From 64e91fa25b1ccfdb8ba510293fcf0582be0dec01 Mon Sep 17 00:00:00 2001
From: Cristian Torres <cris.torres15@gmail.com>
Date: Wed, 27 Mar 2019 17:09:59 -0600
Subject: [PATCH 001/133] [CHANGE] Making State available in .odt templates...

...making use of the same strategy when loading Country info from single attribute.
Previously attempted on PR #10463 which has been closed

This also relates to #7428
---
 htdocs/admin/company.php               | 12 +++++++++++-
 htdocs/societe/class/societe.class.php | 25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 949038b4413..1a5f963a46a 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -74,11 +74,21 @@ if ( ($action == 'update' && ! GETPOST("cancel",'alpha'))
 		activateModulesRequiredByCountry($mysoc->country_code);
 	}
 
+	$tmparray=getState(GETPOST('state_id','int'),'all',$db,$langs,0);
+	if (! empty($tmparray['id']))
+	{
+		$mysoc->state_id   =$tmparray['id'];
+		$mysoc->state_code =$tmparray['code'];
+		$mysoc->state_label=$tmparray['label'];
+
+		$s=$mysoc->state_id.':'.$mysoc->state_code.':'.$mysoc->state_label;
+		dolibarr_set_const($db, "MAIN_INFO_SOCIETE_STATE", $s,'chaine',0,'',$conf->entity);
+	}
+
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom",'nohtml'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADDRESS", GETPOST("MAIN_INFO_SOCIETE_ADDRESS",'nohtml'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN", GETPOST("MAIN_INFO_SOCIETE_TOWN",'nohtml'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ZIP", GETPOST("MAIN_INFO_SOCIETE_ZIP",'alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_STATE", GETPOST("state_id",'alpha'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_REGION", GETPOST("region_code",'alpha'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_MONNAIE", GETPOST("currency",'aZ09'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TEL", GETPOST("tel",'alpha'),'chaine',0,'',$conf->entity);
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 38d07e8e4db..ba268b0b269 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3310,6 +3310,31 @@ class Societe extends CommonObject
 		$this->country=$country_label;
 		if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
 
+		//TODO This could be replicated for region but function `getRegion` didn't exist, so I didn't added it.
+		// We define state_id, state_code and state
+		$state_id=$state_code=$state_label='';
+		if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE))
+		{
+			$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_STATE);
+			$state_id=$tmp[0];
+			if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_STATE is "id:code:label"
+			{
+				$state_code=$tmp[1];
+				$state_label=$tmp[2];
+			}
+			else                    // For backward compatibility
+			{
+				dol_syslog("Your state setup use an old syntax. Reedit it using setup area.", LOG_ERR);
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+				$state_code=getState($state_id,2,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+				$state_label=getState($state_id,0,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+			}
+		}
+		$this->state_id=$state_id;
+		$this->state_code=$state_code;
+		$this->state=$state_label;
+		if (is_object($langs)) $this->state=($langs->trans('State'.$state_code)!='State'.$state_code)?$langs->trans('State'.$state_code):$state_label;
+
 		$this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
 		$this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
 		$this->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB;

From a7a8eb3648b2d0a634d76583c24249ee19924900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20L=C3=A9onard?= <laurent@openthink.be>
Date: Sat, 4 May 2019 06:33:23 +0200
Subject: [PATCH 002/133] Add customer code in customer orders documents

---
 htdocs/core/modules/commande/doc/pdf_einstein.modules.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 9d73384cf3a..0aada45f7f0 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1320,6 +1320,14 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date, "%d %b %Y", false, $outputlangs, true), '', 'R');
 
+		if ($object->thirdparty->code_client)
+		{
+			$posy+=4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+		}
+
 		// Get contact
 		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 		{

From 11ece5603816221f531c35dbede74d84e61b58a0 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 5 May 2019 19:08:27 +0200
Subject: [PATCH 003/133] NEW add API shipment mode

---
 htdocs/api/class/api_setup.class.php | 62 ++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 783ec6540e3..e3bb7f4a799 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2017	Regis Houssin	        <regis.houssin@inodbox.com>
  * Copyright (C) 2017	Neil Orley	            <neil.orley@oeris.fr>
  * Copyright (C) 2018   Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018   Thibault FOUCART        <support@ptibogxiv.net> 
  *
  *
  * This program is free software; you can redistribute it and/or modify
@@ -706,6 +707,67 @@ class Setup extends DolibarrApi
 
         return $list;
     }
+    
+    /**
+     * Get the list of shipping methods.
+     *
+     * @param int       $limit      Number of items per page
+     * @param int       $page       Page number {@min 0}
+     * @param int       $active     Shipping methodsm is active or not {@min 0} {@max 1}
+     * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
+     *
+     * @url     GET dictionary/shipping_methods
+     *
+     * @return array List of shipping methods
+     *
+     * @throws 400 RestException
+     * @throws 200 OK
+     */
+    public function getShippingModes($limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+    {
+        $list = array();
+
+        $sql = "SELECT rowid as id, code, libelle as label, description, tracking, module";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
+        $sql.= " WHERE t.entity IN (".getEntity('c_shipment_mode').")";
+        $sql.= " AND t.active = ".$active;
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+                $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+
+        //$sql.= $this->db->order($sortfield, $sortorder);
+
+        if ($limit) {
+            if ($page < 0) {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql .= $this->db->plimit($limit, $offset);
+        }
+
+        $result = $this->db->query($sql);
+
+        if ($result) {
+            $num = $this->db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
+                $list[] = $this->db->fetch_object($result);
+            }
+        } else {
+            throw new RestException(400, $this->db->lasterror());
+        }
+
+        return $list;
+    }    
 
      /**
      * Get the list of tickets categories.

From 15cff25bbc68738e6c11a7d12081fa7842c2f9b0 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 5 May 2019 19:10:39 +0200
Subject: [PATCH 004/133] Update llx_c_shipment_mode.sql

---
 htdocs/install/mysql/tables/llx_c_shipment_mode.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
index 7945c9f9fb0..efacec420c9 100644
--- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
@@ -19,6 +19,7 @@
 create table llx_c_shipment_mode
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
+  entity				   integer	DEFAULT 1 NOT NULL,	-- multi company id
   tms              timestamp,
   code             varchar(30) NOT NULL,
   libelle          varchar(50) NOT NULL,

From 499798b2e01b725b35027dd94dcc2dadf2bb2340 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 5 May 2019 19:11:18 +0200
Subject: [PATCH 005/133] Update llx_c_shipment_mode.key.sql

---
 htdocs/install/mysql/tables/llx_c_shipment_mode.key.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.key.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.key.sql
index 15058c0630e..3a90d15330f 100644
--- a/htdocs/install/mysql/tables/llx_c_shipment_mode.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.key.sql
@@ -16,5 +16,5 @@
 --
 -- ===================================================================
 
-ALTER TABLE llx_c_shipment_mode ADD UNIQUE INDEX uk_c_shipment_mode (code);
+ALTER TABLE llx_c_shipment_mode ADD UNIQUE INDEX uk_c_shipment_mode (entity, code);
 

From e65c8399e60b0310648bd8368dc48fd0c6428706 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 5 May 2019 19:14:09 +0200
Subject: [PATCH 006/133] Update 9.0.0-10.0.0.sql

---
 htdocs/install/mysql/migration/9.0.0-10.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
index e5b925b0d83..2e143209d9a 100644
--- a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
+++ b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
@@ -108,6 +108,8 @@ ALTER TABLE llx_prelevement_facture_demande ADD COLUMN ext_payment_id varchar(12
 ALTER TABLE llx_prelevement_facture_demande ADD COLUMN ext_payment_site varchar(128) NULL;
 
 -- Fix if table exists
+ALTER TABLE llx_c_shipment_mode ADD COLUMN entity integer;
+
 ALTER TABLE llx_c_units DROP INDEX uk_c_units_code;
 ALTER TABLE llx_c_units ADD COLUMN scale integer;
 ALTER TABLE llx_c_units ADD COLUMN unit_type varchar(10);

From a0ba8d98a1fee2b2d414c4a6ed137e792cfaa755 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 5 May 2019 20:54:31 +0200
Subject: [PATCH 007/133] Update api_setup.class.php

---
 htdocs/api/class/api_setup.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index e3bb7f4a799..78b794a996c 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2017	Regis Houssin	        <regis.houssin@inodbox.com>
  * Copyright (C) 2017	Neil Orley	            <neil.orley@oeris.fr>
  * Copyright (C) 2018   Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2018   Thibault FOUCART        <support@ptibogxiv.net> 
+ * Copyright (C) 2018   Thibault FOUCART        <support@ptibogxiv.net>
  *
  *
  * This program is free software; you can redistribute it and/or modify
@@ -767,7 +767,7 @@ class Setup extends DolibarrApi
         }
 
         return $list;
-    }    
+    }
 
      /**
      * Get the list of tickets categories.

From 77d3f221631a1a92e7c27c82126c33f505eea90c Mon Sep 17 00:00:00 2001
From: ATM-Nicolas <nicolas.prevost@atm-consulting.fr>
Date: Mon, 6 May 2019 11:21:39 +0200
Subject: [PATCH 008/133] NEW : Amount invoiced column in propal list

---
 htdocs/comm/propal/list.php  | 30 ++++++++++++++++++++++++++++++
 htdocs/langs/fr_FR/main.lang |  1 +
 2 files changed, 31 insertions(+)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 24c53d26526..7355ea83269 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -160,6 +160,7 @@ $arrayfields=array(
 	'p.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
 	'p.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
 	'p.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
+	'p.total_invoiced'=>array('label'=>$langs->trans("AmountInvoicedTTC"), 'checked'=>0),
 	'u.login'=>array('label'=>$langs->trans("Author"), 'checked'=>1, 'position'=>10),
 	'sale_representative'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>1),
 	'p.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
@@ -637,6 +638,12 @@ if ($resql)
 		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 		print '</td>';
 	}
+	if (! empty($arrayfields['p.total_invoiced']['checked']))
+	{
+		// Amount invoiced
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
 	if (! empty($arrayfields['u.login']['checked']))
 	{
 		// Author
@@ -701,6 +708,7 @@ if ($resql)
 	if (! empty($arrayfields['p.total_ht']['checked']))       print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
 	if (! empty($arrayfields['p.total_vat']['checked']))      print_liste_field_titre($arrayfields['p.total_vat']['label'], $_SERVER["PHP_SELF"], 'p.tva', '', $param, 'class="right"', $sortfield, $sortorder);
 	if (! empty($arrayfields['p.total_ttc']['checked']))      print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total', '', $param, 'class="right"', $sortfield, $sortorder);
+	if (! empty($arrayfields['p.total_invoiced']['checked'])) print_liste_field_titre($arrayfields['p.total_invoiced']['label'], $_SERVER["PHP_SELF"], 'p.total', '', $param, 'class="right"', $sortfield, $sortorder);
 	if (! empty($arrayfields['u.login']['checked']))       	  print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
 	if (! empty($arrayfields['sale_representative']['checked'])) print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
 	// Extra fields
@@ -911,6 +919,27 @@ if ($resql)
 			if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
 			$totalarray['totalttc'] += $obj->total_ttc;
 		}
+		// Amount invoiced
+        if(! empty($arrayfields['p.total_invoiced']['checked'])) {
+            $totalInvoiced = 0;
+            $p = new Propal($db);
+            $TInvoiceData = $p->InvoiceArrayList($obj->rowid);
+
+            if(! empty($TInvoiceData)) {
+                foreach($TInvoiceData as $invoiceData) {
+                    $invoice = new Facture($db);
+                    $invoice->fetch($invoiceData->facid);
+
+                    if(! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $invoice->type == Facture::TYPE_DEPOSIT) continue;
+                    $totalInvoiced += $invoice->total_ttc;
+                }
+            }
+
+            print '<td class="right">'.price($totalInvoiced)."</td>\n";
+            if (! $i) $totalarray['nbfield']++;
+            if (! $i) $totalarray['totalinvoicedfield']=$totalarray['nbfield'];
+            $totalarray['totalinvoiced'] += $totalInvoiced;
+        }
 
 		$userstatic->id=$obj->fk_user_author;
 		$userstatic->login=$obj->login;
@@ -1037,6 +1066,7 @@ if ($resql)
 		    elseif ($totalarray['totalhtfield'] == $i) print '<td class="right">'.price($totalarray['totalht']).'</td>';
 		    elseif ($totalarray['totalvatfield'] == $i) print '<td class="right">'.price($totalarray['totalvat']).'</td>';
 		    elseif ($totalarray['totalttcfield'] == $i) print '<td class="right">'.price($totalarray['totalttc']).'</td>';
+		    elseif ($totalarray['totalinvoicedfield'] == $i) print '<td class="right">'.price($totalarray['totalinvoiced']).'</td>';
 		    elseif ($totalarray['totalizable']) {
                 $printed = false;
                 foreach ($totalarray['totalizable'] as $totalizable) {
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 552c3334bbe..22e6914dcd9 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -347,6 +347,7 @@ PriceUTTC=P.U TTC
 Amount=Montant
 AmountInvoice=Montant facture
 AmountInvoiced=Montant facturé
+AmountInvoicedTTC=Montant TTC facturé
 AmountPayment=Montant paiement
 AmountHTShort=Montant HT
 AmountTTCShort=Montant TTC

From 53b1dec317f9b8bee27e39437916f899021cbd37 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 8 May 2019 01:56:52 +0200
Subject: [PATCH 009/133] Update 9.0.0-10.0.0.sql

---
 htdocs/install/mysql/migration/9.0.0-10.0.0.sql | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
index 2e143209d9a..66839713bb7 100644
--- a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
+++ b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
@@ -107,9 +107,11 @@ ALTER TABLE llx_prelevement_facture_demande ADD COLUMN sourcetype varchar(32);
 ALTER TABLE llx_prelevement_facture_demande ADD COLUMN ext_payment_id varchar(128) NULL;
 ALTER TABLE llx_prelevement_facture_demande ADD COLUMN ext_payment_site varchar(128) NULL;
 
--- Fix if table exists
-ALTER TABLE llx_c_shipment_mode ADD COLUMN entity integer;
+ALTER TABLE llx_c_shipment_mode ADD COLUMN entity integer DEFAULT 1;
+ALTER TABLE llx_c_shipment_mode DROP INDEX uk_c_shipment_mode;
+ALTER TABLE llx_c_shipment_mode ADD UNIQUE INDEX uk_c_shipment_mode (entity, code);
 
+-- Fix if table exists
 ALTER TABLE llx_c_units DROP INDEX uk_c_units_code;
 ALTER TABLE llx_c_units ADD COLUMN scale integer;
 ALTER TABLE llx_c_units ADD COLUMN unit_type varchar(10);

From 249893a4ab1774b55fb8bf4e066aebb962ba450a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 8 May 2019 01:57:23 +0200
Subject: [PATCH 010/133] Update 9.0.0-10.0.0.sql

---
 htdocs/install/mysql/migration/9.0.0-10.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
index 66839713bb7..43e12c6c05f 100644
--- a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
+++ b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
@@ -109,7 +109,7 @@ ALTER TABLE llx_prelevement_facture_demande ADD COLUMN ext_payment_site varchar(
 
 ALTER TABLE llx_c_shipment_mode ADD COLUMN entity integer DEFAULT 1;
 ALTER TABLE llx_c_shipment_mode DROP INDEX uk_c_shipment_mode;
-ALTER TABLE llx_c_shipment_mode ADD UNIQUE INDEX uk_c_shipment_mode (entity, code);
+ALTER TABLE llx_c_shipment_mode ADD UNIQUE INDEX uk_c_shipment_mode (code, entity);
 
 -- Fix if table exists
 ALTER TABLE llx_c_units DROP INDEX uk_c_units_code;

From 95bb8a1f755f323fef09be8a8f6129a3951ef612 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 8 May 2019 01:57:39 +0200
Subject: [PATCH 011/133] Update llx_c_shipment_mode.key.sql

---
 htdocs/install/mysql/tables/llx_c_shipment_mode.key.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.key.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.key.sql
index 3a90d15330f..a75dfaf2740 100644
--- a/htdocs/install/mysql/tables/llx_c_shipment_mode.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.key.sql
@@ -16,5 +16,5 @@
 --
 -- ===================================================================
 
-ALTER TABLE llx_c_shipment_mode ADD UNIQUE INDEX uk_c_shipment_mode (entity, code);
+ALTER TABLE llx_c_shipment_mode ADD UNIQUE INDEX uk_c_shipment_mode (code, entity);
 

From 3dbfc08a1353c66d81c368f850cd5149b0250420 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 10 May 2019 12:24:02 +0200
Subject: [PATCH 012/133] NEW add "printBucktrackInfo" hook, an external module
 can add info

---
 ChangeLog           |  1 +
 htdocs/main.inc.php | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 355d9baa561..4e36f831197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ FIX: Disallow line start date if after end date.
 
 For Developers:
 NEW: Module "DebugBar" is available as a stable module.
+NEW: add "printBucktrackInfo" hook, an external module can add info
 
 
 WARNING:
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index f195d5f945e..2f3455f7631 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2030,6 +2030,16 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 			$bugbaseurl.= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
 			$bugbaseurl.= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
 			$bugbaseurl.= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
+
+			// Execute hook printBugtrackInfo
+			$parameters=array('searchform'=>$searchform);
+			$reshook=$hookmanager->executeHooks('printBugtrackInfo', $parameters);    // Note that $action and $object may have been modified by some hooks
+			if (empty($reshook))
+			{
+				$bugbaseurl.=$hookmanager->resPrint;
+			}
+			else $bugbaseurl=$hookmanager->resPrint;
+
 			$bugbaseurl.= urlencode("\n");
 			$bugbaseurl.= urlencode("## Report\n");
 			print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';

From a91b462a898cb871fe7e91c886194853b42c7128 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 10 May 2019 12:28:27 +0200
Subject: [PATCH 013/133] FIX wrong parameter

---
 htdocs/main.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2f3455f7631..7dc8df05499 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2032,7 +2032,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 			$bugbaseurl.= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
 
 			// Execute hook printBugtrackInfo
-			$parameters=array('searchform'=>$searchform);
+			$parameters=array('bugbaseurl'=>$bugbaseurl);
 			$reshook=$hookmanager->executeHooks('printBugtrackInfo', $parameters);    // Note that $action and $object may have been modified by some hooks
 			if (empty($reshook))
 			{

From bdd4f3e2973ec48a3d4d51286959383fdecb1e48 Mon Sep 17 00:00:00 2001
From: ATM John BOTELLA <john.botella@atm-consulting.fr>
Date: Sat, 18 May 2019 18:59:55 +0200
Subject: [PATCH 014/133] add css for html5 ::invalid pseudo element

---
 htdocs/theme/eldy/global.inc.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index c1167524bf5..3ab314a5321 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -95,6 +95,10 @@ input.button.massactionconfirmed {
     margin: 4px;
 }
 
+input:invalid, select:invalid {
+    border-color: #ea1212;
+}
+
 /* Focus definitions must be after standard definition */
 textarea:focus {
     /* v6 box-shadow: 0 0 4px #8091BF; */

From 6be48e69521262c461b91d61095362239acec38e Mon Sep 17 00:00:00 2001
From: ATM-Nicolas <nicolas.prevost@atm-consulting.fr>
Date: Mon, 20 May 2019 08:59:44 +0200
Subject: [PATCH 015/133] NEW : Amount HT invoiced column in propal list

---
 htdocs/comm/propal/list.php  | 32 +++++++++++++++++++++++++++++++-
 htdocs/langs/fr_FR/main.lang |  1 +
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 7355ea83269..cd98800f606 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -160,6 +160,7 @@ $arrayfields=array(
 	'p.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
 	'p.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
 	'p.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
+	'p.total_ht_invoiced'=>array('label'=>$langs->trans("AmountInvoicedHT"), 'checked'=>0),
 	'p.total_invoiced'=>array('label'=>$langs->trans("AmountInvoicedTTC"), 'checked'=>0),
 	'u.login'=>array('label'=>$langs->trans("Author"), 'checked'=>1, 'position'=>10),
 	'sale_representative'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>1),
@@ -638,6 +639,12 @@ if ($resql)
 		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 		print '</td>';
 	}
+	if (! empty($arrayfields['p.total_ht_invoiced']['checked']))
+	{
+		// Amount invoiced
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
 	if (! empty($arrayfields['p.total_invoiced']['checked']))
 	{
 		// Amount invoiced
@@ -708,7 +715,8 @@ if ($resql)
 	if (! empty($arrayfields['p.total_ht']['checked']))       print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
 	if (! empty($arrayfields['p.total_vat']['checked']))      print_liste_field_titre($arrayfields['p.total_vat']['label'], $_SERVER["PHP_SELF"], 'p.tva', '', $param, 'class="right"', $sortfield, $sortorder);
 	if (! empty($arrayfields['p.total_ttc']['checked']))      print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (! empty($arrayfields['p.total_invoiced']['checked'])) print_liste_field_titre($arrayfields['p.total_invoiced']['label'], $_SERVER["PHP_SELF"], 'p.total', '', $param, 'class="right"', $sortfield, $sortorder);
+	if (! empty($arrayfields['p.total_ht_invoiced']['checked'])) print_liste_field_titre($arrayfields['p.total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	if (! empty($arrayfields['p.total_invoiced']['checked'])) print_liste_field_titre($arrayfields['p.total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
 	if (! empty($arrayfields['u.login']['checked']))       	  print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
 	if (! empty($arrayfields['sale_representative']['checked'])) print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
 	// Extra fields
@@ -920,6 +928,27 @@ if ($resql)
 			$totalarray['totalttc'] += $obj->total_ttc;
 		}
 		// Amount invoiced
+        if(! empty($arrayfields['p.total_ht_invoiced']['checked'])) {
+            $totalInvoiced = 0;
+            $p = new Propal($db);
+            $TInvoiceData = $p->InvoiceArrayList($obj->rowid);
+
+            if(! empty($TInvoiceData)) {
+                foreach($TInvoiceData as $invoiceData) {
+                    $invoice = new Facture($db);
+                    $invoice->fetch($invoiceData->facid);
+
+                    if(! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $invoice->type == Facture::TYPE_DEPOSIT) continue;
+                    $totalInvoiced += $invoice->total_ht;
+                }
+            }
+
+            print '<td class="right">'.price($totalInvoiced)."</td>\n";
+            if (! $i) $totalarray['nbfield']++;
+            if (! $i) $totalarray['totalhtinvoicedfield']=$totalarray['nbfield'];
+            $totalarray['totalhtinvoiced'] += $totalInvoiced;
+        }
+        // Amount invoiced
         if(! empty($arrayfields['p.total_invoiced']['checked'])) {
             $totalInvoiced = 0;
             $p = new Propal($db);
@@ -1066,6 +1095,7 @@ if ($resql)
 		    elseif ($totalarray['totalhtfield'] == $i) print '<td class="right">'.price($totalarray['totalht']).'</td>';
 		    elseif ($totalarray['totalvatfield'] == $i) print '<td class="right">'.price($totalarray['totalvat']).'</td>';
 		    elseif ($totalarray['totalttcfield'] == $i) print '<td class="right">'.price($totalarray['totalttc']).'</td>';
+		    elseif ($totalarray['totalhtinvoicedfield'] == $i) print '<td class="right">'.price($totalarray['totalhtinvoiced']).'</td>';
 		    elseif ($totalarray['totalinvoicedfield'] == $i) print '<td class="right">'.price($totalarray['totalinvoiced']).'</td>';
 		    elseif ($totalarray['totalizable']) {
                 $printed = false;
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 22e6914dcd9..3cbcf89574e 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -347,6 +347,7 @@ PriceUTTC=P.U TTC
 Amount=Montant
 AmountInvoice=Montant facture
 AmountInvoiced=Montant facturé
+AmountInvoicedHT=Montant HT facturé
 AmountInvoicedTTC=Montant TTC facturé
 AmountPayment=Montant paiement
 AmountHTShort=Montant HT

From 45fabede280fcf2ede6519b6be6c751a182740bf Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 26 May 2019 16:44:17 +0200
Subject: [PATCH 016/133] Basic phone layout for Restaurants in TakePOS

---
 htdocs/langs/en_US/cashdesk.lang |   3 +-
 htdocs/takepos/admin/setup.php   |  10 +++
 htdocs/takepos/invoice.php       | 127 +++++++++++++++++++++++++++++--
 htdocs/takepos/takepos.php       |   7 ++
 4 files changed, 138 insertions(+), 9 deletions(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 8ba3bda053f..83c217b06f7 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -67,4 +67,5 @@ ValidateAndClose=Validate and close
 Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
-POSTicket=POS Ticket
\ No newline at end of file
+POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
\ No newline at end of file
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index f331587723b..3fb9d869cd0 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -73,6 +73,7 @@ if (GETPOST('action', 'alpha') == 'set')
     $res = dolibarr_set_const($db, "TAKEPOS_PRINT_SERVER", GETPOST('TAKEPOS_PRINT_SERVER', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTERS", GETPOST('TAKEPOS_ORDER_PRINTERS', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_NOTES", GETPOST('TAKEPOS_ORDER_NOTES', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_PHONE_BASIC_LAYOUT", GETPOST('TAKEPOS_PHONE_BASIC_LAYOUT', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_AUTO_PRINT_TICKETS", GETPOST('TAKEPOS_AUTO_PRINT_TICKETS', 'int'), 'int', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_HEADER", GETPOST('TAKEPOS_HEADER', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_FOOTER", GETPOST('TAKEPOS_FOOTER', 'alpha'), 'chaine', 0, '', $conf->entity);
@@ -199,6 +200,15 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT && $conf->global->TAKEPOSCONNECTOR){
 	print '</td></tr>';
 }
 
+if ($conf->global->TAKEPOS_BAR_RESTAURANT)
+{
+	print '<tr class="oddeven value"><td>';
+	print $langs->trans("BasicPhoneLayout");
+	print '<td colspan="2">';
+	print $form->selectyesno("TAKEPOS_PHONE_BASIC_LAYOUT", $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT, 1);
+	print '</td></tr>';
+}
+
 print '<tr class="oddeven"><td>';
 print $langs->trans('TicketVatGrouped');
 print '<td colspan="2">';
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 510b949b92b..aac6f7ecaf8 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -44,6 +44,31 @@ $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
 
+if ($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT==1 && $conf->browser->layout == 'phone')
+{
+	// DIRECT LINK TO THIS PAGE FROM MOBILE AND NO TERMINAL SELECTED
+	if ($_SESSION["takeposterminal"]=="")
+	{
+		if ($conf->global->TAKEPOS_NUM_TERMINALS=="1") $_SESSION["takeposterminal"]=1;
+		else
+		{
+			header("Location: takepos.php");
+			exit;
+		}
+	}
+	$mobilepage = GETPOST('mobilepage', 'alpha');
+	$title='TakePOS - Dolibarr '.DOL_VERSION;
+	if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title='TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+	$head='<meta name="apple-mobile-web-app-title" content="TakePOS"/>
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="mobile-web-app-capable" content="yes">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+	print '<link rel="stylesheet" href="css/pos.css">
+	<link rel="stylesheet" href="css/colorbox.css" type="text/css" media="screen" />
+	<script type="text/javascript" src="js/jquery.colorbox-min.js"></script>';
+}
+
 /**
  * Abort invoice creationg with a given error message
  *
@@ -497,13 +522,88 @@ print $langs->trans('TotalTTC');
 print ' : <b>'.price($invoice->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</b></span>';
 print '<br>'.$sectionwithinvoicelink;
 print '</td>';
-print '<td class="linecolqty right">' . $langs->trans('ReductionShort') . '</td>';
-print '<td class="linecolqty right">' . $langs->trans('Qty') . '</td>';
-print '<td class="linecolht right nowraponall">' . $langs->trans('TotalHTShort') . '</td>';
+if ($_SESSION["basiclayout"]!=1)
+{
+	print '<td class="linecolqty right">' . $langs->trans('ReductionShort') . '</td>';
+	print '<td class="linecolqty right">' . $langs->trans('Qty') . '</td>';
+	print '<td class="linecolht right nowraponall">' . $langs->trans('TotalHTShort') . '</td>';
+}
 print "</tr>\n";
 
+if ($_SESSION["basiclayout"]==1)
+{
+	if ($mobilepage=="cats")
+	{
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$categorie = new Categorie($db);
+        $categories = $categorie->get_full_arbo('product');
+		$htmlforlines = '';
+        foreach ($categories as $row){
+			$htmlforlines.= '<tr class="drag drop oddeven posinvoiceline';
+			$htmlforlines.= '" onclick="location.href=\'invoice.php?mobilepage=products&place=' . $place . '&catid=' . $row['id'] . '\'">';
+			$htmlforlines.= '<td class="left">';
+			$htmlforlines.= $row['label'];
+			$htmlforlines.= '</td>';
+			$htmlforlines.= '</tr>'."\n";
+		}
+		$htmlforlines.= '</table>';
+		$htmlforlines.= '<div class="tabsAction">';
+		$htmlforlines.= '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?mobilepage=places&place=' . $place. '">'.$langs->trans("Floors").'</a>';
+		$htmlforlines.= '</div>';
+		print $htmlforlines;
+	}
+	
+	if ($mobilepage=="products")
+	{
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$object = new Categorie($db);
+		$catid = GETPOST('catid', 'int');
+		$result=$object->fetch($catid);
+		$prods = $object->getObjectsInCateg("product");
+		$htmlforlines = '';
+		foreach ($prods as $row) {
+			$htmlforlines.= '<tr class="drag drop oddeven posinvoiceline';
+			$htmlforlines.= '" onclick="location.href=\'invoice.php?mobilepage=invoice&action=addline&place=' . $place . '&idproduct=' . $row->id . '\'">';
+			$htmlforlines.= '<td class="left">';
+			$htmlforlines.= $row->label;
+			$htmlforlines.= '</td>';
+			$htmlforlines.= '</tr>'."\n";
+		}
+		$htmlforlines.= '</table>';
+		$htmlforlines.= '<div class="tabsAction">';
+		$htmlforlines.= '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?mobilepage=cats&place=' . $place. '">'.$langs->trans("Categories").'</a>';
+		$htmlforlines.= '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?mobilepage=places&place=' . $place. '">'.$langs->trans("Floors").'</a>';
+		$htmlforlines.= '</div>';
+		print $htmlforlines;
+	}
+	
+	if ($mobilepage=="places")
+	{
+		$sql="SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables";
+		$resql = $db->query($sql);
+		$rows = array();
+		$htmlforlines = '';
+		while($row = $db->fetch_array($resql)){
+			$rows[] = $row;
+			$htmlforlines.= '<tr class="drag drop oddeven posinvoiceline';
+			$htmlforlines.= '" onclick="location.href=\'invoice.php?mobilepage=invoice&place=' . $row['label'] . '\'">';
+			$htmlforlines.= '<td class="left">';
+			$htmlforlines.= $row['label'];
+			$htmlforlines.= '</td>';
+			$htmlforlines.= '</tr>'."\n";
+		}
+		$htmlforlines.= '</table>';
+		$htmlforlines.= '<div class="tabsAction">';
+		$htmlforlines.= '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?mobilepage=cats&place=' . $place. '">'.$langs->trans("Categories").'</a>';
+		$htmlforlines.= '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?mobilepage=places&place=' . $place. '">'.$langs->trans("Floors").'</a>';
+		$htmlforlines.= '</div>';
+		print $htmlforlines;
+	}
+}
+
 if ($placeid > 0)
 {
+	if ($_SESSION["basiclayout"]==1 && $mobilepage!="invoice") return;
     if (is_array($invoice->lines) && count($invoice->lines))
     {
         $tmplines = array_reverse($invoice->lines);
@@ -538,11 +638,14 @@ if ($placeid > 0)
                 }
             }
             if (!empty($line->array_options['options_order_notes'])) $htmlforlines.= "<br>(".$line->array_options['options_order_notes'].")";
-            $htmlforlines.= '</td>';
-            $htmlforlines.= '<td class="right">' . vatrate($line->remise_percent, true) . '</td>';
-            $htmlforlines.= '<td class="right">' . $line->qty . '</td>';
-            $htmlforlines.= '<td class="right">' . price($line->total_ttc) . '</td>';
-            $htmlforlines.= '</tr>'."\n";
+            if ($_SESSION["basiclayout"]!=1)
+			{
+				$htmlforlines.= '</td>';
+				$htmlforlines.= '<td class="right">' . vatrate($line->remise_percent, true) . '</td>';
+				$htmlforlines.= '<td class="right">' . $line->qty . '</td>';
+				$htmlforlines.= '<td class="right">' . price($line->total_ttc) . '</td>';
+			}
+			$htmlforlines.= '</tr>'."\n";
 
             print $htmlforlines;
         }
@@ -558,6 +661,14 @@ else {      // No invoice generated yet
 
 print '</table>';
 
+if ($_SESSION["basiclayout"]==1 && $mobilepage=="invoice")
+{
+	print '<div class="tabsAction">';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?mobilepage=cats&place=' . $place. '">'.$langs->trans("Categories").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?mobilepage=places&place=' . $place. '">'.$langs->trans("Floors").'</a>';
+	print '</div>';
+}
+
 if ($invoice->socid != $conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]})
 {
     $soc = new Societe($db);
diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index c0a37881cf9..7e55bbc5936 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -57,6 +57,13 @@ if ($conf->browser->layout == 'phone')
 {
     $maxcategbydefaultforthisdevice=8;
     $maxproductbydefaultforthisdevice=16;
+	//REDIRECT TO BASIC LAYOUT IF TERMINAL SELECTED AND BASIC MOBILE LAYOUT ENABLED
+	if ($_SESSION["takeposterminal"]!="" && $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT==1)
+	{
+		$_SESSION["basiclayout"]=1;
+		header("Location: invoice.php?mobilepage=invoice");
+		exit;
+	}
 }
 $MAXCATEG = (empty($conf->global->TAKEPOS_NB_MAXCATEG)?$maxcategbydefaultforthisdevice:$conf->global->TAKEPOS_NB_MAXCATEG);
 $MAXPRODUCT = (empty($conf->global->TAKEPOS_NB_MAXPRODUCT)?$maxproductbydefaultforthisdevice:$conf->global->TAKEPOS_NB_MAXPRODUCT);

From 43ada3fcd44b35bdbf8771ec409146848bd158b7 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 3 Jun 2019 09:36:00 +0200
Subject: [PATCH 017/133] FIX better method to check if pdf is
 protected/encrypted

---
 htdocs/core/lib/pdf.lib.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 14c0435b4ad..1932fca31a2 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -175,18 +175,29 @@ function pdf_getInstance($format = '', $metric = 'mm', $pagetype = 'P')
 /**
  * Return if pdf file is protected/encrypted
  *
- * @param	TCPDF		$pdf			PDF initialized object
  * @param   string		$pathoffile		Path of file
  * @return  boolean     			    True or false
  */
-function pdf_getEncryption(&$pdf, $pathoffile)
+function pdf_getEncryption($pathoffile)
 {
+	require_once TCPDF_PATH.'tcpdf_parser.php';
+
 	$isencrypted = false;
 
-	$pdfparser = $pdf->_getPdfParser($pathoffile);
-	$data = $pdfparser->getParsedData();
-	if (isset($data[0]['trailer'][1]['/Encrypt'])) {
-		$isencrypted = true;
+	$content = file_get_contents($pathoffile);
+
+	ob_start();
+	@($parser = new \TCPDF_PARSER(ltrim($content)));
+	list($xref, $data) = $parser->getParsedData();
+	unset($parser);
+	ob_end_clean();
+
+	if (isset($xref['trailer']['encrypt'])) {
+		$isencrypted = true;	// Secured pdf file are currently not supported
+	}
+
+	if (empty($data)) {
+		$isencrypted = true;	// Object list not found. Possible secured file
 	}
 
 	return $isencrypted;

From 439eafb6377780f9347aa4fabd185949621c73a6 Mon Sep 17 00:00:00 2001
From: Lionel VESSILLER <lvessiller>
Date: Mon, 3 Jun 2019 15:44:17 +0200
Subject: [PATCH 018/133] NEW add extrafields in warehouses - create table -
 admin extrafields - object fecth, insert, update and delete extrafields -
 card and list

---
 htdocs/admin/stock.php                        |   5 +
 htdocs/core/lib/stock.lib.php                 |  34 +++++
 .../install/mysql/migration/10.0.0-11.0.0.sql |  15 +++
 .../tables/llx_entrepot_extrafields.key.sql   |  20 +++
 .../mysql/tables/llx_entrepot_extrafields.sql |  26 ++++
 htdocs/install/pgsql/functions/functions.sql  |   1 +
 htdocs/product/admin/stock_extrafields.php    | 116 +++++++++++++++++
 htdocs/product/stock/card.php                 | 118 +++++++++++++-----
 htdocs/product/stock/class/entrepot.class.php |  66 ++++++++--
 htdocs/product/stock/list.php                 |  73 +++++++++--
 10 files changed, 424 insertions(+), 50 deletions(-)
 create mode 100644 htdocs/install/mysql/migration/10.0.0-11.0.0.sql
 create mode 100644 htdocs/install/mysql/tables/llx_entrepot_extrafields.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_entrepot_extrafields.sql
 create mode 100644 htdocs/product/admin/stock_extrafields.php

diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 2e934211970..7c22d1a4a58 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -27,6 +27,7 @@
  */
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "stocks"));
@@ -77,6 +78,10 @@ llxHeader('', $langs->trans("StockSetup"));
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("StockSetup"), $linkback, 'title_setup');
 
+$head = stock_admin_prepare_head();
+
+dol_fiche_head($head, 'general', $langs->trans("StockSetup"), -1, 'stock');
+
 $form=new Form($db);
 
 
diff --git a/htdocs/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php
index 7b3ef796432..fc7701877bc 100644
--- a/htdocs/core/lib/stock.lib.php
+++ b/htdocs/core/lib/stock.lib.php
@@ -78,3 +78,37 @@ function stock_prepare_head($object)
 
     return $head;
 }
+
+/**
+ *  Return array head with list of tabs to view object informations.
+ *
+ *  @return	array   	        head array with tabs
+ */
+function stock_admin_prepare_head()
+{
+    global $langs, $conf, $user;
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/admin/stock.php';
+    $head[$h][1] = $langs->trans("Miscellaneous");
+    $head[$h][2] = 'general';
+    $h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin');
+
+    $head[$h][0] = DOL_URL_ROOT.'/product/admin/stock_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
+
+    complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin', 'remove');
+
+    return $head;
+}
+
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
new file mode 100644
index 00000000000..9f758b6bc40
--- /dev/null
+++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -0,0 +1,15 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 11.0.0 or higher.
+
+
+create table llx_entrepot_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
+ALTER TABLE llx_entrepot_extrafields ADD INDEX idx_entrepot_extrafields (fk_object);
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_entrepot_extrafields.key.sql b/htdocs/install/mysql/tables/llx_entrepot_extrafields.key.sql
new file mode 100644
index 00000000000..72973186918
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_entrepot_extrafields.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2011 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/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_entrepot_extrafields ADD INDEX idx_entrepot_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql b/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql
new file mode 100644
index 00000000000..c7a209eba8b
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql
@@ -0,0 +1,26 @@
+-- ========================================================================
+-- Copyright (C) 2011 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/>.
+--
+-- ========================================================================
+
+create table llx_entrepot_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index 66b1fbaf370..fc4e4116c84 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -106,6 +106,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_emailcollector_email
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_emailcollector_emailcollectoraction FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_emailcollector_emailcollectorfilter FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_entrepot FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_entrepot_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_events FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_expedition FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_expensereport FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
diff --git a/htdocs/product/admin/stock_extrafields.php b/htdocs/product/admin/stock_extrafields.php
new file mode 100644
index 00000000000..8b2a016415e
--- /dev/null
+++ b/htdocs/product/admin/stock_extrafields.php
@@ -0,0 +1,116 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/product/admin/stock_extrafields.php
+ *		\ingroup    stock
+ *		\brief      Page to setup extra fields of third party
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('companies', 'admin', 'stock'));
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label=ExtraFields::$type2label;
+$type2label=array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+
+$action=GETPOST('action', 'alpha');
+$attrname=GETPOST('attrname', 'alpha');
+$elementtype='entrepot'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+$textobject=$langs->transnoentitiesnoconv("Warehouses");
+
+llxHeader('', $langs->trans("StockSetup"));
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("StockSetup"), $linkback, 'title_setup');
+
+
+$head = stock_admin_prepare_head();
+
+dol_fiche_head($head, 'attributes', $langs->trans("Warehouses"), -1, 'stock');
+
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
+
+dol_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit')
+{
+    print '<div class="tabsAction">';
+    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
+    print "</div>";
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Creation of an optional field											  */
+/*                                                                            */
+/* ************************************************************************** */
+
+if ($action == 'create')
+{
+    print "<br>";
+    print load_fiche_titre($langs->trans('NewAttribute'));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Edition of an optional field                                               */
+/*                                                                            */
+/* ************************************************************************** */
+if ($action == 'edit' && ! empty($attrname))
+{
+    print "<br>";
+    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index ae2150e8464..89d7258e3cc 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'stocks', 'companies', 'categories'));
@@ -55,16 +56,32 @@ $backtopage=GETPOST('backtopage', 'alpha');
 //$result=restrictedArea($user,'stock', $id, 'entrepot&stock');
 $result=restrictedArea($user, 'stock');
 
+$object = new Entrepot($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('entrepot');
+
+// Load object
+if ($id > 0 || ! empty($ref)) {
+    $ret = $object->fetch($id, $ref);
+//    if ($ret > 0)
+//        $ret = $object->fetch_thirdparty();
+    if ($ret <= 0) {
+        setEventMessages($object->error, $object->errors, 'errors');
+        $action = '';
+    }
+}
+
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('warehousecard','globalcard'));
 
-$object = new Entrepot($db);
-
-
 /*
  * Actions
  */
 
+$error = 0;
+
 $usercanread = (($user->rights->stock->lire));
 $usercancreate = (($user->rights->stock->creer));
 $usercandelete = (($user->rights->stock->supprimer));
@@ -85,27 +102,30 @@ if ($action == 'add' && $user->rights->stock->creer)
 
 	if (! empty($object->libelle))
 	{
-		$id = $object->create($user);
-		if ($id > 0)
-		{
-			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+        // Fill array 'array_options' with data from add form
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+        if ($ret < 0) {
+            $error++;
+            $action = 'create';
+        }
 
-			if (! empty($backtopage))
-			{
-				header("Location: ".$backtopage);
-				exit;
-			}
-			else
-			{
-				header("Location: card.php?id=".$id);
-				exit;
-			}
-		}
-		else
-		{
-			$action = 'create';
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
+        if (! $error) {
+            $id = $object->create($user);
+            if ($id > 0) {
+                setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+
+                if (!empty($backtopage)) {
+                    header("Location: " . $backtopage);
+                    exit;
+                } else {
+                    header("Location: card.php?id=" . $id);
+                    exit;
+                }
+            } else {
+                $action = 'create';
+                setEventMessages($object->error, $object->errors, 'errors');
+            }
+        }
 	}
 	else
 	{
@@ -147,15 +167,21 @@ if ($action == 'update' && $cancel <> $langs->trans("Cancel"))
 		$object->town        = GETPOST("town");
 		$object->country_id  = GETPOST("country_id");
 
-		if ( $object->update($id, $user) > 0)
-		{
-			$action = '';
-		}
-		else
-		{
+        // Fill array 'array_options' with data from add form
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+        if ($ret < 0)   $error++;
+
+        if (! $error) {
+            $ret = $object->update($id, $user);
+            if ($ret < 0)   $error++;
+        }
+
+		if ($error) {
 			$action = 'edit';
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
+		} else {
+            $action = '';
+        }
 	}
 	else
 	{
@@ -163,6 +189,22 @@ if ($action == 'update' && $cancel <> $langs->trans("Cancel"))
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
+elseif ($action == 'update_extras') {
+    $object->oldcopy = dol_clone($object);
+
+    // Fill array 'array_options' with data from update form
+    $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+    $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
+    if ($ret < 0) $error++;
+    if (! $error) {
+        $result = $object->insertExtraFields();
+        if ($result < 0) {
+            setEventMessages($object->error, $object->errors, 'errors');
+            $error++;
+        }
+    }
+    if ($error) $action = 'edit_extras';
+}
 
 if ($cancel == $langs->trans("Cancel"))
 {
@@ -257,6 +299,9 @@ if ($action == 'create')
 	print '</select>';
 	print '</td></tr>';
 
+    // Other attributes
+    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php';
+
 	print '</table>';
 
 	dol_fiche_end();
@@ -392,6 +437,9 @@ else
 			}
 			print "</td></tr>";
 
+            // Other attributes
+            include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
 			print "</table>";
 
 			print '</div>';
@@ -638,6 +686,7 @@ else
 			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print '</td></tr>';
 
+			// Status
 			print '<tr><td>'.$langs->trans("Status").'</td><td>';
 			print '<select name="statut" class="flat">';
 			foreach ($object->statuts as $key => $value)
@@ -654,6 +703,15 @@ else
 			print '</select>';
 			print '</td></tr>';
 
+            // Other attributes
+            $parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
+            $reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
+            if (empty($reshook))
+            {
+                print $object->showOptionals($extrafields, 'edit');
+            }
+
 			print '</table>';
 
 			dol_fiche_end();
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 0032d17f97e..4593037da10 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -163,6 +163,19 @@ class Entrepot extends CommonObject
 					}
 				}
 
+                // Actions on extra fields
+                if (! $error)
+                {
+                    if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+                    {
+                        $result=$this->insertExtraFields();
+                        if ($result < 0)
+                        {
+                            $error++;
+                        }
+                    }
+                }
+
 				if (! $error)
 				{
 					$this->db->commit();
@@ -199,6 +212,10 @@ class Entrepot extends CommonObject
 	 */
 	public function update($id, $user)
 	{
+	    global $conf;
+
+        $error=0;
+
 	    if (empty($id)) $id = $this->id;
 
 		// Check if new parent is already a child of current warehouse
@@ -239,13 +256,24 @@ class Entrepot extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql=$this->db->query($sql);
-		if ($resql)
-		{
+
+        if (! $resql) {
+            $error++;
+            $this->errors[]="Error ".$this->db->lasterror();
+        }
+
+        if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) {
+            $result=$this->insertExtraFields();
+            if ($result < 0)
+            {
+                $error++;
+            }
+        }
+
+		if (!$error) {
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -262,6 +290,10 @@ class Entrepot extends CommonObject
 	 */
 	public function delete($user, $notrigger = 0)
 	{
+	    global $conf;
+
+	    $error = 0;
+
 		$this->db->begin();
 
 		if (! $error && empty($notrigger))
@@ -293,17 +325,30 @@ class Entrepot extends CommonObject
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."entrepot";
 			$sql.= " WHERE rowid = " . $this->id;
-
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql1=$this->db->query($sql);
+            if (!$resql1)   $error++;
 
 			// Update denormalized fields because we change content of produt_stock. Warning: Do not use "SET p.stock", does not works with pgsql
 			$sql = "UPDATE ".MAIN_DB_PREFIX."product as p SET stock = (SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock as ps WHERE ps.fk_product = p.rowid)";
-
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql2=$this->db->query($sql);
+            if (!$resql2)   $error++;
 
-			if ($resql1 && $resql2)
+            // Removed extrafields
+            if (! $error) {
+                if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+                {
+                    $result=$this->deleteExtraFields();
+                    if ($result < 0) {
+                        $error++;
+                        $errorflag=-4;
+                        dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
+                    }
+                }
+            }
+
+			if (!$error)
 			{
 				$this->db->commit();
 				return 1;
@@ -377,6 +422,10 @@ class Entrepot extends CommonObject
 				$this->town           = $obj->town;
 				$this->country_id     = $obj->country_id;
 
+                // Retreive all extrafield
+                // fetch optionals attributes and labels
+                $this->fetch_optionals();
+
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 	            $tmp=getCountry($this->country_id, 'all');
 				$this->country=$tmp['label'];
@@ -386,6 +435,7 @@ class Entrepot extends CommonObject
 			}
 			else
 			{
+                $this->error="Record Not Found";
 				return 0;
 			}
 		}
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index b9876bdf36a..8178df6b03c 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -49,6 +49,16 @@ $offset = $limit * $page;
 
 $year = strftime("%Y", time());
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$object = new Entrepot($db);
+$hookmanager->initHooks(array('stocklist'));
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('entrepot');
+$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
     'e.ref'=>"Ref",
@@ -60,6 +70,16 @@ $fieldstosearchall = array(
 );
 
 
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+    }
+}
+
+
 /*
  * Actions
  */
@@ -85,14 +105,19 @@ $warehouse=new Entrepot($db);
 
 $sql = "SELECT e.rowid, e.ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays, e.fk_parent,";
 $sql.= " SUM(p.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue, SUM(ps.reel) as stockqty";
+// Add fields from extrafields
+foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON e.rowid = ps.fk_entrepot";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot_extrafields as ef on (e.rowid = ef.fk_object)";
 $sql.= " WHERE e.entity IN (".getEntity('stock').")";
 if ($search_ref) $sql.= natural_search("e.ref", $search_ref);			// ref
 if ($search_label) $sql.= natural_search("e.lieu", $search_label);		// label
 if ($search_status != '' && $search_status >= 0) $sql.= " AND e.statut = ".$search_status;
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 $sql.= " GROUP BY e.rowid, e.ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays, e.fk_parent";
 $totalnboflines=0;
 $result=$db->query($sql);
@@ -131,6 +156,9 @@ if ($result)
 	if ($search_status)	$param.="&search_status=".urlencode($search_status);
 	if ($sall)			$param.="&sall=".urlencode($sall);
 
+    // Add $param from extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
 	$newcardbutton='';
 	if ($user->rights->stock->creer)
 	{
@@ -173,6 +201,9 @@ if ($result)
 	print '<td class="liste_titre" colspan="3">';
 	print '</td>';
 
+    // Extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
 	print '<td class="liste_titre right">';
 	print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1);
 	print '</td>';
@@ -190,7 +221,9 @@ if ($result)
 	print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stockqty", '', $param, '', $sortfield, $sortorder, 'right ');
     print_liste_field_titre("EstimatedStockValue", $_SERVER["PHP_SELF"], "estimatedvalue", '', $param, '', $sortfield, $sortorder, 'right ');
     print_liste_field_titre("EstimatedStockValueSell", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ');
-	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "e.statut", '', $param, '', $sortfield, $sortorder, 'right ');
+    // Extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+    print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "e.statut", '', $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
 
@@ -198,40 +231,55 @@ if ($result)
 	{
 		$warehouse=new Entrepot($db);
         $var=false;
+        $totalarray=array();
 		while ($i < min($num, $limit))
 		{
-			$objp = $db->fetch_object($result);
+			$obj = $db->fetch_object($result);
 
-			$warehouse->id = $objp->rowid;
-			$warehouse->ref = $objp->ref;
-			$warehouse->label = $objp->ref;
-            $warehouse->lieu = $objp->lieu;
-            $warehouse->fk_parent = $objp->fk_parent;
+			$warehouse->id = $obj->rowid;
+			$warehouse->ref = $obj->ref;
+			$warehouse->label = $obj->ref;
+            $warehouse->lieu = $obj->lieu;
+            $warehouse->fk_parent = $obj->fk_parent;
 
             print '<tr class="oddeven">';
             print '<td>' . $warehouse->getNomUrl(1) . '</td>';
+            if (! $i) $totalarray['nbfield']++;
             // Location
-            print '<td>'.$objp->lieu.'</td>';
+            print '<td>'.$obj->lieu.'</td>';
+            if (! $i) $totalarray['nbfield']++;
+
             // Stock qty
-            print '<td class="right">'.price2num($objp->stockqty, 5).'</td>';
+            print '<td class="right">'.price2num($obj->stockqty, 5).'</td>';
+            if (! $i) $totalarray['nbfield']++;
+
             // PMP value
             print '<td class="right">';
-            if (price2num($objp->estimatedvalue, 'MT')) print price(price2num($objp->estimatedvalue, 'MT'), 1);
+            if (price2num($obj->estimatedvalue, 'MT')) print price(price2num($obj->estimatedvalue, 'MT'), 1);
             else print '';
             print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+
             // Selling value
             print '<td class="right">';
-            if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($objp->sellvalue, 'MT'), 1);
+            if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($obj->sellvalue, 'MT'), 1);
             else
 			{
 				$htmltext=$langs->trans("OptionMULTIPRICESIsOn");
             	print $form->textwithtooltip($langs->trans("Variable"), $htmltext);
 			}
             print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+
+            // Extra fields
+            include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+
             // Status
-            print '<td class="right">'.$warehouse->LibStatut($objp->statut, 5).'</td>';
+            print '<td class="right">'.$warehouse->LibStatut($obj->statut, 5).'</td>';
+            if (! $i) $totalarray['nbfield']++;
 
             print '<td></td>';
+            if (! $i) $totalarray['nbfield']++;
 
             print "</tr>\n";
 
@@ -255,6 +303,7 @@ if ($result)
             print '</td>';
             print '<td></td>';
             print '<td></td>';
+            print '<td></td>';
             print "</tr>\n";
 		}
 	}

From 9a974814fac002004afd5d9b8a90a501b6947653 Mon Sep 17 00:00:00 2001
From: Lionel VESSILLER <lvessiller>
Date: Mon, 3 Jun 2019 15:53:21 +0200
Subject: [PATCH 019/133] NEW add extrafields in warehouses - fix load lang
 stocks

---
 htdocs/product/admin/stock_extrafields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/admin/stock_extrafields.php b/htdocs/product/admin/stock_extrafields.php
index 8b2a016415e..5dc2aa63357 100644
--- a/htdocs/product/admin/stock_extrafields.php
+++ b/htdocs/product/admin/stock_extrafields.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('companies', 'admin', 'stock'));
+$langs->loadLangs(array('companies', 'admin', 'stocks'));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);

From 490e85f4941b1eb71013a6b06c432a5b7cb1762b Mon Sep 17 00:00:00 2001
From: Lionel VESSILLER <lvessiller>
Date: Mon, 3 Jun 2019 16:34:49 +0200
Subject: [PATCH 020/133] Fix PSR2

---
 htdocs/core/lib/stock.lib.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php
index fc7701877bc..50a7611af82 100644
--- a/htdocs/core/lib/stock.lib.php
+++ b/htdocs/core/lib/stock.lib.php
@@ -111,4 +111,3 @@ function stock_admin_prepare_head()
 
     return $head;
 }
-

From 20448475527b115affe098811b5d79564157e733 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 10 Jun 2019 22:33:11 +0200
Subject: [PATCH 021/133] New : add file area at bottom of supplier invoices
 list

---
 htdocs/fourn/facture/list.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index fe3deb6459b..aba34d52e1b 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1133,7 +1133,6 @@ if ($resql)
 
 	print "</form>\n";
 
-	/*
 	$hidegeneratedfilelistifempty=1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
 
@@ -1145,8 +1144,7 @@ if ($resql)
     $genallowed=$user->rights->facture->lire;
     $delallowed=$user->rights->facture->creer;
 
-    print $formfile->showdocuments('massfilesarea_invoices','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
-    */
+    print $formfile->showdocuments('massfilesarea_supplier_invoice','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 }
 else
 {

From 330842d67eebc30f56ebc7dc9ed00246ec0a19a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 Jun 2019 13:14:44 +0200
Subject: [PATCH 022/133] Update list.php

---
 htdocs/comm/propal/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index ee8dacde380..555e89e7a61 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -162,8 +162,8 @@ $arrayfields=array(
 	'p.total_ht'=>array('label'=>"AmountHT", 'checked'=>1),
 	'p.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0),
 	'p.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
-	'p.total_ht_invoiced'=>array('label'=>$langs->trans("AmountInvoicedHT"), 'checked'=>0),
-	'p.total_invoiced'=>array('label'=>$langs->trans("AmountInvoicedTTC"), 'checked'=>0),
+	'p.total_ht_invoiced'=>array('label'=>$langs->trans("AmountInvoicedHT"), 'checked'=>0, 'enabled'=>$conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT),
+	'p.total_invoiced'=>array('label'=>$langs->trans("AmountInvoicedTTC"), 'checked'=>0, 'enabled'=>$conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT),
 	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10),
 	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>1),
 	'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),

From 3afd4e15ad135b74b781a0170d79547fde4208da Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 17 Jun 2019 07:09:19 +0200
Subject: [PATCH 023/133] FIX try to remove ob_* functions

---
 htdocs/core/lib/pdf.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 1932fca31a2..56ca215e118 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -186,11 +186,11 @@ function pdf_getEncryption($pathoffile)
 
 	$content = file_get_contents($pathoffile);
 
-	ob_start();
+	//ob_start();
 	@($parser = new \TCPDF_PARSER(ltrim($content)));
 	list($xref, $data) = $parser->getParsedData();
 	unset($parser);
-	ob_end_clean();
+	//ob_end_clean();
 
 	if (isset($xref['trailer']['encrypt'])) {
 		$isencrypted = true;	// Secured pdf file are currently not supported

From a399e3f63de7b2c652789a069886decd3777c51f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 17 Jun 2019 13:33:44 +0200
Subject: [PATCH 024/133] Update companies.lang

---
 htdocs/langs/fr_FR/companies.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 7a423b0b007..dc2cf3b95b2 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -318,7 +318,7 @@ CompanyDeleted=La société "%s" a été supprimée de la base.
 ListOfContacts=Liste des contacts
 ListOfContactsAddresses=Liste des contacts/adresses
 ListOfThirdParties=Liste des tiers
-ShowCompany=Affichier tiers
+ShowCompany=Afficher tiers
 ShowContact=Afficher contact
 ContactsAllShort=Tous (pas de filtre)
 ContactType=Type de contact

From 1a1f3493c90d5297509af0bf592a51b43bf8d6c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 17 Jun 2019 14:03:57 +0200
Subject: [PATCH 025/133] NEW can specify hour start end for selectDate and
 step for minutes

---
 htdocs/core/class/html.form.class.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 63246fb0287..29f2dd6ed6a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5234,10 +5234,12 @@ class Form
 	 *  @param  int			$fullday        When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59
 	 *  @param	string		$addplusone		Add a link "+1 hour". Value must be name of another selectDate field.
 	 *  @param  datetime    $adddateof      Add a link "Date of invoice" using the following date.
+     *  @param  string      $openinghours   Specify hour strat and hour end for the select ex 8,20
+     *  @param  int         $stepminutes    Specify step for minutes between 1 and 30
 	 * 	@return string                      Html for selectDate
 	 *  @see    form_date(), select_month(), select_year(), select_dayofweek()
 	 */
-    public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '')
+    public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '', $openinghours = '', $stepminutes = 1)
 	{
 		global $conf,$langs;
 
@@ -5248,6 +5250,7 @@ class Form
 		if ($m == '') $m=0;
 		$emptydate=0;
 		$emptyhours=0;
+        if ($stepminutes<=0 || $stepminutes>30) $stepminutes = 1;
 		if ($empty == 1) { $emptydate=1; $emptyhours=1; }
 		if ($empty == 2) { $emptydate=0; $emptyhours=1; }
 		$orig_set_time=$set_time;
@@ -5468,10 +5471,18 @@ class Form
 
 		if ($h)
 		{
+			$hourstart = 0;
+			$hourend = 24;
+			if ($openinghours != '') {
+				$openinghours = explode(',', $openinghours);
+				$hourstart = $openinghours[0];
+				$hourend = $openinghours[1];
+				if ($hourend<$hourstart) $hourend = $hourstart;
+			}
 			// Show hour
 			$retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50 '.($fullday?$fullday.'hour':'').'" id="'.$prefix.'hour" name="'.$prefix.'hour">';
 			if ($emptyhours) $retstring.='<option value="-1">&nbsp;</option>';
-			for ($hour = 0; $hour < 24; $hour++)
+			for ($hour = $hourstart; $hour < $hourend; $hour++)
 			{
 				if (strlen($hour) < 2) $hour = "0" . $hour;
 				$retstring.='<option value="'.$hour.'"'.(($hour == $shour)?' selected':'').'>'.$hour.(empty($conf->dol_optimize_smallscreen)?'':'H').'</option>';
@@ -5485,7 +5496,7 @@ class Form
 			// Show minutes
 			$retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50 '.($fullday?$fullday.'min':'').'" id="'.$prefix.'min" name="'.$prefix.'min">';
 			if ($emptyhours) $retstring.='<option value="-1">&nbsp;</option>';
-			for ($min = 0; $min < 60 ; $min++)
+			for ($min = 0; $min < 60 ; $min+=$stepminutes)
 			{
 				if (strlen($min) < 2) $min = "0" . $min;
 				$retstring.='<option value="'.$min.'"'.(($min == $smin)?' selected':'').'>'.$min.(empty($conf->dol_optimize_smallscreen)?'':'').'</option>';

From aa92bfd1e0a42fea433c2668ebc44533b895d404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 17 Jun 2019 15:31:48 +0200
Subject: [PATCH 026/133] Update bom_card.php

---
 htdocs/bom/bom_card.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index c2ed2ca6705..d788be5354a 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -173,7 +173,6 @@ if (empty($reshook))
 			$action = '';
 		}
 	}
-
 }
 
 

From c62f37095909cc179b3c1b10fdf120b85e2fb395 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Mon, 17 Jun 2019 16:30:56 +0200
Subject: [PATCH 027/133] FIX: Wrong stock movement on supplier credit notes

---
 htdocs/fourn/class/fournisseur.facture.class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 3a27690e7ac..f96caf89207 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2016	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2015		Bahfir Abbes			<bafbes@gmail.com>
- * Copyright (C) 2015		Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2015-2019	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Alexandre Spangaro		<aspangaro@zendsi.com>
  * Copyright (C) 2018           Nicolas ZABOURI			<info@inovea-conseil.com>
  *
@@ -1318,7 +1318,8 @@ class FactureFournisseur extends CommonInvoice
                         // We increase stock for product
                         $up_ht_disc=$this->lines[$i]->pu_ht;
                         if (! empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc=price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
-                        $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr",$num));
+                        if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr",$num));
+                        else $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr",$num));
                         if ($result < 0) { $error++; }
                         unset($this->line);
                     }
@@ -1441,7 +1442,8 @@ class FactureFournisseur extends CommonInvoice
                         $mouvP = new MouvementStock($this->db);
                         $mouvP->origin = &$this;
 						// We increase stock for product
-                        $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
+						if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
+                        else $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
                     }
                 }
             }

From 80d4d8754d5e548902878c50fca8a7571349e2a2 Mon Sep 17 00:00:00 2001
From: Eric Seigne <1468823+rycks@users.noreply.github.com>
Date: Mon, 17 Jun 2019 18:28:11 +0200
Subject: [PATCH 028/133] allow zero as accountancy code nomber (replace all
 empty tests by != '')

---
 .../accountancy/bookkeeping/listbyaccount.php |  2 +-
 htdocs/accountancy/class/lettering.class.php  | 30 +++++++++---------
 htdocs/accountancy/journal/bankjournal.php    | 14 ++++-----
 .../journal/expensereportsjournal.php         | 14 ++++-----
 .../accountancy/journal/purchasesjournal.php  |  2 +-
 htdocs/accountancy/journal/sellsjournal.php   | 14 ++++-----
 htdocs/compta/journal/purchasesjournal.php    |  4 +--
 htdocs/compta/journal/sellsjournal.php        |  2 +-
 .../core/class/html.formaccounting.class.php  |  2 +-
 htdocs/core/lib/accounting.lib.php            | 31 ++++++++++++++-----
 .../societe/mod_codecompta_panicum.php        |  4 +--
 htdocs/societe/class/societe.class.php        |  4 +--
 12 files changed, 70 insertions(+), 53 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index d1ef1377994..bacfdcb714a 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -348,7 +348,7 @@ while ($i < min($num, $limit))
 		$colspan = 9;
 		print "<tr>";
 		print '<td colspan="'.$colspan.'" style="font-weight:bold; border-bottom: 1pt solid black;">';
-		if (! empty($line->numero_compte) && $line->numero_compte != '-1') print length_accountg($line->numero_compte) . ' : ' . $object->get_compte_desc($line->numero_compte);
+		if ($line->numero_compte != "" && $line->numero_compte != '-1') print length_accountg($line->numero_compte) . ' : ' . $object->get_compte_desc($line->numero_compte);
 		else print '<span class="error">'.$langs->trans("Unknown").'</span>';
 		print '</td>';
 		print '</tr>';
diff --git a/htdocs/accountancy/class/lettering.class.php b/htdocs/accountancy/class/lettering.class.php
index a0c977a8d5a..2a89c6c1c96 100644
--- a/htdocs/accountancy/class/lettering.class.php
+++ b/htdocs/accountancy/class/lettering.class.php
@@ -67,11 +67,11 @@ class Lettering extends BookKeeping
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
 		$sql .= " LEFT JOIN  " . MAIN_DB_PREFIX . "bank_url as bu ON(bk.fk_doc = bu.fk_bank AND bu.type IN ('payment', 'payment_supplier') ) ";
 		$sql .= " WHERE ( ";
-		if (! empty($object->code_compta))
+		if ($object->code_compta != "")
 			$sql .= " bk.subledger_account = '" . $object->code_compta . "'  ";
-		if (! empty($object->code_compta) && ! empty($object->code_compta_fournisseur))
+		if ($object->code_compta != "" && $object->code_compta_fournisseur != "")
 			$sql .= " OR ";
-		if (! empty($object->code_compta_fournisseur))
+		if ($object->code_compta_fournisseur != "")
 			$sql .= " bk.subledger_account = '" . $object->code_compta_fournisseur . "' ";
 
 		$sql .= " ) AND (bk.date_lettering ='' OR bk.date_lettering IS NULL) ";
@@ -99,13 +99,13 @@ class Lettering extends BookKeeping
 					$sql .= " AND facf.entity = ".$conf->entity;
 					$sql .= " AND code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=4 AND entity=".$conf->entity.") ";
 					$sql .= " AND ( ";
-					if (! empty($object->code_compta)) {
+					if ($object->code_compta != "") {
 						$sql .= "  bk.subledger_account = '" . $object->code_compta . "'  ";
 					}
-					if (! empty($object->code_compta) && ! empty($object->code_compta_fournisseur)) {
+					if ($object->code_compta != "" && $object->code_compta_fournisseur != "") {
 						$sql .= "  OR  ";
 					}
-					if (! empty($object->code_compta_fournisseur)) {
+					if ($object->code_compta_fournisseur != "") {
 						$sql .= "   bk.subledger_account = '" . $object->code_compta_fournisseur . "' ";
 					}
 					$sql .= " )  ";
@@ -127,13 +127,13 @@ class Lettering extends BookKeeping
 						$sql .= " WHERE bk.code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=3 AND entity=".$conf->entity.") ";
 						$sql .= " AND facf.entity = ".$conf->entity;
 						$sql .= " AND ( ";
-						if (! empty($object->code_compta)) {
+						if ($object->code_compta != "") {
 							$sql .= " bk.subledger_account = '" . $object->code_compta . "'  ";
 						}
-						if (! empty($object->code_compta) && ! empty($object->code_compta_fournisseur)) {
+						if ($object->code_compta != "" && $object->code_compta_fournisseur != "") {
 							$sql .= " OR ";
 						}
-						if (! empty($object->code_compta_fournisseur)) {
+						if ($object->code_compta_fournisseur != "") {
 							$sql .= " bk.subledger_account = '" . $object->code_compta_fournisseur . "' ";
 						}
 						$sql .= ") ";
@@ -159,13 +159,13 @@ class Lettering extends BookKeeping
 					$sql .= " AND bk.code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=4 AND entity=".$conf->entity.") ";
 					$sql .= " AND fac.entity IN (".getEntity('invoice', 0).")";// We don't share object for accountancy
 					$sql .= " AND ( ";
-					if (! empty($object->code_compta)) {
+					if ($object->code_compta != "") {
 						$sql .= "  bk.subledger_account = '" . $object->code_compta . "'  ";
 					}
-					if (! empty($object->code_compta) && ! empty($object->code_compta_fournisseur)) {
+					if ($object->code_compta != "" && $object->code_compta_fournisseur != "") {
 						$sql .= "  OR  ";
 					}
-					if (! empty($object->code_compta_fournisseur)) {
+					if ($object->code_compta_fournisseur != "") {
 						$sql .= "   bk.subledger_account = '" . $object->code_compta_fournisseur . "' ";
 					}
 					$sql .= " )  ";
@@ -187,13 +187,13 @@ class Lettering extends BookKeeping
 						$sql .= " WHERE code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=2 AND entity=".$conf->entity.") ";
 						$sql .= " AND fac.entity IN (".getEntity('invoice', 0).")";// We don't share object for accountancy
 						$sql .= " AND ( ";
-						if (! empty($object->code_compta)) {
+						if ($object->code_compta != "") {
 							$sql .= "  bk.subledger_account = '" . $object->code_compta . "'  ";
 						}
-						if (! empty($object->code_compta) && ! empty($object->code_compta_fournisseur)) {
+						if ($object->code_compta != "" && $object->code_compta_fournisseur != "") {
 							$sql .= "  OR  ";
 						}
-						if (! empty($object->code_compta_fournisseur)) {
+						if ($object->code_compta_fournisseur != "") {
 							$sql .= "   bk.subledger_account = '" . $object->code_compta_fournisseur . "' ";
 						}
 						$sql .= " )  ";
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index e4e07831b44..0f22789d630 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -171,8 +171,8 @@ if ($result) {
 	//print $sql;
 
 	// Variables
-	$account_supplier			= (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : 'NotDefined');	// NotDefined is a reserved word
-	$account_customer			= (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined');	// NotDefined is a reserved word
+	$account_supplier			= (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER != "") ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : 'NotDefined');	// NotDefined is a reserved word
+	$account_customer			= ($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined');	// NotDefined is a reserved word
 	$account_employee			= (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined');	// NotDefined is a reserved word
 	$account_pay_vat			= (! empty($conf->global->ACCOUNTING_VAT_PAY_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT : 'NotDefined');	// NotDefined is a reserved word
 	$account_pay_donation		= (! empty($conf->global->DONATION_ACCOUNTINGACCOUNT) ? $conf->global->DONATION_ACCOUNTINGACCOUNT : 'NotDefined');	// NotDefined is a reserved word
@@ -218,7 +218,7 @@ if ($result) {
 		// Set accountancy code for thirdparty
 		$compta_soc = 'NotDefined';
 		if ($lineisapurchase > 0)
-			$compta_soc = (! empty($obj->code_compta_fournisseur) ? $obj->code_compta_fournisseur : $account_supplier);
+			$compta_soc = (($obj->code_compta_fournisseur != "") ? $obj->code_compta_fournisseur : $account_supplier);
 		if ($lineisasale > 0)
 			$compta_soc = (! empty($obj->code_compta) ? $obj->code_compta : $account_customer);
 
@@ -938,8 +938,8 @@ if (empty($action) || $action == 'view') {
 
 
 	// Button to write into Ledger
-	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
-		|| empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1'
+	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
+		|| ($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1'
 		|| empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') {
 		print '<br>'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
 		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
@@ -950,8 +950,8 @@ if (empty($action) || $action == 'view') {
 
 	if (! empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
 
-	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
-	    || empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
+	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
+	    || ($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
 	   print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
 	}
 	else {
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 4c50015a2ba..d82381533cf 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -444,10 +444,10 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 
 	foreach ($taber as $key => $val) {
 	  $date = dol_print_date($val["date"], 'day');
-	  
+
 	  $userstatic->id = $tabuser[$key]['id'];
 	  $userstatic->name = $tabuser[$key]['name'];
-	  
+
 	  // Fees
 	  foreach ($tabht[$key] as $k => $mt) {
 	    $accountingaccount = new AccountingAccount($db);
@@ -474,7 +474,7 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	      print "\n";
 	    }
 	  }
-	  
+
 	  // Third party
 	  foreach ($tabttc[$key] as $k => $mt) {
 	    print '"' . $date . '"' . $sep;
@@ -585,7 +585,7 @@ if (empty($action) || $action == 'view') {
 				// Account
 				print "<td>";
 				$accountoshow = length_accountg($k);
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				if (($accountoshow == "") || $accountoshow == 'NotDefined')
 				{
 					print '<span class="error">'.$langs->trans("FeeAccountNotDefined").'</span>';
 				}
@@ -615,7 +615,7 @@ if (empty($action) || $action == 'view') {
 			// Account
 			print "<td>";
 			$accountoshow = length_accounta($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT);
-			if (empty($accountoshow) || $accountoshow == 'NotDefined')
+			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("MainAccountForUsersNotDefined").'</span>';
 			}
@@ -624,7 +624,7 @@ if (empty($action) || $action == 'view') {
 			// Subledger account
 			print "<td>";
 			$accountoshow = length_accounta($k);
-			if (empty($accountoshow) || $accountoshow == 'NotDefined')
+			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("UserAccountNotDefined").'</span>';
 			}
@@ -652,7 +652,7 @@ if (empty($action) || $action == 'view') {
 				// Account
 				print "<td>";
 				$accountoshow = length_accountg($k);
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				if (($accountoshow == "") || $accountoshow == 'NotDefined')
 				{
 					print '<span class="error">'.$langs->trans("VATAccountNotDefined").'</span>';
 				}
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index cab5069e1f8..cd82e9f2f27 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -749,7 +749,7 @@ if (empty($action) || $action == 'view') {
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 	if (! empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
-	if (empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
+	if (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
 	}
 	else {
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 8f82fd95afb..3b0607d34a7 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -146,7 +146,7 @@ if ($result) {
 	$num = $db->num_rows($result);
 
 	// Variables
-	$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined';
+	$cptcli = (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "")) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined';
 	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : 'NotDefined';
 
 	$i = 0;
@@ -679,14 +679,14 @@ if (empty($action) || $action == 'view') {
 	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
 	// Button to write into Ledger
-	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
+	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
 		print '<br>';
 		print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
 		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 	if (! empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
-	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
+	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
 	}
 	else {
@@ -813,7 +813,7 @@ if (empty($action) || $action == 'view') {
 				// Account
 				print "<td>";
 				$accountoshow = length_accounta($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER);
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				if (($accountoshow == "") || $accountoshow == 'NotDefined')
 				{
 					print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
 				}
@@ -822,7 +822,7 @@ if (empty($action) || $action == 'view') {
 				// Subledger account
 				print "<td>";
 				$accountoshow = length_accounta($k);
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				if (($accountoshow == "") || $accountoshow == 'NotDefined')
 				{
 					print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 				}
@@ -849,7 +849,7 @@ if (empty($action) || $action == 'view') {
 				// Account
 				print "<td>";
 				$accountoshow = length_accountg($k);
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				if (($accountoshow == "") || $accountoshow == 'NotDefined')
 				{
 					print '<span class="error">'.$langs->trans("ProductNotDefined").'</span>';
 				}
@@ -884,7 +884,7 @@ if (empty($action) || $action == 'view') {
 					// Account
 					print "<td>";
 					$accountoshow = length_accountg($k);
-					if (empty($accountoshow) || $accountoshow == 'NotDefined')
+					if (($accountoshow == "") || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Sale").')'.'</span>';
 					}
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index cd3bf06f43a..5b4e54fd807 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -123,7 +123,7 @@ if ($result)
 {
 	$num = $db->num_rows($result);
 	// les variables
-	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)?$conf->global->ACCOUNTING_ACCOUNT_SUPPLIER:$langs->trans("CodeNotDef"));
+	$cptfour = (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER != "")?$conf->global->ACCOUNTING_ACCOUNT_SUPPLIER:$langs->trans("CodeNotDef"));
 	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)?$conf->global->ACCOUNTING_VAT_BUY_ACCOUNT:$langs->trans("CodeNotDef"));
 
 	$tabfac = array();
@@ -139,7 +139,7 @@ if ($result)
 	{
 		$obj = $db->fetch_object($result);
 		// contrôles
-		$compta_soc = (! empty($obj->code_compta_fournisseur)?$obj->code_compta_fournisseur:$cptfour);
+		$compta_soc = (($obj->code_compta_fournisseur != "")?$obj->code_compta_fournisseur:$cptfour);
 		$compta_prod = $obj->accountancy_code_buy;
 		if (empty($compta_prod))
 		{
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index fe51665163e..123bb3c7770 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -146,7 +146,7 @@ if ($result)
    	{
    	    $obj = $db->fetch_object($result);
    	    // les variables
-   	    $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)?$conf->global->ACCOUNTING_ACCOUNT_CUSTOMER:$langs->trans("CodeNotDef"));
+   	    $cptcli = (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "")?$conf->global->ACCOUNTING_ACCOUNT_CUSTOMER:$langs->trans("CodeNotDef"));
    	    $compta_soc = (! empty($obj->code_compta)?$obj->code_compta:$cptcli);
 		$compta_prod = $obj->accountancy_code_sell;
 		if (empty($compta_prod))
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 87b32902684..cf95e471ddd 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -392,7 +392,7 @@ class FormAccounting extends Form
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
-				if (!empty($obj->code_compta_fournisseur)) {
+				if ($obj->code_compta_fournisseur != "") {
 					$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' ('.$obj->nom.')';
 				}
 			}
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 889d9da8a2c..4b5345da62b 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
  * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2019      Eric Seigne         <eric.seigne@cap-rel.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +24,22 @@
  * 	\brief		Library of accountancy functions
  */
 
+ /**
+  *	Check if a value is empty with some options
+  *
+	*	@param	allow_false : setting this to true will make the function consider a boolean value of false as NOT empty. This parameter is false by default.
+	*	@param	allow_ws :    setting this to true will make the function consider a string with nothing but white space as NOT empty. This parameter is false by default.
+  *	@return	array				  Bool
+	* @author Michael - https://www.php.net/manual/fr/function.empty.php#90767
+  */
+	function is_empty($var, $allow_false = false, $allow_ws = false) {
+		if (!isset($var) || is_null($var) || ($allow_ws == false && trim($var) == "" && !is_bool($var)) || ($allow_false === false && is_bool($var) && $var === false) || (is_array($var) && empty($var))) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
 /**
  *	Prepare array with list of tabs
  *
@@ -75,12 +92,12 @@ function length_accountg($account)
 {
 	global $conf;
 
-	if ($account < 0 || empty($account)) return '';
+	if ($account < 0 || is_empty($account)) return '';
 
-	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
+	if (! is_empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
 
 	$g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;
-	if (! empty($g)) {
+	if (! is_empty($g)) {
 		// Clean parameters
 		$i = strlen($account);
 
@@ -110,12 +127,12 @@ function length_accounta($accounta)
 {
 	global $conf;
 
-	if ($accounta < 0 || empty($accounta)) return '';
+	if ($accounta < 0 || is_empty($accounta)) return '';
 
-	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
+	if (! is_empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
 
 	$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
-	if (! empty($a)) {
+	if (! is_empty($a)) {
 		// Clean parameters
 		$i = strlen($accounta);
 
@@ -158,7 +175,7 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
 
     print "\n\n<!-- debut cartouche journal -->\n";
 
-    if(! empty($varlink)) $varlink = '?'.$varlink;
+    if(! is_empty($varlink)) $varlink = '?'.$varlink;
 
     $head=array();
     $h=0;
diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php
index 4c5ffcd66c5..f3106cef761 100644
--- a/htdocs/core/modules/societe/mod_codecompta_panicum.php
+++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php
@@ -96,8 +96,8 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 		$this->code='';
 
 		if (is_object($societe)) {
-			if ($type == 'supplier') $this->code = (! empty($societe->code_compta_fournisseur)?$societe->code_compta_fournisseur:'');
-			else $this->code = (! empty($societe->code_compta)?$societe->code_compta:'');
+			if ($type == 'supplier') $this->code = (($societe->code_compta_fournisseur != "")?$societe->code_compta_fournisseur:'');
+			else $this->code = (($societe->code_compta != "")?$societe->code_compta:'');
 		}
 
 		return 0; // return ok
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 84bda8abd54..ce7617f003d 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -928,7 +928,7 @@ class Societe extends CommonObject
 		if (! empty($allowmodcodefournisseur) && ! empty($this->fournisseur))
 		{
 			// Attention get_codecompta peut modifier le code suivant le module utilise
-			if (empty($this->code_compta_fournisseur))
+			if ($this->code_compta_fournisseur == "")
 			{
 				$ret=$this->get_codecompta('supplier');
 				if ($ret < 0) return -1;
@@ -1085,7 +1085,7 @@ class Societe extends CommonObject
 			if ($supplier)
 			{
 				$sql .= ", code_fournisseur = ".(! empty($this->code_fournisseur)?"'".$this->db->escape($this->code_fournisseur)."'":"null");
-				$sql .= ", code_compta_fournisseur = ".(! empty($this->code_compta_fournisseur)?"'".$this->db->escape($this->code_compta_fournisseur)."'":"null");
+				$sql .= ", code_compta_fournisseur = ".(($this->code_compta_fournisseur != "")?"'".$this->db->escape($this->code_compta_fournisseur)."'":"null");
 			}
 			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id:"null");
 			$sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;

From e4f5ca79f8d20ddff3c8b5d305c78d4bba9c9a96 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 17 Jun 2019 19:36:21 +0200
Subject: [PATCH 029/133] Fix access category API

---
 htdocs/categories/class/api_categories.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index c82d803f31c..c389e1b63d1 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -86,7 +86,7 @@ class Categories extends DolibarrApi
             throw new RestException(404, 'category not found');
         }
 
-        if ( ! DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
+        if ( ! DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 

From 27c928d9d9f5685c2b6da463ae8ba652f649ad9a Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 17 Jun 2019 20:53:10 +0200
Subject: [PATCH 030/133] NEW list of measuring units API

---
 htdocs/api/class/api_setup.class.php | 61 ++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 783ec6540e3..a38a7cd83c2 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2017	Regis Houssin	        <regis.houssin@inodbox.com>
  * Copyright (C) 2017	Neil Orley	            <neil.orley@oeris.fr>
  * Copyright (C) 2018   Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019   Thibault FOUCART        <support@ptibogxiv.net>
  *
  *
  * This program is free software; you can redistribute it and/or modify
@@ -707,6 +708,66 @@ class Setup extends DolibarrApi
         return $list;
     }
 
+    /**
+     * Get the list of measuring units.
+     *
+     * @param string    $sortfield  Sort field
+     * @param string    $sortorder  Sort order
+     * @param int       $limit      Number of items per page
+     * @param int       $page       Page number (starting from zero)
+     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+     * @return List of events types
+     *
+     * @url     GET dictionary/units
+     *
+     * @throws RestException
+     */
+    public function getListOfMeasuringUnits($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+    {
+        $list = array();
+        //TODO link with multicurrency module
+        $sql = "SELECT t.rowid, t.code, t.label,t.short_label, t.active, t.scale, t.unit_type";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_units as t";
+        $sql.= " WHERE t.active = ".$active;
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+
+        $sql.= $this->db->order($sortfield, $sortorder);
+
+        if ($limit) {
+            if ($page < 0) {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql .= $this->db->plimit($limit, $offset);
+        }
+
+        $result = $this->db->query($sql);
+
+        if ($result) {
+            $num = $this->db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
+                $list[] = $this->db->fetch_object($result);
+            }
+        } else {
+            throw new RestException(503, 'Error when retrieving list of measuring units: '.$this->db->lasterror());
+        }
+
+        return $list;
+    }
+
      /**
      * Get the list of tickets categories.
      *

From f1d64ad164152252a9cb901a966493e6b82aeb1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 17 Jun 2019 23:02:54 +0200
Subject: [PATCH 031/133] Update peruser.php

---
 htdocs/comm/action/peruser.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 754cb736bc9..d4020f4df92 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -1186,33 +1186,34 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			}
 		}
 
-		$ids1='';$ids2='';
-		if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1=join(',', array_keys($cases1[$h]));
-		if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2=join(',', array_keys($cases2[$h]));
+		$ids1='';
+        $ids2='';
+		if (is_array($cases1[$h]) && count($cases1[$h]) && array_keys($cases1[$h])) $ids1=join(',', array_keys($cases1[$h]));
+		if (is_array($cases2[$h]) && count($cases2[$h]) && array_keys($cases2[$h])) $ids2=join(',', array_keys($cases2[$h]));
 
 		if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
 		else echo '<td class="'.$style.' cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
-		if (count($cases1[$h]) == 1)	// only 1 event
+		if (is_array($cases1[$h]) && count($cases1[$h]) == 1)	// only 1 event
 		{
 			$output = array_slice($cases1[$h], 0, 1);
 			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
 			if ($output[0]['string']) $title1.=($title1?' - ':'').$output[0]['string'];
 			if ($output[0]['color']) $color1 = $output[0]['color'];
 		}
-		elseif (count($cases1[$h]) > 1)
+		elseif (is_array($cases1[$h]) && count($cases1[$h]) > 1)
 		{
 			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
 			$color1='222222';
 		}
 
-		if (count($cases2[$h]) == 1)	// only 1 event
+		if (is_array($cases2[$h]) && count($cases2[$h]) == 1)	// only 1 event
 		{
 			$output = array_slice($cases2[$h], 0, 1);
 			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
 			if ($output[0]['string']) $title2.=($title2?' - ':'').$output[0]['string'];
 			if ($output[0]['color']) $color2 = $output[0]['color'];
 		}
-		elseif (count($cases2[$h]) > 1)
+		elseif (is_array($cases2[$h]) && count($cases2[$h]) > 1)
 		{
 			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
 			$color2='222222';

From fd263cb316b34100ec1c4bd0d76a858b0fb0f0fe Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 18 Jun 2019 07:15:59 +0200
Subject: [PATCH 032/133] FIX add v10 in virtualmin script

---
 build/perl/virtualmin/dolibarr.pl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index a28fc430caa..343cebc6abe 100644
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
-# \author       (c)2009-2018 Regis Houssin  <regis.houssin@inodbox.com>
+# \author       (c)2009-2019 Regis Houssin  <regis.houssin@inodbox.com>
 #----------------------------------------------------------------------------
 
 
@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "9.0.0", "8.0.3", "7.0.4", "6.0.8", "5.0.7" );
+return ( "10.0.0", "9.0.3", "8.0.5", "7.0.5", "6.0.8" );
 }
 
 sub script_dolibarr_release
@@ -390,6 +390,7 @@ sub script_dolibarr_check_latest
 {
 local ($ver) = @_;
 local @vers = &osdn_package_versions("dolibarr",
+				$ver >= 10.0 ? "dolibarr\\-(10\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 9.0 ? "dolibarr\\-(9\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 8.0 ? "dolibarr\\-(8\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 7.0 ? "dolibarr\\-(7\\.0\\.[0-9\\.]+)\\.tgz" :

From 96c699482791ebd62614a0209849057799cdb924 Mon Sep 17 00:00:00 2001
From: Nicolas ZABOURI <info@inovea-conseil.com>
Date: Tue, 18 Jun 2019 10:55:16 +0200
Subject: [PATCH 033/133] =?UTF-8?q?FIX=202=20d=C3=A9clarations=20of=20date?=
 =?UTF-8?q?=5Fvalid=20in=20SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/install/mysql/tables/llx_bom_bom.sql | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_bom_bom.sql b/htdocs/install/mysql/tables/llx_bom_bom.sql
index 9c6e014586d..11e1ce74ffd 100644
--- a/htdocs/install/mysql/tables/llx_bom_bom.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bom.sql
@@ -27,10 +27,9 @@ CREATE TABLE llx_bom_bom(
 	qty double(24,8),
 	efficiency double(8,4) DEFAULT 1,
 	date_creation datetime NOT NULL,
-	date_valid datetime NOT NULL, 
+	date_valid datetime,
 	tms timestamp, 
-	date_valid datetime, 
-	fk_user_creat integer NOT NULL, 
+	fk_user_creat integer NOT NULL,
 	fk_user_modif integer, 
 	fk_user_valid integer, 
 	import_key varchar(14), 

From 820c420ae5221f0d96a19624a72828c28e7cdd45 Mon Sep 17 00:00:00 2001
From: ICstage <stagiaire@inovea-conseil.com>
Date: Tue, 18 Jun 2019 14:07:52 +0200
Subject: [PATCH 034/133] FIX Missing hooks

---
 htdocs/adherents/index.php         | 15 ++++++++++++---
 htdocs/comm/index.php              |  9 +++++++++
 htdocs/comm/mailing/index.php      |  9 +++++++++
 htdocs/comm/propal/index.php       |  9 +++++++++
 htdocs/commande/index.php          |  8 ++++++++
 htdocs/compta/charges/index.php    | 12 +++++++++++-
 htdocs/compta/index.php            |  7 ++++++-
 htdocs/contrat/index.php           |  8 ++++++++
 htdocs/don/index.php               |  8 ++++++++
 htdocs/expedition/index.php        |  9 +++++++++
 htdocs/expensereport/index.php     | 11 ++++++++++-
 htdocs/fichinter/index.php         | 11 +++++++++--
 htdocs/fourn/commande/index.php    | 15 ++++++++++++---
 htdocs/hrm/index.php               |  8 ++++++++
 htdocs/mrp/index.php               | 15 ++++++++++++---
 htdocs/opensurvey/index.php        | 12 +++++++++++-
 htdocs/product/index.php           |  4 ++++
 htdocs/product/stock/index.php     |  9 +++++++++
 htdocs/projet/activity/index.php   |  9 +++++++++
 htdocs/projet/index.php            |  9 +++++++++
 htdocs/reception/index.php         | 16 ++++++++++++----
 htdocs/societe/index.php           | 11 ++++++++++-
 htdocs/supplier_proposal/index.php |  9 +++++++++
 htdocs/ticket/index.php            | 11 ++++++++++-
 htdocs/user/home.php               |  5 +++++
 25 files changed, 228 insertions(+), 21 deletions(-)

diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 1d1232a9d58..481a8e8fffd 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
- * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2003		Jean-Louis Bergamo	<jlb@j1b.org>
+ * Copyright (C) 2004-2017	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2019           Nicolas ZABOURI         <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +30,11 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('membersindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array("companies","members"));
 
@@ -435,6 +441,9 @@ print "</div>";
 
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardUsersGroups', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 651d2c54ec7..15e4e226587 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,6 +38,11 @@ if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn
 
 if (! $user->rights->societe->lire) accessforbidden();
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('commercialindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array("commercial", "propal"));
 
@@ -897,6 +903,9 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardCommercials', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index c5d8bc47232..a835ca241a3 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010      Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +28,11 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT .'/comm/mailing/class/mailing.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('mailingindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array('commercial', 'orders'));
 
@@ -207,6 +213,9 @@ if ($langs->file_exists("html/spam.html", 0)) {
     print '<br>';
 }
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardEmailings', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index e69dbbc8b6c..309712ae76b 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +28,11 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT .'/comm/propal/class/propal.class.php';
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('proposalindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array('propal', 'companies'));
 
@@ -540,6 +546,9 @@ if (! empty($conf->propal->enabled))
 //print '</td></tr></table>';
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardPropals', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index c0091b43af0..a0e87bf63a3 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,6 +32,11 @@ require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php';
 
 if (!$user->rights->commande->lire) accessforbidden();
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('ordersindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'bills'));
 
@@ -478,6 +484,8 @@ if (! empty($conf->commande->enabled))
 
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardOrders', $parameters, $object); // Note that $action and $object may have been modified by hook
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 33a06e09136..4b62a98b80b 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -3,8 +3,9 @@
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011-2016 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2011-2014 Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2011-2014 Juanjo Menent	<jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +35,12 @@ require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
+
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('specialexpensesindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills'));
 
@@ -568,6 +575,9 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
 
 print '</form>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardSpecialBills', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index c57b073b487..932d9ed758c 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -2,10 +2,11 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015-2016 Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2015-2016 Juanjo Menent	<jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,6 +64,7 @@ if ($user->societe_id > 0)
 
 $max=3;
 
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager->initHooks(array('invoiceindex'));
 
 /*
@@ -1080,6 +1082,9 @@ if ($resql)
 
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardAccountancy', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 10c2e2915b9..3bf047c87c8 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +29,11 @@ require "../main.inc.php";
 require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
 require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('contractindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'companies', 'contracts'));
 
@@ -609,6 +615,8 @@ else
 //print '</td></tr></table>';
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardContracts', $parameters, $object); // Note that $action and $object may have been modified by hook
 
 llxFooter();
 
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index d632f316a25..4af0f0d81b0 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2002  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2019       Nicolas ZABOURI         <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +27,11 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('donationindex'));
+
 $langs->load("donations");
 
 // Security check
@@ -238,6 +244,8 @@ else dol_print_error($db);
 
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardDonation', $parameters, $object); // Note that $action and $object may have been modified by hook
 
 llxFooter();
 
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index bbb5ef58c36..61838cc321b 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +28,11 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('sendingindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'sendings'));
 
@@ -291,6 +297,9 @@ else dol_print_error($db);
 
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardWarehouseSendings', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index f7d4e2a8405..461a7aec4fe 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -3,7 +3,8 @@
  * Copyright (C) 2004-2015	Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004		Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2011	Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015       Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2015           Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2019           Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +31,11 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('expensereportindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'users', 'trips'));
 
@@ -230,6 +236,9 @@ else dol_print_error($db);
 
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardExpenseReport', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index d240aadf42d..f97c99dc839 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -2,8 +2,8 @@
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015	   Charlie Benke		<charlie@patas-monkey.com>
-
+ * Copyright (C) 2015	   Charlie Benke        <charlie@patas-monkey.com>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,6 +32,11 @@ require_once DOL_DOCUMENT_ROOT .'/fichinter/class/fichinter.class.php';
 
 if (!$user->rights->ficheinter->lire) accessforbidden();
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('interventionindex'));
+
 // Load translation files required by the page
 $langs->load("interventions");
 
@@ -356,6 +361,8 @@ if (! empty($conf->ficheinter->enabled))
 
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardInterventions', $parameters, $object); // Note that $action and $object may have been modified by hook
 
 llxFooter();
 
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 6c2b66bc7f3..e66054dc750 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) 2001-2006	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2012		Vinicius Nogueira		<viniciusvgn@gmail.com>
+ * Copyright (C) 2004-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2012		Vinicius Nogueira	<viniciusvgn@gmail.com>
+ * Copyright (C) 2019           Nicolas ZABOURI         <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +35,11 @@ $orderid = GETPOST('orderid');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('orderssuppliersindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array("suppliers", "orders"));
 
@@ -432,6 +438,9 @@ print "</table><br>";
 
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardOrdersSuppliers', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 066a21ebad0..0dad608a5a5 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2013-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2014	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2015-2016	Alexandre Spangaro	<aspangaro@open-dsi.fr>
+ * Copyright (C) 2019           Nicolas ZABOURI         <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,6 +37,9 @@ if ($conf->deplacement->enabled) require_once DOL_DOCUMENT_ROOT.'/compta/deplace
 if ($conf->expensereport->enabled) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 
+$hookmanager = new HookManager($db);
+$hookmanager->initHooks('hrmindex');
+
 // Load translation files required by the page
 $langs->loadLangs(array('users', 'holidays', 'trips', 'boxes'));
 
@@ -392,6 +396,10 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
 
 print '</div></div></div>';
 
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardHRM', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php
index c30d75b1d40..a587706dbb7 100644
--- a/htdocs/mrp/index.php
+++ b/htdocs/mrp/index.php
@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
- * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2003		Jean-Louis Bergamo	<jlb@j1b.org>
+ * Copyright (C) 2004-2017	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2019           Nicolas ZABOURI         <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +28,11 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('mrpindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array("companies","mrp"));
 
@@ -122,6 +128,9 @@ else
 
 print '</div></div></div>';
 
+$parameters = array('type' => $type, 'user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardBOM', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php
index 413572ca4f6..0a9e3483348 100644
--- a/htdocs/opensurvey/index.php
+++ b/htdocs/opensurvey/index.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
+ * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -32,6 +33,12 @@ if (!$user->rights->opensurvey->read) accessforbidden();
  * View
  */
 
+
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('opensurveyindex'));
+
  // Load translation files required by the page
 $langs->load("opensurvey");
 
@@ -78,6 +85,9 @@ print '</table>';
 
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardOpenSurvey', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 950f4d47b5f..fe93c4b5e6e 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2019       Pierre Ardoin           <mapiolca@me.com>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019       Nicolas ZABOURI         <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -397,6 +398,9 @@ if (! empty($conf->global->MAIN_SHOW_PRODUCT_ACTIVITY_TRIM))
 
 print '</div></div></div>';
 
+$parameters = array('type' => $type, 'user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardProductsServices', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index a19025b5dd6..a0b4895b669 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +28,11 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('stockindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array('stocks', 'productbatch'));
 
@@ -184,6 +190,9 @@ if ($resql)
 //print '</td></tr></table>';
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardWarehouse', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index b3fb66116bf..2148ba576d8 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010      Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,6 +40,11 @@ if ($user->societe_id > 0) $socid=$user->societe_id;
 //$result = restrictedArea($user, 'projet', $projectid);
 if (!$user->rights->projet->lire) accessforbidden();
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('activityindex'));
+
 // Load translation files required by the page
 $langs->load("projects");
 
@@ -573,6 +579,9 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S
 
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardActivities', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index fa77cb4b52c..da148c1eda6 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +31,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('projectsindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'companies'));
 
@@ -319,6 +325,9 @@ if (! empty($conf->global->PROJECT_SHOW_PROJECT_LIST_ON_PROJECT_AREA))
 
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardProjects', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index 3b0bb7a05e0..97e25ab39e5 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2018	   Quentin Vial-Gouteyron    <quentin.vial-gouteyron@atm-consulting.fr>
+/* Copyright (C) 2003-2005 Rodolphe Quiedeville     <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur      <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin            <regis.houssin@capnetworks.com>
+ * Copyright (C) 2018	   Quentin Vial-Gouteyron   <quentin.vial-gouteyron@atm-consulting.fr>
+ * Copyright (C) 2019      Nicolas ZABOURI          <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +29,11 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('receptionindex'));
+
 $langs->load("orders");
 $langs->load("receptions");
 
@@ -292,6 +298,8 @@ else dol_print_error($db);
 
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardWarehouseReceptions', $parameters, $object); // Note that $action and $object may have been modified by hook
 
 llxFooter();
 $db->close();
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 2404c11861e..d6df59f4740 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -2,9 +2,10 @@
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2014      Charles-Fr Benke	    <charles.fr@benke.fr>
+ * Copyright (C) 2014      Charles-Fr Benke	<charles.fr@benke.fr>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2016      Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2019	   Nicolas ZABOURI	<info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +30,11 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('thirdpartiesindex'));
+
 $langs->load("companies");
 
 $socid = GETPOST('socid', 'int');
@@ -366,6 +372,9 @@ else
 //print '</td></tr></table>';
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardThirdparties', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 5a2e6df2f29..d75d0c1647c 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +28,11 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT .'/supplier_proposal/class/supplier_proposal.class.php';
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('suppliersproposalsindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array('supplier_proposal', 'companies'));
 
@@ -375,6 +381,9 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
 
 print '</div></div></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardSupplierProposal', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index 824b1f1833e..09b8a208c3c 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) - 2013-2016     Jean-François FERRY    <hello@librethic.io>
+/* Copyright (C) - 2013-2016    Jean-François FERRY     <hello@librethic.io>
+ * Copyright (C) - 2019         Nicolas ZABOURI         <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +26,11 @@ require_once DOL_DOCUMENT_ROOT . '/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT . '/ticket/class/ticketstats.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/dolgraph.class.php';
 
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('ticketsindex'));
+
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'other', 'ticket'));
 
@@ -371,6 +377,9 @@ if ($result) {
 print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardTickets', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter('');
 $db->close();
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 9a7d0ab94fd..bc766f4dc4b 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2018	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2018	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2019           Nicolas ZABOURI         <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -286,6 +287,10 @@ if ($canreadperms)
 //print '</td></tr></table>';
 print '</div></div></div>';
 
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardUsersGroups', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();

From 492c3b5625f28f2fe117ed6c8041d9415a0eaac8 Mon Sep 17 00:00:00 2001
From: Nicolas ZABOURI <info@inovea-conseil.com>
Date: Tue, 18 Jun 2019 15:13:08 +0200
Subject: [PATCH 035/133] FIX hook

---
 htdocs/adherents/index.php | 2 +-
 htdocs/mrp/index.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 481a8e8fffd..3e26ae1ce3a 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -442,7 +442,7 @@ print "</div>";
 print '</div></div></div>';
 
 $parameters = array('user' => $user);
-$reshook = $hookmanager->executeHooks('dashboardUsersGroups', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('dashboardMembers', $parameters, $object); // Note that $action and $object may have been modified by hook
 
 // End of page
 llxFooter();
diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php
index a587706dbb7..325017c4fb7 100644
--- a/htdocs/mrp/index.php
+++ b/htdocs/mrp/index.php
@@ -129,7 +129,7 @@ else
 print '</div></div></div>';
 
 $parameters = array('type' => $type, 'user' => $user);
-$reshook = $hookmanager->executeHooks('dashboardBOM', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('dashboardMRP', $parameters, $object); // Note that $action and $object may have been modified by hook
 
 // End of page
 llxFooter();

From 181375ff958955a0bd55684d8e4cd97592811672 Mon Sep 17 00:00:00 2001
From: Nicolas ZABOURI <info@inovea-conseil.com>
Date: Tue, 18 Jun 2019 17:09:46 +0200
Subject: [PATCH 036/133] FIX travis space left

---
 htdocs/opensurvey/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php
index 0a9e3483348..6ed0f2148fa 100644
--- a/htdocs/opensurvey/index.php
+++ b/htdocs/opensurvey/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or

From 20e00ca2905f05474fb441d637c7eafb4029cdb2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jun 2019 19:41:16 +0200
Subject: [PATCH 037/133] FIX if last char of customercode is accent making the
 truncate of first chars wrong.

---
 htdocs/core/lib/functions2.lib.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 649988e785b..5d0f25892c8 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -716,8 +716,8 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     global $conf,$user;
 
     if (! is_object($objsoc)) $valueforccc=$objsoc;
-    else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) $valueforccc=$objsoc->code_fournisseur;
-    else $valueforccc=$objsoc->code_client;
+    else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) $valueforccc=dol_string_unaccent($objsoc->code_fournisseur);
+    else $valueforccc=dol_string_unaccent($objsoc->code_client);
 
     $sharetable = $table;
     if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function
@@ -965,6 +965,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     // Define $maskLike
     $maskLike = dol_string_nospecial($mask);
     $maskLike = str_replace("%","_",$maskLike);
+
     // Replace protected special codes with matching number of _ as wild card caracter
     $maskLike = preg_replace('/\{yyyy\}/i','____',$maskLike);
     $maskLike = preg_replace('/\{yy\}/i','__',$maskLike);
@@ -1140,7 +1141,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
         // Now we replace the refclient
         if ($maskrefclient)
         {
-            //print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
+            //print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskrefclient_clientcode=".$maskrefclient_clientcode."\n<br>";exit;
             $maskrefclient_maskbefore='{'.$maskrefclient.'}';
             $maskrefclient_maskafter=$maskrefclient_clientcode.str_pad($maskrefclient_counter,dol_strlen($maskrefclient_maskcounter),"0",STR_PAD_LEFT);
             $numFinal = str_replace($maskrefclient_maskbefore,$maskrefclient_maskafter,$numFinal);

From bcd5949bacffd3fdd722bc268e70d3556d5419e4 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 18 Jun 2019 21:39:30 +0200
Subject: [PATCH 038/133] Responsive on project index

---
 htdocs/projet/index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index fa77cb4b52c..38ef7ee7cf2 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -179,6 +179,7 @@ $sql.= $db->plimit($max, 0);
 $resql=$db->query($sql);
 if ($resql)
 {
+    print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="4">'.$langs->trans("LatestModifiedProjects", $max).'</th></tr>';
@@ -242,7 +243,7 @@ if ($resql)
 			$i++;
 		}
 	}
-	print "</table><br>";
+	print "</table></div><br>";
 }
 else dol_print_error($db);
 

From 30fb89ad5e55b520588327de1bea36f93c6a8d03 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 18 Jun 2019 22:03:29 +0200
Subject: [PATCH 039/133] Responsive HRM index

---
 htdocs/hrm/index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 066a21ebad0..54a0837e1fe 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -134,6 +134,7 @@ if (! empty($conf->holiday->enabled))
 	{
 		$user_id = $user->id;
 
+        print '<div class="div-table-responsive-no-min">';
 	    print '<table class="noborder nohover" width="100%">';
 	    print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Holidays").'</th></tr>';
 	    print "<tr ".$bc[0].">";
@@ -152,7 +153,7 @@ if (! empty($conf->holiday->enabled))
 
 	    print '</td>';
 	    print '</tr>';
-	    print '</table><br>';
+	    print '</table></div><br>';
 	}
 	elseif (! is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
 	{

From c59de4989455dfc1e438908c4c6d2bc49950e261 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 18 Jun 2019 22:38:52 +0200
Subject: [PATCH 040/133] Translate rights

---
 htdocs/core/class/html.formaccounting.class.php | 2 +-
 htdocs/core/lib/accounting.lib.php              | 2 +-
 htdocs/langs/en_US/admin.lang                   | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 87b32902684..7d9e778ac41 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -21,7 +21,7 @@
 
 /**
  *	\file       htdocs/core/class/html.formaccounting.class.php
- *  \ingroup    Advanced accountancy
+ *  \ingroup    Accountancy (Double entries)
  *	\brief      File of class with all html predefined components
  */
 require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 889d9da8a2c..e55083c4822 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -19,7 +19,7 @@
 
 /**
  * 	\file		htdocs/core/lib/accounting.lib.php
- * 	\ingroup	Advanced accountancy
+ * 	\ingroup	Accountancy (Double entries)
  * 	\brief		Library of accountancy functions
  */
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 5fc1994247c..5f69be03dba 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -885,6 +885,12 @@ Permission2802=Use FTP client in write mode (delete or upload files)
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls

From ce375440884d31c60a60e80e422870a966c8b47d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 18 Jun 2019 22:41:18 +0200
Subject: [PATCH 041/133] Translate rights

---
 htdocs/langs/en_US/admin.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 5f69be03dba..f26088f747c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries

From 4de0a57f5cc435afb5c1192e55bac6cf5753dff1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 18 Jun 2019 22:44:43 +0200
Subject: [PATCH 042/133] Translate rights

---
 htdocs/langs/en_US/admin.lang | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index f26088f747c..56a8381021e 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -883,6 +883,10 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+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.
+Permission10005=Delete website content
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions

From a0ae1e96a374e4e243b73f6b4f53757b49da3d5f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 18 Jun 2019 22:52:37 +0200
Subject: [PATCH 043/133] Translate rights

---
 htdocs/langs/en_US/admin.lang | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 56a8381021e..cfc244b0fe0 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -838,6 +838,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders

From 42b03ec85893b0083161abcafa33b7082e118209 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 18 Jun 2019 22:53:50 +0200
Subject: [PATCH 044/133] Translate rights

---
 htdocs/langs/en_US/admin.lang | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index cfc244b0fe0..60a80bb15bc 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -902,6 +902,10 @@ Permission50412=Write/Edit operations in ledger
 Permission50420=Report and export reports (turnover, balance, journals, ledger)
 Permission50430=Define and close a fiscal year
 Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls

From e1c476e744da16429c72e99b80263e844b0818dc Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 19 Jun 2019 05:48:04 +0200
Subject: [PATCH 045/133] Translate rights

---
 htdocs/langs/en_US/admin.lang | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 60a80bb15bc..0c4d7de3962 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -819,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations

From 9234a5446872983f6cfa4bf01f46234c1b17a445 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 19 Jun 2019 05:49:23 +0200
Subject: [PATCH 046/133] Translate rights

---
 htdocs/langs/en_US/admin.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0c4d7de3962..820fac9e2d4 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -892,6 +892,7 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
 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.

From f91c40a45c2907c9cd927330b9e58b8f4f8466c3 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 19 Jun 2019 06:00:11 +0200
Subject: [PATCH 047/133] Translate rights

---
 htdocs/langs/en_US/admin.lang | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 820fac9e2d4..c135fe86206 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -869,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -893,10 +883,24 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
 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.
 Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Delete leave requests
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Admin leave requests (setup and update balance)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions

From 13836d3e219514d5aaf84c1287fd9835c65d0634 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 19 Jun 2019 06:21:53 +0200
Subject: [PATCH 048/133] Missing language ley

---
 htdocs/core/modules/modSalaries.class.php | 2 +-
 htdocs/langs/en_US/salaries.lang          | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index e111e81ef6b..ed3aec4a48b 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -144,7 +144,7 @@ class modSalaries extends DolibarrModules
 
 		$r++;
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='Salaries and payments';
+		$this->export_label[$r]='SalariesAndPayments';
 		$this->export_permission[$r]=array(array("salaries","export"));
 		$this->export_fields_array[$r]=array('u.firstname'=>"Firstname",'u.lastname'=>"Lastname",'u.login'=>"Login",'u.salary'=>'CurrentSalary','p.datep'=>'DatePayment','p.datesp'=>'DateStartPeriod','p.dateep'=>'DateEndPeriod','p.amount'=>'AmountPayment','p.num_payment'=>'Numero','p.label'=>'Label','p.note'=>'Note');
 		$this->export_TypeFields_array[$r]=array('u.firstname'=>"Text",'u.lastname'=>"Text",'u.login'=>'Text','u.salary'=>"Numeric",'p.datep'=>'Date','p.datesp'=>'Date','p.dateep'=>'Date','p.amount'=>'Numeric','p.num_payment'=>'Numeric','p.label'=>'Text');
diff --git a/htdocs/langs/en_US/salaries.lang b/htdocs/langs/en_US/salaries.lang
index 1e3607ce7cc..7c3c08a65bd 100644
--- a/htdocs/langs/en_US/salaries.lang
+++ b/htdocs/langs/en_US/salaries.lang
@@ -17,3 +17,5 @@ TJMDescription=This value is currently for information only and is not used for
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
 SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments

From ffbb14f40ef59410e0a01efcf7f51af2fbfbe1c6 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 19 Jun 2019 06:28:22 +0200
Subject: [PATCH 049/133] Missing language key

---
 htdocs/langs/en_US/website.lang | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 43f82e9f1fb..2683c9a90eb 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -100,4 +100,6 @@ DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contai
 NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
-DeleteAlsoMedias=Delete also all medias files specific to this website?
\ No newline at end of file
+DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
\ No newline at end of file

From a849fbe42e812929ac43c6e90b40c506d03ac8bc Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 19 Jun 2019 07:15:52 +0200
Subject: [PATCH 050/133] Nowrap on amount

---
 htdocs/compta/bank/treso.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 5a4374f47dd..1318dbd4e2d 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -293,9 +293,9 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 					}else print "<td></td>";
 				}
     			print "<td>".$refcomp."</td>";
-    			if ($obj->total_ttc < 0) { print "<td class=\"right\">".price(abs($total_ttc))."</td><td>&nbsp;</td>"; };
-    			if ($obj->total_ttc >= 0) { print "<td>&nbsp;</td><td class=\"right\">".price($total_ttc)."</td>"; };
-    			print '<td class="right">'.price($solde).'</td>';
+    			if ($obj->total_ttc < 0) { print "<td class='nowrap right'>".price(abs($total_ttc))."</td><td>&nbsp;</td>"; };
+    			if ($obj->total_ttc >= 0) { print "<td>&nbsp;</td><td class='nowrap right'>".price($total_ttc)."</td>"; };
+    			print '<td class="nowrap right">'.price($solde).'</td>';
     			print "</tr>";
 			}
 

From 9a32117b1d172f6a5e31cf086639be9e5c2cd286 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 19 Jun 2019 08:43:57 +0200
Subject: [PATCH 051/133] Nowrap on amount

---
 htdocs/compta/resultat/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index addc56a240b..70129e80403 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -943,7 +943,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 		}
 		print "</td>";
 
-		print '<td class="borderrightlight right">&nbsp;';
+		print '<td class="borderrightlight nowrap right">&nbsp;';
 		if ($modecompta == 'BOOKKEEPING')
 		{
 			if (isset($encaiss[$case]))
@@ -978,8 +978,8 @@ print '</td>';
 for ($annee = $year_start ; $annee <= $year_end ; $annee++)
 {
 	$nbcols+=2;
-	print '<td class="right">'.(isset($totsorties[$annee])?price(price2num($totsorties[$annee], 'MT')):'&nbsp;').'</td>';
-	print '<td class="right" style="border-right: 1px solid #DDD">'.(isset($totentrees[$annee])?price(price2num($totentrees[$annee], 'MT')):'&nbsp;').'</td>';
+	print '<td class="nowrap right">'.(isset($totsorties[$annee])?price(price2num($totsorties[$annee], 'MT')):'&nbsp;').'</td>';
+	print '<td class="nowrap right" style="border-right: 1px solid #DDD">'.(isset($totentrees[$annee])?price(price2num($totentrees[$annee], 'MT')):'&nbsp;').'</td>';
 }
 print "</tr>\n";
 

From b8311da26212e95c0a727e542dc2a7e60c8cbc5b Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 19 Jun 2019 08:56:45 +0200
Subject: [PATCH 052/133] Nowrap on amount

---
 htdocs/accountancy/customer/index.php | 20 ++++++++++----------
 htdocs/accountancy/customer/lines.php |  2 +-
 htdocs/accountancy/customer/list.php  |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 0131f51d515..f063f832f54 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -211,10 +211,10 @@ if ($resql) {
 		else print $row[1];
 		print '</td>';
 		for($i = 2; $i <= 12; $i ++) {
-			print '<td class="right">' . price($row[$i]) . '</td>';
+			print '<td class="nowrap right">' . price($row[$i]) . '</td>';
 		}
-		print '<td class="right">' . price($row[13]) . '</td>';
-		print '<td class="right"><b>' . price($row[14]) . '</b></td>';
+		print '<td class="nowrap right">' . price($row[13]) . '</td>';
+		print '<td class="nowrap right"><b>' . price($row[14]) . '</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
@@ -289,10 +289,10 @@ if ($resql) {
 		print '</td>';
 
 		for($i = 2; $i <= 12; $i++) {
-			print '<td class="right">' . price($row[$i]) . '</td>';
+			print '<td class="nowrap right">' . price($row[$i]) . '</td>';
 		}
-		print '<td class="right">' . price($row[13]) . '</td>';
-		print '<td class="right"><b>' . price($row[14]) . '</b></td>';
+		print '<td class="nowrap right">' . price($row[13]) . '</td>';
+		print '<td class="nowrap right"><b>' . price($row[14]) . '</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
@@ -348,9 +348,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 		while ($row = $db->fetch_row($resql)) {
 			print '<tr><td>' . $row[0] . '</td>';
 			for($i = 1; $i <= 12; $i ++) {
-				print '<td class="right">' . price($row[$i]) . '</td>';
+				print '<td class="nowrap right">' . price($row[$i]) . '</td>';
 			}
-			print '<td class="right"><b>' . price($row[13]) . '</b></td>';
+			print '<td class="nowrap right"><b>' . price($row[13]) . '</b></td>';
 			print '</tr>';
 		}
 		$db->free($resql);
@@ -401,9 +401,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 
 				print '<tr><td>' . $row[0] . '</td>';
 				for($i = 1; $i <= 12; $i ++) {
-					print '<td class="right">' . price(price2num($row[$i])) . '</td>';
+					print '<td class="nowrap right">' . price(price2num($row[$i])) . '</td>';
 				}
-				print '<td class="right"><b>' . price(price2num($row[13])) . '</b></td>';
+				print '<td class="nowrap right"><b>' . price(price2num($row[13])) . '</b></td>';
 				print '</tr>';
 			}
 			$db->free($resql);
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 19e85cdb651..ea174638a2a 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -385,7 +385,7 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
 
-		print '<td class="right">' . price($objp->total_ht) . '</td>';
+		print '<td class="nowrap right">' . price($objp->total_ht) . '</td>';
 
 		print '<td class="right">' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . '</td>';
 
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index ed1c40a6ad7..5314099db1f 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -503,7 +503,7 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
 
-		print '<td class="right">';
+		print '<td class="nowrap right">';
 		print price($objp->total_ht);
 		print '</td>';
 

From ec7523d3d2906975fab9e1cf662ff3eae3c074ee Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 19 Jun 2019 09:01:37 +0200
Subject: [PATCH 053/133] Nowrap on amount

---
 htdocs/accountancy/expensereport/index.php | 16 ++++++++--------
 htdocs/accountancy/supplier/index.php      | 16 ++++++++--------
 htdocs/accountancy/supplier/lines.php      |  2 +-
 htdocs/accountancy/supplier/list.php       |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index a5026f920a0..4fe2ee3120b 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -203,10 +203,10 @@ if ($resql) {
 		else print $row[1];
 		print '</td>';
     	for($i = 2; $i <= 12; $i ++) {
-            print '<td class="right">' . price($row[$i]) . '</td>';
+            print '<td class="nowrap right">' . price($row[$i]) . '</td>';
         }
-        print '<td class="right">' . price($row[13]) . '</td>';
-        print '<td class="right"><b>' . price($row[14]) . '</b></td>';
+        print '<td class="nowrap right">' . price($row[13]) . '</td>';
+        print '<td class="nowrap right"><b>' . price($row[14]) . '</b></td>';
         print '</tr>';
     }
     $db->free($resql);
@@ -276,10 +276,10 @@ if ($resql) {
 		else print $row[1];
 		print '</td>';
     	for($i = 2; $i <= 12; $i ++) {
-            print '<td class="right">' . price($row[$i]) . '</td>';
+            print '<td class="nowrap right">' . price($row[$i]) . '</td>';
         }
-        print '<td class="right">' . price($row[13]) . '</td>';
-        print '<td class="right"><b>' . price($row[14]) . '</b></td>';
+        print '<td class="nowrap right">' . price($row[13]) . '</td>';
+        print '<td class="nowrap right"><b>' . price($row[14]) . '</b></td>';
         print '</tr>';
     }
     $db->free($resql);
@@ -331,9 +331,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     	while ($row = $db->fetch_row($resql)) {
     		print '<tr><td>' . $row[0] . '</td>';
             for($i = 1; $i <= 12; $i ++) {
-    			print '<td class="right">' . price($row[$i]) . '</td>';
+    			print '<td class="nowrap right">' . price($row[$i]) . '</td>';
     		}
-    		print '<td class="right"><b>' . price($row[13]) . '</b></td>';
+    		print '<td class="nowrap right"><b>' . price($row[13]) . '</b></td>';
     		print '</tr>';
     	}
 
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index ca60735fcf0..bc632118da7 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -203,10 +203,10 @@ if ($resql) {
 		else print $row[1];
 		print '</td>';
 		for($i = 2; $i <= 12; $i ++) {
-			print '<td class="right">' . price($row[$i]) . '</td>';
+			print '<td class="nowrap right">' . price($row[$i]) . '</td>';
 		}
-		print '<td class="right">' . price($row[13]) . '</td>';
-		print '<td class="right"><b>' . price($row[14]) . '</b></td>';
+		print '<td class="nowrap right">' . price($row[13]) . '</td>';
+		print '<td class="nowrap right"><b>' . price($row[14]) . '</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
@@ -274,10 +274,10 @@ if ($resql) {
 		else print $row[1];
 		print '</td>';
     	for($i = 2; $i <= 12; $i++) {
-            print '<td class="right">' . price($row[$i]) . '</td>';
+            print '<td class="nowrap right">' . price($row[$i]) . '</td>';
         }
-        print '<td class="right">' . price($row[13]) . '</td>';
-        print '<td class="right"><b>' . price($row[14]) . '</b></td>';
+        print '<td class="nowrap right">' . price($row[13]) . '</td>';
+        print '<td class="nowrap right"><b>' . price($row[14]) . '</b></td>';
         print '</tr>';
     }
     $db->free($resql);
@@ -329,9 +329,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     	while ($row = $db->fetch_row($resql)) {
     		print '<tr><td>' . $row[0] . '</td>';
             for($i = 1; $i <= 12; $i ++) {
-    			print '<td class="right">' . price($row[$i]) . '</td>';
+    			print '<td class="nowrap right">' . price($row[$i]) . '</td>';
     		}
-    		print '<td class="right"><b>' . price($row[13]) . '</b></td>';
+    		print '<td class="nowrap right"><b>' . price($row[13]) . '</b></td>';
     		print '</tr>';
     	}
         $db->free($resql);
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 352a73200fb..a67386f6fbd 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -396,7 +396,7 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
 
-		print '<td class="right">' . price($objp->total_ht) . '</td>';
+		print '<td class="nowrap right">' . price($objp->total_ht) . '</td>';
 
 		print '<td class="right">' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . '</td>';
 
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index fc8cc10fec4..17284513650 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -491,7 +491,7 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
 
-		print '<td class="right">';
+		print '<td class="nowrap right">';
 		print price($objp->total_ht);
 		print '</td>';
 

From e44b9113b7410a71ca423c1830f05c4ca3208d98 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 19 Jun 2019 09:01:57 +0200
Subject: [PATCH 054/133] Nowrap on amount

---
 htdocs/accountancy/expensereport/lines.php | 2 +-
 htdocs/accountancy/expensereport/list.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 508dfb7136e..d15ef52ad39 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -319,7 +319,7 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->comments);
 		print '</td>';
 
-		print '<td class="right">' . price($objp->total_ht) . '</td>';
+		print '<td class="nowrap right">' . price($objp->total_ht) . '</td>';
 
 		print '<td class="center">' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . '</td>';
 
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 9f70d175d40..60b24638775 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -376,7 +376,7 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->comments);
 		print '</td>';
 
-		print '<td class="right">';
+		print '<td class="nowrap right">';
 		print price($objp->price);
 		print '</td>';
 

From b6bd4119d9a9f02b00d12b551b43fc600b893452 Mon Sep 17 00:00:00 2001
From: Nicolas ZABOURI <info@inovea-conseil.com>
Date: Wed, 19 Jun 2019 09:12:01 +0200
Subject: [PATCH 055/133] FIX travis Public underscore in load_ldap_info

---
 htdocs/adherents/class/adherent.class.php | 4 +++-
 htdocs/contact/class/contact.class.php    | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 1856de6182f..cda3a461027 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018-2019  Thibault FOUCART		<support@ptibogxiv.net>
+ * Copyright (C) 2019       Nicolas ZABOURI 		<info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -2460,7 +2461,8 @@ class Adherent extends CommonObject
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    /**
 	 *	Initialise tableau info (tableau des attributs LDAP)
 	 *
 	 *	@return		array		Tableau info des attributs
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 5c4df6ab3f9..ca58882b224 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2013      Alexandre Spangaro 	       <aspangaro@open-dsi.fr>
  * Copyright (C) 2013      Juanjo Menent	 	       <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García               <marcosgdf@gmail.com>
+ * Copyright (C) 2019       Nicolas ZABOURI 		<info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -520,6 +521,7 @@ class Contact extends CommonObject
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *	Initialise tableau info (tableau des attributs LDAP)
 	 *

From 9bde7c5229fc3584af4853e4f9707dd7751b238f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 19 Jun 2019 09:21:18 +0200
Subject: [PATCH 056/133] Nowrap on amount

---
 htdocs/core/boxes/box_activity.php           | 2 +-
 htdocs/core/boxes/box_commandes.php          | 2 +-
 htdocs/core/boxes/box_factures_fourn_imp.php | 2 +-
 htdocs/core/boxes/box_factures_imp.php       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 300040639a8..995ba93fb64 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -422,7 +422,7 @@ class box_activity extends ModeleBoxes
         			);
         			$totalnb += $data[$j]->nb;
         			$this->info_box_contents[$line][3] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="nowrap right"',
                         'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
         			);
         			$this->info_box_contents[$line][4] = array(
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 8575e739946..956e73b4acf 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -146,7 +146,7 @@ class box_commandes extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="nowrap right"',
                         'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
                     );
 
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 09de3b874e3..74f8cbc6b64 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -151,7 +151,7 @@ class box_factures_fourn_imp extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="nowrap right"',
                         'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
                     );
 
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index fd85f136f96..a0692c791b2 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -161,7 +161,7 @@ class box_factures_imp extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="nowrap right"',
                         'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
                     );
 

From 7331e43db8e12ac4ee3ae0f2602c39053a1eb696 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Wed, 19 Jun 2019 10:19:33 +0200
Subject: [PATCH 057/133] FIX : we need to fetch fourn invoice with ref in
 current entity

---
 htdocs/fourn/class/fournisseur.facture.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 3a27690e7ac..d7ded8546f1 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -504,7 +504,7 @@ class FactureFournisseur extends CommonInvoice
      */
     public function fetch($id='',$ref='')
     {
-        global $langs;
+        global $langs, $conf;
 
         $sql = "SELECT";
         $sql.= " t.rowid,";
@@ -555,7 +555,7 @@ class FactureFournisseur extends CommonInvoice
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON t.fk_mode_reglement = p.id";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON t.fk_incoterms = i.rowid';
         if ($id)  $sql.= " WHERE t.rowid=".$id;
-        if ($ref) $sql.= " WHERE t.ref='".$this->db->escape($ref)."'";
+        if ($ref) $sql.= " WHERE t.ref='".$this->db->escape($ref)."' AND t.entity = ".$conf->entity;
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);

From 3ad13adf31d6925760587c685f79bd6e694e90fd Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Wed, 19 Jun 2019 10:43:42 +0200
Subject: [PATCH 058/133] FIX : better syntax

---
 htdocs/fourn/class/fournisseur.facture.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index d7ded8546f1..4f9cd93021f 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -504,7 +504,7 @@ class FactureFournisseur extends CommonInvoice
      */
     public function fetch($id='',$ref='')
     {
-        global $langs, $conf;
+        global $langs;
 
         $sql = "SELECT";
         $sql.= " t.rowid,";
@@ -555,7 +555,7 @@ class FactureFournisseur extends CommonInvoice
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON t.fk_mode_reglement = p.id";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON t.fk_incoterms = i.rowid';
         if ($id)  $sql.= " WHERE t.rowid=".$id;
-        if ($ref) $sql.= " WHERE t.ref='".$this->db->escape($ref)."' AND t.entity = ".$conf->entity;
+        if ($ref) $sql.= " WHERE t.ref='".$this->db->escape($ref)."' AND t.entity IN (".getEntity('supplier_invoice').")";
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);

From c109eebe383f240b4340732d5457e26a3f9e0384 Mon Sep 17 00:00:00 2001
From: Abbes Bahfir <bafbes@gmail.com>
Date: Wed, 19 Jun 2019 14:42:56 +0100
Subject: [PATCH 059/133] New:Show c_country elements in modulebuilder

---
 htdocs/core/class/ccountry.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index a97d992bf89..5e744fbdb73 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -47,8 +47,8 @@ class Ccountry // extends CommonObject
 	 */
 	public $errors = array();
 
-	//var $element='ccountry';			//!< Id that identify managed objects
-	//var $table_element='ccountry';	//!< Name of table without prefix where object is stored
+	var $element='ccountry';			//!< Id that identify managed objects
+	var $table_element='c_country';	//!< Name of table without prefix where object is stored
 
     /**
 	 * @var int ID
@@ -65,7 +65,8 @@ class Ccountry // extends CommonObject
 
 	public $active;
 
-
+	public $fields=array(
+		'label' => array('type'=>'varchar(250)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>15, 'notnull'=>-1, 'showoncombobox'=>'1',));
 
 
     /**

From 5b5028254f8d33215d96c60fdb83a9c526de1f3f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jun 2019 16:30:03 +0200
Subject: [PATCH 060/133] Fix label

---
 htdocs/langs/en_US/accountancy.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 449a30acbbb..91234f72aef 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -291,7 +291,7 @@ 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 (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 

From 7c4cddf28d3aacf718d226078b3d23dfcb78fc07 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jun 2019 16:34:01 +0200
Subject: [PATCH 061/133] Fix missing trad

---
 htdocs/langs/en_US/accountancy.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 91234f72aef..7797fdef7b1 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -336,7 +336,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## 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

From 31a53b72aec1bcd2b6524e17bd922a8eda05f028 Mon Sep 17 00:00:00 2001
From: John Botella <john.botella@atm-consulting.fr>
Date: Wed, 19 Jun 2019 16:55:45 +0200
Subject: [PATCH 062/133] FIX var name

---
 htdocs/core/actions_massactions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 34ba465ebff..07766ac7fef 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -209,7 +209,7 @@ if (! $error && $massaction == 'confirm_presend')
 					$resaction.='<div class="error">'.$langs->trans('ErrorOnlyProposalNotDraftCanBeSentInMassAction',$objectobj->ref).'</div><br>';
 					continue; // Payment done or started or canceled
 				}
-				if ($objectclass == 'Commande' && $objectoj->statut == Commande::STATUS_DRAFT)
+				if ($objectclass == 'Commande' && $objectobj->statut == Commande::STATUS_DRAFT)
 				{
 					$langs->load("errors");
 					$nbignored++;

From 47c2f6fac4be2b9a56854d0df42e4182622f1647 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 19 Jun 2019 21:35:35 +0200
Subject: [PATCH 063/133] NEW Add column VAT rate in product list

---
 htdocs/product/list.php | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 7677e82e1b4..5e348c2fe70 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -56,6 +56,7 @@ $search_barcode=GETPOST("search_barcode", 'alpha');
 $search_label=GETPOST("search_label", 'alpha');
 $search_type = GETPOST("search_type", 'int');
 $search_sale = GETPOST("search_sale", 'int');
+$search_vatrate=GETPOST("search_vatrate", 'alpha');
 $search_categ = GETPOST("search_categ", 'int');
 $search_tosell = GETPOST("search_tosell", 'int');
 $search_tobuy = GETPOST("search_tobuy", 'int');
@@ -174,7 +175,8 @@ $arrayfields=array(
     'p.sellprice'=>array('label'=>$langs->trans("SellingPrice"), 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES)),
 	'p.minbuyprice'=>array('label'=>$langs->trans("BuyingPriceMinShort"), 'checked'=>1, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
 	'p.numbuyprice'=>array('label'=>$langs->trans("BuyingPriceNumShort"), 'checked'=>0, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
-	'p.pmp'=>array('label'=>$langs->trans("PMPValueShort"), 'checked'=>0, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
+    'p.tva_tx'=>array('label'=>$langs->trans("VATRate"), 'checked'=>0, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
+    'p.pmp'=>array('label'=>$langs->trans("PMPValueShort"), 'checked'=>0, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
 	'p.seuil_stock_alerte'=>array('label'=>$langs->trans("StockLimit"), 'checked'=>0, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')),
 	'p.desiredstock'=>array('label'=>$langs->trans("DesiredStock"), 'checked'=>1, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')),
 	'p.stock'=>array('label'=>$langs->trans("PhysicalStock"), 'checked'=>1, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')),
@@ -229,6 +231,7 @@ if (empty($reshook))
 		$search_categ=0;
 		$search_tosell="";
 		$search_tobuy="";
+		$search_vatrate="";
 		$search_tobatch='';
 		//$search_type='';						// There is 2 types of list: a list of product and a list of services. No list with both. So when we clear search criteria, we must keep the filter on type.
 
@@ -276,7 +279,7 @@ else
 	$texte = $langs->trans("ProductsAndServices");
 }
 
-$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
+$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type, p.barcode, p.price, p.tva_tx, p.price_ttc, p.price_base_type, p.entity,';
 $sql.= ' p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
 $sql.= ' p.tobatch, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export, p.accountancy_code_buy,';
 $sql.= ' p.datec as date_creation, p.tms as date_update, p.pmp, p.stock,';
@@ -323,6 +326,7 @@ if ($search_label)   $sql .= natural_search('p.label', $search_label);
 if ($search_barcode) $sql .= natural_search('p.barcode', $search_barcode);
 if (isset($search_tosell) && dol_strlen($search_tosell) > 0  && $search_tosell!=-1) $sql.= " AND p.tosell = ".$db->escape($search_tosell);
 if (isset($search_tobuy) && dol_strlen($search_tobuy) > 0  && $search_tobuy!=-1)   $sql.= " AND p.tobuy = ".$db->escape($search_tobuy);
+if ($search_vatrate) $sql .= natural_search('p.tva_tx', $search_vatrate);
 if (dol_strlen($canvas) > 0)                    $sql.= " AND p.canvas = '".$db->escape($canvas)."'";
 if ($catid > 0)     $sql.= " AND cp.fk_categorie = ".$catid;
 if ($catid == -2)   $sql.= " AND cp.fk_categorie IS NULL";
@@ -341,7 +345,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
-$sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
+$sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.tva_tx, p.price_ttc, p.price_base_type,";
 $sql.= " p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
 $sql.= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export, p.accountancy_code_buy, p.pmp, p.stock,';
 $sql.= ' p.weight, p.weight_units, p.length, p.length_units, p.surface, p.surface_units, p.volume, p.volume_units, p.width, p.width_units, p.height, p.height_units';
@@ -421,6 +425,7 @@ if ($resql)
 	if ($search_label) $param.="&search_label=".urlencode($search_label);
 	if ($search_tosell != '') $param.="&search_tosell=".urlencode($search_tosell);
 	if ($search_tobuy != '') $param.="&search_tobuy=".urlencode($search_tobuy);
+    if ($search_vatrate) $sql .= natural_search('p.tva_tx', $search_vatrate);
 	if ($fourn_id > 0) $param.=($fourn_id?"&fourn_id=".$fourn_id:"");
 	if ($seach_categ) $param.=($search_categ?"&search_categ=".urlencode($search_categ):"");
 	if ($show_childproducts) $param.=($show_childproducts?"&search_show_childproducts=".urlencode($show_childproducts):"");
@@ -613,6 +618,13 @@ if ($resql)
 		print '&nbsp;';
 		print '</td>';
 	}
+    // Sell price
+    if (! empty($arrayfields['p.tva_tx']['checked']))
+    {
+        print '<td class="liste_titre right">';
+        print '<input class="right flat maxwidth50" placeholder="%" type="text" name="search_vatrate" size="1" value="'.dol_escape_htmltag($search_vatrate).'">';
+        print '</td>';
+    }
 	// WAP
 	if (! empty($arrayfields['p.pmp']['checked']))
 	{
@@ -715,6 +727,9 @@ if ($resql)
     if (! empty($arrayfields['p.numbuyprice']['checked'])) {
         print_liste_field_titre($arrayfields['p.numbuyprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
     }
+    if (! empty($arrayfields['p.tva_tx']['checked'])) {
+        print_liste_field_titre($arrayfields['p.tva_tx']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+    }
     if (! empty($arrayfields['p.pmp']['checked'])) {
         print_liste_field_titre($arrayfields['p.pmp']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
     }
@@ -983,6 +998,15 @@ if ($resql)
 			print '</td>';
 		}
 
+        // Sell Tax Rate
+        if (! empty($arrayfields['p.tva_tx']['checked']))
+        {
+            print '<td class="right">';
+            print vatrate($obj->tva_tx,true);
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+
 		// WAP
 		if (! empty($arrayfields['p.pmp']['checked']))
 		{

From 68e9712f0c30e17b7c4a78bd593cb8a60ceaf33d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jun 2019 22:05:38 +0200
Subject: [PATCH 064/133] Fix support domains with 3 levels

---
 htdocs/core/lib/geturl.lib.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 714bc26b7da..83e483b3e97 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -172,14 +172,21 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
  * For example: https://www.abc.mydomain.com/dir/page.html return 'mydomain'
  *
  * @param	string	  $url 				    Full URL.
- * @param	int	 	  $mode					0=return 'mydomain', 1=return 'mydomain.com'
+ * @param	int	 	  $mode					0=return 'mydomain', 1=return 'mydomain.com', 2=return 'abc.mydomain.com'
  * @return	string						    Returns domaine name
  */
 function getDomainFromURL($url, $mode = 0)
 {
 	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url);				// Remove http(s)://
 	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain);				// Remove part after domain
-	$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain);				// Remove part www.abc before domain name
+	if ($mode == 2)
+	{
+		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain);	// Remove part 'www.' before 'abc.mydomain.com'
+	}
+	else
+	{
+		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain);				// Remove part 'www.abc.' before 'mydomain.com'
+	}
 	if (empty($mode))
 	{
 		$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain);			// Remove first level domain (.com, .net, ...)

From d6b6f77e74beeab3cb41cbdbbd59b255e4c0614c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jun 2019 22:05:38 +0200
Subject: [PATCH 065/133] Fix support domains with 3 levels

---
 htdocs/core/lib/geturl.lib.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 714bc26b7da..83e483b3e97 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -172,14 +172,21 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
  * For example: https://www.abc.mydomain.com/dir/page.html return 'mydomain'
  *
  * @param	string	  $url 				    Full URL.
- * @param	int	 	  $mode					0=return 'mydomain', 1=return 'mydomain.com'
+ * @param	int	 	  $mode					0=return 'mydomain', 1=return 'mydomain.com', 2=return 'abc.mydomain.com'
  * @return	string						    Returns domaine name
  */
 function getDomainFromURL($url, $mode = 0)
 {
 	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url);				// Remove http(s)://
 	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain);				// Remove part after domain
-	$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain);				// Remove part www.abc before domain name
+	if ($mode == 2)
+	{
+		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain);	// Remove part 'www.' before 'abc.mydomain.com'
+	}
+	else
+	{
+		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain);				// Remove part 'www.abc.' before 'mydomain.com'
+	}
 	if (empty($mode))
 	{
 		$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain);			// Remove first level domain (.com, .net, ...)

From bf71731fc945afdf66216daf3e37359813638d15 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jun 2019 22:28:33 +0200
Subject: [PATCH 066/133] Fix phpcs

---
 htdocs/adherents/class/adherent.class.php | 1 +
 htdocs/contact/class/contact.class.php    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 1856de6182f..c1bb04d90fc 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2460,6 +2460,7 @@ class Adherent extends CommonObject
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *	Initialise tableau info (tableau des attributs LDAP)
 	 *
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 5c4df6ab3f9..de9494fca8b 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -520,6 +520,7 @@ class Contact extends CommonObject
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *	Initialise tableau info (tableau des attributs LDAP)
 	 *

From b4e47d289b5bb183fcb845b236aa6615a62cc8ff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 02:43:56 +0200
Subject: [PATCH 067/133] Code comment

---
 htdocs/user/class/user.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a151fdb5574..8e52ba3028b 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -520,8 +520,8 @@ class User extends CommonObject
 	 *  Add a right to the user
 	 *
 	 * 	@param	int		$rid			Id of permission to add or 0 to add several permissions
-	 *  @param  string	$allmodule		Add all permissions of module $allmodule
-	 *  @param  string	$allperms		Add all permissions of module $allmodule, subperms $allperms only
+	 *  @param  string	$allmodule		Add all permissions of module $allmodule or 'allmodules' to include all modules.
+	 *  @param  string	$allperms		Add all permissions of module $allmodule, subperms $allperms only or '' to include all permissions.
 	 *  @param	int		$entity			Entity to use
 	 *  @param  int	    $notrigger		1=Does not execute triggers, 0=Execute triggers
 	 *  @return int						> 0 if OK, < 0 if KO

From e060af5c977b9a37cf6c054e77f483d617f583c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 02:50:23 +0200
Subject: [PATCH 068/133] Update treso.php

---
 htdocs/compta/bank/treso.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 1318dbd4e2d..f17e622210e 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -293,8 +293,8 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 					}else print "<td></td>";
 				}
     			print "<td>".$refcomp."</td>";
-    			if ($obj->total_ttc < 0) { print "<td class='nowrap right'>".price(abs($total_ttc))."</td><td>&nbsp;</td>"; };
-    			if ($obj->total_ttc >= 0) { print "<td>&nbsp;</td><td class='nowrap right'>".price($total_ttc)."</td>"; };
+    			if ($obj->total_ttc < 0) { print '<td class="nowrap right">'.price(abs($total_ttc))."</td><td>&nbsp;</td>"; };
+    			if ($obj->total_ttc >= 0) { print '<td>&nbsp;</td><td class="nowrap right">'.price($total_ttc)."</td>"; };
     			print '<td class="nowrap right">'.price($solde).'</td>';
     			print "</tr>";
 			}

From 6d38f5ec9cb1fe927106243ab6463c3a39e6d630 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 02:56:44 +0200
Subject: [PATCH 069/133] FIX #11369

---
 htdocs/bom/class/bom.class.php                   | 16 ++++++++--------
 .../class/emailcollector.class.php               |  6 +++---
 .../class/emailcollectoraction.class.php         |  8 ++++----
 .../class/emailcollectorfilter.class.php         |  8 ++++----
 .../template/class/myobject.class.php            |  6 +++---
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 731136fb7f4..99331de8c62 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -165,7 +165,7 @@ class BOM extends CommonObject
 	 */
 	public function __construct(DoliDB $db)
 	{
-		global $conf, $langs, $user;
+		global $conf, $langs;
 
 		$this->db = $db;
 
@@ -184,11 +184,11 @@ class BOM extends CommonObject
 		// Translate some data of arrayofkeyval
 		foreach($this->fields as $key => $val)
 		{
-			if (is_array($this->fields['status']['arrayofkeyval']))
+			if (is_array($this->fields[$key]['arrayofkeyval']))
 			{
-				foreach($this->fields['status']['arrayofkeyval'] as $key2 => $val2)
+				foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
 				{
-					$this->fields['status']['arrayofkeyval'][$key2]=$langs->trans($val2);
+					$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
 				}
 			}
 		}
@@ -1066,7 +1066,7 @@ class BOMLine extends CommonObject
 	 */
 	public function __construct(DoliDB $db)
 	{
-		global $conf, $langs, $user;
+		global $conf, $langs;
 
 		$this->db = $db;
 
@@ -1085,11 +1085,11 @@ class BOMLine extends CommonObject
 		// Translate some data of arrayofkeyval
 		foreach($this->fields as $key => $val)
 		{
-			if (is_array($this->fields['status']['arrayofkeyval']))
+			if (is_array($this->fields[$key]['arrayofkeyval']))
 			{
-				foreach($this->fields['status']['arrayofkeyval'] as $key2 => $val2)
+				foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
 				{
-					$this->fields['status']['arrayofkeyval'][$key2]=$langs->trans($val2);
+					$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
 				}
 			}
 		}
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index f60051df970..ff4be06fcab 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -205,11 +205,11 @@ class EmailCollector extends CommonObject
         // Translate some data of arrayofkeyval
         foreach($this->fields as $key => $val)
         {
-            if (is_array($this->fields['status']['arrayofkeyval']))
+        	if (is_array($this->fields[$key]['arrayofkeyval']))
             {
-                foreach($this->fields['status']['arrayofkeyval'] as $key2 => $val2)
+            	foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
                 {
-                    $this->fields['status']['arrayofkeyval'][$key2]=$langs->trans($val2);
+                	$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
                 }
             }
         }
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index 11ccfbc858e..ca710f99216 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -145,7 +145,7 @@ class EmailCollectorAction extends CommonObject
      */
     public function __construct(DoliDB $db)
     {
-        global $conf, $langs, $user;
+        global $conf, $langs;
 
         $this->db = $db;
 
@@ -164,11 +164,11 @@ class EmailCollectorAction extends CommonObject
         // Translate some data of arrayofkeyval
         foreach($this->fields as $key => $val)
         {
-            if (is_array($this->fields['status']['arrayofkeyval']))
+            if (is_array($this->fields[$key]['arrayofkeyval']))
             {
-                foreach($this->fields['status']['arrayofkeyval'] as $key2 => $val2)
+                foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
                 {
-                    $this->fields['status']['arrayofkeyval'][$key2]=$langs->trans($val2);
+                    $this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
                 }
             }
         }
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index f93ac51f673..5c7c7184ffc 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -114,7 +114,7 @@ class EmailCollectorFilter extends CommonObject
 	 */
 	public function __construct(DoliDB $db)
 	{
-		global $conf, $langs, $user;
+		global $conf, $langs;
 
 		$this->db = $db;
 
@@ -133,11 +133,11 @@ class EmailCollectorFilter extends CommonObject
 		// Translate some data of arrayofkeyval
 		foreach($this->fields as $key => $val)
 		{
-			if (is_array($this->fields['status']['arrayofkeyval']))
+			if (is_array($this->fields[$key]['arrayofkeyval']))
 			{
-				foreach($this->fields['status']['arrayofkeyval'] as $key2 => $val2)
+				foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
 				{
-					$this->fields['status']['arrayofkeyval'][$key2]=$langs->trans($val2);
+					$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
 				}
 			}
 		}
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 266b8d1925f..1b4d1c7b52d 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -227,11 +227,11 @@ class MyObject extends CommonObject
 		// Translate some data of arrayofkeyval
 		foreach($this->fields as $key => $val)
 		{
-			if (is_array($this->fields['status']['arrayofkeyval']))
+			if (is_array($this->fields[$key]['arrayofkeyval']))
 			{
-				foreach($this->fields['status']['arrayofkeyval'] as $key2 => $val2)
+				foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
 				{
-					$this->fields['status']['arrayofkeyval'][$key2]=$langs->trans($val2);
+					$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
 				}
 			}
 		}

From 2b0b7b0dab0603a99d9a379a0dcef814976a0ebe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 03:32:28 +0200
Subject: [PATCH 070/133] Update ccountry.class.php

---
 htdocs/core/class/ccountry.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index 5e744fbdb73..ef89fbcd9b6 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -66,7 +66,8 @@ class Ccountry // extends CommonObject
 	public $active;
 
 	public $fields=array(
-		'label' => array('type'=>'varchar(250)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>15, 'notnull'=>-1, 'showoncombobox'=>'1',));
+		'label' => array('type'=>'varchar(250)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>15, 'notnull'=>-1, 'showoncombobox'=>'1')
+	);
 
 
     /**

From d8c2007d920200b0ac057c03b1eb0c522f3ea263 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 03:53:33 +0200
Subject: [PATCH 071/133] Prepare v11 alpha

---
 htdocs/install/check.php                      |  3 +-
 .../install/mysql/migration/10.0.0-11.0.0.sql | 31 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 55331634aff..6075ad14702 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -451,7 +451,8 @@ else
 								array('from'=>'6.0.0', 'to'=>'7.0.0'),
 								array('from'=>'7.0.0', 'to'=>'8.0.0'),
 								array('from'=>'8.0.0', 'to'=>'9.0.0'),
-								array('from'=>'9.0.0', 'to'=>'10.0.0')
+								array('from'=>'9.0.0', 'to'=>'10.0.0'),
+								array('from'=>'10.0.0', 'to'=>'11.0.0')
 		);
 
 		$count=0;
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 9f758b6bc40..520007e453c 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
@@ -2,6 +2,30 @@
 -- Be carefull to requests order.
 -- This file must be loaded by calling /install/index.php page
 -- when current version is 11.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
 
 
 create table llx_entrepot_extrafields
@@ -12,4 +36,9 @@ create table llx_entrepot_extrafields
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
 
-ALTER TABLE llx_entrepot_extrafields ADD INDEX idx_entrepot_extrafields (fk_object);
\ No newline at end of file
+ALTER TABLE llx_entrepot_extrafields ADD INDEX idx_entrepot_extrafields (fk_object);
+
+
+ALTER TABLE llx_c_shipment_mode ADD COLUMN entity integer DEFAULT 1;
+ALTER TABLE llx_c_shipment_mode DROP INDEX uk_c_shipment_mode;
+ALTER TABLE llx_c_shipment_mode ADD UNIQUE INDEX uk_c_shipment_mode (code, entity);

From 5f32b5e23e79664156f01c02500a97c30df6acd4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 03:54:11 +0200
Subject: [PATCH 072/133] Prepare v11 alpha

---
 htdocs/filefunc.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 6f1a773b7c1..d3aafe94f26 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE', 'Dolibarr');
-if (! defined('DOL_VERSION')) define('DOL_VERSION', '10.0.0');		// a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (! defined('DOL_VERSION')) define('DOL_VERSION', '11.0.0-alpha');		// a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (! defined('EURO')) define('EURO', chr(128));
 

From 5fe91afdc29e0aed5e87a7456e4aef69c94f390b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 03:54:50 +0200
Subject: [PATCH 073/133] Update 9.0.0-10.0.0.sql

---
 htdocs/install/mysql/migration/9.0.0-10.0.0.sql | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
index 43e12c6c05f..e5b925b0d83 100644
--- a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
+++ b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
@@ -107,10 +107,6 @@ ALTER TABLE llx_prelevement_facture_demande ADD COLUMN sourcetype varchar(32);
 ALTER TABLE llx_prelevement_facture_demande ADD COLUMN ext_payment_id varchar(128) NULL;
 ALTER TABLE llx_prelevement_facture_demande ADD COLUMN ext_payment_site varchar(128) NULL;
 
-ALTER TABLE llx_c_shipment_mode ADD COLUMN entity integer DEFAULT 1;
-ALTER TABLE llx_c_shipment_mode DROP INDEX uk_c_shipment_mode;
-ALTER TABLE llx_c_shipment_mode ADD UNIQUE INDEX uk_c_shipment_mode (code, entity);
-
 -- Fix if table exists
 ALTER TABLE llx_c_units DROP INDEX uk_c_units_code;
 ALTER TABLE llx_c_units ADD COLUMN scale integer;

From 77a45b878b94d2b6223effe83da164a29d37e89a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 03:56:42 +0200
Subject: [PATCH 074/133] Fix migration

---
 htdocs/install/mysql/migration/10.0.0-11.0.0.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 520007e453c..5f0d04040de 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
@@ -39,6 +39,7 @@ create table llx_entrepot_extrafields
 ALTER TABLE llx_entrepot_extrafields ADD INDEX idx_entrepot_extrafields (fk_object);
 
 
-ALTER TABLE llx_c_shipment_mode ADD COLUMN entity integer DEFAULT 1;
+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;
 ALTER TABLE llx_c_shipment_mode ADD UNIQUE INDEX uk_c_shipment_mode (code, entity);

From d15a300f02e0feec85e411e83a882de42cdec564 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 04:10:58 +0200
Subject: [PATCH 075/133] Removed not used var

---
 htdocs/compta/facture/card.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 10de9581dfe..44be21898f8 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1295,7 +1295,6 @@ if (empty($reshook))
 									$TTotalByTva[$line->tva_tx] += $line->total_ttc ;
 								}
 
-								$amount_to_diff = 0;
 								foreach ($TTotalByTva as $tva => &$total)
 								{
 									$coef = $total / $srcobject->total_ttc; // Calc coef

From e60020140d01d3a17b4ca467641c083c410854fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 04:11:10 +0200
Subject: [PATCH 076/133] Update societe.class.php

---
 htdocs/societe/class/societe.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6419eb11420..44b38856b90 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3455,7 +3455,7 @@ class Societe extends CommonObject
 			}
 			else                    // For backward compatibility
 			{
-				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
+				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_WARNING);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 				$country_code=getCountry($country_id, 2, $this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
 				$country_label=getCountry($country_id, 0, $this->db);  // This need a SQL request, but it's the old feature that should not be used anymore

From 1a6dc83d4c886cb69c5c845dd6339fc9f71e3522 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 12:25:58 +0200
Subject: [PATCH 077/133] Fix: default accounting account for eec and export
 sales were not used.

---
 htdocs/accountancy/customer/list.php          | 66 +++++++++++++------
 htdocs/accountancy/supplier/list.php          | 44 ++++++++-----
 .../fourn/class/fournisseur.product.class.php |  6 +-
 htdocs/langs/en_US/accountancy.lang           |  3 +
 htdocs/product/class/product.class.php        | 14 ++--
 5 files changed, 90 insertions(+), 43 deletions(-)

diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 5314099db1f..192585ccedd 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -92,9 +92,6 @@ if (! $user->rights->accounting->bind->write)
 $hookmanager->initHooks(array('accountancycustomerlist'));
 
 $formaccounting = new FormAccounting($db);
-$accounting = new AccountingAccount($db);
-$aarowid_s = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT, 1);
-$aarowid_p = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT, 1);
 
 $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
 
@@ -384,11 +381,11 @@ if ($result) {
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidthonsmartphone" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
 	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50 right" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
 	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50 right" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
 	print '<td class="liste_titre">';
-	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth200', 'code2', 1, 0, 1);
+	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth150', 'code2', 1, 0, 1);
 	//print '<input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '">';
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="' . dol_escape_htmltag($search_tvaintra) . '"></td>';
@@ -444,29 +441,50 @@ if ($result) {
 
         $isBuyerInEEC = isInEEC($objp);
 
+        $suggestedaccountingaccountbydefaultfor = '';
     	if ($objp->type_l == 1) {
-			$objp->code_sell_l = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : '');
-			if ($objp->aarowid == '') {
-				$objp->aarowid_suggest = $aarowid_s;
-			}
+    		if ($objp->country_code == $mysoc->country_code || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
+    			$objp->code_sell_l = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : '');
+    			$suggestedaccountingaccountbydefaultfor = '';
+    		} else {
+    			if ($isSellerInEEC && $isBuyerInEEC) {          // European intravat sale
+    				$objp->code_sell_l = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT : '');
+    				$suggestedaccountingaccountbydefaultfor = 'eec';
+	    		} else {                                        // Foreign sale
+	    			$objp->code_sell_l = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT : '');
+	    			$suggestedaccountingaccountbydefaultfor = 'export';
+	    		}
+    		}
 		} elseif ($objp->type_l == 0) {
-			$objp->code_sell_l = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : '');
-			if ($objp->aarowid == '') {
-				$objp->aarowid_suggest = $aarowid_p;
+			if ($objp->country_code == $mysoc->country_code || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
+				$objp->code_sell_l = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : '');
+				$suggestedaccountingaccountbydefaultfor = '';
+			} else {
+				if ($isSellerInEEC && $isBuyerInEEC) {          // European intravat sale
+					$objp->code_sell_l = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT : '');
+					$suggestedaccountingaccountbydefaultfor = 'eec';
+				} else {
+					$objp->code_sell_l = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT : '');
+					$suggestedaccountingaccountbydefaultfor = 'export';
+				}
 			}
 		}
 		if ($objp->code_sell_l == -1) $objp->code_sell_l='';
 
+		$suggestedaccountingaccountfor = '';
 		if ($objp->country_code == $mysoc->country_code || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
             $objp->code_sell_p = $objp->code_sell;
             $objp->aarowid_suggest = $objp->aarowid;
+            $suggestedaccountingaccountfor = '';
         } else {
             if ($isSellerInEEC && $isBuyerInEEC) {          // European intravat sale
                 $objp->code_sell_p = $objp->code_sell_intra;
                 $objp->aarowid_suggest = $objp->aarowid_intra;
+                $suggestedaccountingaccountfor = 'eec';
             } else {                                        // Foreign sale
                 $objp->code_sell_p = $objp->code_sell_export;
                 $objp->aarowid_suggest = $objp->aarowid_export;
+                $suggestedaccountingaccountfor = 'export';
             }
         }
 
@@ -477,8 +495,8 @@ if ($result) {
 		}
 		if (empty($objp->code_sell_l) && empty($objp->code_sell_p)) $code_sell_p_notset = 'color:red';
 
-		// $objp->code_sell_p is now code of product/service
 		// $objp->code_sell_l is now default code of product/service
+		// $objp->code_sell_p is now code of product/service
 
 		print '<tr class="oddeven">';
 
@@ -492,7 +510,7 @@ if ($result) {
 
 		// Ref Product
 		print '<td>';
-		if ($product_static->id)
+		if ($product_static->id > 0)
 			print $product_static->getNomUrl(1);
 		if ($objp->product_label) print '<br>'.$objp->product_label;
 		print '</td>';
@@ -514,7 +532,7 @@ if ($result) {
 		print vatrate($objp->tva_tx_line.($objp->vat_src_code?' ('.$objp->vat_src_code.')':''));
 		print '</td>';
 
-        print '<td class="center">';
+        print '<td>';
         $labelcountry=($objp->country_code && ($langs->trans("Country".$objp->country_code)!="Country".$objp->country_code))?$langs->trans("Country".$objp->country_code):$objp->country_label;
         print $labelcountry;
         print '</td>';
@@ -523,17 +541,27 @@ if ($result) {
 
 		// Current account
 		print '<td class="center" style="' . $code_sell_p_notset . '">';
-	    print (($objp->type_l == 1)?$langs->trans("DefaultForService"):$langs->trans("DefaultForProduct")) . ' = ' . ($objp->code_sell_l > 0 ? length_accountg($objp->code_sell_l) : $langs->trans("Unknown"));
-		if ($objp->product_id > 0)
+	    $s = (($objp->type_l == 1)?$langs->trans("DefaultForService"):$langs->trans("DefaultForProduct")).': ';
+	    $shelp = '';
+	    if ($suggestedaccountingaccountbydefaultfor == 'eec') $shelp.= $langs->trans("SaleEEC");
+	    elseif ($suggestedaccountingaccountbydefaultfor == 'export') $shelp.= $langs->trans("SaleExport");
+	    $s.= ($objp->code_sell_l > 0 ? length_accountg($objp->code_sell_l) : $langs->trans("NotDefined"));
+	    print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
+	    if ($objp->product_id > 0)
 		{
 		    print '<br>';
-		    print (($objp->type_l == 1)?$langs->trans("ThisService"):$langs->trans("ThisProduct")) . ' = ' . (empty($objp->code_sell_p) ? $langs->trans("Unknown") : length_accountg($objp->code_sell_p));
+		    $s = (($objp->type_l == 1)?$langs->trans("ThisService"):$langs->trans("ThisProduct")).': ';
+		    $shelp = '';
+		    if ($suggestedaccountingaccountfor == 'eec') $shelp = $langs->trans("SaleEEC");
+		    elseif ($suggestedaccountingaccountfor == 'export') $shelp = $langs->trans("SaleExport");
+		    $s.= (empty($objp->code_sell_p) ? $langs->trans("NotDefined") : length_accountg($objp->code_sell_p));
+		    print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
 		}
 		print '</td>';
 
 		// Suggested accounting account
 		print '<td>';
-		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
 
 		// Column with checkbox
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 17284513650..b3a426bbf5e 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -332,8 +332,8 @@ if ($result) {
 	if ($search_desc)        $param.='&search_desc='.urlencode($search_desc);
 	if ($search_amount)      $param.='&search_amount='.urlencode($search_amount);
 	if ($search_vat)         $param.='&search_vat='.urlencode($search_vat);
-	if ($search_country) 	$param .= "&search_country=" . urlencode($search_country);
-	if ($search_tvaintra)	$param .= "&search_tvaintra=" . urlencode($search_tvaintra);
+	if ($search_country) 	 $param.="&search_country=".urlencode($search_country);
+	if ($search_tvaintra)	 $param.="&search_tvaintra=".urlencode($search_tvaintra);
 
 	$arrayofmassactions =  array(
 	    'ventil'=>$langs->trans("Ventilate")
@@ -382,11 +382,11 @@ if ($result) {
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
 	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
 	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
 	print '<td class="liste_titre">';
-	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth200', 'code2', 1, 0, 1);
+	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth150', 'code2', 1, 0, 1);
 	//print '<input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '">';
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="' . dol_escape_htmltag($search_tvaintra) . '"></td>';
@@ -418,7 +418,7 @@ if ($result) {
 	print "</tr>\n";
 
 	$facturefourn_static = new FactureFournisseur($db);
-	$productfourn_static = new ProductFournisseur($db);
+	$product_static = new Product($db);
 
 	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
@@ -430,10 +430,10 @@ if ($result) {
 		$objp->code_buy_p = '';
 		$objp->aarowid_suggest = '';
 
-		$productfourn_static->ref = $objp->product_ref;
-		$productfourn_static->id = $objp->product_id;
-		$productfourn_static->type = $objp->type;
-		$productfourn_static->label = $objp->product_label;
+		$product_static->ref = $objp->product_ref;
+		$product_static->id = $objp->product_id;
+		$product_static->type = $objp->type;
+		$product_static->label = $objp->product_label;
 
 		$facturefourn_static->ref = $objp->ref;
 		$facturefourn_static->id = $objp->facid;
@@ -479,8 +479,8 @@ if ($result) {
 
 		// Ref product
 		print '<td>';
-		if ($productfourn_static->id)
-			print $productfourn_static->getNomUrl(1);
+		if ($product_static->id > 0)
+			print $product_static->getNomUrl(1);
 		if ($objp->product_label) print '<br>'.$objp->product_label;
 		print '</td>';
 
@@ -502,26 +502,38 @@ if ($result) {
 		print vatrate($objp->tva_tx_line.($objp->vat_src_code?' ('.$objp->vat_src_code.')':''));
 		print '</td>';
 
-        print '<td class="center">';
+		// Country
+        print '<td>';
         $labelcountry=($objp->country_code && ($langs->trans("Country".$objp->country_code)!="Country".$objp->country_code))?$langs->trans("Country".$objp->country_code):$objp->country_label;
         print $labelcountry;
         print '</td>';
 
+        // VAT Num
 		print '<td>' . $objp->tva_intra . '</td>';
 
 		// Current account
 		print '<td class="center" style="' . $code_buy_p_notset . '">';
-		print (($objp->type_l == 1)?$langs->trans("DefaultForService"):$langs->trans("DefaultForProduct")) . ' = ' . ($objp->code_buy_l > 0 ? length_accountg($objp->code_buy_l) : $langs->trans("Unknown"));
+		$s = (($objp->type_l == 1)?$langs->trans("DefaultForService"):$langs->trans("DefaultForProduct")).': ';
+		$shelp = '';
+		if ($suggestedaccountingaccountbydefaultfor == 'eec') $shelp.= $langs->trans("SaleEEC");
+		elseif ($suggestedaccountingaccountbydefaultfor == 'export') $shelp.= $langs->trans("SaleExport");
+		$s.= ($objp->code_buy_l > 0 ? length_accountg($objp->code_buy_l) : $langs->trans("NotDefined"));
+		print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
 		if ($objp->product_id > 0)
 		{
-		    print '<br>';
-		    print (($objp->type_l == 1)?$langs->trans("ThisService"):$langs->trans("ThisProduct")) . ' = ' . (empty($objp->code_buy_p) ? $langs->trans("Unknown") : length_accountg($objp->code_buy_p));
+			print '<br>';
+			$s = (($objp->type_l == 1)?$langs->trans("ThisService"):$langs->trans("ThisProduct")).': ';
+			$shelp = '';
+			if ($suggestedaccountingaccountfor == 'eec') $shelp = $langs->trans("SaleEEC");
+			elseif ($suggestedaccountingaccountfor == 'export') $shelp = $langs->trans("SaleExport");
+			$s.= (empty($objp->code_buy_p) ? $langs->trans("NotDefined") : length_accountg($objp->code_buy_p));
+			print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
 		}
 		print '</td>';
 
 		// Suggested accounting account
 		print '<td>';
-		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
 
 		// Column with checkbox
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index f2384b13cf2..fc74890f150 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -1009,7 +1009,8 @@ class ProductFournisseur extends Product
 
 
     /**
-     *  Return a link to the object card (with optionaly the picto)
+     *  Return a link to the object card (with optionaly the picto).
+     *  Used getNomUrl of ProductFournisseur if a specific supplier ref is loaded. Otherwise use Product->getNomUrl().
      *
      *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
      *	@param	string	$option						On what the link point to ('nolink', ...)
@@ -1025,11 +1026,10 @@ class ProductFournisseur extends Product
         if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
 
         $result = '';
-        $companylink = '';
 
         $label = '<u>' . $langs->trans("SupplierRef") . '</u>';
         $label.= '<br>';
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->fourn_ref;
+        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref_supplier;
 
         $logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id, 'pfpl.datec', 'DESC'); // set sort order here
         if (is_array($logPrices) && count($logPrices) > 0) {
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 7797fdef7b1..3a08e422600 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -316,6 +316,9 @@ 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
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index de0d28cee83..a5491045c16 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4059,16 +4059,18 @@ class Product extends CommonObject
             }
         }
 
-        $linkstart = '<a href="'.$url.'"';
+        $linkstart = '<a class="nowraponall" href="'.$url.'"';
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
 
         $result.=$linkstart;
         if ($withpicto)
         {
-            if ($this->type == Product::TYPE_PRODUCT) { $result.=(img_object(($notooltip?'':$label), 'product', ($notooltip?'class="paddingright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
+            if ($this->type == Product::TYPE_PRODUCT) {
+            	$result.=(img_object(($notooltip?'':$label), 'product', ($notooltip?'class="paddingright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
             }
-            if ($this->type == Product::TYPE_SERVICE) { $result.=(img_object(($notooltip?'':$label), 'service', ($notooltip?'class="paddinright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
+            if ($this->type == Product::TYPE_SERVICE) {
+            	$result.=(img_object(($notooltip?'':$label), 'service', ($notooltip?'class="paddinright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
             }
         }
         $result.= $newref;
@@ -4078,8 +4080,10 @@ class Product extends CommonObject
         $hookmanager->initHooks(array('productdao'));
         $parameters=array('id'=>$this->id, 'getnomurl'=>$result);
         $reshook=$hookmanager->executeHooks('getNomUrl', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
-        if ($reshook > 0) { $result = $hookmanager->resPrint;
-        } else { $result .= $hookmanager->resPrint;
+        if ($reshook > 0) {
+        	$result = $hookmanager->resPrint;
+        } else {
+        	$result .= $hookmanager->resPrint;
         }
 
         return $result;

From cb057e9c6db20b120fbebb0b11239cfb554904d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 12:32:14 +0200
Subject: [PATCH 078/133] NEW Add hidden option to be ready for BREXIT

---
 htdocs/core/lib/company.lib.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index c3b9bcec2cf..1e27cb112d3 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -649,6 +649,8 @@ function getFormeJuridiqueLabel($code)
  */
 function getCountriesInEEC()
 {
+	global $conf;
+
 	// List of all country codes that are in europe for european vat rules
 	// List found on http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
 	$country_code_in_EEC=array(
@@ -687,6 +689,12 @@ function getCountriesInEEC()
 		//'CH',	// Switzerland - No. Swizerland in not in EEC
 	);
 
+	if (! empty($conf->global->MAIN_COUNTRIES_IN_EEC))
+	{
+		// For example MAIN_COUNTRIES_IN_EEC = 'AT,BE,BG,CY,CZ,DE,DK,EE,ES,FI,FR,GB,GR,HR,NL,HU,IE,IM,IT,LT,LU,LV,MC,MT,PL,PT,RO,SE,SK,SI,UK'
+		$country_code_in_EEC = explode(',', $conf->global->MAIN_COUNTRIES_IN_EEC);
+	}
+
 	return $country_code_in_EEC;
 }
 

From 6e069385bc054a2bd2c0032f32f500cfc755b3eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 12:32:38 +0200
Subject: [PATCH 079/133] Update doc

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index e0f4159c49e..9b91afd128f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -114,6 +114,7 @@ NEW: Option in workflow module to set a reception billed on validate supplier bi
 NEW: Autocompletion on lists should be available on mobile applications.
 NEW: Add mass action to close several members.
 NEW: Add hidden option ADD_UNSPLASH_LOGIN_BACKGROUND for random background
+NEW: Add hidden option to be ready for BREXIT
 
 For Developers:
 NEW: Module "DebugBar" is available as a stable module.

From bff6260983d0a47f49d04f4e6b1629023b1e013a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 12:34:29 +0200
Subject: [PATCH 080/133] Fix syntax error

---
 htdocs/accountancy/journal/bankjournal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 0f22789d630..a9009e725b8 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -172,7 +172,7 @@ if ($result) {
 
 	// Variables
 	$account_supplier			= (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER != "") ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : 'NotDefined');	// NotDefined is a reserved word
-	$account_customer			= ($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined');	// NotDefined is a reserved word
+	$account_customer			= (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined');	// NotDefined is a reserved word
 	$account_employee			= (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined');	// NotDefined is a reserved word
 	$account_pay_vat			= (! empty($conf->global->ACCOUNTING_VAT_PAY_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT : 'NotDefined');	// NotDefined is a reserved word
 	$account_pay_donation		= (! empty($conf->global->DONATION_ACCOUNTINGACCOUNT) ? $conf->global->DONATION_ACCOUNTINGACCOUNT : 'NotDefined');	// NotDefined is a reserved word

From afb63623178365f31be9b37658f805ead993c4b5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 13:37:06 +0200
Subject: [PATCH 081/133] Fix look and feel v10 Fix link to direct debit
 payment order

---
 htdocs/accountancy/admin/accountmodel.php     |  4 +-
 htdocs/accountancy/admin/categories_list.php  |  2 +-
 htdocs/accountancy/admin/closure.php          |  5 +-
 htdocs/accountancy/admin/defaultaccounts.php  |  3 +-
 htdocs/accountancy/admin/export.php           |  5 +-
 htdocs/accountancy/admin/productaccount.php   |  2 +-
 .../class/accountancyexport.class.php         | 78 +++++++++----------
 htdocs/accountancy/journal/bankjournal.php    |  4 +-
 .../journal/expensereportsjournal.php         |  2 +-
 .../accountancy/journal/purchasesjournal.php  |  2 +-
 htdocs/accountancy/journal/sellsjournal.php   |  2 +-
 htdocs/admin/dict.php                         |  3 +-
 htdocs/compta/bank/bankentries_list.php       | 12 ++-
 .../class/bonprelevement.class.php            | 70 +++++++++++++----
 htdocs/langs/en_US/banks.lang                 |  2 +-
 htdocs/langs/en_US/withdrawals.lang           |  4 +-
 16 files changed, 121 insertions(+), 79 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index f44ff0071d2..102d268e218 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2019  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2010-2016  Juanjo Menent           <jmenent@2byte.es>
@@ -462,8 +462,6 @@ $linkback='';
 
 print load_fiche_titre($titre, $linkback, 'title_accountancy');
 
-print "<br>\n";
-
 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 3a55e092d94..e7cdc800aee 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -412,7 +412,7 @@ $titlepicto='title_setup';
 
 print load_fiche_titre($titre, $linkback, $titlepicto);
 
-print $langs->trans("AccountingAccountGroupsDesc", $langs->transnoentitiesnoconv("ByPersonalizedAccountGroups")).'<br><br>';
+print '<span class="opacitymedium">'.$langs->trans("AccountingAccountGroupsDesc", $langs->transnoentitiesnoconv("ByPersonalizedAccountGroups")).'</span><br><br>';
 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
diff --git a/htdocs/accountancy/admin/closure.php b/htdocs/accountancy/admin/closure.php
index a638d598ac9..479dd410f33 100644
--- a/htdocs/accountancy/admin/closure.php
+++ b/htdocs/accountancy/admin/closure.php
@@ -21,9 +21,8 @@
  * \ingroup		Accountancy (Double entries)
  * \brief		Setup page to configure accounting expert module
  */
-require '../../main.inc.php';
 
-// Class
+require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
@@ -89,7 +88,7 @@ llxHeader();
 $linkback = '';
 print load_fiche_titre($langs->trans('MenuClosureAccounts'), $linkback, 'title_accountancy');
 
-print $langs->trans("DefaultClosureDesc").'<br>';
+print '<span class="opacitymedium">'.$langs->trans("DefaultClosureDesc").'</span><br>';
 print '<br>';
 
 print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index cba9ac92f3b..079e3585341 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -78,7 +78,6 @@ $list_account = array (
 
 $accounting_mode = empty($conf->global->ACCOUNTING_MODE) ? 'RECETTES-DEPENSES' : $conf->global->ACCOUNTING_MODE;
 
-
 if (GETPOST('change_chart', 'alpha'))
 {
     $chartofaccounts = GETPOST('chartofaccounts', 'int');
@@ -132,7 +131,7 @@ llxHeader();
 $linkback = '';
 print load_fiche_titre($langs->trans('MenuDefaultAccounts'), $linkback, 'title_accountancy');
 
-print $langs->trans("DefaultBindingDesc").'<br>';
+print '<span class="opacitymedium">'.$langs->trans("DefaultBindingDesc").'</span><br>';
 print '<br>';
 
 print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index 74090e54120..81dc83b2ae5 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -76,6 +76,7 @@ $model_option = array (
     ),
 );
 
+
 /*
  * Actions
  */
@@ -138,6 +139,7 @@ $form = new Form($db);
 // $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
 print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
 
+
 print "\n".'<script type="text/javascript" language="javascript">'."\n";
 print 'jQuery(document).ready(function () {'."\n";
 print '    function initfields()'."\n";
@@ -195,7 +197,6 @@ print '<tr class="liste_titre">';
 print '<td colspan="3">' . $langs->trans('Options') . '</td>';
 print "</tr>\n";
 
-
 $num = count($main_option);
 if ($num) {
 	foreach ($main_option as $key) {
@@ -236,7 +237,7 @@ if (! $conf->use_javascript_ajax) {
 } else {
 	print '<td>';
 	$listmodelcsv = AccountancyExport::getType();
-	print $form->selectarray("ACCOUNTING_EXPORT_MODELCSV", $listmodelcsv, $conf->global->ACCOUNTING_EXPORT_MODELCSV, 0);
+	print $form->selectarray("ACCOUNTING_EXPORT_MODELCSV", $listmodelcsv, $conf->global->ACCOUNTING_EXPORT_MODELCSV, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 
 	print '</td>';
 }
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 4d5561e3aca..562dfd1505b 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -323,7 +323,7 @@ if ($result)
     print load_fiche_titre($langs->trans("ProductsBinding"), '', 'title_accountancy');
 	print '<br>';
 
-	print $langs->trans("InitAccountancyDesc") . '<br>';
+	print '<span class="opacitymedium">'.$langs->trans("InitAccountancyDesc") . '</span><br>';
 	print '<br>';
 
     // Select mode
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 053586e668e..3169d3737d9 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -39,19 +39,18 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
 class AccountancyExport
 {
 	// Type of export. Used into $conf->global->ACCOUNTING_EXPORT_MODELCSV
-    public static $EXPORT_TYPE_NORMAL = 1;	 			// CSV
-	public static $EXPORT_TYPE_CONFIGURABLE = 10;		// CSV
-	public static $EXPORT_TYPE_CEGID = 2;
-	public static $EXPORT_TYPE_COALA = 3;
-	public static $EXPORT_TYPE_BOB50 = 4;
-	public static $EXPORT_TYPE_CIEL = 5;
-	public static $EXPORT_TYPE_QUADRATUS = 6;
-	public static $EXPORT_TYPE_EBP = 7;
-	public static $EXPORT_TYPE_COGILOG = 8;
-	public static $EXPORT_TYPE_AGIRIS = 9;
-	public static $EXPORT_TYPE_FEC = 11;
-	public static $EXPORT_TYPE_OPENCONCERTO = 12;
-	public static $EXPORT_TYPE_SAGE50_SWISS = 13;
+	public static $EXPORT_TYPE_CONFIGURABLE = 1;		// CSV
+	public static $EXPORT_TYPE_AGIRIS = 10;
+	public static $EXPORT_TYPE_EBP = 15;
+	public static $EXPORT_TYPE_CEGID = 20;
+	public static $EXPORT_TYPE_COGILOG = 25;
+	public static $EXPORT_TYPE_COALA = 30;
+	public static $EXPORT_TYPE_BOB50 = 35;
+	public static $EXPORT_TYPE_CIEL = 40;
+	public static $EXPORT_TYPE_SAGE50_SWISS = 45;
+	public static $EXPORT_TYPE_QUADRATUS = 60;
+	public static $EXPORT_TYPE_OPENCONCERTO = 100;
+	public static $EXPORT_TYPE_FEC = 1000;
 
 
 	/**
@@ -94,8 +93,7 @@ class AccountancyExport
 	{
 		global $langs;
 
-		return array (
-			//self::$EXPORT_TYPE_NORMAL => $langs->trans('Modelcsv_normal'),
+		$listofexporttypes = array(
 			self::$EXPORT_TYPE_CONFIGURABLE => $langs->trans('Modelcsv_configurable'),
 			self::$EXPORT_TYPE_CEGID => $langs->trans('Modelcsv_CEGID'),
 			self::$EXPORT_TYPE_COALA => $langs->trans('Modelcsv_COALA'),
@@ -106,9 +104,13 @@ class AccountancyExport
 			self::$EXPORT_TYPE_COGILOG => $langs->trans('Modelcsv_cogilog'),
 			self::$EXPORT_TYPE_AGIRIS => $langs->trans('Modelcsv_agiris'),
             self::$EXPORT_TYPE_OPENCONCERTO => $langs->trans('Modelcsv_openconcerto'),
-			self::$EXPORT_TYPE_FEC => $langs->trans('Modelcsv_FEC'),
 			self::$EXPORT_TYPE_SAGE50_SWISS => $langs->trans('Modelcsv_Sage50_Swiss'),
+			self::$EXPORT_TYPE_FEC => $langs->trans('Modelcsv_FEC'),
 		);
+
+		ksort($listofexporttypes, SORT_NUMERIC);
+
+		return $listofexporttypes;
 	}
 
 	/**
@@ -120,7 +122,6 @@ class AccountancyExport
 	private static function getFormatCode($type)
 	{
 		$formatcode = array (
-			//self::$EXPORT_TYPE_NORMAL => 'csv',
 			self::$EXPORT_TYPE_CONFIGURABLE => 'csv',
 			self::$EXPORT_TYPE_CEGID => 'cegid',
 			self::$EXPORT_TYPE_COALA => 'coala',
@@ -131,8 +132,8 @@ class AccountancyExport
 			self::$EXPORT_TYPE_COGILOG => 'cogilog',
 			self::$EXPORT_TYPE_AGIRIS => 'agiris',
 			self::$EXPORT_TYPE_OPENCONCERTO => 'openconcerto',
+            self::$EXPORT_TYPE_SAGE50_SWISS => 'sage50ch',
 			self::$EXPORT_TYPE_FEC => 'fec',
-                        self::$EXPORT_TYPE_SAGE50_SWISS => 'sage50ch',
 		);
 
 		return $formatcode[$type];
@@ -149,13 +150,13 @@ class AccountancyExport
 
 		return array (
 			'param' => array(
-				/*self::$EXPORT_TYPE_NORMAL => array(
-					'label' => $langs->trans('Modelcsv_normal'),
+				self::$EXPORT_TYPE_CONFIGURABLE => array(
+					'label' => $langs->trans('Modelcsv_configurable'),
 					'ACCOUNTING_EXPORT_FORMAT' => empty($conf->global->ACCOUNTING_EXPORT_FORMAT)?'txt':$conf->global->ACCOUNTING_EXPORT_FORMAT,
 					'ACCOUNTING_EXPORT_SEPARATORCSV' => empty($conf->global->ACCOUNTING_EXPORT_SEPARATORCSV)?',':$conf->global->ACCOUNTING_EXPORT_SEPARATORCSV,
 					'ACCOUNTING_EXPORT_ENDLINE' => empty($conf->global->ACCOUNTING_EXPORT_ENDLINE)?1:$conf->global->ACCOUNTING_EXPORT_ENDLINE,
 					'ACCOUNTING_EXPORT_DATE' => empty($conf->global->ACCOUNTING_EXPORT_DATE)?'%d%m%Y':$conf->global->ACCOUNTING_EXPORT_DATE,
-				),*/
+				),
 				self::$EXPORT_TYPE_CEGID => array(
 					'label' => $langs->trans('Modelcsv_CEGID'),
 				),
@@ -182,25 +183,18 @@ class AccountancyExport
 				self::$EXPORT_TYPE_AGIRIS => array(
 					'label' => $langs->trans('Modelcsv_agiris'),
 				),
-				self::$EXPORT_TYPE_CONFIGURABLE => array(
-					'label' => $langs->trans('Modelcsv_configurable'),
-					'ACCOUNTING_EXPORT_FORMAT' => empty($conf->global->ACCOUNTING_EXPORT_FORMAT)?'txt':$conf->global->ACCOUNTING_EXPORT_FORMAT,
-					'ACCOUNTING_EXPORT_SEPARATORCSV' => empty($conf->global->ACCOUNTING_EXPORT_SEPARATORCSV)?',':$conf->global->ACCOUNTING_EXPORT_SEPARATORCSV,
-					'ACCOUNTING_EXPORT_ENDLINE' => empty($conf->global->ACCOUNTING_EXPORT_ENDLINE)?1:$conf->global->ACCOUNTING_EXPORT_ENDLINE,
-					'ACCOUNTING_EXPORT_DATE' => empty($conf->global->ACCOUNTING_EXPORT_DATE)?'%d%m%Y':$conf->global->ACCOUNTING_EXPORT_DATE,
+                self::$EXPORT_TYPE_OPENCONCERTO => array(
+                    'label' => $langs->trans('Modelcsv_openconcerto'),
+                    'ACCOUNTING_EXPORT_FORMAT' => 'csv',
+                ),
+				self::$EXPORT_TYPE_SAGE50_SWISS => array(
+					'label' => $langs->trans('Modelcsv_Sage50_Swiss'),
+					'ACCOUNTING_EXPORT_FORMAT' => 'csv',
 				),
 				self::$EXPORT_TYPE_FEC => array(
 					'label' => $langs->trans('Modelcsv_FEC'),
 					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
 				),
-                self::$EXPORT_TYPE_OPENCONCERTO => array(
-                    'label' => $langs->trans('Modelcsv_openconcerto'),
-                    'ACCOUNTING_EXPORT_FORMAT' => 'csv',
-                ),
-                                self::$EXPORT_TYPE_SAGE50_SWISS => array(
-                                    'label' => $langs->trans('Modelcsv_Sage50_Swiss'),
-                                    'ACCOUNTING_EXPORT_FORMAT' => 'csv',
-                                ),
 			),
 			'cr'=> array (
 				'1' => $langs->trans("Unix"),
@@ -233,11 +227,9 @@ class AccountancyExport
 
 
 		switch ($conf->global->ACCOUNTING_EXPORT_MODELCSV) {
-			case self::$EXPORT_TYPE_NORMAL :
 			case self::$EXPORT_TYPE_CONFIGURABLE :
 				$this->exportConfigurable($TData);
 				break;
-			case self::$EXPORT_TYPE_NORMAL :
 			case self::$EXPORT_TYPE_CEGID :
 				$this->exportCegid($TData);
 				break;
@@ -918,9 +910,10 @@ class AccountancyExport
     }
 
 	/**
+	 * trunc
 	 *
-	 * @param string	$str 	data
-	 * @param integer 	$size 	data
+	 * @param string	$str 	String
+	 * @param integer 	$size 	Data to trunc
 	 * @return string
 	 */
 	public static function trunc($str, $size)
@@ -929,10 +922,11 @@ class AccountancyExport
 	}
 
 	/**
+	 * toAnsi
 	 *
-	 * @param unknown $str Original string to encode and optionaly truncate
-	 * @param integer $size truncate string after $size characters
-     * @return string String encoded in Windows-1251 charset
+	 * @param string	$str 		Original string to encode and optionaly truncate
+	 * @param integer 	$size 		Truncate string after $size characters
+     * @return string 				String encoded in Windows-1251 charset
 	 */
 	public static function toAnsi($str, $size = -1)
     {
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index a9009e725b8..73f3f9bbfc5 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -931,7 +931,7 @@ if (empty($action) || $action == 'view') {
 		if ($obj->nb > 0)
 		{
 			print '<br>'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
-			print ' : '.$langs->trans("AccountancyAreaDescBank", 9, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>');
+			print ' : '.$langs->trans("AccountancyAreaDescBank", 9, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>');
 		}
 	}
 	else dol_print_error($db);
@@ -942,7 +942,7 @@ if (empty($action) || $action == 'view') {
 		|| ($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1'
 		|| empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') {
 		print '<br>'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
-		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
 	}
 
 
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index d82381533cf..3f4632a0103 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -510,7 +510,7 @@ if (empty($action) || $action == 'view') {
 	// Button to write into Ledger
 	if (empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') {
 		print '<br>'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
-		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index cd82e9f2f27..66a54934e1c 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -745,7 +745,7 @@ if (empty($action) || $action == 'view') {
 	if (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
 		print '<br>';
 		print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
-		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 	if (! empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 3b0607d34a7..57a2ff1586b 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -682,7 +682,7 @@ if (empty($action) || $action == 'view') {
 	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
 		print '<br>';
 		print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
-		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 	if (! empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index b80349623e0..c3d92edefda 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1030,10 +1030,9 @@ if ($id)
     if ($id == 10 && empty($conf->global->FACTURE_TVAOPTION))
     {
     	print info_admin($langs->trans("VATIsUsedIsOff", $langs->transnoentities("Setup"), $langs->transnoentities("CompanyFoundation")));
+    	print "<br>\n";
     }
 
-    print "<br>\n";
-
     // Form to add a new line
     if ($tabname[$id])
     {
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index e28ea5e9af1..811fe663f8c 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2002  Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2018  Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2019  Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010  Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012       Vinícius Nogueira    <viniciusvgn@gmail.com>
  * Copyright (C) 2014       Florian Henry        <florian.henry@open-cooncept.pro>
@@ -45,6 +45,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
@@ -366,6 +367,7 @@ $formaccounting = new FormAccounting($db);
 $companystatic=new Societe($db);
 $bankaccountstatic=new Account($db);
 
+$banktransferstatic=new BonPrelevement($db);
 $societestatic=new Societe($db);
 $userstatic=new User($db);
 $chargestatic=new ChargeSociales($db);
@@ -1135,7 +1137,13 @@ if ($resql)
     	    $cachebankaccount=array();
     	    foreach($links as $key=>$val)
     	    {
-    	        if ($links[$key]['type']=='payment')
+    	    	if ($links[$key]['type']=='withdraw')
+    	    	{
+    	    		$banktransferstatic->id=$links[$key]['url_id'];
+    	    		$banktransferstatic->ref=$links[$key]['label'];
+    	    		print ' '.$banktransferstatic->getNomUrl(0);
+    	    	}
+    	    	elseif ($links[$key]['type']=='payment')
     	        {
     	            $paymentstatic->id=$links[$key]['url_id'];
     	            $paymentstatic->ref=$links[$key]['url_id'];    // FIXME This is id, not ref of payment
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index b462095278d..21cbd6dbfc4 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1174,28 +1174,72 @@ class BonPrelevement extends CommonObject
 	/**
 	 *	Returns clickable name (with picto)
 	 *
-	 *	@param	int		$withpicto	link with picto
-	 *	@param	string	$option		link target
-	 *	@return	string				URL of target
+     *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+     *  @param  string  $option                     On what the link point to ('nolink', ...)
+     *  @param  int     $notooltip                  1=Disable tooltip
+     *  @param  string  $morecss                    Add more css on link
+     *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								URL of target
 	 */
-	public function getNomUrl($withpicto = 0, $option = '')
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
-		global $langs;
+		global $conf, $langs, $hookmanager;
+
+		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
 
 		$result='';
-		$label = $langs->trans("ShowWithdraw").': '.$this->ref;
 
-		$link = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-		$linkend='</a>';
+		$label = '<u>' . $langs->trans("ShowWithdraw") . '</u>';
+		$label.= '<br>';
+		$label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
 
-		if ($option == 'xxx')
+		$url = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id;
+
+		if ($option != 'nolink')
 		{
-			$link = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-			$linkend='</a>';
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
 		}
 
-		if ($withpicto) $result.=($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
-		$result.=$link.$this->ref.$linkend;
+		$linkclose='';
+		if (empty($notooltip))
+		{
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowMyObject");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+
+			/*
+			 $hookmanager->initHooks(array('myobjectdao'));
+			 $parameters=array('id'=>$this->id);
+			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+			 */
+		}
+		else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
+		$linkend='</a>';
+
+		$result .= $linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.= $this->ref;
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+		global $action,$hookmanager;
+		$hookmanager->initHooks(array('myobjectdao'));
+		$parameters=array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook=$hookmanager->executeHooks('getNomUrl', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) $result = $hookmanager->resPrint;
+		else $result .= $hookmanager->resPrint;
+
 		return $result;
 	}
 
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index cb39150b627..c77158e07b7 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index e5e1aa71891..cbca2b2f103 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -69,8 +69,8 @@ WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
 BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal 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 payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"

From 29e3199639cda2bef5fcf7275ddc0bfc69b8573f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 13:39:29 +0200
Subject: [PATCH 082/133] Fix phpcs

---
 htdocs/core/lib/accounting.lib.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 24f71255fc5..c50ee1be869 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -24,21 +24,22 @@
  * 	\brief		Library of accountancy functions
  */
 
+
  /**
   *	Check if a value is empty with some options
   *
-	*	@param	allow_false : setting this to true will make the function consider a boolean value of false as NOT empty. This parameter is false by default.
-	*	@param	allow_ws :    setting this to true will make the function consider a string with nothing but white space as NOT empty. This parameter is false by default.
+  *	@param	allow_false : setting this to true will make the function consider a boolean value of false as NOT empty. This parameter is false by default.
+  *	@param	allow_ws :    setting this to true will make the function consider a string with nothing but white space as NOT empty. This parameter is false by default.
   *	@return	array				  Bool
-	* @author Michael - https://www.php.net/manual/fr/function.empty.php#90767
+  * @author Michael - https://www.php.net/manual/fr/function.empty.php#90767
   */
-	function is_empty($var, $allow_false = false, $allow_ws = false) {
-		if (!isset($var) || is_null($var) || ($allow_ws == false && trim($var) == "" && !is_bool($var)) || ($allow_false === false && is_bool($var) && $var === false) || (is_array($var) && empty($var))) {
-			return true;
-		} else {
-			return false;
-		}
+function is_empty($var, $allow_false = false, $allow_ws = false)
+{
+	if (!isset($var) || is_null($var) || ($allow_ws == false && trim($var) == "" && !is_bool($var)) || ($allow_false === false && is_bool($var) && $var === false) || (is_array($var) && empty($var))) {
+		return true;
 	}
+	return false;
+}
 
 /**
  *	Prepare array with list of tabs

From 4f9aa4caac8689194a6206db77590fa5eb06b97a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 13:53:31 +0200
Subject: [PATCH 083/133] Fix phpcs

---
 htdocs/compta/facture/list.php | 1 +
 htdocs/fourn/facture/list.php  | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 6c325c865a9..0a5efadd832 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1298,6 +1298,7 @@ if ($resql)
 	$filedir=$diroutputmassaction;
 	$genallowed=$user->rights->facture->lire;
 	$delallowed=$user->rights->facture->creer;
+	$title = '';
 
 	print $formfile->showdocuments('massfilesarea_invoices', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 102481b6adb..f72261a0802 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1138,13 +1138,14 @@ if ($resql)
 
     // Show list of available documents
     $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-    $urlsource.=str_replace('&amp;','&',$param);
+    $urlsource.=str_replace('&amp;', '&', $param);
 
     $filedir=$diroutputmassaction;
     $genallowed=$user->rights->facture->lire;
     $delallowed=$user->rights->facture->creer;
+    $title = '';
 
-    print $formfile->showdocuments('massfilesarea_supplier_invoice','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
+    print $formfile->showdocuments('massfilesarea_supplier_invoice', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 else
 {

From bb9b0d401e926ce1b066caa49680d692eeb39988 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 13:56:20 +0200
Subject: [PATCH 084/133] Fix phpcs

---
 htdocs/core/class/ccountry.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index ef89fbcd9b6..a551857ded4 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -47,8 +47,8 @@ class Ccountry // extends CommonObject
 	 */
 	public $errors = array();
 
-	var $element='ccountry';			//!< Id that identify managed objects
-	var $table_element='c_country';	//!< Name of table without prefix where object is stored
+	public $element='ccountry';			//!< Id that identify managed objects
+	public $table_element='c_country';	//!< Name of table without prefix where object is stored
 
     /**
 	 * @var int ID

From 6975e182331d76190fd58873094dfcd8f7b0015f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 13:59:04 +0200
Subject: [PATCH 085/133] Fix phpcs

---
 htdocs/core/lib/accounting.lib.php | 7 ++++---
 htdocs/product/list.php            | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index c50ee1be869..9619bee580f 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -28,10 +28,11 @@
  /**
   *	Check if a value is empty with some options
   *
-  *	@param	allow_false : setting this to true will make the function consider a boolean value of false as NOT empty. This parameter is false by default.
-  *	@param	allow_ws :    setting this to true will make the function consider a string with nothing but white space as NOT empty. This parameter is false by default.
-  *	@return	array				  Bool
   * @author Michael - https://www.php.net/manual/fr/function.empty.php#90767
+  *	@param	mixed		$var			Value to test
+  * @param	int|null	$allow_false 	Setting this to true will make the function consider a boolean value of false as NOT empty. This parameter is false by default.
+  *	@param	int|null	$allow_ws 		Setting this to true will make the function consider a string with nothing but white space as NOT empty. This parameter is false by default.
+  *	@return	boolean				  		True of False
   */
 function is_empty($var, $allow_false = false, $allow_ws = false)
 {
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 5e348c2fe70..7d766452186 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1002,7 +1002,7 @@ if ($resql)
         if (! empty($arrayfields['p.tva_tx']['checked']))
         {
             print '<td class="right">';
-            print vatrate($obj->tva_tx,true);
+            print vatrate($obj->tva_tx, true);
             print '</td>';
             if (! $i) $totalarray['nbfield']++;
         }

From ff0f6295d8bcd46e25b94c65cecdce97a707f377 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 13:59:53 +0200
Subject: [PATCH 086/133] Fix phpcs

---
 htdocs/core/lib/accounting.lib.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index c50ee1be869..9545b6961fd 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -25,14 +25,15 @@
  */
 
 
- /**
-  *	Check if a value is empty with some options
-  *
-  *	@param	allow_false : setting this to true will make the function consider a boolean value of false as NOT empty. This parameter is false by default.
-  *	@param	allow_ws :    setting this to true will make the function consider a string with nothing but white space as NOT empty. This parameter is false by default.
-  *	@return	array				  Bool
-  * @author Michael - https://www.php.net/manual/fr/function.empty.php#90767
-  */
+/**
+ *	Check if a value is empty with some options
+ *
+ * @author Michael - https://www.php.net/manual/fr/function.empty.php#90767
+ * @param	mixed		$var			Value to test
+ * @param	int|null	$allow_false 	Setting this to true will make the function consider a boolean value of false as NOT empty. This parameter is false by default.
+ * @param	int|null	$allow_ws 		Setting this to true will make the function consider a string with nothing but white space as NOT empty. This parameter is false by default.
+ * @return	boolean				  		True of False
+ */
 function is_empty($var, $allow_false = false, $allow_ws = false)
 {
 	if (!isset($var) || is_null($var) || ($allow_ws == false && trim($var) == "" && !is_bool($var)) || ($allow_false === false && is_bool($var) && $var === false) || (is_array($var) && empty($var))) {

From faadae8157a2f6731fd8323e73ec52ba527b5bb5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 15:59:45 +0200
Subject: [PATCH 087/133] Code comment

---
 htdocs/install/mysql/tables/llx_paiement.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql
index 9f40cb2cfc9..a57c345c968 100644
--- a/htdocs/install/mysql/tables/llx_paiement.sql
+++ b/htdocs/install/mysql/tables/llx_paiement.sql
@@ -28,7 +28,7 @@ create table llx_paiement
   datep            datetime,							-- payment date
   amount           double(24,8) DEFAULT 0,				-- amount paid in Dolibarr currency
   multicurrency_amount double(24,8) DEFAULT 0,			-- amount paid in invoice currency	
-  fk_paiement      integer NOT NULL,
+  fk_paiement      integer NOT NULL,					-- type of payment in llx_c_paiement
   num_paiement     varchar(50),
   note             text,
   ext_payment_id   varchar(128),						-- external id of payment (for example Stripe charge id)

From c521b9b8f8285e5e2ece2f034bada99489b6dcd3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 16:58:51 +0200
Subject: [PATCH 088/133] Fix dispatch in ledger table of withdraw / direct
 debit payment

---
 htdocs/accountancy/journal/bankjournal.php    | 56 ++++++++++++++++---
 .../journal/expensereportsjournal.php         |  4 --
 .../accountancy/journal/purchasesjournal.php  |  2 -
 htdocs/accountancy/journal/sellsjournal.php   |  2 -
 .../compta/paiement/class/paiement.class.php  | 46 +++++++++++++--
 htdocs/langs/en_US/accountancy.lang           |  3 +-
 6 files changed, 90 insertions(+), 23 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 73f3f9bbfc5..6b5d63bce0f 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -107,8 +107,6 @@ if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end)
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$idpays = $mysoc->country_id;
-
 $sql  = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type, b.fk_account,";
 $sql .= " ba.courant, ba.ref as baref, ba.account_number, ba.fk_accountancy_journal,";
 $sql .= " soc.code_compta, soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, soc.email as email, bu1.type as typeop_company,";
@@ -154,6 +152,9 @@ $paymentloanstatic = new PaymentLoan($db);
 $accountLinestatic=new AccountLine($db);
 $paymentsubscriptionstatic = new Subscription($db);
 
+$tmppayment = new Paiement($db);
+$tmpinvoice = new Facture($db);
+
 $accountingaccount = new AccountingAccount($db);
 
 // Get code of finance journal
@@ -185,13 +186,14 @@ if ($result) {
 	$tabbq = array ();
 	$tabtp = array ();
 	$tabtype = array ();
+	$tabmoreinfo = array();
 
 	// Loop on each line into llx_bank table. For each line, we should get:
 	// one line tabpay = line into bank
 	// one line for bank record = tabbq
 	// one line for thirdparty record = tabtp
 	$i = 0;
-	while ( $i < $num )
+	while ($i < $num)
 	{
 		$obj = $db->fetch_object($result);
 
@@ -215,7 +217,7 @@ if ($result) {
 		// Set accountancy code for bank
 		$compta_bank = $obj->account_number;
 
-		// Set accountancy code for thirdparty
+		// Set accountancy code for thirdparty (example: '411CU...' or '411' if no subledger account defined on customer)
 		$compta_soc = 'NotDefined';
 		if ($lineisapurchase > 0)
 			$compta_soc = (($obj->code_compta_fournisseur != "") ? $obj->code_compta_fournisseur : $account_supplier);
@@ -257,10 +259,12 @@ if ($result) {
 
 		//var_dump($i);
 		//var_dump($tabpay);
+		//var_dump($tabcompany);
 
 		// By default
 		$tabpay[$obj->rowid]['type'] = 'unknown';	// Can be SOLD, miscellaneous entry, payment of patient, or any old record with no links in bank_url.
 		$tabtype[$obj->rowid] = 'unknown';
+		$tabmoreinfo[$obj->rowid] = array();
 
 		// get_url may return -1 which is not traversable
 		if (is_array($links) && count($links) > 0) {
@@ -285,11 +289,17 @@ if ($result) {
 					}
 				}
 
+				if ($links[$key]['type'] == 'withdraw') {
+					$tabmoreinfo[$obj->rowid]['withdraw']=1;
+				}
+
 				if ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
 					$paymentstatic->ref = $links[$key]['url_id'];
 					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2, '', '');		// TODO Do not include list of invoice in tooltip, the dol_string_nohtmltag is ko with this
 					$tabpay[$obj->rowid]["paymentid"] = $paymentstatic->id;
+
+
 				} elseif ($links[$key]['type'] == 'payment_supplier') {
 					$paymentsupplierstatic->id = $links[$key]['url_id'];
 					$paymentsupplierstatic->ref = $links[$key]['url_id'];
@@ -411,8 +421,30 @@ if ($result) {
 
 		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
 
-		// If not links were found to know amount on thirdparty, we init it.
-		if (empty($tabtp[$obj->rowid])) $tabtp[$obj->rowid]['NotDefined']= $tabbq[$obj->rowid][$compta_bank];
+		// If no links were found to know the amount on thirdparty, we try to guess it.
+		// This may happens on bank entries without the links lines to 'company'.
+		if (empty($tabtp[$obj->rowid]) && ! empty($tabmoreinfo[$obj->rowid]['withdraw']))	// If we dont find 'company' link because it is an old 'withdraw' record
+		{
+			foreach ($links as $key => $val) {
+				if ($links[$key]['type'] == 'payment') {
+					// Get thirdparty
+					$tmppayment->fetch($links[$key]['url_id']);
+					$arrayofamounts = $tmppayment->getAmountsArray();
+					foreach($arrayofamounts as $invoiceid => $amount)
+					{
+						$tmpinvoice->fetch($invoiceid);
+						$tmpinvoice->fetch_thirdparty();
+						if ($tmpinvoice->thirdparty->code_compta)
+						{
+							$tabtp[$obj->rowid][$tmpinvoice->thirdparty->code_compta] += $amount;
+						}
+					}
+				}
+			}
+		}
+
+		// If no links were found to know the amount on thirdparty, we init it to account 'NotDefined'.
+		if (empty($tabtp[$obj->rowid])) $tabtp[$obj->rowid]['NotDefined'] = $tabbq[$obj->rowid][$compta_bank];
 
 		// Check account number is ok
 		/*if ($action == 'writebookkeeping')		// Make test now in such a case
@@ -701,6 +733,7 @@ if (! $error && $action == 'writebookkeeping') {
 						$totalcredit += $bookkeeping->credit;
 
 						$result = $bookkeeping->create($user);
+
 						if ($result < 0) {
 							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
 							{
@@ -1071,7 +1104,6 @@ if (empty($action) || $action == 'view') {
 					if ($tabtype[$key] == 'payment_salary')			$account_ledger = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
 					if ($tabtype[$key] == 'payment_vat')			$account_ledger = $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT;
 					if ($tabtype[$key] == 'member')					$account_ledger = $conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT;
-
 					$accounttoshow = length_accounta($account_ledger);
 					if (empty($accounttoshow) || $accounttoshow == 'NotDefined')
 					{
@@ -1104,6 +1136,7 @@ if (empty($action) || $action == 'view') {
 					print "</td>";
 					// Subledger account
 					print "<td>";
+
 					if (in_array($tabtype[$key], array('payment', 'payment_supplier', 'payment_expensereport', 'payment_salary')))	// Type of payment with subledger
 					{
 						$accounttoshowsubledger = length_accounta($k);
@@ -1115,7 +1148,14 @@ if (empty($action) || $action == 'view') {
 								var_dump($tabtype[$key]);
 								var_dump($tabbq[$key]);*/
 								//print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-								print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown").'</span>';
+								if (! empty($tabcompany[$key]['code_compta']))
+								{
+									print '<span class="warning">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'</span>';
+								}
+								else
+								{
+									print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking").'</span>';
+								}
 							}
 							else print $accounttoshowsubledger;
 						}
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 3f4632a0103..c06506c0895 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -87,15 +87,11 @@ if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end)
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$idpays = $mysoc->country_id;
-
 $sql = "SELECT er.rowid, er.ref, er.date_debut as de,";
 $sql .= " erd.rowid as erdid, erd.comments, erd.total_ht, erd.total_tva, erd.total_localtax1, erd.total_localtax2, erd.tva_tx, erd.total_ttc, erd.fk_code_ventilation, erd.vat_src_code, ";
 $sql .= " u.rowid as uid, u.firstname, u.lastname, u.accountancy_code as user_accountancy_account,";
 $sql .= " f.accountancy_code, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
-//$sql .= " ct.accountancy_code_buy as account_tva";
 $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport_det as erd";
-//$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON erd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_type_fees as f ON f.id = erd.fk_c_type_fees";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = erd.fk_code_ventilation";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 66a54934e1c..8ff70219c68 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -92,8 +92,6 @@ if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end)
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$idpays = $mysoc->country_id;
-
 $sql = "SELECT f.rowid, f.ref as ref, f.type, f.datef as df, f.libelle,f.ref_supplier, f.date_lim_reglement as dlf, f.close_code,";
 $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tva as total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 57a2ff1586b..b69f485a558 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -95,8 +95,6 @@ if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end)
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$idpays = $mysoc->country_id;
-
 $sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.ref_client, f.date_lim_reglement as dlr, f.close_code,";
 $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 28417a6d4f1..a3c79d23602 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -991,16 +991,16 @@ class Paiement extends CommonObject
     }
 
 	/**
-	 *  Retourne la liste des factures sur lesquels porte le paiement
+	 *  Return list of invoices the payment is related to.
 	 *
-	 *  @param	string	$filter         Critere de filtre
-	 *  @return array					Tableau des id de factures
+	 *  @param	string		$filter         Filter
+	 *  @return int|array					<0 if KO or array of invoice id
 	 */
     public function getBillsArray($filter = '')
     {
-		$sql = 'SELECT fk_facture';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'facture as f';
-		$sql.= ' WHERE pf.fk_facture = f.rowid AND fk_paiement = '.$this->id;
+		$sql = 'SELECT pf.fk_facture';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'facture as f';	// We keep link on invoice to allow use of some filters on invoice
+		$sql.= ' WHERE pf.fk_facture = f.rowid AND pf.fk_paiement = '.$this->id;
 		if ($filter) $sql.= ' AND '.$filter;
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -1026,6 +1026,40 @@ class Paiement extends CommonObject
 		}
     }
 
+    /**
+     *  Return list of amounts of payments.
+     *
+     *  @return int|array					Array of amount of payments
+     */
+    public function getAmountsArray()
+    {
+    	$sql = 'SELECT pf.fk_facture, pf.amount';
+    	$sql.= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
+    	$sql.= ' WHERE pf.fk_paiement = '.$this->id;
+    	$resql = $this->db->query($sql);
+    	if ($resql)
+    	{
+    		$i=0;
+    		$num=$this->db->num_rows($resql);
+    		$amounts = array();
+
+    		while ($i < $num)
+    		{
+    			$obj = $this->db->fetch_object($resql);
+    			$amounts[$obj->fk_facture]=$obj->amount;
+    			$i++;
+    		}
+
+    		return $amounts;
+    	}
+    	else
+    	{
+    		$this->error=$this->db->error();
+    		dol_syslog(get_class($this).'::getAmountsArray Error '.$this->error.' -', LOG_DEBUG);
+    		return -1;
+    	}
+    }
+
 	/**
 	 *      Return next reference of customer invoice not already used (or last reference)
 	 *      according to numbering module defined into constant FACTURE_ADDON
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 3a08e422600..3bb0df59812 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+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=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 

From 6b5d4774769340de855afa9d3b161496c474137e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 17:14:04 +0200
Subject: [PATCH 089/133] Fix search criteria lost after a delete

---
 htdocs/accountancy/bookkeeping/list.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 733aea9ac1c..55c9c7386c3 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -309,8 +309,10 @@ if ($action == 'delbookkeeping') {
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		Header("Location: list.php");
-		exit();
+
+		// Make a redirect to avoid to launch the delete later after a back button
+		header("Location: list.php".($param?'?'.$param:''));
+		exit;
 	}
 }
 if ($action == 'delbookkeepingyearconfirm') {
@@ -334,14 +336,14 @@ if ($action == 'delbookkeepingyearconfirm') {
 		{
 			setEventMessages("RecordDeleted", null, 'mesgs');
 		}
-		Header("Location: list.php");
+
+		// Make a redirect to avoid to launch the delete later after a back button
+		header("Location: list.php".($param?'?'.$param:''));
 		exit;
 	}
 	else
 	{
 		setEventMessages("NoRecordDeleted", null, 'warnings');
-		Header("Location: list.php");
-		exit;
 	}
 }
 if ($action == 'delmouvconfirm') {
@@ -358,7 +360,7 @@ if ($action == 'delmouvconfirm') {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
 
-		Header("Location: list.php?noreset=1".($param?'&'.$param:''));
+		header("Location: list.php?noreset=1".($param?'&'.$param:''));
 		exit;
 	}
 }
@@ -481,7 +483,7 @@ if ($action == 'delbookkeepingyear') {
 			'default' => $deljournal
 	);
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, 0, 1, 250);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, 0, 1, 250);
 	print $formconfirm;
 }
 
@@ -817,8 +819,8 @@ if ($num > 0)
 		// Action column
 		print '<td class="nowraponall center">';
         if(empty($line->date_export)) {
-		    print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . $param . '&page=' . $page . ($sortfield ? '&sortfield='.$sortfield : '') . ($sortorder ? '&sortorder='.$sortorder : '') . '">' . img_edit() . '</a>&nbsp;';
-		    print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $param . '&page=' . $page . ($sortfield ? '&sortfield='.$sortfield : '') . ($sortorder ? '&sortorder='.$sortorder : '') . '">' . img_delete() . '</a>';
+		    print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num=' . urlencode($line->piece_num) . $param . '&page=' . $page . ($sortfield ? '&sortfield='.$sortfield : '') . ($sortorder ? '&sortorder='.$sortorder : '') . '">' . img_edit() . '</a>&nbsp;';
+		    print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . urlencode($line->piece_num) . $param . '&page=' . $page . ($sortfield ? '&sortfield='.$sortfield : '') . ($sortorder ? '&sortorder='.$sortorder : '') . '">' . img_delete() . '</a>';
         }
         print '</td>';
 		if (! $i) $totalarray['nbfield']++;

From d47cf87c00ea7310b0956ce0495bb7e9882a2f51 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 17:59:28 +0200
Subject: [PATCH 090/133] Look and feel v10

---
 htdocs/accountancy/bookkeeping/card.php     |  4 ++--
 htdocs/accountancy/bookkeeping/list.php     |  6 +++---
 htdocs/accountancy/journal/bankjournal.php  | 19 +++++++++----------
 htdocs/compta/bank/various_payment/card.php |  2 +-
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index a84a2b2e5b1..b0adb2e2ad1 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -626,7 +626,7 @@ if ($action == 'create')
 						}
 						else
 						{
-							print '<input type="text" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'">';
+							print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'">';
 						}
 						print '</td>';
 						print '<td><input type="text" class="minwidth200" name="label_operation" value="' . (GETPOSTISSET("label_operation") ? GETPOST("label_operation", "alpha") : $line->label_operation). '"></td>';
@@ -683,7 +683,7 @@ if ($action == 'create')
 					}
 					else
 					{
-						print '<input type="text" name="subledger_account" value="">';
+						print '<input type="text" class="maxwidth150" name="subledger_account" value="">';
 					}
 					print '</td>';
 					print '<td><input type="text" class="minwidth200" name="label_operation" value="'.$label_operation.'"/></td>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 55c9c7386c3..4fc30bb0c30 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -512,7 +512,7 @@ if (! empty($conf->global->ACCOUNTING_REEXPORT)) {
 } else {
     $newcardbutton ='<a href="'.$_SERVER['PHP_SELF'].'?action=setreexport&value=1'.($param?'&'.$param:'').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a> ';
 }
-$newcardbutton.= $langs->trans("IncludeDocsAlreadyExported");
+$newcardbutton.= '<span class="valignmiddle marginrightonly">'.$langs->trans("IncludeDocsAlreadyExported").'</span>';
 
 $newcardbutton.= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$conf->global->ACCOUNTING_EXPORT_MODELCSV].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file'.($param?'&'.$param:''));
 
@@ -583,7 +583,7 @@ if (! empty($arrayfields['t.subledger_account']['checked']))
 	}
 	else
 	{
-		print '<input type="text" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'">';
+		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'">';
 	}
 	print '</div>';
 	print '<div class="nowrap">';
@@ -596,7 +596,7 @@ if (! empty($arrayfields['t.subledger_account']['checked']))
 	}
 	else
 	{
-		print '<input type="text" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'">';
+		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'">';
 	}
 	print '</div>';
 	print '</td>';
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 6b5d63bce0f..cfe49764c74 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -298,8 +298,6 @@ if ($result) {
 					$paymentstatic->ref = $links[$key]['url_id'];
 					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2, '', '');		// TODO Do not include list of invoice in tooltip, the dol_string_nohtmltag is ko with this
 					$tabpay[$obj->rowid]["paymentid"] = $paymentstatic->id;
-
-
 				} elseif ($links[$key]['type'] == 'payment_supplier') {
 					$paymentsupplierstatic->id = $links[$key]['url_id'];
 					$paymentsupplierstatic->ref = $links[$key]['url_id'];
@@ -473,11 +471,12 @@ if ($result) {
 	dol_print_error($db);
 }
 
-/*
-var_dump($tabpay);
+
+/*var_dump($tabpay);
+var_dump($tabcompany);
 var_dump($tabbq);
 var_dump($tabtp);
-*/
+var_dump($tabtype);*/
 
 // Write bookkeeping
 if (! $error && $action == 'writebookkeeping') {
@@ -593,15 +592,15 @@ if (! $error && $action == 'writebookkeeping') {
 						$bookkeeping->date_create = $now;
 
 						if ($tabtype[$key] == 'payment') {	// If payment is payment of customer invoice, we get ref of invoice
-							$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
-							$bookkeeping->subledger_label = $tabcompany[$key]['name'];
+							$bookkeeping->subledger_account = $k;							// For payment, the subledger account is stored as $key of $tabtp
+							$bookkeeping->subledger_label = $tabcompany[$key]['name'];		// $tabcompany is defined only if we are sure there is 1 thirdparty for the bank transaction
 							$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
 
 							$accountingaccount->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER, true);
 							$bookkeeping->label_compte = $accountingaccount->label;
-						} elseif ($tabtype[$key] == 'payment_supplier') {		   // If payment is payment of supplier invoice, we get ref of invoice
-							$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
-							$bookkeeping->subledger_label = $tabcompany[$key]['name'];
+						} elseif ($tabtype[$key] == 'payment_supplier') {	// If payment is payment of supplier invoice, we get ref of invoice
+							$bookkeeping->subledger_account = $k;				   			// For payment, the subledger account is stored as $key of $tabtp
+							$bookkeeping->subledger_label = $tabcompany[$key]['name'];		// $tabcompany is defined only if we are sure there is 1 thirdparty for the bank transaction
 							$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
 
 							$accountingaccount->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER, true);
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 2d911b5c6bb..67f1e2909fc 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -382,7 +382,7 @@ if ($action == 'create')
         }
         else
         {
-            print '<input type="text" name="subledger_account" value="'.$subledger_account.'">';
+            print '<input type="text" class="maxwidth200" name="subledger_account" value="'.$subledger_account.'">';
         }
         print '</td></tr>';
     }

From e28bf7196402c974fb35e7f00b6fe693f19b37d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 18:15:14 +0200
Subject: [PATCH 091/133] Fix error management of warehouse->delete

---
 htdocs/product/stock/class/entrepot.class.php | 38 +++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 0032d17f97e..608d62c1ed4 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -262,6 +262,10 @@ class Entrepot extends CommonObject
 	 */
 	public function delete($user, $notrigger = 0)
 	{
+		$error = 0;
+
+		dol_syslog(get_class($this)."::delete id=".$this->id, LOG_DEBUG);
+
 		$this->db->begin();
 
 		if (! $error && empty($notrigger))
@@ -279,7 +283,7 @@ class Entrepot extends CommonObject
 			{
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
 				$sql.= " WHERE fk_entrepot = " . $this->id;
-				dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+
 				$result=$this->db->query($sql);
 				if (! $result)
 				{
@@ -294,31 +298,35 @@ class Entrepot extends CommonObject
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."entrepot";
 			$sql.= " WHERE rowid = " . $this->id;
 
-			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql1=$this->db->query($sql);
+			if (! $resql1)
+			{
+				$error++;
+				$this->errors[] = $this->db->lasterror();
+			}
+		}
 
+		if (! $error)
+		{
 			// Update denormalized fields because we change content of produt_stock. Warning: Do not use "SET p.stock", does not works with pgsql
 			$sql = "UPDATE ".MAIN_DB_PREFIX."product as p SET stock = (SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock as ps WHERE ps.fk_product = p.rowid)";
 
-			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql2=$this->db->query($sql);
+			if (! $resql2)
+			{
+				$error++;
+				$this->errors[] = $this->db->lasterror();
+			}
+		}
 
-			if ($resql1 && $resql2)
-			{
-				$this->db->commit();
-				return 1;
-			}
-			else
-			{
-				$this->db->rollback();
-				$this->error=$this->db->lasterror();
-				return -2;
-			}
+		if (! $error)
+		{
+			$this->db->commit();
+			return 1;
 		}
 		else
 		{
 			$this->db->rollback();
-			$this->error=$this->db->lasterror();
 			return -1;
 		}
 	}

From 495604fa83b100705434338d59c648437a64acb9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 18:16:49 +0200
Subject: [PATCH 092/133] Fix phpunit

---
 test/phpunit/EntrepotTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/phpunit/EntrepotTest.php b/test/phpunit/EntrepotTest.php
index 9672123f103..16555d88e39 100644
--- a/test/phpunit/EntrepotTest.php
+++ b/test/phpunit/EntrepotTest.php
@@ -211,6 +211,7 @@ class EntrepotTest extends PHPUnit_Framework_TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
+		//$this->assertLessThan(1, 0);
 
         return $localobject->id;
     }
@@ -257,6 +258,8 @@ class EntrepotTest extends PHPUnit_Framework_TestCase
 
         $localobject=new Entrepot($db);
 
+        //$this->assertLessThan(1, 0);
+
         return;
     }
 }

From b111636ed0fe4ff2062886ee69aaa83bd60a5ffe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jun 2019 18:32:25 +0200
Subject: [PATCH 093/133] Fix trans

---
 htdocs/langs/en_US/stocks.lang | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index fd89d432360..d42f1a82243 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -66,10 +66,12 @@ RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual
 DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
 DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
 ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
 ReStockOnValidateOrder=Increase real stocks on purchase order approval
 ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.

From b0c76f48e1c203d7c508701b33d87b456082e64c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jun 2019 09:38:26 +0200
Subject: [PATCH 094/133] error management

---
 htdocs/product/stock/class/entrepot.class.php | 2 ++
 test/phpunit/EntrepotTest.php                 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 593b5f1bcea..e857166e392 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -346,6 +346,7 @@ class Entrepot extends CommonObject
 			{
 				$error++;
 				$this->errors[] = $this->db->lasterror();
+				dol_syslog(get_class($this)."::delete Error ".$this->db->lasterror(), LOG_ERR);
 			}
 		}
 
@@ -358,6 +359,7 @@ class Entrepot extends CommonObject
 			{
 				$error++;
 				$this->errors[] = $this->db->lasterror();
+				dol_syslog(get_class($this)."::delete Error ".$this->db->lasterror(), LOG_ERR);
 			}
 		}
 
diff --git a/test/phpunit/EntrepotTest.php b/test/phpunit/EntrepotTest.php
index 16555d88e39..a2c0e78ee96 100644
--- a/test/phpunit/EntrepotTest.php
+++ b/test/phpunit/EntrepotTest.php
@@ -238,7 +238,7 @@ class EntrepotTest extends PHPUnit_Framework_TestCase
 
     	$result=$localobject->delete($user);
 		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+    	$this->assertLessThan($result, 0, $localobject->errorsToString());
 
     	return $result;
     }

From 6f35c53f3ab25247df5812b81b0b8a0dc1ec4281 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jun 2019 09:44:05 +0200
Subject: [PATCH 095/133] Prepare v11

---
 .travis.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 63e48a051f0..b710e17c773 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -164,12 +164,6 @@ before_script:
     echo
     echo "Set timezone"
     echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
-    if [ "$TRAVIS_PHP_VERSION" = '5.4' ]; then
-      # Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0, 7.1, 7.2 and nightly!
-      echo
-      echo "Enabling Memcached for PHP <= 5.4"
-      echo 'extension = memcached.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
-    fi
     phpenv rehash
     echo
 
@@ -350,6 +344,9 @@ script:
   php upgrade.php 9.0.0 10.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log
   php upgrade2.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
   php step5.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log
+  php upgrade.php 10.0.0 11.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log
+  php upgrade2.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
+  php step5.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log
   # Enable modules not enabled into original dump
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKETSUP,MAIN_MODULE_ACCOUNTING > $TRAVIS_BUILD_DIR/enablemodule.log
   echo $?

From 9093be2f0a796885ccc571472b423f628abb6969 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jun 2019 11:23:49 +0200
Subject: [PATCH 096/133] FIX Add missing end date of subscription in export

---
 htdocs/core/modules/modAdherent.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index bc01990d659..b1dd10ebe17 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -278,9 +278,9 @@ class modAdherent extends DolibarrModules
         $this->export_code[$r]=$this->rights_class.'_'.$r;
         $this->export_label[$r]='MembersAndSubscriptions';
         $this->export_permission[$r]=array(array("adherent","export"));
-        $this->export_fields_array[$r]=array('a.rowid'=>'Id','a.civility'=>"UserTitle",'a.lastname'=>"Lastname",'a.firstname'=>"Firstname",'a.login'=>"Login",'a.morphy'=>'Nature','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'d.nom'=>"State",'co.code'=>"CountryCode",'co.label'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status",'a.photo'=>"Photo",'a.note_public'=>"NotePublic",'a.note_private'=>"NotePrivate",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation','a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel','c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.subscription'=>'Amount');
-        $this->export_TypeFields_array[$r]=array('a.civility'=>"Text",'a.lastname'=>"Text",'a.firstname'=>"Text",'a.login'=>"Text",'a.morphy'=>'Text','a.societe'=>'Text','a.address'=>"Text",'a.zip'=>"Text",'a.town'=>"Text",'d.nom'=>"Text",'co.code'=>'Text','co.label'=>"Text",'a.phone'=>"Text",'a.phone_perso'=>"Text",'a.phone_mobile'=>"Text",'a.email'=>"Text",'a.birth'=>"Date",'a.statut'=>"Status",'a.note_public'=>"Text",'a.note_private'=>"Text",'a.datec'=>'Date','a.datevalid'=>'Date','a.tms'=>'Date','a.datefin'=>'Date','ta.rowid'=>'List:adherent_type:libelle','ta.libelle'=>'Text','c.rowid'=>'Numeric','c.dateadh'=>'Date','c.subscription'=>'Numeric');
-        $this->export_entities_array[$r]=array('a.rowid'=>'member','a.civility'=>"member",'a.lastname'=>"member",'a.firstname'=>"member",'a.login'=>"member",'a.morphy'=>'member','a.societe'=>'member','a.address'=>"member",'a.zip'=>"member",'a.town'=>"member",'d.nom'=>"member",'co.code'=>"member",'co.label'=>"member",'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.birth'=>"member",'a.statut'=>"member",'a.photo'=>"member",'a.note_public'=>"member",'a.note_private'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member','a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.subscription'=>'subscription');
+        $this->export_fields_array[$r]=array('a.rowid'=>'Id','a.civility'=>"UserTitle",'a.lastname'=>"Lastname",'a.firstname'=>"Firstname",'a.login'=>"Login",'a.morphy'=>'Nature','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'d.nom'=>"State",'co.code'=>"CountryCode",'co.label'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status",'a.photo'=>"Photo",'a.note_public'=>"NotePublic",'a.note_private'=>"NotePrivate",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation','a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel','c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.datef'=>'DateEndSubscription','c.subscription'=>'Amount');
+        $this->export_TypeFields_array[$r]=array('a.civility'=>"Text",'a.lastname'=>"Text",'a.firstname'=>"Text",'a.login'=>"Text",'a.morphy'=>'Text','a.societe'=>'Text','a.address'=>"Text",'a.zip'=>"Text",'a.town'=>"Text",'d.nom'=>"Text",'co.code'=>'Text','co.label'=>"Text",'a.phone'=>"Text",'a.phone_perso'=>"Text",'a.phone_mobile'=>"Text",'a.email'=>"Text",'a.birth'=>"Date",'a.statut'=>"Status",'a.note_public'=>"Text",'a.note_private'=>"Text",'a.datec'=>'Date','a.datevalid'=>'Date','a.tms'=>'Date','a.datefin'=>'Date','ta.rowid'=>'List:adherent_type:libelle','ta.libelle'=>'Text','c.rowid'=>'Numeric','c.dateadh'=>'Date','c.datef'=>'Date','c.subscription'=>'Numeric');
+        $this->export_entities_array[$r]=array('a.rowid'=>'member','a.civility'=>"member",'a.lastname'=>"member",'a.firstname'=>"member",'a.login'=>"member",'a.morphy'=>'member','a.societe'=>'member','a.address'=>"member",'a.zip'=>"member",'a.town'=>"member",'d.nom'=>"member",'co.code'=>"member",'co.label'=>"member",'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.birth'=>"member",'a.statut'=>"member",'a.photo'=>"member",'a.note_public'=>"member",'a.note_private'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member','a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.datef'=>'subscription','c.subscription'=>'subscription');
         // Add extra fields
         $keyforselect='adherent'; $keyforelement='member'; $keyforaliasextra='extra';
         include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';

From f9095408b67320c0b6527e0875b695cde60f0474 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jun 2019 13:25:40 +0200
Subject: [PATCH 097/133] Fix sort order of export profiles Add missing pos
 information into export of invoice Add missing label of project in export of
 invoice

---
 htdocs/core/modules/modCommande.class.php     |  2 +-
 .../core/modules/modDynamicPrices.class.php   |  1 +
 .../core/modules/modExpenseReport.class.php   |  2 +-
 htdocs/core/modules/modFacture.class.php      | 36 ++++++++++++++-----
 htdocs/core/modules/modFicheinter.class.php   |  2 +-
 htdocs/core/modules/modFournisseur.class.php  |  2 +-
 htdocs/core/modules/modHoliday.class.php      |  2 +-
 htdocs/core/modules/modProduct.class.php      |  2 +-
 htdocs/core/modules/modProjet.class.php       |  2 +-
 htdocs/core/modules/modPropale.class.php      |  2 +-
 htdocs/core/modules/modReception.class.php    |  4 +--
 htdocs/core/modules/modResource.class.php     |  2 +-
 htdocs/core/modules/modService.class.php      |  2 +-
 htdocs/core/modules/modSociete.class.php      |  2 +-
 .../modules/modSupplierProposal.class.php     |  1 +
 htdocs/core/modules/modSyslog.class.php       |  2 +-
 htdocs/core/modules/modUser.class.php         |  2 +-
 htdocs/exports/export.php                     | 16 ++++-----
 18 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 025bbf0a50c..ea70a9f4103 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -51,7 +51,7 @@ class modCommande extends DolibarrModules
 		$this->numero = 25;
 
 		$this->family = "crm";
-		$this->module_position = '30';
+		$this->module_position = '23';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion des commandes clients";
diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php
index 708f0fb86a7..92b79f3ffb8 100644
--- a/htdocs/core/modules/modDynamicPrices.class.php
+++ b/htdocs/core/modules/modDynamicPrices.class.php
@@ -42,6 +42,7 @@ class modDynamicPrices extends DolibarrModules
         $this->numero = 2200;
 
         $this->family = "products";
+        $this->module_position = '85';
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
         $this->name = preg_replace('/^mod/i', '', get_class($this));
         $this->description = "Enable the usage of math expressions for prices";
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index 6a2ba294b7e..0d8fa008c6b 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -44,7 +44,7 @@ class modExpenseReport extends DolibarrModules
 		$this->numero = 770;
 
 		$this->family = "hr";
-		$this->module_position = '40';
+		$this->module_position = '42';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 106de48e96d..88343d8df49 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -218,7 +218,7 @@ class modFacture extends DolibarrModules
 			'f.type'=>"Type", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>"DateDue", 'f.total'=>"TotalHT",
 			'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'f.localtax1'=>'LocalTax1', 'f.localtax2'=>'LocalTax2', 'none.rest'=>'Rest', 'f.paye'=>"InvoicePaid", 'f.fk_statut'=>'InvoiceStatus',
 			'f.note_private'=>"NotePrivate", 'f.note_public'=>"NotePublic", 'f.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin',
-			'f.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'fd.rowid'=>'LineId', 'fd.description'=>"LineDescription",
+			'f.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'pj.title'=>'ProjectLabel', 'fd.rowid'=>'LineId', 'fd.description'=>"LineDescription",
 			'fd.subprice'=>"LineUnitPrice", 'fd.tva_tx'=>"LineVATRate", 'fd.qty'=>"LineQty", 'fd.total_ht'=>"LineTotalHT", 'fd.total_tva'=>"LineTotalVAT",
 			'fd.total_ttc'=>"LineTotalTTC", 'fd.date_start'=>"DateStart", 'fd.date_end'=>"DateEnd", 'fd.special_code'=>'SpecialCode',
 			'fd.product_type'=>"TypeOfLineServiceOrProduct", 'fd.fk_product'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel',
@@ -232,21 +232,31 @@ class modFacture extends DolibarrModules
 		    $this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
 		    $this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
+		if (! empty($conf->cashdesk->enabled) || ! empty($conf->takepos->enabled) || ! empty($conf->global->INVOICE_SHOW_POS_IN_EXPORT))
+		{
+			$this->export_fields_array[$r]['f.module_source']='POSModule';
+			$this->export_fields_array[$r]['f.pos_source']='POSTerminal';
+		}
 		$this->export_TypeFields_array[$r] = array(
 			's.rowid'=>'Numeric', 's.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 'cd.nom'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
 			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text',
 			'f.rowid'=>'Numeric', 'f.ref'=>"Text", 'f.ref_client'=>'Text', 'f.type'=>"Numeric", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>"Date",
 			'f.total'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.tva'=>"Numeric", 'f.localtax1'=>'Numeric', 'f.localtax2'=>'Numeric', 'none.rest'=>"NumericCompute", 'f.paye'=>"Boolean", 'f.fk_statut'=>'Numeric',
 			'f.note_private'=>"Text", 'f.note_public'=>"Text", 'f.fk_user_author'=>'Numeric', 'uc.login'=>'Text', 'f.fk_user_valid'=>'Numeric', 'uv.login'=>'Text',
-			'pj.ref'=>'Text', 'fd.rowid'=>'Numeric', 'fd.label'=>'Text', 'fd.description'=>"Text", 'fd.subprice'=>"Numeric", 'fd.tva_tx'=>"Numeric",
+			'pj.ref'=>'Text', 'pj.title'=>'Text', 'fd.rowid'=>'Numeric', 'fd.label'=>'Text', 'fd.description'=>"Text", 'fd.subprice'=>"Numeric", 'fd.tva_tx'=>"Numeric",
 			'fd.qty'=>"Numeric", 'fd.total_ht'=>"Numeric", 'fd.total_tva'=>"Numeric", 'fd.total_ttc'=>"Numeric", 'fd.date_start'=>"Date", 'fd.date_end'=>"Date",
 			'fd.special_code'=>'Numeric', 'fd.product_type'=>"Numeric", 'fd.fk_product'=>'List:product:label', 'p.ref'=>'Text', 'p.label'=>'Text',
 			'p.accountancy_code_sell'=>'Text'
 		);
+		if (! empty($conf->cashdesk->enabled) || ! empty($conf->takepos->enabled) || ! empty($conf->global->INVOICE_SHOW_POS_IN_EXPORT))
+		{
+			$this->export_TypeFields_array[$r]['f.module_source']='Text';
+			$this->export_TypeFields_array[$r]['f.pos_source']='Text';
+		}
 		$this->export_entities_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'company', 's.code_client'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 's.phone'=>'company',
+			's.rowid'=>"company", 's.nom'=>'company', 's.code_client'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 'cd.nom'=>'company', 's.phone'=>'company',
 			's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company',
-			's.tva_intra'=>'company', 'pj.ref'=>'project', 'fd.rowid'=>'invoice_line', 'fd.label'=>"invoice_line", 'fd.description'=>"invoice_line",
+			's.tva_intra'=>'company', 'pj.ref'=>'project', 'pj.title'=>'project', 'fd.rowid'=>'invoice_line', 'fd.label'=>"invoice_line", 'fd.description'=>"invoice_line",
 			'fd.subprice'=>"invoice_line", 'fd.total_ht'=>"invoice_line", 'fd.total_tva'=>"invoice_line", 'fd.total_ttc'=>"invoice_line", 'fd.tva_tx'=>"invoice_line",
 			'fd.qty'=>"invoice_line", 'fd.date_start'=>"invoice_line", 'fd.date_end'=>"invoice_line", 'fd.special_code'=>'invoice_line',
 			'fd.product_type'=>'invoice_line', 'fd.fk_product'=>'product', 'p.ref'=>'product', 'p.label'=>'product', 'p.accountancy_code_sell'=>'product',
@@ -292,7 +302,7 @@ class modFacture extends DolibarrModules
 			'f.type'=>"Type", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>"DateDue", 'f.total'=>"TotalHT",
 			'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'f.localtax1'=>'LocalTax1', 'f.localtax2'=>'LocalTax2', 'none.rest'=>'Rest', 'f.paye'=>"InvoicePaid", 'f.fk_statut'=>'InvoiceStatus',
 			'f.note_private'=>"NotePrivate", 'f.note_public'=>"NotePublic", 'f.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin',
-			'f.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'p.rowid'=>'PaymentId', 'p.ref'=>'PaymentRef',
+			'f.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'pj.title'=>'ProjectLabel', 'p.rowid'=>'PaymentId', 'p.ref'=>'PaymentRef',
 			'p.amount'=>'AmountPayment', 'pf.amount'=>'AmountPaymentDistributedOnInvoice', 'p.datep'=>'DatePayment', 'p.num_paiement'=>'PaymentNumber',
 			'pt.code'=>'CodePaymentMode', 'pt.libelle'=>'LabelPaymentMode', 'p.note'=>'PaymentNote', 'p.fk_bank'=>'IdTransaction', 'ba.ref'=>'AccountRef'
 		);
@@ -304,19 +314,29 @@ class modFacture extends DolibarrModules
 		    $this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
 		    $this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
+		if (! empty($conf->cashdesk->enabled) || ! empty($conf->takepos->enabled) || ! empty($conf->global->INVOICE_SHOW_POS_IN_EXPORT))
+		{
+			$this->export_fields_array[$r]['f.module_source']='POSModule';
+			$this->export_fields_array[$r]['f.pos_source']='POSTerminal';
+		}
 		$this->export_TypeFields_array[$r] = array(
 		    's.rowid'=>'Numeric', 's.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 'cd.nom'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
 			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text',
 			'f.rowid'=>"Numeric", 'f.ref'=>"Text", 'f.ref_client'=>'Text', 'f.type'=>"Numeric", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>"Date",
 			'f.total'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.tva'=>"Numeric", 'f.localtax1'=>'Numeric', 'f.localtax2'=>'Numeric', 'none.rest'=>'NumericCompute', 'f.paye'=>"Boolean", 'f.fk_statut'=>'Status',
 			'f.note_private'=>"Text", 'f.note_public'=>"Text", 'f.fk_user_author'=>'Numeric', 'uc.login'=>'Text', 'f.fk_user_valid'=>'Numeric', 'uv.login'=>'Text',
-			'pj.ref'=>'Text', 'p.amount'=>'Numeric', 'pf.amount'=>'Numeric', 'p.rowid'=>'Numeric', 'p.ref'=>'Text', 'p.datep'=>'Date', 'p.num_paiement'=>'Numeric',
+			'pj.ref'=>'Text', 'p.amount'=>'Numeric', 'pf.amount'=>'Numeric', 'p.rowid'=>'Numeric', 'p.ref'=>'Text', 'p.title'=>'Text', 'p.datep'=>'Date', 'p.num_paiement'=>'Numeric',
 			'p.fk_bank'=>'Numeric', 'p.note'=>'Text', 'pt.code'=>'Text', 'pt.libelle'=>'text', 'ba.ref'=>'Text'
 		);
+		if (! empty($conf->cashdesk->enabled) || ! empty($conf->takepos->enabled) || ! empty($conf->global->INVOICE_SHOW_POS_IN_EXPORT))
+		{
+			$this->export_fields_array[$r]['f.module_source']='POSModule';
+			$this->export_fields_array[$r]['f.pos_source']='POSTerminal';
+		}
 		$this->export_entities_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'company', 's.code_client'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 's.phone'=>'company',
+			's.rowid'=>"company", 's.nom'=>'company', 's.code_client'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 'cd.nom'=>'company', 's.phone'=>'company',
 			's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company',
-			's.tva_intra'=>'company', 'pj.ref'=>'project', 'p.rowid'=>'payment', 'p.ref'=>'payment', 'p.amount'=>'payment', 'pf.amount'=>'payment', 'p.datep'=>'payment',
+			's.tva_intra'=>'company', 'pj.ref'=>'project', 'p.title'=>'project', 'p.rowid'=>'payment', 'p.ref'=>'payment', 'p.amount'=>'payment', 'pf.amount'=>'payment', 'p.datep'=>'payment',
 			'p.num_paiement'=>'payment', 'pt.code'=>'payment', 'pt.libelle'=>'payment', 'p.note'=>'payment', 'f.fk_user_author'=>'user', 'uc.login'=>'user',
 			'f.fk_user_valid'=>'user', 'uv.login'=>'user', 'p.fk_bank'=>'account', 'ba.ref'=>'account'
 		);
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 8267000297b..5ebba6ff6ee 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -50,7 +50,7 @@ class modFicheinter extends DolibarrModules
         $this->numero = 70;
 
         $this->family = "crm";
-        $this->module_position = '45';
+        $this->module_position = '41';
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
         $this->name = preg_replace('/^mod/i', '', get_class($this));
         $this->description = "Gestion des fiches d'intervention";
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 12193b630c8..a545ce1378b 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -49,7 +49,7 @@ class modFournisseur extends DolibarrModules
 		// Family can be 'crm','financial','hr','projects','product','ecm','technic','other'
 		// It is used to group modules in module setup page
 		$this->family = "srm";
-		$this->module_position = '10';
+		$this->module_position = '12';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion des fournisseurs";
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 09a30e16914..8bb34a338e5 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -54,7 +54,7 @@ class modHoliday extends DolibarrModules
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
 		$this->family = "hr";
-		$this->module_position = '30';
+		$this->module_position = '42';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 3a18749bcde..d425b07d01a 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -50,7 +50,7 @@ class modProduct extends DolibarrModules
 		$this->numero = 50;
 
 		$this->family = "products";
-		$this->module_position = '20';
+		$this->module_position = '25';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Product management";
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 106517c638a..deb5192efc6 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -49,7 +49,7 @@ class modProjet extends DolibarrModules
 		$this->numero = 400;
 
 		$this->family = "projects";
-		$this->module_position = '10';
+		$this->module_position = '14';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion des projets";
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index b28477f3719..745fec8ef96 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -49,7 +49,7 @@ class modPropale extends DolibarrModules
 		$this->numero = 20;
 
 		$this->family = "crm";
-		$this->module_position = '20';
+		$this->module_position = '22';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion des propositions commerciales";
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index 9fc82dc9ad6..6594d7bb04a 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -41,10 +41,10 @@ class modReception extends DolibarrModules
 		global $conf, $user;
 
 		$this->db = $db;
-		$this->numero = 104160;
+		$this->numero = 94160;
 
 		$this->family = "srm";
-		$this->module_position = 40;
+		$this->module_position = '40';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion des réceptions fournisseurs";
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index 5925998a2b2..cceacf3263c 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -55,7 +55,7 @@ class modResource extends DolibarrModules
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
 		$this->family = "projects";
-		$this->module_position = '20';
+		$this->module_position = '16';
 		// Module label (no space allowed)
 		// used if translation string 'ModuleXXXName' not found
 		// (where XXX is value of numeric property 'numero' of module)
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 9db733e4bb2..605c48f0e6b 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -48,7 +48,7 @@ class modService extends DolibarrModules
 		$this->numero = 53;
 
 		$this->family = "products";
-		$this->module_position = '30';
+		$this->module_position = '29';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Service management";
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index cb01019cc1b..e41e96c5add 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -49,7 +49,7 @@ class modSociete extends DolibarrModules
 		$this->numero = 1;
 
 		$this->family = "crm";
-		$this->module_position = '10';
+		$this->module_position = '09';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion des sociétés et contacts";
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index 882b02b5fb4..18cddf2a143 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -50,6 +50,7 @@ class modSupplierProposal extends DolibarrModules
 		$this->numero = 1120;
 
 		$this->family = "srm";
+		$this->module_position = '35';
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "supplier_proposalDESC";
 
diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index 1ac6ead1087..b754eae2765 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -46,7 +46,7 @@ class modSyslog extends DolibarrModules
 		// It is used to group modules in module setup page
 		$this->family = "base";
 		// Module position in the family on 2 digits ('01', '10', '20', ...)
-		$this->module_position = '50';
+		$this->module_position = '75';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index bf7b0c49896..7e31400f1ab 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -46,7 +46,7 @@ class modUser extends DolibarrModules
 		$this->numero = 0;
 
 		$this->family = "hr";		// Family for module (or "base" if core module)
-		$this->module_position = '10';
+		$this->module_position = '05';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion des utilisateurs (requis)";
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index b6dfc23cf48..df298153062 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -361,7 +361,7 @@ if ($action == 'add_export_model')
 	}
 }
 
-// Reload an predefined export model
+// Reload a predefined export model
 if ($step == 2 && $action == 'select_model')
 {
     $_SESSION["export_selected_fields"]=array();
@@ -448,13 +448,13 @@ if ($step == 1 || ! $datatoexport)
     print '<td>'.$langs->trans("ExportableDatas").'</td>';
     print '<td>&nbsp;</td>';
     print '</tr>';
-    $val=true;
-    if (count($objexport->array_export_code))
+
+    if (count($objexport->array_export_module))
     {
-        foreach ($objexport->array_export_code as $key => $value)
+    	$sortedarrayofmodules = dol_sort_array($objexport->array_export_module, 'module_position', 'asc', 0, 0, 1);
+    	foreach ($sortedarrayofmodules as $key => $value)
         {
-            $val=!$val;
-            print '<tr '.$bc[$val].'><td nospan="nospan">';
+            print '<tr class="oddeven"><td nospan="nospan">';
 	        //print img_object($objexport->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
             print $objexport->array_export_module[$key]->getName();
             print '</td><td>';
@@ -466,7 +466,7 @@ if ($step == 1 || ! $datatoexport)
             print '</td><td class="right">';
             if ($objexport->array_export_perms[$key])
             {
-            	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'filenew').'</a>';
+            	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&module_position='.$objexport->array_export_module[$key]->module_position.'&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'filenew').'</a>';
             }
             else
             {
@@ -477,7 +477,7 @@ if ($step == 1 || ! $datatoexport)
     }
     else
     {
-        print '<tr><td '.$bc[false].' colspan="3">'.$langs->trans("NoExportableData").'</td></tr>';
+        print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoExportableData").'</td></tr>';
     }
     print '</table>';
     print '</div>';

From 7ffcd3603b68331a2b5aea9e5023716433d966ea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jun 2019 13:33:24 +0200
Subject: [PATCH 098/133] Add option DOC_SHOW_CUSTOMER_CODE

Because we have a lot of information and the REF is better to retrieve/search an order and know the customer code, i added a hidden option to show this field.
---
 htdocs/core/modules/commande/doc/pdf_einstein.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 0aada45f7f0..176675415c2 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1320,7 +1320,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date, "%d %b %Y", false, $outputlangs, true), '', 'R');
 
-		if ($object->thirdparty->code_client)
+		if (!empty($conf->global->DOC_SHOW_CUSTOMER_CODE) && ! empty($object->thirdparty->code_client))
 		{
 			$posy+=4;
 			$pdf->SetXY($posx, $posy);

From 4499447a89e085c7ef8686c4af206780d5c08caa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jun 2019 14:27:38 +0200
Subject: [PATCH 099/133] Fix sort order of import profiles Fix picto in import
 profile for accounting

---
 htdocs/core/modules/modAccounting.class.php |  2 +-
 htdocs/imports/import.php                   | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index b7ef8950fe1..65638a1cab2 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -240,7 +240,7 @@ class modAccounting extends DolibarrModules
 		$r++;
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='Chartofaccounts';
-		$this->export_icon[$r]='Accounting';
+		$this->export_icon[$r]='accounting';
 		$this->export_permission[$r]=array(array("accounting","chartofaccount"));
 		$this->export_fields_array[$r]=array('ac.rowid'=>'ChartofaccountsId','ac.pcg_version'=>'Chartofaccounts','aa.rowid'=>'Id','aa.account_number'=>"AccountAccounting",'aa.label'=>"Label",'aa.account_parent'=>"Accountparent",'aa.pcg_type'=>"Pcgtype",'aa.pcg_subtype'=>'Pcgsubtype','aa.active'=>'Status');
 		$this->export_TypeFields_array[$r]=array('ac.rowid'=>'List:accounting_system:pcg_version','aa.account_number'=>"Text",'aa.label'=>"Text",'aa.account_parent'=>"Text",'aa.pcg_type'=>'Text','aa.pcg_subtype'=>'Text','aa.active'=>'Status');
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 9227998e4a0..7bcd69e3d0b 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -352,20 +352,19 @@ if ($step == 1 || ! $datatoimport)
 	print '<td>'.$langs->trans("ImportableDatas").'</td>';
 	print '<td>&nbsp;</td>';
 	print '</tr>';
-	$val=true;
-	if (count($objimport->array_import_code))
+
+	if (count($objimport->array_import_module))
 	{
-		foreach ($objimport->array_import_code as $key => $value)
+		$sortedarrayofmodules = dol_sort_array($objimport->array_import_module, 'module_position', 'asc', 0, 0, 1);
+		foreach ($sortedarrayofmodules as $key => $value)
 		{
 			//var_dump($objimport->array_import_code[$key]);
-			$val=!$val;
-			print '<tr '.$bc[$val].'><td>';
+			print '<tr class="oddeven"><td>';
 			$titleofmodule=$objimport->array_import_module[$key]->getName();
 			// Special cas for import common to module/services
 			if (in_array($objimport->array_import_code[$key], array('produit_supplierprices','produit_multiprice','produit_languages'))) $titleofmodule=$langs->trans("ProductOrService");
 			print $titleofmodule;
 			print '</td><td>';
-			//print $value;
 			print img_object($objimport->array_import_module[$key]->getName(), $objimport->array_import_icon[$key]).' ';
 			print $objimport->array_import_label[$key];
             print '</td><td style="text-align: right">';
@@ -382,7 +381,7 @@ if ($step == 1 || ! $datatoimport)
 	}
 	else
 	{
-		print '<tr><td '.$bc[false].' colspan="3">'.$langs->trans("NoImportableData").'</td></tr>';
+		print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoImportableData").'</td></tr>';
 	}
 	print '</table>';
     print '</div>';

From c63b465d48eef28f0dbefde9dde133538a712895 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jun 2019 14:34:04 +0200
Subject: [PATCH 100/133] Fix doxygen

---
 htdocs/core/class/dolgraph.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 5cec0232603..8b7bc4acf18 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -47,8 +47,16 @@ class DolGraph
 	public $data;				// Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
 	public $title;				// Title of graph
 	public $cssprefix='';		// To add into css styles
+
+	/**
+	 * @var int|string 		Width of graph. It can be a numeric for pixels or a string like '100%'
+	 */
 	public $width=380;
+	/**
+	 * @var int 			Height of graph
+	 */
 	public $height=200;
+
 	public $MaxValue=0;
 	public $MinValue=0;
 	public $SetShading=0;

From 0bc0f8ae943e5685357fa593fb55b59807699400 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jun 2019 15:40:35 +0200
Subject: [PATCH 101/133] Fix translation of country

---
 htdocs/societe/class/societe.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ce7617f003d..2ad9a3473a4 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1330,7 +1330,7 @@ class Societe extends CommonObject
 
 				$this->country_id   = $obj->country_id;
 				$this->country_code = $obj->country_id?$obj->country_code:'';
-				$this->country 		= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
+				$this->country 		= $obj->country_id?($langs->transnoentities('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
 
 				$this->state_id     = $obj->state_id;
 				$this->state_code   = $obj->state_code;

From b6266953e97fbc395a12b285e5f5fd1f704f6742 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jun 2019 19:58:28 +0200
Subject: [PATCH 102/133] FIX Management of vat info in stripe

---
 .../interface_80_modStripe_Stripe.class.php   | 54 ++++++++++++++++---
 htdocs/public/payment/newpayment.php          | 21 +++++++-
 htdocs/stripe/class/stripe.class.php          | 18 ++++++-
 3 files changed, 82 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index f9d28a0b984..fb400ecb7be 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -147,7 +147,7 @@ class InterfaceStripe
 				if ($customer)
 				{
 					$namecleaned = $object->name ? $object->name : null;
-					$vatcleaned = $object->tva_intra ? $object->tva_intra : null;
+					$vatcleaned = $object->tva_intra ? $object->tva_intra : null;	// Example of valid numbers are 'FR12345678901' or 'FR12345678902'
 					$desccleaned = $object->name_alias ? $object->name_alias : null;
 					$taxexemptcleaned = $object->tva_assuj ? 'none' : 'exempt';
 					$langcleaned = $object->default_lang ? array(substr($object->default_lang, 0, 2)) : null;
@@ -173,10 +173,10 @@ class InterfaceStripe
 					if ($desccleaned != $customer->description) $changerequested++;
 					if (($customer->tax_exempt == 'exempt' && ! $object->tva_assuj) || (! $customer->tax_exempt == 'exempt' && empty($object->tva_assuj))) $changerequested++;
 					if (! isset($customer->tax_ids['data']) && ! is_null($vatcleaned)) $changerequested++;
-					elseif (isset($customer->tax_ids['data']) && is_null($vatcleaned)) $changerequested++;
-					elseif (isset($customer->tax_ids['data']) && ! is_null($vatcleaned))
+					elseif (isset($customer->tax_ids['data']))
 					{
 						$taxinfo = reset($customer->tax_ids['data']);
+						if (empty($taxinfo) && ! empty($vatcleaned)) $changerequested++;
 						if (isset($taxinfo->value) && $vatcleaned != $taxinfo->value) $changerequested++;
 					}
 
@@ -190,10 +190,42 @@ class InterfaceStripe
 						$customer->description = $desccleaned;
 						$customer->preferred_locales = $langcleaned;
 						$customer->tax_exempt = $taxexemptcleaned;
-						if (! empty($vatcleaned)) $customer->tax_ids = array('object'=>'list', 'data'=>array('value'=>$vatcleaned));
-						else $customer->tax_ids = null;
 
-						$customer->save();
+						try {
+							// Update Tax info on Stripe
+							if (! empty($conf->global->STRIPE_SAVE_TAX_IDS))	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
+							{
+								if (! empty($vatcleaned))
+								{
+									$isineec=isInEEC($object);
+									if ($object->country_code && $isineec)
+									{
+										//$taxids = $customer->allTaxIds($customer->id);
+										$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
+									}
+								}
+								else
+								{
+									$taxids = $customer->allTaxIds($customer->id);
+									if (is_array($taxids->data))
+									{
+										foreach($taxids->data as $taxidobj)
+										{
+											$customer->deleteTaxId($customer->id, $taxidobj->id);
+										}
+									}
+								}
+							}
+
+							// Update Customer on Stripe
+							$customer->save();
+						}
+						catch(Exception $e)
+						{
+						    //var_dump(\Stripe\Stripe::getApiVersion());
+							$this->errors[] = $e->getMessage();
+							$ok = -1;
+						}
 					}
 				}
 			}
@@ -206,7 +238,13 @@ class InterfaceStripe
 			$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 			if ($customer)
 			{
-				$customer->delete();
+				try {
+					$customer->delete();
+				}
+				catch(Exception $e)
+				{
+					dol_syslog("Failed to delete Stripe customer ".$e->getMessage(), LOG_WARNING);
+				}
 			}
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account";
@@ -242,7 +280,7 @@ class InterfaceStripe
 						if ($card) {
 							$card->metadata=array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']));
 							try {
-								$card->save($dataforcard);
+								$card->save();
 							}
 							catch(Exception $e)
 							{
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 90646ef9b41..5d04b6335c7 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -430,6 +430,7 @@ if ($action == 'charge' && ! empty($conf->stripe->enabled))
     			'dol_version' => DOL_VERSION,
     			'dol_entity'  => $conf->entity,
     			'dol_company' => $mysoc->name,		// Usefull when using multicompany
+    			'dol_tax_num' => $taxinfo,
     		    'ipaddress'=> getUserRemoteIP()
     		);
 
@@ -501,24 +502,40 @@ if ($action == 'charge' && ! empty($conf->stripe->enabled))
     		{
     			$vatcleaned = $vatnumber ? $vatnumber : null;
 
-    			$taxinfo = array('type'=>'vat');
+    			/*$taxinfo = array('type'=>'vat');
     			if ($vatcleaned)
     			{
     				$taxinfo["tax_id"] = $vatcleaned;
     			}
     			// We force data to "null" if not defined as expected by Stripe
     			if (empty($vatcleaned)) $taxinfo=null;
+    			*/
 
     			dol_syslog("Create anonymous customer card profile", LOG_DEBUG, 0, '_stripe');
+
                 $customer = \Stripe\Customer::create(array(
     				'email' => $email,
     				'description' => ($email?'Anonymous customer for '.$email:'Anonymous customer'),
     				'metadata' => $metadata,
-    				'tax_info' => $taxinfo,
     				'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
     			));
     			// Return $customer = array('id'=>'cus_XXXX', ...)
 
+                // Create the VAT record in Stripe
+                /* We don't know country of customer, so we can't create tax
+                if (! empty($conf->global->STRIPE_SAVE_TAX_IDS))	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
+                {
+                	if (! empty($vatcleaned))
+                	{
+                		$isineec=isInEEC($object);
+                		if ($object->country_code && $isineec)
+                		{
+                			//$taxids = $customer->allTaxIds($customer->id);
+                			$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
+                		}
+                	}
+                }*/
+
     			if (! empty($FULLTAG))       $metadata["FULLTAG"] = $FULLTAG;
     			if (! empty($dol_id))        $metadata["dol_id"] = $dol_id;
     			if (! empty($dol_type))      $metadata["dol_type"] = $dol_type;
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 27346a15f5e..d8d0c656dab 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -192,6 +192,7 @@ class Stripe extends CommonObject
 
 				$vatcleaned = $object->tva_intra ? $object->tva_intra : null;
 
+				/*
 				$taxinfo = array('type'=>'vat');
 				if ($vatcleaned)
 				{
@@ -199,8 +200,8 @@ class Stripe extends CommonObject
 				}
 				// We force data to "null" if not defined as expected by Stripe
 				if (empty($vatcleaned)) $taxinfo=null;
-
 				$dataforcustomer["tax_info"] = $taxinfo;
+				*/
 
 				//$a = \Stripe\Stripe::getApiKey();
 				//var_dump($a);var_dump($key);exit;
@@ -215,6 +216,21 @@ class Stripe extends CommonObject
 						$customer = \Stripe\Customer::create($dataforcustomer, array("stripe_account" => $key));
 					}
 
+					// Create the VAT record in Stripe
+					if (! empty($conf->global->STRIPE_SAVE_TAX_IDS))	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
+					{
+						if (! empty($vatcleaned))
+						{
+							$isineec=isInEEC($object);
+							if ($object->country_code && $isineec)
+							{
+								//$taxids = $customer->allTaxIds($customer->id);
+								$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
+							}
+						}
+					}
+
+					// Create customer in Dolibarr
 					$sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_account (fk_soc, login, key_account, site, status, entity, date_creation, fk_user_creat)";
 					$sql .= " VALUES (".$object->id.", '', '".$this->db->escape($customer->id)."', 'stripe', " . $status . ", " . $conf->entity . ", '".$this->db->idate(dol_now())."', ".$user->id.")";
 					$resql = $this->db->query($sql);

From a7d7d44f87a148f1c0aa1c945f11c97b2e4b3147 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jun 2019 19:58:28 +0200
Subject: [PATCH 103/133] FIX Management of vat info in stripe

---
 .../interface_80_modStripe_Stripe.class.php   | 54 ++++++++++++++++---
 htdocs/public/payment/newpayment.php          | 21 +++++++-
 htdocs/stripe/class/stripe.class.php          | 18 ++++++-
 3 files changed, 82 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index f9d28a0b984..fb400ecb7be 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -147,7 +147,7 @@ class InterfaceStripe
 				if ($customer)
 				{
 					$namecleaned = $object->name ? $object->name : null;
-					$vatcleaned = $object->tva_intra ? $object->tva_intra : null;
+					$vatcleaned = $object->tva_intra ? $object->tva_intra : null;	// Example of valid numbers are 'FR12345678901' or 'FR12345678902'
 					$desccleaned = $object->name_alias ? $object->name_alias : null;
 					$taxexemptcleaned = $object->tva_assuj ? 'none' : 'exempt';
 					$langcleaned = $object->default_lang ? array(substr($object->default_lang, 0, 2)) : null;
@@ -173,10 +173,10 @@ class InterfaceStripe
 					if ($desccleaned != $customer->description) $changerequested++;
 					if (($customer->tax_exempt == 'exempt' && ! $object->tva_assuj) || (! $customer->tax_exempt == 'exempt' && empty($object->tva_assuj))) $changerequested++;
 					if (! isset($customer->tax_ids['data']) && ! is_null($vatcleaned)) $changerequested++;
-					elseif (isset($customer->tax_ids['data']) && is_null($vatcleaned)) $changerequested++;
-					elseif (isset($customer->tax_ids['data']) && ! is_null($vatcleaned))
+					elseif (isset($customer->tax_ids['data']))
 					{
 						$taxinfo = reset($customer->tax_ids['data']);
+						if (empty($taxinfo) && ! empty($vatcleaned)) $changerequested++;
 						if (isset($taxinfo->value) && $vatcleaned != $taxinfo->value) $changerequested++;
 					}
 
@@ -190,10 +190,42 @@ class InterfaceStripe
 						$customer->description = $desccleaned;
 						$customer->preferred_locales = $langcleaned;
 						$customer->tax_exempt = $taxexemptcleaned;
-						if (! empty($vatcleaned)) $customer->tax_ids = array('object'=>'list', 'data'=>array('value'=>$vatcleaned));
-						else $customer->tax_ids = null;
 
-						$customer->save();
+						try {
+							// Update Tax info on Stripe
+							if (! empty($conf->global->STRIPE_SAVE_TAX_IDS))	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
+							{
+								if (! empty($vatcleaned))
+								{
+									$isineec=isInEEC($object);
+									if ($object->country_code && $isineec)
+									{
+										//$taxids = $customer->allTaxIds($customer->id);
+										$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
+									}
+								}
+								else
+								{
+									$taxids = $customer->allTaxIds($customer->id);
+									if (is_array($taxids->data))
+									{
+										foreach($taxids->data as $taxidobj)
+										{
+											$customer->deleteTaxId($customer->id, $taxidobj->id);
+										}
+									}
+								}
+							}
+
+							// Update Customer on Stripe
+							$customer->save();
+						}
+						catch(Exception $e)
+						{
+						    //var_dump(\Stripe\Stripe::getApiVersion());
+							$this->errors[] = $e->getMessage();
+							$ok = -1;
+						}
 					}
 				}
 			}
@@ -206,7 +238,13 @@ class InterfaceStripe
 			$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 			if ($customer)
 			{
-				$customer->delete();
+				try {
+					$customer->delete();
+				}
+				catch(Exception $e)
+				{
+					dol_syslog("Failed to delete Stripe customer ".$e->getMessage(), LOG_WARNING);
+				}
 			}
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account";
@@ -242,7 +280,7 @@ class InterfaceStripe
 						if ($card) {
 							$card->metadata=array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']));
 							try {
-								$card->save($dataforcard);
+								$card->save();
 							}
 							catch(Exception $e)
 							{
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 90646ef9b41..5d04b6335c7 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -430,6 +430,7 @@ if ($action == 'charge' && ! empty($conf->stripe->enabled))
     			'dol_version' => DOL_VERSION,
     			'dol_entity'  => $conf->entity,
     			'dol_company' => $mysoc->name,		// Usefull when using multicompany
+    			'dol_tax_num' => $taxinfo,
     		    'ipaddress'=> getUserRemoteIP()
     		);
 
@@ -501,24 +502,40 @@ if ($action == 'charge' && ! empty($conf->stripe->enabled))
     		{
     			$vatcleaned = $vatnumber ? $vatnumber : null;
 
-    			$taxinfo = array('type'=>'vat');
+    			/*$taxinfo = array('type'=>'vat');
     			if ($vatcleaned)
     			{
     				$taxinfo["tax_id"] = $vatcleaned;
     			}
     			// We force data to "null" if not defined as expected by Stripe
     			if (empty($vatcleaned)) $taxinfo=null;
+    			*/
 
     			dol_syslog("Create anonymous customer card profile", LOG_DEBUG, 0, '_stripe');
+
                 $customer = \Stripe\Customer::create(array(
     				'email' => $email,
     				'description' => ($email?'Anonymous customer for '.$email:'Anonymous customer'),
     				'metadata' => $metadata,
-    				'tax_info' => $taxinfo,
     				'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
     			));
     			// Return $customer = array('id'=>'cus_XXXX', ...)
 
+                // Create the VAT record in Stripe
+                /* We don't know country of customer, so we can't create tax
+                if (! empty($conf->global->STRIPE_SAVE_TAX_IDS))	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
+                {
+                	if (! empty($vatcleaned))
+                	{
+                		$isineec=isInEEC($object);
+                		if ($object->country_code && $isineec)
+                		{
+                			//$taxids = $customer->allTaxIds($customer->id);
+                			$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
+                		}
+                	}
+                }*/
+
     			if (! empty($FULLTAG))       $metadata["FULLTAG"] = $FULLTAG;
     			if (! empty($dol_id))        $metadata["dol_id"] = $dol_id;
     			if (! empty($dol_type))      $metadata["dol_type"] = $dol_type;
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 27346a15f5e..d8d0c656dab 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -192,6 +192,7 @@ class Stripe extends CommonObject
 
 				$vatcleaned = $object->tva_intra ? $object->tva_intra : null;
 
+				/*
 				$taxinfo = array('type'=>'vat');
 				if ($vatcleaned)
 				{
@@ -199,8 +200,8 @@ class Stripe extends CommonObject
 				}
 				// We force data to "null" if not defined as expected by Stripe
 				if (empty($vatcleaned)) $taxinfo=null;
-
 				$dataforcustomer["tax_info"] = $taxinfo;
+				*/
 
 				//$a = \Stripe\Stripe::getApiKey();
 				//var_dump($a);var_dump($key);exit;
@@ -215,6 +216,21 @@ class Stripe extends CommonObject
 						$customer = \Stripe\Customer::create($dataforcustomer, array("stripe_account" => $key));
 					}
 
+					// Create the VAT record in Stripe
+					if (! empty($conf->global->STRIPE_SAVE_TAX_IDS))	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
+					{
+						if (! empty($vatcleaned))
+						{
+							$isineec=isInEEC($object);
+							if ($object->country_code && $isineec)
+							{
+								//$taxids = $customer->allTaxIds($customer->id);
+								$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
+							}
+						}
+					}
+
+					// Create customer in Dolibarr
 					$sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_account (fk_soc, login, key_account, site, status, entity, date_creation, fk_user_creat)";
 					$sql .= " VALUES (".$object->id.", '', '".$this->db->escape($customer->id)."', 'stripe', " . $status . ", " . $conf->entity . ", '".$this->db->idate(dol_now())."', ".$user->id.")";
 					$resql = $this->db->query($sql);

From 3afa4175dbed20ce889ea1b750771b276f1fe228 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 11:22:04 +0200
Subject: [PATCH 104/133] Update company.php

---
 htdocs/admin/company.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index f707f531f9d..9778a4aa610 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -86,7 +86,9 @@ if ( ($action == 'update' && ! GETPOST("cancel", 'alpha'))
 		dolibarr_set_const($db, "MAIN_INFO_SOCIETE_STATE", $s,'chaine', 0, '', $conf->entity);
 	}
 
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom",'nohtml'),'chaine',0,'',$conf->entity);
+    $db->begin();
+
+    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom",'nohtml'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADDRESS", GETPOST("MAIN_INFO_SOCIETE_ADDRESS",'nohtml'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN", GETPOST("MAIN_INFO_SOCIETE_TOWN",'nohtml'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ZIP", GETPOST("MAIN_INFO_SOCIETE_ZIP",'alpha'),'chaine',0,'',$conf->entity);

From e9a8eb19bb521dd84e8ae7fa2a82409da3067bf3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 11:24:21 +0200
Subject: [PATCH 105/133] Update company.php

---
 htdocs/admin/company.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 9778a4aa610..2728448f031 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -75,7 +75,7 @@ if ( ($action == 'update' && ! GETPOST("cancel", 'alpha'))
 		activateModulesRequiredByCountry($mysoc->country_code);
 	}
 
-	$tmparray=getState(GETPOST('state_id','int'),'all',$db,$langs,0);
+	$tmparray=getState(GETPOST('state_id','int'), 'all', $db, $langs, 0);
 	if (! empty($tmparray['id']))
 	{
 		$mysoc->state_id   =$tmparray['id'];

From 18348fea939e71aa6684dbbe9035ca5dbff52e39 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 11:34:16 +0200
Subject: [PATCH 106/133] Fix sort on date on agenda list

---
 htdocs/comm/action/list.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 28670604b9e..8a578eec735 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -97,15 +97,13 @@ if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $limit * $page ;
 if (! $sortorder)
 {
-	$sortorder="DESC";
-	if ($status == 'todo') $sortorder="DESC";
-	//if ($status == 'done') $sortorder="DESC";
+	$sortorder="DESC,DESC";
+	if ($status == 'todo') $sortorder="DESC,DESC";
 }
 if (! $sortfield)
 {
-	$sortfield="a.datep";
-	if ($status == 'todo') $sortfield="a.datep";
-	//if ($status == 'done') $sortfield="a.datep2";
+	$sortfield="a.datep,a.id";
+	if ($status == 'todo') $sortfield="a.datep,a.id";
 }
 
 // Security check
@@ -500,7 +498,7 @@ if ($resql)
 	if (! empty($arrayfields['a.label']['checked']))	  print_liste_field_titre($arrayfields['a.label']['label'], $_SERVER["PHP_SELF"], "a.label", $param, "", "", $sortfield, $sortorder);
 	if (! empty($arrayfields['a.note']['checked']))		  print_liste_field_titre($arrayfields['a.note']['label'], $_SERVER["PHP_SELF"], "a.note", $param, "", "", $sortfield, $sortorder);
 	//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-	if (! empty($arrayfields['a.datep']['checked']))	  print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep", $param, '', 'align="center"', $sortfield, $sortorder);
+	if (! empty($arrayfields['a.datep']['checked']))	  print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep,a.id", $param, '', 'align="center"', $sortfield, $sortorder);
 	if (! empty($arrayfields['a.datep2']['checked']))	  print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', 'align="center"', $sortfield, $sortorder);
 	if (! empty($arrayfields['s.nom']['checked']))	      print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $param, "", "", $sortfield, $sortorder);
 	if (! empty($arrayfields['a.fk_contact']['checked'])) print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"], "a.fk_contact", $param, "", "", $sortfield, $sortorder);

From a4cd7772ef51193a1065829eda95d476b3cb6f0c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 12:02:41 +0200
Subject: [PATCH 107/133] Fix title

---
 htdocs/core/lib/company.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 1e27cb112d3..ef34befa71c 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1521,7 +1521,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
         $out.=getTitleFieldOfList($langs->trans("Type"));
 		$out.=getTitleFieldOfList($langs->trans("Label"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
         $out.=getTitleFieldOfList($langs->trans("Date"), 0, $_SERVER["PHP_SELF"], 'a.datep,a.id', '', $param, 'align="center"', $sortfield, $sortorder);
-		$out.=getTitleFieldOfList('');
+        $out.=getTitleFieldOfList($langs->trans("RelatedObjects"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
 		$out.=getTitleFieldOfList($langs->trans("ActionOnContact"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
 		$out.=getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], 'a.percent', '', $param, 'align="center"', $sortfield, $sortorder);
 		$out.=getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'maxwidthsearch ');

From 9e7b08e37841ad2731c3a083aeb699dfa94d4cce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 12:05:17 +0200
Subject: [PATCH 108/133] Trans missing

---
 htdocs/societe/agenda.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index a9283f6e236..13838812d9d 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-$langs->load("companies");
+$langs->load(array("companies", "bills", "propal", "orders"));
 
 if (GETPOST('actioncode', 'array'))
 {

From ed34d4ccbd91c6d1ebdde7c933a71f7613a206d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 12:10:30 +0200
Subject: [PATCH 109/133] Bad trans

---
 htdocs/societe/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index b0653c83962..c9275293bb2 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -198,7 +198,7 @@ $arrayfields=array(
 	's.idprof4'=>array('label'=>"ProfId4Short", 'checked'=>$checkedprofid4),
 	's.idprof5'=>array('label'=>"ProfId5Short", 'checked'=>$checkedprofid5),
 	's.idprof6'=>array('label'=>"ProfId6Short", 'checked'=>$checkedprofid6),
-	's.tva_intra'=>array('label'=>"VATIntra", 'checked'=>0),
+	's.tva_intra'=>array('label'=>"VATIntraShort", 'checked'=>0),
 	'customerorsupplier'=>array('label'=>'Nature', 'checked'=>1),
 	's.fk_prospectlevel'=>array('label'=>"ProspectLevelShort", 'checked'=>$checkprospectlevel),
 	's.fk_stcomm'=>array('label'=>"StatusProsp", 'checked'=>$checkstcomm),

From 0f808114e5f108601993b855483257064baa236e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 13:18:33 +0200
Subject: [PATCH 110/133] Sync transifex Fix CSS for Left To Right Languages

---
 htdocs/langs/ar_EG/admin.lang             |    1 +
 htdocs/langs/ar_SA/accountancy.lang       |   15 +-
 htdocs/langs/ar_SA/admin.lang             |   23 +-
 htdocs/langs/ar_SA/agenda.lang            |    2 +
 htdocs/langs/ar_SA/banks.lang             |   28 +-
 htdocs/langs/ar_SA/bills.lang             |    8 +-
 htdocs/langs/ar_SA/cashdesk.lang          |    6 +
 htdocs/langs/ar_SA/compta.lang            |    2 -
 htdocs/langs/ar_SA/errors.lang            |    1 +
 htdocs/langs/ar_SA/holiday.lang           |    3 +-
 htdocs/langs/ar_SA/main.lang              |   15 +-
 htdocs/langs/ar_SA/members.lang           |   40 +-
 htdocs/langs/ar_SA/modulebuilder.lang     |   23 +-
 htdocs/langs/ar_SA/paybox.lang            |    9 +-
 htdocs/langs/ar_SA/paypal.lang            |   22 +-
 htdocs/langs/ar_SA/products.lang          |   11 +-
 htdocs/langs/ar_SA/projects.lang          |    5 +-
 htdocs/langs/ar_SA/receiptprinter.lang    |   12 +-
 htdocs/langs/ar_SA/stripe.lang            |   18 +-
 htdocs/langs/ar_SA/website.lang           |    5 +
 htdocs/langs/bg_BG/accountancy.lang       |   15 +-
 htdocs/langs/bg_BG/admin.lang             | 1237 +++++++++++----------
 htdocs/langs/bg_BG/agenda.lang            |    4 +-
 htdocs/langs/bg_BG/banks.lang             |  122 +-
 htdocs/langs/bg_BG/bills.lang             |  386 +++----
 htdocs/langs/bg_BG/cashdesk.lang          |    6 +
 htdocs/langs/bg_BG/categories.lang        |   32 +-
 htdocs/langs/bg_BG/companies.lang         |    2 +-
 htdocs/langs/bg_BG/compta.lang            |    2 -
 htdocs/langs/bg_BG/contracts.lang         |    3 +-
 htdocs/langs/bg_BG/cron.lang              |   72 +-
 htdocs/langs/bg_BG/errors.lang            |    3 +-
 htdocs/langs/bg_BG/holiday.lang           |    1 +
 htdocs/langs/bg_BG/mails.lang             |    2 +
 htdocs/langs/bg_BG/main.lang              |  573 +++++-----
 htdocs/langs/bg_BG/members.lang           |    1 +
 htdocs/langs/bg_BG/modulebuilder.lang     |   23 +-
 htdocs/langs/bg_BG/paybox.lang            |    9 +-
 htdocs/langs/bg_BG/paypal.lang            |   24 +-
 htdocs/langs/bg_BG/products.lang          |   17 +-
 htdocs/langs/bg_BG/projects.lang          |   87 +-
 htdocs/langs/bg_BG/stripe.lang            |   20 +-
 htdocs/langs/bg_BG/trips.lang             |    4 +-
 htdocs/langs/bg_BG/website.lang           |    5 +
 htdocs/langs/bn_BD/accountancy.lang       |   15 +-
 htdocs/langs/bn_BD/admin.lang             |   23 +-
 htdocs/langs/bn_BD/agenda.lang            |    2 +
 htdocs/langs/bn_BD/banks.lang             |   28 +-
 htdocs/langs/bn_BD/bills.lang             |    8 +-
 htdocs/langs/bn_BD/cashdesk.lang          |    6 +
 htdocs/langs/bn_BD/compta.lang            |    2 -
 htdocs/langs/bn_BD/errors.lang            |    1 +
 htdocs/langs/bn_BD/holiday.lang           |    3 +-
 htdocs/langs/bn_BD/main.lang              |   15 +-
 htdocs/langs/bn_BD/members.lang           |   40 +-
 htdocs/langs/bn_BD/modulebuilder.lang     |   23 +-
 htdocs/langs/bn_BD/paybox.lang            |    9 +-
 htdocs/langs/bn_BD/paypal.lang            |   22 +-
 htdocs/langs/bn_BD/products.lang          |    5 +-
 htdocs/langs/bn_BD/projects.lang          |    5 +-
 htdocs/langs/bn_BD/stripe.lang            |   18 +-
 htdocs/langs/bn_BD/website.lang           |    5 +
 htdocs/langs/bs_BA/accountancy.lang       |   15 +-
 htdocs/langs/bs_BA/admin.lang             |   23 +-
 htdocs/langs/bs_BA/agenda.lang            |    2 +
 htdocs/langs/bs_BA/banks.lang             |   28 +-
 htdocs/langs/bs_BA/bills.lang             |   24 +-
 htdocs/langs/bs_BA/cashdesk.lang          |    6 +
 htdocs/langs/bs_BA/compta.lang            |    2 -
 htdocs/langs/bs_BA/errors.lang            |    1 +
 htdocs/langs/bs_BA/holiday.lang           |    3 +-
 htdocs/langs/bs_BA/main.lang              |   15 +-
 htdocs/langs/bs_BA/members.lang           |   40 +-
 htdocs/langs/bs_BA/modulebuilder.lang     |   23 +-
 htdocs/langs/bs_BA/paybox.lang            |    9 +-
 htdocs/langs/bs_BA/paypal.lang            |   22 +-
 htdocs/langs/bs_BA/products.lang          |    5 +-
 htdocs/langs/bs_BA/projects.lang          |   29 +-
 htdocs/langs/bs_BA/stripe.lang            |   18 +-
 htdocs/langs/bs_BA/website.lang           |    5 +
 htdocs/langs/ca_ES/accountancy.lang       |   15 +-
 htdocs/langs/ca_ES/admin.lang             |   47 +-
 htdocs/langs/ca_ES/agenda.lang            |    4 +-
 htdocs/langs/ca_ES/banks.lang             |   36 +-
 htdocs/langs/ca_ES/bills.lang             |    8 +-
 htdocs/langs/ca_ES/cashdesk.lang          |    6 +
 htdocs/langs/ca_ES/companies.lang         |    2 +-
 htdocs/langs/ca_ES/compta.lang            |    4 +-
 htdocs/langs/ca_ES/contracts.lang         |    3 +-
 htdocs/langs/ca_ES/cron.lang              |   14 +-
 htdocs/langs/ca_ES/errors.lang            |    3 +-
 htdocs/langs/ca_ES/holiday.lang           |   35 +-
 htdocs/langs/ca_ES/mails.lang             |    2 +
 htdocs/langs/ca_ES/main.lang              |   21 +-
 htdocs/langs/ca_ES/members.lang           |   40 +-
 htdocs/langs/ca_ES/modulebuilder.lang     |   49 +-
 htdocs/langs/ca_ES/multicurrency.lang     |    8 +-
 htdocs/langs/ca_ES/paybox.lang            |   13 +-
 htdocs/langs/ca_ES/paypal.lang            |   22 +-
 htdocs/langs/ca_ES/products.lang          |    7 +-
 htdocs/langs/ca_ES/projects.lang          |    9 +-
 htdocs/langs/ca_ES/stripe.lang            |   15 +-
 htdocs/langs/ca_ES/trips.lang             |    2 +-
 htdocs/langs/ca_ES/website.lang           |    7 +-
 htdocs/langs/cs_CZ/accountancy.lang       |   23 +-
 htdocs/langs/cs_CZ/admin.lang             |  105 +-
 htdocs/langs/cs_CZ/agenda.lang            |    4 +-
 htdocs/langs/cs_CZ/banks.lang             |  134 +--
 htdocs/langs/cs_CZ/bills.lang             |    8 +-
 htdocs/langs/cs_CZ/cashdesk.lang          |   22 +-
 htdocs/langs/cs_CZ/companies.lang         |    2 +-
 htdocs/langs/cs_CZ/compta.lang            |    2 -
 htdocs/langs/cs_CZ/contracts.lang         |    3 +-
 htdocs/langs/cs_CZ/cron.lang              |   40 +-
 htdocs/langs/cs_CZ/errors.lang            |    7 +-
 htdocs/langs/cs_CZ/holiday.lang           |   91 +-
 htdocs/langs/cs_CZ/mails.lang             |    2 +
 htdocs/langs/cs_CZ/main.lang              |   23 +-
 htdocs/langs/cs_CZ/members.lang           |  206 ++--
 htdocs/langs/cs_CZ/modulebuilder.lang     |   47 +-
 htdocs/langs/cs_CZ/multicurrency.lang     |   34 +-
 htdocs/langs/cs_CZ/paybox.lang            |   11 +-
 htdocs/langs/cs_CZ/paypal.lang            |   50 +-
 htdocs/langs/cs_CZ/products.lang          |    7 +-
 htdocs/langs/cs_CZ/projects.lang          |   15 +-
 htdocs/langs/cs_CZ/stripe.lang            |   86 +-
 htdocs/langs/cs_CZ/trips.lang             |    4 +-
 htdocs/langs/cs_CZ/website.lang           |    9 +-
 htdocs/langs/da_DK/accountancy.lang       |   15 +-
 htdocs/langs/da_DK/admin.lang             |   23 +-
 htdocs/langs/da_DK/agenda.lang            |    2 +
 htdocs/langs/da_DK/banks.lang             |   28 +-
 htdocs/langs/da_DK/bills.lang             |    8 +-
 htdocs/langs/da_DK/cashdesk.lang          |    6 +
 htdocs/langs/da_DK/compta.lang            |    2 -
 htdocs/langs/da_DK/errors.lang            |    1 +
 htdocs/langs/da_DK/holiday.lang           |    3 +-
 htdocs/langs/da_DK/main.lang              |   15 +-
 htdocs/langs/da_DK/members.lang           |  118 +-
 htdocs/langs/da_DK/modulebuilder.lang     |   23 +-
 htdocs/langs/da_DK/paybox.lang            |    9 +-
 htdocs/langs/da_DK/paypal.lang            |   26 +-
 htdocs/langs/da_DK/products.lang          |    5 +-
 htdocs/langs/da_DK/projects.lang          |    5 +-
 htdocs/langs/da_DK/stripe.lang            |   74 +-
 htdocs/langs/da_DK/website.lang           |    5 +
 htdocs/langs/de_AT/banks.lang             |    1 -
 htdocs/langs/de_AT/members.lang           |    1 -
 htdocs/langs/de_AT/paybox.lang            |    1 -
 htdocs/langs/de_AT/paypal.lang            |    3 -
 htdocs/langs/de_AT/projects.lang          |    1 -
 htdocs/langs/de_AT/sms.lang               |    1 -
 htdocs/langs/de_CH/accountancy.lang       |   10 +-
 htdocs/langs/de_CH/admin.lang             |   90 +-
 htdocs/langs/de_CH/bookmarks.lang         |    3 -
 htdocs/langs/de_CH/boxes.lang             |    6 +-
 htdocs/langs/de_CH/categories.lang        |    2 +-
 htdocs/langs/de_CH/companies.lang         |    4 -
 htdocs/langs/de_CH/ecm.lang               |    2 -
 htdocs/langs/de_CH/holiday.lang           |    4 +-
 htdocs/langs/de_CH/main.lang              |    6 +-
 htdocs/langs/de_CH/members.lang           |    5 +-
 htdocs/langs/de_CH/paybox.lang            |    3 +-
 htdocs/langs/de_CH/printing.lang          |   24 +-
 htdocs/langs/de_CH/projects.lang          |    9 +
 htdocs/langs/de_CH/resource.lang          |    1 -
 htdocs/langs/de_CH/stripe.lang            |    2 -
 htdocs/langs/de_CH/suppliers.lang         |    4 -
 htdocs/langs/de_DE/accountancy.lang       |   33 +-
 htdocs/langs/de_DE/admin.lang             |  583 +++++-----
 htdocs/langs/de_DE/agenda.lang            |    2 +
 htdocs/langs/de_DE/banks.lang             |   24 +-
 htdocs/langs/de_DE/bills.lang             |   26 +-
 htdocs/langs/de_DE/bookmarks.lang         |   22 +-
 htdocs/langs/de_DE/boxes.lang             |   16 +-
 htdocs/langs/de_DE/cashdesk.lang          |    6 +
 htdocs/langs/de_DE/categories.lang        |   14 +-
 htdocs/langs/de_DE/commercial.lang        |   28 +-
 htdocs/langs/de_DE/companies.lang         |   82 +-
 htdocs/langs/de_DE/compta.lang            |    6 +-
 htdocs/langs/de_DE/contracts.lang         |    3 +-
 htdocs/langs/de_DE/cron.lang              |   20 +-
 htdocs/langs/de_DE/deliveries.lang        |    3 +-
 htdocs/langs/de_DE/dict.lang              |    6 +-
 htdocs/langs/de_DE/donations.lang         |    2 +-
 htdocs/langs/de_DE/ecm.lang               |   68 +-
 htdocs/langs/de_DE/errors.lang            |    1 +
 htdocs/langs/de_DE/exports.lang           |   98 +-
 htdocs/langs/de_DE/externalsite.lang      |    2 +-
 htdocs/langs/de_DE/ftp.lang               |   18 +-
 htdocs/langs/de_DE/help.lang              |   22 +-
 htdocs/langs/de_DE/holiday.lang           |   75 +-
 htdocs/langs/de_DE/hrm.lang               |    8 +-
 htdocs/langs/de_DE/install.lang           |   32 +-
 htdocs/langs/de_DE/interventions.lang     |    2 +-
 htdocs/langs/de_DE/ldap.lang              |    2 +-
 htdocs/langs/de_DE/link.lang              |    8 +-
 htdocs/langs/de_DE/loan.lang              |    8 +-
 htdocs/langs/de_DE/mails.lang             |    8 +-
 htdocs/langs/de_DE/main.lang              |   19 +-
 htdocs/langs/de_DE/margins.lang           |   14 +-
 htdocs/langs/de_DE/members.lang           |   80 +-
 htdocs/langs/de_DE/modulebuilder.lang     |   23 +-
 htdocs/langs/de_DE/multicurrency.lang     |   26 +-
 htdocs/langs/de_DE/opensurvey.lang        |   64 +-
 htdocs/langs/de_DE/orders.lang            |    8 +-
 htdocs/langs/de_DE/other.lang             |    6 +-
 htdocs/langs/de_DE/paybox.lang            |    9 +-
 htdocs/langs/de_DE/paypal.lang            |   24 +-
 htdocs/langs/de_DE/printing.lang          |   30 +-
 htdocs/langs/de_DE/productbatch.lang      |   32 +-
 htdocs/langs/de_DE/products.lang          |   17 +-
 htdocs/langs/de_DE/projects.lang          |   51 +-
 htdocs/langs/de_DE/propal.lang            |   16 +-
 htdocs/langs/de_DE/receiptprinter.lang    |   14 +-
 htdocs/langs/de_DE/resource.lang          |   16 +-
 htdocs/langs/de_DE/sendings.lang          |   10 +-
 htdocs/langs/de_DE/sms.lang               |   24 +-
 htdocs/langs/de_DE/stocks.lang            |   90 +-
 htdocs/langs/de_DE/stripe.lang            |   64 +-
 htdocs/langs/de_DE/supplier_proposal.lang |    6 +-
 htdocs/langs/de_DE/suppliers.lang         |   40 +-
 htdocs/langs/de_DE/trips.lang             |    6 +-
 htdocs/langs/de_DE/users.lang             |    8 +-
 htdocs/langs/de_DE/website.lang           |   17 +-
 htdocs/langs/de_DE/workflow.lang          |   24 +-
 htdocs/langs/el_GR/accountancy.lang       |   15 +-
 htdocs/langs/el_GR/admin.lang             |   35 +-
 htdocs/langs/el_GR/agenda.lang            |    2 +
 htdocs/langs/el_GR/banks.lang             |   28 +-
 htdocs/langs/el_GR/bills.lang             |    8 +-
 htdocs/langs/el_GR/cashdesk.lang          |    6 +
 htdocs/langs/el_GR/compta.lang            |    2 -
 htdocs/langs/el_GR/errors.lang            |    1 +
 htdocs/langs/el_GR/holiday.lang           |    3 +-
 htdocs/langs/el_GR/main.lang              |   15 +-
 htdocs/langs/el_GR/members.lang           |   40 +-
 htdocs/langs/el_GR/modulebuilder.lang     |   23 +-
 htdocs/langs/el_GR/paybox.lang            |    9 +-
 htdocs/langs/el_GR/paypal.lang            |   22 +-
 htdocs/langs/el_GR/products.lang          |    5 +-
 htdocs/langs/el_GR/projects.lang          |    5 +-
 htdocs/langs/el_GR/stripe.lang            |   20 +-
 htdocs/langs/el_GR/website.lang           |    5 +
 htdocs/langs/en_AU/admin.lang             |    2 +-
 htdocs/langs/en_AU/banks.lang             |    1 +
 htdocs/langs/en_CA/admin.lang             |    2 +-
 htdocs/langs/en_GB/accountancy.lang       |    3 +-
 htdocs/langs/en_GB/admin.lang             |    2 +-
 htdocs/langs/en_GB/banks.lang             |    1 +
 htdocs/langs/en_IN/admin.lang             |    2 +-
 htdocs/langs/es_CL/accountancy.lang       |    3 +-
 htdocs/langs/es_CL/admin.lang             |    5 +-
 htdocs/langs/es_CL/banks.lang             |    6 -
 htdocs/langs/es_CL/bills.lang             |    4 +-
 htdocs/langs/es_CL/compta.lang            |    1 -
 htdocs/langs/es_CL/main.lang              |    2 +-
 htdocs/langs/es_CL/members.lang           |   19 +-
 htdocs/langs/es_CL/products.lang          |    1 -
 htdocs/langs/es_CL/projects.lang          |    1 -
 htdocs/langs/es_CO/admin.lang             |    5 +-
 htdocs/langs/es_CO/banks.lang             |    1 +
 htdocs/langs/es_CO/bills.lang             |    5 +-
 htdocs/langs/es_CO/compta.lang            |    1 -
 htdocs/langs/es_CO/holiday.lang           |    6 +
 htdocs/langs/es_CO/main.lang              |    1 -
 htdocs/langs/es_CO/members.lang           |    1 +
 htdocs/langs/es_DO/admin.lang             |    1 +
 htdocs/langs/es_EC/admin.lang             |    5 +-
 htdocs/langs/es_EC/main.lang              |    1 -
 htdocs/langs/es_ES/accountancy.lang       |   13 +-
 htdocs/langs/es_ES/admin.lang             |   57 +-
 htdocs/langs/es_ES/agenda.lang            |    4 +-
 htdocs/langs/es_ES/banks.lang             |    4 +-
 htdocs/langs/es_ES/bills.lang             |    8 +-
 htdocs/langs/es_ES/boxes.lang             |    2 +-
 htdocs/langs/es_ES/cashdesk.lang          |    6 +
 htdocs/langs/es_ES/companies.lang         |    2 +-
 htdocs/langs/es_ES/compta.lang            |    2 -
 htdocs/langs/es_ES/contracts.lang         |    3 +-
 htdocs/langs/es_ES/cron.lang              |    2 +-
 htdocs/langs/es_ES/errors.lang            |    3 +-
 htdocs/langs/es_ES/holiday.lang           |    1 +
 htdocs/langs/es_ES/install.lang           |    4 +-
 htdocs/langs/es_ES/loan.lang              |    4 +-
 htdocs/langs/es_ES/mails.lang             |    2 +
 htdocs/langs/es_ES/main.lang              |   23 +-
 htdocs/langs/es_ES/members.lang           |    1 +
 htdocs/langs/es_ES/modulebuilder.lang     |   47 +-
 htdocs/langs/es_ES/multicurrency.lang     |    2 +-
 htdocs/langs/es_ES/other.lang             |   14 +-
 htdocs/langs/es_ES/paybox.lang            |    3 +-
 htdocs/langs/es_ES/paypal.lang            |    3 +-
 htdocs/langs/es_ES/productbatch.lang      |    2 +-
 htdocs/langs/es_ES/products.lang          |    7 +-
 htdocs/langs/es_ES/projects.lang          |   11 +-
 htdocs/langs/es_ES/stripe.lang            |    6 +-
 htdocs/langs/es_ES/trips.lang             |    4 +-
 htdocs/langs/es_ES/users.lang             |    2 +-
 htdocs/langs/es_ES/website.lang           |    7 +-
 htdocs/langs/es_MX/accountancy.lang       |    3 +-
 htdocs/langs/es_MX/admin.lang             |    3 +-
 htdocs/langs/es_MX/bills.lang             |    1 +
 htdocs/langs/es_MX/holiday.lang           |    5 -
 htdocs/langs/es_MX/paybox.lang            |    1 -
 htdocs/langs/es_PA/admin.lang             |    1 +
 htdocs/langs/es_PE/accountancy.lang       |    3 +-
 htdocs/langs/es_PE/admin.lang             |    1 +
 htdocs/langs/es_VE/admin.lang             |    1 +
 htdocs/langs/es_VE/holiday.lang           |    2 -
 htdocs/langs/es_VE/main.lang              |    1 +
 htdocs/langs/et_EE/accountancy.lang       |   15 +-
 htdocs/langs/et_EE/admin.lang             |   23 +-
 htdocs/langs/et_EE/agenda.lang            |    2 +
 htdocs/langs/et_EE/banks.lang             |   28 +-
 htdocs/langs/et_EE/bills.lang             |    8 +-
 htdocs/langs/et_EE/cashdesk.lang          |    6 +
 htdocs/langs/et_EE/compta.lang            |    2 -
 htdocs/langs/et_EE/errors.lang            |    1 +
 htdocs/langs/et_EE/holiday.lang           |    3 +-
 htdocs/langs/et_EE/main.lang              |   15 +-
 htdocs/langs/et_EE/members.lang           |   40 +-
 htdocs/langs/et_EE/modulebuilder.lang     |   23 +-
 htdocs/langs/et_EE/paybox.lang            |    9 +-
 htdocs/langs/et_EE/paypal.lang            |   22 +-
 htdocs/langs/et_EE/products.lang          |    5 +-
 htdocs/langs/et_EE/projects.lang          |    5 +-
 htdocs/langs/et_EE/stripe.lang            |   18 +-
 htdocs/langs/et_EE/website.lang           |    5 +
 htdocs/langs/eu_ES/accountancy.lang       |   15 +-
 htdocs/langs/eu_ES/admin.lang             |   23 +-
 htdocs/langs/eu_ES/agenda.lang            |    2 +
 htdocs/langs/eu_ES/banks.lang             |   28 +-
 htdocs/langs/eu_ES/bills.lang             |    8 +-
 htdocs/langs/eu_ES/cashdesk.lang          |    6 +
 htdocs/langs/eu_ES/compta.lang            |    2 -
 htdocs/langs/eu_ES/errors.lang            |    1 +
 htdocs/langs/eu_ES/holiday.lang           |    3 +-
 htdocs/langs/eu_ES/main.lang              |   15 +-
 htdocs/langs/eu_ES/members.lang           |   40 +-
 htdocs/langs/eu_ES/modulebuilder.lang     |   23 +-
 htdocs/langs/eu_ES/paybox.lang            |    9 +-
 htdocs/langs/eu_ES/paypal.lang            |   22 +-
 htdocs/langs/eu_ES/products.lang          |    5 +-
 htdocs/langs/eu_ES/projects.lang          |    5 +-
 htdocs/langs/eu_ES/stripe.lang            |   18 +-
 htdocs/langs/eu_ES/website.lang           |    5 +
 htdocs/langs/fa_IR/accountancy.lang       |   15 +-
 htdocs/langs/fa_IR/admin.lang             |   59 +-
 htdocs/langs/fa_IR/agenda.lang            |   16 +-
 htdocs/langs/fa_IR/banks.lang             |    8 +-
 htdocs/langs/fa_IR/bills.lang             |    8 +-
 htdocs/langs/fa_IR/bookmarks.lang         |   38 +-
 htdocs/langs/fa_IR/boxes.lang             |    2 +-
 htdocs/langs/fa_IR/cashdesk.lang          |   68 +-
 htdocs/langs/fa_IR/categories.lang        |  142 +--
 htdocs/langs/fa_IR/commercial.lang        |    2 +-
 htdocs/langs/fa_IR/companies.lang         |    2 +-
 htdocs/langs/fa_IR/compta.lang            |  478 ++++----
 htdocs/langs/fa_IR/contracts.lang         |  151 +--
 htdocs/langs/fa_IR/cron.lang              |  124 +--
 htdocs/langs/fa_IR/deliveries.lang        |   20 +-
 htdocs/langs/fa_IR/dict.lang              |   58 +-
 htdocs/langs/fa_IR/donations.lang         |   64 +-
 htdocs/langs/fa_IR/ecm.lang               |   98 +-
 htdocs/langs/fa_IR/errors.lang            |  471 ++++----
 htdocs/langs/fa_IR/exports.lang           |  248 ++---
 htdocs/langs/fa_IR/externalsite.lang      |    8 +-
 htdocs/langs/fa_IR/ftp.lang               |   26 +-
 htdocs/langs/fa_IR/help.lang              |   40 +-
 htdocs/langs/fa_IR/holiday.lang           |  215 ++--
 htdocs/langs/fa_IR/hrm.lang               |   20 +-
 htdocs/langs/fa_IR/interventions.lang     |  124 +--
 htdocs/langs/fa_IR/languages.lang         |   37 +-
 htdocs/langs/fa_IR/ldap.lang              |   42 +-
 htdocs/langs/fa_IR/link.lang              |   18 +-
 htdocs/langs/fa_IR/loan.lang              |   54 +-
 htdocs/langs/fa_IR/mailmanspip.lang       |   50 +-
 htdocs/langs/fa_IR/mails.lang             |   78 +-
 htdocs/langs/fa_IR/main.lang              |   27 +-
 htdocs/langs/fa_IR/margins.lang           |   66 +-
 htdocs/langs/fa_IR/members.lang           |    3 +-
 htdocs/langs/fa_IR/modulebuilder.lang     |   23 +-
 htdocs/langs/fa_IR/opensurvey.lang        |   16 +-
 htdocs/langs/fa_IR/orders.lang            |  294 ++---
 htdocs/langs/fa_IR/other.lang             |   20 +-
 htdocs/langs/fa_IR/paybox.lang            |    3 +-
 htdocs/langs/fa_IR/paypal.lang            |    5 +-
 htdocs/langs/fa_IR/products.lang          |    7 +-
 htdocs/langs/fa_IR/projects.lang          |  447 ++++----
 htdocs/langs/fa_IR/propal.lang            |   20 +-
 htdocs/langs/fa_IR/stocks.lang            |  386 +++----
 htdocs/langs/fa_IR/stripe.lang            |    6 +-
 htdocs/langs/fa_IR/supplier_proposal.lang |   94 +-
 htdocs/langs/fa_IR/suppliers.lang         |   82 +-
 htdocs/langs/fa_IR/trips.lang             |    4 +-
 htdocs/langs/fa_IR/users.lang             |  128 +--
 htdocs/langs/fa_IR/website.lang           |    5 +
 htdocs/langs/fa_IR/withdrawals.lang       |   20 +-
 htdocs/langs/fi_FI/accountancy.lang       |   15 +-
 htdocs/langs/fi_FI/admin.lang             |   23 +-
 htdocs/langs/fi_FI/agenda.lang            |    2 +
 htdocs/langs/fi_FI/banks.lang             |   28 +-
 htdocs/langs/fi_FI/bills.lang             |    8 +-
 htdocs/langs/fi_FI/cashdesk.lang          |    6 +
 htdocs/langs/fi_FI/compta.lang            |    2 -
 htdocs/langs/fi_FI/errors.lang            |    1 +
 htdocs/langs/fi_FI/holiday.lang           |    3 +-
 htdocs/langs/fi_FI/main.lang              |   15 +-
 htdocs/langs/fi_FI/members.lang           |   40 +-
 htdocs/langs/fi_FI/modulebuilder.lang     |   23 +-
 htdocs/langs/fi_FI/paybox.lang            |    9 +-
 htdocs/langs/fi_FI/paypal.lang            |   22 +-
 htdocs/langs/fi_FI/products.lang          |    5 +-
 htdocs/langs/fi_FI/projects.lang          |    5 +-
 htdocs/langs/fi_FI/stripe.lang            |   18 +-
 htdocs/langs/fi_FI/website.lang           |    5 +
 htdocs/langs/fr_BE/accountancy.lang       |    2 +
 htdocs/langs/fr_BE/admin.lang             |    4 +-
 htdocs/langs/fr_BE/bills.lang             |    4 +-
 htdocs/langs/fr_BE/compta.lang            |    1 -
 htdocs/langs/fr_BE/main.lang              |    1 +
 htdocs/langs/fr_CA/accountancy.lang       |    3 +-
 htdocs/langs/fr_CA/admin.lang             |    2 +-
 htdocs/langs/fr_CA/holiday.lang           |   11 -
 htdocs/langs/fr_CA/members.lang           |   10 -
 htdocs/langs/fr_CA/modulebuilder.lang     |    1 -
 htdocs/langs/fr_CA/paybox.lang            |    4 -
 htdocs/langs/fr_CA/paypal.lang            |    6 -
 htdocs/langs/fr_CA/products.lang          |    1 -
 htdocs/langs/fr_CA/projects.lang          |    2 -
 htdocs/langs/fr_CA/stripe.lang            |    1 -
 htdocs/langs/fr_FR/accountancy.lang       |    8 +-
 htdocs/langs/fr_FR/admin.lang             |    8 +-
 htdocs/langs/fr_FR/agenda.lang            |    2 +
 htdocs/langs/fr_FR/banks.lang             |   18 +-
 htdocs/langs/fr_FR/bills.lang             |    8 +-
 htdocs/langs/fr_FR/cashdesk.lang          |    1 +
 htdocs/langs/fr_FR/categories.lang        |    2 +-
 htdocs/langs/fr_FR/companies.lang         |    2 +-
 htdocs/langs/fr_FR/compta.lang            |    2 -
 htdocs/langs/fr_FR/cron.lang              |    2 +-
 htdocs/langs/fr_FR/errors.lang            |    1 +
 htdocs/langs/fr_FR/holiday.lang           |    1 +
 htdocs/langs/fr_FR/main.lang              |   11 +-
 htdocs/langs/fr_FR/members.lang           |    1 +
 htdocs/langs/fr_FR/modulebuilder.lang     |    3 +-
 htdocs/langs/fr_FR/mrp.lang               |    4 +
 htdocs/langs/fr_FR/paybox.lang            |    3 +-
 htdocs/langs/fr_FR/paypal.lang            |    2 +-
 htdocs/langs/fr_FR/products.lang          |    2 +-
 htdocs/langs/fr_FR/projects.lang          |    1 +
 htdocs/langs/fr_FR/receptions.lang        |   86 +-
 htdocs/langs/fr_FR/stripe.lang            |    6 +-
 htdocs/langs/fr_FR/ticket.lang            |    6 +-
 htdocs/langs/fr_FR/website.lang           |    3 +
 htdocs/langs/he_IL/accountancy.lang       |   15 +-
 htdocs/langs/he_IL/admin.lang             |   23 +-
 htdocs/langs/he_IL/agenda.lang            |    2 +
 htdocs/langs/he_IL/banks.lang             |   28 +-
 htdocs/langs/he_IL/bills.lang             |    8 +-
 htdocs/langs/he_IL/cashdesk.lang          |    6 +
 htdocs/langs/he_IL/compta.lang            |    2 -
 htdocs/langs/he_IL/errors.lang            |    1 +
 htdocs/langs/he_IL/holiday.lang           |    3 +-
 htdocs/langs/he_IL/main.lang              |   15 +-
 htdocs/langs/he_IL/members.lang           |   40 +-
 htdocs/langs/he_IL/modulebuilder.lang     |   23 +-
 htdocs/langs/he_IL/paybox.lang            |    9 +-
 htdocs/langs/he_IL/paypal.lang            |   22 +-
 htdocs/langs/he_IL/products.lang          |    5 +-
 htdocs/langs/he_IL/projects.lang          |    5 +-
 htdocs/langs/he_IL/stripe.lang            |   18 +-
 htdocs/langs/he_IL/website.lang           |    5 +
 htdocs/langs/hr_HR/accountancy.lang       |   15 +-
 htdocs/langs/hr_HR/admin.lang             |   23 +-
 htdocs/langs/hr_HR/agenda.lang            |    2 +
 htdocs/langs/hr_HR/banks.lang             |   30 +-
 htdocs/langs/hr_HR/bills.lang             |   20 +-
 htdocs/langs/hr_HR/cashdesk.lang          |    6 +
 htdocs/langs/hr_HR/compta.lang            |    2 -
 htdocs/langs/hr_HR/errors.lang            |    1 +
 htdocs/langs/hr_HR/holiday.lang           |    3 +-
 htdocs/langs/hr_HR/main.lang              |   15 +-
 htdocs/langs/hr_HR/members.lang           |   40 +-
 htdocs/langs/hr_HR/modulebuilder.lang     |   23 +-
 htdocs/langs/hr_HR/paybox.lang            |    9 +-
 htdocs/langs/hr_HR/paypal.lang            |   22 +-
 htdocs/langs/hr_HR/products.lang          |    5 +-
 htdocs/langs/hr_HR/projects.lang          |    5 +-
 htdocs/langs/hr_HR/stripe.lang            |   18 +-
 htdocs/langs/hr_HR/website.lang           |    5 +
 htdocs/langs/hu_HU/accountancy.lang       |   15 +-
 htdocs/langs/hu_HU/admin.lang             |   23 +-
 htdocs/langs/hu_HU/agenda.lang            |    2 +
 htdocs/langs/hu_HU/banks.lang             |   28 +-
 htdocs/langs/hu_HU/bills.lang             |    8 +-
 htdocs/langs/hu_HU/cashdesk.lang          |    6 +
 htdocs/langs/hu_HU/compta.lang            |    2 -
 htdocs/langs/hu_HU/errors.lang            |    1 +
 htdocs/langs/hu_HU/holiday.lang           |    3 +-
 htdocs/langs/hu_HU/main.lang              |   15 +-
 htdocs/langs/hu_HU/members.lang           |   40 +-
 htdocs/langs/hu_HU/modulebuilder.lang     |   23 +-
 htdocs/langs/hu_HU/paybox.lang            |    9 +-
 htdocs/langs/hu_HU/paypal.lang            |   22 +-
 htdocs/langs/hu_HU/products.lang          |    5 +-
 htdocs/langs/hu_HU/projects.lang          |    5 +-
 htdocs/langs/hu_HU/stripe.lang            |   18 +-
 htdocs/langs/hu_HU/website.lang           |    5 +
 htdocs/langs/id_ID/accountancy.lang       |   15 +-
 htdocs/langs/id_ID/admin.lang             |   23 +-
 htdocs/langs/id_ID/agenda.lang            |    2 +
 htdocs/langs/id_ID/banks.lang             |   28 +-
 htdocs/langs/id_ID/bills.lang             |    8 +-
 htdocs/langs/id_ID/cashdesk.lang          |    6 +
 htdocs/langs/id_ID/compta.lang            |    2 -
 htdocs/langs/id_ID/errors.lang            |    1 +
 htdocs/langs/id_ID/holiday.lang           |    3 +-
 htdocs/langs/id_ID/main.lang              |   15 +-
 htdocs/langs/id_ID/members.lang           |   40 +-
 htdocs/langs/id_ID/modulebuilder.lang     |   23 +-
 htdocs/langs/id_ID/paybox.lang            |    9 +-
 htdocs/langs/id_ID/paypal.lang            |   22 +-
 htdocs/langs/id_ID/products.lang          |    5 +-
 htdocs/langs/id_ID/projects.lang          |    5 +-
 htdocs/langs/id_ID/stripe.lang            |   18 +-
 htdocs/langs/id_ID/website.lang           |    5 +
 htdocs/langs/is_IS/accountancy.lang       |   15 +-
 htdocs/langs/is_IS/admin.lang             |   23 +-
 htdocs/langs/is_IS/agenda.lang            |    2 +
 htdocs/langs/is_IS/banks.lang             |   28 +-
 htdocs/langs/is_IS/bills.lang             |    8 +-
 htdocs/langs/is_IS/cashdesk.lang          |    6 +
 htdocs/langs/is_IS/compta.lang            |    2 -
 htdocs/langs/is_IS/errors.lang            |    1 +
 htdocs/langs/is_IS/holiday.lang           |    3 +-
 htdocs/langs/is_IS/main.lang              |   15 +-
 htdocs/langs/is_IS/members.lang           |   40 +-
 htdocs/langs/is_IS/modulebuilder.lang     |   23 +-
 htdocs/langs/is_IS/paybox.lang            |    9 +-
 htdocs/langs/is_IS/paypal.lang            |   22 +-
 htdocs/langs/is_IS/products.lang          |    5 +-
 htdocs/langs/is_IS/projects.lang          |    5 +-
 htdocs/langs/is_IS/stripe.lang            |   18 +-
 htdocs/langs/is_IS/website.lang           |    5 +
 htdocs/langs/it_IT/accountancy.lang       |   17 +-
 htdocs/langs/it_IT/admin.lang             |  101 +-
 htdocs/langs/it_IT/agenda.lang            |   16 +-
 htdocs/langs/it_IT/banks.lang             |   34 +-
 htdocs/langs/it_IT/bills.lang             |   16 +-
 htdocs/langs/it_IT/cashdesk.lang          |    6 +
 htdocs/langs/it_IT/companies.lang         |    4 +-
 htdocs/langs/it_IT/compta.lang            |   10 +-
 htdocs/langs/it_IT/errors.lang            |    1 +
 htdocs/langs/it_IT/holiday.lang           |    3 +-
 htdocs/langs/it_IT/main.lang              |   59 +-
 htdocs/langs/it_IT/members.lang           |   40 +-
 htdocs/langs/it_IT/modulebuilder.lang     |   23 +-
 htdocs/langs/it_IT/other.lang             |    4 +-
 htdocs/langs/it_IT/paybox.lang            |    9 +-
 htdocs/langs/it_IT/paypal.lang            |   22 +-
 htdocs/langs/it_IT/products.lang          |    7 +-
 htdocs/langs/it_IT/projects.lang          |    5 +-
 htdocs/langs/it_IT/stocks.lang            |  110 +-
 htdocs/langs/it_IT/stripe.lang            |   18 +-
 htdocs/langs/it_IT/suppliers.lang         |   58 +-
 htdocs/langs/it_IT/website.lang           |    5 +
 htdocs/langs/ja_JP/accountancy.lang       |   15 +-
 htdocs/langs/ja_JP/admin.lang             |   23 +-
 htdocs/langs/ja_JP/agenda.lang            |    2 +
 htdocs/langs/ja_JP/banks.lang             |   28 +-
 htdocs/langs/ja_JP/bills.lang             |    8 +-
 htdocs/langs/ja_JP/cashdesk.lang          |    6 +
 htdocs/langs/ja_JP/compta.lang            |    2 -
 htdocs/langs/ja_JP/errors.lang            |    1 +
 htdocs/langs/ja_JP/holiday.lang           |    3 +-
 htdocs/langs/ja_JP/main.lang              |   15 +-
 htdocs/langs/ja_JP/members.lang           |   40 +-
 htdocs/langs/ja_JP/modulebuilder.lang     |   23 +-
 htdocs/langs/ja_JP/paybox.lang            |    9 +-
 htdocs/langs/ja_JP/paypal.lang            |   22 +-
 htdocs/langs/ja_JP/products.lang          |    5 +-
 htdocs/langs/ja_JP/projects.lang          |    5 +-
 htdocs/langs/ja_JP/stripe.lang            |   18 +-
 htdocs/langs/ja_JP/website.lang           |    5 +
 htdocs/langs/ka_GE/accountancy.lang       |   15 +-
 htdocs/langs/ka_GE/admin.lang             |   23 +-
 htdocs/langs/ka_GE/agenda.lang            |    2 +
 htdocs/langs/ka_GE/banks.lang             |   28 +-
 htdocs/langs/ka_GE/bills.lang             |    8 +-
 htdocs/langs/ka_GE/cashdesk.lang          |    6 +
 htdocs/langs/ka_GE/compta.lang            |    2 -
 htdocs/langs/ka_GE/errors.lang            |    1 +
 htdocs/langs/ka_GE/holiday.lang           |    3 +-
 htdocs/langs/ka_GE/main.lang              |   15 +-
 htdocs/langs/ka_GE/members.lang           |   40 +-
 htdocs/langs/ka_GE/modulebuilder.lang     |   23 +-
 htdocs/langs/ka_GE/paybox.lang            |    9 +-
 htdocs/langs/ka_GE/paypal.lang            |   22 +-
 htdocs/langs/ka_GE/products.lang          |    5 +-
 htdocs/langs/ka_GE/projects.lang          |    5 +-
 htdocs/langs/ka_GE/stripe.lang            |   18 +-
 htdocs/langs/ka_GE/website.lang           |    5 +
 htdocs/langs/km_KH/main.lang              |   15 +-
 htdocs/langs/kn_IN/accountancy.lang       |   15 +-
 htdocs/langs/kn_IN/admin.lang             |   23 +-
 htdocs/langs/kn_IN/agenda.lang            |    2 +
 htdocs/langs/kn_IN/banks.lang             |   28 +-
 htdocs/langs/kn_IN/bills.lang             |    8 +-
 htdocs/langs/kn_IN/cashdesk.lang          |    6 +
 htdocs/langs/kn_IN/compta.lang            |    2 -
 htdocs/langs/kn_IN/errors.lang            |    1 +
 htdocs/langs/kn_IN/holiday.lang           |    3 +-
 htdocs/langs/kn_IN/main.lang              |   15 +-
 htdocs/langs/kn_IN/members.lang           |   40 +-
 htdocs/langs/kn_IN/modulebuilder.lang     |   23 +-
 htdocs/langs/kn_IN/paybox.lang            |    9 +-
 htdocs/langs/kn_IN/paypal.lang            |   22 +-
 htdocs/langs/kn_IN/products.lang          |    5 +-
 htdocs/langs/kn_IN/projects.lang          |    5 +-
 htdocs/langs/kn_IN/stripe.lang            |   18 +-
 htdocs/langs/kn_IN/website.lang           |    5 +
 htdocs/langs/ko_KR/accountancy.lang       |   15 +-
 htdocs/langs/ko_KR/admin.lang             |   23 +-
 htdocs/langs/ko_KR/agenda.lang            |    2 +
 htdocs/langs/ko_KR/banks.lang             |   28 +-
 htdocs/langs/ko_KR/bills.lang             |    8 +-
 htdocs/langs/ko_KR/cashdesk.lang          |    6 +
 htdocs/langs/ko_KR/compta.lang            |    2 -
 htdocs/langs/ko_KR/errors.lang            |    1 +
 htdocs/langs/ko_KR/holiday.lang           |    3 +-
 htdocs/langs/ko_KR/main.lang              |   15 +-
 htdocs/langs/ko_KR/members.lang           |   40 +-
 htdocs/langs/ko_KR/modulebuilder.lang     |   23 +-
 htdocs/langs/ko_KR/paybox.lang            |    9 +-
 htdocs/langs/ko_KR/paypal.lang            |   22 +-
 htdocs/langs/ko_KR/products.lang          |    5 +-
 htdocs/langs/ko_KR/projects.lang          |    5 +-
 htdocs/langs/ko_KR/stripe.lang            |   18 +-
 htdocs/langs/ko_KR/website.lang           |    5 +
 htdocs/langs/lo_LA/accountancy.lang       |   15 +-
 htdocs/langs/lo_LA/admin.lang             |   23 +-
 htdocs/langs/lo_LA/agenda.lang            |    2 +
 htdocs/langs/lo_LA/banks.lang             |   28 +-
 htdocs/langs/lo_LA/bills.lang             |    8 +-
 htdocs/langs/lo_LA/cashdesk.lang          |    6 +
 htdocs/langs/lo_LA/compta.lang            |    2 -
 htdocs/langs/lo_LA/errors.lang            |    1 +
 htdocs/langs/lo_LA/holiday.lang           |    3 +-
 htdocs/langs/lo_LA/main.lang              |   15 +-
 htdocs/langs/lo_LA/members.lang           |   40 +-
 htdocs/langs/lo_LA/modulebuilder.lang     |   23 +-
 htdocs/langs/lo_LA/paybox.lang            |    9 +-
 htdocs/langs/lo_LA/paypal.lang            |   22 +-
 htdocs/langs/lo_LA/products.lang          |    5 +-
 htdocs/langs/lo_LA/projects.lang          |    5 +-
 htdocs/langs/lo_LA/stripe.lang            |   18 +-
 htdocs/langs/lo_LA/website.lang           |    5 +
 htdocs/langs/lt_LT/accountancy.lang       |   15 +-
 htdocs/langs/lt_LT/admin.lang             |   23 +-
 htdocs/langs/lt_LT/agenda.lang            |    2 +
 htdocs/langs/lt_LT/banks.lang             |   28 +-
 htdocs/langs/lt_LT/bills.lang             |    8 +-
 htdocs/langs/lt_LT/cashdesk.lang          |    6 +
 htdocs/langs/lt_LT/compta.lang            |    2 -
 htdocs/langs/lt_LT/errors.lang            |    1 +
 htdocs/langs/lt_LT/holiday.lang           |    3 +-
 htdocs/langs/lt_LT/main.lang              |   15 +-
 htdocs/langs/lt_LT/members.lang           |   40 +-
 htdocs/langs/lt_LT/modulebuilder.lang     |   23 +-
 htdocs/langs/lt_LT/paybox.lang            |    9 +-
 htdocs/langs/lt_LT/paypal.lang            |   22 +-
 htdocs/langs/lt_LT/products.lang          |    5 +-
 htdocs/langs/lt_LT/projects.lang          |    5 +-
 htdocs/langs/lt_LT/stripe.lang            |   18 +-
 htdocs/langs/lt_LT/website.lang           |    5 +
 htdocs/langs/lv_LV/accountancy.lang       |   27 +-
 htdocs/langs/lv_LV/admin.lang             |   41 +-
 htdocs/langs/lv_LV/agenda.lang            |    2 +
 htdocs/langs/lv_LV/banks.lang             |   24 +-
 htdocs/langs/lv_LV/bills.lang             |   12 +-
 htdocs/langs/lv_LV/bookmarks.lang         |   22 +-
 htdocs/langs/lv_LV/boxes.lang             |    4 +-
 htdocs/langs/lv_LV/cashdesk.lang          |    6 +
 htdocs/langs/lv_LV/categories.lang        |   22 +-
 htdocs/langs/lv_LV/commercial.lang        |    6 +-
 htdocs/langs/lv_LV/companies.lang         |    2 +-
 htdocs/langs/lv_LV/compta.lang            |    2 -
 htdocs/langs/lv_LV/contracts.lang         |    5 +-
 htdocs/langs/lv_LV/cron.lang              |    6 +-
 htdocs/langs/lv_LV/errors.lang            |    7 +-
 htdocs/langs/lv_LV/help.lang              |    2 +-
 htdocs/langs/lv_LV/holiday.lang           |   17 +-
 htdocs/langs/lv_LV/install.lang           |    6 +-
 htdocs/langs/lv_LV/mails.lang             |    4 +-
 htdocs/langs/lv_LV/main.lang              |   17 +-
 htdocs/langs/lv_LV/members.lang           |    1 +
 htdocs/langs/lv_LV/modulebuilder.lang     |   23 +-
 htdocs/langs/lv_LV/multicurrency.lang     |    6 +-
 htdocs/langs/lv_LV/other.lang             |    2 +-
 htdocs/langs/lv_LV/paybox.lang            |    9 +-
 htdocs/langs/lv_LV/paypal.lang            |   22 +-
 htdocs/langs/lv_LV/products.lang          |    7 +-
 htdocs/langs/lv_LV/projects.lang          |    7 +-
 htdocs/langs/lv_LV/sendings.lang          |   16 +-
 htdocs/langs/lv_LV/stripe.lang            |   15 +-
 htdocs/langs/lv_LV/ticket.lang            |    9 +-
 htdocs/langs/lv_LV/trips.lang             |    2 +-
 htdocs/langs/lv_LV/website.lang           |    5 +
 htdocs/langs/mk_MK/accountancy.lang       |   15 +-
 htdocs/langs/mk_MK/admin.lang             |   23 +-
 htdocs/langs/mk_MK/agenda.lang            |    2 +
 htdocs/langs/mk_MK/banks.lang             |   28 +-
 htdocs/langs/mk_MK/bills.lang             |    8 +-
 htdocs/langs/mk_MK/cashdesk.lang          |    6 +
 htdocs/langs/mk_MK/compta.lang            |    2 -
 htdocs/langs/mk_MK/errors.lang            |    1 +
 htdocs/langs/mk_MK/holiday.lang           |    3 +-
 htdocs/langs/mk_MK/main.lang              |   15 +-
 htdocs/langs/mk_MK/members.lang           |   40 +-
 htdocs/langs/mk_MK/modulebuilder.lang     |   23 +-
 htdocs/langs/mk_MK/paybox.lang            |    9 +-
 htdocs/langs/mk_MK/paypal.lang            |   22 +-
 htdocs/langs/mk_MK/products.lang          |    5 +-
 htdocs/langs/mk_MK/projects.lang          |    5 +-
 htdocs/langs/mk_MK/stripe.lang            |   18 +-
 htdocs/langs/mk_MK/website.lang           |    5 +
 htdocs/langs/mn_MN/accountancy.lang       |   15 +-
 htdocs/langs/mn_MN/admin.lang             |   23 +-
 htdocs/langs/mn_MN/agenda.lang            |    2 +
 htdocs/langs/mn_MN/banks.lang             |   28 +-
 htdocs/langs/mn_MN/bills.lang             |    8 +-
 htdocs/langs/mn_MN/cashdesk.lang          |    6 +
 htdocs/langs/mn_MN/compta.lang            |    2 -
 htdocs/langs/mn_MN/errors.lang            |    1 +
 htdocs/langs/mn_MN/holiday.lang           |    3 +-
 htdocs/langs/mn_MN/main.lang              |   15 +-
 htdocs/langs/mn_MN/members.lang           |   40 +-
 htdocs/langs/mn_MN/modulebuilder.lang     |   23 +-
 htdocs/langs/mn_MN/paybox.lang            |    9 +-
 htdocs/langs/mn_MN/paypal.lang            |   22 +-
 htdocs/langs/mn_MN/products.lang          |    5 +-
 htdocs/langs/mn_MN/projects.lang          |    5 +-
 htdocs/langs/mn_MN/stripe.lang            |   18 +-
 htdocs/langs/mn_MN/website.lang           |    5 +
 htdocs/langs/nb_NO/accountancy.lang       |   21 +-
 htdocs/langs/nb_NO/admin.lang             |  891 +++++++--------
 htdocs/langs/nb_NO/agenda.lang            |    8 +-
 htdocs/langs/nb_NO/banks.lang             |   32 +-
 htdocs/langs/nb_NO/bills.lang             |  190 ++--
 htdocs/langs/nb_NO/cashdesk.lang          |   30 +-
 htdocs/langs/nb_NO/companies.lang         |  134 +--
 htdocs/langs/nb_NO/compta.lang            |   24 +-
 htdocs/langs/nb_NO/contracts.lang         |    9 +-
 htdocs/langs/nb_NO/errors.lang            |   81 +-
 htdocs/langs/nb_NO/holiday.lang           |   37 +-
 htdocs/langs/nb_NO/mails.lang             |   26 +-
 htdocs/langs/nb_NO/main.lang              |  191 ++--
 htdocs/langs/nb_NO/members.lang           |    3 +-
 htdocs/langs/nb_NO/modulebuilder.lang     |   49 +-
 htdocs/langs/nb_NO/multicurrency.lang     |   14 +-
 htdocs/langs/nb_NO/paybox.lang            |   11 +-
 htdocs/langs/nb_NO/paypal.lang            |   22 +-
 htdocs/langs/nb_NO/products.lang          |  103 +-
 htdocs/langs/nb_NO/projects.lang          |  117 +-
 htdocs/langs/nb_NO/propal.lang            |   12 +-
 htdocs/langs/nb_NO/stripe.lang            |    6 +-
 htdocs/langs/nb_NO/trips.lang             |    8 +-
 htdocs/langs/nb_NO/website.lang           |   15 +-
 htdocs/langs/nl_BE/accountancy.lang       |    2 +-
 htdocs/langs/nl_BE/holiday.lang           |    1 -
 htdocs/langs/nl_NL/accountancy.lang       |   51 +-
 htdocs/langs/nl_NL/admin.lang             |   49 +-
 htdocs/langs/nl_NL/agenda.lang            |    2 +
 htdocs/langs/nl_NL/banks.lang             |   40 +-
 htdocs/langs/nl_NL/bills.lang             |   54 +-
 htdocs/langs/nl_NL/cashdesk.lang          |    6 +
 htdocs/langs/nl_NL/companies.lang         |    4 +-
 htdocs/langs/nl_NL/compta.lang            |   12 +-
 htdocs/langs/nl_NL/errors.lang            |    3 +-
 htdocs/langs/nl_NL/holiday.lang           |    3 +-
 htdocs/langs/nl_NL/main.lang              |   15 +-
 htdocs/langs/nl_NL/members.lang           |   40 +-
 htdocs/langs/nl_NL/modulebuilder.lang     |   23 +-
 htdocs/langs/nl_NL/paybox.lang            |    9 +-
 htdocs/langs/nl_NL/paypal.lang            |   38 +-
 htdocs/langs/nl_NL/products.lang          |    5 +-
 htdocs/langs/nl_NL/projects.lang          |    5 +-
 htdocs/langs/nl_NL/stripe.lang            |   15 +-
 htdocs/langs/nl_NL/website.lang           |    5 +
 htdocs/langs/pl_PL/accountancy.lang       |   15 +-
 htdocs/langs/pl_PL/admin.lang             |   23 +-
 htdocs/langs/pl_PL/agenda.lang            |    2 +
 htdocs/langs/pl_PL/banks.lang             |   26 +-
 htdocs/langs/pl_PL/bills.lang             |    8 +-
 htdocs/langs/pl_PL/cashdesk.lang          |    6 +
 htdocs/langs/pl_PL/compta.lang            |    2 -
 htdocs/langs/pl_PL/errors.lang            |    1 +
 htdocs/langs/pl_PL/holiday.lang           |    3 +-
 htdocs/langs/pl_PL/main.lang              |   15 +-
 htdocs/langs/pl_PL/members.lang           |   40 +-
 htdocs/langs/pl_PL/modulebuilder.lang     |   23 +-
 htdocs/langs/pl_PL/paybox.lang            |    9 +-
 htdocs/langs/pl_PL/paypal.lang            |   22 +-
 htdocs/langs/pl_PL/products.lang          |    5 +-
 htdocs/langs/pl_PL/projects.lang          |    5 +-
 htdocs/langs/pl_PL/stripe.lang            |   18 +-
 htdocs/langs/pl_PL/website.lang           |    5 +
 htdocs/langs/pt_BR/accountancy.lang       |   49 +-
 htdocs/langs/pt_BR/admin.lang             |  390 ++++++-
 htdocs/langs/pt_BR/agenda.lang            |   18 +-
 htdocs/langs/pt_BR/banks.lang             |   14 +-
 htdocs/langs/pt_BR/bills.lang             |   69 +-
 htdocs/langs/pt_BR/blockedlog.lang        |   14 +-
 htdocs/langs/pt_BR/bookmarks.lang         |   14 +-
 htdocs/langs/pt_BR/boxes.lang             |   29 +
 htdocs/langs/pt_BR/cashdesk.lang          |   23 +
 htdocs/langs/pt_BR/commercial.lang        |   12 +-
 htdocs/langs/pt_BR/companies.lang         |   39 +
 htdocs/langs/pt_BR/compta.lang            |    9 +-
 htdocs/langs/pt_BR/contracts.lang         |    2 +-
 htdocs/langs/pt_BR/cron.lang              |   18 +-
 htdocs/langs/pt_BR/dict.lang              |    2 +
 htdocs/langs/pt_BR/ecm.lang               |    7 +-
 htdocs/langs/pt_BR/errors.lang            |   27 +-
 htdocs/langs/pt_BR/exports.lang           |   46 +-
 htdocs/langs/pt_BR/ftp.lang               |    8 +-
 htdocs/langs/pt_BR/help.lang              |    9 +-
 htdocs/langs/pt_BR/holiday.lang           |   18 +-
 htdocs/langs/pt_BR/install.lang           |    5 +
 htdocs/langs/pt_BR/interventions.lang     |    8 +-
 htdocs/langs/pt_BR/ldap.lang              |    2 +-
 htdocs/langs/pt_BR/mails.lang             |   42 +-
 htdocs/langs/pt_BR/main.lang              |   64 +-
 htdocs/langs/pt_BR/margins.lang           |    1 +
 htdocs/langs/pt_BR/members.lang           |   31 +-
 htdocs/langs/pt_BR/modulebuilder.lang     |   28 +-
 htdocs/langs/pt_BR/multicurrency.lang     |    5 +-
 htdocs/langs/pt_BR/oauth.lang             |   21 +-
 htdocs/langs/pt_BR/opensurvey.lang        |    4 +-
 htdocs/langs/pt_BR/orders.lang            |   13 +
 htdocs/langs/pt_BR/other.lang             |   53 +
 htdocs/langs/pt_BR/paybox.lang            |   12 +-
 htdocs/langs/pt_BR/paypal.lang            |   16 +-
 htdocs/langs/pt_BR/printing.lang          |    6 +-
 htdocs/langs/pt_BR/products.lang          |   41 +-
 htdocs/langs/pt_BR/projects.lang          |   30 +-
 htdocs/langs/pt_BR/propal.lang            |    2 +
 htdocs/langs/pt_BR/sms.lang               |   20 +-
 htdocs/langs/pt_BR/stocks.lang            |   36 +-
 htdocs/langs/pt_BR/stripe.lang            |   19 +-
 htdocs/langs/pt_BR/suppliers.lang         |   31 +-
 htdocs/langs/pt_BR/ticket.lang            |  111 +-
 htdocs/langs/pt_BR/trips.lang             |    2 +
 htdocs/langs/pt_BR/users.lang             |   12 +-
 htdocs/langs/pt_BR/website.lang           |   21 +-
 htdocs/langs/pt_BR/withdrawals.lang       |   15 +-
 htdocs/langs/pt_BR/workflow.lang          |   17 +-
 htdocs/langs/pt_PT/accountancy.lang       |   15 +-
 htdocs/langs/pt_PT/admin.lang             |   23 +-
 htdocs/langs/pt_PT/agenda.lang            |    2 +
 htdocs/langs/pt_PT/banks.lang             |   28 +-
 htdocs/langs/pt_PT/bills.lang             |    8 +-
 htdocs/langs/pt_PT/cashdesk.lang          |    6 +
 htdocs/langs/pt_PT/compta.lang            |    2 -
 htdocs/langs/pt_PT/errors.lang            |    1 +
 htdocs/langs/pt_PT/holiday.lang           |    3 +-
 htdocs/langs/pt_PT/main.lang              |   15 +-
 htdocs/langs/pt_PT/members.lang           |   35 +-
 htdocs/langs/pt_PT/modulebuilder.lang     |   23 +-
 htdocs/langs/pt_PT/paybox.lang            |    9 +-
 htdocs/langs/pt_PT/paypal.lang            |   14 +-
 htdocs/langs/pt_PT/products.lang          |    5 +-
 htdocs/langs/pt_PT/projects.lang          |    5 +-
 htdocs/langs/pt_PT/stripe.lang            |   15 +-
 htdocs/langs/pt_PT/website.lang           |    5 +
 htdocs/langs/ro_RO/accountancy.lang       |   15 +-
 htdocs/langs/ro_RO/admin.lang             |   23 +-
 htdocs/langs/ro_RO/agenda.lang            |    2 +
 htdocs/langs/ro_RO/banks.lang             |  122 +-
 htdocs/langs/ro_RO/bills.lang             |    8 +-
 htdocs/langs/ro_RO/cashdesk.lang          |    6 +
 htdocs/langs/ro_RO/compta.lang            |    2 -
 htdocs/langs/ro_RO/errors.lang            |    1 +
 htdocs/langs/ro_RO/holiday.lang           |   89 +-
 htdocs/langs/ro_RO/main.lang              |   15 +-
 htdocs/langs/ro_RO/members.lang           |    1 +
 htdocs/langs/ro_RO/modulebuilder.lang     |   23 +-
 htdocs/langs/ro_RO/paybox.lang            |   15 +-
 htdocs/langs/ro_RO/paypal.lang            |   38 +-
 htdocs/langs/ro_RO/products.lang          |    5 +-
 htdocs/langs/ro_RO/projects.lang          |    5 +-
 htdocs/langs/ro_RO/stripe.lang            |    6 +-
 htdocs/langs/ro_RO/website.lang           |    5 +
 htdocs/langs/ru_RU/accountancy.lang       |   15 +-
 htdocs/langs/ru_RU/admin.lang             |   23 +-
 htdocs/langs/ru_RU/agenda.lang            |    2 +
 htdocs/langs/ru_RU/banks.lang             |   28 +-
 htdocs/langs/ru_RU/bills.lang             |   10 +-
 htdocs/langs/ru_RU/cashdesk.lang          |    6 +
 htdocs/langs/ru_RU/compta.lang            |    2 -
 htdocs/langs/ru_RU/errors.lang            |    1 +
 htdocs/langs/ru_RU/holiday.lang           |    3 +-
 htdocs/langs/ru_RU/main.lang              |   15 +-
 htdocs/langs/ru_RU/members.lang           |   40 +-
 htdocs/langs/ru_RU/modulebuilder.lang     |   23 +-
 htdocs/langs/ru_RU/paybox.lang            |    9 +-
 htdocs/langs/ru_RU/paypal.lang            |   22 +-
 htdocs/langs/ru_RU/products.lang          |    5 +-
 htdocs/langs/ru_RU/projects.lang          |    5 +-
 htdocs/langs/ru_RU/stripe.lang            |   18 +-
 htdocs/langs/ru_RU/website.lang           |    5 +
 htdocs/langs/sk_SK/accountancy.lang       |   15 +-
 htdocs/langs/sk_SK/admin.lang             |   23 +-
 htdocs/langs/sk_SK/agenda.lang            |    2 +
 htdocs/langs/sk_SK/banks.lang             |   28 +-
 htdocs/langs/sk_SK/bills.lang             |    8 +-
 htdocs/langs/sk_SK/cashdesk.lang          |    6 +
 htdocs/langs/sk_SK/compta.lang            |    2 -
 htdocs/langs/sk_SK/errors.lang            |    1 +
 htdocs/langs/sk_SK/holiday.lang           |    3 +-
 htdocs/langs/sk_SK/main.lang              |   15 +-
 htdocs/langs/sk_SK/members.lang           |   40 +-
 htdocs/langs/sk_SK/modulebuilder.lang     |   23 +-
 htdocs/langs/sk_SK/paybox.lang            |    9 +-
 htdocs/langs/sk_SK/paypal.lang            |   22 +-
 htdocs/langs/sk_SK/products.lang          |    5 +-
 htdocs/langs/sk_SK/projects.lang          |    5 +-
 htdocs/langs/sk_SK/stripe.lang            |   18 +-
 htdocs/langs/sk_SK/website.lang           |    5 +
 htdocs/langs/sl_SI/accountancy.lang       |   15 +-
 htdocs/langs/sl_SI/admin.lang             |   23 +-
 htdocs/langs/sl_SI/agenda.lang            |    2 +
 htdocs/langs/sl_SI/banks.lang             |   28 +-
 htdocs/langs/sl_SI/bills.lang             |    8 +-
 htdocs/langs/sl_SI/cashdesk.lang          |    6 +
 htdocs/langs/sl_SI/compta.lang            |    2 -
 htdocs/langs/sl_SI/errors.lang            |    1 +
 htdocs/langs/sl_SI/holiday.lang           |    3 +-
 htdocs/langs/sl_SI/main.lang              |   15 +-
 htdocs/langs/sl_SI/members.lang           |   40 +-
 htdocs/langs/sl_SI/modulebuilder.lang     |   23 +-
 htdocs/langs/sl_SI/paybox.lang            |    9 +-
 htdocs/langs/sl_SI/paypal.lang            |   22 +-
 htdocs/langs/sl_SI/products.lang          |    5 +-
 htdocs/langs/sl_SI/projects.lang          |    5 +-
 htdocs/langs/sl_SI/stripe.lang            |   18 +-
 htdocs/langs/sl_SI/website.lang           |    5 +
 htdocs/langs/sq_AL/accountancy.lang       |   15 +-
 htdocs/langs/sq_AL/admin.lang             |   23 +-
 htdocs/langs/sq_AL/agenda.lang            |    2 +
 htdocs/langs/sq_AL/banks.lang             |   28 +-
 htdocs/langs/sq_AL/bills.lang             |    8 +-
 htdocs/langs/sq_AL/cashdesk.lang          |    6 +
 htdocs/langs/sq_AL/compta.lang            |    2 -
 htdocs/langs/sq_AL/errors.lang            |    1 +
 htdocs/langs/sq_AL/holiday.lang           |    3 +-
 htdocs/langs/sq_AL/main.lang              |   15 +-
 htdocs/langs/sq_AL/members.lang           |   40 +-
 htdocs/langs/sq_AL/modulebuilder.lang     |   23 +-
 htdocs/langs/sq_AL/paybox.lang            |    9 +-
 htdocs/langs/sq_AL/paypal.lang            |   22 +-
 htdocs/langs/sq_AL/products.lang          |    5 +-
 htdocs/langs/sq_AL/projects.lang          |    5 +-
 htdocs/langs/sq_AL/stripe.lang            |   18 +-
 htdocs/langs/sq_AL/website.lang           |    5 +
 htdocs/langs/sr_RS/accountancy.lang       |   15 +-
 htdocs/langs/sr_RS/admin.lang             |   23 +-
 htdocs/langs/sr_RS/agenda.lang            |    2 +
 htdocs/langs/sr_RS/banks.lang             |   28 +-
 htdocs/langs/sr_RS/bills.lang             |    8 +-
 htdocs/langs/sr_RS/cashdesk.lang          |    6 +
 htdocs/langs/sr_RS/compta.lang            |    2 -
 htdocs/langs/sr_RS/errors.lang            |    1 +
 htdocs/langs/sr_RS/holiday.lang           |    3 +-
 htdocs/langs/sr_RS/main.lang              |   15 +-
 htdocs/langs/sr_RS/members.lang           |   40 +-
 htdocs/langs/sr_RS/paybox.lang            |    9 +-
 htdocs/langs/sr_RS/paypal.lang            |   22 +-
 htdocs/langs/sr_RS/products.lang          |    5 +-
 htdocs/langs/sr_RS/projects.lang          |    5 +-
 htdocs/langs/sv_SE/accountancy.lang       |  121 +-
 htdocs/langs/sv_SE/admin.lang             |  161 +--
 htdocs/langs/sv_SE/agenda.lang            |   38 +-
 htdocs/langs/sv_SE/banks.lang             |   12 +-
 htdocs/langs/sv_SE/bills.lang             |   56 +-
 htdocs/langs/sv_SE/cashdesk.lang          |    6 +
 htdocs/langs/sv_SE/compta.lang            |   54 +-
 htdocs/langs/sv_SE/errors.lang            |  187 ++--
 htdocs/langs/sv_SE/holiday.lang           |   93 +-
 htdocs/langs/sv_SE/main.lang              |   53 +-
 htdocs/langs/sv_SE/members.lang           |   35 +-
 htdocs/langs/sv_SE/modulebuilder.lang     |  227 ++--
 htdocs/langs/sv_SE/paybox.lang            |    7 +-
 htdocs/langs/sv_SE/paypal.lang            |    9 +-
 htdocs/langs/sv_SE/products.lang          |    9 +-
 htdocs/langs/sv_SE/projects.lang          |  213 ++--
 htdocs/langs/sv_SE/stripe.lang            |   80 +-
 htdocs/langs/sv_SE/website.lang           |    7 +-
 htdocs/langs/sw_SW/accountancy.lang       |   15 +-
 htdocs/langs/sw_SW/admin.lang             |   23 +-
 htdocs/langs/sw_SW/agenda.lang            |    2 +
 htdocs/langs/sw_SW/banks.lang             |   28 +-
 htdocs/langs/sw_SW/bills.lang             |    8 +-
 htdocs/langs/sw_SW/cashdesk.lang          |    6 +
 htdocs/langs/sw_SW/compta.lang            |    2 -
 htdocs/langs/sw_SW/errors.lang            |    1 +
 htdocs/langs/sw_SW/holiday.lang           |    3 +-
 htdocs/langs/sw_SW/main.lang              |   15 +-
 htdocs/langs/sw_SW/members.lang           |   40 +-
 htdocs/langs/sw_SW/paybox.lang            |    9 +-
 htdocs/langs/sw_SW/paypal.lang            |   22 +-
 htdocs/langs/sw_SW/products.lang          |    5 +-
 htdocs/langs/sw_SW/projects.lang          |    5 +-
 htdocs/langs/th_TH/accountancy.lang       |   15 +-
 htdocs/langs/th_TH/admin.lang             |   23 +-
 htdocs/langs/th_TH/agenda.lang            |    2 +
 htdocs/langs/th_TH/banks.lang             |   28 +-
 htdocs/langs/th_TH/bills.lang             |    8 +-
 htdocs/langs/th_TH/cashdesk.lang          |    6 +
 htdocs/langs/th_TH/compta.lang            |    2 -
 htdocs/langs/th_TH/errors.lang            |    1 +
 htdocs/langs/th_TH/holiday.lang           |    3 +-
 htdocs/langs/th_TH/main.lang              |   15 +-
 htdocs/langs/th_TH/members.lang           |   40 +-
 htdocs/langs/th_TH/modulebuilder.lang     |   23 +-
 htdocs/langs/th_TH/paybox.lang            |    9 +-
 htdocs/langs/th_TH/paypal.lang            |   22 +-
 htdocs/langs/th_TH/products.lang          |    5 +-
 htdocs/langs/th_TH/projects.lang          |    5 +-
 htdocs/langs/th_TH/stripe.lang            |   18 +-
 htdocs/langs/th_TH/website.lang           |    5 +
 htdocs/langs/tr_TR/accountancy.lang       |   47 +-
 htdocs/langs/tr_TR/admin.lang             |  551 ++++-----
 htdocs/langs/tr_TR/agenda.lang            |   24 +-
 htdocs/langs/tr_TR/banks.lang             |   24 +-
 htdocs/langs/tr_TR/bills.lang             |   94 +-
 htdocs/langs/tr_TR/bookmarks.lang         |   16 +-
 htdocs/langs/tr_TR/boxes.lang             |   56 +-
 htdocs/langs/tr_TR/cashdesk.lang          |   12 +-
 htdocs/langs/tr_TR/categories.lang        |   14 +-
 htdocs/langs/tr_TR/commercial.lang        |   10 +-
 htdocs/langs/tr_TR/companies.lang         |   84 +-
 htdocs/langs/tr_TR/compta.lang            |   14 +-
 htdocs/langs/tr_TR/cron.lang              |   24 +-
 htdocs/langs/tr_TR/deliveries.lang        |    3 +-
 htdocs/langs/tr_TR/dict.lang              |    2 +-
 htdocs/langs/tr_TR/ecm.lang               |   10 +-
 htdocs/langs/tr_TR/errors.lang            |   31 +-
 htdocs/langs/tr_TR/exports.lang           |   30 +-
 htdocs/langs/tr_TR/ftp.lang               |    8 +-
 htdocs/langs/tr_TR/help.lang              |    8 +-
 htdocs/langs/tr_TR/holiday.lang           |   49 +-
 htdocs/langs/tr_TR/install.lang           |   12 +-
 htdocs/langs/tr_TR/interventions.lang     |   18 +-
 htdocs/langs/tr_TR/ldap.lang              |    8 +-
 htdocs/langs/tr_TR/mails.lang             |   26 +-
 htdocs/langs/tr_TR/main.lang              |  195 ++--
 htdocs/langs/tr_TR/members.lang           |   62 +-
 htdocs/langs/tr_TR/modulebuilder.lang     |   61 +-
 htdocs/langs/tr_TR/multicurrency.lang     |   14 +-
 htdocs/langs/tr_TR/oauth.lang             |   26 +-
 htdocs/langs/tr_TR/orders.lang            |   52 +-
 htdocs/langs/tr_TR/other.lang             |   70 +-
 htdocs/langs/tr_TR/paybox.lang            |    9 +-
 htdocs/langs/tr_TR/paypal.lang            |   16 +-
 htdocs/langs/tr_TR/printing.lang          |   14 +-
 htdocs/langs/tr_TR/products.lang          |   67 +-
 htdocs/langs/tr_TR/projects.lang          |   23 +-
 htdocs/langs/tr_TR/propal.lang            |    4 +-
 htdocs/langs/tr_TR/salaries.lang          |   11 +-
 htdocs/langs/tr_TR/sendings.lang          |   14 +-
 htdocs/langs/tr_TR/sms.lang               |    6 +-
 htdocs/langs/tr_TR/stocks.lang            |   78 +-
 htdocs/langs/tr_TR/stripe.lang            |   21 +-
 htdocs/langs/tr_TR/suppliers.lang         |   20 +-
 htdocs/langs/tr_TR/trips.lang             |   10 +-
 htdocs/langs/tr_TR/users.lang             |   16 +-
 htdocs/langs/tr_TR/website.lang           |    7 +-
 htdocs/langs/tr_TR/withdrawals.lang       |   36 +-
 htdocs/langs/tr_TR/workflow.lang          |   24 +-
 htdocs/langs/uk_UA/accountancy.lang       |   15 +-
 htdocs/langs/uk_UA/admin.lang             |   23 +-
 htdocs/langs/uk_UA/agenda.lang            |    2 +
 htdocs/langs/uk_UA/banks.lang             |   28 +-
 htdocs/langs/uk_UA/bills.lang             |    8 +-
 htdocs/langs/uk_UA/cashdesk.lang          |    6 +
 htdocs/langs/uk_UA/compta.lang            |    2 -
 htdocs/langs/uk_UA/errors.lang            |    1 +
 htdocs/langs/uk_UA/holiday.lang           |    3 +-
 htdocs/langs/uk_UA/main.lang              |   15 +-
 htdocs/langs/uk_UA/members.lang           |   40 +-
 htdocs/langs/uk_UA/modulebuilder.lang     |   23 +-
 htdocs/langs/uk_UA/paybox.lang            |    9 +-
 htdocs/langs/uk_UA/paypal.lang            |   22 +-
 htdocs/langs/uk_UA/products.lang          |    5 +-
 htdocs/langs/uk_UA/projects.lang          |    5 +-
 htdocs/langs/uk_UA/stripe.lang            |   18 +-
 htdocs/langs/uk_UA/website.lang           |    5 +
 htdocs/langs/uz_UZ/accountancy.lang       |   15 +-
 htdocs/langs/uz_UZ/admin.lang             |   23 +-
 htdocs/langs/uz_UZ/agenda.lang            |    2 +
 htdocs/langs/uz_UZ/banks.lang             |   28 +-
 htdocs/langs/uz_UZ/bills.lang             |    8 +-
 htdocs/langs/uz_UZ/cashdesk.lang          |    6 +
 htdocs/langs/uz_UZ/compta.lang            |    2 -
 htdocs/langs/uz_UZ/errors.lang            |    1 +
 htdocs/langs/uz_UZ/holiday.lang           |    3 +-
 htdocs/langs/uz_UZ/main.lang              |   15 +-
 htdocs/langs/uz_UZ/members.lang           |   40 +-
 htdocs/langs/uz_UZ/paybox.lang            |    9 +-
 htdocs/langs/uz_UZ/paypal.lang            |   22 +-
 htdocs/langs/uz_UZ/products.lang          |    5 +-
 htdocs/langs/uz_UZ/projects.lang          |    5 +-
 htdocs/langs/vi_VN/accountancy.lang       |   15 +-
 htdocs/langs/vi_VN/admin.lang             |   23 +-
 htdocs/langs/vi_VN/agenda.lang            |    2 +
 htdocs/langs/vi_VN/banks.lang             |   28 +-
 htdocs/langs/vi_VN/bills.lang             |    8 +-
 htdocs/langs/vi_VN/cashdesk.lang          |    6 +
 htdocs/langs/vi_VN/compta.lang            |    2 -
 htdocs/langs/vi_VN/errors.lang            |    1 +
 htdocs/langs/vi_VN/holiday.lang           |    3 +-
 htdocs/langs/vi_VN/main.lang              |   15 +-
 htdocs/langs/vi_VN/members.lang           |   40 +-
 htdocs/langs/vi_VN/modulebuilder.lang     |   23 +-
 htdocs/langs/vi_VN/paybox.lang            |    9 +-
 htdocs/langs/vi_VN/paypal.lang            |   22 +-
 htdocs/langs/vi_VN/products.lang          |    5 +-
 htdocs/langs/vi_VN/projects.lang          |    5 +-
 htdocs/langs/vi_VN/stripe.lang            |   18 +-
 htdocs/langs/vi_VN/website.lang           |    5 +
 htdocs/langs/zh_CN/accountancy.lang       |   15 +-
 htdocs/langs/zh_CN/admin.lang             |   23 +-
 htdocs/langs/zh_CN/agenda.lang            |    2 +
 htdocs/langs/zh_CN/banks.lang             |    8 +-
 htdocs/langs/zh_CN/bills.lang             |    8 +-
 htdocs/langs/zh_CN/cashdesk.lang          |    6 +
 htdocs/langs/zh_CN/compta.lang            |    2 -
 htdocs/langs/zh_CN/errors.lang            |    1 +
 htdocs/langs/zh_CN/holiday.lang           |    3 +-
 htdocs/langs/zh_CN/main.lang              |   15 +-
 htdocs/langs/zh_CN/members.lang           |  136 +--
 htdocs/langs/zh_CN/modulebuilder.lang     |   23 +-
 htdocs/langs/zh_CN/paybox.lang            |    9 +-
 htdocs/langs/zh_CN/paypal.lang            |   44 +-
 htdocs/langs/zh_CN/products.lang          |    5 +-
 htdocs/langs/zh_CN/projects.lang          |    5 +-
 htdocs/langs/zh_CN/stripe.lang            |   86 +-
 htdocs/langs/zh_CN/website.lang           |    5 +
 htdocs/langs/zh_TW/accountancy.lang       |   15 +-
 htdocs/langs/zh_TW/admin.lang             |   25 +-
 htdocs/langs/zh_TW/agenda.lang            |    2 +
 htdocs/langs/zh_TW/banks.lang             |   74 +-
 htdocs/langs/zh_TW/bills.lang             |    8 +-
 htdocs/langs/zh_TW/cashdesk.lang          |    6 +
 htdocs/langs/zh_TW/compta.lang            |    2 -
 htdocs/langs/zh_TW/errors.lang            |    1 +
 htdocs/langs/zh_TW/holiday.lang           |    3 +-
 htdocs/langs/zh_TW/main.lang              |   15 +-
 htdocs/langs/zh_TW/members.lang           |   35 +-
 htdocs/langs/zh_TW/modulebuilder.lang     |   23 +-
 htdocs/langs/zh_TW/paybox.lang            |    9 +-
 htdocs/langs/zh_TW/paypal.lang            |   22 +-
 htdocs/langs/zh_TW/products.lang          |    5 +-
 htdocs/langs/zh_TW/projects.lang          |    5 +-
 htdocs/langs/zh_TW/stripe.lang            |   18 +-
 htdocs/langs/zh_TW/website.lang           |    5 +
 htdocs/theme/eldy/btn.inc.php             |    2 +-
 htdocs/theme/eldy/dropdown.inc.php        |    2 +-
 htdocs/theme/eldy/global.inc.php          |   12 +-
 htdocs/user/class/user.class.php          |    2 +-
 1173 files changed, 15929 insertions(+), 12176 deletions(-)
 delete mode 100644 htdocs/langs/de_CH/stripe.lang
 delete mode 100644 htdocs/langs/es_VE/holiday.lang

diff --git a/htdocs/langs/ar_EG/admin.lang b/htdocs/langs/ar_EG/admin.lang
index fb0836aebfb..af9c5597f40 100644
--- a/htdocs/langs/ar_EG/admin.lang
+++ b/htdocs/langs/ar_EG/admin.lang
@@ -19,6 +19,7 @@ DolibarrSetup=تثبيت أو ترقية البرنامج
 InternalUsers=مستخدمون داخليون
 ExternalUsers=مستخدمون خارجيون
 FormToTestFileUploadForm=نموذج تجربة رفع الملفات (تبعا للتنصيب)
+FeatureAvailableOnlyOnStable=الميزة متوفرة فقط في الإصدارات الثابتة الرسمية
 Module700Name=تبرعات
 Module1780Name=الأوسمة/التصنيفات
 Permission81=قراءة أوامر الشراء
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index ed802f551e5..4a81e94e4f8 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=حساب التسمية
 LabelOperation=Label operation
 Sens=السيناتور
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=دفتر اليومية
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 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
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 3d10314c654..89b929493dd 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=أيضا إذا كان لديك عدد كبير
 UseSearchToSelectContactTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة (> 100 000)، يمكنك زيادة السرعة عن طريق وضع CONTACT_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=عدد الحروف لبدء البحث: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=غير متوفر عندما يكون أجاكس معطلاً
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=الجافا سكربت معطل
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=الميناء
 VirtualServerName=اسم الخادم الافتراضي
 OS=نظام التشغيل
 PhpWebLink=Php ربط الشبكة
-Browser=المتصفح
 Server=الخادم
 Database=قاعدة بيانات
 DatabaseServer=قاعدة بيانات المضيف
@@ -1077,7 +1079,7 @@ SystemInfoDesc=نظام المعلومات المتنوعة المعلومات 
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=لتفعيل وحدات ، على الإعداد منطقة الصفحة الرئيسية&gt; الإعداد -> الوحدات).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=الفواتير والقروض وتلاحظ وحدة ال
 BillsPDFModules=فاتورة نماذج الوثائق
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=علما الائتمان
-CreditNotes=ويلاحظ الائتمان
 ForceInvoiceDate=قوة تاريخ الفاتورة تاريخ المصادقة على
 SuggestedPaymentModesIfNotDefinedInInvoice=واقترح على طريقة دفع الفواتير تلقائيا اذا لم تعرف للفاتورة
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=الرمز البريدي
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
index 354674a5d23..7687f5c0af6 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=الأحداث التي سيقوم دوليبار بإنشاء أ
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=تم إنشاء الطرف الثالث %s
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=العقد%s  تم التأكد من صلاحيته
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=الإقتراح%sتم توقعية
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=المشروع %s تم تعديلة
 PROJECT_DELETEInDolibarr=المشروع %s تم حذفة
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index 0101f4aedb1..f4a67cc42dd 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=البنك
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=مدفوعات متنوعة
 MenuNewVariousPayment=مدفوعات متنوعة جديدة
 BankName=اسم المصرف
 FinancialAccount=الحساب
 BankAccount=الحساب المصرفي
 BankAccounts=الحسابات المصرفية
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=عرض الحساب
 AccountRef=مرجع الحساب المالي
 AccountLabel=بطاقة الحساب المالي
@@ -30,7 +30,7 @@ AllTime=من البداية
 Reconciliation=التسوية
 RIB=رقم الحساب المصرفي
 IBAN=عدد إيبان
-BIC=بيك / سويفت عدد
+BIC=BIC/SWIFT code
 SwiftValid=بيك / سويفت صالحة
 SwiftVNotalid=بيك / سويفت غير صالح
 IbanValid=بان صالحة
@@ -42,11 +42,11 @@ AccountStatementShort=بيان
 AccountStatements=كشوفات الحساب
 LastAccountStatements=كشوفات الحساب الأخيرة
 IOMonthlyReporting=تقارير شهرية
-BankAccountDomiciliation=عنوان الحساب
+BankAccountDomiciliation=Bank address
 BankAccountCountry=بلد حساب
 BankAccountOwner=اسم صاحب الحساب
 BankAccountOwnerAddress=عنوان مالك الحساب
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=إنشاء حساب
 NewBankAccount=حساب جديد
 NewFinancialAccount=حساب مالي جديد
@@ -98,14 +98,14 @@ BankLineConciliated=تم تسوية القيد
 Reconciled=تمت تسويتة
 NotReconciled=لم يتم تسويتة
 CustomerInvoicePayment=مدفوعات العميل
-SupplierInvoicePayment=دفع المورد
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=دفع الاشتراك
 WithdrawalPayment=سحب المدفوعات
 SocialContributionPayment=مدفوعات الضرائب الاجتماعية / المالية
 BankTransfer=حوالة مصرفية
 BankTransfers=حوالات المصرفية
 MenuBankInternalTransfer=حوالة داخلية
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=من
 TransferTo=إلى
 TransferFromToDone=التحويل من <b>%s</b>إلى <b>%s</b>من <b>%s</b>%s قد تم تسجيلة.
@@ -136,7 +136,7 @@ BankTransactionLine=قيد البنك
 AllAccounts=All bank and cash accounts
 BackToAccount=عودة إلى الحساب
 ShowAllAccounts=عرض لجميع الحسابات
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=اختيار كشف الحساب البنكي ذات الصلة مع التسوية. استخدام قيمة رقمية للفرز: شهر سنة أو يوم شهر سنة
 EventualyAddCategory=في نهاية المطاف، حدد الفئة التي لتصنيف السجلات
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=تم ارجاع الشيك وإعادة فتح
 BankAccountModelModule=نماذج مستندات للحسابات البنكية
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=نموذج لطباعة صفحة تحتوي على معلومات BAN .
-NewVariousPayment=مدفوعات متنوعة جديدة
-VariousPayment=مدفوعات متنوعة
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=مدفوعات متنوعة
-ShowVariousPayment=عرض الدفعات المتنوعة
-AddVariousPayment=إضافة دفعات متنوعة
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=تفويض سيبا الخاص بك
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index e240b4b3937..6b5fc0f0a3c 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=تسديدها
 DeletePayment=حذف الدفعة
 ConfirmDeletePayment=هل انت متأكد انك ترغب في حذف هذه الدفعة؟
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=المدفوعات المستلمة
 ReceivedCustomersPayments=المدفوعات المستلمة من العملاء
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=دفع مبلغ
-ValidatePayment=تحقق من الدفع
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
index e322e50887b..49f4cab2cc5 100644
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=التاريخ
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index d0a619aa5ea..d06fefd2700 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=الضرائب الاجتماعية / المالية لدفع
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=دفع جديدة
-Payments=المدفوعات
 PaymentCustomerInvoice=الزبون تسديد الفاتورة
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=اجتماعي / دفع الضرائب المالية
@@ -205,7 +204,6 @@ SellsJournal=مبيعات المجلة
 PurchasesJournal=شراء مجلة
 DescSellsJournal=مبيعات المجلة
 DescPurchasesJournal=شراء مجلة
-InvoiceRef=فاتورة المرجع.
 CodeNotDef=لم يتم تعريف
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=تاريخ الدفع الأجل لا يمكن أن يكون أقل من تاريخ الكائن.
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index e69b2d95ad5..87689d4edd1 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
diff --git a/htdocs/langs/ar_SA/holiday.lang b/htdocs/langs/ar_SA/holiday.lang
index 4ca03f4f867..ac38470af89 100644
--- a/htdocs/langs/ar_SA/holiday.lang
+++ b/htdocs/langs/ar_SA/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=طلبات إجازة التحقق من صحة
 HolidaysValidatedBody=تم التحقق من صحة طلب إجازة لمدة٪ s إلى٪ s.
 HolidaysRefused=طلب نفى
-HolidaysRefusedBody=تم رفض طلب إجازة لمدة٪ s إلى٪ s للسبب التالي:
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=إلغاء طلب الأوراق
 HolidaysCanceledBody=تم إلغاء طلب إجازة لمدة٪ s إلى٪ s.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index adf5294ba69..ec726e1e0c3 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -371,6 +371,7 @@ Percentage=نسبة مئوية
 Total=الإجمالي الكلي
 SubTotal=حاصل الجمع
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=إجمالي (شركة الضريبة)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=إرسال بريد إلكتروني
 Email=Email
 NoEMail=أي بريد إلكتروني
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=لا هاتف المحمول
@@ -671,7 +671,6 @@ Method=الطريقة
 Receive=استقبال
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=القيمة الحالية
 PartialWoman=جزئي
 TotalWoman=المجموع
 NeverReceived=لم يتلق
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=تصنيف الفواتير
 ClassifyUnbilled=Classify unbilled
 Progress=تقدم
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=المكتب الخلفي
 View=View
@@ -842,6 +842,11 @@ Exports=صادرات
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=خيارات التصدير
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=متفرقات
 Calendar=التقويم
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=السنة المالية
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index 4de188494a7..9ca7d011016 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -6,7 +6,7 @@ Member=عضو
 Members=أعضاء
 ShowMember=وتظهر بطاقة عضو
 UserNotLinkedToMember=المستخدم لا ترتبط عضو
-ThirdpartyNotLinkedToMember=طرف ثالث لا علاقة لعضو
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=أعضاء التذاكر
 FundationMembers=أعضاء المؤسسة
 ListOfValidatedPublicMembers=قائمة الأعضاء العامة المصادق
@@ -67,11 +67,11 @@ Subscriptions=الاشتراكات
 SubscriptionLate=متأخر
 SubscriptionNotReceived=الاشتراك لم يتلق
 ListOfSubscriptions=قائمة الاشتراكات
-SendCardByMail=أرسل بطاقة
+SendCardByMail=Send card by email
 AddMember=إنشاء عضو
 NoTypeDefinedGoToSetup=لا يجوز لأي عضو في أنواع محددة. الذهاب إلى الإعداد -- أنواع الأعضاء
 NewMemberType=عضو جديد من نوع
-WelcomeEMail=مرحبا بك في البريد الإلكتروني
+WelcomeEMail=Welcome email
 SubscriptionRequired=الاشتراك المطلوب
 DeleteType=حذف
 VoteAllowed=يسمح التصويت
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd الملف
 ValidateMember=صحة عضوا
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=الارتباطات التالية تفتح صفحة لا يحمي أي Dolibarr تصريح. فهي ليست formated صفحة ، تقدم مثالا على الكيفية التي تظهر في قائمة الأعضاء في قاعدة البيانات.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=عضو في لائحة عامة
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=مضمون البطاقة الخاصة بك عضوا
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=موضوع البريد الإلكتروني وردت في حالة لصناعة السيارات في نقش أحد النزلاء
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=البريد الإلكتروني وردت في حالة لصناعة السيارات في نقش أحد النزلاء
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=البريد الإلكتروني للمرسل البريد الإلكتروني التلقائي
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=علامات الشكل
 DescADHERENT_ETIQUETTE_TEXT=النص المطبوع على أوراق عنوان الأعضاء
 DescADHERENT_CARD_TYPE=شكل بطاقات صفحة
@@ -156,8 +156,8 @@ DocForAllMembersCards=إنشاء بطاقات العمل لجميع أعضاء (
 DocForOneMemberCards=إنشاء بطاقات العمل لعضو معين (تنسيق الإعداد للإخراج في الواقع : <b>%s)</b>
 DocForLabels=أوراق عنوان انتج (تنسيق الإعداد للإخراج فعلا : <b>%s)</b>
 SubscriptionPayment=دفع الاشتراك
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=أعضاء إحصاءات حسب البلد
 MembersStatisticsByState=أعضاء إحصاءات الولاية / المقاطعة
 MembersStatisticsByTown=أعضاء إحصاءات بلدة
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=هذه الشاشة تظهر لك إحصاءات عن أعضاء من الطبيعة.
 MembersByRegion=هذه الشاشة تظهر لك إحصاءات عن أعضاء حسب المنطقة.
 VATToUseForSubscriptions=معدل ضريبة القيمة المضافة لاستخدامه في اشتراكات
-NoVatOnSubscription=لا TVA للاشتراكات
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=المنتج يستخدم لخط الاشتراك في فاتورة و:٪ الصورة
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/ar_SA/modulebuilder.lang b/htdocs/langs/ar_SA/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/ar_SA/modulebuilder.lang
+++ b/htdocs/langs/ar_SA/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/ar_SA/paybox.lang b/htdocs/langs/ar_SA/paybox.lang
index 75c1a3961bd..a99f086470b 100644
--- a/htdocs/langs/ar_SA/paybox.lang
+++ b/htdocs/langs/ar_SA/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=لإكمال
 YourEMail=البريد الإلكتروني لتلقي تأكيد الدفع
 Creditor=دائن
 PaymentCode=رمز الدفع
-PayBoxDoPayment=الدفع باستخدام بطاقة الائتمان أو بطاقة السحب الآلي (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=القيام بالدفع
 YouWillBeRedirectedOnPayBox=سيتم إعادة توجيهك على صفحة Paybox الأمنة لإدخال معلومات بطاقة الائتمان الخاصة بك
 Continue=التالي
 ToOfferALinkForOnlinePayment=عنوان URL للدفع %s
-ToOfferALinkForOnlinePaymentOnOrder=URL لتقديم واجهة مستخدم الدفع عبر الإنترنت %s لأمر العميل
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL لتقديم واجهة مستخدم الدفع عبر الإنترنت %s لفاتورة العميل
 ToOfferALinkForOnlinePaymentOnContractLine=URL لتقديم %s واجهة مستخدم الدفع عبر الإنترنت لخط العقد
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL لتقديم واجهة مستخدم الدفع عبر الإنترنت %s مقابل مبلغ مجاني
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL لتقديم %s واجهة مستخدم الدفع عبر الإنترنت للحصول على اشتراك عضو
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=يمكنك أيضا إضافة معلمة عنوان url <b>&tag=<i>value</i></b> إلى أي من عنوان urlهذا (مطلوب فقط للدفع المجاني) لإضافة علامة تعليق الدفع الخاصة بك.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=تؤكد هذه الصفحة أنه قد تم تسجيل دفعتك. شكرا لكم.
@@ -33,7 +33,8 @@ VendorName=اسم البائع
 CSSUrlForPaymentForm=CSS style sheet url  لنموذج الدفع
 NewPayboxPaymentReceived=تلقى الدفع Paybox الجديد
 NewPayboxPaymentFailed=دفع Paybox جديد حاول ولكنه فشل
-PAYBOX_PAYONLINE_SENDEMAIL=البريد الإلكتروني للانذار بعد (نجاح أو فشل) الدفع 
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=قيمة PBX SITE
 PAYBOX_PBX_RANG=قيمة PBX رانج
 PAYBOX_PBX_IDENTIFIANT=قيمة PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/ar_SA/paypal.lang b/htdocs/langs/ar_SA/paypal.lang
index 6ffd7e627c6..351495835aa 100644
--- a/htdocs/langs/ar_SA/paypal.lang
+++ b/htdocs/langs/ar_SA/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=بايبال حدة الإعداد
-PaypalDesc=صفحات تقدم هذه الوحدة للسماح للدفع على <a href="http://www.paypal.com" target="_blank">بال</a> من قبل العملاء. ويمكن استخدام هذا لدفع مجانا أو مقابل دفع Dolibarr على كائن معين (الفاتورة ، والنظام ،...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=مع دفع بايبال
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=وضع الاختبار / رمل
 PAYPAL_API_USER=API المستخدم
 PAYPAL_API_PASSWORD=API كلمة السر
 PAYPAL_API_SIGNATURE=API توقيع
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=تقدم الدفع &quot;لا يتجزأ&quot; (بطاقة الائتمان + باي بال) أو &quot;باي بال&quot; فقط
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=التكامل
 PaypalModeOnlyPaypal=باي بال فقط
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=هذا هو معرف من الصفقة: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=إضافة رابط الدفع باي بال عند إرسال مستند عبر البريد
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=البريد الإلكتروني لتحذير بعد دفع (النجاح أو لا)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=العودة URL بعد دفع
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=رسالة خطأ قصيرة
 ErrorCode=رمز الخطأ
 ErrorSeverityCode=خطأ خطورة مدونة
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 0eb9d543701..e5051d4aae4 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=المرجع المنتج.
+ProductRef=مرجع المنتج
 ProductLabel=وصف المنتج
 ProductLabelTranslated=تسمية المنتج مترجمة
-ProductDescriptionTranslated=ترجم وصف المنتج
-ProductNoteTranslated=ترجم مذكرة المنتج
+ProductDescriptionTranslated=ترجمة وصف المنتج
+ProductNoteTranslated=ترجمة مذكرة المنتج
 ProductServiceCard=منتجات / بطاقة الخدمات
 TMenuProducts=المنتجات
 TMenuServices=الخدمات
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=المتغيرات العالمية
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=updaters متغير العالمية
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=البيانات JSON
 GlobalVariableUpdaterHelp0=يوزع البيانات JSON من URL محددة، تحدد قيمة الموقع من القيمة ذات الصلة،
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 079ba22a36d..e377e74bbf9 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=الوقت الذي تستغرقه
 TimeSpentByYou=الوقت الذي يقضيه من قبلك
 TimeSpentByUser=الوقت الذي يقضيه المستخدم
 TimesSpent=قضى وقتا
-RefTask=المرجع. مهمة
-LabelTask=علامة مهمة
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=الوقت المستغرق في المهام
 TaskTimeUser=المستعمل
 TaskTimeNote=ملاحظة
diff --git a/htdocs/langs/ar_SA/receiptprinter.lang b/htdocs/langs/ar_SA/receiptprinter.lang
index 16d23a2f456..8732c502908 100644
--- a/htdocs/langs/ar_SA/receiptprinter.lang
+++ b/htdocs/langs/ar_SA/receiptprinter.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
 ReceiptPrinterSetup=Setup of module ReceiptPrinter
-PrinterAdded=طابعة٪ الصورة بإضافة
-PrinterUpdated=طابعة%s تجديد
-PrinterDeleted=طابعة٪ الصورة حذفها
-TestSentToPrinter=اختبار المرسلة إلى الطابعة٪ الصورة
+PrinterAdded=تم إضافة الطابعة %s
+PrinterUpdated=تم تحديث الطابعة %s
+PrinterDeleted=تم حذف الطابعة %s
+TestSentToPrinter=تجربة طباعة نموذج على الطابعة %s
 ReceiptPrinter=Receipt printers
 ReceiptPrinterDesc=Setup of receipt printers
-ReceiptPrinterTemplateDesc=إعداد قوالب
+ReceiptPrinterTemplateDesc=إعداد القوالب
 ReceiptPrinterTypeDesc=وصف نوع استلام الطابعة
 ReceiptPrinterProfileDesc=وصف الملف استلام الطابعة
 ListPrinters=قائمة طابعات
@@ -19,7 +19,7 @@ CONNECTOR_DUMMY_HELP=طابعة وهمية لاختبار، لا يفعل شيئ
 CONNECTOR_NETWORK_PRINT_HELP=10.xxx:9100
 CONNECTOR_FILE_PRINT_HELP=/ ديف / USB / lp0، / ديف / USB / LP1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1، COM1، فلان: // FooUser: السر @ الكمبيوتر / مجموعة العمل / استلام الطابعة
-PROFILE_DEFAULT=الملف التعريف الافتراضي
+PROFILE_DEFAULT=ملف التعريف الافتراضي
 PROFILE_SIMPLE=ملف التعريف بسيط
 PROFILE_EPOSTEP=ملحمة تيب الملف الشخصي
 PROFILE_P822D=الملف P822D
diff --git a/htdocs/langs/ar_SA/stripe.lang b/htdocs/langs/ar_SA/stripe.lang
index 2162529e9b8..594741ab0e8 100644
--- a/htdocs/langs/ar_SA/stripe.lang
+++ b/htdocs/langs/ar_SA/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=فيما يلي عناوين المواقع المتاحة لعرض هذه الصفحة زبون لتسديد دفعة Dolibarr على الأجسام
 PaymentForm=شكل الدفع
-WelcomeOnPaymentPage=ونحن نرحب على خدمة الدفع عبر الإنترنت
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=تتيح لك هذه الشاشة إجراء الدفع الإلكتروني إلى ٪ s.
 ThisIsInformationOnPayment=هذه هي المعلومات عن الدفع للقيام
 ToComplete=لإكمال
 YourEMail=البريد الالكتروني لتأكيد الدفع
-STRIPE_PAYONLINE_SENDEMAIL=البريد الإلكتروني لتحذير بعد دفع (النجاح أو لا)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=الدائن
 PaymentCode=دفع رمز
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=التالى
 ToOfferALinkForOnlinePayment=عنوان دفع %s
-ToOfferALinkForOnlinePaymentOnOrder=عنوان لتقديم المستندات ٪ الدفع الإلكتروني واجهة المستخدم للأمر
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=عنوان لتقديم المستندات ٪ الدفع الإلكتروني واجهة المستخدم للفاتورة
 ToOfferALinkForOnlinePaymentOnContractLine=عنوان لتقديم المستندات ٪ الدفع الإلكتروني واجهة المستخدم للحصول على عقد خط
 ToOfferALinkForOnlinePaymentOnFreeAmount=عنوان لتقديم المستندات ٪ الدفع الإلكتروني واجهة المستخدم لمبلغ حرة
 ToOfferALinkForOnlinePaymentOnMemberSubscription=عنوان الموقع لتقديم الدفع عبر الإنترنت %s واجهة المستخدم للاشتراك عضو
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=يمكنك أيضا إضافة رابط المعلم <b>= & علامة</b> على أي من <i><b>قيمة</b></i> تلك عنوان (مطلوب فقط لدفع الحر) الخاصة بك لإضافة تعليق دفع الوسم.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=هذه الصفحة يؤكد أنه قد تم تسجيلها دفعتك. شكرا لك.
-YourPaymentHasNotBeenRecorded=يمكنك دفع لم يسجل وتم إلغاء الصفقة. شكرا لك.
 AccountParameter=حساب المعلمات
 UsageParameter=استخدام المعلمات
 InformationToFindParameters=مساعدة للعثور على معلومات حسابك %s
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index 78ba38eb15d..ca432fd69ac 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 36d03b25149..047b5e94524 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Етикет на сметка
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Дневник
 JournalLabel=Journal label
 NumPiece=Номер на част
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 6c9c114f426..0f44140eea4 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -10,12 +10,12 @@ VersionDevelopment=Разработка
 VersionUnknown=Неизвестен
 VersionRecommanded=Препоръчва се
 FileCheck=Проверки за цялостност на файлове
-FileCheckDesc=Този инструмент ви позволява да проверите целостта на файловете и настройката на вашето приложение, сравнявайки всеки файл с официалния. Може да се провери и стойността на някои константи за настройка. Можете да използвате този инструмент, за да определите дали някой файл е бил променен (напр. от хакер).
+FileCheckDesc=Този инструмент ви позволява да проверите целостта на файловете и настройката на вашето приложение, сравнявайки всеки файл с официалния. Може да се провери и стойността на някои константи за настройка. Може да използвате този инструмент, за да определите дали някой файл е бил променен (напр. от хакер).
 FileIntegrityIsStrictlyConformedWithReference=Целостта на файловете е строго съобразена с референцията.
 FileIntegrityIsOkButFilesWereAdded=Проверката за целостта на файловете премина, но някои нови файлове са добавени.
 FileIntegritySomeFilesWereRemovedOrModified=Проверката за цялостта на файловете е неуспешна. Някои файлове са били променени, премахнати или добавени.
 GlobalChecksum=Глобална контролна сума
-MakeIntegrityAnalysisFrom=Извършване на анализ на целостта на файловете на приложението от
+MakeIntegrityAnalysisFrom=Извършване на анализ за целостта на файловете на приложението от
 LocalSignature=Вграден локален подпис (по-малко надежден)
 RemoteSignature=Отдалечен подпис (по-надежден)
 FilesMissing=Missing Files
@@ -23,7 +23,7 @@ FilesUpdated=Updated Files
 FilesModified=Променени файлове
 FilesAdded=Добавени файлове
 FileCheckDolibarr=Проверка целостта на файловете в приложението
-AvailableOnlyOnPackagedVersions=Локалният файл за проверка на целостта е наличен само когато приложението е инсталирано от официален пакет
+AvailableOnlyOnPackagedVersions=Локалният файл за проверка на целостта е наличен, само когато приложението е инсталирано от официален пакет
 XmlNotFound=XML файлът за проверка на приложението не е намерен
 SessionId=ID на сесията
 SessionSaveHandler=Handler за да запазите сесията
@@ -66,14 +66,16 @@ Dictionary=Dictionaries
 ErrorReservedTypeSystemSystemAuto=Стойност 'система' и 'автосистема' за типа са запазени. Може да използвате за стойност 'потребител' при добавяне на ваш личен запис.
 ErrorCodeCantContainZero=Кода не може да съдържа стойност 0
 DisableJavascript=Изключване на Java скрипт и Ajax функции
-DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=Забележка: За тестови цели или за отстраняване на грешки. За оптимизация за слепи хора или текстови браузъри може използвате настройката в потребителския профил
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Изчакайте, докато се натисне клавиш, преди да заредите съдържанието на комбинирания списък на контрагенти. <br> Това може да увеличи производителността, ако имате голям брой контрагенти, но е по-малко удобно.
-DelaiedFullListToSelectContact=Изчакайте, докато се натисне бутона, преди да заредите съдържанието на комбинирания падащ списък на контакти. <br> Това може да увеличи производителността, ако имате голям брой контакти, но е по-малко удобно)
-NumberOfKeyToSearch=NBR от знаци, за да предизвика търсене: %s
+DelaiedFullListToSelectCompany=Изчаква натискането на клавиш, преди да зареди съдържание в списъка с контрагенти. <br> Това може да увеличи производителността, ако имате голям брой контрагенти, но е по-малко удобно.
+DelaiedFullListToSelectContact=Изчаква натискането на клавиш, преди да зареди съдържание в списъка с контакти. <br> Това може да увеличи производителността, ако имате голям брой контакти, но е по-малко удобно
+NumberOfKeyToSearch=Брой знаци предизвикващи търсене: %s
+NumberOfBytes=Брой байтове
+SearchString=Низ за търсене
 NotAvailableWhenAjaxDisabled=Не е налично, когато Аякс инвалиди
-AllowToSelectProjectFromOtherCompany=На документ на контрагент, може да изберете проект, свързан с друг контрагент
+AllowToSelectProjectFromOtherCompany=В документ на контрагент може да бъде избран проект, свързан с друг контрагент
 JavascriptDisabled=Java скрипт е забранен
 UsePreviewTabs=Използвайте Преглед раздели
 ShowPreview=Покажи преглед
@@ -81,7 +83,7 @@ PreviewNotAvailable=Preview не е наличен
 ThemeCurrentlyActive=Тема активни в момента
 CurrentTimeZone=TimeZone PHP (сървър)
 MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Датите се съхраняват и връщат от сървъра на базата данни така, сякаш се съхраняват като подаден стойност. Часовата зона има ефект само когато се използва функцията UNIX_TIMESTAMP (която не трябва да се използва от Dolibarr, така че базата данни TZ не трябва да има ефект, дори ако бъде променена след въвеждането на данните).
+TZHasNoEffect=Датите се съхраняват и връщат от сървъра на базата данни така, сякаш се съхраняват като подаден низ. Часовата зона има ефект само когато се използва функцията UNIX_TIMESTAMP (която не трябва да се използва от Dolibarr, така че базата данни TZ не трябва да има ефект, дори ако бъде променена след въвеждането на данните).
 Space=Пространство
 Table=Таблица
 Fields=Полетата
@@ -92,7 +94,7 @@ NextValueForInvoices=Следваща стойност (фактури)
 NextValueForCreditNotes=Следваща стойност (кредитни известия)
 NextValueForDeposit=Следваща стойност (авансово плащане)
 NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Забележка: <b> Вашата </b> PHP конфигурация понастоящем ограничава максималния размер на файловете за качване в <b> %s </b> %s, независимо от стойността на този параметър
+MustBeLowerThanPHPLimit=Забележка: <b> Вашата </b> PHP конфигурация понастоящем ограничава максималния размер на файловете за качване до <b> %s </b> %s, независимо от стойността на този параметър
 NoMaxSizeByPHPLimit=Забележка: Не срокът се определя в конфигурацията на вашия PHP
 MaxSizeForUploadedFiles=Максимален размер за качените файлове (0 за да забраните качване)
 UseCaptchaCode=Използвайте графичен код (CAPTCHA) на страницата за вход
@@ -108,7 +110,7 @@ MenuIdParent=ID майка меню
 DetailMenuIdParent=ID на основното меню (0 за горното меню)
 DetailPosition=Брой Сортиране, за да определи позицията на менюто
 AllMenus=Всички
-NotConfigured=Не е конфигуриран модул / приложение
+NotConfigured=Модулът / приложението не е конфигуриран(о)
 Active=Активен
 SetupShort=Настройки
 OtherOptions=Други опции
@@ -127,15 +129,15 @@ PHPTZ=Часова зона на PHP Сървъра
 DaylingSavingTime=Лятното часово време
 CurrentHour=Час на PHP (сървър)
 CurrentSessionTimeOut=Продължителност на текущата сесия
-YouCanEditPHPTZ=За да зададете различна PHP часова зона (не се изисква), можете да опитате да добавите .htaccess файл с ред като този 'SetEnv TZ Europe/Paris'
+YouCanEditPHPTZ=За да зададете различна PHP часова зона (не се изисква), може да опитате да добавите .htaccess файл с ред като този 'SetEnv TZ Europe/Paris'
 HoursOnThisPageAreOnServerTZ=Внимание, в противоречие с други екрани, часовете на тази страница не са в местната часова зона, а в часовата зона на сървъра.
 Box=Джаджа
 Boxes=Джаджи
-MaxNbOfLinesForBoxes=Максимален брой линии за джаджи
+MaxNbOfLinesForBoxes=Максимален брой редове за джаджи
 AllWidgetsWereEnabled=Всички налични джаджи са активирани
 PositionByDefault=Default order
 Position=Длъжност
-MenusDesc=Мениджърите на менюто определят съдържанието на двете ленти с меню (хоризонтална лента и вертикална лента).
+MenusDesc=Меню мениджърите определят съдържанието на двете ленти с менюта (хоризонтална и вертикална).
 MenusEditorDesc=Редакторът на менюто ви позволява да дефинирате потребителски менюта. Използвайте го внимателно, за да избегнете нестабилност и трайно недостъпни менюта.<br>Някои модули добавят менюта (най-вече в менюто <b>Всички</b>). Ако премахнете някои от тези менюта по погрешка, можете да ги възстановите като деактивирате и да активирате отново модула.
 MenuForUsers=Меню за потребители
 LangFile=.lang файл
@@ -143,19 +145,19 @@ Language_en_US_es_MX_etc=Език (en_US, es_MX, ...)
 System=Система
 SystemInfo=Системна информация
 SystemToolsArea=Системни инструменти
-SystemToolsAreaDesc=Тази зона осигурява административни функции. Използвайте менюто, за да изберете необходимата функция.
+SystemToolsAreaDesc=Тази секция осигурява административни функции. Използвайте менюто, за да изберете необходимата функционалност.
 Purge=Изчистване
 PurgeAreaDesc=Тази страница ви позволява да изтриете всички файлове, генерирани или съхранени от Dolibarr (временни файлове или всички файлове в директорията <b>%s</b>). Използването на тази функция обикновено не е необходимо. Той се предоставя като решение за потребители, чиито Dolibarr се хоства от доставчик, който не предлага разрешения за изтриване на файлове, генерирани от уеб сървъра.
-PurgeDeleteLogFile=Изтриване на лог файлове <b>%s</b> определени за Syslog модула (няма риск от загуба на данни)
+PurgeDeleteLogFile=Изтриване на лог файлове, включително <b>%s</b> генериран от Debug Logs модула (няма риск от загуба на данни)
 PurgeDeleteTemporaryFiles=Изтриване на всички временни файлове (няма риск от загуба на данни)
 PurgeDeleteTemporaryFilesShort=Изтриване на временни файлове
-PurgeDeleteAllFilesInDocumentsDir=Изтрийте всички файлове в директорията: <b>%s</b>.<br>Това ще изтрие всички генерирани документи, свързани с елементи (контрагенти, фактури и т.н.), файлове, качени в модула ECM, архиви на базата данни и временни файлове.
+PurgeDeleteAllFilesInDocumentsDir=Изтриване на  всички файлове в директорията: <b>%s</b>.<br>Това ще изтрие всички генерирани документи, свързани с елементи (контрагенти, фактури и т.н.), файлове, качени чрез ECM модула, архиви на базата данни и временни файлове.
 PurgeRunNow=Изчистване сега
 PurgeNothingToDelete=Няма директория или файлове за изтриване.
 PurgeNDirectoriesDeleted=<b>%s</b> изтрити файлове или директории.
 PurgeNDirectoriesFailed=Неуспешно изтриване на <b>%s</b> файлове или директории.
 PurgeAuditEvents=Поръси всички събития по сигурността
-ConfirmPurgeAuditEvents=Сигурни ли сте, че искате да изчистите всички събития свързани с сигурността? Всички записи за сигурността ще бъдат изтрити, други данни няма да бъдат премахнати.
+ConfirmPurgeAuditEvents=Сигурни ли сте, че искате да изчистите всички събития свързани със сигурността? Всички записи за сигурността ще бъдат изтрити, други данни няма да бъдат премахнати.
 GenerateBackup=Генериране на бекъп
 Backup=Бекъп
 Restore=Възстановяване
@@ -167,11 +169,11 @@ NoBackupFileAvailable=Няма налични бекъпи.
 ExportMethod=Тип на експортирането
 ImportMethod=Внос метод
 ToBuildBackupFileClickHere=За изграждането на резервно копие на файла, натиснете <a href="%s">тук</a> .
-ImportMySqlDesc=За да импортирате архив на MySQL, можете да използвате phpMyAdmin, чрез вашия хостинг или да използвате командата mysql от командния ред.<br>Например:
+ImportMySqlDesc=За да импортирате архив на MySQL може да използвате phpMyAdmin, чрез вашия хостинг или да използвате MySQL команда в терминала.<br>Например:
 ImportPostgreSqlDesc=За да импортирате архивния файл, трябва да използвате pg_restore команда от командния ред:
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=Име на файл за архивиране:
+FileNameToGenerate=Име на архивния файл:
 Compression=Компресия
 CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
 CommandsToDisableForeignKeysForImportWarning=Задължително, ако искате да сте в състояние да възстановите SQL дъмп по-късно
@@ -193,14 +195,14 @@ IgnoreDuplicateRecords=Игнориране на грешки при дубли
 AutoDetectLang=Автоматично (език на браузъра)
 FeatureDisabledInDemo=Feature инвалиди в демо
 FeatureAvailableOnlyOnStable=Функцията се предлага само в официални стабилни версии
-BoxesDesc=Джаджите са компоненти, показващи информация, който можете да добавите, за да персонализирате някои страници. Можете да избирате между показване на джаджата или не, като изберете целевата страница и кликнете върху 'Активиране', или като кликнете върху кошчето, за да я деактивирате.
+BoxesDesc=Джаджите са компоненти, показващи информация, които може да добавите, за да персонализирате някои страници. Можете да избирате между показване на джаджата или не, като изберете целевата страница и кликнете върху 'Активиране', или като кликнете върху кошчето, за да я деактивирате.
 OnlyActiveElementsAreShown=Показани са само елементи от <a href="%s">активирани модули</a>.
 ModulesDesc=Модулите / приложенията определят кои функции са налични в системата. Някои модули изискват да се предоставят съответните разрешения на потребителите след активиране на модула. Кликнете върху бутона за включване / изключване (в края на реда с името на модула), за да активирате / деактивирате модул / приложение.
-ModulesMarketPlaceDesc=Можете да намерите още модули за изтегляне от външни уеб сайтове в интернет ...
+ModulesMarketPlaceDesc=Може да намерите още модули за изтегляне от външни уеб сайтове в интернет...
 ModulesDeployDesc=Ако разрешенията във вашата файлова система го позволяват, можете да използвате този инструмент за инсталиране на външен модул. След това модулът ще се вижда в раздела <strong>%s</strong>.
 ModulesMarketPlaces=Намиране на външно приложение/модул
 ModulesDevelopYourModule=Разработване на собствено приложение/модул
-ModulesDevelopDesc=Можете също така да разработите свой собствен модул или да намерите партньор, който да го разработи за вас.
+ModulesDevelopDesc=Може също така да разработите свой собствен модул или да намерите партньор, който да го разработи за вас.
 DOLISTOREdescriptionLong=Вместо да превключите към <a href="https://www.dolistore.com">www.dolistore.com</a> уебсайта, за да намерите външен модул, може да използвате този вграден инструмент, който ще извърши търсенето в страницата вместо вас (може да е бавно, нуждаете се от интернет достъп) ...
 NewModule=Нов
 FreeModule=Свободен
@@ -211,10 +213,10 @@ SeeInMarkerPlace=Вижте в сайта за покупка
 Updated=Актуализиран
 Nouveauté=Новост
 AchatTelechargement=Купуване / Изтегляне
-GoModuleSetupArea=За да разположите / инсталирате нов модул, отидете в зоната за настройка на модул: <a href="%s">%s</a>.
+GoModuleSetupArea=За да разположите / инсталирате нов модул, отидете в секцията за настройка на модул: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, официалният пазар за външни модули за Dolibarr ERP/CRM
 DoliPartnersDesc=Списък на компаниите, които предоставят разработване по поръчка модули или функции. <br> Забележка: тъй като Dolibarr е приложение с отворен код, <i> всеки </i>, който има опит в програмирането на PHP, може да разработи модул.
-WebSiteDesc=Външни уебсайтове за повече модули за добавки (които не са основни) ...
+WebSiteDesc=Външни уебсайтове за повече модули за добавки (които не са основни)...
 DevelopYourModuleDesc=Някои решения за разработване на ваш собствен модул...
 URL=Връзка
 BoxesAvailable=Налични джаджи
@@ -227,11 +229,11 @@ Required=Задължително
 UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Сигурност
 Passwords=Пароли
-DoNotStoreClearPassword=Шифроване на пароли, съхранявани в базата данни (НЕ като обикновен текст). Силно се препоръчва да активирате тази опция.
-MainDbPasswordFileConfEncrypted=Шифроване на паролата за базата данни, съхранена в conf.php. Силно се препоръчва да активирате тази опция.
+DoNotStoreClearPassword=Криптиране на пароли, съхранявани в базата данни (НЕ като обикновен текст). Силно се препоръчва да активирате тази опция.
+MainDbPasswordFileConfEncrypted=Криптиране на паролата за базата данни, съхранена в conf.php. Силно се препоръчва да активирате тази опция.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=Защитаване на генерирани PDF файлове. Това НЕ се препоръчва, тъй като прекъсва генерирането на големи количества PDF.
+ProtectAndEncryptPdfFiles=Защитаване на генерирани PDF файлове. Това НЕ се препоръчва, тъй като прекъсва генерирането на общ PDF.
 ProtectAndEncryptPdfFilesDesc=Защитата на PDF документ го запазва за четене и печат с всеки PDF браузър. Редактирането и копирането обаче вече не са възможни. Имайте предвид, че използването на тази функция прави изграждането на глобално обединени PDF файлове невъзможно.
 Feature=Особеност
 DolibarrLicense=Лиценз
@@ -260,21 +262,21 @@ SpaceX=Пространство Х
 SpaceY=Пространство Y
 FontSize=Размер на шрифта
 Content=Съдържание
-NoticePeriod=Период на известяване
-NewByMonth=Ново по месец
+NoticePeriod=Период на предизвестие
+NewByMonth=Нови на месец
 Emails=Имейли
-EMailsSetup=Настройка на имейли
+EMailsSetup=Настройка за имейл известяване
 EMailsDesc=Тази страница позволява да замените стандартните си PHP параметри за изпращане на имейли. В повечето случаи в Unix / Linux OS, PHP настройката е правилна и тези параметри не са необходими.
-EmailSenderProfiles=Профили на подател на имейли
+EmailSenderProfiles=Профили за изходяща електронна поща
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS порт (стойност по подразбиране в php.ini: <b> %s </b>)
 MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS хост (стойност по подразбиране в php.ini: <b> %s </b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS порт (не е дефиниран в PHP за Unix-подобни системи)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS хост (не е дефиниран в PHP за Unix-подобни системи)
-MAIN_MAIL_EMAIL_FROM=Имейл на подателя за автоматични имейли (стойност по подразбиране в php.ini: <b> %s </b>)
-MAIN_MAIL_ERRORS_TO=Имейл, използван за автоматично получаване на грешки (за полето 'Грешки-към' в изпратените имейли)
-MAIN_MAIL_AUTOCOPY_TO= Имейл (Bcc) за изпращане на копие на всички изпратени имейли
+MAIN_MAIL_EMAIL_FROM=Имейл адрес за изпращане на автоматични имейли (стойност по подразбиране в php.ini: <b> %s </b>)
+MAIN_MAIL_ERRORS_TO=Имейл адрес за получаване на грешки (за полето 'Грешки-към' в изпратените имейли)
+MAIN_MAIL_AUTOCOPY_TO= Имейл адрес за получаване на скрито копие (Bcc) на всички изпратени имейли
 MAIN_DISABLE_ALL_MAILS=Деактивиране на изпращането на всички имейли (за тестови цели или демонстрации)
-MAIN_MAIL_FORCE_SENDTO=Изпращане на всички имейли до (вместо реалните получатели, за тестови цели)
+MAIN_MAIL_FORCE_SENDTO=Изпращане на всички имейли до (вместо до реалните получатели, за тестови цели)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Добавяне на списъка с имейли на потребители (служители) към разрешените получатели
 MAIN_MAIL_SENDMODE=Метод за изпращане на имейл
 MAIN_MAIL_SMTPS_ID=SMTP потребителско име (ако изпращащият сървър изисква удостоверяване)
@@ -293,11 +295,11 @@ UserEmail=Имейл на потребител
 CompanyEmail=Имейл на фирмата
 FeatureNotAvailableOnLinux=Функцията не е на разположение на Unix подобни системи. Тествайте вашата програма Sendmail на местно ниво.
 SubmitTranslation=Ако преводът за този език не е завършен или сте открили грешки, може да ги коригирате като редактирате файловете в директорията <b> langs/ %s </b> и предоставите вашите промени в www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Ако преводът за този език не е завършен или ако сте открили грешки, може да коригирате това, като редактирате файлове в директорията <b> langs/ %s </b> и предоставите вашите промени променени на dolibarr.org/forum или за разработчиците на github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=Ако преводът за този език не е завършен или ако сте открили грешки, може да коригирате това, като редактирате файлове в директорията <b> langs/ %s </b> и предоставите вашите промени на dolibarr.org/forum или за разработчици на github.com/Dolibarr/dolibarr.
 ModuleSetup=Настройки на модул
-ModulesSetup=Настройка на Модули/Приложения
+ModulesSetup=Настройка на Модули / Приложения
 ModuleFamilyBase=Система
-ModuleFamilyCrm=Управление на взаимоотношенията с клиенти (CRM)
+ModuleFamilyCrm=Управление на взаимоотношения с клиенти (CRM)
 ModuleFamilySrm=Управление на взаимоотношения с доставчици (VRM)
 ModuleFamilyProducts=Управление на продукти (PM)
 ModuleFamilyHr=Управление на човешките ресурси
@@ -312,13 +314,13 @@ ModuleFamilyInterface=Интерфейси със външни системи.
 MenuHandlers=Меню работещи
 MenuAdmin=Menu Editor
 DoNotUseInProduction=Не използвайте на продукшън платформа
-ThisIsProcessToFollow=Процедура за надстройка:
+ThisIsProcessToFollow=Процедура за актуализация:
 ThisIsAlternativeProcessToFollow=Това е алтернативна настройка за ръчно обработване:
 StepNb=Стъпка %s
 FindPackageFromWebSite=Намерете пакет, който ви осигурява функционалността от която имате нужда (например на официалния уебсайт %s).
 DownloadPackageFromWebSite=Изтеглете пакета (например от официалния уебсайт %s).
-UnpackPackageInDolibarrRoot=Разопаковайте / разархивирайте файловете в директорията на Dolibarr на сървъра : <b> %s </b>
-UnpackPackageInModulesRoot=За да разположите / инсталирате външен модул, разопаковайте / разархивирайте пакетираните файлове в директорията на сървъра, определена за външни модули: <br> <b> %s </b>
+UnpackPackageInDolibarrRoot=Разопаковайте / разархивирайте файловете в директорията <b> %s </b> на Dolibarr
+UnpackPackageInModulesRoot=За да разположите / инсталирате външен модул, разопаковайте / разархивирайте пакетираните файлове в директорията <br> <b> %s </b> на сървъра, определена за външни модули
 SetupIsReadyForUse=Разполагането на модула е завършено. Необходимо е да активирате и настроите модула във вашата система, като отидете на страницата за настройка на модули: <a href="%s"> %s </a>.
 NotExistsDirect=Алтернативната основна директория не е дефинирана за съществуваща директория. <br>
 InfDirAlt=От версия 3 е възможно да се дефинира алтернативна основна директория. Това ви позволява да съхранявате в специална директория, добавки и персонализирани шаблони. <br> Просто създайте основна директория в Dolibarr (например: custom). <br>
@@ -369,7 +371,7 @@ FirstnameNamePosition=Позиция на Име/Фамилия
 DescWeather=Следните изображения ще бъдат показани на таблото, когато броят на закъснелите действия достигне следните стойности:
 KeyForWebServicesAccess=Ключът към използване на Web Services (параметър &quot;dolibarrkey&quot; в WebServices)
 TestSubmitForm=Формата на входящ тест
-ThisForceAlsoTheme=С използването на този мениджър на менюто ще използва и собствената му тема независимо от избора на потребителя. Също така специализирания за смартфони меню мениджър може да не работи на всички смартфони. Използвайте друг мениджър на менюто, ако имате проблеми с вашия.
+ThisForceAlsoTheme=С използването на този меню мениджър ще се използва и собствената му тема независимо от избора на потребителя. Също така специализирания за смартфони меню мениджър може да не работи на всички смартфони. Използвайте друг мениджър на менюто, ако имате проблеми с вашия.
 ThemeDir=Директория с темите
 ConnectionTimeout=Прекъсване на връзката
 ResponseTimeout=Отговор изчакване
@@ -385,7 +387,7 @@ PDFRulesForSalesTax=Правила за данък върху продажбит
 PDFLocaltax=Правила за %s
 HideLocalTaxOnPDF=Скриване на %s ставка в колоната ДДС
 HideDescOnPDF=Скриване на описанието на продукти
-HideRefOnPDF=Скриване на реф. номера на продукти
+HideRefOnPDF=Скриване на реф. номер на продукти
 HideDetailsOnPDF=Скриване на подробности за продуктовите линии
 PlaceCustomerAddressToIsoLocation=Използвайте френска стандартна позиция (La Poste) за позиция на клиентския адрес
 Library=Библиотека
@@ -409,7 +411,7 @@ Boolean=Булева (едно квадратче за отметка)
 ExtrafieldPhone = Телефон
 ExtrafieldPrice = Цена
 ExtrafieldMail = Имейл
-ExtrafieldUrl = Url
+ExtrafieldUrl = URL
 ExtrafieldSelect = Избор лист
 ExtrafieldSelectList = Избор от таблица
 ExtrafieldSeparator=Разделител (не е поле)
@@ -419,115 +421,116 @@ ExtrafieldCheckBox=Полета за отметка
 ExtrafieldCheckBoxFromList=Отметки от таблица
 ExtrafieldLink=Link to an object
 ComputedFormula=Изчислено поле
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
-ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ComputedFormulaDesc=Тук можете да въведете формула, използвайки други свойства на обекта или PHP код, за да получите динамична изчислена стойност. Можете да използвате всички съвместими с PHP формули, включително "?" условен оператор и следния глобален обект: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>. <br> <strong>ВНИМАНИЕ</strong>: Може да са налице само някои свойства на $object. Ако ви трябват свойства, които не са заредени, просто вземете сами обекта във вашата формула като във втория пример. <br> Използването на изчислено поле означава, че не можете да въведете никаква стойност от интерфейса. Също така, ако има синтактична грешка, формулата може да не върне нищо. <br><br> Пример за формула: <br> $object->id<10 ? round($object>id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($ mysoc->zip, 1, 2) <br><br> Пример за презареждане на обект <br>(($reloadedobj = new Societe ($db)) && ($reloadedobj->fetch ($obj->id ? $obj->id:($ obj->rowid ? $obj->rowid: $object->id )) > 0)) ? $reloadedobj->array_options ['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' <br><br> Друг пример за формула за натоварване на обекта и неговия главен обект: <br> (($reloadedobj = new Task ($db)) && ($reloadedobj->fetch ($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch ($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ExtrafieldParamHelpPassword=Оставяйки това поле празно означава, че тази стойност ще бъде съхранена без криптиране (полето трябва да бъде скрито само със звезда на екрана). <br> Задайте „auto“, за да използвате правилото за криптиране по подразбиране, за да запазите паролата в базата данни (тогава стойността за четене ще бъде само за хеш, няма начин да извлечете оригиналната стойност)
+ExtrafieldParamHelpselect=Списъкът със стойности трябва да бъде във формат key,value (където key не може да бъде '0';) <br><br> например: <br> 1,value1 <br> 2,value2 <br> code3,value3 <br> ... <br><br> За да имате списъка в зависимост от друг допълнителен списък с атрибути: <br> 1,value1|options_ <i>parent_list_code</i>:parent_key<br>2,value2|options_ <i>parent_list_code</i>:parent_key <br><br> За да имате списъка в зависимост от друг списък: <br> 1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=Списъкът със стойности трябва да бъде във формат key,value (където key не може да бъде '0') <br><br> например: <br> 1,value1 <br>2,value2 <br>3,value3<br> ...
+ExtrafieldParamHelpradio=Списъкът със стойности трябва да бъде във формат key,value (където key не може да бъде '0') <br><br> например: <br> 1,value1 <br>2,value2 <br>3,value3<br> ...
+ExtrafieldParamHelpsellist=Списъкът на стойностите идва от таблица <br>Синтаксис: table_name:label_field:id_field::filter<br> Пример: c_typent: libelle:id::filter <br><br> - idfilter е задължително основен int key <br> - филтърът може да бъде прост тест (например active = 1), за да се покаже само активна стойност <br> Може също да използвате $ID$ във филтъра, който е текущият идентификатор на текущия обект. <br>За да направите SELECT във филтъра, използвайте $SEL$ <br> ако искате да филтрирате по допълнителни полета, използвайте синтаксис extra.fieldcode=...(където кодът на полето е кодът на допълнителното поле) <br><br> За да имате списъка в зависимост от друг допълнителен списък с атрибути: <br> c_typent:libelle:id:options_ <i>parent_list_code</i>|parent_column:филтер<br><br> За да имате списъка в зависимост от друг списък: <br> c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Списъкът на стойностите идва от таблица <br> Синтаксис: table_name:label_field:id_field::filter <br> Пример: c_typent:libelle:id::filter <br><br> филтърът може да бъде прост тест (например active = 1), за да се покаже само активна стойност <br> Можете също да използвате $ID$ във филтъра, който е текущият идентификатор на текущия обект <br> За да направите SELECT във филтъра, използвайте $SEL$ <br> ако искате да филтрирате по допълнителни полета, използвайте синтаксис extra.fieldcode=...(където кодът на полето е кодът на екстра полето) <br><br> За да имате списъка в зависимост от друг допълнителен списък с атрибути: <br>c_typent:libelle:id:options_ <i>parent_list_code</i>|parent_column:filter<br><br> За да имате списъка в зависимост от друг списък: <br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelplink=Параметрите трябва да са ObjectName:Classpath<br>Синтаксис: ObjectName:Classpath<br>Примери: <br> Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Използвана библиотека за създаване на PDF файлове
-LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Някои държави могат да прилагат два или три данъка към всеки ред във фактурата. Ако случаят е такъв, изберете вида на втория и третия данък и съответната данъчна ставка. Възможен тип са:<br>1: местен данък върху продукти и услуги без ДДС (местния данък се изчислява върху сумата без данък)<br>2: местен данък върху продукти и услуги с ДДС (местният данък се изчислява върху сумата + основния данък)<br>3: местен данък върху продукти без ДДС (местният данък се изчислява върху сумата без данък)<br>4: местен данък върху продукти с ДДС (местният данък се изчислява върху сумата + основния данък)<br>5: местен данък върху услуги без ДДС (местният данък се изчислява върху сумата без данък)<br>6: местен данък върху услуги с ДДС (местният данък се изчислява върху сумата + основния данък)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Обнови връзка
 LinkToTest=Генерирана е връзка за потребител <strong>%s</strong> (натиснете телефонния номер за тест)
 KeepEmptyToUseDefault=Оставете празно за стойност по подразбиране
 DefaultLink=Връзка по подразбиране
-SetAsDefault=Избери като по-подразбиране
+SetAsDefault=Задайте по подразбиране
 ValueOverwrittenByUserSetup=Внимание, тази стойност може да бъде презаписана от потребителски настройки (всеки потребител може да зададе собствен натисни-набери адрес)
 ExternalModule=Външен модул - инсталиран в директория %s
-BarcodeInitForthird-parties=Масов баркод за контрагент
+BarcodeInitForthird-parties=Масова баркод инициализация за контрагенти
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Понастоящем имате <strong> %s </strong> запис на <strong> %s </strong> %s без дефиниран баркод.
+CurrentlyNWithoutBarCode=В момента имате <strong>%s</strong> записа на <strong>%s</strong> %s без дефиниран баркод.
 InitEmptyBarCode=Init value for next %s empty records
 EraseAllCurrentBarCode=Erase all current barcode values
 ConfirmEraseAllCurrentBarCode=Сигурни ли сте че, искате да изтриете всички текущи стойности на баркода?
 AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
-EnableFileCache=Пусни кеширането на файла
-ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
-NoDetails=No additional details in footer
+NoBarcodeNumberingTemplateDefined=Няма активиран баркод шаблон за номериране в настройката на баркод модула.
+EnableFileCache=Активиране на файлово кеширане
+ShowDetailsInPDFPageFoot=Добавете още подробности във футъра, като адрес на компанията или името на управителя (в допълнение към професионалните идентификационни номера, капитала на компанията и идентификационния номер по ДДС).
+NoDetails=Няма допълнителни подробности във футъра
 DisplayCompanyInfo=Показване на фирмения адрес
 DisplayCompanyManagers=Показване на името на управителя
-DisplayCompanyInfoAndManagers=Показване на адреса на фирмата и имената на управителя
-EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
-ModuleCompanyCodeCustomerAquarium=%s последван от клиентски код за счетоводна сметка  на клиента
-ModuleCompanyCodeSupplierAquarium=%s последван от код на доставчика за счетоводна сметка на доставчика
-ModuleCompanyCodePanicum=Върнете празен код за счетоводство.
+DisplayCompanyInfoAndManagers=Показване на фирмения адрес и името на управителя
+EnableAndSetupModuleCron=Ако искате да се генерира автоматично тази повтаряща се фактура, модулът '%s' трябва да бъде активиран и правилно настроен. В противен случай генерирането на фактури трябва да се извършва ръчно от този шаблон, като се използва бутона 'Създаване'. Имайте предвид, че дори да сте активирали автоматичното генериране, все още можете да стартирате безопасно ръчно генериране. Генерирането на дубликати за същия период не е възможно.
+ModuleCompanyCodeCustomerAquarium=%s последван от клиентски код за счетоводен код на клиента
+ModuleCompanyCodeSupplierAquarium=%s последван от код на доставчика за счетоводен код на доставчика
+ModuleCompanyCodePanicum=Не генерира счетоводен код
 ModuleCompanyCodeDigitaria=Счетоводният код зависи от кода на контрагента. Кодът се състои от знака "C" в първата позиция, последван от първите 5 символа от кода на контрагента.
-Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
-UseDoubleApproval=Използвайте одобрение от 3 стъпки, когато сумата (без данък) е по-висока от ...
-WarningPHPMail=ПРЕДУПРЕЖДЕНИЕ: Често е по-добре да настроите изпращането на имейли,  да използва имейл сървъра на вашия доставчик, вместо настройката по подразбиране. Някои доставчици на електронна поща (като Yahoo) не ви позволяват да изпращате имейл от друг сървър, отколкото от собствения им сървър. Текущата ви настройка използва сървъра на приложението за изпращане на имейли, а не на сървъра на вашия доставчик на електронна поща, така че някои получатели (съвместими с ограничителния DMARC протокол), ще поискат от вашия доставчик на електронна поща дали могат да приемат имейла ви и някои доставчици на електронна поща (като Yahoo) може да отговори "не", защото сървърът не е техен, така че малко от изпратените ви имейли може да не бъдат приети (бъдете внимателни и с квотата за изпращане на вашия имейл доставчик). <br> Ако вашият доставчик на имейл (като Yahoo) има това ограничение, трябва да промените настройката за имейл, за да изберете друг метод "SMTP сървър" и да въведете SMTP сървъра и идентификационните данни, предоставени от вашия доставчик на електронна поща.
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+Use3StepsApproval=По подразбиране поръчките за покупки трябва да бъдат създадени и одобрени от двама различни потребители (една стъпка / потребител за създаване и друга стъпка / потребител за одобрение. Обърнете внимание, че ако потребителят има разрешение да създава и одобрява, една стъпка / потребител ще бъде достатъчно). С тази опция може да поискате да въведете трета стъпка / потребител за одобрение, ако сумата е по-висока от определена стойност (така ще са необходими 3 стъпки: 1 = валидиране, 2 = първо одобрение и 3 = второ одобрение, ако количеството е достатъчно).<br> Оставете това поле празно, ако едно одобрение (в 2 стъпки) е достатъчно или задайте много ниска стойност (например: 0.1), за да се изисква винаги второ одобрение (в 3 стъпки).
+UseDoubleApproval=Използване на одобрение в 3 стъпки, когато сумата (без данък) е по-голяма от...
+WarningPHPMail=ВНИМАНИЕ: За предпочитане е да настроите изпращането на имейли,  да използва имейл сървъра на вашия доставчик, вместо настройката по подразбиране. Някои доставчици на електронна поща (като Yahoo) не позволяват да изпращате имейл от друг сървър, освен от собствения им сървър. Текущата настройка използва сървъра на приложението за изпращане на имейли, а не на сървъра на вашия доставчик на електронна поща, така че някои получатели (съвместими с ограничителния DMARC протокол), ще попитат вашия доставчик на електронна поща дали могат да приемат имейлът ви, а някои доставчици на електронна поща (като Yahoo) ще отговорят "не", защото сървърът не е техен, така че някои от изпратените имейли може да не бъдат приети (бъдете внимателни и с квотата за изпращане на вашия имейл доставчик).<br>Ако вашият доставчик на имейл (като Yahoo) има това ограничение, трябва да промените настройката и да изберете другия метод "SMTP сървър" и да въведете SMTP сървъра и идентификационните данни, предоставени от вашия доставчик на електронна поща.
+WarningPHPMail2=Ако вашият SMTP доставчик трябва да ограничи имейл клиента до някои IP адреси (много рядко), това е IP адресът на потребителския агент за поща (MUA) за вашето ERP CRM приложение: <strong>%s</strong> .
 ClickToShowDescription=Кликнете, за да се покаже описание
-DependsOn=Този модул се нуждае от модула (ите)
-RequiredBy=Този модул се изисква от модул (и)
-TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
-PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-EnableDefaultValues=Активиране на персонализирането на стойностите по подразбиране
-EnableOverwriteTranslation=Активиране на използването на презаписан превод
-GoIntoTranslationMenuToChangeThis=Намерен е превод за ключа с този код. За да промените тази стойност, трябва да я редактирате от Начало-Настройки-Преводи.
-WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
-Field=Област
+DependsOn=Този модул се нуждае от модул(и)
+RequiredBy=Този модул изисква модул(и)
+TheKeyIsTheNameOfHtmlField=Това е името на HTML полето. Необходими са технически познания, за да прочетете съдържанието на HTML страницата и да получите ключовото име на полето.
+PageUrlForDefaultValues=Трябва да въведете относителния път на URL адреса на страницата. Ако включите параметри в URL, стойностите по подразбиране ще бъдат ефективни, ако всички параметри са зададени с една и съща стойност.
+PageUrlForDefaultValuesCreate=<br>Пример: <br>За да създадете нов контрагент, той е <strong>%s</strong>.<br> За URL на външни модули, инсталирани в /custom/ директорията използвайте следния път <strong>mymodule/mypage.php</strong> и не включвайте  custom/mymodule/mypage.php.<br>Ако искате само стойността по подразбиране, в случай че URL има някакъв параметър, може да използвате <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Пример:<br>За страницата, която изброява контрагентите, той е <strong>%s</strong>.<br>За URL на външни модули, инсталирани в  /custom/ директорията използвайте следния път <strong>mymodule/mypagelist.php</strong>и не включвайте custom/mymodule/mypagelist.php. <br> Ако искате само стойността по подразбиране, в случай че URL има някакъв параметър, може да използвате <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Също така имайте предвид, че презаписването на стойностите по подразбиране за създаване на формуляри работи само за страници, които са били правилно разработени (с параметър action=create или presend...)
+EnableDefaultValues=Персонализиране на стойности по подразбиране
+EnableOverwriteTranslation=Използване на презаписан превод
+GoIntoTranslationMenuToChangeThis=Намерен е превод за ключа с този код. За да промените тази стойност, трябва да я редактирате като отидете в Начало - Настройки - Превод
+WarningSettingSortOrder=Внимание, задаването на ред за сортиране по подразбиране може да доведе до техническа грешка при влизане в страницата на списъка, ако полето е неизвестно. Ако възникне такава грешка, се върнете на тази страница, за да премахнете редът за сортиране по подразбиране и да възстановите първоначалното състояние.
+Field=Поле
 ProductDocumentTemplates=Шаблони на документи за генериране на продуктов документ
-FreeLegalTextOnExpenseReports=Безплатен правен текст в отчетите за разходите
-WatermarkOnDraftExpenseReports=Воден знак за чернови на отчети за разходите
-AttachMainDocByDefault=Задайте това на 1, ако искате да прикачите основния документ по имейл по подразбиране (ако е приложимо)
-FilesAttachedToEmail=Прикачите файл
-SendEmailsReminders=Изпратете напомняния за дневния ред по имейли
+FreeLegalTextOnExpenseReports=Свободен юридически текст в разходните отчети
+WatermarkOnDraftExpenseReports=Воден знак в чернови разходни отчети
+AttachMainDocByDefault=Задайте стойност '1', ако искате по подразбиране да се прикачи основния документ към имейла (ако е приложимо)
+FilesAttachedToEmail=Прикачете файл
+SendEmailsReminders=Изпращане на напомняния за събития по имейл
 davDescription=Настройка на WebDAV сървър
 DAVSetup=Настройка на модул DAV
-DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
-DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
-DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
-DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
-DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
-DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+DAV_ALLOW_PRIVATE_DIR=Активиране на обща частна директория (специална WebDAV директория с име 'private' - изискват се данни за вход)
+DAV_ALLOW_PRIVATE_DIRTooltip=Общата частна директория е WebDAV директория, до която всеки може да има достъп с неговите данни за вход.
+DAV_ALLOW_PUBLIC_DIR=Активиране на обща публична директория (специална WebDAV директория с име 'public' - не се изискват данни за вход)
+DAV_ALLOW_PUBLIC_DIRTooltip=Общата публична директория е WebDAV директория, до която всеки може да има достъп (за четене и запис), без да се изискват данни за вход.
+DAV_ALLOW_ECM_DIR=Активиране на частна DMS / ECM директория (основна директория на DMS / ECM модула - изискват се данни за вход)
+DAV_ALLOW_ECM_DIRTooltip=Основна директория, в която всички файлове се добавят ръчно при използване на модула DMS / ECM. Подобно на достъпа през уеб интерфейса ще имате нужда от валидно потребителско име и парола, заедно със съответните права за достъп.
 # Modules
 Module0Name=Потребители и групи
 Module0Desc=Управление на потребители / служители и групи
 Module1Name=Контрагенти
-Module1Desc=Управление на фирми и контакти (клиенти, перспективи ...)
+Module1Desc=Управление на фирми и контакти (клиенти, възможности...)
 Module2Name=Търговски
 Module2Desc=Търговско управление
-Module10Name=Accounting (simplified)
-Module10Desc=Опростени счетоводни отчети (дневници, оборот) въз основа на съдържанието на базата данни. Не използва сметкоплан.
+Module10Name=Счетоводство (опростено)
+Module10Desc=Опростени счетоводни отчети (дневник, оборот) въз основа на съдържанието в базата данни. Не използва сметкоплан.
 Module20Name=Предложения
 Module20Desc=Търговско предложение управление
 Module22Name=Масови имейли
-Module22Desc=Управлявайте масовото изпращане по имейл
+Module22Desc=Управление на масови имейли
 Module23Name=Енергия
 Module23Desc=Наблюдение на консумацията на енергия
 Module25Name=Поръчки за продажба
 Module25Desc=Управление на поръчки за продажба
 Module30Name=Фактури
-Module30Desc=Управление на фактури и кредитни известия за клиенти. Управление на фактури и кредитни известия за доставчици
+Module30Desc=Управление на фактури и кредитни известия към клиенти. Управление на фактури и кредитни известия от доставчици
 Module40Name=Доставчици
 Module40Desc=Управление на доставчици и покупки (поръчки за покупка и фактуриране)
-Module42Name=Debug Logs
-Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module42Name=Журнали за отстраняване на грешки
+Module42Desc=Инструменти за регистриране (файл, syslog, ...). Дневници за технически цели и отстраняване на грешки.
 Module49Name=Редактори
 Module49Desc=Управление на редактор
 Module50Name=Продукти
-Module50Desc=Управление на продуктите
+Module50Desc=Управление на продукти
 Module51Name=Масови имейли
 Module51Desc=Маса управлението на хартия пощенски
 Module52Name=Запаси
-Module52Desc=Управление на стоките (само за продукти)
+Module52Desc=Управление на наличности (само за продукти)
 Module53Name=Услуги
-Module53Desc=Управление на услугите
+Module53Desc=Управление на услуги
 Module54Name=Договори/Абонаменти
 Module54Desc=Управление на договори (услуги или периодични абонаменти)
 Module55Name=Баркодове
 Module55Desc=Управление на баркод
 Module56Name=Телефония
 Module56Desc=Телефония интеграция
-Module57Name=Банка плащания с директен дебит
-Module57Desc=Управление на нареждания за плащане с директен дебит. Включва генериране на SEPA файл за Европейските страни.
+Module57Name=Банкови плащания с директен дебит
+Module57Desc=Управление на платежни нареждания за директен дебит. Включва генериране на SEPA файл за европейските страни.
 Module58Name=ClickToDial
 Module58Desc=Интеграция на ClickToDial система (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -538,114 +541,114 @@ Module75Name=Разход и пътуване бележки
 Module75Desc=Сметка и управление на пътуване бележки
 Module80Name=Превозите
 Module80Desc=Управление на пратки и документи за доставка
-Module85Name=Банки | Каса
+Module85Name=Банки и пари в брой
 Module85Desc=Управление на банкови или парични сметки
 Module100Name=Външен сайт
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module100Desc=Добавяне на връзка към външен уебсайт като икона в главното меню. Уебсайтът се показва в рамка под горното меню.
 Module105Name=Пощальон и СПИП
 Module105Desc=Пощальон или СПИП интерфейс за член модул
 Module200Name=LDAP
-Module200Desc=LDAP directory synchronization
+Module200Desc=Синхронизиране на LDAP директория
 Module210Name=PostNuke
 Module210Desc=PostNuke интеграция
 Module240Name=Данни износ
-Module240Desc=Инструмент за експортиране на Dolibarr данни (с помощ)
+Module240Desc=Инструмент за експортиране на данни от Dolibarr (с асистенти)
 Module250Name=Импортирането на данни
 Module250Desc=Инструмент за импортиране на данни в Dolibarr (с асистенти)
 Module310Name=Членове
 Module310Desc=Управление на членовете на организацията
 Module320Name=RSS емисия
-Module320Desc=Add a RSS feed to Dolibarr pages
+Module320Desc=Добавяне на RSS емисия към страниците на Dolibarr
 Module330Name=Отметки и кратки пътища
-Module330Desc=Създавайте винаги достъпни преки пътища към вътрешните или външните страници, до които често имате достъп
+Module330Desc=Създаване на достъпни кратки пътища към вътрешни или външни страници, които използвате често
 Module400Name=Проекти или възможности
-Module400Desc=Управление на проекти, потенциални клиенти и / или задачи. Можете също така да зададете всеки елемент (фактура, поръчка, предложение, намеса, ...) на проект и да получите напречен изглед от проекта.
+Module400Desc=Управление на проекти, възможности / потенциални клиенти и / или задачи. Свързване на елементи (фактури, поръчки, предложения, интервенции, ...) към проект, с цел получаване на общ преглед за проекта
 Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграция
 Module500Name=Данъци и специални разходи
-Module500Desc=Управление на други разходи (ДДС, социални или допълнителни данъци, дивиденти, ...)
-Module510Name=Salaries
-Module510Desc=Записвайте и проследявайте плащанията на служителите
-Module520Name=Заеми
+Module500Desc=Управление на други разходи (ДДС, социални или фискални данъци, дивиденти, ...)
+Module510Name=Заплати
+Module510Desc=Записване и проследяване на плащанията към служители
+Module520Name=Кредити
 Module520Desc=Management of loans
 Module600Name=Известия
-Module600Desc=Изпращайте известия по имейл, предизвикани от бизнес събитие: за потребител (настройка, определена за всеки потребител), за контакти на контрагенти (настройка, определена за всеки контрагент) или по конкретни имейли
-Module600Long=Имайте предвид, че този модул изпраща имейли в реално време, когато се случи конкретно бизнес събитие. Ако търсите функция за изпращане на напомняния по имейл за събития от дневния ред, влезте в настройката на модула Дневен ред.
+Module600Desc=Изпращане на известия по имейл, предизвикани от дадено събитие: за потребител (настройка, определена за всеки потребител), за контакти на контрагенти (настройка, определена за всеки контрагент) или за определени имейли
+Module600Long=Имайте предвид, че този модул изпраща имейли в реално време, когато настъпи дадено събитие. Ако търсите функция за изпращане на напомняния по имейл за събития от календара отидете в настройката на модула Календар.
 Module610Name=Продуктови варианти
 Module610Desc=Създаване на варианти на продукта (цвят, размер и др.)
 Module700Name=Дарения
 Module700Desc=Управление на дарения
-Module770Name=Отчети за разходите
-Module770Desc=Управление на искания за разходен отчет (транспорт, хранене, ...)
-Module1120Name=Доставчици търговски предложения
-Module1120Desc=Поискайте търговско предложение и цени от доставчик
+Module770Name=Разходни отчети
+Module770Desc=Управление на искания за разходи (транспорт, храна, ...)
+Module1120Name=Запитвания към доставчици
+Module1120Desc=Управление на запитвания към доставчици за цени и условия на доставка
 Module1200Name=Богомолка
 Module1200Desc=Mantis интеграция
 Module1520Name=Document Generation
-Module1520Desc=Генериране на масови електронни документи
+Module1520Desc=Генериране на документи за масови имейли
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Създаване на етикети / категории (за продукти, клиенти, доставчици, контакти или членове)
 Module2000Name=WYSIWYG редактор
 Module2000Desc=Разрешаване на редактиране / форматиране на текстовите полета с помощта на CKEditor (html)
 Module2200Name=Dynamic Prices
-Module2200Desc=Използвайте математически изрази за автоматично генериране на цени
+Module2200Desc=Използване на математически изрази за автоматично генериране на цени
 Module2300Name=Планирани задачи
-Module2300Desc=Планирано управление на заданията (псевдоним на таблица cron или chrono)
-Module2400Name=Събития / Дневен ред
-Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
-Module2500Name=DMS / ECM
-Module2500Desc=Система за управление на документи / Управление на електронно съдържание. Автоматична организация на вашите генерирани или съхранени документи. Споделете ги, когато имате нужда.
+Module2300Desc=Управление на планирани задачи (cron или chrono таблица)
+Module2400Name=Събития / Календар
+Module2400Desc=Проследяване на събития. Регистриране на автоматични събития с цел проследяване или записване на ръчни събития или срещи. Това е основният модул за добро управление на взаимоотношенията с клиенти и доставчици.
+Module2500Name=Документи / Съдържание
+Module2500Desc=Система за управление на документи / Управление на електронно съдържание. Автоматична организация на вашите генерирани или съхранени документи. Споделяне на документи.
 Module2600Name=API services (Web services SOAP)
 Module2600Desc=Enable the Dolibarr SOAP server providing API services
 Module2610Name=API services (Web services REST)
 Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2660Name=Извикване на WebServices (SOAP клиент)
+Module2660Desc=Активиране на Dollibarr клиент за уеб услуги (Може да се използва за препращане на данни / заявки към външни сървъри. Понастоящем се поддържат само поръчки за покупка.)
 Module2700Name=Gravatar
-Module2700Desc=Използвайте онлайн услугата Gravatar (www.gravatar.com), за да покажете снимка на потребители / членове (намерени с техните имейли). Има нужда от достъп до интернет
+Module2700Desc=Онлайн услуга Gravatar (www.gravatar.com), която показва снимка на потребители / членове (открита, чрез техните имейли). Нуждае се от достъп до интернет.
 Module2800Desc=FTP Клиент
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind реализации възможности
-Module3200Name=Незаменими архиви
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3200Name=Неизменими архиви
+Module3200Desc=Непроменлив дневник на бизнес събития. Събитията се архивират в реално време. Дневникът е таблица, достъпна единствено за четене, която съдържа последователни събития, които могат да бъдат експортирани. Този модул може да е задължителен за някои страни.
 Module4000Name=ЧР
-Module4000Desc=Управление на човешките ресурси (управление на отдел, договори и настроения на служителите)
+Module4000Desc=Управление на човешки ресурси (управление на отдел, договори и настроения на служители)
 Module5000Name=Няколко фирми
 Module5000Desc=Позволява ви да управлявате няколко фирми
 Module6000Name=Workflow
-Module6000Desc=Управление на работния процес (автоматично създаване на обект и / или автоматично изменение на състоянието)
+Module6000Desc=Управление на работен процес (автоматично създаване на обект и / или автоматично промяна на неговия статус)
 Module10000Name=Уебсайтове
-Module10000Desc=Create websites (public) with a WYSIWYG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
-Module20000Name=Управление на заявки за отпуск
-Module20000Desc=Дефиниране и проследяване на исканията за отпуск на служители
-Module39000Name=Продукти и партиди
-Module39000Desc=Партиди, серийни номера, управление на продуктите по време използвай/продай преди дата
+Module10000Desc=Създаване на уебсайтове (публични) с WYSIWYG редактор. Просто настройте вашия уеб сървър (Apache, Nginx, ...), за да посочите специалната директория на Dolibarr, за да бъдат онлайн в интернет с определеното за целта име на домейн.
+Module20000Name=Молби за отпуск
+Module20000Desc=Управление на молби за отпуск от служители
+Module39000Name=Продуктови партиди
+Module39000Desc=Управление на партиди, серийни номера, дати използвай преди / продавай до
 Module40000Name=Различни валути
-Module40000Desc=Използвайте алтернативни валути в цените и документите
+Module40000Desc=Използване на алтернативни валути в цени и документи
 Module50000Name=Paybox
-Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
-Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale module SimplePOS (simple POS).
-Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS).
+Module50000Desc=Предлага на клиентите PayBox страница за онлайн плащане (чрез кредитни / дебитни карти). Позволява на клиентите да извършват необходими плащания или плащания, свързани с определен Dolibarr обект (фактура, поръчка и т.н.)
+Module50100Name=ПОС SimplePOS
+Module50100Desc=Точка за продажба SimplePOS (опростен ПОС)
+Module50150Name=ПОС TakePOS
+Module50150Desc=Точка за продажба TakePOS (ПОС със сензорен екран)
 Module50200Name=Paypal
-Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50200Desc=Предлага на клиентите PayPal страница за онлайн плащане (чрез PayPal сметка или кредитни / дебитни карти). Позволява на клиентите да извършват необходими плащания или плащания, свързани с определен Dolibarr обект (фактура, поръчка и т.н.)
 Module50300Name=Stripe
-Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
-Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50300Desc=Предлага на клиентите Stripe страница за онлайн плащане (чрез кредитни / дебитни карти). Позволява на клиентите да извършват необходими плащания или плащания, свързани с определен Dolibarr обект (фактура, поръчка и т.н.)
+Module50400Name=Счетоводство (двойно записване)
+Module50400Desc=Управление на счетоводство (двойни вписвания, поддържат се общи и спомагателни счетоводни книги). Експортиране на счетоводната книга в други формати за счетоводен софтуер.
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module54000Desc=Директен печат (без отваряне на документи), чрез използване на Cups IPP интерфейс (Принтерът трябва да се вижда от сървъра, a CUPS трябва да бъде инсталиран на сървъра).
 Module55000Name=Poll, Survey or Vote
-Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module55000Desc=Създаване на онлайн анкети, проучвания или гласувания (като Doodle, Studs, RDVz и др.)
 Module59000Name=Полета
 Module59000Desc=Модул за управление на маржовете
 Module60000Name=Комисии
 Module60000Desc=Модул за управление на комисии
 Module62000Name=Условия на доставка
-Module62000Desc=Добавете функции за управление на Условия на доставка
+Module62000Desc=Добавяне на функции за управление на Инкотермс (условия на доставка)
 Module63000Name=Ресурси
-Module63000Desc=Управление на ресурси (принтери, коли, стаи, ...) за разпределяне по събития
+Module63000Desc=Управление на ресурси (принтери, коли, стаи, ...) с цел разпределяне по събития
 Permission11=Клиентите фактури
 Permission12=Създаване / промяна на фактури на клиентите
 Permission13=Unvalidate клиентите фактури
@@ -665,9 +668,9 @@ Permission32=Създаване / промяна на продукти
 Permission34=Изтриване на продукти
 Permission36=Преглед / управление на скрити продукти
 Permission38=Износ на продукти
-Permission41=Прочетете проекти и задачи (споделени проекти and проекти по който съм контакт). Може също да се отчита време, за мен или моите подчинени, по назначени задачи (Графика)
-Permission42=Създаване / променяне на проекти (споделени проекти и проекти, за които съм контакт). Също така може да създава задачи и да задава потребители на проекти и задачи
-Permission44=Изтриване на проекти (споделени проекти и проекти, по които съм контакт)
+Permission41=Преглед на проекти и задачи (споделени проекти и проекти, в които съм определен за контакт). Въвеждане на отделено време, за служителя или неговите подчинени, по възложени задачи (График)
+Permission42=Създаване / редактиране на проекти (споделени проекти и проекти, в които съм определен за контакт). Създаване на задачи и възлагане на проекти и задачи на потребители
+Permission44=Изтриване на проекти (споделени проекти и проекти, в които съм определен за контакт)
 Permission45=Експортиране на проекти
 Permission61=Прочети интервенции
 Permission62=Създаване / промяна на интервенции
@@ -700,23 +703,23 @@ Permission109=Изтриване sendings
 Permission111=Финансови сметки
 Permission112=Създаване / редакция / изтриване и сравни сделки
 Permission113=Setup financial accounts (create, manage categories)
-Permission114=Равнение на транзакции
+Permission114=Съгласуване на транзакции
 Permission115=Експортни сделки и извлеченията от сметките
 Permission116=Трансфери между сметки
-Permission117=Manage checks dispatching
+Permission117=Управление на изпратени чекове
 Permission121=Четене на трети лица, свързани с потребителя
 Permission122=Създаване / промяна контрагенти, свързани с потребителя
 Permission125=Изтриване на трети лица, свързани с потребителя
 Permission126=Контрагенти за износ
-Permission141=Прочетете всички проекти и  задачи (също лични проекти, за които не съм контакт)
-Permission142=Създаване/промяна всички проекти и задачи(също лични проекти, по които не съм контакт)
+Permission141=Преглед на всички проекти и задачи (включително частни проекти, в които служителя не е определен за контакт)
+Permission142=Създаване / редактиране на всички проекти и задачи (включително частни проекти, в които служителя не е определен за контакт)
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Прочети доставчици
 Permission147=Прочети статистиката
-Permission151=Прочетете нареждания за плащане с директен дебит
-Permission152=Създаване / промяна на нареждания за директен дебит
-Permission153=Изпрати / предай нареждания за плащане с директен дебит
-Permission154=Записване на Кредити / Отхвърляне нареждания за плащане с директен дебит
+Permission151=Преглед на платежни нареждания за директен дебит
+Permission152=Създаване / редактиране на платежни нареждания за директен дебит
+Permission153=Изпращане / предаване на платежни нареждания за директен дебит
+Permission154=Записване на кредити / отхвърляния на платежни нареждания за директен дебит
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -729,17 +732,17 @@ Permission173=Delete trips and expenses
 Permission174=Read all trips and expenses
 Permission178=Export trips and expenses
 Permission180=Прочети доставчици
-Permission181=Прочетете поръчките за покупка
-Permission182=Създаване / промяна на поръчки за покупка
-Permission183=Потвърдете поръчките за покупка
+Permission181=Преглед на поръчки за покупка
+Permission182=Създаване / редактиране на поръчки за покупка
+Permission183=Валидиране на поръчки за покупка
 Permission184=Одобряване на поръчки за покупка
-Permission185=Поръчайте или отменете поръчките за покупка
+Permission185=Потвърждаване или анулиране на поръчки за покупка
 Permission186=Получаване на поръчки за покупка
-Permission187=Затвори поръчка за покупка
-Permission188=Отменете поръчките за покупка
+Permission187=Затваряне на поръчки за покупка
+Permission188=Анулиране на поръчки за покупка
 Permission192=Създаване на линии
 Permission193=Отказ линии
-Permission194=Read the bandwidth lines
+Permission194=Преглед на линиите на честотната лента
 Permission202=Създаване на ADSL връзки
 Permission203=Поръчка връзки поръчки
 Permission204=Поръчка връзки
@@ -764,12 +767,12 @@ Permission244=Вижте съдържанието на скрити катего
 Permission251=Прочетете други потребители и групи
 PermissionAdvanced251=Прочетете други потребители
 Permission252=Разрешения на други потребители
-Permission253=Създаване / промяна на други потребители, групи и права
+Permission253=Създаване / редактиране на други потребители, групи и разрешения
 PermissionAdvanced253=Създаване / промяна на вътрешни / външни потребители и разрешения
 Permission254=Създаване / промяна на външни потребители
 Permission255=Промяна на други потребители парола
 Permission256=Изтрий или забраняване на други потребители
-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).
+Permission262=Разширяване на достъпа до всички контрагенти (не само контрагенти, за които този потребител е търговски представител).<br>Не е ефективно за външни потребители (винаги са ограничени до своите предложения, поръчки, фактури, договори и т.н.).<br>Не е ефективно за проекти (имат значение само разрешенията, видимостта и възложенията в проекта).
 Permission271=Прочети CA
 Permission272=Прочети фактури
 Permission273=Издаване на фактури
@@ -779,9 +782,9 @@ Permission283=Изтриване на контакти
 Permission286=Експортиране на контакти
 Permission291=Прочети тарифи
 Permission292=Задаване на разрешения за тарифите
-Permission293=Променете тарифите на клиента
-Permission300=Четене на баркодове
-Permission301=Създаване / променяне на баркодове
+Permission293=Промяна на тарифите на клиента
+Permission300=Преглед на баркодове
+Permission301=Създаване / редактиране на баркодове
 Permission302=Изтриване на баркодове
 Permission311=Прочети услуги
 Permission312=Assign service/subscription to contract
@@ -801,9 +804,9 @@ Permission401=Прочети отстъпки
 Permission402=Създаване / промяна на отстъпки
 Permission403=Проверка на отстъпки
 Permission404=Изтриване на отстъпки
-Permission511=Прочетете плащанията на заплати
-Permission512=Създаване / промяна на плащанията на заплати
-Permission514=Изтриване на плащанията за заплати
+Permission511=Преглед на плащания на заплати
+Permission512=Създаване / редактиране на плащания на заплати
+Permission514=Изтриване на плащания на заплати
 Permission517=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -835,32 +838,32 @@ Permission1102=Създаване / промяна на поръчките за
 Permission1104=Проверка на поръчките за доставка
 Permission1109=Изтриване на поръчките за доставка
 Permission1181=Прочети доставчици
-Permission1182=Прочетете поръчките за покупка
-Permission1183=Създаване / промяна на поръчки за покупка
-Permission1184=Потвърдете поръчките за покупка
+Permission1182=Преглед на поръчки за покупка
+Permission1183=Създаване / редактиране на поръчки за покупка
+Permission1184=Валидиране на поръчки за покупка
 Permission1185=Одобряване на поръчки за покупка
-Permission1186=Поръчайте поръчки за покупка
-Permission1187=Потвърдете получаването на поръчка за покупка
+Permission1186=Поръчка на поръчки за покупка
+Permission1187=Потвърждаване на получаването на поръчка за покупка
 Permission1188=Изтриване на поръчки за покупка
-Permission1190=Одобрете (второ одобрение) поръчки за покупка
+Permission1190=Одобряване (второ одобрение) на поръчки за покупка
 Permission1201=Резултат от износ
 Permission1202=Създаване / Промяна на износ
-Permission1231=Прочетете фактури на доставчици
-Permission1232=Създаване / промяна на фактури на доставчици
-Permission1233=Потвърдете фактурите на доставчика
-Permission1234=Изтриване на фактури на доставчика
-Permission1235=Изпращайте фактурите на доставчика по имейл
-Permission1236=Експортиране на фактури, атрибути и плащания на доставчика
+Permission1231=Преглед на фактури за доставка
+Permission1232=Създаване / редактиране на фактури за доставка
+Permission1233=Валидиране на фактури за доставка
+Permission1234=Изтриване на фактури за доставка
+Permission1235=Изпращане на фактури за доставка по имейл
+Permission1236=Експортиране на фактури за доставка, атрибути и плащания
 Permission1237=Експортиране на поръчки за покупка и техните подробности
 Permission1251=Пусни масов внос на външни данни в базата данни (данни товара)
 Permission1321=Износ на клиентите фактури, атрибути и плащания
-Permission1322=Отваряне на платена сметка
-Permission1421=Експорай поръчки за продажба и атрибути
-Permission20001=Прочетете заявките за отпуск (вашите отпуски и тези на вашите подчинени)
-Permission20002=Създаване / промяна вашите заявки за отпуск (вашите отпуски и тези на вашите подчинени)
+Permission1322=Повторно отваряне на платена фактура
+Permission1421=Експортиране на поръчки за продажба и атрибути
+Permission20001=Преглед на молби за отпуск (на служителя и неговите подчинени)
+Permission20002=Създаване / редактиране на молби за отпуск (на служителя и неговите подчинени)
 Permission20003=Delete leave requests
-Permission20004=Прочетете всички заявки за отсъствие (дори и на служители който не са ви подчинени)
-Permission20005=Създаване / промяна на заявки за отсъствие за всички (дори и на потребители, които не са подчинени)
+Permission20004=Преглед на всички молби за отпуск (дори на служители които не са подчинени на служителя)
+Permission20005=Създаване / редактиране на всички молби за отпуск (дори на служители, които не са подчинени на служителя)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -872,14 +875,14 @@ Permission2403=Изтрий действия (събития или задачи
 Permission2411=Прочетете действия (събития или задачи) на другите
 Permission2412=Създаване / промяна действия (събития или задачи) на другите
 Permission2413=Изтрий действия (събития или задачи) на другите
-Permission2414=Експортни действия / задачи на други
+Permission2414=Експортиране на действия / задачи на други лица
 Permission2501=/ Изтегляне документи
 Permission2502=Изтегляне на документи
 Permission2503=Изпращане или изтриване на документи
 Permission2515=Setup документи директории
 Permission2801=Използвайте FTP клиент в режим на четене (да преглеждате и сваляте само)
 Permission2802=Използвайте FTP клиент в режим на запис (изтриване или качване на файлове)
-Permission50101=Използвайте терминал за продажби
+Permission50101=Използване на точка на продажба
 Permission50201=Прочети сделки
 Permission50202=Сделки на внос
 Permission54001=Print
@@ -888,32 +891,32 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
-Permission63001=Прочетете ресурси
-Permission63002=Създаване / промяна на ресурси
+Permission63001=Преглед на ресурси
+Permission63002=Създаване / редактиране на ресурси
 Permission63003=Изтриване на ресурси
-Permission63004=Свързване на ресурси към събитията от дневния ред
-DictionaryCompanyType=Видове Контрагенти
-DictionaryCompanyJuridicalType=Легална форма на контрагентите
-DictionaryProspectLevel=Потенциален
-DictionaryCanton=Области / провинция
+Permission63004=Свързване на ресурси към събития от календара
+DictionaryCompanyType=Видове контрагенти
+DictionaryCompanyJuridicalType=Правна форма на контрагенти
+DictionaryProspectLevel=Потенциал за перспектива
+DictionaryCanton=Области / региони
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Звание или титла
-DictionaryActions=Видове събития от дневния ред
+DictionaryCivility=Обръщения
+DictionaryActions=Видове събития в календара
 DictionarySocialContributions=Видове социални или фискални данъци
 DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Размер на данъчните печати
+DictionaryRevenueStamp=Размер на данъчни печати (бандероли)
 DictionaryPaymentConditions=Условия за плащане
-DictionaryPaymentModes=Начин на плащане
-DictionaryTypeContact=Contact/Address types
-DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryPaymentModes=Методи за плащане
+DictionaryTypeContact=Видове контакти / адреси
+DictionaryTypeOfContainer=Уебсайт - Видове страници / контейнери
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Формати на карти
-DictionaryFees=Отчет за разходите - Видове отчети за разходите
+DictionaryFees=Разходен отчет - Видове разходни отчети
 DictionarySendingMethods=Shipping methods
-DictionaryStaff=Брой на служителите
+DictionaryStaff=Брой служители
 DictionaryAvailability=Delivery delay
 DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
@@ -923,45 +926,45 @@ DictionaryAccountancyJournal=Счетоводни дневници
 DictionaryEMailTemplates=Шаблони за имейли
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Измервателни единици
-DictionaryProspectStatus=Потенциален статус
+DictionaryProspectStatus=Статус на перспективи
 DictionaryHolidayTypes=Видове отпуск
-DictionaryOpportunityStatus=Lead status for project/lead
-DictionaryExpenseTaxCat=Отчет за разходите - Категории транспорт
-DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryOpportunityStatus=Статус на възможността за проект / възможност
+DictionaryExpenseTaxCat=Разходен отчет - Транспортни категории
+DictionaryExpenseTaxRange=Разходен отчет - Обхват на транспортни категории
 SetupSaved=Setup спаси
 SetupNotSaved=Настройката не е запазена
 BackToModuleList=Назад към списъка с модули
-BackToDictionaryList=Назад към списъка на речниците
-TypeOfRevenueStamp=Type of tax stamp
-VATManagement=Управление на данъка върху продажбите (ДДС)
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
-VATIsNotUsedDesc=По подразбиране предложеното ДДС е 0, което може да се използват за случаи като асоциации, физически лица или малки фирми.
-VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+BackToDictionaryList=Назад към списъка с речници
+TypeOfRevenueStamp=Вид на данъчния печат (бандерол)
+VATManagement=Управление на данък върху продажбите (ДДС)
+VATIsUsedDesc=По подразбиране при създаване на перспективи, фактури, поръчки и т.н. ставката на данък продажби следва активното стандартно правило: <br> Ако продавачът не е обект на данък върху продажбите, тогава данъкът върху продажбите остава 0. Край на правилото. <br> Ако (страната на продавача = страната на купувача), тогава данъкът върху продажбите по подразбиране се равнява на данък върху продажбите на продукта в страната на продавача. Край на правилото. <br> Ако продавачът и купувачът са в Европейската общност, а стоките са продукти зависими от транспорт (превоз, търговски флот, въздушен транспорт), то ДДС по подразбиране е 0. Това правило зависи от страната на продавача - моля консултирайте се с вашия счетоводител. ДДС трябва да бъде платен от купувача на митническата служба в тяхната страна, а не на продавача. Край на правилото. <br> Ако продавачът и купувачът са в Европейската общност, а купувачът не е дружество (с регистриран вътрешнообщностен номер по ДДС), то тогава ДДС се начислява по ставката на ДДС в страната на продавача. Край на правилото. <br> Ако продавачът и купувачът са в Европейската общност и купувачът е дружество (с регистриран вътрешнообщностен номер по ДДС), то тогава ДДС по подразбиране е 0. Край на правилото. <br> Във всеки друг случай предложената по подразбиране ставка на ДДС е 0. Край на правилото.
+VATIsNotUsedDesc=По подразбиране предложената ставка на ДДС е 0, което може да се използва за случаи като асоциации, физически лица или малки фирми.
+VATIsUsedExampleFR=Във Франция това означава дружества или организации, които имат реална фискална система (опростена реална или нормална реална). Система, в която е деклариран ДДС.
+VATIsNotUsedExampleFR=Във Франция това означава асоциации, които не декларират данък върху продажбите или компании, организации, или свободни професии, които са избрали фискалната система за микропредприятия (данък върху продажбите във франчайз) и са платили франчайз данък върху продажбите без декларация за данък върху продажбите. Този избор ще покаже информация за "Неприложим данък върху продажбите - art-293B от CGI" във фактурите.
 ##### Local Taxes #####
 LTRate=Курс
 LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Използвайте втори тип данък (различен от първия)
+LocalTax1IsUsedDesc=Използване на втори тип данък (различен от първия)
 LocalTax1IsNotUsedDesc=Да не се използва друг тип данък (различен от първия)
 LocalTax1Management=Second type of tax
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Използвайте трети тип данък (различен от първия)
+LocalTax2IsUsedDesc=Използване на трети тип данък (различен от първия)
 LocalTax2IsNotUsedDesc=Да не се използва друг тип данък (различен от първия)
 LocalTax2Management=Third type of tax
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=RE Управление
-LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
+LocalTax1IsUsedDescES=Ставката на RE по подразбиране при създаване на перспективи, фактури, поръчки и т.н. следва активното стандартно правило: <br>Ако купувачът не е подложен на RE, RE по подразбиране = 0. Край на правилото. <br>Ако купувачът е подложен на RE, тогава RE е по подразбиране. Край на правилото. <br>
 LocalTax1IsNotUsedDescES=По подразбиране предложения RE е 0. Край на правило.
 LocalTax1IsUsedExampleES=В Испания те са професионалисти, подлежащи на някои специфични части на испанската IAE.
 LocalTax1IsNotUsedExampleES=В Испания те са професионални и общества и при спазване на определени сектори на испанската IAE.
 LocalTax2ManagementES=IRPF Management
-LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2IsUsedDescES=Ставката на IRPF по подразбиране при създаване на перспективи, фактури, поръчки и т.н. следва активното стандартно правило: <br>Ако продавачът не е подложен на IRPF, то по подразбиране IRPF = 0. Край на правилото. <br>Ако продавачът е подложен на IRPF, тогава IRPF е по подразбиране. Край на правилото. <br>
 LocalTax2IsNotUsedDescES=По подразбиране предложения IRPF е 0. Край на правило.
 LocalTax2IsUsedExampleES=В Испания, на свободна практика и независими специалисти, които предоставят услуги и фирми, които са избрани на данъчната система от модули.
-LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
+LocalTax2IsNotUsedExampleES=В Испания те са предприятия, които не подлежат на данъчна система от модули.
 CalcLocaltax=Reports on local taxes
 CalcLocaltax1=Sales - Purchases
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
@@ -971,16 +974,16 @@ CalcLocaltax3=Sales
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Етикет на документи
-LabelOrTranslationKey=Етикет или преведен ключ
-ValueOfConstantKey=Value of constant
+LabelOrTranslationKey=Етикет или ключ за превод
+ValueOfConstantKey=Стойност на константа
 NbOfDays=Брой дни
 AtEndOfMonth=В края на месеца
-CurrentNext=Настоящ / Следваща
+CurrentNext=Текущ/Следващ
 Offset=Офсет
 AlwaysActive=Винаги активна
 Upgrade=Обновяване
 MenuUpgrade=Обновяване/Удължаване
-AddExtensionThemeModuleOrOther=Внедрете / инсталирате външно приложение / модул
+AddExtensionThemeModuleOrOther=Внедряване / инсталиране на външно приложение / модул
 WebServer=Уеб сървър
 DocumentRootServer=Главната директория на уеб сървъра
 DataRootServer=Файлове с данни
@@ -989,7 +992,6 @@ Port=Порт
 VirtualServerName=Име на виртуалния сървър
 OS=OS
 PhpWebLink=Web-Php връзка
-Browser=Browser
 Server=Сървър
 Database=База данни
 DatabaseServer=Хост базата данни
@@ -999,7 +1001,7 @@ DatabaseUser=Потребители на бази данни
 DatabasePassword=Database парола
 Tables=Маси
 TableName=Таблица име
-NbOfRecord=Брой на записите
+NbOfRecord=Брой записи
 Host=Сървър
 DriverType=Шофьор тип
 SummarySystem=Резюме на информационна система
@@ -1015,13 +1017,13 @@ DefaultMaxSizeShortList=Максимална дължина по подразб
 MessageOfDay=Послание на деня
 MessageLogin=Съобщение на страницата за вход
 LoginPage=Входна страница
-BackgroundImageLogin=Изображение на фона
+BackgroundImageLogin=Фоново изображение
 PermanentLeftSearchForm=Постоянна форма за търсене в лявото меню
 DefaultLanguage=Език по подразбиране
 EnableMultilangInterface=Активиране на многоезикова поддръжка
 EnableShowLogo=Показване на логото в лявото меню
-CompanyInfo=Компания / Организация
-CompanyIds=Фирма / Организация самоличност
+CompanyInfo=Фирма / Организация
+CompanyIds=Идентификационни данни на фирма / организация
 CompanyName=Име
 CompanyAddress=Адрес
 CompanyZip=П. код
@@ -1036,118 +1038,118 @@ OwnerOfBankAccount=Собственик на %s банкови сметки
 BankModuleNotActive=Банкови сметки модул не е активиран
 ShowBugTrackLink=Show link "<strong>%s</strong>"
 Alerts=Сигнали
-DelaysOfToleranceBeforeWarning=Забавяне преди показване на предупредителен сигнал за:
-DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Планирани събития (събития в дневния ред) незавършени
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Проектът не е затворен на време
-Delays_MAIN_DELAY_TASKS_TODO=Планирана задача (задачи на проекта) незавършена
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Поръчка не обработена
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Поръчка за покупка не обработена
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Предложението не е затворено
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Предложението не е фактурирано
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Услугата за активиране
-Delays_MAIN_DELAY_RUNNING_SERVICES=Изтеклата услуга
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Неплатена фактура на доставчик
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Неплатена фактура на клиент
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Предстоящо банково равнение
-Delays_MAIN_DELAY_MEMBERS=Забавете таксата за членство
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Проверете депозитите който не са готови
-Delays_MAIN_DELAY_EXPENSEREPORTS=Отчет за разходите за одобрение
-SetupDescription1=Преди да започнете да използвате Dolibarr трябва да се дефинират някои първоначални параметри и да се активират / конфигурират модулите.
-SetupDescription2=Следните два раздела са задължителни (първите два записи в менюто Настройка):
-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.
-SetupDescription5=Други записи в менюто за настройка управляват допълнителни параметри.
+DelaysOfToleranceBeforeWarning=Закъснение преди показване на предупредителен сигнал за:
+DelaysOfToleranceDesc=Задаване на закъснение, преди на екрана да се покаже иконата за предупреждение %s на закъснелия елемент.
+Delays_MAIN_DELAY_ACTIONS_TODO=Планирани събития (събития в календара), които не са завършени
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Проект, който не е затворен навреме
+Delays_MAIN_DELAY_TASKS_TODO=Планирана задача (задача от проект), която не е завършена
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Поръчка, която не е обработена
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Поръчка за покупка, която не е обработена
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Предложение, което не е затворено
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Предложение, което не е фактурирано
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Услуга, която не е активирана
+Delays_MAIN_DELAY_RUNNING_SERVICES=Услуга, която е изтекла
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Фактура за доставка, която не е платена
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Фактура за продажба, която не е платена
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Банкова транзакция, която не е съгласувана
+Delays_MAIN_DELAY_MEMBERS=Членска такса, която не е платена
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Чеков депозит, който не е извършен
+Delays_MAIN_DELAY_EXPENSEREPORTS=Разходен отчет, който не е одобрен
+SetupDescription1=Преди да започнете да използвате Dolibarr трябва да се дефинират някои първоначални параметри и да се активират / конфигурират някои модули.
+SetupDescription2=Следните две секции са задължителни (първите две подменюта в менюто Настройки):
+SetupDescription3=<a href="%s">%s ->%s</a> <br> Основни параметри, използвани за персонализиране на поведението по подразбиране на вашето приложение (например за функции, свързани със държавата).
+SetupDescription4=<a href="%s">%s ->%s</a> <br> Този софтуер е набор от много модули / приложения, всички повече или по-малко независими. Модулите, съответстващи на вашите нужди, трябва да бъдат активирани и конфигурирани. В менютата се добавят нови елементи / опции с активирането на модул.
+SetupDescription5=Менюто "Други настройки" управлява допълнителни параметри.
 LogEvents=Събития одит на сигурността
 Audit=Проверка
 InfoDolibarr=За Dolibarr
 InfoBrowser=За браузъра
-InfoOS=За операционната система
-InfoWebServer=За уеб сървър
+InfoOS=За ОС
+InfoWebServer=За уеб сървъра
 InfoDatabase=За базата данни
 InfoPHP=За PHP
-InfoPerf=За производителността 
+InfoPerf=За производителността
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=Списък на събитията Dolibarr сигурност
 SecurityEventsPurged=Събития по сигурността прочиства
-LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
-AreaForAdminOnly=Параметрите за настройка могат да се задават само от <b> Администратори </b>.
+LogEventDesc=Активиране на регистрирането за конкретни събития за сигурност. Администриране на записаните събития, чрез меню <b>%s - %s</b>. Внимание, тази функция може да генерира голямо количество данни в базата данни.
+AreaForAdminOnly=Параметрите за настройка могат да се задават само от <b>Администратори</b>.
 SystemInfoDesc=Информационна система Разни техническа информация можете да получите в режим само за четене и видими само за администратори.
-SystemAreaForAdminOnly=Тази област е достъпна само за администраторски потребители. Потребителските права на Dolibarr не могат да променят това ограничение.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Редактирайте данните на вашия счетоводител
-AccountantFileNumber=Номер на файла
-DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
-AvailableModules=Налични приложение / модули
+SystemAreaForAdminOnly=Тази секция е достъпна само за администратори. Потребителските права в Dolibarr не могат да променят това ограничение.
+CompanyFundationDesc=Редактирайте информацията за фирма / организация като кликнете върху бутона '%s' или '%s' в долната част на страницата.
+AccountantDesc=Редактирайте данните на вашия счетоводител / одитор
+AccountantFileNumber=Счетоводен код
+DisplayDesc=Тук могат да се променят параметрите, които влияят на външния вид и поведението на Dolibarr.
+AvailableModules=Налични приложения / модули
 ToActivateModule=За да активирате модули, отидете на настройка пространство (Начало-> Setup-> модули).
 SessionTimeOut=Време за сесията
-SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
+SessionExplanation=Това число гарантира, че сесията никога няма да изтече преди това закъснение, ако чистачът на сесии се извършва от вътрешен PHP чистач на сесии (и нищо друго). Вътрешният PHP чистач на сесии не гарантира, че сесията ще изтече след това закъснение. Тя ще изтече, след това закъснение и когато се задейства чистачът на сесии на всеки <b>%s / %s</b> идентифицирания в системата, но само по време на достъп от други сесии (ако стойността е 0, това означава, че почистването на сесията се извършва само от външен процес).<br>Забележка: на някои сървъри с външен механизъм за почистване на сесиите (cron под debian, ubuntu ...), сесиите могат да бъдат унищожени след период, определен от външна настройка, независимо от въведената тук стойност.
 TriggersAvailable=Налични тригери
-TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
+TriggersDesc=Тригерите са файлове, които ще променят поведението на Dolibarr след като бъдат копирани в директорията <b>htdocs/core/triggers</b>. Те реализират нови действия, активирани при събития в Dolibarr (създаване на нов контрагент, валидиране на фактура, ...).
 TriggerDisabledByName=Тригерите в този файл са изключени от <b>NORUN</b> наставка в името си.
 TriggerDisabledAsModuleDisabled=Тригерите в този файл са забранени като модул <b>%s</b> е забранено.
 TriggerAlwaysActive=Тригерите в този файл са винаги активни,, каквото са активирани модули Dolibarr.
 TriggerActiveAsModuleActive=Тригерите в този файл са активни, като модул <b>%s</b> е активирана.
-GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting. For a full list of the parameters available <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">see here</a>.
-MiscellaneousDesc=Всички останали параметри, свързани със сигурността, са дефинирани тук.
+GeneratedPasswordDesc=Изберете метода, който ще се използва за автоматично генерирани пароли.
+DictionaryDesc=Определете всички референтни данни. Може да добавите стойности по подразбиране.
+ConstDesc=Тази страница позволява да редактирате (презаписвате) параметри, които не са достъпни в други страници. Това са параметри предимно запазени за разработчици / разширено отстраняване на неизправности. За пълен списък на наличните параметри <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="Външен сайт - отваря се в нов прозорец" target="_blank">вижте тук</a>.
+MiscellaneousDesc=Тук са дефинирани всички параметри, свързани със сигурността.
 LimitsSetup=Граници / Прецизно настройване
-LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Макс. брой символи за единични цени
-MAIN_MAX_DECIMALS_TOT=Макс. брой символи за обща цена
-MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+LimitsDesc=Тук може да дефинирате ограничения използвани от Dolibarr за по-голяма прецизност и оптимизация
+MAIN_MAX_DECIMALS_UNIT=Максимален брой десетични знаци за единични цени
+MAIN_MAX_DECIMALS_TOT=Максимален брой десетични знаци за общи суми
+MAIN_MAX_DECIMALS_SHOWN=Максимален брой десетични знаци за цени, <b>показани на екрана</b>. Добавете многоточие <b>...</b> след този параметър (напр. 2...), ако искате да видите "<b>...</b>" суфикс след съкратената (закръглена) цена.
+MAIN_ROUNDING_RULE_TOT=Диапазон на закръгляване (за страни, в които закръгляването се извършва на нещо различно от стандартното 10. Например поставете 0.05, ако закръгляването се извършва с 0.05 стъпки)
 UnitPriceOfProduct=Нетен единичната цена на даден продукт
-TotalPriceAfterRounding=Обща цена (без ДДС / с ДДС) след закръгляването
+TotalPriceAfterRounding=Обща цена (без ДДС / ДДС / с ДДС) след закръгляване
 ParameterActiveForNextInputOnly=Параметър ефективно само за следващия вход
-NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
-NoEventFoundWithCriteria=Не е намерено събитие свързано със сигурността по тези параметри на търсене.
+NoEventOrNoAuditSetup=Не е регистрирано събитие свързано със сигурността. Това е нормално, ако проверката не е активирана в страницата "Настройки - Сигурност - Събития".
+NoEventFoundWithCriteria=Не е намерено събитие свързано със сигурността по тези параметри за търсене.
 SeeLocalSendMailSetup=Вижте настройка Sendmail
-BackupDesc=За <b> пълно </b> архивиране на инсталация на Dolibarr се изискват две стъпки.
-BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1.
-BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
-BackupDescX=Архивираната директория трябва да се съхранява на сигурно място.
+BackupDesc=<b>Пълното</b> архивиране на Dolibarr инсталация се извършва в две стъпки.
+BackupDesc2=Архивиране на съдържанието в директорията "documents" (<b>%s</b>), съдържаща всички ръчно добавени и генерирани файлове. Това също така ще включва всички архивирани файлове, генерирани в Стъпка 1.
+BackupDesc3=Архивиране на структурата и съдържанието на база данни (<b>%s</b>) в архивен файл. За тази цел може да използвате следния асистент.
+BackupDescX=Архивиращата директория трябва да се съхранява на сигурно място.
 BackupDescY=Генерирания дъмп файл трябва да се съхранява на сигурно място.
-BackupPHPWarning=Архивирането не може да бъде гарантирано с този метод. Препоръчва се предходния.
-RestoreDesc=За да възстановите архивното копие на Dolibarr, са необходими две стъпки.
-RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
-RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
+BackupPHPWarning=Архивирането не може да бъде гарантирано с този метод. Препоръчва се предходният.
+RestoreDesc=Възстановяването на Dolibarr от архивно копие се извършва в две стъпки.
+RestoreDesc2=Възстановете от архивният файл (например zip файл) директорията "documents" в нова Dolibarr инсталация или в "documents" директорията на текущата инсталация (<b>%s</b>).
+RestoreDesc3=Възстановете структурата на базата данни и данните от архивния файл в базата данни на новата Dolibarr инсталация или в базата данни (<b>%s</b>) на настоящата инсталация. Внимание, след като възстановяването приключи, трябва да използвате  потребителско име и парола, които са били налични по време на архивирането / инсталацията, за да се свържете отново.<br>За да възстановите архивирана база данни в тази текущата инсталация, може да използвате следния асистент.
 RestoreMySQL=MySQL внос
 ForcedToByAModule= Това правило е принуден да <b>%s</b> от активиран модул
 PreviousDumpFiles=Съществуващи архивни файлове
 WeekStartOnDay=Първи ден от седмицата
-RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+RunningUpdateProcessMayBeRequired=Актуализацията изглежда задължителна (версията на програмата %s се различава от версията на базата данни %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Трябва да изпълните тази команда от командния ред след влизане на черупката с потребителски <b>%s</b> или трябва да добавите опцията-W в края на командния ред, за да предоставят <b>%s</b> парола.
 YourPHPDoesNotHaveSSLSupport=SSL функции не са налични във вашата PHP
 DownloadMoreSkins=Изтегляне на повече теми
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
-ShowProfIdInAddress=Покажете професионален ИД с адреси
-ShowVATIntaInAddress=Скриване на вътрешнообщностния ДДС номер с адреси
+SimpleNumRefModelDesc=Връща референтен номер във формат %syymm-nnnn, където yy е година, mm е месец и nnnn е последователност от номера без връщане към нула
+ShowProfIdInAddress=Показване на идентификационни данни в полетата с адреси
+ShowVATIntaInAddress=Скриване на вътрешнообщностния номер по ДДС в полетата с адреси
 TranslationUncomplete=Частичен превод
 MAIN_DISABLE_METEO=Деактивиране на метеорологичния изглед
 MeteoStdMod=Стандартен режим
 MeteoStdModEnabled=Стандартният режим е активиран
 MeteoPercentageMod=Процентен режим
-MeteoPercentageModEnabled=Процентен режим активиран
+MeteoPercentageModEnabled=Процентният режим е активиран
 MeteoUseMod=Кликнете, за да използвате %s
 TestLoginToAPI=Тествайте влезете в API
-ProxyDesc=Някои функции на Dolibarr изискват достъп до интернет. Определете тук параметрите на интернет връзката като достъп чрез прокси сървър, ако е необходимо.
+ProxyDesc=Някои функции на Dolibarr изискват достъп до интернет. Определете тук параметрите на интернет връзката за достъп през прокси сървър, ако е необходимо.
 ExternalAccess=Външен / Интернет достъп
-MAIN_PROXY_USE=Използвайте прокси сървър (в противен случай достъпът е директно към интернет)
+MAIN_PROXY_USE=Използване на прокси сървър (в противен случай достъпът към интернет е директен)
 MAIN_PROXY_HOST=Прокси сървър: Име / Адрес
 MAIN_PROXY_PORT=Прокси сървър: Порт
-MAIN_PROXY_USER=Прокси сървър: Вписване/ Потребител
+MAIN_PROXY_USER=Прокси сървър: Потребител
 MAIN_PROXY_PASS=Прокси сървър: Парола
 DefineHereComplementaryAttributes=Определете тук всички допълнителни / персонализирани атрибути, които искате да бъдат включени за: %s
 ExtraFields=Допълнителни атрибути
 ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsLinesRec=Допълнителни атрибути (линии на шаблони на фактури)
+ExtraFieldsLinesRec=Допълнителни атрибути (шаблонни редове на фактури)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Допълнителни атрибути (контрагенти)
-ExtraFieldsContacts=Допълнителни атрибути (контакти / адрес)
+ExtraFieldsContacts=Допълнителни атрибути (контакти / адреси)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1161,113 +1163,111 @@ AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters
 SendmailOptionNotComplete=Внимание, на някои системи Linux, за да изпратите имейл от електронната си поща, Sendmail изпълнение настройка трябва conatins опция-ба (параметър mail.force_extra_parameters във вашия php.ini файл). Ако някои получатели никога не получават имейли, опитайте се да редактирате тази PHP параметър с mail.force_extra_parameters = ба).
 PathToDocuments=Път до документи
 PathDirectory=Директория
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
-TranslationSetup=Настройване на превода
-TranslationKeySearch=Търсете ключ за превод или стойност
-TranslationOverwriteKey=Презапишете стойността за превода
-TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
-TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
-TranslationString=Превод на стойността
-CurrentTranslationString=Настояща стойност на превода
-WarningAtLeastKeyOrTranslationRequired=Критерият за търсене е необходим най-малко за ключ или стойност на превода
-NewTranslationStringToShow=Нова преведена стойност, която да се показва
-OriginalValueWas=Оригиналния превод е презаписан. Първоначалната стойност е: <br> <br> %s
-TransKeyWithoutOriginalValue=Наложихте нов превод за ключа за превод „<strong> %s </strong>“, който не съществува в никакви езикови файлове
-TotalNumberOfActivatedModules=Активирани приложения / модули: <b> %s </b> / <b> %s </b>
+SendmailOptionMayHurtBuggedMTA=Функцията за изпращане на имейли, чрез метода "PHP mail direct" ще генерира имейл съобщение, което може да не бъде правилно анализирано от някои пощенски сървъри за входяща поща. Резултатът ще бъде, че някои писма няма да бъдат прочетени от хората, хоствани на тези подслушвани платформи. Такъв е случаят с някои интернет доставчици (напр. Orange във Франция). Това не е проблем с Dolibarr или PHP, а с пощенския сървър за входяща поща. Може обаче да добавите опция MAIN_FIX_FOR_BUGGED_MTA със стойност "1" в Настройки - Други настройки, за да промените и избегнете това в Dolibarr. Възможно е обаче да имате проблеми с други сървъри, които стриктно използват SMTP стандарта. Другото (препоръчително) решение е да се използва методът "SMTP socket library", който няма недостатъци.
+TranslationSetup=Настройка на превода
+TranslationKeySearch=Търсене на ключ за превод или низ
+TranslationOverwriteKey=Презаписване на преводен низ
+TranslationDesc=Как да настроите езика на дисплея: <br> * По подразбиране / За цялата система : меню <strong>Начало - Настройки - Екран</strong> <br> * За потребител: Кликнете върху потребителското име в горната част на екрана и променете езика в раздела <strong>Настройка на потребителския интерфейс</strong>.
+TranslationOverwriteDesc=Може също така да презапишете низовете, попълвайки следната таблица. Изберете вашият език от падащото меню "%s", въведете ключът за превод в "%s" и вашият нов превод в "%s".
+TranslationOverwriteDesc2=Може да използвате другия раздел, за да научите кой ключ за превод да използвате
+TranslationString=Преводен низ
+CurrentTranslationString=Текущ преводен низ
+WarningAtLeastKeyOrTranslationRequired=Изисква се критерий за търсене с ключ за превод или преводен низ
+NewTranslationStringToShow=Нов преводен низ, който да се покаже
+OriginalValueWas=Оригиналния превод е презаписан. Първоначалната стойност е:<br><br>%s
+TransKeyWithoutOriginalValue=Наложихте нов превод за ключа за превод "<strong>%s</strong>", който не съществува в нито един от езиковите файлове
+TotalNumberOfActivatedModules=Активирани приложения / модули: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Трябва да даде възможност на най-малко 1 модул
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+ClassNotFoundIntoPathWarning=Не е намерен клас %s в описания PHP път
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Бележка, само следните модули са достъпни за външни потребители (независимо от правата на такива потребители) и само ако са предоставени съответните права: <br>
+OnlyFollowingModulesAreOpenedToExternalUsers=Забележка: Само следните модули са достъпни за външни потребители (независимо от правата им), ако са им предоставени съответните права.<br>
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=Използвате драйвер %s, който е най-добрият драйвер в момента.
-YouDoNotUseBestDriver=Използвате шофьор %s, но се препоръчва шофьор %s.
-NbOfProductIsLowerThanNoPb=Вие имате само %s продукти/услуги в базата данни. Това не изисква особено оптимизиране.
+YouDoNotUseBestDriver=Използвате драйвер %s, но драйвер %s е препоръчителен.
+NbOfProductIsLowerThanNoPb=Вие имате само %s продукти / услуги в базата данни. Това не изисква специално оптимизиране.
 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.
-BrowserIsOK=Използвате уеб браузъра %s. Този браузър е добре за сигурност и производителност.
-BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
+YouHaveXProductUseSearchOptim=В базата данни имате %s продукти. Трябва да добавите константата PRODUCT_DONOTSEARCH_ANYWHERE със стойност "1" в страницата Начало - Настройки - Други настройки. Ограничете търсенето до началото на низове, което позволява базата данни да използва индекси, а вие да получите незабавен отговор.
+BrowserIsOK=Използвате уеб браузъра %s. Този браузър е добър от гледна точка на сигурност и производителност.
+BrowserIsKO=Използвате уеб браузъра %s. Известно е, че този браузър е лош избор от гледна точка на сигурност, производителност и надеждност. Препоръчително е да използвате Firefox, Chrome, Opera или Safari.
 XDebugInstalled=XDebug is loaded.
 XCacheInstalled=XCache is loaded.
-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=Попитайте за предпочитания начин на доставка за контрагентите
+AddRefInList=Показване на кода на клиента / доставчика в списъка (select list или combobox) и повечето от хипервръзките.<br>Контрагентите ще се появят с формат на името "CC12345 - SC45678 - Голяма фирма ЕООД", вместо "Голяма фирма ЕООД"
+AddAdressInList=Показване на списъка с информация за адреса на клиента / доставчика (изборен списък или комбиниран списък).<br>Контрагентите ще се появят с формат на името на "Голяма фирма ЕООД - ул. Първа № 2 П. код Град - България, вместо "Голяма фирма ЕООД"
+AskForPreferredShippingMethod=Запитване към контрагенти за предпочитан начин на доставка
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
 GetBarCode=Get barcode
 ##### Module password generation
 PasswordGenerationStandard=Върнете парола, генерирана в съответствие с вътрешен алгоритъм Dolibarr: 8 символа, съдържащи общи цифри и символи с малки.
-PasswordGenerationNone=Не предлагайте генерирана парола. Паролата трябва да бъде въведена ръчно.
+PasswordGenerationNone=Да не се предлага генерирана парола. Паролата трябва да бъде въведена ръчно.
 PasswordGenerationPerso=Връщане на парола съответно вашата лично определена конфигурация.
 SetupPerso=Съответно по вашата конфигурация
 PasswordPatternDesc=Описание на модел за парола
 ##### Users setup #####
-RuleForGeneratedPasswords=Правила за генериране и потвърждаване на пароли
-DisableForgetPasswordLinkOnLogonPage=Не показвайте връзката "Забравена парола" на страницата за вход
+RuleForGeneratedPasswords=Правила за генериране и валидиране на пароли
+DisableForgetPasswordLinkOnLogonPage=Да не се показва връзката "Забравена парола" на страницата за вход
 UsersSetup=Потребители модул за настройка
-UserMailRequired=Имейл, необходим за създаване на нов потребител
+UserMailRequired=Необходим е имейл при създаване на нов потребител
 ##### HRM setup #####
-HRMSetup=Настройка на модула за УЧР
+HRMSetup=Настройка на модула ЧР
 ##### Company setup #####
 CompanySetup=Фирми модул за настройка
-CompanyCodeChecker=Опции за автоматично генериране на кодове клиент / доставчик
+CompanyCodeChecker=Опции за автоматично генериране на кодове на клиент / доставчик
 AccountCodeManager=Опции за автоматично генериране на счетоводни кодове на клиент / доставчик
-NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
-NotificationsDescUser=* по потребител, един след друг
-NotificationsDescContact=* по контакти на контрагенти  (клиенти или доставчици), по един контакт.
-NotificationsDescGlobal=* or by setting global email addresses in this setup page.
+NotificationsDesc=Автоматично изпращане на имейл известия за някои събития в Dolibarr.<br>Получателите на известия могат да бъдат дефинирани:
+NotificationsDescUser=* за потребител, един по един
+NotificationsDescContact=* за контакти на контрагенти (клиенти или доставчици), един по един
+NotificationsDescGlobal=* или чрез задаване на глобални имейл адреси в тази страница за настройка.
 ModelModules=Шаблони за документи
-DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+DocumentModelOdt=Генериране на документи от шаблоните на OpenDocument (файлове .ODT / .ODS от LibreOffice, OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Воден знак върху проект на документ
 JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Правила за професионалните ИДта
+CompanyIdProfChecker=Правила за идентификационните данни (проф. IDs)
 MustBeUnique=Трябва да е уникално?
-MustBeMandatory=Задължително за създаване на контрагенти (ако ДДС номера или вида на фирмата са определени)?
-MustBeInvoiceMandatory=Задължително да валидирате фактурите?
-TechnicalServicesProvided=Технически услуги предоставени 
+MustBeMandatory=Задължително при създаване на контрагенти (ако ДДС номера или вида на фирмата са определени)?
+MustBeInvoiceMandatory=Задължително при валидиране на фактури?
+TechnicalServicesProvided=Предоставени технически услуги
 #####DAV #####
-WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
-WebDavServer=Root URL of %s server: %s
+WebDAVSetupDesc=Това е връзката за достъп до WebDAV директорията. Тя съдържа „публична“ директория, отворена за всеки потребител, който знае URL адреса (ако е разрешен достъпът до публичната директория) и „лична“ директория, която изисква съществуващо потребителско име и парола за достъп.
+WebDavServer=Основен URL адрес на %s сървъра: %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=За износ на линк към <b>%s</b> формат е на разположение на следния линк: %s
 ##### Invoices #####
 BillsSetup=Фактури модул за настройка
 BillsNumberingModule=Фактури и кредитни известия, номериране модул
 BillsPDFModules=Фактура модели документи
-BillsPDFModulesAccordindToInvoiceType=Модел на фактурата според вида фактура
+BillsPDFModulesAccordindToInvoiceType=Модели на фактури в зависимост от вида на фактурата
 PaymentsPDFModules=Модели на платежни документи
-CreditNote=Кредитно известие
-CreditNotes=Кредитни известия
 ForceInvoiceDate=Принудително датата на фактурата датата на валидиране
 SuggestedPaymentModesIfNotDefinedInInvoice=Предложени плащания режим на фактура по подразбиране, ако не са определени за фактура
-SuggestPaymentByRIBOnAccount=Предложете плащане чрез теглене от сметка
-SuggestPaymentByChequeToAddress=Предложете плащане с чек
+SuggestPaymentByRIBOnAccount=Да се предлага плащане по сметка
+SuggestPaymentByChequeToAddress=Да се предлага плащане с чек
 FreeLegalTextOnInvoices=Свободен текст на фактури
 WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
 PaymentsNumberingModule=Модел на номериране на плащания
-SuppliersPayment=Плащания на доставчици
-SupplierPaymentSetup=Настройка на плащанията на доставчика
+SuppliersPayment=Плащания към доставчици
+SupplierPaymentSetup=Настройка на плащания към доставчици
 ##### Proposals #####
 PropalSetup=Модул за настройка на търговски предложения
 ProposalsNumberingModules=Търговско предложение за номериране на модули
 ProposalsPDFModules=Търговски предложение документи модели
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Препоръчителен вид плащане по търговско предложение по подразбиране, ако не е определен
 FreeLegalTextOnProposal=Свободен текст на търговски предложения
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
+SupplierProposalSetup=Настройка на модул Запитвания към доставчици
+SupplierProposalNumberingModules=Модели за номериране на запитвания към доставчици
+SupplierProposalPDFModules=Модели за документи на запитвания към доставчици
+FreeLegalTextOnSupplierProposal=Свободен текст в запитвания към доставчици
+WatermarkOnDraftSupplierProposal=Воден знак върху черновите запитвания към доставчици (няма, ако празно)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Да се пита за детайли на банковата сметка в запитванията към доставчици
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Питане за Складов източник за поръчка
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Искайте банкова сметка за поръчки за покупка
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Да се пита за детайли на банковата сметка в поръчките за покупка
 ##### Orders #####
-OrdersSetup=Настройка и управление на поръчки за продажби
+OrdersSetup=Настройка на модул Поръчки за продажба
 OrdersNumberingModules=Поръчки номериране модули
 OrdersModelModule=Поръчка документи модели
 FreeLegalTextOnOrders=Свободен текст на поръчки
@@ -1290,10 +1290,10 @@ WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
 MembersSetup=Потребители модул за настройка
 MemberMainOptions=Основни параметри
 AdherentLoginRequired= Управление на Login за всеки член
-AdherentMailRequired=Имейл, необходим за създаване на нов член
+AdherentMailRequired=Необходим е имейл при създаване на нов член
 MemberSendInformationByMailByDefault=Checkbox да изпрати потвърждение поща на членовете (валидиране или нов абонамент) е включена по подразбиране
 VisitorCanChooseItsPaymentMode=Посетителят може да избира от наличните начини на плащане
-MEMBER_REMINDER_EMAIL=Активиране на автоматичното напомняне <b> по имейл </b> за изтекли абонаменти. Забележка: Модул <strong> %s </strong> трябва да е активиран and правилно настроен за изпращане на напомняния.
+MEMBER_REMINDER_EMAIL=Активиране на автоматично напомняне, <b>чрез имейл </b> за изтекли абонаменти. Забележка: Модул <strong>%s</strong> трябва да е активиран и правилно настроен за изпращане на напомняния.
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Глобални параметри
@@ -1301,7 +1301,7 @@ LDAPUsersSynchro=Потребители
 LDAPGroupsSynchro=Групи
 LDAPContactsSynchro=Контакти
 LDAPMembersSynchro=Потребители
-LDAPMembersTypesSynchro=Типове членове
+LDAPMembersTypesSynchro=Видове членове
 LDAPSynchronization=LDAP синхронизация
 LDAPFunctionsNotAvailableOnPHP=LDAP функции не са налични на вашия PHP
 LDAPToDolibarr=LDAP -> Dolibarr
@@ -1311,7 +1311,7 @@ LDAPSynchronizeUsers=Организацията на потребителите
 LDAPSynchronizeGroups=Организиране на групи в LDAP
 LDAPSynchronizeContacts=Организиране на контакти в LDAP
 LDAPSynchronizeMembers=Организация на членовете на организацията в LDAP
-LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPSynchronizeMembersTypes=Организация на видовете членове на фондацията в LDAP
 LDAPPrimaryServer=Основно сървъра
 LDAPSecondaryServer=Средно сървъра
 LDAPServerPort=Порта на сървъра
@@ -1321,7 +1321,7 @@ LDAPServerUseTLS=Използване на TLS
 LDAPServerUseTLSExample=LDAP сървъра използване TLS
 LDAPServerDn=Сървър DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPAdminDnExample=Пълна DN (напр. cn = admin, dc = example, dc = com или cn = Administrator, cn = Users, dc = example, dc = com за активна директория)
 LDAPPassword=Администраторската парола
 LDAPUserDn=Потребителя DN
 LDAPUserDnExample=Пълна DN (EX: OU = потребители, DC = общество, DC = COM)
@@ -1335,18 +1335,18 @@ LDAPDnContactActive=Контакти &quot;синхронизация
 LDAPDnContactActiveExample=Активира / Неактивирани синхронизация
 LDAPDnMemberActive=Членовете синхронизация
 LDAPDnMemberActiveExample=Активира / Неактивирани синхронизация
-LDAPDnMemberTypeActive=Members types' synchronization
-LDAPDnMemberTypeActiveExample=Активира / Неактивирани синхронизация
+LDAPDnMemberTypeActive=Синхронизиране на видове членове
+LDAPDnMemberTypeActiveExample=Активирана / Неактивирана синхронизация
 LDAPContactDn=Dolibarr контакти &quot;DN
 LDAPContactDnExample=Пълна DN (бивши: ОУ = контакти, DC = общество, DC = COM)
 LDAPMemberDn=Dolibarr членове DN
 LDAPMemberDnExample=Пълна DN (EX: OU = потребители, DC = общество, DC = COM)
 LDAPMemberObjectClassList=Списък на objectClass
 LDAPMemberObjectClassListExample=Списък на атрибути за определяне на objectClass рекордни (напр. върха, inetOrgPerson или отгоре, ръководство за активна директория)
-LDAPMemberTypeDn=Dolibarr members types DN
-LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeDn=Dolibarr видове членове DN
+LDAPMemberTypepDnExample=Пълна DN (напр. ou = memberstypes, dc = example, dc = com)
 LDAPMemberTypeObjectClassList=Списък на objectClass
-LDAPMemberTypeObjectClassListExample=Списък на атрибути за определяне на objectClass рекордни (: отгоре, groupOfUniqueNames)
+LDAPMemberTypeObjectClassListExample=Списък на objectClass определящи атрибути на запис (напр. top, groupOfUniqueNames)
 LDAPUserObjectClassList=Списък на objectClass
 LDAPUserObjectClassListExample=Списък на атрибути за определяне на objectClass рекордни (напр. върха, inetOrgPerson или отгоре, ръководство за активна директория)
 LDAPGroupObjectClassList=Списък на objectClass
@@ -1358,63 +1358,63 @@ LDAPTestSynchroContact=Тест за синхронизация на конта
 LDAPTestSynchroUser=Синхронизация тест на потребителя
 LDAPTestSynchroGroup=Синхронизация Test група
 LDAPTestSynchroMember=Член на синхронизация Test
-LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSynchroMemberType=Тест за синхронизиране на вид член
 LDAPTestSearch= Test a LDAP search
 LDAPSynchroOK=Синхронизация тест успешно
 LDAPSynchroKO=Неуспешно синхронизиране тест
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPSynchroKOMayBePermissions=Неуспешен тест за синхронизация. Проверете дали връзката към сървъра е правилно конфигурирана и позволява актуализации на LDAP
 LDAPTCPConnectOK=TCP свърже с LDAP сървъра успешни (сървър = %s, Порт = %s)
 LDAPTCPConnectKO=TCP се свърже с LDAP сървъра не успя (Server = %s, Port = %s)
-LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=Свързването / удостоверяване с LDAP сървъра е успешно (Сървър = %s, Порт = %s, Администратор = %s, Парола = %s)
+LDAPBindKO=Свързването / удостоверяването с LDAP сървъра е неуспешно (Сървър = %s, Порт = %s, Администратор = %s, Парола = %s)
 LDAPSetupForVersion3=LDAP сървър, конфигуриран за версия 3
 LDAPSetupForVersion2=LDAP сървър, конфигуриран за версия 2
 LDAPDolibarrMapping=Dolibarr Mapping
 LDAPLdapMapping=LDAP Mapping
 LDAPFieldLoginUnix=Вход (UNIX)
-LDAPFieldLoginExample=Example: uid
+LDAPFieldLoginExample=Пример: uid
 LDAPFilterConnection=Търсене филтър
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFilterConnectionExample=Пример: &(objectClass=inetOrgPerson)
 LDAPFieldLoginSamba=Вход (самба, activedirectory)
-LDAPFieldLoginSambaExample=Пример: samaccountname
+LDAPFieldLoginSambaExample=Пример: СамбаПотребителскоИме
 LDAPFieldFullname=Пълното име
 LDAPFieldFullnameExample=Пример: cn
-LDAPFieldPasswordNotCrypted=Паролата не е шифрована
-LDAPFieldPasswordCrypted=Паролата е шифрована
-LDAPFieldPasswordExample=Пример: userPassword
+LDAPFieldPasswordNotCrypted=Паролата не е криптирана
+LDAPFieldPasswordCrypted=Паролата е криптирана
+LDAPFieldPasswordExample=Пример: ПотребителскаПарола
 LDAPFieldCommonNameExample=Пример: cn
 LDAPFieldName=Име
 LDAPFieldNameExample=Пример: sn
 LDAPFieldFirstName=Собствено име
-LDAPFieldFirstNameExample=Пример: givenName
+LDAPFieldFirstNameExample=Пример: СобственоИме
 LDAPFieldMail=Имейл адрес
-LDAPFieldMailExample=Пример: mail
+LDAPFieldMailExample=Пример: ИмейлАдрес
 LDAPFieldPhone=Професионален телефонен номер
-LDAPFieldPhoneExample=Пример: telephonenumber
+LDAPFieldPhoneExample=Пример: ТелефоненНомер
 LDAPFieldHomePhone=Личен телефонен номер
-LDAPFieldHomePhoneExample=Пример: домашен телефон
+LDAPFieldHomePhoneExample=Пример: ДомашенНомер
 LDAPFieldMobile=Мобилен телефон
-LDAPFieldMobileExample=Пример: мобилен
+LDAPFieldMobileExample=Пример: МобиленНомер
 LDAPFieldFax=Номер на факс
-LDAPFieldFaxExample=Пример: номер на факс
+LDAPFieldFaxExample=Пример: ФаксНомер
 LDAPFieldAddress=Улица
-LDAPFieldAddressExample=Пример: улица
+LDAPFieldAddressExample=Пример: Улица
 LDAPFieldZip=Цип
-LDAPFieldZipExample=Пример: Пощенски код
+LDAPFieldZipExample=Пример: ПощенскиКод
 LDAPFieldTown=Град
-LDAPFieldTownExample=Example: l
+LDAPFieldTownExample=Пример: Град
 LDAPFieldCountry=Държава
 LDAPFieldDescription=Описание
-LDAPFieldDescriptionExample=Пример: описание
+LDAPFieldDescriptionExample=Пример: Описание
 LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Пример: публична бележка
+LDAPFieldNotePublicExample=Пример: ПубличнаБележка
 LDAPFieldGroupMembers= Членовете на групата
-LDAPFieldGroupMembersExample= Пример: уникален член
+LDAPFieldGroupMembersExample= Пример: УникаленЧлен
 LDAPFieldBirthdate=Рождена дата
 LDAPFieldCompany=Фирма
-LDAPFieldCompanyExample=Example: o
+LDAPFieldCompanyExample=Пример: Фирма
 LDAPFieldSid=SID
-LDAPFieldSidExample=Example: objectsid
+LDAPFieldSidExample=Пример: objectsid
 LDAPFieldEndLastSubscription=Дата на абонамент края
 LDAPFieldTitle=Длъжност
 LDAPFieldTitleExample=Example: title
@@ -1424,45 +1424,45 @@ LDAPDescContact=Тази страница ви позволява да дефи
 LDAPDescUsers=Тази страница ви позволява да дефинирате LDAP атрибути име в LDAP дърво за всеки намерени данни на потребителите Dolibarr.
 LDAPDescGroups=Тази страница ви позволява да дефинирате LDAP атрибути име в LDAP дърво за всеки данни, намиращи се на групи Dolibarr.
 LDAPDescMembers=Тази страница ви позволява да дефинирате LDAP атрибути име в LDAP дърво за всеки намерени данни на Dolibarr членове модул.
-LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescMembersTypes=Тази страница ви позволява да дефинирате името на LDAP атрибутите в LDAP дърво за всяка информация, намерена във видовете членове в Dolibarr.
 LDAPDescValues=Примерни стойности са предназначени за <b>OpenLDAP</b> със следните заредени схеми: <b>core.schema, cosine.schema, inetorgperson.schema).</b> Ако използвате thoose ценности и OpenLDAP, променете LDAP <b>slapd.conf</b> конфигурационен файл, за да има всички thoose схеми натоварени.
 ForANonAnonymousAccess=За заверено достъп (достъп за писане например)
 PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Не е инсталиран, така че вашият сървър не се забавя от това.
+YouMayFindPerfAdviceHere=Тази страница предоставя някои проверки или съвети, свързани с производителността.
+NotInstalled=Не е инсталирано, така че вашият сървър не се забавя от това.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
 MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
 OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+NoOPCodeCacheFound=Не е намерен OPCode кеш. Може би използвате OPCode кеш, различен от XCache или eAccelerator (добър) или може би нямате OPCode кеш (много лошо).
 HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
 FilesOfTypeCached=Files of type %s are cached by HTTP server
 FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
-CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByServerDesc=Например с помощта на Apache директивата "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
-CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+CompressionOfResourcesDesc=Например с помощта на Apache директивата "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
-DefaultCreateForm=Default values (to use on forms)
+DefaultValuesDesc=Тук може да дефинирате стойността по подразбиране, която искате да използвате, когато създавате нов запис заедно с филтрите по подразбиране или реда за сортиране на записите в списъка.
+DefaultCreateForm=Стойности по подразбиране (за използване в формуляри)
 DefaultSearchFilters=Филтри за търсене по подразбиране
-DefaultSortOrder=ред на подреждане по подразбиране
-DefaultFocus=Поле на фокус по подразбиране
-DefaultMandatory=Задължителни полета във формите по подразбиране
+DefaultSortOrder=Поръчки за сортиране по подразбиране
+DefaultFocus=Полета за фокусиране по подразбиране
+DefaultMandatory=Задължителни полета по подразбиране във формуляри
 ##### Products #####
 ProductSetup=Настройка на модул Продукти
 ServiceSetup=Услуги модул за настройка
 ProductServiceSetup=Продукти и услуги модули за настройка
-NumberOfProductShowInSelect=Максимален брой продукти за показване в комбинираното падащо меню за избор (0 = без ограничение)
-ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+NumberOfProductShowInSelect=Максимален брой продукти за показване в комбинирани списъци за избор (0 = без ограничение)
+ViewProductDescInFormAbility=Показване на описанията на продуктите във формуляри (в противен случай се показват в изскачащи подсказки)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Показване на описанията на продуктите на езика на контрагента
-UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+ViewProductDescInThirdpartyLanguageAbility=Показване на описанията на продуктите в езика на контрагента
+UseSearchToSelectProductTooltip=Също така, ако имате голям брой продукти (> 100 000) може да увеличите скоростта като зададете константата PRODUCT_DONOTSEARCH_ANYWHERE да бъде със стойност "1" в Настройки - Други настройки. След това търсенето ще бъде ограничено до началото на низ.
+UseSearchToSelectProduct=Изчакване, докато бъде натиснат клавиш преди да се зареди съдържанието на комбинирания списък с продукти (това може да увеличи производителността, ако имате голям брой продукти, но е по-малко удобно)
 SetDefaultBarcodeTypeProducts=Тип баркод по подразбиране за продукти
 SetDefaultBarcodeTypeThirdParties=Тип баркод по подразбиране за контрагенти
 UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
@@ -1478,9 +1478,9 @@ SyslogFilename=Име на файла и пътя
 YouCanUseDOL_DATA_ROOT=Можете да използвате DOL_DATA_ROOT / dolibarr.log за лог файл в Dolibarr директория &quot;документи&quot;. Можете да зададете различен път, за да се съхранява този файл.
 ErrorUnknownSyslogConstant=Постоянни %s не е известен Syslog постоянно
 OnlyWindowsLOG_USER=Windows поддържа само LOG_USER
-CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+CompressSyslogs=Компресиране и архивиране на журнали за грешки (генерирани от модула Журнали за отстраняване на грешки)
+SyslogFileNumberOfSaves=Архивирани журнали
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Конфигурирайте планираната задача за почистване, за да зададете честотата на архивиране на журнала
 ##### Donations #####
 DonationsSetup=Настройка на модул Дарение
 DonationsReceiptModel=Шаблон на получаване на дарение
@@ -1511,19 +1511,19 @@ RSSUrl=RSS URL
 RSSUrlExample=Интересна RSS емисия
 ##### Mailing #####
 MailingSetup=Настройка на модул Имейли
-MailingEMailFrom=Подател имейл (От) за имейли, изпратен от имейли модула
-MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingEMailFrom=Подател на имейли (From), изпратени от модула Електронна поща
+MailingEMailError=Обратен имейл адрес (Errors-to) за имейли с грешки
 MailingDelay=Seconds to wait after sending next message
 ##### Notification #####
-NotificationSetup=Настройка на модул за известия по имейл
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+NotificationSetup=Настройка на модул Имейл известяване
+NotificationEMailFrom=Подател на имейли (From), изпратени от модула за известяване
 FixedEmailTarget=Получател
 ##### Sendings #####
-SendingsSetup=Настройка на модула за доставка
+SendingsSetup=Настройка на модула Експедиция
 SendingsReceiptModel=Изпращане получаване модел
 SendingsNumberingModules=Sendings номериране модули
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=В повечето случаи експедиционните формуляри се използват както за формуляри за доставка на клиенти (списък на продуктите, които трябва да бъдат изпратени), така и за формуляри, които са получени и подписани от клиента. Следователно разписката за доставка на продукти е дублираща функция и рядко се активира.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Продукти доставки получаване номерацията модул
@@ -1535,18 +1535,18 @@ AdvancedEditor=Разширено редактор
 ActivateFCKeditor=Активирайте разширен редактор за:
 FCKeditorForCompany=WYSIWIG създаване / редактиране на елементи на описание и бележка (с изключение на продукти / услуги)
 FCKeditorForProduct=WYSIWIG създаване / редактиране на продукти / услуги описание и бележка
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG създаване / редактиране на продуктови редове за всички обекти (предложения, поръчки, фактури и др.). <font class="warning">Внимание: Използването на тази опция не се препоръчва, тъй като може да създаде проблеми с някои специални символи и при форматиране на страниците, по време на генериране на PDF файловете.</font>
 FCKeditorForMailing= WYSIWIG създаване / редактиране на писма
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForMail=WYSIWIG създаване / редактиране на цялата поща (с изключение на Настройки - Електронна поща)
 ##### Stock #####
-StockSetup=Настройка на модул за наличност
-IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+StockSetup=Настройка на модул Наличности
+IfYouUsePointOfSaleCheckModule=Ако използвате модула Точка за продажби (POS), предоставен по подразбиране или чрез външен модул, тази настройка може да бъде игнорирана от вашия POS модул. Повечето POS модули по подразбиране са разработени да създават веднага фактура, след което да намаляват наличностите, независимо от опциите тук. В случай, че имате нужда или не от автоматично намаляване на наличностите при регистриране на продажба от POS проверете и настройката на вашия POS модул.
 ##### Menu #####
 MenuDeleted=Меню заличават
 Menus=Менюта
 TreeMenuPersonalized=Персонализирани менюта
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NotTopTreeMenuPersonalized=Персонализирани менюта, които не са свързани с главното меню
 NewMenu=Ново меню
 Menu=Избор на меню
 MenuHandler=Меню манипулатор
@@ -1563,7 +1563,7 @@ DetailRight=Условие, за да се покаже неразрешени 
 DetailLangs=Lang името на файла за превод на етикета код
 DetailUser=Intern / EXTERN /
 Target=Цел
-DetailTarget=Target for links (_blank top opens a new window)
+DetailTarget=Насочване за връзки (_blank top отваря нов прозорец)
 DetailLevel=Level (-1: горното меню, 0: хедър, меню&gt; 0 меню и подменю)
 ModifMenu=Меню промяна
 DeleteMenu=Изтриване на елемент от менюто
@@ -1572,13 +1572,13 @@ FailedToInitializeMenu=Неуспешно инициализиране на ме
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Дължимия ДДС
-OptionVATDefault=Standard basis
+OptionVATDefault=Стандартна основа
 OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
-OptionPaymentForProductAndServices=Cash basis for products and services
-OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+OptionVatDefaultDesc=ДДС се дължи: <br> - при доставка на стоки (въз основа на датата на фактурата) <br> - при плащания на услуги
+OptionVatDebitOptionDesc=ДДС се дължи: <br> - при доставка на стоки (въз основа на датата на фактурата) <br> - по фактура (дебит) за услуги
+OptionPaymentForProductAndServices=Парична база за продукти и услуги
+OptionPaymentForProductAndServicesDesc=ДДС се дължи: <br> - при плащане на стоки <br> - при плащания за услуги
+SummaryOfVatExigibilityUsedByDefault=ДДС се изисква по подразбиране според избраната опция:
 OnDelivery=При доставка
 OnPayment=На плащане
 OnInvoice=На фактура
@@ -1587,7 +1587,7 @@ SupposedToBeInvoiceDate=Дата на фактура използва
 Buy=Купувам
 Sell=Продажба
 InvoiceDateUsed=Дата на фактура използва
-YourCompanyDoesNotUseVAT=Вашата фирма определила да не използва  ДДС (Начало - Настройка - Фирма / Организация), така че няма опции за ДДС настройка.
+YourCompanyDoesNotUseVAT=Вашата фирма не е определила да използва ДДС (Начало - Настройки - Фирма / Организация), така че няма опции за настройка на ДДС.
 AccountancyCode=Счетоводен код
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1595,66 +1595,66 @@ AccountancyCodeBuy=Purchase account. code
 AgendaSetup=Събития и натъкмяване на дневен ред модул
 PasswordTogetVCalExport=, За да разреши износ връзка
 PastDelayVCalExport=Не изнася случай по-стари от
-AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
-AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
+AGENDA_USE_EVENT_TYPE=Използване на видове събития (управлявани в меню Настройка - Речници - Видове събития в календара)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Автоматично задаване на стойност по подразбиране за вид събитие във формуляра при създаване на събитие
+AGENDA_DEFAULT_FILTER_TYPE=Автоматично задаване на стойност по подразбиране за вид събитие във филтъра за търсене на календара
+AGENDA_DEFAULT_FILTER_STATUS=Автоматично задаване на стойност по подразбиране за статус на събитие във филтъра за търсене на календара
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_EMAIL=Активиране на напомняне за събития, <b>чрез имейли</b> (опцията за напомняне / закъснение може да бъде определена за всяко събитие). Забележка: Модулът <strong>%s</strong> трябва да бъде активиран и правилно настроен, за да се изпращат напомняния в определеното време.
+AGENDA_REMINDER_BROWSER=Активиране на напомняне за събития <b>в браузъра на потребителя</b> (когато бъде достигната датата на събитието, всеки потребител може да отхвърли известието от браузъра)
 AGENDA_REMINDER_BROWSER_SOUND=Активиране на звуково известяване
-AGENDA_SHOW_LINKED_OBJECT=Показване на свързания обект в изгледа на дневния ред
+AGENDA_SHOW_LINKED_OBJECT=Показване на свързания обект в календара
 ##### Clicktodial #####
 ClickToDialSetup=Кликнете, за да наберете настройка модул
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
-ClickToDialUseTelLink=Използвайте само връзка"тел:" на телефоните номера
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUrlDesc=URL, който се извиква при кликване върху телефонен номер. В URL адреса може да използвате маркери <br> <b>__PHONETO__</b>, който ще бъде заменен с телефонния номер на лицето, на което ще се обаждате <br> <b>__PHONEFROM__</b>, който ще бъде заменен с телефонния номер на обаждащия се (вашият) <br> <b>__LOGIN__</b>, който ще бъде заменен с clicktodial потребителско име (дефиниран в картата на потребителя) <br> <b>__PASS__</b>, който ще бъде заменен с clicktodial парола (дефинирана в картата на потребителя).
+ClickToDialDesc=Този модул прави възможно кликването върху телефонни номера. С едно щракване върху иконата ще наберете телефонният номер. Това може да се използва за извикване на Call-Center система от Dolibarr, която може да избере например телефонен номер в SIP система.
+ClickToDialUseTelLink=Просто използвайте връзката "tel:" за телефонни номера
+ClickToDialUseTelLinkDesc=Използвайте този метод, ако вашите потребители имат softphone или софтуерен интерфейс, инсталиран на същия компютър заедно с браузъра и се обаждат, когато кликнете върху връзка във вашия браузър, която започва "tel:". Ако имате нужда от пълно сървърно решение (няма нужда от локална софтуерна инсталация), трябва да изберете стойност "Не" и да попълните следващото поле.
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Терминал за продажби
-CashDeskSetup=Настройка на модула Терминал за продажби
-CashDeskThirdPartyForSell=Общ по-подразбиране контрагент, която да използва за продажби
+CashDesk=Точка за продажба
+CashDeskSetup=Настройка на модул Точка за продажби
+CashDeskThirdPartyForSell=Стандартен контрагент по подразбиране, който да се използва за продажби
 CashDeskBankAccountForSell=Акаунт по подразбиране да се използва за получаване на парични плащания
-CashDeskBankAccountForCheque= Профил по подразбиране да се използва за получаване на плащания с чек
+CashDeskBankAccountForCheque= Банкова сметка по подразбиране, която да се използва за получаване на плащания с чек
 CashDeskBankAccountForCB= Акаунт по подразбиране да се използва за получаване на парични плащания с кредитни карти
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskDoNotDecreaseStock=Изключване на намаляването на наличности, когато продажбата се извършва от точка за продажби (ако стойността е "НЕ", намаляването на  наличности се прави за всяка продажба, извършена от POS, независимо от опцията, определена в модула Наличности).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
+StockDecreaseForPointOfSaleDisabled=Намаляването на наличности от точка за продажби е деактивирано
+StockDecreaseForPointOfSaleDisabledbyBatch=Намаляването на наличности в POS не е съвместимо с модула Продуктови партиди (активен в момента), така че намаляването на наличности е деактивирано.
+CashDeskYouDidNotDisableStockDecease=Не сте деактивирали намаляването на запасите при продажбата от точка за продажби, поради тази причина се изисква наличие на склад.
 ##### Bookmark #####
 BookmarkSetup=Bookmark настройка модул
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
+BookmarkDesc=Този модул позволява да се управляват отметки. Може също да добавяте преки пътища към всички страници на Dolibarr или външни уеб сайтове в лявото меню.
 NbOfBoomarkToShow=Максимален брой отметки, които да се показват в лявото меню
 ##### WebServices #####
 WebServicesSetup=WebServices модул за настройка
 WebServicesDesc=С активирането на този модул, Dolibarr се превърне в уеб сървъра на услугата за предоставяне на различни уеб услуги.
 WSDLCanBeDownloadedHere=WSDL ЕВРОВОК файлове на предоставяните услуги може да изтеглите от тук
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+EndPointIs=SOAP клиентите трябва да изпращат заявките си до крайна точка на Dolibarr, достъпна чрез URL
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Активиране на режима на производство (това ще активира използването на кеш за управление на услуги)
-ApiExporerIs=You can explore and test the APIs at URL
+ApiProductionMode=Активиране на производствен режим (това ще активира използването на кеш при управление на услуги)
+ApiExporerIs=Можете да изследвате и тествате API на URL адрес
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+WarningAPIExplorerDisabled=API Explorer е деактивиран. API Explorer не се изисква да предоставя API услуги. Той е инструмент за разработчици за намиране / тестване на REST API. Ако имате нужда от този инструмент, влезте в настройките на модула API REST, за да го активирате.
 ##### Bank #####
 BankSetupModule=Модул за настройка на банката
-FreeLegalTextOnChequeReceipts=Свободен текст на касовите бележки
+FreeLegalTextOnChequeReceipts=Свободен текст в чековите разписки
 BankOrderShow=Показване ред на банкови сметки за страни, които използват &quot;подробен номер на банкова
 BankOrderGlobal=Общ
 BankOrderGlobalDesc=Обща дисплей за
 BankOrderES=Испански
 BankOrderESDesc=Испански дисплей за
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+ChequeReceiptsNumberingModule=Модел за номериране на чекови разписки
 ##### Multicompany #####
 MultiCompanySetup=Multi-модул за настройка компания
 ##### Suppliers #####
-SuppliersSetup=Настройка на модула на доставчици
-SuppliersCommandModel=Пълният шаблон на поръчка за доставка (лого ...)
-SuppliersInvoiceModel=Пълният шаблон на фактурата на доставчика (лого ...)
-SuppliersInvoiceNumberingModel=Модели за номериране на фактури на доставчика
+SuppliersSetup=Настройка на модул Доставчици
+SuppliersCommandModel=Пълен шаблон на поръчка за покупка (лого ...)
+SuppliersInvoiceModel=Пълен шаблон на фактура за доставка (лого ...)
+SuppliersInvoiceNumberingModel=Модели за номериране на фактури за доставка
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind модул за настройка
@@ -1669,17 +1669,17 @@ ProjectsSetup=Инсталационния проект модул
 ProjectsModelModule=Проект доклади документ модел
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+UseSearchToSelectProject=Изчакване, докато се натисне клавиш, преди да се зареди съдържанието на комбинирания списък с проекти. <br> Това може да подобри производителността при по-голям брой проекти, но е по-малко удобно.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
 AccountingPeriods=Счетоводни периоди
-AccountingPeriodCard=Accounting period
+AccountingPeriodCard=Счетоводен период
 NewFiscalYear=Нов счетоводен период
-OpenFiscalYear=Отворен счетоводен период
-CloseFiscalYear=Затворен счетоводен период
-DeleteFiscalYear=Изтри счетоводен период
-ConfirmDeleteFiscalYear=Сигурни ли сте че искате да изтриете този счетоводен период?
-ShowFiscalYear=Покажи счетоводен период
+OpenFiscalYear=Отваряне на счетоводен период
+CloseFiscalYear=Затваряне на счетоводен период
+DeleteFiscalYear=Изтриване на счетоводен период
+ConfirmDeleteFiscalYear=Сигурни ли сте, че искате да изтриете този счетоводен период?
+ShowFiscalYear=Преглед на счетоводен период
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1690,195 +1690,204 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0: Вид на плащане за клиент, 1: Вид плащане за доставчик, 2: Вид на плащане за клиенти и доставчици
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Настройка на модул Отчети за разходите - индекс хиляди
-ExpenseReportsRulesSetup=Настройка на модул Отчети за разходите - Правила
-ExpenseReportNumberingModules=Настройка на модул Отчети за разходите - Номерация
+ExpenseReportsIkSetup=Настройка на модул Разходни отчети - Показания на километража
+ExpenseReportsRulesSetup=Настройка на модул Разходни отчети - Правила
+ExpenseReportNumberingModules=Модул за номериране на разходни отчети
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=Можете да намерите опции за известия по имейл, като активирате и конфигурирате модула "Известие".
-ListOfNotificationsPerUser=Списък на известията за потребител *
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=Списък на фиксираните известия
-GoOntoUserCardToAddMore=Отворете раздела „Известия“ на потребител, за да добавите или премахнете известия за потребители
-GoOntoContactCardToAddMore=Отидете в раздела „Известия“ на контрагента, за да добавите или премахнете известия за контакти / адреси
+YouMayFindNotificationsFeaturesIntoModuleNotification=Може да откриете опции за известия по имейл като активирате и конфигурирате модула "Известия".
+ListOfNotificationsPerUser=Списък с известия за потребител*
+ListOfNotificationsPerUserOrContact=Списък с известия (събития), налични за потребител* или за контакт**
+ListOfFixedNotifications=Списък с фиксирани известия
+GoOntoUserCardToAddMore=Отидете в раздела „Известия“ на съответния потребител, за да добавите или премахнете известия за този потребител
+GoOntoContactCardToAddMore=Отидете в раздела „Известия“ на съответния контрагент, за да добавите или премахнете известия за съответните контакти / адреси
 Threshold=Threshold
-BackupDumpWizard=Съветник за създаване на архивния файл
+BackupDumpWizard=Асистент за създаване на архивния файл
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+SomethingMakeInstallFromWebNotPossible2=Поради тази причина описаният тук процес за актуализация е ръчен процес, който може да се изпълнява само от потребител със съответните права.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMustContainCustom=Инсталирането или създаването на външен модул в приложението е необходимо да съхрани файловете на модула в директорията <strong>%s</strong>. За да се обработва тази директория от Dolibarr, трябва да настроите вашият <strong>conf/conf.php</strong> файл да съдържа двете директивни линии: <br> <strong>$dolibarr_main_url_root_alt = '/custom';</strong> <br> <strong>$dolibarr_main_document_root_alt = '%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
-TextTitleColor=Text color of Page title
+HighlightLinesColor=Цвят на подчертания ред при преминаване на мишката отгоре (използвайте 'ffffff', ако не искате да се подчертава)
+HighlightLinesChecked=Цвят на подчертания ред, когато е маркиран (използвайте 'ffffff',ако не искате да се подчертава)
+TextTitleColor=Цвят на текста в заглавието на страницата
 LinkColor=Цвят на връзките
-PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
+PressF5AfterChangingThis=Натиснете CTRL + F5 на клавиатурата или изчистете кеша на браузъра си след като промените тази стойност, за да стане ефективна.
+NotSupportedByAllThemes=Ще работи с основните теми, но може да не се поддържат външни теми.
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Скриване на изображения в горното меню
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextColor=Цвят на текста в заглавието на таблиците
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-ColorFormat=The RGB color is in HEX format, eg: FF0000
+UnicodeCurrency=Въведете тук между скобите, десетичен код, който представлява символа на валутата. Например: за $, въведете [36] - за Бразилски Реал R$ [82,36] - за €, въведете [8364]
+ColorFormat=RGB цвета е в HEX формат, например: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
-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).
+RecuperableOnly=Да за ДДС "Не възприеман, но възстановим", предназначен за някои области във Франция. Запазете стойността "Не" във всички останали случаи.
+UrlTrackingDesc=Ако доставчикът или транспортната услуга предлага страница или уеб сайт за проверка на статуса на вашите пратки, то може да ги въведете тук. Може да използвате ключа {TRACKID} в URL параметрите, така че системата да го замени с проследяващия номер, който потребителят е въвел в картата на пратката.
+OpportunityPercent=Когато създавате нова възможност определяте приблизително очакваната сума от проекта / възможността. Според статуса на възможността тази сума ще бъде умножена по определения му процент, за да се оцени общата сума, която всичките ви възможности могат да генерират. Стойността е в проценти (между 0 и 100).
 TemplateForElement=This template record is dedicated to which element
 TypeOfTemplate=Type of template
-TemplateIsVisibleByOwnerOnly=Шаблонът се вижда само от собственика
-VisibleEverywhere=Вижда се навсякъде
-VisibleNowhere=Вижда се никъде
+TemplateIsVisibleByOwnerOnly=Шаблонът е видим само за собственика му
+VisibleEverywhere=Видим навсякъде
+VisibleNowhere=Не се вижда никъде
 FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
-ForcedConstants=Изисква постоянни стойности
+ForcedConstants=Необходими постоянни стойности
 MailToSendProposal=Клиентски предложения
 MailToSendOrder=Поръчки за продажба
-MailToSendInvoice=Клиентски фактури
-MailToSendShipment=Превозите
-MailToSendIntervention=Намеси
+MailToSendInvoice=Фактури за продажба
+MailToSendShipment=Пратки
+MailToSendIntervention=Интервенции
 MailToSendSupplierRequestForQuotation=Запитване за оферта
-MailToSendSupplierOrder=Поръчка
-MailToSendSupplierInvoice=Фактури на доставчик
+MailToSendSupplierOrder=Поръчки за покупка
+MailToSendSupplierInvoice=Фактури за доставка
 MailToSendContract=Договори
 MailToThirdparty=Контрагенти
 MailToMember=Членове
 MailToUser=Потребители
-MailToProject=Страници на проектите
+MailToProject=Страница "Проекти"
 ByDefaultInList=Показване по подразбиране при показа на списък
 YouUseLastStableVersion=Използвате последната стабилна версия
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Пример за съобщение, което можете да използвате, за да обявите това съобщение за поддръжка (не се колебайте да го използвате на уебсайтовете си)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Наличен е Dolibarr ERP & CRM %s. Версия %s е поддържана версия, така че съдържа само корекции на грешки. Препоръчваме на всички потребители да надстроят до тази версия. Изданието за поддръжка не въвежда нови функции или промени в базата данни. Можете да го изтеглите от зоната за изтегляне на портала https://www.dolibarr.org (поддиректория Стабилни версии). Можете да прочетете <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> за пълен списък с промени.
-MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
-ModelModulesProduct=Шаблони на документите за продуктите
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-SeeChangeLog=See ChangeLog file (english only)
+TitleExampleForMajorRelease=Пример за съобщение, което може да използвате, за да обявите това главно издание (не се колебайте да го използвате на уебсайтовете си)
+TitleExampleForMaintenanceRelease=Пример за съобщение, което може да използвате, за да обявите това издание за поддръжка (не се колебайте да го използвате на уебсайтовете си)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s е наличен. Версия %s е главна версия с много нови функции както за потребители, така и за разработчици. Може да го изтеглите от раздела за изтегляне на портала https://www.dolibarr.org (поддиректория Стабилни версии). Може да прочетете <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> за пълен списък с промените.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s е наличен. Версията %s е поддържаща версия, така че съдържа само корекции на грешки. Препоръчваме на всички потребители да актуализират до тази версия. Изданието за поддръжка не въвежда нови функции или промени в базата данни. Може да го изтеглите от раздела за изтегляне на портала https://www.dolibarr.org (поддиректория Стабилни версии). Може да прочетете <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> за пълен списък с промените.
+MultiPriceRuleDesc=Когато опцията "Няколко нива на цени за продукт / услуга" е активирана може да определите различни цени (по едно за ниво цена) за всеки продукт. За да спестите време тук може да въведете правило за автоматично изчисляване на цена за всяко ниво на базата на цената от първото ниво, така че ще трябва да въведете само цена за първото ниво за всеки продукт. Тази страница е предназначена да ви спести време, но е полезна само ако цените за всяко ниво са относителни към първо ниво. В повечето случаи може да игнорирате тази страница.
+ModelModulesProduct=Шаблони за продуктови документи
+ToGenerateCodeDefineAutomaticRuleFirst=За да можете автоматично да генерирате кодове, първо трябва да определите мениджър, за да дефинирате автоматично номера на баркода.
+SeeSubstitutionVars=Вижте * Забележка за списък на възможните заместващи променливи
+SeeChangeLog=Вижте файла ChangeLog (само на английски)
 AllPublishers=Всички издатели
 UnknownPublishers=Неизвестни издатели
 AddRemoveTabs=Добавяне или премахване на раздели
-AddDataTables=Добавяне на таблици на обекти
-AddDictionaries=Добавете таблици с речници
-AddData=Добавете данни за обекти или речници
-AddBoxes=Добавете джаджи
-AddSheduledJobs=Добавете насрочени работи
-AddHooks=Добавете куки
-AddTriggers=Добавете тригери
-AddMenus=Добавете менюта
-AddPermissions=Добавете права
-AddExportProfiles=Добавете профили за експортиране
-AddImportProfiles=Добавете профили за импортиране
-AddOtherPagesOrServices=Добавете други страници или услуги
-AddModels=Add document or numbering templates
-AddSubstitutions=Добавете замествания на клавиши
+AddDataTables=Добавяне на таблици с обекти
+AddDictionaries=Добавяне на таблици с речници
+AddData=Добавяне на данни за обекти или речници
+AddBoxes=Добавяне на джаджи
+AddSheduledJobs=Добавяне на планирани задачи
+AddHooks=Добавяне на куки
+AddTriggers=Добавяне на тригери
+AddMenus=Добавяне на менюта
+AddPermissions=Добавяне на права
+AddExportProfiles=Добавяне на профили за експортиране
+AddImportProfiles=Добавяне на профили за импортиране
+AddOtherPagesOrServices=Добавяне на други страници или услуги
+AddModels=Добавяне на шаблон за документ или за номериране
+AddSubstitutions=Добавяне на заместващи ключове
 DetectionNotPossible=Откриването не е възможно
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
-ListOfAvailableAPIs=List of available APIs
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
-LandingPage=Landing page
-SamePriceAlsoForSharedCompanies=Ако използвате много-фирмен модул, с избора "Една цена", цената също ще бъде еднаква за всички фирми, ако продуктите се споделени между тях.
-ModuleEnabledAdminMustCheckRights=Модулът е активиран. Правата за активиран модул(и) бяха дадени само на администраторски потребители. Може да се наложи ръчно да предоставите права на други потребители или групи, ако е необходимо.
-UserHasNoPermissions=Този потребител няма определени права
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
-BaseCurrency=Референтна валута на компанията (влезте в настройката на компанията, за да промените това)
-WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
-WarningInstallationMayBecomeNotCompliantWithLaw=Опитвате се да инсталирате модул %s, който е външен модул. Активирането на външен модул означава, че имате доверие на издателя на този модул и сте сигурни, че този модул не оказва неблагоприятно въздействие върху поведението на приложението ви и е в съответствие със законите на вашата страна (%s). Ако модулът въведе незаконна функция, вие ставате отговорни за използването на незаконен софтуер.
+UrlToGetKeyToUseAPIs=URL адрес за получаване и използване на token за API (след като е получен token, той се съхранява в таблицата с потребителски данни на базата данни и трябва да се предоставя при всяко повикване за API)
+ListOfAvailableAPIs=Списък с налични API
+activateModuleDependNotSatisfied=Модул "%s" е зависим от модула "%s", който липсва, така че модул "%1$s" може да не работи правилно. Моля, инсталирайте модул "%2$s" или деактивирайте модула "%1$s", ако искате да се предпазите от изненади.
+CommandIsNotInsideAllowedCommands=Командата, която се опитвате да изпълните не е в списъка с налични команди дефинирани от параметъра <strong>$dolibarr_main_restrict_os_commands</strong> във файла <strong>conf.php</strong>.
+LandingPage=Начална страница (портал)
+SamePriceAlsoForSharedCompanies=Ако използвате модула "Няколко фирми" с активирана опция за "Една цена", то тази цена ще бъде еднаква за всички фирми, ако продуктите са споделени между тях.
+ModuleEnabledAdminMustCheckRights=Модулът е активиран. Права за използване на активирания модул са предоставени само на администратори на системата. Необходимо е ръчно да се предоставят права на други потребители или групи, ако е необходимо.
+UserHasNoPermissions=Този потребител няма дефинирани права
+TypeCdr=Използвайте "Няма", ако датата на плащане е датата на фактурата плюс разликата в дни (разликата е поле "%s") <br> Използвайте "В края на месеца", ако след добавяне на разликата датата трябва да бъде отместена напред, за да достигне до края на месеца (+ по избор "%s" в дни) <br> Използвайте "Текущ / Следващ", за да определите датата на плащане да бъде първата N-та от месеца плюс разликата (разликата е поле "%s", а N се съхранява в поле "%s")
+BaseCurrency=Основна валута на фирмата (отидете в Настройки - Фирма / Организация, за да я промените)
+WarningNoteModuleInvoiceForFrenchLaw=Модулът %s е в съответствие с френските закони (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Модулът %s е съвместим с френските закони (Loi Finance 2016), защото модулът "Неизменими архиви" се активира автоматично.
+WarningInstallationMayBecomeNotCompliantWithLaw=Опитвате се да инсталирате модул %s, който е външен модул. Активирането на външен модул означава, че имате доверие на издателя на този модул и сте сигурни, че този модул не оказва неблагоприятно въздействие върху поведението на системата и е в съответствие със законите на вашата страна (%s). Ако модулът въведе незаконна функция, вие ставате отговорни за използването на незаконен софтуер.
 MAIN_PDF_MARGIN_LEFT=Лява граница в PDF
 MAIN_PDF_MARGIN_RIGHT=Дясна граница в PDF
 MAIN_PDF_MARGIN_TOP=Горна граница в PDF
 MAIN_PDF_MARGIN_BOTTOM=Долна граница в PDF
 NothingToSetup=За този модул не е необходима специфична настройка.
-SetToYesIfGroupIsComputationOfOtherGroups=Задайте това да, ако тази група е съвкупност от други групи
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SetToYesIfGroupIsComputationOfOtherGroups=Задайте стойност "Да", ако тази група е съвкупност от други групи
+EnterCalculationRuleIfPreviousFieldIsYes=Въведете правило за изчисление, ако предишното поле е настроено на "Да" (например "CODEGRP1 + CODEGRP2")
 SeveralLangugeVariatFound=Намерени са няколко езикови варианта
-COMPANY_AQUARIUM_REMOVE_SPECIAL=Премахнете специалните символи
-COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
-GDPRContact=Длъжностно лице по защита на данните (Защита на данните или GDPR контакт)
-GDPRContactDesc=Ако съхранявате данни за европейски компании / граждани, можете да посочите контакт, който е отговорен за Общия регламент за защита на данните /GDPR/ тук
-HelpOnTooltip=Help text to show on tooltip
-HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
-YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
-ChartLoaded=Chart of account loaded
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Премахване на специални символи
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex филтър за изчистване на стойността (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=Длъжностно лице по защита на данните (DPO, Защита на лични данни или GDPR контакт)
+GDPRContactDesc=Ако съхранявате данни за европейски компании / граждани, тук може да посочите контакт, който е отговорен за Общия регламент за защита на данните /GDPR/
+HelpOnTooltip=Помощен текст, който да се показва в подсказка
+HelpOnTooltipDesc=Поставете тук текст или ключ за превод, който да се покаже в подсказка, когато това поле се появи във формуляр
+YouCanDeleteFileOnServerWith=Може да изтриете този файл от сървъра с команда в терминала: <br> %s
+ChartLoaded=Сметкопланът е зареден
 SocialNetworkSetup=Настройка на модул Социални мрежи
-EnableFeatureFor=Активиране на функциите за <strong> %s </strong>
-VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Разменете адреса на подателя и получателя в PDF формат
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
-EmailCollector=Email collector
-EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
-NewEmailCollector=Нов колектор на имейли
-EMailHost=Host of email IMAP server
-MailboxSourceDirectory=Източна директория на пощенската кутия
-MailboxTargetDirectory=Целева директория на пощенската кутия
-EmailcollectorOperations=Действия за извършване от колектор
-CollectNow=Съберете сега
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
-LastResult=Latest result
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
-NoNewEmailToProcess=No new email (matching filters) to process
+EnableFeatureFor=Активиране на функции за <strong> %s </strong>
+VATIsUsedIsOff=Забележка: Опцията за използване на данък върху продажбите или ДДС е <strong>изключена</strong> в менюто %s - %s, така че данъкът върху продажбите или ДДС винаги ще бъде 0 за продажби.
+SwapSenderAndRecipientOnPDF=Размяна на адресите на подателя и получателя в PDF документи
+FeatureSupportedOnTextFieldsOnly=Внимание, функцията се поддържа само в текстови полета. Също така трябва да се зададе URL параметър action=create или action=edit ИЛИ името на страницата трябва да завършва с "new.php", за да задейства тази функция.
+EmailCollector=Имейл колекционер
+EmailCollectorDescription=Добавете планирана задача в страницата за настройка, за да сканирате редовно пощенските кутии (използвайки протокола IMAP) и да записвате получените в приложението имейли на правилното място и / или да създавате автоматично някои записи (например нови възможности).
+NewEmailCollector=Нов колекционер на имейли
+EMailHost=Адрес на IMAP сървър
+MailboxSourceDirectory=Директория / Източник в пощенската кутия
+MailboxTargetDirectory=Директория / Цел в пощенската кутия
+EmailcollectorOperations=Операции за извършване от колекционера
+MaxEmailCollectPerCollect=Максимален брой събрани имейли при колекциониране
+CollectNow=Колекциониране
+ConfirmCloneEmailCollector=Сигурни ли сте, че искате да клонирате имейл колектора %s?
+DateLastCollectResult=Дата на последен опит за колекциониране
+DateLastcollectResultOk=Дата на последно успешно колекциониране
+LastResult=Последен резултат
+EmailCollectorConfirmCollectTitle=Потвърждение за колекциониране на имейли
+EmailCollectorConfirmCollect=Искате ли да стартирате колекционирането на този колекционер?
+NoNewEmailToProcess=Няма нови имейли (отговарящи на заложените филтри) за обработка
 NothingProcessed=Нищо не е направено
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=Открити са %s имейл адреса, %s имейл адреса са успешно обработени (за %s записа / действия)
 RecordEvent=Записване на имейл събитие
-CreateLeadAndThirdParty=Създайте възможност (и контрагент, ако е необходимо)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
-CodeLastResult=Последен код на резултатите
-NbOfEmailsInInbox=Number of emails in source directory
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr проследяващо ID е намерено
-WithoutDolTrackingID=Dolibarr проследяващо ID не е намерено
-FormatZip=П. код
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Показване на автоматично дърво на ECM
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+CreateLeadAndThirdParty=Създаване на възможност (и контрагент, ако е необходимо)
+CreateTicketAndThirdParty=Създаване на тикет (и контрагент, ако е необходимо)
+CodeLastResult=Код на последния резултат
+NbOfEmailsInInbox=Брой имейли в директорията източник
+LoadThirdPartyFromName=Зареждане на името на контрагента от %s (само за зареждане)
+LoadThirdPartyFromNameOrCreate=Зареждане на името на контрагента от %s (да се създаде, ако не е намерено)
+WithDolTrackingID=Намерен е проследяващ код в Dolibarr
+WithoutDolTrackingID=Не е намерен проследяващ код в Dolibarr
+FormatZip=Пощенски код
+MainMenuCode=Код на менюто (главно меню)
+ECMAutoTree=Показване на автоматично ECM дърво
+OperationParamDesc=Определете стойности, които да използвате за действие или как да извличате стойности. Например: <br> objproperty1=SET:abc <br> objproperty1=SET: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> Използвайте символа ; като разделител за извличане или задаване на няколко свойства.
 OpeningHours=Работно време
-OpeningHoursDesc=Въведете тук редовното работно време на вашата компания.
-ResourceSetup=Конфигуриране на модул ресурси
-UseSearchToSelectResource=Използвайте формуляр за търсене, за да изберете ресурс (а не падащ списък).
-DisabledResourceLinkUser=Деактивирайте функцията, свържете ресурс с потребител
-DisabledResourceLinkContact=Деактивирайте функцията, свържете ресурс с контакт
-ConfirmUnactivation=Потвърдете нулирането на модула
-OnMobileOnly=Само на малък екран (смартфон)
-DisableProspectCustomerType=Деактивирайте типа  „Перспектива + клиент“ за контрагент (така че контрагента трябва да бъде Перспектива или Клиент, но не може да бъде и двете)
-MAIN_OPTIMIZEFORTEXTBROWSER=Опростен интерфейс за незрящ човек
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Активирайте тази опция, ако сте сляп човек или ако използвате приложението от текстов браузър като Lynx или Links.
-ThisValueCanOverwrittenOnUserLevel=Тази стойност може да бъде презаписана от всеки потребител от неговата потребителска страница - таб '%s'
-DefaultCustomerType=Тип за контрагент по подразбиране за формата за създаване на "Нов клиент"
-ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
-RootCategoryForProductsToSell=Root category of products to sell
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
-DebugBar=Debug Bar
-DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
-DebugBarSetup=DebugBar Setup
-GeneralOptions=General Options
-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
-EXPORTS_SHARE_MODELS=Export models are share with everybody
-ExportSetup=Setup of module Export
-InstanceUniqueID=Unique ID of the instance
-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/.
+OpeningHoursDesc=Въведете тук редовното работно време на вашата фирма.
+ResourceSetup=Конфигурация на модул Ресурси
+UseSearchToSelectResource=Използване на поле за търсене при избор на ресурс (вместо избор от списък в падащо меню)
+DisabledResourceLinkUser=Деактивиране на функция за свързване на ресурс от потребители
+DisabledResourceLinkContact=Деактивиране на функция за свързване на ресурс от контакти
+ConfirmUnactivation=Потвърдете задаването на първоначални настройки на модула
+OnMobileOnly=Само при малък екран (смартфон)
+DisableProspectCustomerType=Деактивиране на типа контрагент "Перспектива + Клиент" (контрагента трябва да бъде Перспектива или Клиент, но не може да бъде и двете)
+MAIN_OPTIMIZEFORTEXTBROWSER=Опростяване на интерфейса за незрящ човек
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Активирайте тази опция за незрящ човек или ако използвате приложението от текстов браузър като Lynx или Links.
+ThisValueCanOverwrittenOnUserLevel=Тази стойност може да бъде променена от профила на всеки потребител в раздела '%s'
+DefaultCustomerType=Тип контрагент по подразбиране във формуляра за създаване на "Нов клиент"
+ABankAccountMustBeDefinedOnPaymentModeSetup=Забележка: Банковата сметка трябва да бъде дефинирана в модула за всеки режим на плащане (Paypal, Stripe, ...), за да работи тази функция.
+RootCategoryForProductsToSell=Основна категория продукти за продажба
+RootCategoryForProductsToSellDesc=Ако е дефинирано, само продукти и подпродукти от тази категория ще бъдат достъпни в точката за продажби
+DebugBar=Инструменти за отстраняване на грешки
+DebugBarDesc=Лента с инструменти, която опростява отстраняването на грешки
+DebugBarSetup=Настройка на инструментите за отстраняване на грешки
+GeneralOptions=Основни опции
+LogsLinesNumber=Брой редове, които да се показват в раздела журнали
+UseDebugBar=Използване на инструменти за отстраняване на грешки
+DEBUGBAR_LOGS_LINES_NUMBER=Брой последни редове на журнал, които да се пазят в конзолата
+WarningValueHigherSlowsDramaticalyOutput=Внимание, по-високите стойности забавят драматично производителността
+DebugBarModuleActivated=Модула "Инструменти за отстраняване на грешки" е активиран и забавя драматично интерфейса
+EXPORTS_SHARE_MODELS=Моделите за експортиране се споделят с всички
+ExportSetup=Настройка на модула Експортиране на данни
+InstanceUniqueID=Уникален идентификатор на инстанцията
+SmallerThan=По-малък от
+LargerThan=По-голям от
+IfTrackingIDFoundEventWillBeLinked=Обърнете внимание, че ако е намерен проследяващ код във входящата електронна поща, събитието ще бъде автоматично свързано със свързаните обекти.
+WithGMailYouCanCreateADedicatedPassword=С GMail акаунт, ако сте активирали валидирането в 2 стъпки е препоръчително да създадете специална втора парола за приложението, вместо да използвате своята парола за акаунта от https://myaccount.google.com/.
+IFTTTSetup=Настройка на модул IFTTT
+IFTTT_SERVICE_KEY=IFTTT Service key
+IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Ключ за сигурност, който защитава URL адреса, използван от IFTTT, за да изпраща съобщения до вашия Dolibarr.
+IFTTTDesc=Този модул е предназначен да задейства събития на IFTTT и / или да изпълнява някои действия, чрез външни IFTTT тригери.
+UrlForIFTTT=URL адрес за IFTTT
+YouWillFindItOnYourIFTTTAccount=Ще го намерите във вашият IFTTT акаунт
+EndPointFor=Крайна точка за %s: %s
diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang
index a125a218d1d..198781d303e 100644
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/htdocs/langs/bg_BG/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Събития, за които Dolibarr ще създаде де
 EventRemindersByEmailNotEnabled=Напомнянията за събития по имейл не са активирани в настройката на модула %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Контрагент %s е създаден
+COMPANY_DELETEInDolibarr=Контрагент %s е изтрит
 ContractValidatedInDolibarr=Контакт %s е валидиран
 CONTRACT_DELETEInDolibarr=Договор %s е изтрит
 PropalClosedSignedInDolibarr=Предложение %s е подписано
@@ -95,7 +96,8 @@ PROJECT_MODIFYInDolibarr=Проект %s е променен
 PROJECT_DELETEInDolibarr=Проект %s е изтрит
 TICKET_CREATEInDolibarr=Тикет %s е създаден
 TICKET_MODIFYInDolibarr=Тикет %s е променен
-TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_ASSIGNEDInDolibarr=Тикет %s е възложен
+TICKET_CLOSEInDolibarr=Тикет %s е затворен
 TICKET_DELETEInDolibarr=Тикет %s е изтрит
 ##### End agenda events #####
 AgendaModelModule=Шаблони на документи за събитие
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index bfb631042ae..6652d0e65d1 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Банка
-MenuBankCash=Банка | Каса
+MenuBankCash=Банки | Каса
 MenuVariousPayment=Разнородни плащания
 MenuNewVariousPayment=Ново разнородно плащане
 BankName=Име на банката
 FinancialAccount=Сметка
 BankAccount=Банкова сметка
 BankAccounts=Банкови сметки
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Банкови сметки | Портал
 ShowAccount=Показване на сметка
 AccountRef=Финансова сметка реф.
 AccountLabel=Финансова сметка етикет
@@ -30,23 +30,23 @@ AllTime=От начало
 Reconciliation=Помирение
 RIB=Номер на банкова сметка
 IBAN=IBAN номер
-BIC=BIC / SWIFT номер
-SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
-StandingOrders=Direct Debit orders
-StandingOrder=Direct debit order
+BIC=BIC/SWIFT Код
+SwiftValid=BIC/SWIFT валиден
+SwiftVNotalid=BIC/SWIFT невалиден
+IbanValid=BAN валиден
+IbanNotValid=BAN невалиден
+StandingOrders=Поръчки за директен дебит
+StandingOrder=Поръчка за директен дебит
 AccountStatement=Отчет по сметка
 AccountStatementShort=Отчет
 AccountStatements=Извлечения по сметки
 LastAccountStatements=Последни извлечения
 IOMonthlyReporting=Месечно отчитане
-BankAccountDomiciliation=Сметка адрес
+BankAccountDomiciliation=Адрес на банката
 BankAccountCountry=Профил страната
 BankAccountOwner=Името на собственика на сметката
 BankAccountOwnerAddress=Притежател на сметката адрес
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+RIBControlError=Проверката за достоверност на стойностите е неуспешна. Това означава, че информацията за този номер на сметката не е пълна или е неправилна (проверете страната, номерата и IBAN).
 CreateAccount=Създаване на сметка
 NewBankAccount=Нова сметка
 NewFinancialAccount=Нова финансова сметка
@@ -60,13 +60,13 @@ BankType2=Парична сметка
 AccountsArea=Сметки
 AccountCard=Картова сметка
 DeleteAccount=Изтриване на акаунт
-ConfirmDeleteAccount=Are you sure you want to delete this account?
+ConfirmDeleteAccount=Сигурни ли сте, че искате да изтриете тази сметка?
 Account=Сметка
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
+BankTransactionByCategories=Банкови транзакции по категории
+BankTransactionForCategory=Банкови транзакции по категории <b>%s</b>
 RemoveFromRubrique=Премахване на връзката с категория
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=Списък на банкови записи
+RemoveFromRubriqueConfirm=Сигурни ли сте, че желаете да премахнете връзката между операцията и категорията?
+ListBankTransactions=Списък с банкови транзакции
 IdTransaction=Transaction ID
 BankTransactions=Банкови записи
 BankTransaction=Банков запис
@@ -76,92 +76,94 @@ TransactionsToConciliate=Записи за равнение
 Conciliable=Може да се примири
 Conciliate=Reconcile
 Conciliation=Помирение
-SaveStatementOnly=Save statement only
-ReconciliationLate=Reconciliation late
+SaveStatementOnly=Запазете само извлечението
+ReconciliationLate=Късно съгласуване
 IncludeClosedAccount=Включват затворени сметки
 OnlyOpenedAccount=Само открити сметки
 AccountToCredit=Профил на кредитен
 AccountToDebit=Сметка за дебитиране
 DisableConciliation=Деактивирате функцията помирение за тази сметка
 ConciliationDisabled=Помирение функция инвалиди
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
+LinkedToAConciliatedTransaction=Свързан е със съгласуван запис
 StatusAccountOpened=Отворен
 StatusAccountClosed=Затворен
 AccountIdShort=Номер
 LineRecord=Транзакция
-AddBankRecord=Добави запис
-AddBankRecordLong=Add entry manually
-Conciliated=Reconciled
+AddBankRecord=Добавяне на запис
+AddBankRecordLong=Ръчно добавяне на запис
+Conciliated=Съгласувано
 ConciliatedBy=Съгласуват от
 DateConciliating=Reconcile дата
-BankLineConciliated=Entry reconciled
-Reconciled=Reconciled
-NotReconciled=Not reconciled
+BankLineConciliated=Записите са съгласувани
+Reconciled=Съгласувано
+NotReconciled=Не е съгласувано
 CustomerInvoicePayment=Клиентско плащане
-SupplierInvoicePayment=Доставчика на платежни услуги
+SupplierInvoicePayment=Плащане на доставчик
 SubscriptionPayment=Плащане на членски внос
 WithdrawalPayment=Оттегляне плащане
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Банков превод
 BankTransfers=Банкови преводи
-MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+MenuBankInternalTransfer=Вътрешен превод
+TransferDesc=Прехвърляне от един акаунт в друг, Dolibarr ще направи два записа (дебитна сметка в източник и кредит в целевата сметка). За тази транзакция ще се използва същата сума (с изключение на знак), етикет и дата)
 TransferFrom=От
 TransferTo=За
 TransferFromToDone=Прехвърлянето от <b>%s</b> на <b>%s</b> на %s <b>%s</b> беше записано.
 CheckTransmitter=Предавател
-ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
-DeleteCheckReceipt=Delete this check receipt?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+ValidateCheckReceipt=Валидиране на тази чекова разписка?
+ConfirmValidateCheckReceipt=Сигурни ли сте, че искате да потвърдите получаването на чека, няма да е възможна промяна след като това бъде направено?
+DeleteCheckReceipt=Да се изтрие ли тази чекова разписка?
+ConfirmDeleteCheckReceipt=Сигурни ли сте, че искате да изтриете тази чекова разписка?
 BankChecks=Банката проверява
 BankChecksToReceipt=Чекове чакащи депозит
 ShowCheckReceipt=Покажи проверете получаване депозит
-NumberOfCheques=No. of check
-DeleteTransaction=Изтри запис
+NumberOfCheques=Брой чекове
+DeleteTransaction=Изтриване на запис
 ConfirmDeleteTransaction=Сигурни ли сте че искате да изтриете този запис ? 
 ThisWillAlsoDeleteBankRecord=Това ще изтрие генерирания банков запис
 BankMovements=Движения
 PlannedTransactions=Планирани записи
 Graph=Графики
-ExportDataset_banque_1=Bank entries and account statement
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_1=Банкови записи и извлечение по сметка
+ExportDataset_banque_2=Депозитна разписка
 TransactionOnTheOtherAccount=Транзакциите по друга сметка
-PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateSucceeded=Номерът на плащането е актуализиран успешно
 PaymentNumberUpdateFailed=Плащане брой не може да бъде актуализиран
-PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateSucceeded=Датата на плащането е актуализирана успешно
 PaymentDateUpdateFailed=Дата на плащане не може да бъде актуализиран
 Transactions=Сделки
 BankTransactionLine=Банков запис
-AllAccounts=All bank and cash accounts
+AllAccounts=Всички банкови и касови сметки
 BackToAccount=Обратно към сметка
 ShowAllAccounts=Покажи за всички сметки
-FutureTransaction=Transaction in future. No way to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+FutureTransaction=Бъдещи транзакции. Невъзможно равнение.
+SelectChequeTransactionAndGenerate=Изберете / филтрирайте чековете, които включва разписка за депозит и кликнете върху "Create".
+InputReceiptNumber=Изберете банковото извлечение, свързано със съгласуването. Използвайте числова стойност, която е във вида: YYYYMM или YYYYMMDD
 EventualyAddCategory=В крайна сметка, да посочите категорията, в която да се класифицират записи
-ToConciliate=To reconcile?
+ToConciliate=Да се съгласува ли?
 ThenCheckLinesAndConciliate=След това проверете линии в отчета на банката и кликнете
 DefaultRIB=По подразбиране BAN
 AllRIB=Всички BAN
-LabelRIB=BAN Label
+LabelRIB=BAN етикет
 NoBANRecord=Няма BAN запис
 DeleteARib=Изтри BAN запис
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
-RejectCheck=Върнат Чек
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
-RejectCheckDate=Дата на която чека е върнат
-CheckRejected=Върнат Чек
-CheckRejectedAndInvoicesReopened=Върнат Чек и отворена фактура
-BankAccountModelModule=Документ шаблон за банков акаунт
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
+ConfirmDeleteRib=Сигурни ли сте, че искате да изтриете този BAN запис?
+RejectCheck=Чекът е върнат
+ConfirmRejectCheck=Сигурни ли сте, искате да маркирате този чек като е отхвърлен?
+RejectCheckDate=Дата, на която чекът е върнат
+CheckRejected=Чекът е върнат
+CheckRejectedAndInvoicesReopened=Чекът е върнат и фактурата е отворена
+BankAccountModelModule=Шаблони на документи за банкови сметки
+DocumentModelSepaMandate=Шаблон за SEPA нареждания . Полезно само за европейските страни в ЕИО.
 DocumentModelBan=Шаблон на който да се принтира страница с BAN информация
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Разнородни плащания
+NewVariousPayment=Ново смесено плащане
+VariousPayment=Смесено плащане
 VariousPayments=Разнородни плащания
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
-SEPAMandate=SEPA mandate
-YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+ShowVariousPayment=Показване на смесено плащане
+AddVariousPayment=Добавяне на смесено плащане
+SEPAMandate=SEPA нареждане
+YourSEPAMandate=Вашите SEPA нареждания
+FindYourSEPAMandate=Това е вашето SEPA нареждане да упълномощите нашата компания да направи поръчка за директен дебит към вашата банка. Върнете го подписано (сканиране на подписания документ) или го изпратете по пощата на
+AutoReportLastAccountStatement=Автоматично попълнете полето „номер на банково извлечение“ с последния номер на извлечение, когато правите равнение
+CashControl=Лимит за плащане в брой на POS
+NewCashFence=Нов лимит за плащане в брой
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index e4888666bd0..3c6c4545f1f 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -17,8 +17,8 @@ DisabledBecauseNotErasable=Деактивирано, защото не може
 InvoiceStandard=Стандартна фактура
 InvoiceStandardAsk=Стандартна фактура
 InvoiceStandardDesc=Тази фактурата е фактура от най-общ вид.
-InvoiceDeposit=Фактура
-InvoiceDepositAsk=Фактура
+InvoiceDeposit=Фактура за авансово плащане
+InvoiceDepositAsk=Фактура за авансово плащане
 InvoiceDepositDesc=Този вид фактура се използва, когато е получено авансово плащане.
 InvoiceProForma=Проформа фактура
 InvoiceProFormaAsk=Проформа фактура
@@ -28,7 +28,7 @@ InvoiceReplacementAsk=Фактура подменяща друга фактур
 InvoiceReplacementDesc=<b>Подменяща фактура</b> се използва за анулиране и пълно заменяне на фактура без получено плащане. <br><br> Забележка: Само фактури без плащания по тях могат да бъдат заменяни. Ако фактурата, която заменяте, все още не е приключена, то тя ще бъде автоматично приключена като „Изоставена“.
 InvoiceAvoir=Кредитно известие
 InvoiceAvoirAsk=Кредитно известие за коригиране на фактура
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+InvoiceAvoirDesc=<b>Кредитното известие </b> е отрицателна фактура, използвана за коригиране на факта, че фактурата показва сума, която се различава от действително платената сума (например клиентът е платил твърде много по грешка или няма да плати пълната сума, тъй като някои продукти са върнати).
 invoiceAvoirWithLines=Създаване на кредитно известие с редове от оригиналната фактура
 invoiceAvoirWithPaymentRestAmount=Създаване на кредитно известие с неплатения остатък от оригиналната фактура
 invoiceAvoirLineWithPaymentRestAmount=Кредитно известие с неплатен остатък
@@ -53,9 +53,9 @@ InvoiceLine=Фактурен ред
 InvoiceCustomer=Продажна фактура
 CustomerInvoice=Продажна фактура
 CustomersInvoices=Продажни фактури
-SupplierInvoice=Фактура на доставчика
-SuppliersInvoices=Фактури на доставчици
-SupplierBill=Фактура на доставчика
+SupplierInvoice=Фактура за доставка
+SuppliersInvoices=Фактури за доставка
+SupplierBill=Фактура за доставка
 SupplierBills=Доставни фактури
 Payment=Плащане
 PaymentBack=Обратно плащане
@@ -66,12 +66,14 @@ paymentInInvoiceCurrency=във валутата на фактурите
 PaidBack=Платено обратно
 DeletePayment=Изтрий плащане
 ConfirmDeletePayment=Сигурни ли сте че, искате да изтриете това плащане?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
-SupplierPayments=Плащания на доставчици
+ConfirmConvertToReduc=Искате ли да конвертирате това %s в абсолютна отстъпка?
+ConfirmConvertToReduc2=Сумата ще бъде запазена измежду всички отстъпки и може да се използва като отстъпка за текуща или бъдеща фактура за този клиент.
+ConfirmConvertToReducSupplier=Искате ли да конвертирате това %s в абсолютна отстъпка?
+ConfirmConvertToReducSupplier2=Сумата ще бъде запазена измежду всички отстъпки и може да се използва като отстъпка за текуща или бъдеща фактура за този доставчик.
+SupplierPayments=Плащания към доставчици
 ReceivedPayments=Получени плащания
 ReceivedCustomersPayments=Плащания получени от клиенти
-PayedSuppliersPayments=Плащания направени към доставчици
+PayedSuppliersPayments=Направени плащания към доставчици
 ReceivedCustomersPaymentsToValid=Получени плащания от клиенти за валидация
 PaymentsReportsForYear=Отчети за плащания за %s
 PaymentsReports=Отчети за плащания
@@ -79,20 +81,19 @@ PaymentsAlreadyDone=Вече направени плащания
 PaymentsBackAlreadyDone=Вече направени обратни плащания
 PaymentRule=Правило за плащане
 PaymentMode=Вид плащане
-PaymentTypeDC=Дебитна / кредитна карта
+PaymentTypeDC=Дебитна / Кредитна карта
 PaymentTypePP=PayPal
 IdPaymentMode=Вид плащане (id)
 CodePaymentMode=Вид плащане (код)
 LabelPaymentMode=Вид плащане (етикет)
 PaymentModeShort=Вид плащане
-PaymentTerm=Условия за плащане
+PaymentTerm=Условие за плащане
 PaymentConditions=Условия за плащане
 PaymentConditionsShort=Условия за плащане
 PaymentAmount=Сума за плащане
-ValidatePayment=Валидирай плащане
 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.
+HelpPaymentHigherThanReminderToPay=Внимание, сумата за плащане на една или повече фактури е по-висока от дължимата сума за плащане. <br> Редактирайте записа си, в противен случай потвърдете и обмислете създаването на кредитно известие за получената сума за всяка надплатена фактура.
+HelpPaymentHigherThanReminderToPaySupplier=Внимание, сумата за плащане на една или повече фактури е по-висока от дължимата сума за плащане. <br> Редактирайте записа си, в противен случай потвърдете и обмислете създаването на кредитно известие за излишъка, платен за всяка надплатена фактура.
 ClassifyPaid=Класифицирай 'Платено'
 ClassifyPaidPartially=Класифицирай 'Платено частично'
 ClassifyCanceled=Класифицирай 'Изоставено'
@@ -104,14 +105,14 @@ AddBill=Създаване на фактура или кредитно изве
 AddToDraftInvoices=Добави към фактура чернова
 DeleteBill=Изтрий фактура
 SearchACustomerInvoice=Търсене за продажна фактура
-SearchASupplierInvoice=Търсете фактура на доставчика
+SearchASupplierInvoice=Търсене на фактура за доставка
 CancelBill=Отказване на фактура
 SendRemindByMail=Изпращане на напомняне по имейл
-DoPayment=ПЛАЩАНЕ
-DoPaymentBack=Въведете възстановяване
-ConvertToReduc=Маркирайте като наличен кредит
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
+DoPayment=Въвеждане на плащане
+DoPaymentBack=Въвеждане на възстановяване
+ConvertToReduc=Маркиране като наличен кредит
+ConvertExcessReceivedToReduc=Превръщане на получения излишък в наличен кредит
+ConvertExcessPaidToReduc=Превръщане на платения излишък в налична отстъпка
 EnterPaymentReceivedFromCustomer=Въведете плащане получено от клиент
 EnterPaymentDueToCustomer=Дължимото плащане на клиента
 DisabledBecauseRemainderToPayIsZero=Деактивирано понеже остатъка за плащане е нула
@@ -120,103 +121,103 @@ BillStatus=Статус на фактурата
 StatusOfGeneratedInvoices=Състояние на генерираните фактури
 BillStatusDraft=Чернова (трябва да се валидира)
 BillStatusPaid=Платена
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Платен (готов за потребление в окончателната фактура)
+BillStatusPaidBackOrConverted=Кредитното известие е възстановено или маркирано като наличен кредит
+BillStatusConverted=Платена (готова за използване в окончателна фактура)
 BillStatusCanceled=Изоставена
 BillStatusValidated=Валидирана (трябва да се плати)
 BillStatusStarted=Започната
 BillStatusNotPaid=Неплатена
-BillStatusNotRefunded=Не са възстановени
+BillStatusNotRefunded=Не възстановено
 BillStatusClosedUnpaid=Затворена (неплатена)
 BillStatusClosedPaidPartially=Платена (частично)
 BillShortStatusDraft=Чернова
 BillShortStatusPaid=Платена
-BillShortStatusPaidBackOrConverted=Възстановени или конвертирани
-Refunded=Възстановени
+BillShortStatusPaidBackOrConverted=Възстановено или конвертирано
+Refunded=Възстановено
 BillShortStatusConverted=Платена
 BillShortStatusCanceled=Изоставена
 BillShortStatusValidated=Валидирана
 BillShortStatusStarted=Започната
 BillShortStatusNotPaid=Неплатена
-BillShortStatusNotRefunded=Не са възстановени
+BillShortStatusNotRefunded=Не възстановено
 BillShortStatusClosedUnpaid=Затворена
 BillShortStatusClosedPaidPartially=Платена (частично)
 PaymentStatusToValidShort=За валидиране
-ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
-ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorVATIntraNotConfigured=Все още не е определен вътреобщностен ДДС номер
+ErrorNoPaiementModeConfigured=Няма дефиниран вид на плащане по подразбиране. Отидете в настройката на модула Фактури, за да коригирате това.
+ErrorCreateBankAccount=Създайте банкова сметка, след това отидете в настройката на модула Фактури, за да дефинирате видове плащания
 ErrorBillNotFound=Фактура %s не съществува
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Грешка, опитахте да валидирате фактура, за да замените фактура %s, но тя вече е заменена с фактура %s.
 ErrorDiscountAlreadyUsed=Грешка, вече се използва отстъпка
 ErrorInvoiceAvoirMustBeNegative=Грешка, коригиращата фактура трябва да има отрицателна сума
 ErrorInvoiceOfThisTypeMustBePositive=Грешка, този тип фактура трябва да има положителна стойност,
 ErrorCantCancelIfReplacementInvoiceNotValidated=Грешка, не може да се анулира фактура, която е била заменена от друга фактура, която все още е в състояние на чернова
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Тази или друга част вече е използвана, така че сериите с отстъпки не могат да бъдат премахнати.
 BillFrom=От
 BillTo=За
 ActionsOnBill=Действия по фактура
-RecurringInvoiceTemplate=Шаблон / повтаряща се фактура
-NoQualifiedRecurringInvoiceTemplateFound=Няма повтаряща се шаблона фактура за генериране
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Не е повтаряща се шаблона фактура
+RecurringInvoiceTemplate=Шаблонна / Повтаряща се фактура
+NoQualifiedRecurringInvoiceTemplateFound=Няма шаблонна повтаряща се фактура за генериране
+FoundXQualifiedRecurringInvoiceTemplate=Намерени са %s шаблонни повтарящи се фактури, отговарящи на изискванията за генериране.
+NotARecurringInvoiceTemplate=Не е шаблонна повтаряща се фактура
 NewBill=Нова фактура
-LastBills=Последни %s фактури
-LatestTemplateInvoices=Последни %s шаблонни фактури
-LatestCustomerTemplateInvoices=Последни %s шаблонни фактури на клиенти
-LatestSupplierTemplateInvoices=Последни %s шаблонни фактури на доставчици
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Последни %s фактури доставчици
+LastBills=Фактури: %s последни
+LatestTemplateInvoices=Шаблонни повтарящи се фактури: %s последни
+LatestCustomerTemplateInvoices=Шаблонни повтарящи се фактури за продажба: %s последни
+LatestSupplierTemplateInvoices=Шаблонни повтарящи се фактури за доставка: %s последни
+LastCustomersBills=Фактури за продажба: %s последни
+LastSuppliersBills=Фактури за доставка: %s последни
 AllBills=Всички фактури
 AllCustomerTemplateInvoices=Всички шаблонни фактури
 OtherBills=Други фактури
 DraftBills=Чернови фактури
-CustomersDraftInvoices=Чернови фактури клиенти
-SuppliersDraftInvoices=Чернови фактури доставчици
+CustomersDraftInvoices=Чернови фактури за продажба
+SuppliersDraftInvoices=Чернови фактури за доставка
 Unpaid=Неплатен
 ConfirmDeleteBill=Сигурни ли сте, че искате да изтриете тази фактура?
-ConfirmValidateBill=Сигурни ли сте че, искате да потвърдите тази фактура <b> %s </b>?
-ConfirmUnvalidateBill=Сигурен ли сте, че искате да промените фактура <b>%s</b> в състояние на чернова?
-ConfirmClassifyPaidBill=Сигурни ли сте че, искате да промените фактурата <b> %s </b> към статус платена?
-ConfirmCancelBill=Сигурен ли сте, че искате да отмените фактура <b>%s?</b>
-ConfirmCancelBillQuestion=Защо искате да класифицирате тази фактура като „изоставена“?
-ConfirmClassifyPaidPartially=Сигурни ли сте че, искате да промените фактурата <b> %s </b> към статус платена?
-ConfirmClassifyPaidPartiallyQuestion=Тази фактура не е изцяло платена. Каква е причината за закриване на тази фактура?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ConfirmValidateBill=Сигурни ли сте че, искате да валидирате тази фактура <b> %s </b>?
+ConfirmUnvalidateBill=Сигурен ли сте, че искате да върнете фактура <b>%s</b> в състояние на чернова?
+ConfirmClassifyPaidBill=Сигурни ли сте че, искате да маркирате фактура <b> %s </b> със статус платена?
+ConfirmCancelBill=Сигурни ли сте, че искате да анулирате фактура <b> %s </b>?
+ConfirmCancelBillQuestion=Защо искате да класифицирате тази фактура като „Изоставена“?
+ConfirmClassifyPaidPartially=Сигурни ли сте че, искате да маркирате фактура <b> %s </b> със статус платена?
+ConfirmClassifyPaidPartiallyQuestion=Тази фактура не е платена изцяло. Каква е причината за приключване на тази фактура?
+ConfirmClassifyPaidPartiallyReasonAvoir=Неплатения остатък <b> (%s %s) </b> е предоставена отстъпка, тъй като плащането е извършено преди срока за плащане. Уреждам ДДС с кредитно известие.
+ConfirmClassifyPaidPartiallyReasonDiscount=Неплатения остатък <b> (%s %s) </b> е предоставена отстъпка, тъй като плащането е извършено преди срока за плащане.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Неплатеният остатък <b>(%s %s)</b> е дадена отстъпка, защото плащането е направено преди срока за плащане. Приемам да се загуби ДДС по тази отстъпка.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Неплатеният остатък <b>(%s %s)</b> е дадена отстъпка, защото плащането е направено преди срока за плащане Възстановявам ДДС по тази отстъпка без кредитно известие.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Лош клиент
 ConfirmClassifyPaidPartiallyReasonProductReturned=Продукти частично върнати
 ConfirmClassifyPaidPartiallyReasonOther=Сумата е изоставена по друга причина
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Този избор е възможен, ако фактурата е снабдена с подходящи коментари. (Например: "Само данък, съответстващ на действително платената цена, дава право на приспадане")
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=В някои държави този избор е възможен, само ако фактурата съдържа правилни бележки.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Използвайте този избор, ако всички други не са подходящи
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b> е лош клиент </b> е клиент, който отказва да изплати дълга си.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b> Лош клиент </b> е клиент, който отказва да плати дълга си.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Този избор се използва, когато плащането не е пълно, тъй като някои от продуктите са били върнати
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Използвайте този избор, ако всички останали не са подходящи, например в следната ситуация:\n- плащането не е завършено, защото някои продукти са изпратени обратно\n- предявената сума е задължителна, понеже отстъпката е забравена\nВъв всички случаи, надхвърлената сума трябва да бъде коригирана в счетоводната система, чрез създаване на кредитно известие.
 ConfirmClassifyAbandonReasonOther=Друг
 ConfirmClassifyAbandonReasonOtherDesc=Този избор ще бъде използван във всички останали случаи. За пример, защото имате намерение да създадете заменяща фактура.
-ConfirmCustomerPayment=Потвърждавате ли това плащане от клиент за <b> %s </b> %s?
-ConfirmSupplierPayment=Потвърждавате ли това плащане към доставчик за <b> %s </b> %s?
-ConfirmValidatePayment=Сигурни ли сте, че искате да потвърдите това плащане? Не се допуска промяна след потвърждаване на плащането.
+ConfirmCustomerPayment=Потвърждавате ли това входящо плащане за <b> %s </b> %s?
+ConfirmSupplierPayment=Потвърждавате ли това изходящо плащане за <b> %s </b> %s?
+ConfirmValidatePayment=Сигурни ли сте, че искате да валидирате това плащане? Не се допуска промяна след валидиране на плащането.
 ValidateBill=Валидирай фактура
 UnvalidateBill=Отвалидирай фактура
 NumberOfBills=Брой фактури
-NumberOfBillsByMonth=Брой фактури по месец
+NumberOfBillsByMonth=Брой фактури на месец
 AmountOfBills=Сума на фактури
-AmountOfBillsHT=Стойност на фактурите (без ДДС)
+AmountOfBillsHT=Сума на фактури (без ДДС)
 AmountOfBillsByMonthHT=Сума на фактури по месец (без данък)
 ShowSocialContribution=Покажи социален/фискален данък
 ShowBill=Покажи фактура
 ShowInvoice=Покажи фактура
 ShowInvoiceReplace=Покажи заменяща фактура
 ShowInvoiceAvoir=Покажи кредитно известие
-ShowInvoiceDeposit=Покажи авансова фактура
-ShowInvoiceSituation=Show situation invoice
+ShowInvoiceDeposit=Показване на авансова фактура
+ShowInvoiceSituation=Показване на ситуационна фактура
 ShowPayment=Покажи плащане
 AlreadyPaid=Вече е платена
 AlreadyPaidBack=Вече е платена обратно
-AlreadyPaidNoCreditNotesNoDeposits=Вече е платено (без кредитни известия и авансови плащания)
+AlreadyPaidNoCreditNotesNoDeposits=Вече платено (без кредитни известия и авансови плащания)
 Abandoned=Изоставен
 RemainderToPay=Неплатен остатък
 RemainderToTake=Остатъчна сума за взимане
@@ -224,13 +225,13 @@ RemainderToPayBack=Оставаща сума за възстановяване
 Rest=Чакаща
 AmountExpected=Претендирана сума
 ExcessReceived=Получено превишение
-ExcessPaid=Excess paid
+ExcessPaid=Надплатено
 EscompteOffered=Предложена отстъпка (плащане преди срока)
 EscompteOfferedShort=Отстъпка
 SendBillRef=Изпращане на фактура %s
 SendReminderBillRef=Изпращане на фактура %s (напомняне)
-StandingOrders=Нареждане за директен дебит
-StandingOrder=Direct debit order
+StandingOrders=Нареждания с директен дебит
+StandingOrder=Нареждане за директен дебит
 NoDraftBills=Няма чернови фактури
 NoOtherDraftBills=Няма други чернови фактури
 NoDraftInvoices=Няма чернови фактури
@@ -240,19 +241,19 @@ RemainderToBill=Напомняне за фактуриране
 SendBillByMail=Изпращане на фактура по имейл
 SendReminderBillByMail=Изпращане на напомняне по имейл
 RelatedCommercialProposals=Свързани търговски предложения
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
+RelatedRecurringCustomerInvoices=Свързани повтарящи се фактури за продажба
 MenuToValid=За валидни
-DateMaxPayment=Дължимо плащане до
+DateMaxPayment=Плащането се дължи на
 DateInvoice=Дата на фактура
-DatePointOfTax=Point of tax
+DatePointOfTax=Дата на данъчно събитие
 NoInvoice=Няма фактура
 ClassifyBill=Класифицирай фактурата
-SupplierBillsToPay=Неплатени фактури на доставчици
-CustomerBillsUnpaid=Неплатени клиентски фактури
+SupplierBillsToPay=Неплатени фактури за доставка
+CustomerBillsUnpaid=Неплатени фактури за продажба
 NonPercuRecuperable=Невъзстановими
 SetConditions=Задайте условия за плащане
-SetMode=Задайте начин на плащане
-SetRevenuStamp=Set revenue stamp
+SetMode=Задайте видът на плащане
+SetRevenuStamp=Задайте гербова марка (бандерол)
 Billed=Фактурирано
 RecurringInvoices=Повтарящи се фактури
 RepeatableInvoice=Шаблон за фактура
@@ -262,15 +263,15 @@ Repeatables=Шаблони
 ChangeIntoRepeatableInvoice=Превърни в шаблон за фактура
 CreateRepeatableInvoice=Създай шаблон за фактура
 CreateFromRepeatableInvoice=Създай от шаблон за фактура
-CustomersInvoicesAndInvoiceLines=Фактури на клиент и техните детайли
+CustomersInvoicesAndInvoiceLines=Фактури за продажба и техните детайли
 CustomersInvoicesAndPayments=Продажни фактури и плащания
-ExportDataset_invoice_1=Фактури на клиент и техните детайли
+ExportDataset_invoice_1=Фактури за продажба и техните детайли
 ExportDataset_invoice_2=Продажни фактури и плащания
 ProformaBill=Проформа фактура:
 Reduction=Намаляване
-ReductionShort=Отстъпка
+ReductionShort=Отст.
 Reductions=Намаления
-ReductionsShort=Отстъпка
+ReductionsShort=Отст.
 Discounts=Отстъпки
 AddDiscount=Създай отстъпка
 AddRelativeDiscount=Създай относителна отстъпка
@@ -284,13 +285,13 @@ RelativeDiscount=Относителна отстъпка
 GlobalDiscount=Глобална отстъпка
 CreditNote=Кредитно известие
 CreditNotes=Кредитни известия
-CreditNotesOrExcessReceived=Credit notes or excess received
+CreditNotesOrExcessReceived=Кредитни известия или получен излишък
 Deposit=Авансово плащане
 Deposits=Авансови плащания
 DiscountFromCreditNote=Отстъпка от кредитно известие %s
 DiscountFromDeposit=Авансови плащания от фактура %s
-DiscountFromExcessReceived=Плащания над  стойността на фактурата %s
-DiscountFromExcessPaid=Плащания над  стойността на фактурата %s
+DiscountFromExcessReceived=Плащания над стойността на фактура %s
+DiscountFromExcessPaid=Плащания над стойността на фактура %s
 AbsoluteDiscountUse=Този вид кредит може да се използва по фактура преди нейното валидиране
 CreditNoteDepositUse=Фактурата трябва да бъде валидирана, за да се използва този вид кредити
 NewGlobalDiscount=Нова абсолютна отстъпка
@@ -299,140 +300,141 @@ DiscountType=Тип отстъпка
 NoteReason=Бележка/Причина
 ReasonDiscount=Причина
 DiscountOfferedBy=Предоставено от
-DiscountStillRemaining=Отстъпки или кредити на разположение
-DiscountAlreadyCounted=Discounts or credits already consumed
+DiscountStillRemaining=Налични отстъпки или кредити
+DiscountAlreadyCounted=Изразходвани отстъпки или кредити
 CustomerDiscounts=Отстъпки за клиенти
 SupplierDiscounts=Отстъпки на доставчици
 BillAddress=Фактурен адрес
-HelpEscompte=This discount is a discount granted to customer because payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
+HelpEscompte=Тази отстъпка представлява отстъпка, предоставена на клиента, тъй като плащането е извършено преди срока на плащане.
+HelpAbandonBadCustomer=Тази сума е изоставена (поради некоректен (лош) клиент) и се счита за изключителна загуба.
+HelpAbandonOther=Тази сума е изоставена, тъй като е била грешка (Например: неправилен клиент или фактура заменена от друга)
 IdSocialContribution=Id за плащане на социален/фискален данък
 PaymentId=Плащане ID
-PaymentRef=Payment ref.
+PaymentRef=Реф. плащане
 InvoiceId=Фактура ID
 InvoiceRef=Фактура код
 InvoiceDateCreation=Фактура дата създаване
 InvoiceStatus=Фактурата статус
 InvoiceNote=Фактура бележка
 InvoicePaid=Фактура плащане
-OrderBilled=Order billed
-DonationPaid=Donation paid
+OrderBilled=Поръчката е фактурирана
+DonationPaid=Дарението е платено
 PaymentNumber=Плащане номер
 RemoveDiscount=Премахни отстъпка
 WatermarkOnDraftBill=Воден знак върху чернови фактури (няма ако е празно)
 InvoiceNotChecked=Не е избрана фактура
 ConfirmCloneInvoice=Сигурни ли сте, че искате да клонирате тази фактура <b> %s </b>?
 DisabledBecauseReplacedInvoice=Действието е деактивирано, тъй като фактурата е била заменена
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
-NbOfPayments=No. of payments
+DescTaxAndDividendsArea=Тази секция показва обобщение на всички плащания, направени за специални разходи. Тук са включени само записи с плащания през определената година.
+NbOfPayments=Брой плащания
 SplitDiscount=Раздели отстъпката на две
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
+ConfirmSplitDiscount=Сигурни ли сте, че искате да разделите тази отстъпка <b> %s </b> %s на две по-малки отстъпки?
+TypeAmountOfEachNewDiscount=Въведете сума за всяка от двете части:
+TotalOfTwoDiscountMustEqualsOriginal=Общата сума на двете нови отстъпки трябва да бъде равна на първоначалната сума за отстъпка.
 ConfirmRemoveDiscount=Сигурни ли сте, че искате да премахнете тази отстъпка?
 RelatedBill=Свързана фактура
 RelatedBills=Свързани фактури
 RelatedCustomerInvoices=Свързани продажни фактури
-RelatedSupplierInvoices=Свързани фактури на доставчика
+RelatedSupplierInvoices=Свързани фактури за доставка
 LatestRelatedBill=Последна свързана фактура
 WarningBillExist=Внимание, вече съществуват една или повече фактури
 MergingPDFTool=Инструмент за sliwane на PDF
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-ListOfSituationInvoices=List of situation invoices
-CurrentSituationTotal=Total current situation
-DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Премахнете тази фактура от цикъл
-ConfirmRemoveSituationFromCycle=Премахнете тази фактура  %s от цикъл
-ConfirmOuting=Потвърдете излизането
+AmountPaymentDistributedOnInvoice=Сума на плащане, разпределена по фактура
+PaymentOnDifferentThirdBills=Позволява плащания по различни фактури на контрагенти, но от едно и също дружество (фирма майка)
+PaymentNote=Бележка за плащане
+ListOfPreviousSituationInvoices=Списък на предишни ситуационни фактури
+ListOfNextSituationInvoices=Списък на следващи ситуационни фактури
+ListOfSituationInvoices=Списък на ситуационни фактури
+CurrentSituationTotal=Общо настояща ситуация
+DisabledBecauseNotEnouthCreditNote=За да премахнете ситуационна фактура от цикъла, общата сума на кредитните известия за тази фактура трябва да покриват общата сума на фактурата
+RemoveSituationFromCycle=Премахване на тази фактура от цикъла
+ConfirmRemoveSituationFromCycle=Да се премахне ли фактура %s от цикъла?
+ConfirmOuting=Потвърдете разхода
 FrequencyPer_d=Всеки %s дни
 FrequencyPer_m=Всеки %s месеца
 FrequencyPer_y=Всеки %s години
 FrequencyUnit=Честотна единица
-toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
-NextDateToExecution=Дата за следващото генериране на фактури
-NextDateToExecutionShort=Дата на следващото ген.
+toolTipFrequency=Примери: <br> <b> Задайте 7, ден </b>: издава нова фактура на всеки 7 дни <br> <b> Задайте 3, месец </b>: издава нова фактура на всеки 3 месеца
+NextDateToExecution=Дата за следващо генериране на фактура
+NextDateToExecutionShort=Дата на следващо ген.
 DateLastGeneration=Дата на последно генериране
-DateLastGenerationShort=Дата на последното ген.
-MaxPeriodNumber=Макс. брой на генерираните фактури
-NbOfGenerationDone=Брой на вече генерирани фактури
+DateLastGenerationShort=Дата на последно ген.
+MaxPeriodNumber=Максимален брой генерирани фактури
+NbOfGenerationDone=Брой генерирани фактури
 NbOfGenerationDoneShort=Брой извършени генерирания
-MaxGenerationReached=Максимален брой генерирания е достигнат
-InvoiceAutoValidate=Автоматично потвърждавайте на фактурите
-GeneratedFromRecurringInvoice=Генериран от шаблон повтаряща се фактура %s
-DateIsNotEnough=Дата все още не е достигната
-InvoiceGeneratedFromTemplate=Фактура %s, е генерирана от шаблон за повтаряща се фактура %s
+MaxGenerationReached=Максималният брой генерирания е достигнат
+InvoiceAutoValidate=Автоматично валидиране на фактури
+GeneratedFromRecurringInvoice=Генерирано от шаблонна повтаряща се фактура %s
+DateIsNotEnough=Датата все още не е достигната
+InvoiceGeneratedFromTemplate=Фактура %s е генерирана от шаблон за повтаряща се фактура %s
+GeneratedFromTemplate=Генерирано от шаблонна фактура %s
 WarningInvoiceDateInFuture=Внимание, датата на фактурата е по-напред от текущата дата
 WarningInvoiceDateTooFarInFuture=Внимание,  датата на фактурата е твърде далеч от текущата дата
-ViewAvailableGlobalDiscounts=Вижте наличните отстъпки
+ViewAvailableGlobalDiscounts=Преглед на налични отстъпки
 # PaymentConditions
-Statut=Състояние
+Statut=Статус
 PaymentConditionShortRECEP=При получаване
 PaymentConditionRECEP=При получаване
 PaymentConditionShort30D=30 дни
 PaymentCondition30D=30 дни
-PaymentConditionShort30DENDMONTH=до 30 дни в края на месеца
-PaymentCondition30DENDMONTH=до 30 дни след края на месеца
+PaymentConditionShort30DENDMONTH=30 дни от края на месеца
+PaymentCondition30DENDMONTH=В рамките на 30 дни след края на месеца
 PaymentConditionShort60D=60 дни
 PaymentCondition60D=60 дни
-PaymentConditionShort60DENDMONTH=до 60 дни в края на месеца
-PaymentCondition60DENDMONTH=до 60 дни след края на месеца
+PaymentConditionShort60DENDMONTH=60 дни от края на месеца
+PaymentCondition60DENDMONTH=В рамките на 60 дни след края на месеца
 PaymentConditionShortPT_DELIVERY=Доставка
 PaymentConditionPT_DELIVERY=При доставка
 PaymentConditionShortPT_ORDER=Поръчка
 PaymentConditionPT_ORDER=При поръчка
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50% авансово, 50% при доставка
-PaymentConditionShort10D=до 10 дни
-PaymentCondition10D=до 10 дни
-PaymentConditionShort10DENDMONTH=до 10 дни в края на месеца
-PaymentCondition10DENDMONTH=до 10 дни след края на месеца
-PaymentConditionShort14D=до 14 дни
-PaymentCondition14D=до 14 дни
-PaymentConditionShort14DENDMONTH=до 14 дни в края на месеца
-PaymentCondition14DENDMONTH=до 14 дни след края на месеца
+PaymentConditionShort10D=10 дни
+PaymentCondition10D=10 дни
+PaymentConditionShort10DENDMONTH=10 дни от края на месеца
+PaymentCondition10DENDMONTH=В рамките на 10 дни след края на месеца
+PaymentConditionShort14D=14 дни
+PaymentCondition14D=14 дни
+PaymentConditionShort14DENDMONTH=14 дни от края на месеца
+PaymentCondition14DENDMONTH=В рамките на 14 дни след края на месеца
 FixAmount=Фиксирана сума
 VarAmount=Променлива сума (%% общ.)
-VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+VarAmountOneLine=Променлива сума (%% общ.) - 1 ред с етикет "%s"
 # PaymentType
 PaymentTypeVIR=Банков превод
 PaymentTypeShortVIR=Банков превод
-PaymentTypePRE=Нареждане за плащане с директен дебит
-PaymentTypeShortPRE=Нареждане за дебитно плащане
+PaymentTypePRE=Платежно нареждане за директен дебит
+PaymentTypeShortPRE=Платежно нареждане за дебит
 PaymentTypeLIQ=Касово плащане в брой
 PaymentTypeShortLIQ=В брой
 PaymentTypeCB=Плащане с карта
 PaymentTypeShortCB=С карта
 PaymentTypeCHQ=Чек
 PaymentTypeShortCHQ=Чек
-PaymentTypeTIP=TIP (Documents against Payment)
+PaymentTypeTIP=TIP (Документи срещу плащане)
 PaymentTypeShortTIP=Плащане по TIP
 PaymentTypeVAD=Онлайн плащане
 PaymentTypeShortVAD=Онлайн плащане
-PaymentTypeTRA=Bank draft
+PaymentTypeTRA=Банково извлечение
 PaymentTypeShortTRA=Чернова
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Банкови данни
 BankCode=Банков код
-DeskCode=Branch code
+DeskCode=Код на клон
 BankAccountNumber=Номер на сметка
-BankAccountNumberKey=Checksum
+BankAccountNumberKey=Контролната сума
 Residence=Адрес
 IBANNumber=IBAN номер на сметка
 IBAN=IBAN
 BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT Код
+BICNumber=BIC/SWIFT код
 ExtraInfos=Допълнителна информация
 RegulatedOn=Регулация на
 ChequeNumber=Чек NВ°
 ChequeOrTransferNumber=Чек/трансфер NВ°
-ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeBordereau=Чек график
+ChequeMaker=Чек/трансфер предавател
 ChequeBank=Банка на чека
 CheckBank=Чек
 NetToBePaid=Нетно за плащане
@@ -440,33 +442,33 @@ PhoneNumber=Тел
 FullPhoneNumber=Телефон
 TeleFax=Факс
 PrettyLittleSentence=Приемене на размера на плащанията с чекове, издадени в мое име, като член на счетоводна асоциация, одобрена от данъчната администрация.
-IntracommunityVATNumber=Вътрешно общностен ДДС №
-PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
-PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+IntracommunityVATNumber=ДДС №
+PaymentByChequeOrderedTo=Чекови плащания (с ДДС) се извършват до %s, изпратени на адрес
+PaymentByChequeOrderedToShort=Чекови плащания (с ДДС) се извършват до
 SendTo=изпратено на
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+PaymentByTransferOnThisBankAccount=Плащане, чрез превод по следната банкова сметка
 VATIsNotUsedForInvoice=* Неприложим ДДС, art-293BB от CGI
 LawApplicationPart1=Чрез прилагането на закон 80.335 от 12/05/80
 LawApplicationPart2=стоките остават собственост на
-LawApplicationPart3=the seller until full payment of
+LawApplicationPart3=продавача до пълното плащане на
 LawApplicationPart4=цената им.
 LimitedLiabilityCompanyCapital=SARL със столица
 UseLine=Приложи
 UseDiscount=Използвай отстъпка
 UseCredit=Използвай кредит
 UseCreditNoteInInvoicePayment=Намаляване на сумата за плащане с този кредит
-MenuChequeDeposits=Check Deposits
+MenuChequeDeposits=Чекови депозити
 MenuCheques=Чекове
-MenuChequesReceipts=Check receipts
+MenuChequesReceipts=Чекови разписки
 NewChequeDeposit=Нов депозит
-ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
+ChequesReceipts=Чекови разписки
+ChequesArea=Секция за чекови депозити
+ChequeDeposits=Чекови депозити
 Cheques=Чекове
 DepositId=Id депозит
 NbCheque=Брой чекове
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Използвайте контакт / адрес с тип „контакт за фактуриране“ вместо адрес на контрагента като получател на фактури
+CreditNoteConvertedIntoDiscount=Това %s е преобразувано в %s
+UsBillingContactAsIncoiveRecipientIfExist=Използване на контакт/адрес с тип "контакт за фактуриране" вместо адрес на контрагента като получател на фактури
 ShowUnpaidAll=Покажи всички неплатени фактури
 ShowUnpaidLateOnly=Покажи само неплатените фактури с просрочено плащане
 PaymentInvoiceRef=Платежна фактуре %s
@@ -477,36 +479,36 @@ Reported=Закъснение
 DisabledBecausePayments=Не е възможно, тъй като има някои плащания
 CantRemovePaymentWithOneInvoicePaid=Не може да се премахне плащането, тъй като има най-малко една фактура, класифицирана като платена
 ExpectedToPay=Очаквано плащане
-CantRemoveConciliatedPayment=Can't remove reconciled payment
+CantRemoveConciliatedPayment=Съгласуваното плащане не може да се премахне
 PayedByThisPayment=Плаща от това плащане
-ClosePaidInvoicesAutomatically=Класифицирайте "Платени" всички стандартни, авансови или заместващи фактури, платени напълно
+ClosePaidInvoicesAutomatically=Класифицирайте "Платени" всички стандартни, авансови или заместващи фактури, които са платени напълно.
 ClosePaidCreditNotesAutomatically=Класифицирай "Платени" всички кредитни известия изцяло обратно платени.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
-AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+ClosePaidContributionsAutomatically=Класифицирайте "Платени" всички социални или фискални вноски, които са платени напълно.
+AllCompletelyPayedInvoiceWillBeClosed=Всички фактури без остатък за плащане ще бъдат автоматично приключени със статус "Платени".
 ToMakePayment=Плати
 ToMakePaymentBack=Плати обратно
 ListOfYourUnpaidInvoices=Списък с неплатени фактури
 NoteListOfYourUnpaidInvoices=Бележка: Този списък съдържа само фактури за контрагенти, които са свързани като търговски представители.
 RevenueStamp=Приходен печат
 YouMustCreateInvoiceFromThird=Тази опция е налична само при създаване на фактура от раздел "Клиент" на контрагента
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
-YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+YouMustCreateInvoiceFromSupplierThird=Тази опция е налична само при създаването на фактура от раздел "Доставчик" на контрагента
+YouMustCreateStandardInvoiceFirstDesc=Първо трябва да създадете стандартна фактура и да я конвертирате в „шаблон“, за да създадете нова шаблонна фактура
 PDFCrabeDescription=Фактурен PDF шаблон. Пълен шаблон за фактура (препоръчителен шаблон)
-PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
+PDFSpongeDescription=PDF шаблон за фактура. Пълен шаблон за фактура
+PDFCrevetteDescription=PDF шаблон за фактура. Пълен шаблон за ситуационни фактури
 TerreNumRefModelDesc1=Върнете номер с формат %syymm-nnnn за стандартни фактури и %syymm-nnnn за кредитни известия, където уу е година, mm е месец и NNNN е последователност, без прекъсване и без 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+MarsNumRefModelDesc1=Връща номер с формат %syymm-nnnn за стандартни фактури, %syymm-nnnn за заместващи фактури, %syymm-nnnn за фактури за авансово плащане и %syymm-nnnn за кредитни известия, където yy е година, mm е месец и nnnn е последователност без прекъсване и без връщане към 0
 TerreNumRefModelError=Документ започващ с $syymm вече съществува и не е съвместим с този модел на последователност. Извадете го или го преименувайте за да се активира този модул.
-CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+CactusNumRefModelDesc1=Връща номер с формат %syymm-nnnn за стандартни фактури, %syymm-nnnn за кредитни известия и %syymm-nnnn за фактури за авансово плащане, където yy е година, mm е месец и nnnn е последователност без прекъсване и без връщане към 0
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Представител свързан с продажна фактура
 TypeContact_facture_external_BILLING=Контакт по продажна фактура
 TypeContact_facture_external_SHIPPING=Контакт за доставка на клиента
 TypeContact_facture_external_SERVICE=Контакт за обслужване на клиента
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
-TypeContact_invoice_supplier_external_BILLING=Контакт на доставчика по фактури
-TypeContact_invoice_supplier_external_SHIPPING=Контакт на доставчика по доставки
-TypeContact_invoice_supplier_external_SERVICE=Контакт на доставчика по услуги
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Представител по фактура за покупка
+TypeContact_invoice_supplier_external_BILLING=Контакт на доставчик по фактура
+TypeContact_invoice_supplier_external_SHIPPING=Контакт на доставчик по доставка
+TypeContact_invoice_supplier_external_SERVICE=Контакт на доставчик по услуга
 # Situation invoices
 InvoiceFirstSituationAsk=Първа ситуационна фактура
 InvoiceFirstSituationDesc=<b>ситуационни фактури</b> са вързани към ситуации отнасящи се до процес, например конструиране. Всяка ситуация е свързана с една фактура.
@@ -517,37 +519,37 @@ SituationAmount=Сума за ситуационна фактура (нето)
 SituationDeduction=Ситуационно изваждане
 ModifyAllLines=Промени всички линии
 CreateNextSituationInvoice=Създай следваща ситуация
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
+ErrorFindNextSituationInvoice=Грешка, неуспех при намирането на следващия цикъл на реф. ситуация
+ErrorOutingSituationInvoiceOnUpdate=Фактурата за тази ситуация не може да бъде публикувана.
+ErrorOutingSituationInvoiceCreditNote=Невъзможно е да се изпрати свързано кредитно известие.
+NotLastInCycle=Тази фактура не е последната от цикъла и не трябва да се променя.
 DisabledBecauseNotLastInCycle=Следваща ситуация вече съществува.
 DisabledBecauseFinal=Тази ситуация е финална.
-situationInvoiceShortcode_AS=AS
-situationInvoiceShortcode_S=Н
+situationInvoiceShortcode_AS=КАТО
+situationInvoiceShortcode_S=С
 CantBeLessThanMinPercent=Прогресът не може да бъде по-малък от стойността в предишната ситуация.
 NoSituations=Няма отворени ситуации
 InvoiceSituationLast=Последна и обща фактура
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
+PDFCrevetteSituationNumber=Ситуация №%s
+PDFCrevetteSituationInvoiceLineDecompte=Ситуационна фактура - Преброяване
 PDFCrevetteSituationInvoiceTitle=Ситуационна фактура
-PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
+PDFCrevetteSituationInvoiceLine=Ситуация №%s: Инв. N ° %s на %s
+TotalSituationInvoice=Обща ситуация
+invoiceLineProgressError=Напредъкът на фактура не може да бъде по-голям или равен на следващия ред на фактурата
+updatePriceNextInvoiceErrorUpdateline=Грешка: актуализирайте цената на фактура: %s
+ToCreateARecurringInvoice=За да създадете повтаряща се фактура за този договор, първо създайте тази фактура, след това я конвертирайте в шаблон за фактура и определете честотата за генериране на бъдещи фактури.
+ToCreateARecurringInvoiceGene=За да генерирате бъдещи фактури редовно и ръчно, отидете в меню <strong> %s - %s - %s </strong>.
+ToCreateARecurringInvoiceGeneAuto=Ако трябва да генерирате такива фактури автоматично, помолете администратора да активира и настрои модула <strong> %s </strong>. Имайте предвид, че двата метода (ръчен и автоматичен) могат да се използват заедно, без риск от дублиране.
 DeleteRepeatableInvoice=Изтриване на шаблонна фактура
-ConfirmDeleteRepeatableInvoice=Сигурни ли сте че искате да изтриете шаблонната фактура?
-CreateOneBillByThird=Създайте една фактура на контрагент (в противен случай по фактура за поръчка)
-BillCreated=%s bill(s) created
-StatusOfGeneratedDocuments=Състояние на генериране на документи
-DoNotGenerateDoc=Не генерирайте файла с документ
-AutogenerateDoc=Автоматично генериране на файл с документи
-AutoFillDateFrom=Задайте начална дата на услугата с датата на фактурата
+ConfirmDeleteRepeatableInvoice=Сигурни ли сте, че искате да изтриете тази шаблонна фактура?
+CreateOneBillByThird=Създайте по една фактура за контрагент (в противен случай по фактура за поръчка)
+BillCreated=Създадени са %s фактури
+StatusOfGeneratedDocuments=Статус на генерираните документи
+DoNotGenerateDoc=Не генерирайте файл за документа
+AutogenerateDoc=Автоматично генериране на файл за документа
+AutoFillDateFrom=Задайте начална дата на услугата от датата на фактурата
 AutoFillDateFromShort=Задаване на начална дата
-AutoFillDateTo=Задайте крайна дата на услугата с датата на следващата фактурата
+AutoFillDateTo=Задайте крайна дата на услугата от датата на следващата фактура
 AutoFillDateToShort=Задаване на крайна дата
-MaxNumberOfGenerationReached=Максимален брой генерирания е достигнат
+MaxNumberOfGenerationReached=Максималният брой генерирани документи е достигнат
 BILL_DELETEInDolibarr=Фактурата е изтрита
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index 3925fb5578e..5c5740cc6f7 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Групиране на ДДС по ставка в билет
 AutoPrintTickets=Автоматично отпечатване на билети
 EnableBarOrRestaurantFeatures=Включете функции за бар или ресторант
 ConfirmDeletionOfThisPOSSale=Потвърждавате ли изтриването на настоящата продажба?
+History=История
+ValidateAndClose=Валидиране и затваряне
+Terminal=Терминал
+NumberOfTerminals=Брой терминали
+TerminalSelect=Изберете терминал, който искате да използвате:
+POSTicket=POS тикет
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index 9a146558ea0..21a09d93634 100644
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -10,14 +10,14 @@ modify=промяна
 Classify=Добавяне
 CategoriesArea=Зона етикети/категории
 ProductsCategoriesArea=Зона етикети/категории Продукти
-SuppliersCategoriesArea=Зона етикети/категории на доставчици
+SuppliersCategoriesArea=Секция с етикети / категории на доставчици
 CustomersCategoriesArea=Зона етикети/категории Клиенти
 MembersCategoriesArea=Зона етикети/категории Членове
 ContactsCategoriesArea=Зона етикети/категории Контакти
-AccountsCategoriesArea=Зона етикети/категории на Сметки
-ProjectsCategoriesArea=Зона етикети/категории на Проекти
-UsersCategoriesArea=Зона на етикети/категории на Потребители
-SubCats=Под-категории
+AccountsCategoriesArea=Секция с етикети / категории на сметки
+ProjectsCategoriesArea=Секция с етикети / категории на проекти
+UsersCategoriesArea=Секция с етикети / категории на потребители
+SubCats=Подкатегории
 CatList=Списък на етикети/категории
 NewCategory=Нов етикет/категория
 ModifCat=Редактиране етикет/категория
@@ -27,26 +27,26 @@ CreateThisCat=Създаване на този етикет/категория
 NoSubCat=Няма подкатегория.
 SubCatOf=Подкатегория
 FoundCats=Намерени етикети/категории
-ImpossibleAddCat=Невъзможно е да се добави етикет/категория %s
+ImpossibleAddCat=Не е възможно да добавите етикет / категория %s
 WasAddedSuccessfully=<b>%s</b> е добавен успешно.
 ObjectAlreadyLinkedToCategory=Елементът вече е към този етикет/категория.
 ProductIsInCategories=Продукта/услугата е в следните етикети/категории
 CompanyIsInCustomersCategories=Контагентът е свързан към следните клиенти/потециални/категории
-CompanyIsInSuppliersCategories=Този контрагент е свързан към следните етикети/категории на доставчици
+CompanyIsInSuppliersCategories=Този контрагент е свързан към следните етикети / категории на доставчици
 MemberIsInCategories=Този член е в следните етикети/категории Членове
 ContactIsInCategories=Този конктакт не в етикети/категории Контакти
 ProductHasNoCategory=Този продукт/услуга не е в нито един етикет/категория
-CompanyHasNoCategory=Този контрагент не е в нито един етикет/категория
+CompanyHasNoCategory=Този контрагент не е в нито един етикет / категория
 MemberHasNoCategory=Този член не е в нито един етикет/категория
 ContactHasNoCategory=Този контакт не е в никои етикети/категории
-ProjectHasNoCategory=Този проект не е в нито един етикет/категория
+ProjectHasNoCategory=Този проект не е в нито един етикет / категория
 ClassifyInCategory=Добавяне в етикет/категория
 NotCategorized=Без етикет/категория
 CategoryExistsAtSameLevel=Тази категория вече съществува с този код
 ContentsVisibleByAllShort=Съдържанието е видимо от всички
 ContentsNotVisibleByAllShort=Съдържанието не е видимо от всички
 DeleteCategory=Изтриване на етикет/категория
-ConfirmDeleteCategory=Сигурни ли сте, че искате да изтриете този етикет/категория?
+ConfirmDeleteCategory=Сигурни ли сте, че искате да изтриете този етикет / категория?
 NoCategoriesDefined=Няма създадени етикети/категории
 SuppliersCategoryShort=Етикет/категория Доставчици
 CustomersCategoryShort=Етикет/категория Клиенти
@@ -63,14 +63,14 @@ AccountsCategoriesShort=Етикети/категории Сметки
 ProjectsCategoriesShort=Етикети/категории Проекти
 UsersCategoriesShort=Етикети/категории Потребители
 ThisCategoryHasNoProduct=Тази категория не съдържа никакъв продукт.
-ThisCategoryHasNoSupplier=Тази категория не съдържа никакъв доставчик.
+ThisCategoryHasNoSupplier=Тази категория не съдържа никакви доставчици.
 ThisCategoryHasNoCustomer=Тази категория не съдържа никакъв клиент.
 ThisCategoryHasNoMember=Тази категория не съдържа никакъв член.
 ThisCategoryHasNoContact=Тази категория не съдържа никакъв контакт
-ThisCategoryHasNoAccount=Тази категория не съдържа никаква сметка.
-ThisCategoryHasNoProject=Тази категория не съдържа никакъв проект.
+ThisCategoryHasNoAccount=Тази категория не съдържа никакви сметки.
+ThisCategoryHasNoProject=Тази категория не съдържа никакви проекти.
 CategId=Етикет/категория id
-CatSupList=Списък на етикети/категории Доставчици
+CatSupList=Списък на етикети / категории Доставчици
 CatCusList=Списък на етикети/категории Клиенти/Потенциални Клиенти
 CatProdList=Списък на етикети/категории Продукти
 CatMemberList=Списък на етикети/категории Членове
@@ -78,12 +78,12 @@ CatContactList=Списък на етикети/категории Контак
 CatSupLinks=Връзки между доставчици и етикети/категории
 CatCusLinks=Връзки между клиенти/потенциални клиенти и етикети/категории
 CatProdLinks=Връзки между продукти/услуги и етикети/категории
-CatProJectLinks=Връзки между проекти и етикети/категории
+CatProJectLinks=Връзки между проекти и етикети / категории
 DeleteFromCat=Изтриване от етикети/категории
 ExtraFieldsCategories=Допълнителни атрибути
 CategoriesSetup=Етикети/категории настройка
 CategorieRecursiv=Автоматично свързване с родителския етикет/категория
-CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
+CategorieRecursivHelp=Ако опцията е включена, когато добавите продукт в подкатегория, продуктът също ще бъде добавен и в главната категория.
 AddProductServiceIntoCategory=Добавяне на следния продукт/услуга
 ShowCategory=Показване на етикет/категория
 ByDefaultInList=По подразбиране в списък
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 11e520c9c89..df6f5990b91 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -28,7 +28,7 @@ AliasNames=Друго име (търговско, марка, ...)
 AliasNameShort=Псевдоним
 Companies=Фирми
 CountryIsInEEC=Държавата е в рамките на Европейската икономическа общност
-PriceFormatInCurrentLanguage=Форматиране на цената в текущия език
+PriceFormatInCurrentLanguage=Формат за показване на цената в текущия език и валута
 ThirdPartyName=Име на контрагент
 ThirdPartyEmail=Имейл на контрагент
 ThirdParty=Контрагент
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index 205967946e0..bae5b09070f 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Добавяне на социален/фискален д
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Секция за фактуриране и плащания
 NewPayment=Ново плащане
-Payments=Плащания
 PaymentCustomerInvoice=Плащане на продажна фактура
 PaymentSupplierInvoice=плащане на фактура от доставчик
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Продажби вестник
 PurchasesJournal=Покупките вестник
 DescSellsJournal=Продажби вестник
 DescPurchasesJournal=Покупките вестник
-InvoiceRef=Фактура с реф.
 CodeNotDef=Не е определена
 WarningDepositsNotIncluded=Фактурите за авансови плащания не са включени в тази версия с този модул за счетоводство.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/bg_BG/contracts.lang b/htdocs/langs/bg_BG/contracts.lang
index 03b50d6b1a5..346d8e3aad3 100644
--- a/htdocs/langs/bg_BG/contracts.lang
+++ b/htdocs/langs/bg_BG/contracts.lang
@@ -64,7 +64,8 @@ DateStartRealShort=Недвижими началната дата
 DateEndReal=Недвижими крайната дата
 DateEndRealShort=Недвижими крайната дата
 CloseService=Затворете услуга
-BoardRunningServices=Изтекъл стартирани услуги
+BoardRunningServices=Услуги в ход
+BoardExpiredServices=Услуги с изтекъл срок
 ServiceStatus=Състояние на услугата
 DraftContracts=Чернови договори
 CloseRefusedBecauseOneServiceActive=Договорът не може да бъде затворен, тъй като има най-малко една отворена услуга в него
diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
index e9c9679325f..fa4967686d1 100644
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -6,35 +6,35 @@ Permission23102 = Създаване/обновяване на Планиран
 Permission23103 = Изтриване на Планирана задача
 Permission23104 = Изпълнение на Планирана задача
 # Admin
-CronSetup= Настройки за управление на Планирани задачи
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+CronSetup=Настройки за управление на Планирани задачи
+URLToLaunchCronJobs=URL адрес за проверка и стартиране на определени cron задачи
 OrToLaunchASpecificJob=Или за проверка и зареждане на специфична задача
 KeyForCronAccess=Защитен ключ на URL за зареждане на cron задачи
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+FileToLaunchCronJobs=Команден ред за проверка и стартиране на определени cron задачи
 CronExplainHowToRunUnix=В Unix среда би трябвало да използвате следния crontab ред за изпълнение на командния ред на всеки 5 минути
-CronExplainHowToRunWin=В Microsoft(tm)-ска среда може да използвате инструментите за планирани задачи, за да се изпълни командния ред на всеки 5 минути
-CronMethodDoesNotExists=Class %s does not contains any method %s
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronExplainHowToRunWin=В среда на Microsoft (tm) Windows можете да използвате инструментите за планирани задачи, за да стартирате командния ред на всеки 5 минути
+CronMethodDoesNotExists=Класът %s не съдържа метод %s
+CronJobDefDesc=Профилите на Cron задачите се дефинират в дескрипторния файл на модула. Когато модулът е активиран, те са заредени и достъпни, така че можете да администрирате задачите от менюто за администриране %s.
+CronJobProfiles=Списък на предварително определени профили на cron задачи
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Активирана и деактивирана
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastOutput=Последен изходен резултат
+CronLastResult=Последен код на резултатите
 CronCommand=Команда
 CronList=Планирани задачи
 CronDelete=Изтриване на планирани задачи
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
-CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronConfirmDelete=Сигурни ли сте, че искате да изтриете тези планирани задачи?
+CronExecute=Стартиране на планирана задача
+CronConfirmExecute=Сигурни ли сте, че искате да изпълните тези планирани задачи сега?
+CronInfo=Модулът за планирани задачи позволява да планирате задача и да я изпълните автоматично. Задачата може да се стартира и ръчно.
 CronTask=Задача
 CronNone=Няма
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=Не преди
+CronDtEnd=Не след
 CronDtNextLaunch=Следващо изпълнение
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
+CronDtLastLaunch=Начална дата на последното изпълнение
+CronDtLastResult=Крайна дата на последното изпълнение
 CronFrequency=Честота
 CronClass=Клас
 CronMethod=Метод
@@ -42,8 +42,8 @@ CronModule=Модул
 CronNoJobs=Няма регистрирани задачи
 CronPriority=Приоритет
 CronLabel=Етикет
-CronNbRun=Nb. зареждане
-CronMaxRun=Max number launch
+CronNbRun=Брой стартирания
+CronMaxRun=Максимален брой стартирания
 CronEach=Всеки
 JobFinished=Задачи заредени и приключили
 #Page card
@@ -51,33 +51,33 @@ CronAdd= Добавяне на задачи
 CronEvery=Изпълни задачата всеки
 CronObject=Въплъщение/Обект за създаване
 CronArgs=Параметри
-CronSaveSucess=Save successfully
+CronSaveSucess=Съхраняването е успешно
 CronNote=Коментар
 CronFieldMandatory=Полета %s са задължителни
 CronErrEndDateStartDt=Крайната дата не може да бъде преди началната дата
-StatusAtInstall=Status at module installation
+StatusAtInstall=Състояние при инсталиране на модула
 CronStatusActiveBtn=Активирайте
 CronStatusInactiveBtn=Деактивирай
 CronTaskInactive=Тази задача е неактивирана
 CronId=Id
-CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple 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 exemple 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>
+CronClassFile=Име на файл с клас
+CronModuleHelp=Име на Dolibarr директорията с модули (работи и с външен Dolibarr модул).<BR>Например, за да извикате метода на извличане от Dolibarr продуктов обект /htdocs/<u>product</u>/class/product.class.php, стойността за модула е<br><i>product</i>
+CronClassFileHelp=Относителният път и името на файла за зареждане (пътят е относителен към основната директория на уеб сървъра).<BR>Например, за да извикате метода на извличане на Dolibarr продуктов обект htdocs/product/class/<u>product.class.php</u>, стойността за файлово име на класът е<br><i>product/class/product.class.php</i>
+CronObjectHelp=Името на обекта за зареждане.<BR>Например, за да извикате метода на извличане от Dolibarr продуктов обект /htdocs/product/class/product.class.php, стойността на файловото име на класът е<br><i>Product</i>
+CronMethodHelp=Методът на обекта за стартиране.<BR>Например, за да извикате метода на извличане от Dolibarr продуктов обект /htdocs/product/class/product.class.php, стойността за метода е<br><i>fetch</i>
+CronArgsHelp=Аргументите на метода.<BR>Например, за да извикате метода на извличане от Dolibarr продуктов обект /htdocs/product/class/product.class.php, стойността за параметрите може да бъде<br><i>0, ProductRef</i>
 CronCommandHelp=Системният команден ред за стартиране.
 CronCreateJob=Създаване на нова Планирана задача
 CronFrom=От
 # Info
 # Common
 CronType=Тип задача
-CronType_method=Call method of a PHP Class
+CronType_method=Метод за извикване на PHP клас
 CronType_command=Терминална команда
-CronCannotLoadClass=Cannot load class file %s (to use class %s)
-CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
-JobDisabled=Неактивирани задачи
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+CronCannotLoadClass=Не може да бъде зареден клас файл %s (за да се използва клас %s)
+CronCannotLoadObject=Клас файл %s е зареден, но обект %s не е открит в него
+UseMenuModuleToolsToAddCronJobs=Отидете в меню 'Начало - Администрация - Планирани задачи', за да видите и редактирате планираните задачи.
+JobDisabled=Задачата е деактивирана
+MakeLocalDatabaseDumpShort=Архивиране на локална база данни
+MakeLocalDatabaseDump=Създаване на локална база данни. Параметрите са: компресия ('gz' or 'bz' or 'none'), вид архивиране ('mysql', 'pgsql', 'auto'), 1, 'auto' или име на файла за съхранение, брой резервни файлове, които да се запазят
+WarningCronDelayed=Внимание, за целите на изпълнението, каквато и да е следващата дата на изпълнение на активирани задачи, вашите задачи могат да бъдат забавени до максимум %s часа, преди да бъдат стартирани.
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 7e6e681f162..5818039f365 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -216,7 +216,8 @@ ErrorDuringChartLoad=Грешка при зареждане на диаграм
 ErrorBadSyntaxForParamKeyForContent=Неправилен синтаксис за параметър keyforcontent. Трябва да има стойност, започваща с %s или %s
 ErrorVariableKeyForContentMustBeSet=Грешка, трябва да бъде зададена константа с име %s (с текстово съдържание за показване) или %s (с външен url за показване).
 ErrorURLMustStartWithHttp=URL адресът %s трябва да започва с http:// или https://
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorNewRefIsAlreadyUsed=Грешка, новата референция вече е използвана
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Грешка, изтриването на плащане, свързано с приключена фактура, е невъзможно.
 # Warnings
 WarningPasswordSetWithNoAccount=За този член бе зададена парола. Въпреки това, не е създаден потребителски акаунт. Така че тази парола е съхранена, но не може да се използва за влизане в Dolibarr. Може да се използва от външен модул/интерфейс, но ако не е необходимо да дефинирате потребителско име или парола за член може да деактивирате опцията "Управление на вход за всеки член" от настройката на модула Членове. Ако трябва да управлявате вход, но не се нуждаете от парола, можете да запазите това поле празно, за да избегнете това предупреждение. Забележка: Имейлът може да се използва и като вход, ако членът е свързан с потребител.
 WarningMandatorySetupNotComplete=Кликнете тук, за да настроите задължителните параметри
diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang
index 0027a794d20..e0194788563 100644
--- a/htdocs/langs/bg_BG/holiday.lang
+++ b/htdocs/langs/bg_BG/holiday.lang
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Модели за номериране на молби
 TemplatePDFHolidays=Шаблон за молби за отпуск PDF
 FreeLegalTextOnHolidays=Свободен текст в PDF файла
 WatermarkOnDraftHolidayCards=Воден знак върху черновата на молба за отпуск
+HolidaysToApprove=Отпуски за одобрение
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 18da5c3783b..3e0699cfba3 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Тема на имейла
 MailText=Съобщение
 MailFile=Прикачени файлове
 MailMessage=Тяло на имейла
+SubjectNotIn=Не е в Тема
+BodyNotIn=Не е в съобщение
 ShowEMailing=Показване на масови имейли
 ListOfEMailings=Списък на масови имейли
 NewMailing=Нов масов имейл
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 1070ec1c58d..bb9c15de13a 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
-DIRECTION=ltr
+DIRECTION=л
 # Note for Chinese:
 # msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
 # stsongstdlight or cid0cs are for simplified Chinese
@@ -8,14 +8,14 @@ FONTFORPDF=DejaVuSans
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
-FormatDateShort=%m/%d/%Y
-FormatDateShortInput=%m/%d/%Y
+FormatDateShort=%d.%m.%Y
+FormatDateShortInput=%d.%m.%Y
 FormatDateShortJava=dd.MM.yyyy
 FormatDateShortJavaInput=dd.MM.yyyy
 FormatDateShortJQuery=dd.mm.yy
 FormatDateShortJQueryInput=dd.mm.yy
 FormatHourShortJQuery=HH:MI
-FormatHourShort=%H:%M
+FormatHourShort=%H:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
@@ -28,29 +28,29 @@ NoTemplateDefined=Няма наличен шаблон за този тип им
 AvailableVariables=Налични променливи за заместване
 NoTranslation=Няма превод
 Translation=Превод
-NoRecordFound=Няма открити записи
+NoRecordFound=Няма намерен запис
 NoRecordDeleted=Няма изтрит запис
 NotEnoughDataYet=Няма достатъчно данни
 NoError=Няма грешка
 Error=Грешка
 Errors=Грешки
 ErrorFieldRequired=Полето '%s' е задължително
-ErrorFieldFormat=Полето '%s' е с грешна стойност
-ErrorFileDoesNotExists=Файлът %s не съществува
-ErrorFailedToOpenFile=Файлът %s не може да се отвори
+ErrorFieldFormat=Поле '%s' има грешна стойност
+ErrorFileDoesNotExists=Файл %s не съществува
+ErrorFailedToOpenFile=Неуспешно отваряне на файл %s
 ErrorCanNotCreateDir=Не може да се създаде директория %s
-ErrorCanNotReadDir=Не може да се чете директория %s
+ErrorCanNotReadDir=Не може да се прочете директория %s
 ErrorConstantNotDefined=Параметър %s не е дефиниран
 ErrorUnknown=Неизвестна грешка
 ErrorSQL=Грешка в SQL
-ErrorLogoFileNotFound=Файлът с лого '%s' не е открит
-ErrorGoToGlobalSetup=Отворете настройката „Фирма / Организация“, за да коригирате това
-ErrorGoToModuleSetup=Отидете в настройки на Модули, за да коригирате това
+ErrorLogoFileNotFound=Не е открит файл с лого '%s'
+ErrorGoToGlobalSetup=Отворете настройка на „Фирма/Организация“, за да коригирате това
+ErrorGoToModuleSetup=Отидете в настройка на модула, за да коригирате това
 ErrorFailedToSendMail=Неуспешно изпращане на имейл (подател = %s, получател = %s)
 ErrorFileNotUploaded=Файлът не беше качен. Уверете се, че размерът му не надвишава максимално допустимия, че е на разположение свободно пространство на диска и че няма файл със същото име в тази директория.
 ErrorInternalErrorDetected=Открита е грешка
 ErrorWrongHostParameter=Неправилен параметър на сървъра
-ErrorYourCountryIsNotDefined=Вашата страна не е дефинирана. Отидете в Начало-Настройка-Редактирайте и попълнете формата отново.
+ErrorYourCountryIsNotDefined=Вашата държава не е дефинирана. Отидете в Начало - Настройка - Фирма/Организация и попълнете формата отново.
 ErrorRecordIsUsedByChild=Изтриването на този запис не бе успешно. Този запис се използва от поне от един под запис.
 ErrorWrongValue=Грешна стойност
 ErrorWrongValueForParameterX=Грешна стойност за параметър %s
@@ -58,13 +58,13 @@ ErrorNoRequestInError=Няма грешна заявка
 ErrorServiceUnavailableTryLater=Услугата не е налична в момента. Опитайте отново по-късно.
 ErrorDuplicateField=Дублиране в поле с уникални стойности
 ErrorSomeErrorWereFoundRollbackIsDone=Намерени са някои грешки. Промените бяха отменени.
-ErrorConfigParameterNotDefined=Параметърът <b> %s </b> не е дефиниран в конфигурационния файл Dolibarr <b> conf.php </b>.
+ErrorConfigParameterNotDefined=Параметър <b> %s </b> не е дефиниран в конфигурационния файл на Dolibarr <b> conf.php </b>.
 ErrorCantLoadUserFromDolibarrDatabase=Не е открит потребител <b>%s</b> в базата данни.
-ErrorNoVATRateDefinedForSellerCountry=Грешка, за държавата '%s' няма дефинирани ДДС ставки.
-ErrorNoSocialContributionForSellerCountry=Грешка, за държава '%s' няма дефинирани ставки за социални осигуровки.
+ErrorNoVATRateDefinedForSellerCountry=Грешка, не са дефинирани ДДС ставки за държавата „%s“.
+ErrorNoSocialContributionForSellerCountry=Грешка, не е дефиниран тип за социални / фискални данъци за държавата "%s".
 ErrorFailedToSaveFile=Грешка, неуспешно записване на файл.
-ErrorCannotAddThisParentWarehouse=Вие се опитвате да добавите основен склад, който вече е под склад на съществуващ основен склад
-MaxNbOfRecordPerPage=Макс. брой записи на страница
+ErrorCannotAddThisParentWarehouse=Опитвате се да добавите основен склад, който вече е под-склад на съществуващ склад
+MaxNbOfRecordPerPage=Максимален брой записи на страница
 NotAuthorized=Не сте упълномощен да правите това.
 SetDate=Настройка на дата
 SelectDate=Изберете дата
@@ -74,32 +74,32 @@ ClickHere=Кликнете тук
 Here=Тук
 Apply=Приложи
 BackgroundColorByDefault=Стандартен цвят на фона
-FileRenamed=Файлът бе преименуван успешно
-FileGenerated=Файлът бе генериран успешно 
-FileSaved=Файлът бе запазен успешно
-FileUploaded=Файлът е качен успешно
-FileTransferComplete=Файл (файлове) са качени успешно
-FilesDeleted=Файл (файлове) са изтрити успешно
-FileWasNotUploaded=Файлът е избран за прикачване, но все още не е качен. Кликнете върху &quot;Прикачи файл&quot;.
-NbOfEntries=Брой записи
+FileRenamed=Файлът е успешно преименуван
+FileGenerated=Файлът е успешно генериран
+FileSaved=Файлът е успешно запазен
+FileUploaded=Файлът е успешно качен
+FileTransferComplete=Файлът(овете) е(са) успешно качен(и)
+FilesDeleted=Файлът(овете) е(са) успешно изтрит(и)
+FileWasNotUploaded=Избран е файл за прикачване, но все още не е качен. Кликнете върху "Прикачване на файл" за това.
+NbOfEntries=Брой вписвания
 GoToWikiHelpPage=Прочетете онлайн помощта (необходим е достъп до интернет)
 GoToHelpPage=Прочетете помощта
 RecordSaved=Записът е съхранен
 RecordDeleted=Записът е изтрит
-RecordGenerated=Генериран е запис
+RecordGenerated=Записът е генериран
 LevelOfFeature=Ниво на функции
-NotDefined=Не е определено
-DolibarrInHttpAuthenticationSoPasswordUseless=Режимът за удостоверяване в Dolibarr е зададен на <b> %s </b> в конфигурационен файл <b> conf.php </b>. <br> Това означава, че базата данни с пароли е външна за Dolibarr, така че промяната в това поле може да няма ефект ,
+NotDefined=Не е дефинирано
+DolibarrInHttpAuthenticationSoPasswordUseless=Режимът за удостоверяване в Dolibarr е зададен на <b> %s </b> в конфигурационен файл <b> conf.php </b>. <br> Това означава, че базата данни с пароли е външна за Dolibarr, така че промяната в това поле може да няма ефект.
 Administrator=Администратор
 Undefined=Неопределен
 PasswordForgotten=Забравена парола?
 NoAccount=Нямате профил?
-SeeAbove=Виж по-горе
+SeeAbove=Вижте по-горе
 HomeArea=Начало
 LastConnexion=Последно влизане
 PreviousConnexion=Предишно влизане
 PreviousValue=Предишна стойност
-ConnectedOnMultiCompany=Свързан към обекта
+ConnectedOnMultiCompany=Свързан към обект
 ConnectedSince=Свързан от
 AuthenticationMode=Режим на удостоверяване
 RequestedUrl=Заявен URL адрес
@@ -110,12 +110,12 @@ InformationLastAccessInError=Информация за грешка при по
 DolibarrHasDetectedError=Dolibarr засече техническа грешка
 YouCanSetOptionDolibarrMainProdToZero=Можете да прочетете .log файл или да зададете опция $ dolibarr_main_prod на '0' в конфигурационния си файл, за да получите повече информация.
 InformationToHelpDiagnose=Тази информация може да бъде полезна за диагностични цели (можете да зададете опция $ dolibarr_main_prod на '1', за да премахнете такива известия)
-MoreInformation=Още информация
+MoreInformation=Повече информация
 TechnicalInformation=Техническа информация
 TechnicalID=Техническо ID
 NotePublic=Бележка (публична)
 NotePrivate=Бележка (частна)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr е настроен да ограничи точността единичните цени до <b>%s</b> знака след десетичната запетая.
+PrecisionUnitIsLimitedToXDecimals=Dolibarr е настроен да ограничи прецизността на единичните цени до <b> %s </b> десетични числа.
 DoTest=Тест
 ToFilter=Филтър
 NoFilter=Без филтър
@@ -134,36 +134,36 @@ Always=Винаги
 Never=Никога
 Under=под
 Period=Период
-PeriodEndDate=Крайна дата на периода
+PeriodEndDate=Крайна дата за период
 SelectedPeriod=Избран период
 PreviousPeriod=Предишен период
-Activate=Активирай
+Activate=Активиране
 Activated=Активирано
 Closed=Затворен
 Closed2=Затворен
 NotClosed=Не е затворен
 Enabled=Включено
-Enable=Активирайте
-Deprecated=Остаряло
+Enable=Включване
+Deprecated=Отхвърлено
 Disable=Изключи
 Disabled=Изключено
-Add=Добави
-AddLink=Добави връзка
-RemoveLink=Премахни връзка
+Add=Добавяне
+AddLink=Добавяне на връзка
+RemoveLink=Премахване на връзка
 AddToDraft=Добавяне към чернова
-Update=Актуализирай
-Close=Затвари
-CloseBox=Премахване на джаджа от таблото си за управление
-Confirm=Потвърди
-ConfirmSendCardByMail=Наистина ли искате да изпратите съдържанието на тази карта по имайл на адрес <b> %s </b>?
+Update=Актуализиране
+Close=Затваряне
+CloseBox=Премахнете джаджата от таблото си за управление
+Confirm=Потвърждаване
+ConfirmSendCardByMail=Наистина ли искате да изпратите съдържанието на тази карта по имейл до <b> %s </b>?
 Delete=Изтриване
 Remove=Премахване
 Resiliate=Прекратяване
 Cancel=Отказ
-Modify=Промени
+Modify=Редактиране
 Edit=Редактиране
-Validate=Валидирай
-ValidateAndApprove=Валидирай и одобри
+Validate=Валидиране
+ValidateAndApprove=Валидиране и одобряване
 ToValidate=За валидиране
 NotValidated=Не е валидиран
 Save=Запис
@@ -172,7 +172,7 @@ TestConnection=Проверка на връзката
 ToClone=Клониране
 ConfirmClone=Изберете данни, които искате да клонирате:
 NoCloneOptionsSpecified=Няма определени данни за клониране.
-Of=от
+Of=на
 Go=Давай
 Run=Изпълни
 CopyOf=Копие на
@@ -223,25 +223,25 @@ Info=История
 Family=Семейство
 Description=Описание
 Designation=Описание
-DescriptionOfLine=Описание на линия
-DateOfLine=Дата на ред
-DurationOfLine=Продължителност на линията
+DescriptionOfLine=Описание на реда
+DateOfLine=Дата на реда
+DurationOfLine=Продължителност на реда
 Model=Шаблон на документа
 DefaultModel=Шаблон на документ по подразбиране
 Action=Събитие
-About=За системата
+About=Относно
 Number=Брой
-NumberByMonth=Бройка по месец
-AmountByMonth=Сума по месец
+NumberByMonth=Брой на месец
+AmountByMonth=Сума на месец
 Numero=Брой
 Limit=Лимит
 Limits=Лимити
 Logout=Изход
 NoLogoutProcessWithAuthMode=Не се прилага функция за изключване на връзката с режима за удостоверяване <b>%s</b>
-Connection=Влизане
+Connection=Вход
 Setup=Настройки
 Alert=Предупреждение
-MenuWarnings=Сигнали
+MenuWarnings=Предупреждения
 Previous=Предишен
 Next=Следващ
 Cards=Карти
@@ -250,36 +250,36 @@ Now=Сега
 HourStart=Начален час
 Date=Дата
 DateAndHour=Дата и час
-DateToday=Днешната дата
+DateToday=Днешна дата
 DateReference=Референтна дата
 DateStart=Начална дата
 DateEnd=Крайна дата
 DateCreation=Дата на създаване
-DateCreationShort=Дата създ.
+DateCreationShort=Създаване
 DateModification=Дата на промяна
-DateModificationShort=Дата промяна
+DateModificationShort=Промяна
 DateLastModification=Последна дата на промяна
 DateValidation=Дата на валидиране
 DateClosing=Дата на приключване
 DateDue=Дата на падеж
-DateValue=Дата на стойност
-DateValueShort=Дата стойност
-DateOperation=Дата на операцията
-DateOperationShort=Дата опер.
-DateLimit=Крайната дата
+DateValue=Дата на вальор
+DateValueShort=Вальор
+DateOperation=Дата на изпълнение
+DateOperationShort=Изпълнение
+DateLimit=Крайна дата
 DateRequest=Дата на заявка
 DateProcess=Дата на изпълнение
-DateBuild=Дата на създаване на справката
+DateBuild=Дата на съставяне на отчета
 DatePayment=Дата на плащане
 DateApprove=Дата на одобрение
-DateApprove2=Дата на одобрение (повторно одобрение)
-RegistrationDate=Дата на Регистрация
-UserCreation=Създаване потребител
-UserModification=Промяна потребител
-UserValidation=Валидиране потребител
-UserCreationShort=Създайте. потребител
-UserModificationShort=Промяна. потребител
-UserValidationShort=Валиден. потребител
+DateApprove2=Дата на одобрение (второ одобрение)
+RegistrationDate=Дата на регистрация
+UserCreation=Създаващ потребител
+UserModification=Променящ потребител
+UserValidation=Валидиращ потребител
+UserCreationShort=Създаващ
+UserModificationShort=Променящ
+UserValidationShort=Валидиращ
 DurationYear=година
 DurationMonth=месец
 DurationWeek=седмица
@@ -314,7 +314,7 @@ MonthOfDay=Месец на деня
 HourShort=ч
 MinuteShort=мин
 Rate=Курс
-CurrencyRate=Валутен обменен курс
+CurrencyRate=Обменен валутен курс
 UseLocalTax=Включи данъци
 Bytes=Байта
 KiloBytes=Килобайта
@@ -340,22 +340,22 @@ UnitPrice=Единична цена
 UnitPriceHT=Единична цена (без ДДС)
 UnitPriceHTCurrency=Единична цена (без ДДС) (валута)
 UnitPriceTTC=Единична цена
-PriceU=Ед.ц.
-PriceUHT=Ед. ц. (без ДДС)
-PriceUHTCurrency=Единична цена (валута)
-PriceUTTC=Ед.ц. (с ДДС)
+PriceU=Ед. цена
+PriceUHT=Ед. цена (без ДДС)
+PriceUHTCurrency=Ед. цена (валута)
+PriceUTTC=Ед. цена (с ДДС)
 Amount=Сума
 AmountInvoice=Фактурна стойност
-AmountInvoiced=Сумата е фактурирана
+AmountInvoiced=Фактурирана сума
 AmountPayment=Сума за плащане
 AmountHTShort=Сума (без ДДС)
 AmountTTCShort=Сума (с ДДС)
 AmountHT=Сума (без ДДС)
 AmountTTC=Сума (с ДДС)
 AmountVAT=Сума на ДДС
-MulticurrencyAlreadyPaid=Вече платена, оригинална валута
-MulticurrencyRemainderToPay=Остава да платите, оригиналната валута
-MulticurrencyPaymentAmount=Размер на плащането, оригинална валута
+MulticurrencyAlreadyPaid=Вече платено, оригинална валута
+MulticurrencyRemainderToPay=Оставащо за плащане, оригиналната валута
+MulticurrencyPaymentAmount=Сума на плащане, оригинална валута
 MulticurrencyAmountHT=Сума (без ДДС), оригинална валута
 MulticurrencyAmountTTC=Сума (с ДДС), оригинална валута
 MulticurrencyAmountVAT=Сума на ДДС, оригинална валута
@@ -365,20 +365,21 @@ AmountLT1ES=Сума на RE
 AmountLT2ES=Сума на IRPF
 AmountTotal=Обща сума
 AmountAverage=Средна сума
-PriceQtyMinHT=Цена на к-во мин. (без ДДС)
-PriceQtyMinHTCurrency=Цена на к-во мин. (без ДДС) (валута)
+PriceQtyMinHT=Цена за минимално количество (без ДДС)
+PriceQtyMinHTCurrency=Цена за минимално количество (без ДДС) (валута)
 Percentage=Процент
 Total=Общо
 SubTotal=Междинна сума
 TotalHTShort=Общо (без ДДС)
-TotalHTShortCurrency=Общо (без ДДС в валутата)
+TotalHT100Short=Общо 100%% (без ДДС)
+TotalHTShortCurrency=Общо (без ДДС във валута)
 TotalTTCShort=Общо (с ДДС)
-TotalHT=Общо (без ДДС)
+TotalHT=Данъчна основа (без ДДС)
 TotalHTforthispage=Общо (без ДДС) за тази страница
 Totalforthispage=Общо за тази страница
-TotalTTC=Общо (с ДДС)
-TotalTTCToYourCredit=Общо (с ДДС) с вашия кредит
-TotalVAT=Общо данък
+TotalTTC=Сума за плащане
+TotalTTCToYourCredit=Общо (с ДДС) към вашия кредит
+TotalVAT=Начислен ДДС
 TotalVATIN=Общо IGST
 TotalLT1=Общо данък 2
 TotalLT2=Общо данък 3
@@ -386,13 +387,13 @@ TotalLT1ES=Общо RE
 TotalLT2ES=Общо IRPF
 TotalLT1IN=Общо CGST
 TotalLT2IN=Общо SGST
-HT=Без ДДС
-TTC=С ДДС
-INCVATONLY=С ДДС
-INCT=С всички данъци
-VAT=Данък продажби
+HT=без ДДС
+TTC=с ДДС
+INCVATONLY=с ДДС
+INCT=с всички данъци
+VAT=ДДС
 VATIN=IGST
-VATs=Данъци продажби
+VATs=Данъци върху продажбите
 VATINs=IGST данъци
 LT1=Данък върху продажбите 2
 LT1Type=Данък върху продажбите 2 вид
@@ -402,45 +403,45 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Additionnal cents
+LT1GC=Допълнителни центове
 VATRate=Данъчна ставка
 VATCode=Код за данъчна ставка
 VATNPR=Данъчна ставка NPR
-DefaultTaxRate=Ставка на данъка по подразбиране
+DefaultTaxRate=Данъчна ставка по подразбиране
 Average=Средно
 Sum=Сума
 Delta=Делта
-RemainToPay=Остава да платите
+RemainToPay=Оставащо за плащане
 Module=Модул / Приложение
 Modules=Модули / Приложения
 Option=Опция
 List=Списък
 FullList=Пълен списък
-Statistics=Статистика
+Statistics=Статистики
 OtherStatistics=Други статистически данни
-Status=Състояние
-Favorite=Любими
-ShortInfo=Инфо
-Ref=Код
-ExternalRef=Код външен
-RefSupplier=Код. доставчик
-RefPayment=Код плащане
+Status=Статус
+Favorite=Фаворит
+ShortInfo=Инфо.
+Ref=Реф.
+ExternalRef=Реф. външна
+RefSupplier=Реф. доставчик
+RefPayment=Реф. плащане
 CommercialProposalsShort=Търговски предложения
 Comment=Коментар
 Comments=Коментари
 ActionsToDo=Предстоящи събития
 ActionsToDoShort=Да се направи
-ActionsDoneShort=Завършени
+ActionsDoneShort=Завършено
 ActionNotApplicable=Не се прилага
 ActionRunningNotStarted=За започване
 ActionRunningShort=В процес
 ActionDoneShort=Завършено
-ActionUncomplete=Незавършен
-LatestLinkedEvents=Последни %s свързани събития
-CompanyFoundation=Компания / Организация
+ActionUncomplete=Незавършено
+LatestLinkedEvents=Свързани събития: %s последни
+CompanyFoundation=Фирма / Организация
 Accountant=Счетоводител
 ContactsForCompany=Контакти за този контрагент
-ContactsAddressesForCompany=Контакти/адреси за този контрагент
+ContactsAddressesForCompany=Контакти / адреси за този контрагент
 AddressesForCompany=Адреси за този контрагент
 ActionsOnCompany=Събития за този контрагент
 ActionsOnContact=Събития за този контакт / адрес
@@ -448,27 +449,27 @@ ActionsOnMember=Събития за този член
 ActionsOnProduct=Събития за този продукт
 NActionsLate=%s закъснели
 ToDo=Да се направи
-Completed=Завършен
+Completed=Завършено
 Running=В процес
 RequestAlreadyDone=Заявката вече е записана
 Filter=Филтър
 FilterOnInto=Критерий за търсене '<strong>%s</strong>' в полета %s
-RemoveFilter=Премахване на филтъра
+RemoveFilter=Премахване на филтър
 ChartGenerated=Графиката е генерирана
 ChartNotGenerated=Графиката не е генерирана
 GeneratedOn=Създаден на %s
-Generate=Генерирай
+Generate=Генериране
 Duration=Продължителност
 TotalDuration=Обща продължителност
 Summary=Резюме
 DolibarrStateBoard=Статистика от базата данни
 DolibarrWorkBoard=Отворени елементи
-NoOpenedElementToProcess=Няма отворен елемент в процес
+NoOpenedElementToProcess=Няма отворен елемент за обработка
 Available=Налично
 NotYetAvailable=Все още не е налично
 NotAvailable=Не е налично
-Categories=Етикети/категории
-Category=Етикет/категория
+Categories=Етикети / Категории
+Category=Етикет / Категория
 By=От
 From=От
 to=за
@@ -478,27 +479,27 @@ Other=Друг
 Others=Други
 OtherInformations=Друга информация
 Quantity=Количество
-Qty=К-во
+Qty=Кол.
 ChangedBy=Променено от
 ApprovedBy=Одобрено от
-ApprovedBy2=Одобрено от (повторно одобрение)
+ApprovedBy2=Одобрено от (второ одобрение)
 Approved=Одобрено
 Refused=Отхвърлено
-ReCalculate=Преизчисли
+ReCalculate=Преизчисляване
 ResultKo=Неуспех
 Reporting=Справка
 Reportings=Справки
 Draft=Чернова
 Drafts=Чернови
 StatusInterInvoiced=Фактурирано
-Validated=Валидиран
+Validated=Валидирано
 Opened=Отворено
 OpenAll=Отворено (всички)
-ClosedAll=Затворени (всички)
+ClosedAll=Затворено (всички)
 New=Нов
 Discount=Отстъпка
 Unknown=Неизвестно
-General=Общи
+General=Общ
 Size=Размер
 OriginalSize=Оригинален размер
 Received=Получено
@@ -516,18 +517,18 @@ None=Няма
 NoneF=Няма
 NoneOrSeveral=Няма или няколко
 Late=Закъснели
-LateDesc=Елементът се дефинира като Закъснение съгласно системната конфигурация в меню Начало - Настройка - Сигнали.
-NoItemLate=Няма забавен продукт
+LateDesc=Елементът се дефинира като Закъснение съгласно системната конфигурация в меню Начало - Настройка - Предупреждения.
+NoItemLate=Няма забавен елемент
 Photo=Снимка
 Photos=Снимки
 AddPhoto=Добавяне на снимка
-DeletePicture=Изтрий снимка
-ConfirmDeletePicture=Потвърди изтриване на снимка?
+DeletePicture=Изтриване на снимка
+ConfirmDeletePicture=Потвърждавате ли изтриването на снимката?
 Login=Потребител
-LoginEmail=Вход (имейл)
-LoginOrEmail=Вход или имейл
+LoginEmail=Потребител (имейл)
+LoginOrEmail=Потребител или имейл
 CurrentLogin=Текущ потребител
-EnterLoginDetail=Въведете данните за вход
+EnterLoginDetail=Въведете данни за вход
 January=Януари
 February=Февруари
 March=Март
@@ -565,47 +566,47 @@ MonthShort10=Окт
 MonthShort11=Ное
 MonthShort12=Дек
 MonthVeryShort01=Я
-MonthVeryShort02=П
-MonthVeryShort03=П
+MonthVeryShort02=Ф
+MonthVeryShort03=М
 MonthVeryShort04=А
-MonthVeryShort05=П
+MonthVeryShort05=М
 MonthVeryShort06=Ю
 MonthVeryShort07=Ю
 MonthVeryShort08=А
-MonthVeryShort09=Н
+MonthVeryShort09=С
 MonthVeryShort10=О
 MonthVeryShort11=Н
 MonthVeryShort12=Д
 AttachedFiles=Прикачени файлове и документи
-JoinMainDoc=Присъединете се към основния документ
+JoinMainDoc=Присъединете към основния документ
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Име на справката
-ReportPeriod=Период на справката
+ReportName=Име на отчета
+ReportPeriod=Период на отчета
 ReportDescription=Описание
-Report=Справка
+Report=Отчет
 Keyword=Ключова дума
 Origin=Произход
 Legend=Легенда
-Fill=Попълни
-Reset=Нулирай
+Fill=Попълване
+Reset=Нулиране
 File=Файл
 Files=Файлове
 NotAllowed=Не е разрешено
-ReadPermissionNotAllowed=Няма права за четене
+ReadPermissionNotAllowed=Не са предоставени права за четене
 AmountInCurrency=Сума във валута %s
 Example=Пример
 Examples=Примери
 NoExample=Няма пример
 FindBug=Съобщи за грешка
-NbOfThirdParties=Брой на контрагентите
-NbOfLines=Брой на редовете
-NbOfObjects=Брой на обектите
-NbOfObjectReferers=Брой свързани продукти
-Referers=Подобни продукти
+NbOfThirdParties=Брой контрагенти
+NbOfLines=Брой редове
+NbOfObjects=Брой обекти
+NbOfObjectReferers=Брой свързани елементи
+Referers=Свързани елементи
 TotalQuantity=Общо количество
-DateFromTo=От %s до %s
+DateFromTo=от %s до %s
 DateFrom=От %s
 DateUntil=До %s
 Check=Маркирай
@@ -616,14 +617,14 @@ Internals=Вътрешни
 Externals=Външни
 Warning=Внимание
 Warnings=Предупреждения
-BuildDoc=Създай Doc
+BuildDoc=Създаване на документ
 Entity=Субект
 Entities=Субекти
 CustomerPreview=Преглед на клиент
-SupplierPreview=Преглед на доставчика
-ShowCustomerPreview=Покажи преглед на клиента
-ShowSupplierPreview=Показване на преглед на доставчика
-RefCustomer=Код клиент
+SupplierPreview=Преглед на доставчик
+ShowCustomerPreview=Показване на преглед на клиент
+ShowSupplierPreview=Показване на преглед на доставчик
+RefCustomer=Реф. клиент
 Currency=Валута
 InfoAdmin=Информация за администратори
 Undo=Отмяна
@@ -636,93 +637,91 @@ FeatureNotYetSupported=Функцията все още не се поддърж
 CloseWindow=Затвори прозореца
 Response=Отговор
 Priority=Приоритет
-SendByMail=Изпрати по имейл
+SendByMail=Изпращане по имейл
 MailSentBy=Изпратено по имейл от
 TextUsedInTheMessageBody=Текст на имейла
-SendAcknowledgementByMail=Изпратете потвърждение  по имейл
+SendAcknowledgementByMail=Изпращане на имейл потвърждение
 SendMail=Изпращане на имейл
 Email=Имейл
 NoEMail=Няма имейл
-Email=Имейл
 AlreadyRead=Вече е прочетено
 NotRead=Непрочетено
 NoMobilePhone=Няма мобилен телефон
 Owner=Собственик
 FollowingConstantsWillBeSubstituted=Следните константи ще бъдат заменени със съответната стойност.
-Refresh=Обнови
+Refresh=Обновяване
 BackToList=Назад към списъка
 GoBack=Назад
-CanBeModifiedIfOk=Може да се променя ако е валидно
-CanBeModifiedIfKo=Може да се променя ако е невалидно
+CanBeModifiedIfOk=Може да се променя, ако е валидно
+CanBeModifiedIfKo=Може да се променя, ако не е валидно
 ValueIsValid=Стойността е валидна
 ValueIsNotValid=Стойността не е валидна
-RecordCreatedSuccessfully=Записът е създаден успешно
-RecordModifiedSuccessfully=Записът е променен успешно
-RecordsModified=%s запис(и) променени
-RecordsDeleted=%s запис(и) изтрити
-RecordsGenerated=%sзапис(и) генерирани
+RecordCreatedSuccessfully=Записът е успешно създаден
+RecordModifiedSuccessfully=Записът е успешно променен
+RecordsModified=%s запис(а) е(са) променен(и)
+RecordsDeleted=%s запис(а) е(са) изтрит(и)
+RecordsGenerated=%s запис(а) е(са) генериран(и)
 AutomaticCode=Автоматичен код
 FeatureDisabled=Функцията е изключена
 MoveBox=Преместване на джаджа
-Offered=Предложено
+Offered=100%
 NotEnoughPermissions=Вие нямате разрешение за това действие
-SessionName=Име на сесията
+SessionName=Име на сесия
 Method=Метод
-Receive=Получавам
+Receive=Получаване
 CompleteOrNoMoreReceptionExpected=Завършено или не се очаква нищо повече
 ExpectedValue=Очаквана стойност
-CurrentValue=Текуща стойност
-PartialWoman=Частична
+PartialWoman=Частично
 TotalWoman=Обща
-NeverReceived=Никога не получено
-Canceled=Отменен
-YouCanChangeValuesForThisListFromDictionarySetup=Можете да промените стойностите за този списък от меню Настройки - Речници
-YouCanChangeValuesForThisListFrom=Можете да промените стойностите за този списък от меню %s
-YouCanSetDefaultValueInModuleSetup=Можете да зададете стойността по подразбиране, използвана при създаване на нов запис в настройката на модула
+NeverReceived=Никога не е получавано
+Canceled=Анулирано
+YouCanChangeValuesForThisListFromDictionarySetup=Може да промените стойностите за този списък от меню Настройки - Речници
+YouCanChangeValuesForThisListFrom=Може да промените стойностите за този списък от меню %s
+YouCanSetDefaultValueInModuleSetup=Може да зададете стойността по подразбиране, използвана при създаване на нов запис в настройката на модула
 Color=Цвят
 Documents=Свързани файлове
 Documents2=Документи
 UploadDisabled=Качването е деактивирано
-MenuAccountancy=Accounting
+MenuAccountancy=Счетоводство
 MenuECM=Документи
 MenuAWStats=AWStats
 MenuMembers=Членове
-MenuAgendaGoogle=Google дневния ред
-ThisLimitIsDefinedInSetup=Ограничение на системата (Начало-Настройки-Настройки на сигурността): %s Кб, ограничение на PHP: %s Кб
+MenuAgendaGoogle=Google бележник
+ThisLimitIsDefinedInSetup=Ограничение на системата (Меню Начало - Настройка - Сигурност): %s Kb, ограничение на PHP: %s Kb
 NoFileFound=Няма записани документи в тази директория
 CurrentUserLanguage=Текущ език
 CurrentTheme=Текущата тема
-CurrentMenuManager=Текущ меню менажер
-Browser=Browser
+CurrentMenuManager=Текущ меню манипулатор
+Browser=Браузър
 Layout=Оформление
 Screen=Екран
 DisabledModules=Деактивирани модули
 For=За
-ForCustomer=За клиента
+ForCustomer=За клиент
 Signature=Подпис
 DateOfSignature=Дата на подписване
-HidePassword=Покажи със скрита парола
-UnHidePassword=Покажи с видима парола
-Root=Корен
+HidePassword=Показване на команда със скрита парола
+UnHidePassword=Показване на реална команда с ясна парола
+Root=Начало
 Informations=Информация
 Page=Страница
 Notes=Бележки
 AddNewLine=Добави нов ред
 AddFile=Добави файл
 FreeZone=Не е предварително определен продукт / услуга
-FreeLineOfType=Продукт свободен текст, въведете:
+FreeLineOfType=Свободен текст към елемента, въведете:
 CloneMainAttributes=Клонира обекта с неговите основни атрибути
-ReGeneratePDF=Отново генериране на PDF
-PDFMerge=PDF обединяване
+ReGeneratePDF=Повторно генериране на PDF
+PDFMerge=Обединяване на PDF файлове
 Merge=Обединяване
 DocumentModelStandardPDF=Стандартен PDF шаблон
 PrintContentArea=Показване на страница за печат само с основното съдържание
-MenuManager=Меню менажер
-WarningYouAreInMaintenanceMode=Внимание, вие сте в режим на поддръжка: само регистрацията <b> %s </b> е позволена да използва приложението в този режим.
+MenuManager=Меню манипулатор
+WarningYouAreInMaintenanceMode=Внимание, вие сте в режим на поддръжка: позволено е само за потребител <b> %s </b> да използва приложението в този режим.
 CoreErrorTitle=Системна грешка
-CoreErrorMessage=За съжаление възникна грешка. Обърнете се към системния си администратор, за да проверите log файлове или да забраните $ dolibarr_main_prod = 1, за да получите повече информация.
+CoreErrorMessage=За съжаление възникна грешка. Обърнете се към системния си администратор, за да проверите log файлове или да забраните $dolibarr_main_prod=1, за да получите повече информация.
 CreditCard=Кредитна карта
-ValidatePayment=Валидирай плащане
+ValidatePayment=Валидиране на плащане
 CreditOrDebitCard=Кредитна или дебитна карта
 FieldsWithAreMandatory=Полетата с <b>%s</b> са задължителни
 FieldsWithIsForPublic=Полетата с <b> %s </b> се показват в публичния списък с членове. Ако не искате това, махнете отметката от полето „обществено“.
@@ -732,11 +731,11 @@ NotSupported=Не се поддържа
 RequiredField=Задължително поле
 Result=Резултат
 ToTest=Тест
-ValidateBefore=Картата трябва да бъде потвърдена, преди да използвате тази функция
+ValidateBefore=Картата трябва да бъде валидирана, преди да използвате тази функция
 Visibility=Видимост
 Totalizable=Обобщено
 TotalizableDesc=Това поле е обобщено в списъка
-Private=Частен
+Private=Личен
 Hidden=Скрит
 Resources=Ресурси
 Source=Източник
@@ -748,37 +747,37 @@ Frequency=Честота
 IM=Мигновени съобщения
 NewAttribute=Нов атрибут
 AttributeCode=Код на атрибут
-URLPhoto=URL на снимка/лого
+URLPhoto=URL адрес на снимка / лого
 SetLinkToAnotherThirdParty=Връзка към друг контрагент
 LinkTo=Връзка към
-LinkToProposal=Връзка с търговско предложението
-LinkToOrder=Link to order
+LinkToProposal=Връзка към търговско предложение
+LinkToOrder=Връзка към поръчка
 LinkToInvoice=Връзка към фактура
-LinkToTemplateInvoice=Връзка към шаблона фактура
+LinkToTemplateInvoice=Връзка към шаблон за фактура
 LinkToSupplierOrder=Връзка към поръчка за покупка
-LinkToSupplierProposal=Връзка към търговско предложение от доставчик
-LinkToSupplierInvoice=Връзка към фактура на доставчика
+LinkToSupplierProposal=Връзка към запитване към доставчик
+LinkToSupplierInvoice=Връзка към фактура за доставка
 LinkToContract=Връзка към договор
-LinkToIntervention=Връзка към интервенцията
-CreateDraft=Създай чернова
+LinkToIntervention=Връзка към интервенция
+CreateDraft=Създаване на чернова
 SetToDraft=Назад към черновата
 ClickToEdit=Кликнете, за да редактирате
 ClickToRefresh=Кликнете, за да обновите
-EditWithEditor=Редактирайте с CKEditor
-EditWithTextEditor=Редактирайте с текстов редактор
-EditHTMLSource=Редактирайте HTML източника
+EditWithEditor=Редактиране с CKEditor
+EditWithTextEditor=Редактиране с текстов редактор
+EditHTMLSource=Редактиране на HTML кода
 ObjectDeleted=Обект %s е изтрит
 ByCountry=По държава
-ByTown=До град
+ByTown=По град
 ByDate=По дата
-ByMonthYear=До месец/година
-ByYear=С години
+ByMonthYear=По месец / година
+ByYear=По година
 ByMonth=По месец
 ByDay=По ден
 BySalesRepresentative=По търговски представител
-LinkedToSpecificUsers=Свързано с контакт на потребителя
+LinkedToSpecificUsers=Свързано е с конкретен потребителски контакт
 NoResults=Няма резултати
-AdminTools=Инструменти на Админ.
+AdminTools=Администрация
 SystemTools=Системни инструменти
 ModulesSystemTools=Модулни инструменти
 Test=Тест
@@ -791,83 +790,89 @@ from=от
 toward=към
 Access=Достъп
 SelectAction=Избиране на действие
-SelectTargetUser=Изберете целта потребител / служител
-HelpCopyToClipboard=Използвайте Ctrl+C за да копирате в клипборда
-SaveUploadedFileWithMask=Запишете файла на сървъра с име "<strong>%s</strong>" (иначе "%s")
-OriginFileName=Оригинално име на файла
-SetDemandReason=Източник
-SetBankAccount=Дефинирай банкова сметка
+SelectTargetUser=Изберете целеви потребител / служител
+HelpCopyToClipboard=Използвайте Ctrl + C, за да копирате в клипборда
+SaveUploadedFileWithMask=Запиши файла на сървъра с име "<strong>%s</strong>" (иначе "%s")
+OriginFileName=Оригинално име на файл
+SetDemandReason=Задайте източник
+SetBankAccount=Дефиниране на банкова сметка
 AccountCurrency=Валута на профила
-ViewPrivateNote=Биж бележки
-XMoreLines=%s ред(а) скрити
-ShowMoreLines=Показване на повече/по-малко линии
+ViewPrivateNote=Преглед на бележки
+XMoreLines=%s ред(а) е(са) скрит(и)
+ShowMoreLines=Показване на повече / по-малко редове
 PublicUrl=Публичен URL
-AddBox=Добави поле
+AddBox=Добавяне на кутия
 SelectElementAndClick=Изберете елемент и кликнете върху %s
 PrintFile=Печат на файл %s
-ShowTransaction=Показване на запис по банкова сметка
-ShowIntervention=Покажи намеса
-ShowContract=Покажи договор
-GoIntoSetupToChangeLogo=Отидете в Начало - Настройка - Фирма, за да промените логото или отидете в Начало - Настройка - Екран, за да скриете.
-Deny=Забрани
+ShowTransaction=Показване на запис на банкова сметка
+ShowIntervention=Показване на интервенция
+ShowContract=Показване на договор
+GoIntoSetupToChangeLogo=Отидете в Начало - Настройка - Фирма / Организация, за да промените логото или в Начало - Настройка - Екран, за да го скриете.
+Deny=Забраняване
 Denied=Забранено
 ListOf=Списък на %s
 ListOfTemplates=Списък с шаблони
 Gender=Пол
 Genderman=Мъж
 Genderwoman=Жена
-ViewList=Списъчен вид
+ViewList=Списъчен изглед
 Mandatory=Задължително
 Hello=Здравейте
 GoodBye=Довиждане
-Sincerely=Искрено
-DeleteLine=Изтриване на линия
-ConfirmDeleteLine=Сигурни ли сте че искате да изтриете този ред?
-NoPDFAvailableForDocGenAmongChecked=Няма PDF на разположение за генериране на документ сред проверен запис
-TooManyRecordForMassAction=Твърде много записи са избрани за масово действие. Действието е ограничено до списък с %s записи.
+Sincerely=Поздрави
+DeleteLine=Изтриване на ред
+ConfirmDeleteLine=Сигурни ли сте, че искате да изтриете този ред?
+NoPDFAvailableForDocGenAmongChecked=Няма PDF файл на разположение за генериране на документ в проверения запис
+TooManyRecordForMassAction=Твърде много записи са избрани за масово действие. Действието е ограничено до списък от %s записа.
 NoRecordSelected=Няма избран запис
-MassFilesArea=Област за файлове, изградени от масови действия
-ShowTempMassFilesArea=Показване на областта на файловете, изградени от масови действия
-ConfirmMassDeletion=Масово изтриване на потвърждение
-ConfirmMassDeletionQuestion=Сигурни ли сте че, искате да изтриете %s избраните запис(и) ?
+MassFilesArea=Секция за файлове, създадени от масови действия
+ShowTempMassFilesArea=Показване на секцията с файлове, създадени от масови действия
+ConfirmMassDeletion=Потвърждение за масово изтриване
+ConfirmMassDeletionQuestion=Сигурни ли сте, че искате да изтриете избраните %s записа?
 RelatedObjects=Свързани обекти
-ClassifyBilled=Класифицирай платени
-ClassifyUnbilled=Класифицирайте не таксувано
+ClassifyBilled=Класифициране като фактурирано
+ClassifyUnbilled=Класифициране като нефактурирано
 Progress=Прогрес
+ProgressShort=Напредък
 FrontOffice=Фронт офис
 BackOffice=Бек офис
-View=Изглед
-Export=Export
-Exports=Exports
+View=Преглед
+Export=Експортиране
+Exports=Експортирания
 ExportFilteredList=Експортиране на филтрирания списък
 ExportList=Списък за експортиране
 ExportOptions=Настройки за експортиране
+IncludeDocsAlreadyExported=Включените документи са вече експортирани
+ExportOfPiecesAlreadyExportedIsEnable=Експортът на вече експортирани части е разрешен
+ExportOfPiecesAlreadyExportedIsDisable=Експортът на вече експортирани части е забранен
+AllExportedMovementsWereRecordedAsExported=Всички експортирани движения бяха записани като експортирани
+NotAllExportedMovementsCouldBeRecordedAsExported=Не всички експортирани движения могат да бъдат записани като експортирани
 Miscellaneous=Разни
 Calendar=Календар
 GroupBy=Групирай по...
-ViewFlatList=Вижте плосък списък
-RemoveString=Премахнете стойност "%s" от полето
-SomeTranslationAreUncomplete=Някои от предлаганите езици могат да бъдат само частично преведени или да съдържат грешки. Моля, помогнете ни да коригирате езика ви като се регистрирате на адрес <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a>  да добавите подобренията си.
-DirectDownloadLink=Директна връзка за изтегляне (публично / външно)
-DirectDownloadInternalLink=Директна връзка за изтегляне (трябва да бъде регистрирани и да имате права)
-Download=Изтегли
-DownloadDocument=Изтеглете документ
-ActualizeCurrency=Актуализирайте валутния курс
-Fiscalyear=Fiscal year
-ModuleBuilder=Модул Строител
+ViewFlatList=Преглед на плосък списък
+RemoveString=Премахване на низ „%s“
+SomeTranslationAreUncomplete=Някои от предлаганите езици могат да бъдат само частично преведени или да съдържат грешки. Моля, помогнете ни да коригираме езика ви като се регистрирате на адрес <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a>, за да добавите подобренията си.
+DirectDownloadLink=Директна връзка за изтегляне (публична / външна)
+DirectDownloadInternalLink=Директна връзка за изтегляне (изисква регистрация в системата и съответни права)
+Download=Изтегляне
+DownloadDocument=Изтегляне на документ
+ActualizeCurrency=Актуализиране на валутния курс
+Fiscalyear=Фискална година
+ModuleBuilder=Инструмент за създаване на модули и приложения
 SetMultiCurrencyCode=Определяне на валута
 BulkActions=Масови действия
 ClickToShowHelp=Кликнете, за да покажете помощната подсказка
-WebSite=уебсайт
+WebSite=Уебсайт
 WebSites=Уебсайтове
-WebSiteAccounts=Профили в уебсайтове
-ExpenseReport=Доклад разходи
-ExpenseReports=Опис разходи
+WebSiteAccounts=Профили в уебсайта
+ExpenseReport=Разходен отчет
+ExpenseReports=Разходни отчети
 HR=ЧР
 HRAndBank=ЧР и Банка
 AutomaticallyCalculated=Автоматично изчислени
-TitleSetToDraft=Върнете се към черновата
-ConfirmSetToDraft=Сигурни ли сте че, искате да се върнете към състоянието на чернова?
+TitleSetToDraft=Назад към черновата
+ConfirmSetToDraft=Сигурни ли сте, че искате да се върнете към състоянието на чернова?
 ImportId=Идентификатор за импортиране
 Events=Събития
 EMailTemplates=Имейл шаблони
@@ -882,10 +887,10 @@ ListOpenLeads=Списък с отворени възможности
 ListOpenProjects=Списък с отворени проекти
 NewLeadOrProject=Нова възможност или проект
 Rights=Права
-LineNb=Линия №.
+LineNb=ред №
 IncotermLabel=Условия на доставка
-TabLetteringCustomer=Клиент абревиатура 
-TabLetteringSupplier=Доставчик абревиатура 
+TabLetteringCustomer=Абревиатура на клиент
+TabLetteringSupplier=Абревиатура на доставчик
 Monday=Понеделник
 Tuesday=Вторник
 Wednesday=Сряда
@@ -915,15 +920,15 @@ ShortFriday=П
 ShortSaturday=С
 ShortSunday=Н
 SelectMailModel=Изберете шаблон за имейл
-SetRef=Задай код
+SetRef=Задаване на референция
 Select2ResultFoundUseArrows=Намерени са някои резултати. Използвайте стрелките, за да изберете.
 Select2NotFound=Няма намерени резултати
 Select2Enter=Въвеждане
-Select2MoreCharacter=или повече символа
+Select2MoreCharacter=или повече знака
 Select2MoreCharacters=или повече знаци
-Select2MoreCharactersMore=<strong>Търси синтаксис:</strong><br><kbd><strong> |</strong></kbd><kbd> или</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
+Select2MoreCharactersMore=<strong> Синтаксис на търсенето: </strong> <br> <kbd> <strong> | </strong> </kbd> <kbd> ИЛИ </kbd> (а | б) <br> <kbd> <strong> * </strong> </kbd> <kbd> Някакъв знак </kbd> (а * б) <br> <kbd> <strong> ^ </strong> </kbd> <kbd> Започнете с </kbd> (^ аб) <br> <kbd> <strong> $ </strong> </kbd> <kbd> Завършете с </kbd> ( ab $) <br>
 Select2LoadingMoreResults=Зараждане на повече резултати...
-Select2SearchInProgress=Търсене в ход...
+Select2SearchInProgress=В процес на търсене...
 SearchIntoThirdparties=Контрагенти
 SearchIntoContacts=Контакти
 SearchIntoMembers=Членове
@@ -931,42 +936,46 @@ SearchIntoUsers=Потребители
 SearchIntoProductsOrServices=Продукти или услуги
 SearchIntoProjects=Проекти
 SearchIntoTasks=Задачи
-SearchIntoCustomerInvoices=Клиентски фактури
-SearchIntoSupplierInvoices=Фактури на доставчик
+SearchIntoCustomerInvoices=Фактури за продажба
+SearchIntoSupplierInvoices=Фактура за доставка
 SearchIntoCustomerOrders=Поръчки за продажба
-SearchIntoSupplierOrders=Поръчка
-SearchIntoCustomerProposals=Клиентски предложения
-SearchIntoSupplierProposals=Предложения на доставчик
-SearchIntoInterventions=Намеси
+SearchIntoSupplierOrders=Поръчки за покупка
+SearchIntoCustomerProposals=Търговски предложения
+SearchIntoSupplierProposals=Запитвания към доставчик
+SearchIntoInterventions=Интервенции
 SearchIntoContracts=Договори
-SearchIntoCustomerShipments=Клиент пратки
-SearchIntoExpenseReports=Опис разходи
+SearchIntoCustomerShipments=Клиентски пратки
+SearchIntoExpenseReports=Разходни отчети
 SearchIntoLeaves=Отпуск
 SearchIntoTickets=Тикети
 CommentLink=Коментари
 NbComments=Брой коментари
-CommentPage=Коментар пространство
-CommentAdded=Коментарът бе добавен
+CommentPage=Място за коментари
+CommentAdded=Коментарът е добавен
 CommentDeleted=Коментарът е изтрит
 Everybody=Всички
-PayedBy=Платен от
-PayedTo=Платен на
+PayedBy=Платено от
+PayedTo=Платено на
 Monthly=Месечно
 Quarterly=Тримесечие
-Annual=Годишен
-Local=Местен
-Remote=Отдалечен
+Annual=Годишно
+Local=Локално
+Remote=Отдалечено
 LocalAndRemote=Локално и отдалечено
 KeyboardShortcut=Клавишна комбинация
 AssignedTo=Възложено на
 Deletedraft=Изтриване на чернова
-ConfirmMassDraftDeletion=Потвърдете масово изтриване на чернови
+ConfirmMassDraftDeletion=Потвърждаване за масово изтриване на чернови
 FileSharedViaALink=Файлът е споделен чрез връзка
-SelectAThirdPartyFirst=Първо изберете контрагент ...
+SelectAThirdPartyFirst=Първо изберете контрагент...
 YouAreCurrentlyInSandboxMode=В момента се намирате в режим "sandbox" на %s
 Inventory=Складова наличност
 AnalyticCode=Аналитичен код
-TMenuMRP=MRP
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
+TMenuMRP=ПМИ
+ShowMoreInfos=Показване на повече информация
+NoFilesUploadedYet=Моля, първо качете документ
+SeePrivateNote=Вижте частната бележка
+PaymentInformation=Платежна информация
+ValidFrom=Валидно от
+ValidUntil=Валидно до
+NoRecordedUsers=Няма потребители
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index ba218e9108f..c2856d00f53 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -197,3 +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
diff --git a/htdocs/langs/bg_BG/modulebuilder.lang b/htdocs/langs/bg_BG/modulebuilder.lang
index 2f3467be3d3..333fbcab6b5 100644
--- a/htdocs/langs/bg_BG/modulebuilder.lang
+++ b/htdocs/langs/bg_BG/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Опасна зона
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/bg_BG/paybox.lang b/htdocs/langs/bg_BG/paybox.lang
index aca768e6325..6a2fb5ed6b5 100644
--- a/htdocs/langs/bg_BG/paybox.lang
+++ b/htdocs/langs/bg_BG/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=За да завършите
 YourEMail=Имейл за да получите потвърждение на плащането
 Creditor=Кредитор
 PaymentCode=Плащане код
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Направете плащане
 YouWillBeRedirectedOnPayBox=Вие ще бъдете пренасочени на защитена Paybox страница за въвеждане на информация за кредитни карти
 Continue=До
 ToOfferALinkForOnlinePayment=URL за %s плащане
-ToOfferALinkForOnlinePaymentOnOrder=URL адрес, за да предложи на потребителя %s онлайн интерфейс плащане за поръчка на клиента
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL да предложи %s онлайн интерфейс ползвател на платежни за клиента фактура
 ToOfferALinkForOnlinePaymentOnContractLine=URL да предложи %s онлайн интерфейс ползвател на платежни за договор линия
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL да предложи %s онлайн интерфейс ползвател на платежни за безплатен сума
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL да предложи %s онлайн интерфейс ползвател на платежни за член абонамент
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Можете също да добавите URL параметър <b>и етикет = <i>стойност</i></b> на която и да е от тези URL (задължително само за безплатно плащане), за да добавите свой ​​собствен етикет за коментар на плащане.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Тази страница потвърждава, че плащането е било записано. Благодаря.
@@ -33,7 +33,8 @@ VendorName=Име на продавача
 CSSUrlForPaymentForm=CSS URL стил лист за плащане форма
 NewPayboxPaymentReceived=Ново Paybox заплащане е получено
 NewPayboxPaymentFailed=Ново Paybox заплащане беше опитано, но неуспешно
-PAYBOX_PAYONLINE_SENDEMAIL=Имейл за предупреждаване след заплащане (успешно или неусешно)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/bg_BG/paypal.lang b/htdocs/langs/bg_BG/paypal.lang
index cfea12bcd8b..821a3b43f7f 100644
--- a/htdocs/langs/bg_BG/paypal.lang
+++ b/htdocs/langs/bg_BG/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Настройки на модул PayPal
-PaypalDesc=В този модул се предлагат страници, които да дават възможност за заплащане от клиентите на <a href="http://www.paypal.com" target="_blank">PayPal</a> . Това може да се използва за плащане или за плащане на даден обект Dolibarr (фактура, поръчка, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Плащане с Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode тест / пясък
 PAYPAL_API_USER=API потребителско име
 PAYPAL_API_PASSWORD=API парола
 PAYPAL_API_SIGNATURE=API подпис
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Оферта плащане &quot;неразделна&quot; (кредитна карта + Paypal) или &quot;Paypal&quot;
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Интеграл
 PaypalModeOnlyPaypal=Paypal само
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=Това е номер на сделката: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Добавяне на URL адреса на Paypal плащане, когато ви изпрати документа по пощата
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
-NewOnlinePaymentReceived=New online payment received
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
+NewOnlinePaymentReceived=Получено е ново онлайн плащане
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Имейл за предупреждаване след заплащане (успешно или не)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Връщане на URL след заплащане
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Код грешка
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 5c4a37d1ee9..fcfb8ca0605 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -161,7 +161,7 @@ CustomCode=Митнически / Стоков / ХС код
 CountryOrigin=Държава на произход
 Nature=Вид на продукта (материал/завършен)
 ShortLabel=Кратък етикет
-Unit=Единица
+Unit=Мярка
 p=е.
 set=комплект
 se=комплект
@@ -260,7 +260,7 @@ AddVariable=Добавяне на променлива
 AddUpdater=Добавяне на актуализатор
 GlobalVariables=Глобални променливи
 VariableToUpdate=Променлива за актуализиране
-GlobalVariableUpdaters=Актуализатори на глобални променливи
+GlobalVariableUpdaters=Външни източници за актуализиране на променливи
 GlobalVariableUpdaterType0=JSON данни
 GlobalVariableUpdaterHelp0=Разграничава JSON данните от URL, VALUE определя местоположението на съответната стойност,
 GlobalVariableUpdaterHelpFormat0=Формат за запитване {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -275,7 +275,7 @@ PropalMergePdfProductChooseFile=Избиране на PDF файлове
 IncludingProductWithTag=Включително продукт/услуга с таг/категория
 DefaultPriceRealPriceMayDependOnCustomer=Цена по подразбиране, реалната цена може да зависи от клиента
 WarningSelectOneDocument=Моля изберете поне един документ
-DefaultUnitToShow=Единица
+DefaultUnitToShow=Мярка
 NbOfQtyInProposals=Количество в предложенията
 ClinkOnALinkOfColumn=Кликнете върху връзката от колона %s, за да получите подробен изглед...
 ProductsOrServicesTranslations=Преводи на Продукти / Услуги
@@ -284,9 +284,9 @@ TranslatedDescription=Преведено описание
 TranslatedNote=Преведени бележки
 ProductWeight=Тегло за един продукт
 ProductVolume=Обем за един продукт
-WeightUnits=Единица за тегло
-VolumeUnits=Единица за обем
-SizeUnits=Единица за размер
+WeightUnits=Мярка за тегло
+VolumeUnits=Мярка за обем
+SizeUnits=Мярка за размер
 DeleteProductBuyPrice=Изтриване на покупна цена
 ConfirmDeleteProductBuyPrice=Сигурни ли сте, че искате да изтриете тази покупна цена?
 SubProduct=Подпродукт
@@ -294,7 +294,7 @@ ProductSheet=Лист на продукт
 ServiceSheet=Лист на услуга
 PossibleValues=Възможни стойности
 GoOnMenuToCreateVairants=Отидете в менюто %s - %s, за да подготвите атрибутите на варианта (като цветове, размер, ...)
-UseProductFournDesc=Използване на описанията на продукти от доставчик в документите към доставчик
+UseProductFournDesc=Добавяне на функция за дефиниране на описания на продуктите, определени от доставчици като допълнение към описанията за клиенти
 ProductSupplierDescription=Описание на продукта от доставчик
 #Attributes
 VariantAttributes=Атрибути на варианти
@@ -338,4 +338,5 @@ CloneDestinationReference=Местоположение на продуктова
 ErrorCopyProductCombinations=Възникна грешка при копиране на вариантите на продукта
 ErrorDestinationProductNotFound=Търсеният продукт не е намерен
 ErrorProductCombinationNotFound=Няма намерен вариант на продукта
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ActionAvailableOnVariantProductOnly=Действието е достъпно само за варианта на продукта
+ProductsPricePerCustomer=Цени на продукта в зависимост от клиента
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 7ad1d68c5b4..1cc17d3e576 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - projects
 RefProject=Реф. проект
 ProjectRef=Проект реф.
-ProjectId=Id на проект
+ProjectId=Проект №
 ProjectLabel=Име на проект
-ProjectsArea=Зона за проекти
+ProjectsArea=Секция за проекти
 ProjectStatus=Статус на проект
 SharedProject=Всички
-PrivateProject=Контакти за проекта
+PrivateProject=Участници в проекта
 ProjectsImContactFor=Проекти, в които съм определен за контакт
 AllAllowedProjects=Всеки проект, който мога да видя (мой и публичен)
 AllProjects=Всички проекти
@@ -19,12 +19,12 @@ TasksOnProjectsDesc=Този изглед представя всички зад
 MyTasksDesc=Този изглед е ограничен до проекти или задачи, в които сте контакт
 OnlyOpenedProject=Само отворените проекти са видими (чернови или затворени проекти не са видими).
 ClosedProjectsAreHidden=Затворените проекти не са видими.
-TasksPublicDesc=Този изглед представя всички проекти и задачи, които можете да прочетете.
-TasksDesc=Този изглед представя всички проекти и задачи (вашите потребителски права ви дават разрешение да виждате всичко).
+TasksPublicDesc=Този страница показва всички проекти и задачи, които може да прочетете.
+TasksDesc=Този страница показва всички проекти и задачи (вашите потребителски права ви дават разрешение да виждате всичко).
 AllTaskVisibleButEditIfYouAreAssigned=Всички задачи за определените проекти са видими, но можете да въведете време само за задача, възложена на избрания потребител. Задайте задача, ако е необходимо да въведете отделено време за нея.
 OnlyYourTaskAreVisible=Видими са само задачите, които са ви възложени. Възложете задача на себе си, ако не е видима, а трябва да въведете отделено време за нея.
 ImportDatasetTasks=Задачи по проекти
-ProjectCategories=Етикети/Категории
+ProjectCategories=Етикети / Категории
 NewProject=Нов проект
 AddProject=Създаване на проект
 DeleteAProject=Изтриване на проект
@@ -33,7 +33,7 @@ ConfirmDeleteAProject=Сигурни ли сте, че искате да изт
 ConfirmDeleteATask=Сигурни ли сте, че искате да изтриете тази задача?
 OpenedProjects=Отворени проекти
 OpenedTasks=Отворени задачи
-OpportunitiesStatusForOpenedProjects=Размер на възможностите от проекти по статус
+OpportunitiesStatusForOpenedProjects=Размер на възможностите от отворени проекти по статус
 OpportunitiesStatusForProjects=Размер на възможностите от проекти по статус
 ShowProject=Преглед на проект
 ShowTask=Преглед на задача
@@ -45,7 +45,8 @@ TimeSpent=Отделено време
 TimeSpentByYou=Време, отделено от вас
 TimeSpentByUser=Време, отделено от потребител
 TimesSpent=Отделено време
-RefTask=Реф. задача
+TaskId=Задача №
+RefTask=Задача реф.
 LabelTask=Име на задача
 TaskTimeSpent=Време, отделено на задачи
 TaskTimeUser=Потребител
@@ -55,10 +56,10 @@ TasksOnOpenedProject=Задачи от отворени проекти
 WorkloadNotDefined=Не е определена работна натовареност
 NewTimeSpent=Отделено време
 MyTimeSpent=Моето отделено време
-BillTime=Bill the time spent
-BillTimeShort=Bill time
-TimeToBill=Time not billed
-TimeBilled=Time billed
+BillTime=Фактуриране на отделено време
+BillTimeShort=Фактуриране на време
+TimeToBill=Нефактурирано време
+TimeBilled=Фактурирано време
 Tasks=Задачи
 Task=Задача
 TaskDateStart=Начална дата на задача
@@ -69,10 +70,10 @@ AddTask=Създаване на задача
 AddTimeSpent=Въвеждане на отделено време
 AddHereTimeSpentForDay=Добавете тук отделеното време за този ден/задача
 Activity=Дейност
-Activities=Задачи/дейности
-MyActivities=Мои задачи/дейности
+Activities=Задачи / Дейности
+MyActivities=Мои задачи / дейности
 MyProjects=Мои проекти
-MyProjectsArea=Зона за мои проекти
+MyProjectsArea=Секция с мои проекти
 DurationEffective=Ефективна продължителност
 ProgressDeclared=Деклариран напредък
 ProgressCalculated=Изчислен напредък
@@ -80,8 +81,8 @@ Time=Време
 ListOfTasks=Списък със задачи
 GoToListOfTimeConsumed=Отидете в списъка с изразходваното време
 GoToListOfTasks=Отидете в списъка със задачи
-GoToGanttView=Отидете в Gantt изгледа
-GanttView=Gantt изглед
+GoToGanttView=Преглед на Gantt диаграма
+GanttView=Gantt диаграма
 ListProposalsAssociatedProject=Списък на търговски предложения, свързани с проекта
 ListOrdersAssociatedProject=Списък на поръчки за продажба, свързани с проекта
 ListInvoicesAssociatedProject=Списък на фактури за продажба, свързани с проекта
@@ -96,17 +97,17 @@ ListDonationsAssociatedProject=Списък на дарения, свързан
 ListVariousPaymentsAssociatedProject=Списък на различни плащания, свързани с проекта
 ListSalariesAssociatedProject=Списък на плащания на заплати, свързани с проекта
 ListActionsAssociatedProject=Списък на събития, свързани с проекта
-ListTaskTimeUserProject=Списък на отделено време за задачи по проекта
+ListTaskTimeUserProject=Списък на отделено време по задачи, свързани с проекта
 ListTaskTimeForTask=Списък на отделено време за задача
 ActivityOnProjectToday=Дейност по проект (за деня)
-ActivityOnProjectYesterday=Дейност по проект (вчера)
-ActivityOnProjectThisWeek=Дейност по проект ( за седмицата)
+ActivityOnProjectYesterday=Дейност по проект (за вчера)
+ActivityOnProjectThisWeek=Дейност по проект (за седмица)
 ActivityOnProjectThisMonth=Дейност по проект (за месеца)
 ActivityOnProjectThisYear=Дейност по проект (за година)
 ChildOfProjectTask=Наследник на проект/задача
 ChildOfTask=Наследник на задача
 TaskHasChild=Задачата има наследник
-NotOwnerOfProject=Не е собственик на този частен проект
+NotOwnerOfProject=Не сте собственик на този частен проект
 AffectedTo=Разпределено на
 CantRemoveProject=Този проект не може да бъде премахнат, тъй като е свързан с някои други обекти (фактури, поръчки или други). Вижте раздела свързани файлове.
 ValidateProject=Валидиране на проект
@@ -116,8 +117,8 @@ ConfirmCloseAProject=Сигурни ли сте, че искате да затв
 AlsoCloseAProject=Също така затворете проекта (задръжте го отворен, ако все още трябва да работите по задачите в него)
 ReOpenAProject=Отваряне на проект
 ConfirmReOpenAProject=Сигурни ли сте, че искате да отворите повторно този проект?
-ProjectContact=Контакти на проекта
-TaskContact=Контакти за задачата
+ProjectContact=Контакти / Участници
+TaskContact=Участници в задачата
 ActionsOnProject=Събития свързани с проекта
 YouAreNotContactOfProject=Вие не сте контакт за този частен проект
 UserIsNotContactOfProject=Потребителят не е контакт за този частен проект
@@ -125,7 +126,7 @@ DeleteATimeSpent=Изтриване на отделено време
 ConfirmDeleteATimeSpent=Сигурни ли сте, че искате да изтриете това отделено време?
 DoNotShowMyTasksOnly=Показване също на задачи, които не са възложени на мен
 ShowMyTasksOnly=Показване на задачи, възложени на мен
-TaskRessourceLinks=Contacts of task
+TaskRessourceLinks=Контакти / Участници
 ProjectsDedicatedToThisThirdParty=Проекти, насочени към този контрагент
 NoTasks=Няма задачи за този проект
 LinkedToAnotherCompany=Свързано с друг контрагент
@@ -138,8 +139,8 @@ CloneContacts=Клониране на контакти
 CloneNotes=Клониране на бележки
 CloneProjectFiles=Клониране на обединени файлове в проекта
 CloneTaskFiles=Клониране на обединени файлове в задачи (ако задача(ите) са клонирани)
-CloneMoveDate=Актуализирайте датите на проекта/задачите от сега?
-ConfirmCloneProject=Сигурни ли сте, че ще клонирате този проект?
+CloneMoveDate=Актуализиране на датите на проекта/задачите от сега?
+ConfirmCloneProject=Сигурни ли сте, че ще искате да клонирате този проект?
 ProjectReportDate=Променете датите на задачите, според новата начална дата на проекта
 ErrorShiftTaskDate=Невъзможно е да се смени датата на задача, за да съответства на новата начална дата на проекта
 ProjectsAndTasksLines=Проекти и задачи
@@ -152,12 +153,12 @@ TaskDeletedInDolibarr=Задача %s е изтрита
 OpportunityStatus=Статус на възможността
 OpportunityStatusShort=Статус на възможността
 OpportunityProbability=Вероятност за възможността
-OpportunityProbabilityShort=Вероятност за възможността
+OpportunityProbabilityShort=Вероятност
 OpportunityAmount=Сума на възможността
-OpportunityAmountShort=Сума на възможността
+OpportunityAmountShort=Сума
 OpportunityAmountAverageShort=Средна сума на възможността
 OpportunityAmountWeigthedShort=Изчислена сума на възможността
-WonLostExcluded=Не включва Спечелени/Изгубени
+WonLostExcluded=не включва Спечелени / Изгубени
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Ръководител на проекта
 TypeContact_project_external_PROJECTLEADER=Ръководител на проекта
@@ -175,14 +176,14 @@ DocumentModelBaleine=Шаблон за проектен документ за з
 DocumentModelTimeSpent=Шаблон за отчет на отделеното време по проект
 PlannedWorkload=Планирана работна натовареност
 PlannedWorkloadShort=Работна натовареност
-ProjectReferers=Свързани обекти
+ProjectReferers=Свързани елементи
 ProjectMustBeValidatedFirst=Проектът трябва първо да бъде валидиран
 FirstAddRessourceToAllocateTime=Определете потребителски ресурс на задачата за разпределяне на времето
 InputPerDay=За ден
 InputPerWeek=За седмица
 InputDetail=Детайли
 TimeAlreadyRecorded=Това отделено време е вече записано за тази задача/ден и потребител %s
-ProjectsWithThisUserAsContact=Проекти с този потребител като контакт
+ProjectsWithThisUserAsContact=Проекти с потребител за контакт
 TasksWithThisUserAsContact=Задачи възложени на този потребител
 ResourceNotAssignedToProject=Не е зададено към проект
 ResourceNotAssignedToTheTask=Не е зададено към задача
@@ -196,24 +197,24 @@ AssignTask=Възлагане
 ProjectOverview=Общ преглед
 ManageTasks=Използване на проекти, за да следите задачите и/или да докладвате за отделеното време за тях (часови листове)
 ManageOpportunitiesStatus=Използване на проекти за проследяване на възможности/потенциални клиенти
-ProjectNbProjectByMonth=Брой създадени проекти по месец
-ProjectNbTaskByMonth=Брой създадени задачи по месец
-ProjectOppAmountOfProjectsByMonth=Сума на възможностите по месец
-ProjectWeightedOppAmountOfProjectsByMonth=Изчислена сума на възможностите по месец
+ProjectNbProjectByMonth=Брой създадени проекти на месец
+ProjectNbTaskByMonth=Брой създадени задачи на месец
+ProjectOppAmountOfProjectsByMonth=Сума на възможностите на месец
+ProjectWeightedOppAmountOfProjectsByMonth=Изчислена сума на възможностите на месец
 ProjectOpenedProjectByOppStatus=Отворен проект/възможност по статус на възможността
 ProjectsStatistics=Статистики за проекти/възможности
 TasksStatistics=Статистика за задачи
 TaskAssignedToEnterTime=Задачата е възложена. Въвеждането на време по тази задача трябва да е възможно.
 IdTaskTime=Id време на задача
-YouCanCompleteRef=Ако искате да завършите реф. с някакъв суфикс, препоръчително е да добавите символ - за да го разделите, така че автоматичното номериране ще продължи да работи правилно за следващите проекти. Например %s-MYSUFFIX
+YouCanCompleteRef=Ако искате да завършите реф. с някакъв суфикс, препоръчително е да добавите символ "-", за да го разделите, така че автоматичното номериране да продължи да работи правилно за следващите проекти. Например %s-MYSUFFIX
 OpenedProjectsByThirdparties=Отворени проекти по контрагенти
 OnlyOpportunitiesShort=Само възможности
 OpenedOpportunitiesShort=Отворени възможности
-NotOpenedOpportunitiesShort=Not an open lead
+NotOpenedOpportunitiesShort=Затворени възможности
 NotAnOpportunityShort=Не е възможност
 OpportunityTotalAmount=Обща сума на възможностите
 OpportunityPonderatedAmount=Изчислена сума на възможностите
-OpportunityPonderatedAmountDesc=Изчислена вероятна сума на възможността
+OpportunityPonderatedAmountDesc=Изчислена вероятна сума на възможностите
 OppStatusPROSP=Проучване
 OppStatusQUAL=Квалифициране
 OppStatusPROPO=Офериране
@@ -232,14 +233,14 @@ ThirdPartyRequiredToGenerateInvoice=Контрагент трябва да бъ
 AllowCommentOnTask=Разрешаване на потребителски коментари в задачите
 AllowCommentOnProject=Разрешаване на потребителски коментари в проектите
 DontHavePermissionForCloseProject=Нямате права да затворите проект %s
-DontHaveTheValidateStatus=Проектът %s трябва да бъде отворен, за да го затварите
-RecordsClosed=%s проект(а) е/са затворен(и)
-SendProjectRef=Информационен проект %s
+DontHaveTheValidateStatus=Проектът %s трябва да бъде отворен, за да го затворите
+RecordsClosed=%s проект(а) е(са) затворен(и)
+SendProjectRef=Информация за проект %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Модулът 'Заплати' трябва да бъде активиран, за да дефинирате почасова ставка на служителите, за да оценените отделеното по проекта време
 NewTaskRefSuggested=Реф. № на задачата вече се използва, изисква се нов
-TimeSpentInvoiced=Отделното време е фактурирано
+TimeSpentInvoiced=Фактурирано отделено време
 TimeSpentForInvoice=Отделено време
 OneLinePerUser=Един ред на потребител
 ServiceToUseOnLines=Услуга за използване по редовете
 InvoiceGeneratedFromTimeSpent=Фактура %s е генерирана въз основа на отделеното време по проекта
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Проверете дали въвеждате график за задачите на проекта и планирате да генерирате фактура(и) от графика, за да таксувате клиента за проекта (не проверявайте дали планирате да създадете фактура, която не се основава на въведените часове).
diff --git a/htdocs/langs/bg_BG/stripe.lang b/htdocs/langs/bg_BG/stripe.lang
index 539c7930538..2b3107da00d 100644
--- a/htdocs/langs/bg_BG/stripe.lang
+++ b/htdocs/langs/bg_BG/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeSetup=Настройка на модула на лентата
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Следните интернет адреси са на разположение, за да предложи на клиента да направи плащане по Dolibarr обекти
 PaymentForm=Формуляра за плащане
-WelcomeOnPaymentPage=Добре дошли на нашия онлайн платежни услуги
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Този екран ви позволи да направите онлайн плащане на %s.
 ThisIsInformationOnPayment=Това е информация за плащане, за да се направи
 ToComplete=За да завършите
 YourEMail=Имейл за да получите потвърждение на плащането
-STRIPE_PAYONLINE_SENDEMAIL=Имейл за предупреждаване след заплащане (успешно или не)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Кредитор
 PaymentCode=Плащане код
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Следващ
 ToOfferALinkForOnlinePayment=URL за %s плащане
-ToOfferALinkForOnlinePaymentOnOrder=URL адрес, за да предложи на потребителя %s онлайн интерфейс плащане за поръчка на клиента
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL да предложи %s онлайн интерфейс ползвател на платежни за клиента фактура
 ToOfferALinkForOnlinePaymentOnContractLine=URL да предложи %s онлайн интерфейс ползвател на платежни за договор линия
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL да предложи %s онлайн интерфейс ползвател на платежни за безплатен сума
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL да предложи %s онлайн интерфейс ползвател на платежни за член абонамент
 YouCanAddTagOnUrl=Можете също да добавите URL параметър <b>и етикет = <i>стойност</i></b> на която и да е от тези URL (задължително само за безплатно плащане), за да добавите свой ​​собствен етикет за коментар на плащане.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=Тази страница потвърждава, че плащането е било записано. Благодаря.
-YourPaymentHasNotBeenRecorded=Плащането не е записана и сделката е била анулирана. Благодаря.
 AccountParameter=Отчитат параметри
 UsageParameter=Употреба параметри
 InformationToFindParameters=Помощ &quot;, за да намерите информация за %s сметка
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/bg_BG/trips.lang b/htdocs/langs/bg_BG/trips.lang
index b5dc37406ef..bd3046fe9d1 100644
--- a/htdocs/langs/bg_BG/trips.lang
+++ b/htdocs/langs/bg_BG/trips.lang
@@ -73,7 +73,7 @@ EX_PAR_VP=Паркинг за ЛПС
 EX_CAM_VP=Поддръжка и ремонт на ЛПС
 DefaultCategoryCar=Режим на транспортиране по подразбиране
 DefaultRangeNumber=Номер на обхвата по подразбиране
-UploadANewFileNow=Upload a new document now
+UploadANewFileNow=Качете нов документ сега
 Error_EXPENSEREPORT_ADDON_NotDefined=Грешка, правилото за номериране на разходни отчети не е дефинирано в настройката на модула 'Разходни отчети'
 ErrorDoubleDeclaration=Създали сте друг разходен отчет в същия времеви период.
 AucuneLigne=Няма деклариран разходен отчет
@@ -148,4 +148,4 @@ nolimitbyEX_EXP=от ред (няма ограничение)
 CarCategory=Категория на автомобила
 ExpenseRangeOffset=Размер на офсета: %s
 RangeIk=Обхват на пробега
-AttachTheNewLineToTheDocument=Attach the new line to an existing document
+AttachTheNewLineToTheDocument=Прикрепете реда към свързан документ
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index 4745fb4bef5..e228c6be1d5 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index ccba0841767..daa5b4ef413 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index a36d63c7373..e8a5dda7efb 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/bn_BD/agenda.lang b/htdocs/langs/bn_BD/agenda.lang
index b928554b328..30c2a3d4038 100644
--- a/htdocs/langs/bn_BD/agenda.lang
+++ b/htdocs/langs/bn_BD/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index 4d9affc517a..05225b58ed7 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-BIC=BIC/SWIFT number
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Statement
 AccountStatements=Account statements
 LastAccountStatements=Last account statements
 IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Supplier payment
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index 175b2fc98b5..5f39c25daf2 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Payment amount
-ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang
index 5138fe80be3..006097b7e82 100644
--- a/htdocs/langs/bn_BD/cashdesk.lang
+++ b/htdocs/langs/bn_BD/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 83b931731df..3f175b8b782 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=New payment
-Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 68db165215d..b5a9d70cb70 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/bn_BD/holiday.lang b/htdocs/langs/bn_BD/holiday.lang
index 951af61f273..9aafa73550e 100644
--- a/htdocs/langs/bn_BD/holiday.lang
+++ b/htdocs/langs/bn_BD/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index b501053d4ab..b930ecc464e 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
 Email=Email
 NoEMail=No email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index b29477e346d..9517568846c 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=Members
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=Late
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/bn_BD/modulebuilder.lang b/htdocs/langs/bn_BD/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/bn_BD/modulebuilder.lang
+++ b/htdocs/langs/bn_BD/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/bn_BD/paybox.lang b/htdocs/langs/bn_BD/paybox.lang
index 0d35ac440fa..d5e4fd9ba55 100644
--- a/htdocs/langs/bn_BD/paybox.lang
+++ b/htdocs/langs/bn_BD/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Do payment
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/bn_BD/paypal.lang b/htdocs/langs/bn_BD/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/bn_BD/paypal.lang
+++ b/htdocs/langs/bn_BD/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 841b4a604d3..402779cb00f 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index b0c1113b0ec..76bd0ce597d 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
diff --git a/htdocs/langs/bn_BD/stripe.lang b/htdocs/langs/bn_BD/stripe.lang
index 6fa072b4c9a..7a3389f34b7 100644
--- a/htdocs/langs/bn_BD/stripe.lang
+++ b/htdocs/langs/bn_BD/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditor
 PaymentCode=Payment code
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index f416ebbc84a..b4d894f55d7 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index fdbd33953d4..38c19fb68da 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modifikacija transakcije
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 04f53e74520..a24caf6d762 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Broj znakova za početak pretrage: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Nije moguće kada je Ajax isključen
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=Onemogućena JavaScript
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Knjižna obavijest
-CreditNotes=Knjižne obavijesti
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang
index 79eab01ab98..653a35de667 100644
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/htdocs/langs/bs_BA/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Događaji za koje će Dolibarr stvoriti akciju u dnevni red automa
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Kreirana treća strana %s
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Ugovor %s potvrđen
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Prijedlog %s potpisan
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index f5a842294e5..b8c984c0ff3 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banka
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Razna plaćanja
 MenuNewVariousPayment=Novo ostalo plaćanje
 BankName=Naziv banke
 FinancialAccount=Račun
 BankAccount=Žiro račun
 BankAccounts=Žiro računi
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bankovni računi | Portali
 ShowAccount=Prikaži račun
 AccountRef=Finansijski račun ref
 AccountLabel=Naziv za finansijski račun
@@ -30,7 +30,7 @@ AllTime=Od početka
 Reconciliation=Izmirenje
 RIB=Broj bankovnog računa
 IBAN=IBAN broj
-BIC=BIC / SWIFT broj
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valjan
 SwiftVNotalid=BIC/SWIFT nije valjan
 IbanValid=BAN valjan
@@ -42,11 +42,11 @@ AccountStatementShort=Izvod
 AccountStatements=Izvodi računa
 LastAccountStatements=Posljednji izvod računa
 IOMonthlyReporting=Mjesečno izvještavanje
-BankAccountDomiciliation=Adresa računa
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Zemlja računa
 BankAccountOwner=Ime vlasnika računa
 BankAccountOwnerAddress=Adresa vlasnika računa
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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
 NewBankAccount=Novi račun
 NewFinancialAccount=Novi finansijski račun
@@ -98,14 +98,14 @@ BankLineConciliated=Transakcija izmirena
 Reconciled=Izmireno
 NotReconciled=Nije izmireno
 CustomerInvoicePayment=Uplata kupca
-SupplierInvoicePayment=Plaćanje dobavljaču
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Plaćanje preplate
 WithdrawalPayment=Povlačenje uplate
 SocialContributionPayment=Plaćanje socijalnog/fiskalnog poreza
 BankTransfer=Prenos između banaka
 BankTransfers=Prenosi između banaka
 MenuBankInternalTransfer=Interni transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od strane
 TransferTo=Prema
 TransferFromToDone=Transfer sa <b>%s</b> na <b>%s</b> u iznosu od <b>%s</b> %s je zapisan.
@@ -136,7 +136,7 @@ BankTransactionLine=Bankovna transakcija
 AllAccounts=All bank and cash accounts
 BackToAccount=Nazad na račun
 ShowAllAccounts=Pokaži za sve račune
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Izaberite izvod iz banke za izmirivanje. Koristite brojevne vrijednosti koje se mogu sortirati: YYYYMM ili YYYYMMDD
 EventualyAddCategory=Na kraju, navesti kategoriju u koju će se svrstati zapisi
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Ček vraćen i fakture ponovno otvorene
 BankAccountModelModule=Šabloni dokumenata za bankovne račune
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Šablon za štampanje stranice sa BAN podacima.
-NewVariousPayment=Novo ostalo plaćanje
-VariousPayment=Razna plaćanja
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Razna plaćanja
-ShowVariousPayment=Pokaži ostala plaćanja
-AddVariousPayment=Dodaj ostala plaćanja
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Vaš SEPA mandat
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index 50863e0cac8..6b4f729a832 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -6,13 +6,13 @@ BillsCustomer=Faktura kupca
 BillsSuppliers=Fakture prodavača
 BillsCustomersUnpaid=Nenaplaćene fakture od kupca
 BillsCustomersUnpaidForCompany=Neplaćene fakture kupca za %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsSuppliersUnpaid=Neplaćene fakture dobavljača
+BillsSuppliersUnpaidForCompany=Neplaćene fakture dobavljača %s
 BillsLate=Zakašnjela plaćanja
 BillsStatistics=Statistika faktura kupaca
-BillsStatisticsSuppliers=Vendors invoices statistics
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+BillsStatisticsSuppliers=Statistika računa dobavljača
+DisabledBecauseDispatchedInBookkeeping=Onemogućeno jer je faktura proslijeđena računovodstvu
+DisabledBecauseNotLastInvoice=Onemogućeno jer se račun ne može obrisati. Neki računi su evidentirane nakon ove i ona može napraviti rupe u brojaču.
 DisabledBecauseNotErasable=Onemogućeno jer se ne može brisati
 InvoiceStandard=Standardna faktura
 InvoiceStandardAsk=Standardna faktura
@@ -29,7 +29,7 @@ InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and complete
 InvoiceAvoir=Knjižna obavijest
 InvoiceAvoirAsk=Knjižna obavijest za korekciju računa
 InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
+invoiceAvoirWithLines=Napravi knjižnu obavijest sa stavkama iz originalne fakture
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
 ReplaceInvoice=Zamijeni fakturu %s
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=u valuti faktura
 PaidBack=Uplaćeno nazad
 DeletePayment=Obriši uplatu
 ConfirmDeletePayment=Da li ste sigurni da želite obrisati ovu uplatu?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Primljene uplate od kupaca
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Iznos plaćanja
-ValidatePayment=Potvrditi uplatu
 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.
@@ -169,7 +170,7 @@ LastSuppliersBills=Latest %s vendor invoices
 AllBills=Sve fakture
 AllCustomerTemplateInvoices=All template invoices
 OtherBills=Ostale fakture
-DraftBills=Uzorak faktura
+DraftBills=Nacrt fakture
 CustomersDraftInvoices=Nacrti faktura kupcima
 SuppliersDraftInvoices=Vendor draft invoices
 Unpaid=Neplaćeno
@@ -247,7 +248,7 @@ DateInvoice=Datum fakture
 DatePointOfTax=Point of tax
 NoInvoice=Nema fakture
 ClassifyBill=Označi fakturu
-SupplierBillsToPay=Unpaid vendor invoices
+SupplierBillsToPay=Neplaćene fakture dobavljača
 CustomerBillsUnpaid=Nenaplaćene fakture od kupca
 NonPercuRecuperable=Nepovratno
 SetConditions=Set Payment Terms
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/bs_BA/cashdesk.lang b/htdocs/langs/bs_BA/cashdesk.lang
index edef7046e86..c69d158efaf 100644
--- a/htdocs/langs/bs_BA/cashdesk.lang
+++ b/htdocs/langs/bs_BA/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Historija
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 969f32189f4..c29165688c6 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Novo plaćanje
-Payments=Uplate
 PaymentCustomerInvoice=Plaćanje računa kupca
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Plaćanje socijalnog/fiskalnog poreza
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Referenca fakture
 CodeNotDef=Nije definirano
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 3a5bafcf7b2..2f1d689e63b 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/bs_BA/holiday.lang b/htdocs/langs/bs_BA/holiday.lang
index c26603617a9..4109d9d014a 100644
--- a/htdocs/langs/bs_BA/holiday.lang
+++ b/htdocs/langs/bs_BA/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index eb5f6072dad..668e4b3bc9f 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -371,6 +371,7 @@ Percentage=Postotak
 Total=Ukupno
 SubTotal=Međuzbir
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Ukupno (uklj. PDV)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Pošalji konfirmacijski email
 SendMail=Pošalji e-mail
 Email=email
 NoEMail=nema emaila
-Email=email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=Nema broj mobitela
@@ -671,7 +671,6 @@ Method=Metoda
 Receive=Primiti
 CompleteOrNoMoreReceptionExpected=Završeno ili se ne očekuje više
 ExpectedValue=Očekivana vrijednost
-CurrentValue=Trenutna vrijednost
 PartialWoman=Djelimično
 TotalWoman=Ukupno
 NeverReceived=Nikad primljeno
@@ -834,6 +833,7 @@ RelatedObjects=Povezani objekti
 ClassifyBilled=Klasificiraj kao fakturisano
 ClassifyUnbilled=Klasificiraj kao nefakturisano
 Progress=Napredak
+ProgressShort=Progr.
 FrontOffice=Izlog
 BackOffice=Administracija
 View=Pogled
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Izvezi filtrirani spisak
 ExportList=Spisak za izvoz
 ExportOptions=Opcije izvoza
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Razno
 Calendar=Kalendar
 GroupBy=Grupiranje po...
@@ -854,7 +859,7 @@ Download=Skidanje
 DownloadDocument=Skidanje dokumenta
 ActualizeCurrency=Ažuriraj kurs valute
 Fiscalyear=Fiskalna godina
-ModuleBuilder=Kreator modula
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Postavi valutu
 BulkActions=Masovne akcije
 ClickToShowHelp=Klikni za prikaz pomoći
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index 7b57e4d21d3..8542f3cb28e 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=Članovi
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=Kasno
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Obriši
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Plaćanje preplate
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/bs_BA/modulebuilder.lang b/htdocs/langs/bs_BA/modulebuilder.lang
index 5f920bbb5f5..fefb15abedc 100644
--- a/htdocs/langs/bs_BA/modulebuilder.lang
+++ b/htdocs/langs/bs_BA/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/bs_BA/paybox.lang b/htdocs/langs/bs_BA/paybox.lang
index a902d6c7c97..062e8c63720 100644
--- a/htdocs/langs/bs_BA/paybox.lang
+++ b/htdocs/langs/bs_BA/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Izvrši plaćanje
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Sljedeće
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/bs_BA/paypal.lang b/htdocs/langs/bs_BA/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/bs_BA/paypal.lang
+++ b/htdocs/langs/bs_BA/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 79641a72d7f..862b203c33a 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 703e4c700e4..ca0285ca234 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectRef=Project ref.
-ProjectId=Project Id
-ProjectLabel=Project label
-ProjectsArea=Projects Area
-ProjectStatus=Project status
+RefProject=Ref. projekat
+ProjectRef=Projekt ref.
+ProjectId=Projekt Id
+ProjectLabel=Oznaka projekta
+ProjectsArea=Područje projekta
+ProjectStatus=Status projekta
 SharedProject=Zajednički projekti
 PrivateProject=Kontakti projekta
 ProjectsImContactFor=Projects for I am explicitly a contact
-AllAllowedProjects=All project I can read (mine + public)
+AllAllowedProjects=Svi projekti koje mogu gledati (moji + javni)
 AllProjects=Svi projekti
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=Ovaj pregled ograničen je na projekte u kojima ste stavljeni kao kontakt
 ProjectsPublicDesc=Ovaj pregled predstavlja sve projekte koje možete čitati.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Ovaj pregled predstavlja sve projekte ili zadatke koje možete čitati.
@@ -23,13 +23,13 @@ TasksPublicDesc=Ovaj pregled predstavlja sve projekte ili zadatke koje možete 
 TasksDesc=Ovaj pregled predstavlja sve projekte i zadatke (postavke vaših korisničkih dozvola vam omogućavaju da vidite sve).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
-ImportDatasetTasks=Tasks of projects
-ProjectCategories=Project tags/categories
+ImportDatasetTasks=Zadaci projekata
+ProjectCategories=Projekt oznake/kategorije
 NewProject=Novi projekat
-AddProject=Create project
+AddProject=Napravi projekat
 DeleteAProject=Obisati projekat
 DeleteATask=Obrisati zadatak
-ConfirmDeleteAProject=Are you sure you want to delete this project?
+ConfirmDeleteAProject=Jeste li sigurni da želite obrisati ovaj projekat?
 ConfirmDeleteATask=Are you sure you want to delete this task?
 OpenedProjects=Open projects
 OpenedTasks=Open tasks
@@ -45,8 +45,9 @@ TimeSpent=Vrijeme provedeno
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Vrijeme provedeno
-RefTask=Ref. zadatka
-LabelTask=Oznaka zadatka
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Korisnik
 TaskTimeNote=Napomena
diff --git a/htdocs/langs/bs_BA/stripe.lang b/htdocs/langs/bs_BA/stripe.lang
index 38cda02ce58..1ce18d76333 100644
--- a/htdocs/langs/bs_BA/stripe.lang
+++ b/htdocs/langs/bs_BA/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditor
 PaymentCode=Payment code
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Sljedeće
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index c8b9960b0b0..aa367a744ab 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index fbc9f3dc1a1..73fa80f097f 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Comptabilització d'informes de despeses
 CreateMvts=Crea una nova transacció
 UpdateMvts=Modificació d'una transacció
 ValidTransaction=Valida l'assentament
-WriteBookKeeping=Registrar moviments al Llibre Major
+WriteBookKeeping=Registreu les transaccions a Ledger
 Bookkeeping=Llibre major
 AccountBalance=Compte saldo
 ObjectsRef=Referència de l'objecte origen
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable per a registrar les don
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable per defecte per als productes comprats (utilitzat si no es defineix en el full de producte)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte comptable per defecte pels productes venuts (s'utilitza si no es defineix en el full de producte)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Compte comptable per defecte pels productes venuts a la CEE (s'utilitza si no es defineix en el full de producte)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Compte comptable per defecte pels productes venuts d'exportació (s'utilitza si no es defineix en el full de producte)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Compte comptable per defecte pels productes venuts a la CEE (s'utilitza si no es defineix en el full de producte)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Compte comptable per defecte pels productes venuts d'exportació (s'utilitza si no es defineix en el full de producte)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable per defecte per als serveis adquirits (s'utilitza si no es defineix en el full de servei)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable per defecte per als serveis venuts (s'utilitza si no es defineix en el full de servei)
 
@@ -177,6 +177,7 @@ LabelAccount=Etiqueta de compte
 LabelOperation=Etiqueta de l'operació
 Sens=Significat
 LetteringCode=Codi de retolació
+Lettering=Lletres
 Codejournal=Diari
 JournalLabel=Títol de Diari
 NumPiece=Número de peça
@@ -288,8 +289,10 @@ Modelcsv_quadratus=Exporta a Quadratus QuadraCompta
 Modelcsv_ebp=Exporta a EBP
 Modelcsv_cogilog=Exporta a Cogilog
 Modelcsv_agiris=Exporta a Agiris
+Modelcsv_openconcerto=Exporta per a OpenConcerto (Test)
 Modelcsv_configurable=Exporta CSV configurable
-Modelcsv_FEC=Exportació FEC (Art. L47 A) (prova)
+Modelcsv_FEC=Exporta FEC (art. L47 A)
+Modelcsv_Sage50_Swiss=Exportació per Sage 50 Switzerland
 ChartofaccountsId=Id pla comptable
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=Aquesta pàgina pot ser utilitzat per establir un compte per
 DefaultClosureDesc=Aquesta pàgina es pot utilitzar per configurar els paràmetres que s'utilitzaran per incloure un balanç.
 Options=Opcions
 OptionModeProductSell=En mode vendes
+OptionModeProductSellIntra=Les vendes de mode exportades a la CEE
+OptionModeProductSellExport=Les vendes de mode exportades a altres països
 OptionModeProductBuy=En mode compres
 OptionModeProductSellDesc=Mostra tots els productes amb compte comptable per a les vendes.
+OptionModeProductSellIntraDesc=Mostra tots els productes amb compte comptable per a les vendes en CEE.
+OptionModeProductSellExportDesc=Mostra tots els productes amb compte comptable per a altres vendes a l’estranger.
 OptionModeProductBuyDesc=Mostra tots els productes amb compte comptable per a les compres.
 CleanFixHistory=Eliminar el codi comptable de les línies que no existeixen als gràfics de compte
 CleanHistory=Reinicia tota la comptabilització per l'any seleccionat
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 7ae10d6560e..54d7428262b 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=També si tenen un gran número de tercers (> 10
 UseSearchToSelectContactTooltip=També si vostè té un gran número de tercers (> 100.000), pot augmentar la velocitat mitjançant l'estableciment. CONTACT_DONOTSEARCH_ANYWHERE amb la constant a 1 a Configuració --> Altres. La cerca serà limitada a la creació de la cadena
 DelaiedFullListToSelectCompany=Esperar fins que es prem una tecla abans de carregar el contingut de la llista combinada de Tercers. <br> Això pot augmentar el rendiment si teniu un gran nombre de tercers, però és menys convenient.
 DelaiedFullListToSelectContact=Esperar fins que es prem una tecla abans de carregar el contingut de la llista combinada de Contactes. <br>Això pot augmentar el rendiment si teniu un gran nombre de tercers, però és menys convenient.
-NumberOfKeyToSearch=Nombre de caràcters per a desencadenar la cerca: %s
+NumberOfKeyToSearch=Nombre de caràcters per activar la cerca: %s
+NumberOfBytes=Nombre de bytes
+SearchString=Cerca cadena
 NotAvailableWhenAjaxDisabled=No disponible quan Ajax estigui desactivat
 AllowToSelectProjectFromOtherCompany=En un document d'un tercer, pots triar un projecte enllaçat a un altre tercer
 JavascriptDisabled=Javascript desactivat
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=Aquest és el nom del camp HTML. Son necessaris conei
 PageUrlForDefaultValues=Has d'introduir aquí l'URL relatiu de la pàgina. Si inclous paràmetres a l'URL, els valors predeterminats seran efectius si tots els paràmetres s'estableixen en el mateix valor.
 PageUrlForDefaultValuesCreate=<br> Exemple: <br> Per al formulari per crear una nou tercer, és <strong> %s </strong>. <br> Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no incloeu "custom/", així que utilitzeu una ruta com <strong> mymodule / mypage.php </strong> i no custom/mymodule/mypage.php. <br> Si voleu un valor predeterminat només si la url té algun paràmetre, podeu utilitzar <strong> %s</strong>
 PageUrlForDefaultValuesList=<br> Exemple: <br> Per a la pàgina que llista els tercers, és <strong> %s </strong>. <br> Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no incloeu "custom/" utilitzeu una ruta com <strong> mymodule/mypagelist.php </strong> i no custom/mymodule/mypagelist.php. <br> Si voleu un valor predeterminat només si la url té algun paràmetre, podeu utilitzar <strong> %s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=També tingueu en compte que sobreescriure valors predeterminats per a la creació de formularis funciona només per a pàgines dissenyades correctament (de manera que amb el paràmetre action = create o presend ...)
 EnableDefaultValues=Activa la personalització dels valors predeterminats
 EnableOverwriteTranslation=Habilita l'ús de la traducció sobreescrita
 GoIntoTranslationMenuToChangeThis=S'ha trobat una traducció per a la clau amb aquest codi. Per canviar aquest valor, heu d'editar-lo des de  Inici-Configuració-Traducció.
@@ -541,7 +544,7 @@ Module80Desc=Enviaments i gestió de notes de lliurament
 Module85Name=Bancs i Efectiu
 Module85Desc=Gestió de comptes bancaris o efectiu
 Module100Name=Lloc extern
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module100Desc=Afegiu un enllaç a un lloc web extern com a icona del menú principal. El lloc web es mostra en un marc sota el menú superior.
 Module105Name=Mailman i SPIP
 Module105Desc=Interfície amb Mailman o SPIP pel mòdul de Socis
 Module200Name=LDAP
@@ -632,7 +635,7 @@ Module50200Name=Paypal
 Module50200Desc=Ofereix als clients una pàgina de pagament en línia de PayPal (compte PayPal o targetes de crèdit / dèbit). Això es pot utilitzar per permetre als vostres clients fer pagaments o pagaments ad-hoc relacionats amb un objecte Dolibarr específic (factura, ordre, etc ...)
 Module50300Name=Stripe
 Module50300Desc=Oferiu als clients una pàgina de pagament en línia de Stripe (targetes de crèdit / dèbit). Això es pot utilitzar per permetre als vostres clients fer pagaments o pagaments ad-hoc relacionats amb un objecte Dolibarr específic (factura, ordre, etc ...)
-Module50400Name=Accounting (double entry)
+Module50400Name=Comptabilitat (doble entrada)
 Module50400Desc=Gestió comptable (entrades dobles, suport general i llibres majors auxiliars). Exporta el llibre major en diversos altres formats de programari de comptabilitat.
 Module54000Name=PrintIPP
 Module54000Desc=L'impressió directa (sense obrir els documents) utilitza l'interfície Cups IPP (L'impressora té que ser visible pel servidor i CUPS té que estar instal·lat en el servidor)
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Nom del servidor virtual
 OS=SO
 PhpWebLink=Enllaç Web-PHP
-Browser=Navegador
 Server=Servidor
 Database=Base de dades
 DatabaseServer=Host de la base de dades
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Mòdul de numeració de factures i abonaments
 BillsPDFModules=Models de documents de factures
 BillsPDFModulesAccordindToInvoiceType=Model de documents de factures d'acord amb el tipus de factura
 PaymentsPDFModules=Models de documents de pagament
-CreditNote=Abonament
-CreditNotes=Abonaments
 ForceInvoiceDate=Forçar la data de factura a la data de validació
 SuggestedPaymentModesIfNotDefinedInInvoice=Formes de pagament suggerides per a les factures si no estan definides explícitament
 SuggestPaymentByRIBOnAccount=Suggereix el pagament per retirada per compte
@@ -1711,8 +1711,8 @@ SomethingMakeInstallFromWebNotPossible2=Per aquest motiu, el procés d'actualitz
 InstallModuleFromWebHasBeenDisabledByFile=La instal·lació de mòduls externs des de l'aplicació es troba desactivada per l'administrador. Ha de requerir que elimini l'arxiu <strong>%s</strong> per habilitar aquesta funció
 ConfFileMustContainCustom=Per instal·lar o crear un mòdul extern desde l'aplicació es necessita desar els fitxers del mòdul en el directori <strong>%s</strong>. Per permetre a Dolibarr el processament d'aquest directori, has de configurar el teu <strong>conf/conf.php</strong> afegint aquestes 2 línies:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Remarca línies de la taula quan el ratolí passi per sobre
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+HighlightLinesColor=Ressalteu el color de la línia quan el ratolí passa (utilitzeu 'ffffff' per no ressaltar)
+HighlightLinesChecked=Ressalteu el color de la línia quan està marcada (utilitzeu 'ffffff' per no ressaltar)
 TextTitleColor=Color del text del títol de la pàgina
 LinkColor=Color dels enllaços
 PressF5AfterChangingThis=Prem CTRL+F5 en el teclat o neteja la memòria cau del navegador després de canviar aquest valor per fer-ho efectiu
@@ -1819,7 +1819,7 @@ ChartLoaded=Gràfic de compte carregat
 SocialNetworkSetup=Configuració del mòdul de Xarxes socials
 EnableFeatureFor=Activa les funcions de <strong> %s </strong>
 VATIsUsedIsOff=Nota: L'opció d'utilitzar l'impost de vendes o l'IVA s'ha establert a <strong> Desconnectada </strong> al menú %s - %s, de manera que l'impost sobre vendes o Vat utilitzat sempre serà de 0 per vendes.
-SwapSenderAndRecipientOnPDF=Adreçar el remitent i l'adreça del destinatari en PDF
+SwapSenderAndRecipientOnPDF=Intercanvieu la posició de l'adreça del remitent i del destinatari en documents PDF
 FeatureSupportedOnTextFieldsOnly=Advertència, funció només compatible amb camps de text. També s'ha d'establir un paràmetre d'URL action = create o action = edit ha de ser OR el nom de la pàgina ha de finalitzar amb 'new.php' per activar aquesta funció.
 EmailCollector=Col lector de correu electrònic
 EmailCollectorDescription=Afegiu una tasca programada i una pàgina de configuració per escanejar regularment caixes de correu electrònic (utilitzant el protocol IMAP) i registreu els correus electrònics rebuts a la vostra aplicació, al lloc adequat i / o creeu alguns registres automàticament (com a clients potencials).
@@ -1828,28 +1828,30 @@ EMailHost=Servidor IMAP de correu electrònic
 MailboxSourceDirectory=Directori d'origen de la bústia
 MailboxTargetDirectory=Directori de destinació de la bústia
 EmailcollectorOperations=Operacions a realitzar per col·leccionista
+MaxEmailCollectPerCollect=Nombre màxim de correus electrònics recopilats per recollida
 CollectNow=Recolliu ara
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+ConfirmCloneEmailCollector=Esteu segur que voleu clonar el recollidor de correu electrònic %s?
+DateLastCollectResult=Data del darrer intent de recollida
+DateLastcollectResultOk=Data de la darrera recollida amb èxit
 LastResult=Últim resultat
 EmailCollectorConfirmCollectTitle=Confirmació de recollida de correu electrònic
 EmailCollectorConfirmCollect=Voleu executar la col · lecció per aquest col · leccionista ara?
 NoNewEmailToProcess=No hi ha cap altre correu electrònic (filtres coincidents) per processar
 NothingProcessed=No s'ha fet res
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s correus electrònics qualificats, %s correus electrònics processats amb èxit (per %s registre / accions realitzades)
 RecordEvent=Registre d'esdeveniments de correu electrònic
 CreateLeadAndThirdParty=Crea Client Potencial (i tercer si és necessari)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Crear tiquet (i tercers si cal)
 CodeLastResult=Últim codi retornat
 NbOfEmailsInInbox=Nombre de correus electrònics en el directori font
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+LoadThirdPartyFromName=Carregueu la cerca de tercers al %s (només carrega)
+LoadThirdPartyFromNameOrCreate=Carregueu la cerca de tercers a %s (crear si no es troba)
 WithDolTrackingID=Trobat l'ID de seguiment de Dolibarr
 WithoutDolTrackingID=No s'ha trobat l'ID de seguiment de Dolibarr
 FormatZip=Codi postal
 MainMenuCode=Codi d'entrada del menú (menu principal)
 ECMAutoTree=Mostra l'arbre ECM automàtic
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Definiu els valors a utilitzar per a l’acció o com extreure valors. Per exemple: <br> objproperty1 = SET: abc <br> objproperty1 = SET: un valor amb substitució de __objpropietat1__ <br> objproperty3 = SETIFEMPTY: abc <br> objproperty4 = EXTRACTE: HEADER: X-Myheaderkey. * [^ s] + (. *) <br> options_myextrafield = EXTRACTE: ASSIGNATURA: ([^ s] *) <br> object.objproperty5 = EXTRACTE: COS: el nom de la meva empresa és ([^ s] *) <br><br> Utilitza un; char com a separador per extreure o establir diverses propietats.
 OpeningHours=Horari d'obertura
 OpeningHoursDesc=Introduïu aquí l'horari habitual d'obertura de la vostra empresa.
 ResourceSetup=Configuració del mòdul de recursos
@@ -1877,8 +1879,15 @@ WarningValueHigherSlowsDramaticalyOutput=Advertència, els valors més alts fren
 DebugBarModuleActivated=Quan la barra de depuració del mòdul està activada frena molt la interfície
 EXPORTS_SHARE_MODELS=Els models d’exportació es comparteixen amb tothom
 ExportSetup=Configuració del mòdul Export
-InstanceUniqueID=Unique ID of the instance
+InstanceUniqueID=ID únic de la instància
 SmallerThan=Menor que
 LargerThan=Major que
-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/.
+IfTrackingIDFoundEventWillBeLinked=Tingueu en compte que si es troba un identificador de seguiment al correu electrònic entrant, l’esdeveniment s’enllaçarà automàticament als objectes relacionats.
+WithGMailYouCanCreateADedicatedPassword=Amb un compte de GMail, si heu activat la validació de dos passos, es recomana crear una segona contrasenya dedicada a l’aplicació en comptes d’utilitzar la contrasenya del vostre compte des de https://myaccount.google.com/.
+IFTTTSetup=Configuració del mòdul IFTTT
+IFTTT_SERVICE_KEY=Clau de servei IFTTT
+IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Clau de seguretat per assegurar l’URL del punt final utilitzat per IFTTT per enviar missatges al vostre Dolibarr.
+IFTTTDesc=Aquest mòdul està dissenyat per activar esdeveniments en IFTTT i / o per executar alguna acció en desencadenants externs IFTTT.
+UrlForIFTTT=Punt final d’URL per a IFTTT
+YouWillFindItOnYourIFTTTAccount=El trobareu al vostre compte IFTTT
+EndPointFor=Punt final per %s: %s
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index 6eff9f70e40..06260b04aa6 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Esdeveniments per a què Dolibarr crei una acció de forma automà
 EventRemindersByEmailNotEnabled=Els recordatoris d'esdeveniments per correu electrònic no estaven habilitats en la configuració del mòdul %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tercer %s creat
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contracte %s validat
 CONTRACT_DELETEInDolibarr=Contracte %s eliminat
 PropalClosedSignedInDolibarr=Pressupost %s firmat
@@ -95,7 +96,8 @@ PROJECT_MODIFYInDolibarr=Projecte %s modificat
 PROJECT_DELETEInDolibarr=S'ha eliminat el projecte %s
 TICKET_CREATEInDolibarr=S'ha creat el tiquet %s
 TICKET_MODIFYInDolibarr=S'ha modificat el tiquet %s
-TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_ASSIGNEDInDolibarr=S'ha assignat el bitllet %s
+TICKET_CLOSEInDolibarr=Tiquet %s tancat
 TICKET_DELETEInDolibarr=S'ha esborrat el tiquet %s
 ##### End agenda events #####
 AgendaModelModule=Plantilles de documents per esdeveniments
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index 410fb07e2e5..dc6e05e8513 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -7,7 +7,7 @@ BankName=Nom del banc
 FinancialAccount=Compte
 BankAccount=Compte bancari
 BankAccounts=Comptes bancaris
-BankAccountsAndGateways=Banc | Passarel·les
+BankAccountsAndGateways=Comptes bancaris | Passarel·les
 ShowAccount=Mostrar el compte
 AccountRef=Ref. compte financer
 AccountLabel=Etiqueta compte financer
@@ -30,7 +30,7 @@ AllTime=Des del principi
 Reconciliation=Conciliació
 RIB=Compte bancari
 IBAN=Identificador IBAN
-BIC=Identificador BIC/SWIFT
+BIC=Codi BIC/SWIFT
 SwiftValid=BIC/SWIFT vàlid
 SwiftVNotalid=BIC/SWIFT no vàlid
 IbanValid=BAN vàlid
@@ -42,11 +42,11 @@ AccountStatementShort=Extracte
 AccountStatements=Extractes
 LastAccountStatements=Últims extractes bancaris
 IOMonthlyReporting=Informe mensual E/S
-BankAccountDomiciliation=Domiciliació de compte
+BankAccountDomiciliation=Dades bancàries
 BankAccountCountry=País del compte
 BankAccountOwner=Nom del titular del compte
 BankAccountOwnerAddress=Direcció del titular del compte
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+RIBControlError=Ha fallat el control d'integritat. Això significa que la informació d'aquest compte bancari és incompleta o incorrecta (comprova el pais, els dígits i l'IBAN)
 CreateAccount=Crear compte
 NewBankAccount=Nou compte
 NewFinancialAccount=Nou compte financer
@@ -76,7 +76,7 @@ TransactionsToConciliate=Registres a conciliar
 Conciliable=Conciliable
 Conciliate=Conciliar
 Conciliation=Conciliació
-SaveStatementOnly=Save statement only
+SaveStatementOnly=Guardar sols extracte
 ReconciliationLate=Reconciliació tardana
 IncludeClosedAccount=Incloure comptes tancats
 OnlyOpenedAccount=Només comptes oberts
@@ -98,14 +98,14 @@ BankLineConciliated=Registre conciliat
 Reconciled=Conciliat
 NotReconciled=No conciliat
 CustomerInvoicePayment=Cobrament a client
-SupplierInvoicePayment=Pagament a proveïdor
+SupplierInvoicePayment=Pagament al proveïdor
 SubscriptionPayment=Pagament de quota
 WithdrawalPayment=Cobrament de domiciliació
 SocialContributionPayment=Pagament d'impostos varis
 BankTransfer=Transferència bancària
 BankTransfers=Transferències bancàries
 MenuBankInternalTransfer=Transferència interna
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Traspassa d'un compte a un altre, Dolibarr generarà dos registres (dèbit en compte origen i crèdit en compte destí). Per aquesta transacció s'utilitzarà el mateix import (excepte el signe), l'etiqueta i la data).
 TransferFrom=De
 TransferTo=Cap a
 TransferFromToDone=La transferència de <b>%s</b> cap a <b>%s</b> de <b>%s</b> %s s'ha creat.
@@ -117,7 +117,7 @@ ConfirmDeleteCheckReceipt=Vols eliminar aquesta remesa de xec?
 BankChecks=Xec bancari
 BankChecksToReceipt=Xecs en espera de l'ingrés
 ShowCheckReceipt=Mostra la remesa d'ingrés de xec
-NumberOfCheques=No. of check
+NumberOfCheques=Nº de xec
 DeleteTransaction=Eliminar registre
 ConfirmDeleteTransaction=Esteu segur de voler eliminar aquesta registre?
 ThisWillAlsoDeleteBankRecord=Açò eliminarà també els registres bancaris generats
@@ -136,8 +136,8 @@ BankTransactionLine=Registre bancari
 AllAccounts=Tots els comptes bancaris i en efectiu
 BackToAccount=Tornar al compte
 ShowAllAccounts=Mostra per a tots els comptes
-FutureTransaction=Transaction in future. No way to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+FutureTransaction=Transacció futura. No és possible conciliar.
+SelectChequeTransactionAndGenerate=Selecciona/filtra els xecs a incloure en la remesa de xecs a ingressar i fes clic a "Crea".
 InputReceiptNumber=Selecciona l'estat del compte bancari relacionat amb la conciliació. Utilitza un valor numèric que es pugui ordenar: AAAAMM o AAAAMMDD
 EventualyAddCategory=Eventualment, indiqui una categoria en la qual classificar els registres
 ToConciliate=A conciliar?
@@ -154,14 +154,16 @@ RejectCheckDate=Data de devolució del xec
 CheckRejected=Xec retornat
 CheckRejectedAndInvoicesReopened=Xec retornat i factures reobertes
 BankAccountModelModule=Plantilles de documents per comptes bancaris
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
+DocumentModelSepaMandate=Plantilla per a mandat SEPA. Vàlid només per a països europeus de la CEE.
 DocumentModelBan=Plantilla per imprimir una pàgina amb informació BAN
-NewVariousPayment=Nou pagament varis
-VariousPayment=Pagaments varis
+NewVariousPayment=Nou pagament divers
+VariousPayment=Pagament divers
 VariousPayments=Pagaments varis
-ShowVariousPayment=Mostra els pagaments varis
-AddVariousPayment=Afegir pagaments extres
+ShowVariousPayment=Mostra pagaments diversos
+AddVariousPayment=Afegiu pagaments diversos
 SEPAMandate=Mandat SEPA
 YourSEPAMandate=La vostra ordre SEPA
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+FindYourSEPAMandate=Aquest és el vostre mandat de SEPA per autoritzar a la nostra empresa a realitzar un ordre de dèbit directe al vostre banc. Gràcies per retornar-la signada (escanejar el document signat) o envieu-lo per correu a
+AutoReportLastAccountStatement=Ompliu automàticament el camp "nombre d'extracte bancari" amb l'últim número de l'extracte al fer la conciliació
+CashControl=Tancar Efectiu del Punt de Venda
+NewCashFence=Nou tancament d'efectiu
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index c615038b4ed..570a7b34517 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=en divisa de factures
 PaidBack=Reemborsat
 DeletePayment=Elimina el pagament
 ConfirmDeletePayment=Esteu segur de voler eliminar aquest pagament?
-ConfirmConvertToReduc=Voleu convertir %s en un descompte absolut? <br> L'import es guardarà entre tots els descomptes i es podria utilitzar com a descompte per a una factura actual o futura per a aquest client.
-ConfirmConvertToReducSupplier=Voleu convertir %s en un descompte absolut? <br> L'import es guardarà entre tots els descomptes i es podria utilitzar com a descompte per a una factura actual o futura per a aquest venedor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Pagaments a proveïdors
 ReceivedPayments=Pagaments rebuts
 ReceivedCustomersPayments=Cobraments rebuts de clients
@@ -89,7 +91,6 @@ PaymentTerm=Condicions de pagament
 PaymentConditions=Condicions de pagament
 PaymentConditionsShort=Condicions de pagament
 PaymentAmount=Import pagament
-ValidatePayment=Validar aquest pagament
 PaymentHigherThanReminderToPay=Pagament superior a la resta a pagar
 HelpPaymentHigherThanReminderToPay=Atenció, l'import del pagament d'una o més factures és superior a la resta a pagar.<br>Corregiu la entrada, en cas contrari, confirmeu i pensi en crear un abonament d'allò percebut en excés per cada factura sobrepagada.
 HelpPaymentHigherThanReminderToPaySupplier=Atenció, l'import del pagament d'una o més factures és superior 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Valida les factures automàticament
 GeneratedFromRecurringInvoice=Generat des de la plantilla de factura recurrent %s
 DateIsNotEnough=Encara no s'ha arribat a la data
 InvoiceGeneratedFromTemplate=La factura %s s'ha generat des de la plantilla de factura recurrent %s
+GeneratedFromTemplate=Generat a partir de la plantilla factura %s
 WarningInvoiceDateInFuture=Alerta, la data de factura és major que la data actual
 WarningInvoiceDateTooFarInFuture=Alerta, la data de factura és molt antiga respecte la data actual
 ViewAvailableGlobalDiscounts=Veure descomptes disponibles
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index 16295644165..f4c80787b1e 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=IVA per grups als tiquets
 AutoPrintTickets=Imprimeix automàticament els tiquets
 EnableBarOrRestaurantFeatures=Habiliteu funcions per a bar o restaurant
 ConfirmDeletionOfThisPOSSale=Confirmeu la supressió de la venda actual?
+History=Històric
+ValidateAndClose=Valida i tanca
+Terminal=Terminal
+NumberOfTerminals=Nombre de terminals
+TerminalSelect=Selecciona el terminal que vols utilitzar:
+POSTicket=Tiquet TPV
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index a368ba39d75..9721e179a83 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -28,7 +28,7 @@ AliasNames=Àlies (nom comercial, marca, ...)
 AliasNameShort=Nom comercial
 Companies=Empreses
 CountryIsInEEC=Pais dins de la Comunitat Econòmica Europea
-PriceFormatInCurrentLanguage=Format del preu en la llengua actual
+PriceFormatInCurrentLanguage=Format de visualització de preus en l'idioma i la moneda actuals
 ThirdPartyName=Nom del tercer
 ThirdPartyEmail=Correu electrònic del tercer
 ThirdParty=Tercer
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index f6d21fe4a61..35cad091b15 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Afegeix un impost varis
 ContributionsToPay=Impostos varis a pagar
 AccountancyTreasuryArea=Àrea de facturació i pagament
 NewPayment=Nou pagament
-Payments=Pagaments
 PaymentCustomerInvoice=Cobrament factura a client
 PaymentSupplierInvoice=Pagament de la factura del proveïdor
 PaymentSocialContribution=Pagament d'impost varis
@@ -112,7 +111,7 @@ SocialContributionsPayments=Pagaments d'impostos varis
 ShowVatPayment=Veure pagaments IVA
 TotalToPay=Total a pagar
 BalanceVisibilityDependsOnSortAndFilters=El balanç es visible en aquest llistat només si la taula està ordenada de manera ascendent sobre %s i filtrada per 1 compte bancari
-CustomerAccountancyCode=Codi de comptable del client
+CustomerAccountancyCode=Codi comptable del client
 SupplierAccountancyCode=Codi comptable del proveïdor
 CustomerAccountancyCodeShort=Codi compt. cli.
 SupplierAccountancyCodeShort=Codi compt. prov.
@@ -205,7 +204,6 @@ SellsJournal=Diari de vendes
 PurchasesJournal=Diari de compres
 DescSellsJournal=Diari de vendes
 DescPurchasesJournal=Diari de compres
-InvoiceRef=Ref. factura
 CodeNotDef=No definit
 WarningDepositsNotIncluded=Les factures de bestreta no estan incloses en aquesta versió amb aquest mòdul de comptabilitat.
 DatePaymentTermCantBeLowerThanObjectDate=La data límit de pagament no pot ser inferior a la data de l'objecte
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index 39f929681d7..133a45d08fb 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -64,7 +64,8 @@ DateStartRealShort=Data inici
 DateEndReal=Data real finalització del servei
 DateEndRealShort=Data real finalització
 CloseService=Finalitzar servei
-BoardRunningServices=Serveis actius expirats
+BoardRunningServices=Serveis en execució
+BoardExpiredServices=Els serveis han caducat
 ServiceStatus=Estat del servei
 DraftContracts=Contractes esborrany
 CloseRefusedBecauseOneServiceActive=El contracte no es pot tancar ja que almenys hi ha un servei obert
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index 4eca72bb589..f5bd7a1a199 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -12,7 +12,7 @@ OrToLaunchASpecificJob=O per llançar una tasca específica
 KeyForCronAccess=Codi de seguretat per a la URL de llançament de tasques automàtiques
 FileToLaunchCronJobs=Línia de comando per verificar i executar tasques cron qualificades
 CronExplainHowToRunUnix=A entorns Unix s'ha d'utilitzar la següent entrada crontab per executar la comanda cada 5 minuts
-CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=En l'entorn de Microsoft (tm) de Windows, podeu utilitzar les Eines de tasques programades per executar la línia de comandaments cada 5 minuts
 CronMethodDoesNotExists=La classe %s no conté cap mètode %s
 CronJobDefDesc=Els perfils de tasques programades es defineixen a la fitxa del mòdul descriptor. Quan s'activa el mòdul, es carreguen i estan disponibles per poder administrar les tasques des del menú d'eines d'administració %s.
 CronJobProfiles=Llista de perfils predefinits de tasques programades
@@ -61,11 +61,11 @@ CronStatusInactiveBtn=Desactivar
 CronTaskInactive=Aquesta tasca es troba desactivada
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-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>
+CronModuleHelp=Nom del directori del mòdul de Dolibarr (també funciona amb mòduls externs). <BR> Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/<u>product</u>/class/product.class.php, el valor pel mòdul és <br><i>product</i>
+CronClassFileHelp=La ruta relativa i el nom del fitxer a carregar (la ruta és relativa al directori arrel del servidor web). <BR> Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/<u>product.class.php</u>, el valor del nom del fitxer de classe és<br> <i>product/class/product.class.php</i>
+CronObjectHelp=El nom de l'objecte a carregar. <BR> Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor pel nom del fitxer de classe és<br> <i>Product</i>
+CronMethodHelp=El mètode d'objecte a cridar. <BR> Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor pel mètode és<br> <i>fetch</i>
+CronArgsHelp=Els arguments del mètode. <BR> Per exemple, cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor dels paràmetres pot ser <br> <i>0, ProductRef</i>
 CronCommandHelp=El comando del sistema a executar
 CronCreateJob=Crear nova tasca programada
 CronFrom=De
@@ -79,5 +79,5 @@ CronCannotLoadObject=El "class file" %s s'ha carregat, però l'objecte %s no s'h
 UseMenuModuleToolsToAddCronJobs=Ves a menú "Inici - Utilitats de sistema - Tasques programades" per veure i editar les tasques programades.
 JobDisabled=Tasca desactivada
 MakeLocalDatabaseDumpShort=Còpia de seguretat de la base de dades local
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Crear un bolcat de la base de dades local. Els paràmetres són: compressió ('gz' o 'bz' o 'none'), tipus de còpia de seguretat ('mysql' o 'pgsql'), 1, 'auto' o nom de fitxer per a compilar, nombre de fitxers de còpia de seguretat per conservar
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 424af575d1e..f368041dded 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -216,7 +216,8 @@ ErrorDuringChartLoad=S'ha produït un error en carregar el gràfic de comptes. S
 ErrorBadSyntaxForParamKeyForContent=Sintaxi incorrecta per a la clau de contingut del paràmetre. Ha de tenir un valor que comenci per %s o %s
 ErrorVariableKeyForContentMustBeSet=Error, s'ha d'establir la constant amb el nom %s (amb contingut de text per mostrar) o %s (amb url extern per mostrar).
 ErrorURLMustStartWithHttp=L'URL %s ha de començar amb http: // o https: //
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorNewRefIsAlreadyUsed=Error, la nova referència ja s’està utilitzant
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 # Warnings
 WarningPasswordSetWithNoAccount=S'ha indicat una contrasenya per aquest soci. En canvi, no s'ha creat cap compte d'usuari, de manera que aquesta contrasenya s'ha desat però no pot ser utilitzada per entrar a Dolibarr. Es pot utilitzar per un mòdul/interfície extern, però si no cal definir cap usuari i contrasenya per un soci, pots deshabilitar la opció "Gestiona l'entrada per tots els socis" des de la configuració del mòdul Socis. Si necessites gestionar una entrada sense contrasenya, pots mantenir aquest camp buit i permetre aquest avís. Nota: El correu electrònic es pot utilitzar per entrar si el soci està enllaçat a un usuarí
 WarningMandatorySetupNotComplete=Feu clic aquí per configurar els paràmetres obligatoris
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index 6aec4a69a59..b5c01ff83a7 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=RRHH
-Holidays=Leave
-CPTitreMenu=Leave
+Holidays=Dies lliures
+CPTitreMenu=Dies lliures
 MenuReportMonth=Estat mensual
 MenuAddCP=Nova petició de dia lliure
-NotActiveModCP=You must enable the module Leave to view this page.
+NotActiveModCP=Ha d'activar el mòdul Dies lliures retribuïts per veure aquesta pàgina
 AddCP=Realitzar una petició de dies lliures
 DateDebCP=Data inici
 DateFinCP=Data fi
@@ -15,18 +15,18 @@ ApprovedCP=Aprovada
 CancelCP=Anul·lada
 RefuseCP=Rebutjada
 ValidatorCP=Validador
-ListeCP=List of leave
+ListeCP=Llista de dies lliures
 LeaveId=Identificador de baixa
 ReviewedByCP=Serà revisada per
 UserForApprovalID=Usuari per al ID d'aprovació
-UserForApprovalFirstname=First name of approval user
-UserForApprovalLastname=Last name of approval user
+UserForApprovalFirstname=Nom de l'usuari d'aprovació
+UserForApprovalLastname=Cognom de l'usuari d'aprovació
 UserForApprovalLogin=Login de l'usuari d'aprovació
 DescCP=Descripció
 SendRequestCP=Enviar la petició de dies lliures
 DelayToRequestCP=Les peticions de dies lliures s'han de realitzar al menys <b>%s dies</b> abans.
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+MenuConfCP=Saldo de dies lliures
+SoldeCPUser=El seu saldo de dies lliures es de <b>%s dies</b>
 ErrorEndDateCP=Ha d'indicar una data de fi superior a la data d'inici.
 ErrorSQLCreateCP=S'ha produït un error de SQL durant la creació:
 ErrorIDFicheCP=S'ha produït un error, aquesta sol·licitud de dies lliures no existeix
@@ -101,8 +101,8 @@ LEAVE_SICK=Baixa per enfermetat
 LEAVE_OTHER=Altres sortides
 LEAVE_PAID_FR=Vacances pagades
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+LastUpdateCP=Última actualització automàtica de reserva de dies lliures
+MonthOfLastMonthlyUpdate=Mes de la última actualització automàtica de reserva de dies lliures
 UpdateConfCPOK=Actualització efectuada correctament.
 Module27130Name= Gestió de dies lliures
 Module27130Desc= Gestió de dies lliures
@@ -112,7 +112,7 @@ NoticePeriod=Preavís
 HolidaysToValidate=Dies lliures retribuïts a validar
 HolidaysToValidateBody=A continuació trobara una sol·licitud de dies lliures retribuïts per validar
 HolidaysToValidateDelay=Aquesta sol·licitud de dies lliures retribuïts tindrà lloc en un termini de menys de %s dies.
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysToValidateAlertSolde=L'usuari que ha realitzat la sol·licitud de dies lliures retribuïts no disposa de suficients dies disponibles
 HolidaysValidated=Dies lliures retribuïts valids
 HolidaysValidatedBody=La seva sol·licitud de dies lliures retribuïts des de el %s al %s ha sigut validada.
 HolidaysRefused=Dies lliures retribuïts denegats
@@ -121,9 +121,10 @@ HolidaysCanceled=Dies lliures retribuïts cancel·lats
 HolidaysCanceledBody=La seva solicitud de dies lliures retribuïts del %s al %s ha sigut cancel·lada.
 FollowedByACounter=1: Aquest tipus de dia lliure necessita el seguiment d'un comptador. El comptador s'incrementa manualment o automàticament i quan hi ha una petició de dia lliure validada, el comptador es decrementa.<br>0: No seguit per un comptador.
 NoLeaveWithCounterDefined=No s'han definit els tipus de dies lliures que son necessaris per poder seguir-los amb comptador
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Holiday
-HolidaysNumberingModules=Leave requests numbering models
-TemplatePDFHolidays=Template for leave requests PDF
-FreeLegalTextOnHolidays=Free text on PDF
-WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+GoIntoDictionaryHolidayTypes=Ves a <strong>Inici - Configuració - Diccionaris - Tipus de dies lliures</strong> per configurar els diferents tipus de dies lliures
+HolidaySetup=Configuració del mòdul Vacances
+HolidaysNumberingModules=Models numerats de sol·licituds de dies lliures
+TemplatePDFHolidays=Plantilla de sol · licitud de dies lliures en PDF
+FreeLegalTextOnHolidays=Text gratuït a PDF
+WatermarkOnDraftHolidayCards=Marques d'aigua sobre esborranys de sol·licituds de dies lliures
+HolidaysToApprove=Vacances per aprovar
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 44dbb49a44c..47d7cc4e1b8 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Tema de correu electrònic
 MailText=Missatge
 MailFile=Fitxers adjunts
 MailMessage=Text utilitzat en el cos del missatge
+SubjectNotIn=No està subjecte
+BodyNotIn=No en el cos
 ShowEMailing=Mostrar E-Mailing
 ListOfEMailings=Llistat de E-Mailings
 NewMailing=Nou E-Mailing
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index b99ce6ef43a..a0f72a017cc 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentatge
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (exclòs)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (exclòs en moneda)
 TotalTTCShort=Total
 TotalHT=Total (sense IVA)
@@ -402,7 +403,7 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=RE
 LT2IN=IRPF
-LT1GC=Additionnal cents
+LT1GC=Cèntims addicionals
 VATRate=Taxa IVA
 VATCode=Codi de la taxa impositiva
 VATNPR=Taxa impositiva NPR
@@ -462,7 +463,7 @@ Duration=Duració
 TotalDuration=Duració total
 Summary=Resum
 DolibarrStateBoard=Estadístiques de base de dades
-DolibarrWorkBoard=Obrir elements
+DolibarrWorkBoard=Elements oberts
 NoOpenedElementToProcess=Sense elements oberts per processar
 Available=Disponible
 NotYetAvailable=Encara no disponible
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Envia el correu electrònic de confirmació
 SendMail=Envia e-mail
 Email=Correu
 NoEMail=Sense correu electrònic
-Email=Correu
 AlreadyRead=Ja llegides
 NotRead=No llegit
 NoMobilePhone=Sense mòbil
@@ -671,7 +671,6 @@ Method=Mètode
 Receive=Recepció
 CompleteOrNoMoreReceptionExpected=Completat o no s'espera res més
 ExpectedValue=Valor esperat
-CurrentValue=Valor actual
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Mai rebut
@@ -834,6 +833,7 @@ RelatedObjects=Objectes relacionats
 ClassifyBilled=Classificar facturat
 ClassifyUnbilled=Classificar no facturat
 Progress=Progrés
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=Veure
@@ -842,6 +842,11 @@ Exports=Exportacions
 ExportFilteredList=Llistat filtrat d'exportació
 ExportList=Llistat d'exportació
 ExportOptions=Opcions d'exportació
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Diversos
 Calendar=Calendari
 GroupBy=Agrupat per...
@@ -854,7 +859,7 @@ Download=Descarrega
 DownloadDocument=Baixar el document
 ActualizeCurrency=Actualitza el canvi de divisa
 Fiscalyear=Any fiscal
-ModuleBuilder=Creador de mòdul
+ModuleBuilder=Generador de mòduls i aplicacions
 SetMultiCurrencyCode=Estableix moneda
 BulkActions=Accions massives
 ClickToShowHelp=Fes clic per mostrar l'ajuda desplegable
@@ -968,5 +973,9 @@ Inventory=Inventari
 AnalyticCode=Codi analític
 TMenuMRP=MRP
 ShowMoreInfos=Mostra més informació
-NoFilesUploadedYet=Please upload a document first
+NoFilesUploadedYet=Carregueu primer un document
 SeePrivateNote=Veure nota privada
+PaymentInformation=Informació sobre el pagament
+ValidFrom=Vàlid des de
+ValidUntil=Vàlid fins
+NoRecordedUsers=No users
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 4c07b1bfdd6..4827becdaf6 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -6,7 +6,7 @@ Member=Soci
 Members=Socis
 ShowMember=Mostra la fitxa de soci
 UserNotLinkedToMember=Usuari no enllaçat a un soci
-ThirdpartyNotLinkedToMember=Tercer no enllaçat a un soci
+ThirdpartyNotLinkedToMember=Tercer no vinculat a un membre
 MembersTickets=Etiquetes de socis
 FundationMembers=Socis de l'entitat
 ListOfValidatedPublicMembers=Llistat de socis públics validats
@@ -67,7 +67,7 @@ Subscriptions=Afiliacions
 SubscriptionLate=En retard
 SubscriptionNotReceived=Afiliació no rebuda
 ListOfSubscriptions=Llista d'afiliacions
-SendCardByMail=Envia fitxa per e-mail
+SendCardByMail=Enviar una targeta per correu electrònic
 AddMember=Crea soci
 NoTypeDefinedGoToSetup=No s'ha definit cap tipus de soci. Ves al menú "Tipus de socis"
 NewMemberType=Nou tipus de soci
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Vols esborrar aquesta subscripció?
 Filehtpasswd=Arxiu htpasswd
 ValidateMember=Valida un soci
 ConfirmValidateMember=Vols validar aquest soci?
-FollowingLinksArePublic=Els enllaços següents són pàgines accessibles a tothom i no protegides per cap habilitació Dolibarr.
+FollowingLinksArePublic=Els següents enllaços són pàgines obertes que no estan protegides per cap permís Dolibarr. No tenen pàgines amb format, es proporciona com a exemple per mostrar com es llista la base de dades dels socis.
 PublicMemberList=Llistat públic de socis
 BlankSubscriptionForm=Formulari públic d'auto-subscripció
 BlankSubscriptionFormDesc=Dolibarr us pot proporcionar una URL/lloc web públic per permetre que els visitants externs sol·licitin subscriure's a la fundació. Si un mòdul de pagament en línia està habilitat, també es pot proporcionar automàticament un formulari de pagament.
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Enviant informació per correu electrònic a membre
 SendingEmailOnAutoSubscription=Enviament de correu electrònic amb registre automàtic
 SendingEmailOnMemberValidation=S'està enviant un correu electrònic amb la validació de membre nou
 SendingEmailOnNewSubscription=S'està enviant un correu electrònic amb una nova subscripció
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
+SendingReminderForExpiredSubscription=S'està enviant un recordatori per les subscripcions caducades
 SendingEmailOnCancelation=Enviant correu electrònic de cancel·lació
 # Topic of email templates
 YourMembershipRequestWasReceived=S'ha rebut la vostra subscripció.
@@ -124,16 +124,16 @@ CardContent=Contingut de la seva fitxa de soci
 ThisIsContentOfYourMembershipRequestWasReceived=Volem informar-li que s'ha rebut la vostra sol·licitud de subscripció. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=Volem informar-vos que la vostra subscripció s'ha validat amb la informació següent: <br> <br>
 ThisIsContentOfYourSubscriptionWasRecorded=Volem informar-vos que s'ha registrat la vostra nova subscripció. <br> <br>
-ThisIsContentOfSubscriptionReminderEmail=Volem informar-vos que la vostra subscripció està a punt de caducar. Esperem que la vulgueu renovar.<br><br>
-ThisIsContentOfYourCard=Això és un recordatori de la informació que obtenim sobre vostè. No dubti en contactar-nos si hi ha alguna cosa que sembla malament. <br> <br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Assumpte del e-mail rebut en cas d'auto-inscripció d'un convidat
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail rebut en cas d'auto-inscripció d'un convidat
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Correu electrònic de plantilla per utilitzar per enviar correus electrònics a un membre de la subscripció automàtica de membres
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Plantilla de correu electrònic per utilitzar per enviar correus electrònics a un membre en la validació de membre
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Plantilla de correu electrònic per utilitzar per enviar correus electrònics a un membre sobre la nova gravació de la subscripció
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Plantilla de correu electrònic per utilitzar per enviar correus electrònics quan la subscripció està a punt de caducar
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla de correu electrònic per utilitzar per enviar en la cancel·lació de membres
-DescADHERENT_MAIL_FROM=E-mail emissor per als e-mails automàtics
+ThisIsContentOfSubscriptionReminderEmail=Volem informar-vos que la vostra subscripció està a punt d'expirar o que ja ha caducat (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Esperem que la renovisqueu. <br> <br>
+ThisIsContentOfYourCard=Aquest és un resum de la informació que tenim sobre vostè. Poseu-vos en contacte amb nosaltres si hi ha alguna cosa incorrecta. <br> <br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Assumpte del correu electrònic de notificació rebut en cas d'inscripció automàtica d'un convidat
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Contingut del correu electrònic de notificació rebut en cas d'inscripció automàtica d'un convidat
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Plantilla de correu electrònic a utilitzar per enviar correus electrònics a un membre de la subscripció automàtica de membres
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Plantilla de correu electrònic que s'utilitzarà per enviar correus electrònics a un membre en la validació dels membres
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Plantilla de correu electrònic que s'utilitzarà per enviar un correu electrònic a un membre sobre la nova gravació de la subscripció
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Plantilla de correu electrònic que s'utilitzarà per enviar un recordatori de correu electrònic quan la subscripció estigui a punt de caducar
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla de correu electrònic a utilitzar per enviar un correu electrònic a un membre en la cancel·lació de membres
+DescADHERENT_MAIL_FROM=Correu electrònic del remitent per a correus electrònics automàtics
 DescADHERENT_ETIQUETTE_TYPE=Format pàgines etiquetes
 DescADHERENT_ETIQUETTE_TEXT=Text a imprimir a la direcció de les etiquetes de soci
 DescADHERENT_CARD_TYPE=Format pàgines de carnet
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generació de targetes per a tots els socis
 DocForOneMemberCards=Generació de targetes per a un soci en particular
 DocForLabels=Generació d'etiquetes d'adreces (Format de plantilla configurat actualment: <b>%s</b>)
 SubscriptionPayment=Pagament de quota
-LastSubscriptionDate=Data de l'última afiliació
-LastSubscriptionAmount=Últim import de subscripció
+LastSubscriptionDate=Data de l'últim pagament de subscripció
+LastSubscriptionAmount=Import de la subscripció més recent
 MembersStatisticsByCountries=Estadístiques de socis per país
 MembersStatisticsByState=Estadístiques de socis per província
 MembersStatisticsByTown=Estadístiques de socis per població
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Estadístiques dels membres per naturalesa
 MembersByNature=Aquesta pantalla mostra estadístiques de socis per caràcter.
 MembersByRegion=Aquesta pantalla mostra les estadístiques de socis per regió.
 VATToUseForSubscriptions=Taxa d'IVA per les afiliacions
-NoVatOnSubscription=Sense IVA per a les afiliacions
-MEMBER_PAYONLINE_SENDEMAIL=E-Mail per advertir en cas de recepció de confirmació d'un pagament validat d'una afiliació (Exemple: pagament-fet@exemple.com)
+NoVatOnSubscription=Sense IVA per subscripcions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producte utilitzat per la línia de subscripció a la factura: %s
 NameOrCompany=Nom o empresa
 SubscriptionRecorded=S'ha registrat la subscripció
 NoEmailSentToMember=No s'ha enviat un correu electrònic al membre
 EmailSentToMember=Correu electrònic enviat a membre a %s
 SendReminderForExpiredSubscriptionTitle=Enviar recordatori per correu electrònic per subscripció caducada
-SendReminderForExpiredSubscription=Enviar un recordatori per correu electrònic als membres quan la subscripció estigui a punt de caducar (el paràmetre és el nombre de dies abans de la finalització de la subscripció per enviar el recordatori)
+SendReminderForExpiredSubscription=Envia un recordatori per correu electrònic als socis quan l'afiliació estigui a punt de caducar (el paràmetre és una quantitat de dies abans de la finalització de l'afiliació per enviar el recordatori. Pot ser una llista de dies separats per un punt i coma, per exemple '10;5;0;-5')
+MembershipPaid=Membres pagats pel període actual (fins a %s)
+YouMayFindYourInvoiceInThisEmail=Podeu trobar la factura adjunta a aquest correu electrònic
+XMembersClosed=%s soci(s) tancat(s)
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 0382e0de755..4a80ecffc7c 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=Aquesta eina només ha de ser utilitzada per usuaris o desenvolupadors experimentats. Proporciona utilitats per crear o editar el vostre propi mòdul. La documentació per al desenvolupament manual alternatiu <a href="%s" target="_blank">és aquí</a> .
 EnterNameOfModuleDesc=Introdueix el nom del mòdul/aplicació per crear sense espais. Utilitza majúscules per separar paraules (Per exemple: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Introduïu el nom de l'objecte que voleu crear sense espais. Utilitzeu majúscules per separar paraules (Per exemple: MyObject, Estudiant, Professor...). El fitxer de classes CRUD, però també el fitxer API, pàgines per a llistar/afegir/editar/eliminar objectes i els fitxers SQL es generaran.
-ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc2=Camí on es generen / editen els mòduls (primer directori per als mòduls externs definits en %s): <strong> %s </strong>
 ModuleBuilderDesc3=S'han trobat mòduls generats/editables: <strong>%s</strong>
 ModuleBuilderDesc4=Es detecta un mòdul com "editable" quan el fitxer <strong>%s</strong> existeix al directori arrel del mòdul
 NewModule=Nou mòdul
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=Aquesta és la vista dels disparadors proporcionats pe
 ModuleBuilderDeschooks=Aquesta pestanya està dedicada als ganxos (hooks)
 ModuleBuilderDescwidgets=Aquesta pestanya està dedicada per crear/gestionar ginys
 ModuleBuilderDescbuildpackage=Pots generar aquí un fitxer de paquet "llest per distribuir" (un fitxer .zip normalitzat) del teu mòdul i un fitxer de documentació "llest per distribuir". Només cal que facis clic al botó per crear el paquet o el fitxer de documentació.
-EnterNameOfModuleToDeleteDesc=Podeu eliminar el mòdul. ADVERTIMENT: TOTS els fitxers del mòdul i les dades estructurades i la documentació seran eliminades.
-EnterNameOfObjectToDeleteDesc=Podeu eliminar un objecte. AVÍS: Tots els fitxers relacionats amb l'objecte seran eliminats.
+EnterNameOfModuleToDeleteDesc=Podeu suprimir el vostre mòdul. AVÍS: se suprimiran tots els fitxers de codificació del mòdul (generats o creats manualment) I la documentació estructurada i la documentació.
+EnterNameOfObjectToDeleteDesc=Podeu suprimir un objecte. AVÍS: Tots els fitxers de codificació (generats o creats manualment) relacionats amb l'objecte s'eliminaran.
 DangerZone=Zona perillosa
 BuildPackage=Construeix el paquet
+BuildPackageDesc=Podeu generar un paquet zip de la vostra aplicació de manera que estigueu a punt per distribuir-lo a qualsevol Dolibarr. També podeu distribuir-lo o vendre-lo al mercat com <a href="https://www.dolistore.com">DoliStore.com</a> .
 BuildDocumentation=Construeix documentació
 ModuleIsNotActive=Aquest mòdul encara no està activat. Aneu a %s per fer-lo en viu o feu clic aquí:
-ModuleIsLive=Aquest mòdul s'ha activat. Qualsevol canvi en ell pot trencar una característica activa actual.
+ModuleIsLive=Aquest mòdul ha estat activat. Qualsevol canvi pot trencar la funció actual en viu.
 DescriptionLong=Descripció llarga
 EditorName=Nom de l'editor
 EditorUrl=URL d'editor
@@ -40,13 +41,14 @@ PageForAgendaTab=Pàgina de PHP per a la pestanya d'esdeveniments
 PageForDocumentTab=Pàgina de PHP per a la pestanya de documents
 PageForNoteTab=Pàgina de PHP per a la pestanya de notes
 PathToModulePackage=Ruta al zip del paquet del mòdul/aplicació
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
+PathToModuleDocumentation=Camí al fitxer de la documentació del mòdul / aplicació (%s)
 SpaceOrSpecialCharAreNotAllowed=Els espais o caràcters especials no estan permesos.
 FileNotYetGenerated=El fitxer encara no s'ha generat
-RegenerateClassAndSql=Esborra i regenera fitxers de classe i sql
+RegenerateClassAndSql=Força l'actualització dels fitxers .class i .sql
 RegenerateMissingFiles=Genera els fitxers que falten
-SpecificationFile=File of documentation
+SpecificationFile=Fitxer de documentació
 LanguageFile=Arxiu del llenguatge
+ObjectProperties=Propietats de l'objecte
 ConfirmDeleteProperty=Estàs segur que vols eliminar la propietat <strong> %s </strong>? Això canviarà el codi a la classe PHP, però també eliminarà la columna de la definició de la taula de l'objecte.
 NotNull=No és NULL
 NotNullDesc=1=Estableix la base de dades a NOT NULL. -1=Permet els valors nuls i força el valor a ser NULL si és buit ('' ó 0).
@@ -62,9 +64,11 @@ ReadmeFile=Fitxer Readme
 ChangeLog=Fitxer ChangeLog
 TestClassFile=Fitxer per a la classe de proves Unit amb PHP
 SqlFile=Fitxer Sql
-PageForLib=Fitxer per a llibreries PHP
+PageForLib=Fitxer per a biblioteca PHP
+PageForObjLib=Fitxer per a la biblioteca PHP dedicada a l'objecte
 SqlFileExtraFields=Fitxer SQL per a atributs complementaris
 SqlFileKey=Fitxer Sql per a claus
+SqlFileKeyExtraFields=Fitxer Sql per a claus d'atributs complementaris
 AnObjectAlreadyExistWithThisNameAndDiffCase=Ja existeix un objecte amb aquest nom i un cas diferent
 UseAsciiDocFormat=Podeu utilitzar el format de Markdown, però es recomana utilitzar el format Asciidoc (pausa entre .md i .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=És una mesura
@@ -76,13 +80,15 @@ ListOfMenusEntries=Llista d'entrades de menú
 ListOfPermissionsDefined=Llista de permisos definits
 SeeExamples=Mira exemples aquí
 EnabledDesc=Condició per tenir activat aquest camp (Exemples: 1 ó $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example: preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
+VisibleDesc=El camp és visible? (Exemples: 0 = Mai visible, 1 = Visible a la llista i creació / creació / actualització / visualització de formularis, 2 = Visible només a la llista, 3 = Visible només en crear / actualitzar / visualitzar formulari (no llista), 4 = Visible a la llista i Formulari de visualització / actualització només (no crear). Si es fa servir un valor de valor negatiu, el camp no es mostra per defecte a la llista, però es pot seleccionar per veure-ho). Pot ser una expressió, per exemple: preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1
 IsAMeasureDesc=Es pot acumular el valor del camp per obtenir un total en la llista? (Exemples: 1 o 0)
 SearchAllDesc=El camp utilitzat per realitzar una cerca des de l'eina de cerca ràpida? (Exemples: 1 o 0)
 SpecDefDesc=Introduïu aquí tota la documentació que voleu proporcionar amb el vostre mòdul que encara no està definit per altres pestanyes. Podeu utilitzar .md o millor, la sintaxi enriquida .asciidoc.
 LanguageDefDesc=Introduïu a aquests fitxers, totes les claus i les traduccions per a cada fitxer d'idioma.
-MenusDefDesc=Definiu aquí els menús proporcionats pel vostre mòdul (un cop definits, són visibles en l'editor de menús %s)
-PermissionsDefDesc=Definiu aquí els nous permisos proporcionats pel vostre mòdul (una vegada definit, són visibles a la configuració de permisos del sistema %s)
+MenusDefDesc=Definiu aquí els menús proporcionats pel vostre mòdul
+PermissionsDefDesc=Definiu aquí els nous permisos proporcionats pel vostre mòdul
+MenusDefDescTooltip=Els menús proporcionats pel vostre mòdul / aplicació es defineixen a la matriu <strong>$ this-> menús</strong> al fitxer descriptor del mòdul. Podeu editar manualment aquest fitxer o utilitzar l’editor incrustat. <br><br> Nota: un cop definits (i el mòdul es reactiven), els menús també es visualitzen a l'editor de menús disponible per als usuaris administradors de %s.
+PermissionsDefDescTooltip=Els permisos proporcionats pel vostre mòdul / aplicació es defineixen a la matriu <strong>$ this-> rights</strong> al fitxer descriptor del mòdul. Podeu editar manualment aquest fitxer o utilitzar l’editor incrustat. <br><br> Nota: un cop definits (i el mòdul reactivat), els permisos es visualitzen a la configuració de permisos per defecte %s.
 HooksDefDesc=Definiu a la propietat <b>module_parts['hooks']</b>, en el descriptor del mòdul, el context dels "hooks" que voleu gestionar (una llista de contextos es pot trobar si cerqueu '<b>initHooks</b>' (en el codi del nucli de Dolibarr. <br> Editeu el fitxer del "hook" per afegir el codi de les vostres funcions "hookables" (les quals es poden trobar cercant "<b>executeHooks</b>" en el codi del nucli de Dolibarr).
 TriggerDefDesc=Definiu en el fitxer "trigger" el codi que voleu executar per a cada esdeveniment de negoci executat.
 SeeIDsInUse=Veure IDs en ús a la vostra instal·lació
@@ -101,12 +107,13 @@ UseDocFolder=Desactiva la carpeta de documentació
 UseSpecificReadme=Utilitzeu un ReadMe específic
 RealPathOfModule=Camí real del mòdul
 ContentCantBeEmpty=El contingut del fitxer no pot estar buit
-WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
-CLIDesc=You can generate here some command line scripts you want to provide with your module.
-CLIFile=CLI File
-NoCLIFile=No CLI files
-UseSpecificEditorName = Use a specific editor name
-UseSpecificEditorURL = Use a specific editor URL
-UseSpecificFamily = Use a specific family
-UseSpecificAuthor = Use a specific author
-UseSpecificVersion = Use a specific initial version
+WidgetDesc=Podeu generar i editar aquí els estris que s’incrustaran amb el vostre mòdul.
+CLIDesc=Podeu generar aquí alguns scripts de línia d’ordres que voleu proporcionar amb el vostre mòdul.
+CLIFile=Fitxer CLI
+NoCLIFile=Sense fitxers CLI
+UseSpecificEditorName = Utilitzeu un nom d’editor específic
+UseSpecificEditorURL = Utilitzeu editor específic URL
+UseSpecificFamily = Utilitzeu una família específica
+UseSpecificAuthor = Utilitzeu un autor específic
+UseSpecificVersion = Utilitzeu una versió inicial específica
+ModuleMustBeEnabled=El mòdul / aplicació s'ha d’habilitar primer
diff --git a/htdocs/langs/ca_ES/multicurrency.lang b/htdocs/langs/ca_ES/multicurrency.lang
index 710586d58e5..a3a5b95fe08 100644
--- a/htdocs/langs/ca_ES/multicurrency.lang
+++ b/htdocs/langs/ca_ES/multicurrency.lang
@@ -4,15 +4,15 @@ ErrorAddRateFail=Error en la taxa afegida
 ErrorAddCurrencyFail=Error en la moneda afegida
 ErrorDeleteCurrencyFail=Error en esborrar
 multicurrency_syncronize_error=Error de sincronització: %s
-MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Utilitza la data del document per trobar el tipus de canvi, en lloc d'utilitzar la conversió més recent coneguda
-multicurrency_useOriginTx=Quan un objecte es crea des d'un altre, manté la conversió original de l'objecte origen (en cas contrari, utilitza l'última conversió coneguda)
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Utilitza la data del document per trobar el tipus de canvi, en comptes d'utilitzar l'última conversió coneguda
+multicurrency_useOriginTx=Quan un objecte es crea des d'un altre, manté la conversió original de l'objecte origen (en cas contrari, fes servir l'última conversió coneguda)
 CurrencyLayerAccount=API Moneda-Layer
-CurrencyLayerAccount_help_to_synchronize=Pots crear un compte al lloc web per utilitzar aquesta funcionalitat <br>Obté la teva <b>clau API </b><br>Si fas servir un compte gratuït, no pots canviar la <b>moneda d'origen</b> (USD per defecte)<br>Però si la teva moneda principal no és USD, pots utilitzar la <b>moneda alternativa d'origen</b> per forçar la teva moneda principal<br><br>Estàs limitat a 1000 sincronitzacions al mes
+CurrencyLayerAccount_help_to_synchronize=Heu de crear un compte al lloc web %s per utilitzar aquesta funcionalitat. <br> Obtingueu la vostra <b>clau d’API</b> . <br> Si utilitzeu un compte gratuït, no podeu canviar la <b>moneda d'origen</b> (per defecte, USD). <br> Si la vostra moneda principal no és USD, l'aplicació la recalcularà automàticament. <br><br> Es limita a 1000 sincronitzacions mensuals.
 multicurrency_appId=Clau API
 multicurrency_appCurrencySource=Moneda origen
 multicurrency_alternateCurrencySource=Moneda d'origen alternativa
 CurrenciesUsed=Monedes utilitzades
-CurrenciesUsed_help_to_add=Afegeix les diferents monedes i conversions que necessitis per utilitzar <b>pressupostos</b>, <b>comandes</b>, etc.
+CurrenciesUsed_help_to_add=Afegeix les diferents monedes i conversions que necessitis als teus <b> pressupostos </b>, <b> comandes </b>, etc.
 rate=Taxa
 MulticurrencyReceived=Rebut, moneda original
 MulticurrencyRemainderToTake=Import restant, moneda original
diff --git a/htdocs/langs/ca_ES/paybox.lang b/htdocs/langs/ca_ES/paybox.lang
index 18653181e2c..3fbc28f89bb 100644
--- a/htdocs/langs/ca_ES/paybox.lang
+++ b/htdocs/langs/ca_ES/paybox.lang
@@ -10,21 +10,21 @@ ToComplete=A completar
 YourEMail=E-mail de confirmació de pagament
 Creditor=Beneficiari
 PaymentCode=Codi de pagament
-PayBoxDoPayment=Pagament amb targeta de crèdit o dèbit (Paybox)
+PayBoxDoPayment=Pagueu amb Paybox
 ToPay=Emetre pagament
 YouWillBeRedirectedOnPayBox=Serà redirigit a la pàgina segura de PayBox per indicar la seva targeta de crèdit
 Continue=Continuar
 ToOfferALinkForOnlinePayment=URL de pagament %s
-ToOfferALinkForOnlinePaymentOnOrder=URL que ofereix una interfície de cobrament en línia %s basada en l'import d'una comanda de client
+ToOfferALinkForOnlinePaymentOnOrder=URL per oferir una interfície d'usuari de pagament en línia %s per a un ordre de venda
 ToOfferALinkForOnlinePaymentOnInvoice=URL que ofereix una interfície de cobrament en línia %s basada en l'import d'una factura a client
 ToOfferALinkForOnlinePaymentOnContractLine=URL que ofereix una interfície de pagament en línia %s basada en l'import d'una línia de contracte
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL que ofereix una interfície de pagament en línia %s basada en un impport llíure
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL que ofereix una interfície de pagament en línia %s per una quota de soci
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL per oferir un pagament %s en línia, interfície d'usuari per al pagament de la donació
 YouCanAddTagOnUrl=També pot afegir el paràmetre url <b>&tag=<i>value</i></b> per a qualsevol d'aquestes adreces (obligatori només per al pagament lliure) per veure el seu propi codi de comentari de pagament.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Configureu la vostra caixa de pagaments amb l'URL <b> %s </b> perquè el pagament es creï automàticament quan sigui validat per Paybox.
 YourPaymentHasBeenRecorded=Aquesta pàgina confirma que el pagament s'ha registrat correctament. Gràcies.
-YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=El vostre pagament no s'ha registrat i la transacció s'ha cancel·lat. Gràcies.
 AccountParameter=Paràmetres del compte
 UsageParameter=Paràmetres d'ús
 InformationToFindParameters=Informació per trobar la seva configuració de compte %s
@@ -33,7 +33,8 @@ VendorName=Nom del venedor
 CSSUrlForPaymentForm=Url del full d'estil CSS per al formulari de pagament
 NewPayboxPaymentReceived=Nou pagament Paybox rebut
 NewPayboxPaymentFailed=Nou intent de pagament Paybox sense èxit
-PAYBOX_PAYONLINE_SENDEMAIL=E-Mail a avisar en cas de pagament (amb èxit o no)
+PAYBOX_PAYONLINE_SENDEMAIL=Notificació per correu electrònic després de l'intent de pagament (èxit o fracàs)
 PAYBOX_PBX_SITE=Valor per PBX SITE
 PAYBOX_PBX_RANG=valor per PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Valor per PBX ID
+PAYBOX_HMAC_KEY=Clau HMAC
diff --git a/htdocs/langs/ca_ES/paypal.lang b/htdocs/langs/ca_ES/paypal.lang
index 83c7c2531e4..7246fea7e23 100644
--- a/htdocs/langs/ca_ES/paypal.lang
+++ b/htdocs/langs/ca_ES/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Configuració mòdul PayPal
-PaypalDesc=Aquest mòdul ofereix una pàgina de pagament a través del proveïdor <a href="http://www.paypal.com" target="_blank">Paypal</a> per realitzar qualsevol pagament o un pagament en relació amb un objecte Dolibarr (factures, comandes ...)
-PaypalOrCBDoPayment=Pagament amb Paypal (Targeta de crèdit o Paypal)
-PaypalDoPayment=Continuar el pagament mitjançant Paypal
+PaypalDesc=Aquest mòdul permet el pagament per part dels clients a través de <a href="http://www.paypal.com" target="_blank"> PayPal </a>. Això es pot utilitzar per a un pagament ad hoc o per un pagament relacionat amb un objecte Dolibarr (factura, comanda ...)
+PaypalOrCBDoPayment=Paga amb PayPal (targeta de crèdit o PayPal)
+PaypalDoPayment=Paga amb PayPal
 PAYPAL_API_SANDBOX=Mode de proves(sandbox)
 PAYPAL_API_USER=Nom usuari API
 PAYPAL_API_PASSWORD=Contrasenya usuari API
 PAYPAL_API_SIGNATURE=Signatura API
 PAYPAL_SSLVERSION=Versió Curl SSL
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Proposar pagament integral (Targeta+Paypal) o només Paypal
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferir un pagament "integral" (Targeta de crèdit + PayPal) o "PayPal" només
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=Només PayPal
-ONLINE_PAYMENT_CSS_URL=URL opcional del full d'estil CSS a la pàgina de pagament en línia
+ONLINE_PAYMENT_CSS_URL=URL opcional del full d'estils CSS a la pàgina de pagament en línia
 ThisIsTransactionId=Identificador de la transacció: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Afegir la url del pagament Paypal en enviar un document per e-mail
-YouAreCurrentlyInSandboxMode=Actualment esteu en el mode %s "sandbox"
+PAYPAL_ADD_PAYMENT_URL=Incloeu l'adreça de pagament de PayPal quan envieu un document per correu electrònic
 NewOnlinePaymentReceived=Nou pagament online rebut
 NewOnlinePaymentFailed=S'ha intentat el nou pagament online però ha fallat
-ONLINE_PAYMENT_SENDEMAIL=E-Mail a avisar en cas de pagament (amb èxit o no)
+ONLINE_PAYMENT_SENDEMAIL=Adreça de correu electrònic per a les notificacions després de cada intent de pagament (per a l'èxit i el fracàs)
 ReturnURLAfterPayment=URL de retorn després del pagament
 ValidationOfOnlinePaymentFailed=Ha fallat la validació del pagament online
 PaymentSystemConfirmPaymentPageWasCalledButFailed=La pàgina de confirmació de pagament sol·licitada pel sistema de pagament ha retornat un error
@@ -28,7 +27,10 @@ ShortErrorMessage=Missatge d'error curt
 ErrorCode=Codi d'error
 ErrorSeverityCode=Codi sever d'error
 OnlinePaymentSystem=Sistema de pagament online
-PaypalLiveEnabled=Paypal live actiu (d'una altra forma en mode prova/sandbox)
-PaypalImportPayment=Importar els pagaments Paypal
+PaypalLiveEnabled=El mode "en viu" de PayPal habilitat (en cas contrari, el mode prova / sandbox)
+PaypalImportPayment=Importeu els pagaments de PayPal
 PostActionAfterPayment=Accions posteriors desprès dels pagaments
 ARollbackWasPerformedOnPostActions=S'ha produït una tornada endarrere en totes les accions "post". Heu de completar les accions "post" manualment si són necessàries.
+ValidationOfPaymentFailed=La validació del pagament ha fallat
+CardOwner=Titular de targeta
+PayPalBalance=Crèdit Paypal
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 964e142f52c..4e7a25a4ac1 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -260,7 +260,7 @@ AddVariable=Afegeix variable
 AddUpdater=Afegeix actualitzador
 GlobalVariables=Variables globals
 VariableToUpdate=Variable per actualitzar
-GlobalVariableUpdaters=Actualitzacions de variables globals
+GlobalVariableUpdaters=Actualitzacions externes per a variables
 GlobalVariableUpdaterType0=Dades JSON
 GlobalVariableUpdaterHelp0=Analitza dades JSON des de l'URL especificada, el valor especifica l'ubicació de valor rellevant
 GlobalVariableUpdaterHelpFormat0=Format per a la sol·licitud {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Fulla de producte
 ServiceSheet=Fulla de servei
 PossibleValues=Valors possibles
 GoOnMenuToCreateVairants=Anar al menu %s - %s per preparar variants de l'atribut (com colors, mides, etc...)
-UseProductFournDesc=Utilitzeu descripcions de proveïdors de productes en documents de proveïdors
+UseProductFournDesc=Afegeix una funció per definir les descripcions dels productes definits pels proveïdors, a més de les descripcions pels clients
 ProductSupplierDescription=Descripció del venedor del producte
 #Attributes
 VariantAttributes=Atributs de variants
@@ -338,4 +338,5 @@ CloneDestinationReference=Referència del producte destí
 ErrorCopyProductCombinations=S'ha produït un error al copiar les variants de producte
 ErrorDestinationProductNotFound=No s'ha trobat el producte de destí
 ErrorProductCombinationNotFound=Variant de producte no trobada
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ActionAvailableOnVariantProductOnly=Acció només disponible sobre la variant del producte
+ProductsPricePerCustomer=Preus dels productes per clients
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 0624bf5bab7..f3e43c00929 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Temps dedicat
 TimeSpentByYou=Temps dedicat per vostè
 TimeSpentByUser=Temps dedicat per usuari
 TimesSpent=Temps dedicat
-RefTask=Ref. tasca
-LabelTask=Etiqueta de la tasca
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Temps dedicat a les tasques
 TaskTimeUser=Usuari
 TaskTimeNote=Nota
@@ -209,7 +210,7 @@ YouCanCompleteRef=Si voleu completar la referència amb algun sufix, es recomana
 OpenedProjectsByThirdparties=Projectes oberts per tercers
 OnlyOpportunitiesShort=Només oportunitats
 OpenedOpportunitiesShort=Oportunitats obertes
-NotOpenedOpportunitiesShort=Not an open lead
+NotOpenedOpportunitiesShort=No és una oportunitat oberta
 NotAnOpportunityShort=No és una oportunitat
 OpportunityTotalAmount=Quantitat total de clients potencials
 OpportunityPonderatedAmount=Quantitat ponderada de clients potencials
@@ -242,4 +243,4 @@ TimeSpentForInvoice=Temps dedicat
 OneLinePerUser=Una línia per usuari
 ServiceToUseOnLines=Servei d'ús a les línies
 InvoiceGeneratedFromTimeSpent=La factura %s s'ha generat a partir del temps dedicat al projecte
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Comproveu si heu introduït el full de temps en les tasques del projecte I teniu previst generar factures des del full de temps per facturar al client del projecte (no comproveu si voleu crear la factura que no es basa en els fulls de temps introduïts).
diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang
index bbbd5c48a63..044768eb87c 100644
--- a/htdocs/langs/ca_ES/stripe.lang
+++ b/htdocs/langs/ca_ES/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configuració del mòdul Stripe
-StripeDesc=Mòdul per oferir una pàgina de pagament en línia que accepti pagaments amb targeta de crèdit/dèbit mitjançant <a href="http://www.stripe.com" target="_blank">Stripe</a>. Això es pot utilitzar per permetre als vostres clients fer pagaments oberts o el pagament d'un objecte particular de Dolibarr (factura, comanda, ...)
+StripeDesc=Ofereix als clients una pàgina de pagament en línia de Stripe per als pagaments amb targetes credit / cebit a través de <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Això es pot utilitzar per permetre als vostres clients fer pagaments ad-hoc o pagaments relacionats amb un objecte particular de Dolibarr (factura, comanda ...)
 StripeOrCBDoPayment=Pagar amb targeta de crèdit o Stripe
 FollowingUrlAreAvailableToMakePayments=Les següents URL estan disponibles per a permetre a un client fer un cobrament en objectes de Dolibarr
 PaymentForm=Formulari de pagament
@@ -9,14 +9,14 @@ ThisScreenAllowsYouToPay=Aquesta pantalla li permet fer el seu pagament en líni
 ThisIsInformationOnPayment=Aquí està la informació sobre el pagament a realitzar
 ToComplete=A completar
 YourEMail=E-mail de confirmació de pagament
-STRIPE_PAYONLINE_SENDEMAIL=E-Mail a avisar en cas de pagament (amb èxit o no)
+STRIPE_PAYONLINE_SENDEMAIL=Notificació de correu electrònic després d'un intent de pagament (èxit o fracàs)
 Creditor=Beneficiari
 PaymentCode=Codi de pagament
-StripeDoPayment=Pagament amb targeta de crèdit o dèbit (Stripe)
+StripeDoPayment=Paga amb Stripe
 YouWillBeRedirectedOnStripe=Se us redirigirà a la pàgina de Stripe assegurada per introduir la informació de la vostra targeta de crèdit
 Continue=Continuar
 ToOfferALinkForOnlinePayment=URL de pagament %s
-ToOfferALinkForOnlinePaymentOnOrder=URL que ofereix una interfície de cobrament en línia %s basada en l'import d'una comanda de client
+ToOfferALinkForOnlinePaymentOnOrder=URL per oferir una interfície d'usuari de pagament en línia %s per a un ordre de venda
 ToOfferALinkForOnlinePaymentOnInvoice=URL que ofereix una interfície de cobrament en línia %s basada en l'import d'una factura a client
 ToOfferALinkForOnlinePaymentOnContractLine=URL que ofereix una interfície de pagament en línia %s basada en l'import d'una línia de contracte
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL que ofereix una interfície de pagament en línia %s basada en un impport llíure
@@ -35,12 +35,12 @@ STRIPE_TEST_SECRET_KEY=Clau secreta de test
 STRIPE_TEST_PUBLISHABLE_KEY=Clau de test publicable
 STRIPE_TEST_WEBHOOK_KEY=Clau de prova de Webhook
 STRIPE_LIVE_SECRET_KEY=Clau secreta
-STRIPE_LIVE_PUBLISHABLE_KEY=Clau pubiclable
+STRIPE_LIVE_PUBLISHABLE_KEY=Clau pubicable
 STRIPE_LIVE_WEBHOOK_KEY=Webhook clau en directe
 ONLINE_PAYMENT_WAREHOUSE=Les existències per utilitzar per disminuir les existències quan es fa el pagament en línia <br> (Pendent de fer Quan es fa una opció per reduir l'estoc en una acció a la factura i es genera la factura el pagament en línia?)
 StripeLiveEnabled=Stripe live activat (del contrari en mode test/sandbox)
 StripeImportPayment=Importar pagaments per Stripe
-ExampleOfTestCreditCard=Exemple de targeta de crèdit per a prova: %s (vàlid), %s (error CVC), %s (vençut), %s (falla de càrrega)
+ExampleOfTestCreditCard=Exemple de targeta de crèdit per a la prova: %s => vàlid, %s => error CVC, %s => caducat, %s => falla la càrrega
 StripeGateways=Passarel·les Stripe
 OAUTH_STRIPE_TEST_ID=Identificador de client de Stripe Connect (ca _...)
 OAUTH_STRIPE_LIVE_ID=Identificador de client de Stripe Connect (ca _...)
@@ -62,3 +62,6 @@ CreateCustomerOnStripe=Crea un client a Stripe
 CreateCardOnStripe=Crea una targeta a Stripe
 ShowInStripe=Mostra a Stripe
 StripeUserAccountForActions=Compte d'usuari per utilitzar en alguns e-mails de notificació d'esdeveniments Stripe (pagaments Stripe)
+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)
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index ef63aaefab6..09f7a3419ad 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -148,4 +148,4 @@ nolimitbyEX_EXP=per línia (sense límits)
 CarCategory=Categoria de cotxe
 ExpenseRangeOffset=Quantitat d'offset: %s
 RangeIk=Rang de quilometratge
-AttachTheNewLineToTheDocument=Attach the new line to an existing document
+AttachTheNewLineToTheDocument=Adjunta la línia a un document carregat
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index a24be6cceaa..6606aa40a41 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -52,7 +52,7 @@ NoPageYet=Encara sense pàgines
 YouCanCreatePageOrImportTemplate=Podeu crear una pàgina nova o importar una plantilla completa del lloc web
 SyntaxHelp=Ajuda sobre consells de sintaxi específics
 YouCanEditHtmlSourceckeditor=Podeu editar el codi font HTML usant el botó "Codi font" a l'editor.
-YouCanEditHtmlSource=<br> <span class="fa fa-bug"></span> Podeu incloure codi PHP a aquesta font utilitzant les etiquetes <strong> &lt;? php? &gt; </strong>. Les següents variables globals estan disponibles: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs. <br> <br> <span class="fa fa-bug"></span> Vostè també pot incloure contingut d'una altra pàgina / contenidor amb la següent sintaxi: <br><strong> &lt;? php includeContainer ('alias_of_container_to_include'); ? &gt; </strong><br><br><span class="fa fa-bug"></span> Podeu fer una redirecció a una altra pàgina / contenidor amb la sintaxi següent (Nota: no feu cap contingut abans una redirecció): <br><strong> &lt;? php redirectToContainer ('alias_of_container_to_redirect_to'); ? &gt; </strong><br><br><span class="fa fa-link"></span> Per afegir un enllaç a una altra pàgina, utilitzeu la sintaxi: <br><strong> &lt;a href = "alias_of_page_to_link_to .php "&gt;mylink&lt;a&gt; </strong><br><br><span class="fa fa-download"></span> Per incloure un enllaç <strong> per baixar </strong>, un fitxer emmagatzemat al <strong> documents </strong>, useu el <strong> document.php </strong>contenidor : <br> Exemple, per a un fitxer en documents / ecm (necessita ser registrat), la sintaxi és: <br> <strong> &lt;a href = "/ document.php? modulepart = ecm & file = [relatiu_dir /] filename.ext" &gt; </strong><br>  Per a un arxiu en documents / medias (directori obert per a accés públic), la sintaxi és:  <br><strong> &lt;a href = "/ document.php? modulepart = media & file = [relative_dir /] filename.ext" &gt; </strong><br>  Per a un fitxer compartit amb un vincle compartit (accés obert usant la clau hash compartida del fitxer) , la sintaxi és: <br><strong> &lt;a href = "/ document.php? hashp = publicsharekeyoffile" &gt; </strong><br><br><span class="fa fa-picture-o"></span> Per incloure una <strong> imatge </strong> emmagatzemada al directori  <strong>documents </strong>, useu el <strong> viewimage.php </strong> contenidor: <br> Exemple, per obtenir una imatge en documents / medias (directori obert per a accés públic), la sintaxi és:  <br><strong> &lt;img src = "/ viewimage.php? modulepart = medias&amp;file = [relatiu_dir /] nom del fitxer .ext "&gt; </strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Podeu incloure codi PHP en aquesta font mitjançant les etiquetes <strong>&lt;? Php?&gt;</strong> . Les següents variables globals estan disponibles: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs. <br><br><span class="fa fa-bug"></span> També podeu incloure contingut d’una altra pàgina / contenidor amb la sintaxi següent: <br> <strong>&lt;? php includeContainer (&#39;alias_of_container_to_include&#39;); ?&gt;</strong> <br><br><span class="fa fa-bug"></span> Podeu fer una redirecció a una altra pàgina / contenidor amb la sintaxi següent (Nota: no publiqueu cap contingut abans de redirigir): <br> <strong>&lt;? php redirectToContainer (&#39;alias_of_container_to_redirect_to&#39;); ?&gt;</strong> <br><br><span class="fa fa-link"></span> Per afegir un enllaç a una altra pàgina, utilitzeu la sintaxi: <br> <strong>&lt;a href=&quot;alias_of_page_to_link_to.php&quot;&gt; mylink &lt;a&gt;</strong> <br><br><span class="fa fa-download"></span> Per incloure un <strong>enllaç per descarregar</strong> un fitxer emmagatzemat al directori de <strong>documents</strong> , utilitzeu el <strong>document.php</strong> wrapper: <br> Exemple, per a un fitxer en documents / ecm (cal registrar-lo), la sintaxi és: <br> <strong>&lt;a href=&quot;/document.php?modulepart=ecm&amp;file=[relative_dir/]filename.ext&quot;&gt;</strong> <br> Per a un fitxer a documents / medias (directori obert per a accés públic), la sintaxi és: <br> <strong>&lt;a href=&quot;/document.php?modulepart=medias&amp;file=[relative_dir/]filename.ext&quot;&gt;</strong> <br> Per a un fitxer compartit amb un enllaç compartit (accés obert mitjançant la clau de repartiment compartida del fitxer), la sintaxi és: <br> <strong>&lt;a href=&quot;/document.php?hashp=publicsharekeyoffile&quot;&gt;</strong> <br><br><span class="fa fa-picture-o"></span> Per incloure una <strong>imatge</strong> emmagatzemada al directori de <strong>documents</strong> , utilitzeu l’ <strong>envàs de viewimage.php</strong> : <br> Exemple: per a una imatge en documents / medias (directori obert per a accés públic), la sintaxi és: <br> <strong>&lt;img src = &quot;/ viewimage.php? modulepart = medias i fitxer = [relative_dir /] nom_fitxer.ext&quot;&gt;</strong> <br>
 ClonePage=Clona la pàgina/contenidor
 CloneSite=Clona el lloc
 SiteAdded=S'ha afegit el lloc web
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=Aquesta pàgina/contenidor és una traducció de
 ThisPageHasTranslationPages=Aquesta pàgina/contenidor té traducció
 NoWebSiteCreateOneFirst=Encara no s'ha creat cap lloc web. Creeu-ne un primer.
 GoTo=Ves a
+DynamicPHPCodeContainsAForbiddenInstruction=Afegiu un codi PHP dinàmic que conté la instrucció PHP ' <strong>%s</strong> ' prohibida per defecte com a contingut dinàmic (vegeu les opcions ocultes WEBSITE_PHP_ALLOW_xxx per augmentar la llista d’ordres permeses).
+NotAllowedToAddDynamicContent=No teniu permís per afegir o editar contingut dinàmic de PHP als llocs web. Demana permís o simplement guarda el codi en etiquetes php sense modificar.
+ReplaceWebsiteContent=Substituïu el contingut del lloc web
+DeleteAlsoJs=Voleu suprimir també tots els fitxers javascript específics d'aquest lloc web?
+DeleteAlsoMedias=Voleu suprimir també tots els fitxers de mitjans específics d’aquest lloc web?
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index b23f903793a..776bc0b8511 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -98,8 +98,8 @@ MenuLoanAccounts=Úvěrové účty
 MenuProductsAccounts=produktové účty
 MenuClosureAccounts=Uzavření účtů
 ProductsBinding=Produkty účty
-TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Registration in accounting
+TransferInAccounting=Transfer v účetnictví
+RegistrationInAccounting=Registrace v účetnictví
 Binding=Vazba na účetní závěrky
 CustomersVentilation=Zákaznické fakturační závazky
 SuppliersVentilation=Závazná faktura dodavatele
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Záväzná zpráva o výdajích
 CreateMvts=Vytvořit novou transakci
 UpdateMvts=Modifikace transakce
 ValidTransaction=Ověřte transakci
-WriteBookKeeping=Účetní záznamy v hlavní účetní knize
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=účetní kniha
 AccountBalance=Zůstatek na účtu
 ObjectsRef=Zdrojový objekt ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Účtovací účet pro registraci předp
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Účetní účet ve výchozím nastavení pro zakoupené výrobky (použít, pokud není definován v listu produktu)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Účetní účet ve výchozím nastavení pro prodané produkty (použít, pokud není definován v listu produktu)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Účtovací účet standardně pro prodané výrobky v EHS (používá se, pokud není definován v produktovém listu)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Účtovací účet standardně pro export prodaný výrobek z EHS (používá se, pokud není definován v listu výrobku)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Účtovací účet standardně pro prodané výrobky v EHS (používá se, pokud není definován v produktovém listu)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Účtovací účet standardně pro export prodaný výrobek z EHS (používá se, pokud není definován v listu výrobku)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Účetní účet ve výchozím nastavení pro zakoupené služby (použít, pokud není definován v servisním listu)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Účetní účet ve výchozím nastavení pro prodané služby (použít, pokud není definován v servisním listu)
 
@@ -177,6 +177,7 @@ LabelAccount=Štítek účtu
 LabelOperation=Operace štítků
 Sens=Sens
 LetteringCode=Písmenový kód
+Lettering=Nápis
 Codejournal=Deník
 JournalLabel=Označení časopisu
 NumPiece=počet kusů
@@ -256,7 +257,7 @@ NotYetAccounted=Zatím nebyl zaznamenán v knize
 
 ## Admin
 ApplyMassCategories=Aplikovat hmotnostní kategorie
-AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
+AddAccountFromBookKeepingWithNoCategories=Dostupný účet ještě není v personalizované skupině
 CategoryDeleted=Kategorie účetního účtu byla odstraněna
 AccountingJournals=účetní deníky
 AccountingJournal=Účetní deník
@@ -288,8 +289,10 @@ Modelcsv_quadratus=Export pro Quadratus QuadraCompta
 Modelcsv_ebp=Export pro EBP
 Modelcsv_cogilog=Export pro Cogilog
 Modelcsv_agiris=Export pro Agiris
+Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV konfigurovatelný
-Modelcsv_FEC=Export FEC (článek L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Schéma Id účtů
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=Tato stránka může být použita k nastavení výchozího 
 DefaultClosureDesc=Tato stránka může být použita pro nastavení parametrů, které se mají použít k uzavření rozvahy.
 Options=možnosti
 OptionModeProductSell=prodejní režim
+OptionModeProductSellIntra=Režim prodeje vyváženého v EHS
+OptionModeProductSellExport=Režim prodeje vyvážené v jiných zemích
 OptionModeProductBuy=Nákupní režim
 OptionModeProductSellDesc=Zobrazit všechny produkty s vyúčtováním pro přímý prodej.
+OptionModeProductSellIntraDesc=Zobrazit všechny produkty s účetním účtem pro prodej v EHS.
+OptionModeProductSellExportDesc=Zobrazit všechny produkty s účetním účtem pro ostatní zahraniční prodeje.
 OptionModeProductBuyDesc=Zobrazit všechny produkty které připadají v úvahu pro nákupy.
 CleanFixHistory=Odstraňte účtovací kód z řádků, které neexistují ve schématech účtu
 CleanHistory=Obnovit všechny vazby pro vybraný rok
@@ -308,7 +315,7 @@ PredefinedGroups=Předdefinované skupiny
 WithoutValidAccount=Bez platného zvláštním účtu
 WithValidAccount=S platným zvláštním účtu
 ValueNotIntoChartOfAccount=Tato hodnota účetního účtu neexistuje v účtu
-AccountRemovedFromGroup=Account removed from group
+AccountRemovedFromGroup=Účet byl odstraněn ze skupiny
 
 ## Dictionary
 Range=Řada účetních účtu
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 1b25fc472dd..01508debb80 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -24,7 +24,7 @@ FilesModified=Upravené soubory
 FilesAdded=přidané soubory
 FileCheckDolibarr=Zkontrolovat integritu souborů aplikací
 AvailableOnlyOnPackagedVersions=Místní soubor pro kontrolu integrity je k dispozici pouze při instalaci aplikace z oficiálního balíčku
-XmlNotFound=Xml Integrity souboru aplikace nebyly načteny
+XmlNotFound=XML soubor integrity aplikace nebyl nalezen
 SessionId=ID relace
 SessionSaveHandler=Manipulátor uložených relací
 SessionSavePath=Místo uložení relace
@@ -66,12 +66,14 @@ Dictionary=Slovníky
 ErrorReservedTypeSystemSystemAuto=Hodnota &quot;system&quot; a &quot;systemauto&quot; je vyhrazena. Můžete použít &quot;user&quot; k pŕidání vlastního záznamu
 ErrorCodeCantContainZero=Kód nemůže obsahovat hodnotu 0
 DisableJavascript=Zakázat JavaScript a Ajax funkce
-DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=Poznámka: Pro účely testování nebo ladění. Pro optimalizaci pro nevidomé nebo textové prohlížeče můžete použít nastavení v profilu uživatele
 UseSearchToSelectCompanyTooltip=Také, pokud máte velký počet subjektů (> 100 000), můžete zvýšit rychlost nastavením konstantní COMPANY_DONOTSEARCH_ANYWHERE 1 v Setup-> Ostatní. Vyhledávání pak bude omezena na začátek řetězce.
 UseSearchToSelectContactTooltip=Také, pokud máte velký počet subjektů (> 100 000), můžete zvýšit rychlost nastavením konstantní CONTACT_DONOTSEARCH_ANYWHERE 1 v Setup-> Ostatní. Vyhledávání pak bude omezena na začátek řetězce.
 DelaiedFullListToSelectCompany=Počkejte, dokud nebude stisknuto tlačítko před vložením obsahu seznamu combo. <br> To může zvýšit výkon, pokud máte velký počet subjektů, ale je to méně výhodné.
 DelaiedFullListToSelectContact=Před vložením obsahu seznamu kontaktů do seznamu kontaktů počkejte, dokud nebude stisknuto tlačítko. <br> To může zvýšit výkon, pokud máte velký počet kontaktů, ale je méně vhodný)
-NumberOfKeyToSearch=Počet charakterů nutných k spuštění hledání: %s
+NumberOfKeyToSearch=Počet znaků pro vyhledávání: %s
+NumberOfBytes=Počet bytů
+SearchString=Vyhledávací řetězec
 NotAvailableWhenAjaxDisabled=Není k dispozici při vypnutém Ajaxu
 AllowToSelectProjectFromOtherCompany=Na dokumentu subjektu si může vybrat projekt propojený s jiným subjektem
 JavascriptDisabled=JavaScript zablokován
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=Toto je název pole HTML. Technická znalost je potř
 PageUrlForDefaultValues=Musíte zadat relativní cestu URL stránky. Pokud do adresy URL zadáte parametry, budou výchozí hodnoty účinné, pokud budou všechny parametry nastaveny na stejnou hodnotu.
 PageUrlForDefaultValuesCreate= <br> Příklad: <br> Formulář pro vytvoření nového subjektu je <strong> %s </strong>. <br> Pro URL externích modulů nainstalovaných do vlastního adresáře nezahrnujte "vlastní /", tak použijte cestu jako <strong> mymodule / mypage.php </strong> a ne vlastní / mymodule / mypage.php. <br> Pokud chcete výchozí hodnotu pouze v případě, že url má nějaký parametr, můžete použít <strong> %s </strong>
 PageUrlForDefaultValuesList= <br> Příklad: <br> Pro stránku, která obsahuje subjekty, je <strong> %s </strong>. <br> Pro adresy URL externích modulů nainstalovaných do vlastního adresáře nezahrnujte "vlastní", takže použijte cestu jako <strong> mymodule / mypagelist.php </strong> a ne vlastní / mymodule / mypagelist.php. <br> Pokud chcete výchozí hodnotu pouze v případě, že url má nějaký parametr, můžete použít <strong> %s </strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Povolit přizpůsobení výchozích hodnot
 EnableOverwriteTranslation=Povolit použití přepsaného překladu
 GoIntoTranslationMenuToChangeThis=Překlad byl nalezen pro klíč s tímto kódem. Chcete-li tuto hodnotu změnit, musíte ji upravit z Home-Setup-translation.
@@ -481,11 +484,11 @@ FilesAttachedToEmail=Přiložit soubor
 SendEmailsReminders=Poslat připomenutí pořadů emaily
 davDescription=Nastavte server WebDAV
 DAVSetup=Nastavení modulu DAV
-DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
-DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
-DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
-DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
-DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
+DAV_ALLOW_PRIVATE_DIR=Povolit obecný soukromý adresář (WebDAV vyhrazený adresář s názvem "private"  - vyžaduje se přihlášení)
+DAV_ALLOW_PRIVATE_DIRTooltip=Obecný soukromý adresář je adresář WebDAV, ke kterému může přistupovat kdokoliv s přihlášením / předáním aplikace.
+DAV_ALLOW_PUBLIC_DIR=Povolit obecný veřejný adresář (vyhrazený adresář WebDAV s názvem "public" - není vyžadováno žádné přihlášení)
+DAV_ALLOW_PUBLIC_DIRTooltip=Obecný veřejný adresář je adresář WebDAV, ke kterému může přistupovat kdokoliv (v režimu čtení a zápisu), bez nutnosti autorizace (účet login / password).
+DAV_ALLOW_ECM_DIR=Povolit soukromý adresář DMS/ECM (kořenový adresář modulu DMS/ECM - vyžaduje se přihlášení)
 DAV_ALLOW_ECM_DIRTooltip=Kořenový adresář, kde jsou všechny soubory ručně nahrány při použití modulu DMS / ECM. Stejně jako přístup z webového rozhraní budete potřebovat platné přihlašovací jméno / heslo s přístupovými oprávněními k jeho přístupu.
 # Modules
 Module0Name=Uživatelé a skupiny
@@ -494,7 +497,7 @@ Module1Name=Subjekty
 Module1Desc=Správa firem a kontaktů (zákazníci, vyhlídky ...)
 Module2Name=Obchodní
 Module2Desc=Obchodní řízení
-Module10Name=Accounting (simplified)
+Module10Name=Účetnictví (zjednodušené)
 Module10Desc=Jednoduché účetní výkazy (časopisy, obrat) založené na obsahu databáze. Nepoužívá žádný tabulkový záznam.
 Module20Name=Návrhy
 Module20Desc=Komerční návrh řízení
@@ -541,7 +544,7 @@ Module80Desc=Správa zásilek a doručení
 Module85Name=Banky a hotovost
 Module85Desc=Správa bankovních nebo hotovostních účtů
 Module100Name=Externí stránky
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module100Desc=Přidat odkaz na externí webovou stránku jako ikonu hlavní nabídky. Webová stránka je zobrazena v rámečku v horním menu.
 Module105Name=Mailman a SPIP
 Module105Desc=Mailman nebo SPIP pro modul modulu
 Module200Name=LDAP
@@ -632,7 +635,7 @@ Module50200Name=Paypal
 Module50200Desc=Nabídněte zákazníkům platební stránku PayPal online (účet PayPal nebo kreditní nebo debetní karty). To může být použito k tomu, aby zákazníci mohli provádět ad hoc platby nebo platby související s konkrétním předmětem Dolibarr (faktura, objednávka atd.)
 Module50300Name=Proužek
 Module50300Desc=Nabídněte zákazníkům Stripe online platební stránku (kreditní / debetní karty). To může být použito k tomu, aby zákazníci mohli provádět ad hoc platby nebo platby související s konkrétním předmětem Dolibarr (faktura, objednávka atd.)
-Module50400Name=Accounting (double entry)
+Module50400Name=Účetnictví (Dvojitá položka)
 Module50400Desc=Správa účetnictví (dvojité vstupy, podpora obecných a pomocných knih). Exportujte knihu v několika dalších formátech účetního softwaru.
 Module54000Name=PrintIPP
 Module54000Desc=Přímý tisk (bez otevírání dokumentů) pomocí rozhraní Cups IPP (Tiskárna musí být viditelná ze serveru a CUPS musí být nainstalována na serveru).
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Název virtuálního serveru
 OS=OS
 PhpWebLink=Web Php link
-Browser=Prohlížeč
 Server=Server
 Database=Databáze
 DatabaseServer=Databáze hostitele
@@ -1055,8 +1057,8 @@ Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Zkontrolujte, zda není vklad hotový
 Delays_MAIN_DELAY_EXPENSEREPORTS=Zpráva o výdajích ke schválení
 SetupDescription1=Než začnete používat Dolibarr, je třeba definovat některé počáteční parametry a povolit / konfigurovat moduly.
 SetupDescription2=Následující dvě části jsou povinné (první dvě položky v nabídce Nastavení):
-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.
+SetupDescription3=<a href="%s">%s ->%s</a> <br> Základní parametry používané k přizpůsobení výchozího chování vaší aplikace (např. Pro funkce související se zemí).
+SetupDescription4=<a href="%s">%s -> %s</a> <br> Tento software je sadou mnoha modulů/aplikací, které jsou více či méně nezávislé. Moduly odpovídající vašim potřebám musí být povoleny a nakonfigurovány. Nové položky/možnosti jsou přidány do menu s aktivací modulu.
 SetupDescription5=Ostatní položky nabídky nastavení řídí volitelné parametry.
 LogEvents=Události bezpečnostního auditu
 Audit=Audit
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Systémové informace jsou různé technické informace, které z
 SystemAreaForAdminOnly=Tato oblast je k dispozici pouze uživatelům správce. Uživatelské oprávnění Dolibarr nemůže toto omezení měnit.
 CompanyFundationDesc=Upravte informace společnosti / subjektu. Klikněte na tlačítko "%s" nebo "%s" v dolní části stránky.
 AccountantDesc=Upravte údaje svého účetního / účetního
-AccountantFileNumber=Číslo souboru
+AccountantFileNumber=Accountant code
 DisplayDesc=Parametry ovlivňující vzhled a chování nástroje Dolibarr lze zde změnit.
 AvailableModules=Dostupné aplikace / moduly
 ToActivateModule=Chcete-li aktivovat moduly, přejděte na oblast nastavení (Home-> Setup-> Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Faktury a dobropisy číslování modelu
 BillsPDFModules=Modely dokumentů faktur
 BillsPDFModulesAccordindToInvoiceType=Modely dokladů faktur podle typu faktury
 PaymentsPDFModules=Vzory platebních dokumentů
-CreditNote=Dobropis
-CreditNotes=Dobropisy
 ForceInvoiceDate=Vynutit datum fakturace k datu ověření
 SuggestedPaymentModesIfNotDefinedInInvoice=Navrhované platby režimu na faktuře ve výchozím nastavení, pokud není definován pro faktury
 SuggestPaymentByRIBOnAccount=Navrhněte platbu výběrem na účet
@@ -1252,7 +1252,7 @@ SupplierPaymentSetup=Nastavení plateb dodavatelů
 PropalSetup=Nastavení modulů komerčních návrhů
 ProposalsNumberingModules=Modelové modely číslování návrhů
 ProposalsPDFModules=Komerční návrh doklady modely
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Navrhovaný režim platby na návrh ve výchozím nastavení, pokud není definován pro návrh
 FreeLegalTextOnProposal=Volný text o obchodních návrhů
 WatermarkOnDraftProposal=Vodoznak v návrhových komerčních návrzích (žádný není prázdný)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Zeptejte se na umístění bankovního účtu nabídky
@@ -1711,8 +1711,8 @@ SomethingMakeInstallFromWebNotPossible2=Z tohoto důvodu je zde popsaný proces
 InstallModuleFromWebHasBeenDisabledByFile=Instalace externího modulu z aplikace byla deaktivována správcem. Musíte požádat jej, aby odstranil soubor <strong> %s </strong>, aby tuto funkci povolil.
 ConfFileMustContainCustom=Instalace nebo sestavení externího modulu z aplikace musí ukládat soubory modulu do adresáře <strong> %s </strong>. Chcete-li, aby tento adresář zpracoval Dolibarr, musíte nastavit <strong> conf / conf.php </strong> a přidat dvě řádky: <br> <strong> $ dolibarr_main_url_root_alt = '/ custom'; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s / vlastní'; </strong>
 HighlightLinesOnMouseHover=Zvýrazněte řádky tabulky, když pohyb myší projde
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+HighlightLinesColor=Zvýrazněte barvu čáry, když myš přejde (použijte "ffffff"aby nebylo zvýrazněno)
+HighlightLinesChecked=Zvýrazněte barvu čáry, když je zaškrtnuta (pro zvýraznění použijte "ffffff")
 TextTitleColor=Barva textu titulku stránky
 LinkColor=Barva odkazů
 PressF5AfterChangingThis=Stisknutím klávesy CTRL + F5 na klávesnici nebo vymazat mezipaměť prohlížeče Po změně této hodnoty, aby bylo účinné
@@ -1819,7 +1819,7 @@ ChartLoaded=Schéma účtů je načteno
 SocialNetworkSetup=Nastavení modulu Sociální sítě
 EnableFeatureFor=Povolit funkce pro <strong> %s </strong>
 VATIsUsedIsOff=Poznámka: Možnost použít daň z prodeje nebo DPH byla nastavena na hodnotu <strong> Vypnuto </strong> v nabídce %s - %s, takže daň z prodeje nebo Vat bude vždy 0 pro prodej.
-SwapSenderAndRecipientOnPDF=Směňte adresu odesílatele a příjemce v PDF
+SwapSenderAndRecipientOnPDF=Zaměnit pozici odesílatele a příjemce na dokumentech PDF
 FeatureSupportedOnTextFieldsOnly=Upozornění, funkce je podporována pouze v textových polích. Také musí být nastaven parametr URL akce = create nebo action = editace NEBO název stránky musí skončit s 'new.php' pro spuštění této funkce.
 EmailCollector=Sběratel e-mailu
 EmailCollectorDescription=Přidejte plánovanou úlohu a stránku s nastavením pro pravidelné skenování poštovních schránek (pomocí protokolu IMAP) a zaznamenávejte e-maily přijaté do vaší aplikace na správném místě a / nebo vytvořte automaticky nějaké záznamy (například potenciální zákazníci).
@@ -1828,28 +1828,30 @@ EMailHost=Hostitel poštovního IMAP serveru
 MailboxSourceDirectory=Adresář zdrojové schránky
 MailboxTargetDirectory=Adresář cílové schránky
 EmailcollectorOperations=Operace, které mají dělat sběratel
+MaxEmailCollectPerCollect=Maximální počet e-mailů shromážděných za sběr
 CollectNow=Sbírat nyní
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
-LastResult=Latest result
+ConfirmCloneEmailCollector=Opravdu chcete klonovat sběratel e-mailů %s?
+DateLastCollectResult=Datum poslední vyzvednutí vyzkoušeno
+DateLastcollectResultOk=Datum poslední sbírat úspěšně
+LastResult=Poslední výsledek
 EmailCollectorConfirmCollectTitle=E-mail sbírat potvrzení
 EmailCollectorConfirmCollect=Chcete kolekci pro tento sběratel spustit?
 NoNewEmailToProcess=Žádné nové e-maily (odpovídající filtry), které chcete zpracovat
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s e-maily kvalifikovány, %s úspěšně zpracovány emaily (pro %s záznam / akce provedeny) podle sběratele
 RecordEvent=Nahrávat událost e-mailu
 CreateLeadAndThirdParty=Vytvoření vedení (a případně subjekty)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Vytvořit lístek (a případně subjekt)
 CodeLastResult=Výstup posledního kódu
-NbOfEmailsInInbox=Number of emails in source directory
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+NbOfEmailsInInbox=Počet e-mailů ve zdrojovém adresáři
+LoadThirdPartyFromName=Načíst vyhledávání subjektem na adrese %s (pouze načíst)
+LoadThirdPartyFromNameOrCreate=Načíst vyhledávání subjektů na adrese %s (vytvořit, pokud nebyly nalezeny)
 WithDolTrackingID=Dolibarr ID sledování nalezeno
 WithoutDolTrackingID=Dolibarr ID sledování nebylo nalezeno
 FormatZip=Zip
 MainMenuCode=Vstupní kód nabídky (hlavní menu)
 ECMAutoTree=Zobrazit automatický strom ECM
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Definujte hodnoty, které chcete použít pro akci, nebo jak extrahovat hodnoty. Například: <br> objproperty1 = SET: abc <br> objproperty1 = SET: hodnota s nahrazením __objproperty1__ <br> objproperty3 = SETIFEMPTY: abc <br> objproperty4 = EXTRACT: HEADER: X-Myheaderkey. * [^ s] + (. *) <br> options_myextrafield = EXTRACT: SUBJECT: ([^]] *) <br> object.objproperty5 = EXTRACT: BODY: Název mé společnosti je (^ ^] *) <br><br> Použijte; char jako oddělovač extrahovat nebo nastavit několik vlastností.
 OpeningHours=Otevírací doba
 OpeningHoursDesc=Zadejte zde běžnou pracovní dobu vaší společnosti.
 ResourceSetup=Konfigurace modulu zdrojů
@@ -1863,22 +1865,29 @@ 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.
 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=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
-RootCategoryForProductsToSell=Root category of products to sell
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
+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.
+RootCategoryForProductsToSell=Kořenová kategorie produktů k prodeji
+RootCategoryForProductsToSellDesc=Pokud jsou definovány, budou v prodejním místě k dispozici pouze produkty v této kategorii nebo děti této kategorie
 DebugBar=Debug Bar
-DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
-DebugBarSetup=DebugBar Setup
-GeneralOptions=General Options
-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
-EXPORTS_SHARE_MODELS=Export models are share with everybody
-ExportSetup=Setup of module Export
-InstanceUniqueID=Unique ID of the instance
-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/.
+DebugBarDesc=Panel nástrojů, který je dodáván s množstvím nástrojů pro zjednodušení ladění
+DebugBarSetup=Nastavení DebugBar
+GeneralOptions=Obecné možnosti
+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í
+EXPORTS_SHARE_MODELS=Exportní modely jsou sdílené s každým
+ExportSetup=Nastavení modulu Export
+InstanceUniqueID=Jedinečné ID instance
+SmallerThan=Menší než
+LargerThan=Větší než
+IfTrackingIDFoundEventWillBeLinked=Všimněte si, že je-li ID ID nalezeno v příchozím e-mailu, bude událost automaticky propojena s příslušnými objekty.
+WithGMailYouCanCreateADedicatedPassword=Pokud je účet služby GMail povolen, je-li povoleno ověření dvou kroků, je doporučeno vytvořit vyhrazené druhé heslo pro aplikaci namísto použití hesla hesla z účtu https://myaccount.google.com/.
+IFTTTSetup=Nastavení modulu IFTTT
+IFTTT_SERVICE_KEY=Servisní klíč IFTTT
+IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Bezpečnostní klíč pro zabezpečení adresy URL koncového bodu, kterou používá IFTTT k odesílání zpráv do Dolibarr.
+IFTTTDesc=Tento modul je určen pro spouštění událostí na IFTTT a / nebo pro provádění některých akcí na externích spouštěčích IFTTT.
+UrlForIFTTT=URL koncový bod pro IFTTT
+YouWillFindItOnYourIFTTTAccount=Najdete ho na svém účtu IFTTT
+EndPointFor=End point for %s : %s
diff --git a/htdocs/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang
index 2007ce30d04..20871c710c9 100644
--- a/htdocs/langs/cs_CZ/agenda.lang
+++ b/htdocs/langs/cs_CZ/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Události, pro které Dolibarr vytvoří akci v programu automatic
 EventRemindersByEmailNotEnabled=Připomenutí událostí e-mailem nebyla povolena do %snastavení modulu .
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Subjekt %s vytvořen
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Kontrakt %s ověřen
 CONTRACT_DELETEInDolibarr=Smlouva %s byla smazána
 PropalClosedSignedInDolibarr=Nabídka %s podepsána
@@ -95,7 +96,8 @@ PROJECT_MODIFYInDolibarr=Projekt %s modifikované
 PROJECT_DELETEInDolibarr=Projekt %s byl smazán
 TICKET_CREATEInDolibarr=Lístek %s byl vytvořen 
 TICKET_MODIFYInDolibarr=Změna lístku %s
-TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
+TICKET_CLOSEInDolibarr=Lístek %s uzavřen
 TICKET_DELETEInDolibarr=Lístek %s byl smazán
 ##### End agenda events #####
 AgendaModelModule=Šablony dokumentů pro události
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index 510c283a6a3..42ea29d40bf 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banka
-MenuBankCash=Bank | Cash
-MenuVariousPayment=Miscellaneous payments
-MenuNewVariousPayment=New Miscellaneous payment
+MenuBankCash=Banky | Hotovost
+MenuVariousPayment=Různé platby
+MenuNewVariousPayment=Nová Různá platba
 BankName=Název banky
 FinancialAccount=Účet
 BankAccount=Bankovní účet
 BankAccounts=Bankovní účty
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bankovní účty Brány
 ShowAccount=Ukázat účet
 AccountRef=Finanční účet ref
 AccountLabel=Štítek finančního účtu
@@ -30,23 +30,23 @@ AllTime=Od začátku
 Reconciliation=Vyrovnání
 RIB=Číslo bankovního účtu
 IBAN=IBAN
-BIC=BIC/SWIFT kód
+BIC=BIC / SWIFT kód
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
-StandingOrders=Direct Debit orders
-StandingOrder=Direct debit order
+IbanValid=BAN platný
+IbanNotValid=BAN není platná
+StandingOrders=Příkazy přímého inkasa
+StandingOrder=Trvalý příkaz
 AccountStatement=Výpis z účtu
 AccountStatementShort=Prohlášení
 AccountStatements=Výpisy z účtů
 LastAccountStatements=Poslední výpis z účtu
 IOMonthlyReporting=Měsíční hlášení
-BankAccountDomiciliation=Účetní adresa
+BankAccountDomiciliation=adresa banky
 BankAccountCountry=Účet země
 BankAccountOwner=Název majitele účtu
 BankAccountOwnerAddress=Adresa majitele účtu
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+RIBControlError=Kontrola integrity hodnot selhala. To znamená, že informace pro toto číslo účtu nejsou úplné nebo jsou nesprávné (zkontrolujte zemi, čísla a IBAN).
 CreateAccount=Vytvořit účet
 NewBankAccount=Nový účet
 NewFinancialAccount=Nový finanční účet
@@ -60,84 +60,84 @@ BankType2=Pokladní účet
 AccountsArea=Oblast účtů
 AccountCard=Karta účtu
 DeleteAccount=Smazat účet
-ConfirmDeleteAccount=Are you sure you want to delete this account?
+ConfirmDeleteAccount=Opravdu chcete tento účet smazat?
 Account=Účet
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
+BankTransactionByCategories=Bankovní záznamy podle kategorií
+BankTransactionForCategory=Bankovní položky pro kategorii <b> %s </b>
 RemoveFromRubrique=Odstraňte spojení s kategorií
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
+RemoveFromRubriqueConfirm=Opravdu chcete odstranit propojení mezi položkou a kategorií?
+ListBankTransactions=Seznam bankovních záznamů
 IdTransaction=ID transakce
-BankTransactions=Bank entries
+BankTransactions=Bankovní zápisy
 BankTransaction=Bankovní transakce
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
+ListTransactions=Seznamy záznamů
+ListTransactionsByCategory=Seznam položek/kategorií
+TransactionsToConciliate=Položky ke sladění
 Conciliable=Může být porovnáno
 Conciliate=Porovnat
 Conciliation=Porovnání
-SaveStatementOnly=Save statement only
-ReconciliationLate=Reconciliation late
+SaveStatementOnly=Uložit výkaz pouze
+ReconciliationLate=Porovnání později
 IncludeClosedAccount=Zahrnout uzavřené účty
 OnlyOpenedAccount=Pouze otevřené účty
 AccountToCredit=Úvěrový účet
 AccountToDebit=Účet na vrub
 DisableConciliation=Zakázat funkci porovnání pro tento účet
 ConciliationDisabled=Funkce porovnání vypnuta
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
+LinkedToAConciliatedTransaction=Souvisí s dohodnutým zápisem
 StatusAccountOpened=Otevřeno
 StatusAccountClosed=Zavřeno
 AccountIdShort=Číslo
 LineRecord=Transakce
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
-Conciliated=Reconciled
+AddBankRecord=Přidat záznam
+AddBankRecordLong=Přidejte položku ručně
+Conciliated=Sladěno
 ConciliatedBy=Porovnáno
 DateConciliating=Datum porovnání
-BankLineConciliated=Entry reconciled
-Reconciled=Reconciled
-NotReconciled=Not reconciled
+BankLineConciliated=Vstup porovnání
+Reconciled=Sladěno
+NotReconciled=Nesladěno
 CustomerInvoicePayment=Zákaznická platba
 SupplierInvoicePayment=Dodavatelská platba
-SubscriptionPayment=Zasílání novinek platba
+SubscriptionPayment=Platba předplatného
 WithdrawalPayment=Výběr platby
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bankovní převod
 BankTransfers=Bankovní převody
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Převod z jednoho účtu na jiný, Dolibarr zapíše dva záznamy (debet na zdrojovém účtu a kredit na cílový účet). Pro tuto transakci bude použita stejná částka (kromě znaménka), štítek a datum)
 TransferFrom=Z
 TransferTo=Na
 TransferFromToDone=Převod z <b>%s</b> na <b>%s</b> %s <b>%s</b> byl zaznamenán.
 CheckTransmitter=Převádějící
-ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
-DeleteCheckReceipt=Delete this check receipt?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+ValidateCheckReceipt=Ověřit potvrzení o kontrole?
+ConfirmValidateCheckReceipt=Jste si jisti, že chcete ověřit zaškrtnutí tohoto potvrzení? Jakmile ho provedete, nebudete ho již moci změnit.
+DeleteCheckReceipt=Chcete smazat potvrzení o kontrole?
+ConfirmDeleteCheckReceipt=Opravdu chcete tuto potvrzení o potvrzení vymazat?
 BankChecks=Bankovní šeky
-BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceipt=Kontroly čekající na vklad
 ShowCheckReceipt=Zobrazit příjmový vklad šeku
-NumberOfCheques=No. of check
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+NumberOfCheques=Počet kontrol
+DeleteTransaction=Smazat záznam
+ConfirmDeleteTransaction=Opravdu chcete tuto položku smazat?
+ThisWillAlsoDeleteBankRecord=Toto odstraní vznikající bankovní transakce
 BankMovements=Pohyby
-PlannedTransactions=Planned entries
+PlannedTransactions=Plánované záznamy
 Graph=Grafika
-ExportDataset_banque_1=Bank entries and account statement
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_1=Bankovní záznamy a výpis z účtu
+ExportDataset_banque_2=Vkladní lístek
 TransactionOnTheOtherAccount=Transakce na jiný účet
-PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateSucceeded=Číslo platby bylo úspěšně aktualizováno
 PaymentNumberUpdateFailed=Číslo platby nelze aktualizovat
-PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateSucceeded=Datum platby bylo úspěšně aktualizováno
 PaymentDateUpdateFailed=Datum platby nelze aktualizovat
 Transactions=Transakce
 BankTransactionLine=Bank entry
-AllAccounts=All bank and cash accounts
+AllAccounts=Všechny bankovní a hotovostní účty
 BackToAccount=Zpět na účet
 ShowAllAccounts=Zobrazit pro všechny účty
-FutureTransaction=Transaction in future. No way to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+FutureTransaction=Budoucí transakce. Nedá se sladit.
+SelectChequeTransactionAndGenerate=Zvolte / filtrujte kontroly, které chcete zahrnout do potvrzení o vkladové kartě a klikněte na "Vytvořit".
 InputReceiptNumber=Vyberte si výpis z účtu v souvislosti s porovnáváním. Použijte tříditelnou číselnou hodnotu: YYYYMM nebo YYYYMMDD
 EventualyAddCategory=Eventuelně upřesněte kategorii, ve které chcete klasifikovat záznamy
 ToConciliate=To reconcile?
@@ -147,21 +147,23 @@ AllRIB=Všechny BAN
 LabelRIB=BAN Štítek
 NoBANRecord=Žádný BAN záznam
 DeleteARib=Smazat BAN záznam
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
-RejectCheck=Check returned
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
-RejectCheckDate=Date the check was returned
-CheckRejected=Check returned
-CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
-VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
-SEPAMandate=SEPA mandate
-YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+ConfirmDeleteRib=Opravdu chcete tento záznam BAN odstranit?
+RejectCheck=Kontrola vrácena
+ConfirmRejectCheck=Opravdu chcete označit tuto kontrolu za zamítnuta?
+RejectCheckDate=Datum vrácení kontroly
+CheckRejected=Kontrola vrácena
+CheckRejectedAndInvoicesReopened=Kontrola vrácena a faktury znovu otevřeny
+BankAccountModelModule=Šablony dokumentů pro bankovní účty
+DocumentModelSepaMandate=Šablona mandátu SEPA. Pouze pro evropské země v EHS.
+DocumentModelBan=Šablona pro tisk stránky s informacemi o BAN.
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
+VariousPayments=Různé platby
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
+SEPAMandate=Mandát SEPA
+YourSEPAMandate=Váš mandát SEPA
+FindYourSEPAMandate=Toto je vaše mandát SEPA, který autorizuje naši společnost, aby inkasovala inkasní příkaz k vaší bance. Vraťte jej podepsanou (skenování podepsaného dokumentu) nebo pošlete jej poštou
+AutoReportLastAccountStatement=Automaticky vyplňte pole "číslo bankovního výpisu" s posledním číslem výpisu při odsouhlasení
+CashControl=POS peněžní oplocení
+NewCashFence=Nový peněžní plot
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 2f6567f4e78..024125e7199 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=v měně faktur
 PaidBack=Navrácené
 DeletePayment=Odstranit platby
 ConfirmDeletePayment=Jste si jisti, že chcete smazat tuto platbu?
-ConfirmConvertToReduc=Přejete si převést tento %s na absolutní slevu? <br> Částka bude uložena mezi všechny slevy a mohla by být použita jako sleva pro aktuální nebo budoucí fakturu pro tohoto zákazníka.
-ConfirmConvertToReducSupplier=Přejete si převést tento %s na absolutní slevu? <br> Částka bude uložena mezi všechny slevy a mohla by být použita jako sleva pro aktuální nebo budoucí fakturu pro tohoto prodejce.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Platby dodavatele
 ReceivedPayments=Přijaté platby
 ReceivedCustomersPayments=Platby přijaté od zákazníků
@@ -89,7 +91,6 @@ PaymentTerm=Platební termín
 PaymentConditions=Platební podmínky
 PaymentConditionsShort=Platební podmínky
 PaymentAmount=Částka platby
-ValidatePayment=Ověření platby
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Ověřovat faktury automaticky
 GeneratedFromRecurringInvoice=Generován z šablony opakující faktury %s
 DateIsNotEnough=Datum ještě nebylo dosaženo
 InvoiceGeneratedFromTemplate=Faktura %s generována z opakující se šablona faktury %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Upozornění: datum faktury je vyšší než aktuální datum
 WarningInvoiceDateTooFarInFuture=Upozornění: datum faktury je příliš daleko od aktuálního data
 ViewAvailableGlobalDiscounts=Zobrazit dostupné slevy
diff --git a/htdocs/langs/cs_CZ/cashdesk.lang b/htdocs/langs/cs_CZ/cashdesk.lang
index 259d51a60dc..06438883dac 100644
--- a/htdocs/langs/cs_CZ/cashdesk.lang
+++ b/htdocs/langs/cs_CZ/cashdesk.lang
@@ -50,15 +50,21 @@ TheoricalAmount=Teoretická částka
 RealAmount=Skutečná částka
 CashFenceDone=Peněžní oplatek za období
 NbOfInvoices=Některé z faktur
-Paymentnumpad=Type of Pad to enter payment
+Paymentnumpad=Zadejte Pad pro vložení platby
 Numberspad=Numbers Pad
-BillsCoinsPad=Coins and banknotes Pad
+BillsCoinsPad=Mince a bankovky Pad
 DolistorePosCategory=Moduly TakePOS a další POS řešení pro Dolibarr
 TakeposNeedsCategories=Firma TakePOS potřebuje k tomu produktové kategorie
 OrderNotes=Objednací poznámky
-CashDeskBankAccountFor=Default account to use for payments in
-NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
-TicketVatGrouped=Group VAT by rate in tickets
-AutoPrintTickets=Automatically print tickets
-EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
-ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+CashDeskBankAccountFor=Výchozí účet, který se má použít pro platby v účtu
+NoPaimementModesDefined=V konfiguraci TakePOS není definován žádný režim platby
+TicketVatGrouped=Skupinová DPH dle sazeb na lístcích
+AutoPrintTickets=Automaticky tisknout vstupenky
+EnableBarOrRestaurantFeatures=Povolit funkce pro Bar nebo Restaurace
+ConfirmDeletionOfThisPOSSale=Potvrzujete, že jste tento prodej zrušili?
+History=Historie
+ValidateAndClose=Ověřte a zavřete
+Terminal=Terminál
+NumberOfTerminals=Počet terminálů
+TerminalSelect=Vyberte terminál, který chcete použít:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index ed3ad1189a3..fae494503ab 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -28,7 +28,7 @@ AliasNames=Alias jméno (komerční, ochranná známka, ...)
 AliasNameShort=Název aliasu
 Companies=Společnosti
 CountryIsInEEC=Země je uvnitř Evropského hospodářského společenství
-PriceFormatInCurrentLanguage=Cenový formát v aktuálním jazyce
+PriceFormatInCurrentLanguage=Formát zobrazení ceny v aktuálním jazyce a měně
 ThirdPartyName=Název subjektu
 ThirdPartyEmail=E-mail subjektu
 ThirdParty=Subjekt
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index 96c20a552ae..9fd0d7e0d96 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Přidejte sociální / fiskální daň
 ContributionsToPay=Sociální / daně za náhradu
 AccountancyTreasuryArea=Fakturační a platební oblast
 NewPayment=Nová platba
-Payments=Platby
 PaymentCustomerInvoice=Platba zákaznické faktury
 PaymentSupplierInvoice=Platba dodavatelské faktury
 PaymentSocialContribution=Sociální / fiskální placení daní
@@ -205,7 +204,6 @@ SellsJournal=Prodejní deník
 PurchasesJournal=Nákupní deník
 DescSellsJournal=Prodejní deník
 DescPurchasesJournal=Nákupní deník
-InvoiceRef=Faktura čj.
 CodeNotDef=Není definováno
 WarningDepositsNotIncluded=Zálohové faktury nejsou zahrnuty v této verzi tohoto modulu účetnictví.
 DatePaymentTermCantBeLowerThanObjectDate=Datum termínu platby nemůže být nižší než datum objektu.
diff --git a/htdocs/langs/cs_CZ/contracts.lang b/htdocs/langs/cs_CZ/contracts.lang
index f2550b5dedc..c7424739a01 100644
--- a/htdocs/langs/cs_CZ/contracts.lang
+++ b/htdocs/langs/cs_CZ/contracts.lang
@@ -64,7 +64,8 @@ DateStartRealShort=Skutečné datum zahájení
 DateEndReal=Skutečné datum ukončení
 DateEndRealShort=Skutečné datum ukončení
 CloseService=Zavřít služby
-BoardRunningServices=Prošlé spuštěné služby
+BoardRunningServices=Spuštěné služby
+BoardExpiredServices=Vypršené služby
 ServiceStatus=Stav služby
 DraftContracts=Koncepty smlouvy
 CloseRefusedBecauseOneServiceActive=Smlouvu nelze uzavřít, protože u ní ní existuje alespoň jedna otevřená služba
diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
index 26fe6ba9bd3..5d196c978eb 100644
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/htdocs/langs/cs_CZ/cron.lang
@@ -6,16 +6,16 @@ Permission23102 = Vytvoření/aktualizace naplánované úlohy
 Permission23103 = Smazat naplánovanou úlohu
 Permission23104 = Provést naplánovanou úlohu
 # Admin
-CronSetup= Nastavení naplánovaných úloh
+CronSetup=Nastavení naplánovaných úloh
 URLToLaunchCronJobs=URL ke kontrole a spuštění úlohy v případě potřeby
 OrToLaunchASpecificJob=Nebo zkontrolovat a zahájit konkrétní práci
 KeyForCronAccess=Bezpečnostní klíč URL spuštění úlohy
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+FileToLaunchCronJobs=Příkazový řádek pro kontrolu a spuštění kvalifikovaných úloh v cronu
 CronExplainHowToRunUnix=Na Unixových systémech by jste měli použít následující položku crontab ke spuštění příkazového řádku každých 5 minut
-CronExplainHowToRunWin=Na Microsoft Windows systémech můžete použít naplánováné nástroje úloh ke spuštění příkazového řádku každých 5 minut
+CronExplainHowToRunWin=V prostředí Microsoft  Windows můžete pomocí nástrojů Naplánované úlohy spustit příkazový řádek každých 5 minut
 CronMethodDoesNotExists=Třída %s neobsahuje žádné metody %s
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronJobDefDesc=Profily úloh Cron jsou definovány do souboru deskriptoru modulu. Když je modul aktivován, jsou načteny a dostupné, takže můžete spravovat úlohy z nabídky nástrojů admin %s.
+CronJobProfiles=Seznam předdefinovaných úloh profilu cron
 # Menu
 EnabledAndDisabled=Zapínat a vypínat
 # Page list
@@ -27,7 +27,7 @@ CronDelete=Smazat naplánované úlohy
 CronConfirmDelete=Jste si jisti, že chcete odstranit tyto naplánované úlohy?
 CronExecute=Spuštění naplánovaných úloh
 CronConfirmExecute=Jste si jisti, že chcete provést tyto naplánované úlohy nyní?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronInfo=Plánovací modul úloh umožňuje naplánovat úlohy, které se mají automaticky spouštět. Práce lze také spustit ručně.
 CronTask=Práce
 CronNone=Nikdo
 CronDtStart=Ne předtím
@@ -42,8 +42,8 @@ CronModule=Modul
 CronNoJobs=Žádné registrované úkoly
 CronPriority=Priorita
 CronLabel=Štítek
-CronNbRun=Nb. zahájit
-CronMaxRun=Max number launch
+CronNbRun=Počet spuštění
+CronMaxRun=Maximální počet spuštění
 CronEach=Každý
 JobFinished=Práce zahájena a dokončena
 #Page card
@@ -55,29 +55,29 @@ CronSaveSucess=Úspěšně uloženo
 CronNote=Komentář
 CronFieldMandatory=Pole %s je povinné
 CronErrEndDateStartDt=Datum ukončení nemůže být před datem zahájení
-StatusAtInstall=Status at module installation
+StatusAtInstall=Stav při instalaci modulu
 CronStatusActiveBtn=Umožnit
 CronStatusInactiveBtn=Zakázat
 CronTaskInactive=Tato úloha je zakázána
 CronId=Id
-CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple 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 exemple 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>
+CronClassFile=Název souboru s třídou
+CronModuleHelp=Název adresáře modulu Dolibarr (také pracuje s externím modulem Dolibarr). <BR> Chcete-li volat například metodu načítání produktu Dolibarr Product /htdocs/<u>product</u>/class/product.class.php, je hodnota pro modul <br><i> produkt </i>
+CronClassFileHelp=Relativní cesta a název souboru k načtení (cesta je relativní k kořenovému adresáři webového serveru). <BR> Chcete-li například volat metodu načítání produktu Dolibarr Product htdocs / product / class / <u> product.class.php</u>, hodnota pro název souboru třídy je <br><i> product / class / product.class.php </i>
+CronObjectHelp=Název objektu, který chcete načíst. <BR> Chcete-li volat například metodu načítání produktu Dolibarr Product /htdocs/product/class/product.class.php, hodnota názvu souboru třídy je <br><i> Produkt </i>
+CronMethodHelp=Objektová metoda spuštění. <BR> Chcete-li například volat metodu načítání produktu Dolibarr Product /htdocs/product/class/product.class.php, hodnota metody je <br><i> načíst </i>
+CronArgsHelp=Argumenty metody. <BR> Chcete-li například volat metodu načítání produktu Dolibarr Product /htdocs/product/class/product.class.php, může být hodnota parametrů<br><i> 0, ProductRef </i>
 CronCommandHelp=Spustit příkazový řádek.
 CronCreateJob=Vytvořit novou naplánovanou úlohu
 CronFrom=Z
 # Info
 # Common
 CronType=Typ úlohy
-CronType_method=Call method of a PHP Class
+CronType_method=Metoda volání třídy PHP
 CronType_command=Shell příkaz
-CronCannotLoadClass=Cannot load class file %s (to use class %s)
-CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
+CronCannotLoadClass=Nelze načíst soubor třídy %s (použít třídu %s)
+CronCannotLoadObject=Byl vložen soubor třídy %s, ale do něj nebyl nalezen objekt %s
 UseMenuModuleToolsToAddCronJobs=Jděte do menu "Home- Moduly nářadí- Seznam úloh" kde vidíte a upravujete naplánované úlohy.
 JobDisabled=Úloha vypnuta
 MakeLocalDatabaseDumpShort=Záloha lokální databáze
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+MakeLocalDatabaseDump=Vytvoření výpisu místní databáze. Parametry jsou: komprese ('gz' nebo 'bz' nebo 'none'), zálohovací typ ('mysql', 'pgsql', 'auto'),
+WarningCronDelayed=Pozor, pokud jde o výkonnost, bez ohledu na to, co je příštím datem provedení povolených úloh, mohou být vaše úlohy zpožděny maximálně do %s hodin, než budou spuštěny.
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 5afe3ba440d..881d0385adf 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -216,11 +216,12 @@ ErrorDuringChartLoad=Při načtení tabulky účtů došlo k chybě. Pokud nebyl
 ErrorBadSyntaxForParamKeyForContent=Špatná syntaxe pro parametr keyforfortent. Musí mít hodnotu začínající %s nebo %s
 ErrorVariableKeyForContentMustBeSet=Chyba, musí být nastavena konstanta s názvem %s (s obsahem textu, který se má zobrazit) nebo %s (s externí adresou URL).
 ErrorURLMustStartWithHttp=Adresa URL %s musí začínat http: // nebo https: //
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorNewRefIsAlreadyUsed=Chyba, nový odkaz je již použit
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 # Warnings
 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=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningMandatorySetupNotComplete=Klikněte zde pro nastavení povinných parametrů
+WarningEnableYourModulesApplications=Kliknutím zde povolíte moduly a aplikace
 WarningSafeModeOnCheckExecDir=Upozornění: volba PHP <b> safe_mode </b> je taková, že příkaz musí být uložen uvnitř adresáře deklarovaného parametrem php <b> safe_mode_exec_dir </b>.
 WarningBookmarkAlreadyExists=Záložka s tímto názvem, nebo tento cíl (URL) již existuje.
 WarningPassIsEmpty=Upozornění: Heslo databáze je prázdné. To je bezpečnostní díra. Do databáze byste měli přidat heslo a změnit tento soubor conf.php. Pokud to neuděláte, koledujete si o problémy ....
diff --git a/htdocs/langs/cs_CZ/holiday.lang b/htdocs/langs/cs_CZ/holiday.lang
index 91e1d72c0d0..03a83bf4293 100644
--- a/htdocs/langs/cs_CZ/holiday.lang
+++ b/htdocs/langs/cs_CZ/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leave
-CPTitreMenu=Leave
+Holidays=Listy
+CPTitreMenu=Dovolená
 MenuReportMonth=Měsíční výkaz
-MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leave to view this page.
+MenuAddCP=Nová žádost o dovolenou
+NotActiveModCP=Chcete-li zobrazit tuto stránku, musíte povolit modul Nechat.
 AddCP=Požádejte o dovolenou
 DateDebCP=Datum zahájení
 DateFinCP=Datum ukončení
@@ -15,18 +15,18 @@ ApprovedCP=Schválený
 CancelCP=Zrušený
 RefuseCP=Odmínutý
 ValidatorCP=Schválil
-ListeCP=List of leave
-LeaveId=Leave ID
+ListeCP=Seznam dovolených
+LeaveId=Zanechte ID
 ReviewedByCP=Bude přezkoumána
-UserForApprovalID=User for approval ID
-UserForApprovalFirstname=First name of approval user
-UserForApprovalLastname=Last name of approval user
-UserForApprovalLogin=Login of approval user
+UserForApprovalID=Uživatel pro ID schválení
+UserForApprovalFirstname=Jméno uživatele schválení
+UserForApprovalLastname=Příjmení schvalovacího uživatele
+UserForApprovalLogin=Přihlášení uživatele schvalování
 DescCP=Popis
 SendRequestCP=Vytvořit požadavek na dovolenou
 DelayToRequestCP=Požadavek na dovolenou musí být zadán nejméně <b>%s den(y)</b> před termínem.
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+MenuConfCP=Zůstatek dovolené
+SoldeCPUser=Zbývající dovolená je <b>%s</b> dnů.
 ErrorEndDateCP=Musíte vybrat koncové datum větší než datum zahájení.
 ErrorSQLCreateCP=SQL chyba při tvorbě:
 ErrorIDFicheCP=Došlo k chybě, požadavek dovolené neexistuje.
@@ -35,14 +35,14 @@ ErrorUserViewCP=Nemáte oprávnění číst tuto žádost o dovolenou
 InfosWorkflowCP=Průběh informací
 RequestByCP=Požádané
 TitreRequestCP=Nechat žádost
-TypeOfLeaveId=Type of leave ID
-TypeOfLeaveCode=Type of leave code
-TypeOfLeaveLabel=Type of leave label
+TypeOfLeaveId=Typ ID dovolené
+TypeOfLeaveCode=Typ kódu dovolené
+TypeOfLeaveLabel=Typ štítku na dovolenou
 NbUseDaysCP=Počet dní vyčerpané dovolené
-NbUseDaysCPShort=Days consumed
-NbUseDaysCPShortInMonth=Days consumed in month
-DateStartInMonth=Start date in month
-DateEndInMonth=End date in month
+NbUseDaysCPShort=Počet spotřebovaných dnů
+NbUseDaysCPShortInMonth=Dny spotřebované v měsíci
+DateStartInMonth=Datum zahájení v měsíci
+DateEndInMonth=Datum ukončení v měsíci
 EditCP=Upravit
 DeleteCP=Vymazat
 ActionRefuseCP=Odmítnout
@@ -71,12 +71,12 @@ DateRefusCP=Datum odmítnutí
 DateCancelCP=Datum zrušení
 DefineEventUserCP=Přiřadit výjimečnou dovolenou pro uživatele
 addEventToUserCP=Přiřadit dovolenou
-NotTheAssignedApprover=You are not the assigned approver
+NotTheAssignedApprover=Nejste určeným schvalujícím
 MotifCP=Důvod
 UserCP=Uživatel
 ErrorAddEventToUserCP=Došlo k chybě při přidávání požadavku na výjimečnou dovolenou.
 AddEventToUserOkCP=Přidání výjimečné dovolené bylo dokončeno.
-MenuLogCP=View change logs
+MenuLogCP=Zobrazení protokolů změn
 LogCP=Log aktualizací dostupných prázdninových dnů
 ActionByCP=Účinkují
 UserUpdateCP=Pro uživatele
@@ -85,45 +85,46 @@ NewSoldeCP=Nový zůstatek
 alreadyCPexist=Žádost o dovolenou pro toto období již byla provedena.
 FirstDayOfHoliday=První den dovolené
 LastDayOfHoliday=Poslední den dovolené
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
+BoxTitleLastLeaveRequests=Nejnovější %s upravené žádosti o dovolenou
 HolidaysMonthlyUpdate=Měsíční aktualizace
 ManualUpdate=Ruční aktualizace
 HolidaysCancelation=Stornovat dovolenou
-EmployeeLastname=Employee last name
-EmployeeFirstname=Employee first name
-TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
-LastHolidays=Latest %s leave requests
-AllHolidays=All leave requests
-HalfDay=Half day
-NotTheAssignedApprover=You are not the assigned approver
-LEAVE_PAID=Paid vacation
-LEAVE_SICK=Sick leave
-LEAVE_OTHER=Other leave
-LEAVE_PAID_FR=Paid vacation
+EmployeeLastname=Příjmení zaměstnance
+EmployeeFirstname=Křestní jméno zaměstnance
+TypeWasDisabledOrRemoved=Typ volno (id %s) byl zakázán nebo odstraněn
+LastHolidays=Nejnovější %s žádosti o dovolenou
+AllHolidays=Všechny žádosti o dovolenou
+HalfDay=Půldenní
+NotTheAssignedApprover=Nejste určeným schvalujícím
+LEAVE_PAID=Placená dovolená
+LEAVE_SICK=Nemocní dovolenka
+LEAVE_OTHER=Další dovolená
+LEAVE_PAID_FR=Placená dovolená
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+LastUpdateCP=Poslední automatická aktualizace přidělení dovolené
+MonthOfLastMonthlyUpdate=Měsíc poslední automatické aktualizace přidělení dovolené
 UpdateConfCPOK=Aktualizováno úspěšně.
 Module27130Name= Správa žádostí o dovolenou
 Module27130Desc= Správa požadavků dovolené
 ErrorMailNotSend=Došlo k chybě při odesílání na e-mail:
-NoticePeriod=Notice period
+NoticePeriod=Výpovědní lhůta
 #Messages
 HolidaysToValidate=Ověření žádosti o dovolenou
 HolidaysToValidateBody=Níže je požadavek na ověření dovolené
 HolidaysToValidateDelay=Tento požadavek dovolené proběhne ve lhůtě kratší než %s dní.
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysToValidateAlertSolde=Uživatel, který provedl tuto žádost o povolení, nemá dostatek dostupných dní.
 HolidaysValidated=Ověřené žádosti dovolené
 HolidaysValidatedBody=Vaše žádost o dovolenou %s do %s byla ověřena.
 HolidaysRefused=Požadavek zamítnut
 HolidaysRefusedBody=Vaše žádost o dovolenou pro %s do %s byla zamítnuta z těchto důvodů:
 HolidaysCanceled=Zrušené požadavky na dovolenou
 HolidaysCanceledBody=Vaše žádost o dovolenou pro %s na %s byla zrušena.
-FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
-NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Holiday
-HolidaysNumberingModules=Leave requests numbering models
-TemplatePDFHolidays=Template for leave requests PDF
-FreeLegalTextOnHolidays=Free text on PDF
-WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+FollowedByACounter=1: Tento typ dovolené musí být následován počítadlem. Čítač se zvyšuje ručně nebo automaticky a po potvrzení žádosti o dovolenou je počitadlo snižováno. <br> 0: Následují počítadlo.
+NoLeaveWithCounterDefined=Neexistují definované typy dovolených, které musí následovat počítadlo
+GoIntoDictionaryHolidayTypes=Přejděte do <strong> Domovská stránka - Nastavení - Slovníky - Typ dovolené </strong> a nastavte různé typy listů.
+HolidaySetup=Nastavení modulu Dovolená
+HolidaysNumberingModules=Zanechat modely číslování žádostí
+TemplatePDFHolidays=Šablona pro žádosti o dovolenou PDF
+FreeLegalTextOnHolidays=Volný text ve formátu PDF
+WatermarkOnDraftHolidayCards=Vodoznaky na žádosti o povolení dovolené
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index 0d30ffe45be..9321d8f66b0 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Předmět
 MailText=Zpráva
 MailFile=Přiložené soubory
 MailMessage=Tělo e-mailu
+SubjectNotIn=Není v předmětu
+BodyNotIn=Není v těle
 ShowEMailing=Zobrazit mail
 ListOfEMailings=Seznam zpráv
 NewMailing=Nové odeslání
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 77c2d090415..a843f00cee0 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -371,6 +371,7 @@ Percentage=Procento
 Total=Celkový
 SubTotal=Mezisoučet
 TotalHTShort=Celkem (bez)
+TotalHT100Short=Celkem 100%% (bez.)
 TotalHTShortCurrency=Celkem (bez měny)
 TotalTTCShort=Celkem (vč. DPH)
 TotalHT=Celkem (bez daně)
@@ -402,7 +403,7 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Additionnal cents
+LT1GC=Doplňkové centy
 VATRate=Daňová sazba
 VATCode=Daňový kód
 VATNPR=Daňová sazba NPR
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Zaslat potvrzovací e-mail
 SendMail=Odeslat e-mail
 Email=E-mail
 NoEMail=Žádný e-mail
-Email=E-mail
 AlreadyRead=Již jste si přečetli
 NotRead=Nepřečetl
 NoMobilePhone=Žádné telefonní číslo
@@ -671,7 +671,6 @@ Method=Metoda
 Receive=Přijmout
 CompleteOrNoMoreReceptionExpected=Dokončeno nebo nic víc očekávaného
 ExpectedValue=Očekávaná hodnota
-CurrentValue=Současná hodnota
 PartialWoman=Částečný
 TotalWoman=Celkový
 NeverReceived=Nikdy nedostal
@@ -834,6 +833,7 @@ RelatedObjects=Související objekty
 ClassifyBilled=Označit jako účtováno
 ClassifyUnbilled=Zařadit nevyfakturované
 Progress=Pokrok
+ProgressShort=Progr.
 FrontOffice=Přední kancelář
 BackOffice=Back office
 View=Pohled
@@ -842,6 +842,11 @@ Exports=Exporty
 ExportFilteredList=Export filtrovaný seznam
 ExportList=seznam export
 ExportOptions=Možnosti exportu
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Smíšený
 Calendar=Kalendář
 GroupBy=Skupina vytvořená...
@@ -854,7 +859,7 @@ Download=Stažení
 DownloadDocument=Stáhnout dokument
 ActualizeCurrency=Aktualizovat měnovou sazbu
 Fiscalyear=Fiskální rok
-ModuleBuilder=module Builder
+ModuleBuilder=Tvůrce modulů a aplikací
 SetMultiCurrencyCode=Nastavte měnu
 BulkActions=Hromadné akce
 ClickToShowHelp=Kliknutím zobrazíte nápovědu nápovědy
@@ -967,6 +972,10 @@ YouAreCurrentlyInSandboxMode=V současné době se nacházíte v %srežimu "sand
 Inventory=Inventář
 AnalyticCode=Analytický kód
 TMenuMRP=MRP
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
+ShowMoreInfos=Zobrazit další informace
+NoFilesUploadedYet=Nejprve nahrajte dokument
+SeePrivateNote=Viz soukromá poznámka
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index 2f3abe65b1f..2ffb379f7c9 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -1,37 +1,37 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=Členská sekce
+MembersArea=Členská oblast
 MemberCard=Členské karty
 SubscriptionCard=Vstupní karta
 Member=Člen
 Members=Členové
 ShowMember=Zobrazit členskou kartu
 UserNotLinkedToMember=Uživatel není spojena s členem
-ThirdpartyNotLinkedToMember=Subjekty nejsou spojeny s členy
-MembersTickets=Členové Vstupenky
-FundationMembers=Členy Nadace
-ListOfValidatedPublicMembers=Seznam potvrzených veřejné členy
+ThirdpartyNotLinkedToMember=Subjekty nejsou spojené s členy
+MembersTickets=Vstupenky pro členy
+FundationMembers=Členové nadace
+ListOfValidatedPublicMembers=Seznam ověřených veřejných členů
 ErrorThisMemberIsNotPublic=Tento člen je neveřejný
-ErrorMemberIsAlreadyLinkedToThisThirdParty=Další člen (jméno: <b>%s,</b> login: <b>%s)</b> je již spojena s třetími stranami <b>%s.</b> Odstraňte tento odkaz jako první, protože třetí strana nemůže být spojována pouze člen (a vice versa).
-ErrorUserPermissionAllowsToLinksToItselfOnly=Z bezpečnostních důvodů musí být uděleno oprávnění k úpravám, aby všichni uživatelé mohli spojit člena uživatele, která není vaše.
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Další člen (jméno: <b> %s</b>, přihlašovací jméno: <b> %s </b>) je již propojen se subjektem <b> %s</b>. Nejprve odeberte tento odkaz, protože subjekt nemůže být propojen pouze s členem (a naopak).
+ErrorUserPermissionAllowsToLinksToItselfOnly=Z bezpečnostních důvodů musíte mít oprávnění k úpravě všech uživatelů, abyste mohli člena propojit s uživatelem, který není vaším.
 SetLinkToUser=Odkaz na uživateli Dolibarr
-SetLinkToThirdParty=Odkaz na Dolibarr třetí osobě
+SetLinkToThirdParty=Odkaz na Dolibarr subjektu
 MembersCards=Členové vizitky
 MembersList=Seznam členů
-MembersListToValid=Seznam návrhů členů (má být ověřen)
+MembersListToValid=Seznam členů návrhu (bude ověřeno)
 MembersListValid=Seznam platných členů
 MembersListUpToDate=Seznam platných členů s aktuální předplatné
-MembersListNotUpToDate=Seznam platných členů s předplatným zastaralé
+MembersListNotUpToDate=Seznam platných členů s předplatným zastaralým
 MembersListResiliated=Seznam ukončených členů
 MembersListQualified=Seznam kvalifikovaných členů
-MenuMembersToValidate=Návrhy členů
-MenuMembersValidated=Ověřené členů
-MenuMembersUpToDate=Aktuální členy
-MenuMembersNotUpToDate=Neaktuální členů
+MenuMembersToValidate=Návrh členů
+MenuMembersValidated=Ověření členové
+MenuMembersUpToDate=Aktuální členové
+MenuMembersNotUpToDate=Neaktuální členové
 MenuMembersResiliated=Ukončené členové
-MembersWithSubscriptionToReceive=Členové s předplatným dostávat
+MembersWithSubscriptionToReceive=Členové s předplatným k přijímání
 DateSubscription=Vstupní data
-DateEndSubscription=Zasílání novinek datum ukončení
-EndSubscription=Konec předplatné
+DateEndSubscription=Datum ukončení předplatného
+EndSubscription=Konec odběru
 SubscriptionId=ID předplatného
 MemberId=ID člena
 NewMember=Nový člen
@@ -47,134 +47,134 @@ MemberStatusActiveLate=předplatné vypršelo
 MemberStatusActiveLateShort=Vypršela
 MemberStatusPaid=Zasílání novinek aktuální
 MemberStatusPaidShort=Až do dnešního dne
-MemberStatusResiliated=zakončený členem
+MemberStatusResiliated=Ukončený člen
 MemberStatusResiliatedShort=ukončený
 MembersStatusToValid=Návrhy členů
 MembersStatusResiliated=Ukončené členové
 NewCotisation=Nový příspěvek
-PaymentSubscription=Nový příspěvek platba
+PaymentSubscription=Nová platba příspěvku
 SubscriptionEndDate=Předplatné je datum ukončení
-MembersTypeSetup=Členové Nastavení typu
-MemberTypeModified=Member type modified
-DeleteAMemberType=Delete a member type
-ConfirmDeleteMemberType=Are you sure you want to delete this member type?
-MemberTypeDeleted=Member type deleted
-MemberTypeCanNotBeDeleted=Member type can not be deleted
+MembersTypeSetup=Nastavení typu členů
+MemberTypeModified=Typ člena změněn
+DeleteAMemberType=Odstranit typ člena
+ConfirmDeleteMemberType=Opravdu chcete smazat tento typ člena?
+MemberTypeDeleted=Typ člena byl smazán
+MemberTypeCanNotBeDeleted=Typ člena nelze smazat
 NewSubscription=Nový odběratel
-NewSubscriptionDesc=Tato forma umožňuje nahrávat vaše předplatné jako nový člen nadace. Chcete-li obnovit předplatné (je-li již člen), kontaktujte Správní rada Nadace místo e-mailem %s.
+NewSubscriptionDesc=Tento formulář umožňuje zaznamenat vaše předplatné jako nový člen nadace. Chcete-li obnovit předplatné (pokud je již členem), kontaktujte nadační místo místo e-mailem %s.
 Subscription=Předplatné
 Subscriptions=Předplatné
 SubscriptionLate=Pozdě
-SubscriptionNotReceived=Vstupní nikdy nedostal
-ListOfSubscriptions=Seznam předplatné
-SendCardByMail=Poslat kartu e-mailem
+SubscriptionNotReceived=Předplatné nebylo nikdy přijato
+ListOfSubscriptions=Seznam předplatného
+SendCardByMail=Odeslat kartu e-mailem
 AddMember=Vytvořit člena
-NoTypeDefinedGoToSetup=Žádný člen definovány typy. Jdi na menu &quot;Členové typy&quot;
-NewMemberType=Nový člen typu
+NoTypeDefinedGoToSetup=Žádné typy členů nejsou definovány. Přejděte do nabídky "Typy členů"
+NewMemberType=Nový typ člena
 WelcomeEMail=Vítejte e-mail
 SubscriptionRequired=Předplatné vyžadovalo
 DeleteType=Vymazat
-VoteAllowed=Hlasovat povolena
-Physical=Fyzikální
+VoteAllowed=Hlasování povoleno
+Physical=Fyzický
 Moral=Morální
-MorPhy=Morální / Fyzikální
+MorPhy=Morální / fyzický
 Reenable=Znovu povolit
 ResiliateMember=Ukončit člena
 ConfirmResiliateMember=Jste si jisti, že chcete ukončit tyto členy?
 DeleteMember=Odstranění člena
-ConfirmDeleteMember=Jste si jisti, že chcete odstranit tohoto člena (Odstranění kontaktu budou smazány všechny své odběry)?
-DeleteSubscription=Odstranění předplatné
+ConfirmDeleteMember=Opravdu chcete smazat tohoto člena (Smazání člena odstraní všechny jeho odběry)?
+DeleteSubscription=Odstranění odběru
 ConfirmDeleteSubscription=Jste si jisti, že chcete smazat tento odběr?
 Filehtpasswd=htpasswd souboru
 ValidateMember=Ověření člena
 ConfirmValidateMember=Jste si jisti, že chcete ověřit tohoto člena?
-FollowingLinksArePublic=Následující odkazy jsou otevřené stránky nejsou chráněny žádným povolením Dolibarr. Oni nejsou formátované stránky, pokud jako v příkladu ukázat, jak do seznamu členy databázi.
+FollowingLinksArePublic=Následující odkazy jsou otevřené stránky, které nejsou chráněny žádným oprávněním Dolibarr. Nejsou to formátované stránky, jako příklad ukázat, jak seznam členů databáze.
 PublicMemberList=Veřejný seznam členů
-BlankSubscriptionForm=Public self-subscription form
-BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
-EnablePublicSubscriptionForm=Enable the public website with self-subscription form
+BlankSubscriptionForm=Formulář veřejného předplatného
+BlankSubscriptionFormDesc=Dolibarr vám může poskytnout veřejnou adresu URL / webovou stránku, která umožní externím návštěvníkům požádat o přihlášení k nadaci. Je-li zapnutý online platební modul, může být také automaticky poskytnut formulář platby.
+EnablePublicSubscriptionForm=Povolte veřejnou webovou stránku s formulářem pro předplatné
 ForceMemberType=Vynutit typ uživatele
 ExportDataset_member_1=Členové a předplatné
 ImportDataset_member_1=Členové
-LastMembersModified=Poslední %s upravený členy
+LastMembersModified=Nejnovější %smodifikovaní členi 
 LastSubscriptionsModified=Poslední %s modifikované odběry
 String=Řetěz
 Text=Text
 Int=Int
 DateAndTime=Datum a čas
-PublicMemberCard=Členské veřejné karta
-SubscriptionNotRecorded=Předplatné nezaznamenává
+PublicMemberCard=Člen veřejné karty
+SubscriptionNotRecorded=Předplatné nebylo zaznamenáno
 AddSubscription=Vytvořit odběr
 ShowSubscription=Zobrazit předplatné
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
-SendingEmailOnCancelation=Sending email on cancelation
+SendingAnEMailToMember=Odeslání informačního e-mailu členovi
+SendingEmailOnAutoSubscription=Odesílání e-mailů na automatickou registraci
+SendingEmailOnMemberValidation=Odeslání e-mailu na ověření nových členů
+SendingEmailOnNewSubscription=Odesílání e-mailů na nové předplatné
+SendingReminderForExpiredSubscription=Odeslání upomínky na uplynulé odběry
+SendingEmailOnCancelation=Odeslání e-mailu na zrušení
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
-YourMembershipWasCanceled=Your membership was canceled
-CardContent=Obsah vaší členskou kartu
+YourMembershipRequestWasReceived=Vaše členství bylo přijato.
+YourMembershipWasValidated=Vaše členství bylo ověřeno
+YourSubscriptionWasRecorded=Váš nový odběr byl zaznamenán
+SubscriptionReminderEmail=Připomenutí předplatného
+YourMembershipWasCanceled=Vaše členství bylo zrušeno
+CardContent=Obsah Vaší členské karty
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Předmět e-mailu obdržel v případě auto-nápis host
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail přijatý v případě auto-nápis host
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Odesílatele pro automatické e-maily
-DescADHERENT_ETIQUETTE_TYPE=Formát etikety stránku
-DescADHERENT_ETIQUETTE_TEXT=Text tištěný na listech členských adrese
-DescADHERENT_CARD_TYPE=Formát strany karty
-DescADHERENT_CARD_HEADER_TEXT=Text v rámečku nahoře členských karet
-DescADHERENT_CARD_TEXT=Text tištěný na členských karet (zarovnání vlevo)
-DescADHERENT_CARD_TEXT_RIGHT=Text tištěný na členských karet (zarovnání vpravo)
+ThisIsContentOfYourMembershipRequestWasReceived=Chceme vám oznámit, že vaše žádost o členství byla přijata. <br> <br>
+ThisIsContentOfYourMembershipWasValidated=Chtěli bychom vás informovat, že vaše členství bylo ověřeno s následujícími informacemi: <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=Chceme vám oznámit, že vaše nové předplatné bylo zaznamenáno. <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=Chceme vám oznámit, že vaše předplatné má brzy skončit nebo již uplynula (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Doufáme, že jej obnovíte. <br> <br>
+ThisIsContentOfYourCard=Toto je shrnutí informací, které máme o vás. Pokud něco není správné, kontaktujte nás. <br> <br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Předmět oznámení o přijetí v případě automatického zapisování hosta
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Obsah oznámení o přijetí v případě automatického zápisu hosta
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Šablona e-mailu, která se používá k odeslání e-mailu členu na autosubscription člena
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Šablona e-mailu, která se používá k odeslání e-mailu členovi na ověření člena
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Šablona e-mailu, která se používá k odeslání e-mailu členovi při nahrávání nového odběru
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Šablona e-mailu, která se používá k odeslání upozornění na e-mail při uplynutí platnosti předplatného
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Šablona e-mailu, která se používá k odeslání e-mailu členovi na zrušení člena
+DescADHERENT_MAIL_FROM=Email odesílatele pro automatické e-maily
+DescADHERENT_ETIQUETTE_TYPE=Formát stránky štítků
+DescADHERENT_ETIQUETTE_TEXT=Text vytištěný na adresních listech členů
+DescADHERENT_CARD_TYPE=Formát stránky karet
+DescADHERENT_CARD_HEADER_TEXT=Text vytištěný na kartách členů
+DescADHERENT_CARD_TEXT=Text vytištěný na kartách členů (zarovnání vlevo)
+DescADHERENT_CARD_TEXT_RIGHT=Text vytištěný na kartách členů (zarovnání vpravo)
 DescADHERENT_CARD_FOOTER_TEXT=Text vytištěn na spodní straně členských karet
-ShowTypeCard=Zobrazit typu &quot;%s&quot;
+ShowTypeCard=Zobrazit typ '%s'
 HTPasswordExport=htpassword generování souboru
-NoThirdPartyAssociatedToMember=Žádná třetí strana spojené s tímto členem
-MembersAndSubscriptions= Členové a předplatné
-MoreActions=Doplňující akce na záznam
-MoreActionsOnSubscription=Doplňující akce, navrhl ve výchozím nastavení při nahrávání předplatné
+NoThirdPartyAssociatedToMember=K tomuto členu není přidružen žádný subjekt
+MembersAndSubscriptions= Členové a odběry
+MoreActions=Doplňková akce při nahrávání
+MoreActionsOnSubscription=Doplňková akce, navržená standardně při nahrávání předplatného
 MoreActionBankDirect=Vytvořte přímý záznam na bankovním účtu
 MoreActionBankViaInvoice=Vytvoření faktury a platby na bankovní účet
 MoreActionInvoiceOnly=Vytvořte fakturu bez zaplacení
-LinkToGeneratedPages=Vytvořit vizitek
+LinkToGeneratedPages=Generujte vizitky
 LinkToGeneratedPagesDesc=Tato obrazovka umožňuje vytvářet PDF soubory s vizitkami všech vašich členů nebo konkrétního člena.
 DocForAllMembersCards=Vytvořit vizitky pro všechny členy
 DocForOneMemberCards=Vytvořit vizitky pro konkrétní člena
-DocForLabels=Vytvořit adresy listy
-SubscriptionPayment=Zasílání novinek platba
-LastSubscriptionDate=Poslední datum odběru
-LastSubscriptionAmount=Množství posledního odběru
+DocForLabels=Generovat adresářové listy
+SubscriptionPayment=Platba předplatného
+LastSubscriptionDate=Datum poslední platby předplatného
+LastSubscriptionAmount=Částka nejnovějších odběrů
 MembersStatisticsByCountries=Členové Statistiky podle země
 MembersStatisticsByState=Členové statistika stát / provincie
 MembersStatisticsByTown=Členové statistika podle města
 MembersStatisticsByRegion=Členové statistiky podle krajů
 NbOfMembers=Počet členů
-NoValidatedMemberYet=Žádné ověřené členy nalezeno
+NoValidatedMemberYet=Nebyli nalezeni validovaní členové
 MembersByCountryDesc=Tato obrazovka vám ukáže statistiku členů jednotlivých zemích. Grafika však závisí na Google on-line služby grafu a je k dispozici pouze v případě, je připojení k internetu funguje.
 MembersByStateDesc=Tato obrazovka vám ukáže statistiku členů podle státu / provincie / Canton.
-MembersByTownDesc=Tato obrazovka vám ukáže statistiku členům města.
+MembersByTownDesc=Tato obrazovka zobrazuje statistiky o členech podle města.
 MembersStatisticsDesc=Zvolte statistik, které chcete číst ...
 MenuMembersStats=Statistika
-LastMemberDate=Nejzazší datum člen
-LatestSubscriptionDate=Poslední datum odběru
+LastMemberDate=Nejnovější datum člena
+LatestSubscriptionDate=Poslední datum přihlášení
 Nature=Příroda
 Public=Informace jsou veřejné
 NewMemberbyWeb=Nový uživatel přidán. Čeká na schválení
-NewMemberForm=Nový člen forma
+NewMemberForm=Nový formulář člena
 SubscriptionsStatistics=Statistiky o předplatné
 NbOfSubscriptions=Počet odběrů
 AmountOfSubscriptions=Částka úpisů
@@ -182,17 +182,19 @@ TurnoverOrBudget=Obrat (pro firmu), nebo rozpočet (pro nadaci)
 DefaultAmount=Výchozí částka předplatného
 CanEditAmount=Návštěvník si může vybrat / upravit výši svého upsaného
 MEMBER_NEWFORM_PAYONLINE=Přejít na integrované on-line platební stránky
-ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=Tato obrazovka ukáže statistiky o členy z důvodu povahy.
-MembersByRegion=Tato obrazovka ukáže statistiky o členům regionu.
-VATToUseForSubscriptions=Sazba DPH se má použít pro předplatné
-NoVatOnSubscription=Ne TVA za upsaný vlastní kapitál
-MEMBER_PAYONLINE_SENDEMAIL=Email pouze pro e-mailové upozornění, když Dolibarr obdrží potvrzení o ověřenou platby za úpis (příklad: paymentdone@example.com)
+ByProperties=Od přírody
+MembersStatisticsByProperties=Statistika členů podle charakteru
+MembersByNature=Tato obrazovka zobrazuje statistiky o členech podle jejich povahy.
+MembersByRegion=Tato obrazovka zobrazuje statistiky členů podle oblastí.
+VATToUseForSubscriptions=Sazba DPH, která se použije pro předplatné
+NoVatOnSubscription=Bez DPH pro předplatné
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt slouží k odběru linku do faktury: %s
-NameOrCompany=Name or company
-SubscriptionRecorded=Subscription recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+NameOrCompany=Jméno nebo společnost
+SubscriptionRecorded=Zaznamenal se úpis
+NoEmailSentToMember=Žádný e-mail nebyl odeslán členovi
+EmailSentToMember=E-mail odeslán členu na %s
+SendReminderForExpiredSubscriptionTitle=Pošlete připomenutí e-mailem na vypršení předplatného
+SendReminderForExpiredSubscription=Odeslání připomenutí e-mailem členům při uplynutí platnosti předplatného (parametr je počet dní před ukončením předplatného pro odeslání připomenutí. Může to být seznam dnů oddělených středníkem, například '10; 5; 0; -5 ')
+MembershipPaid=Členství zaplaceno za běžné období (do %s)
+YouMayFindYourInvoiceInThisEmail=Vaše faktura můžete připojit k tomuto e-mailu
+XMembersClosed=%s member(s) closed
diff --git a/htdocs/langs/cs_CZ/modulebuilder.lang b/htdocs/langs/cs_CZ/modulebuilder.lang
index 4b8a2b61096..28fe91cc4c1 100644
--- a/htdocs/langs/cs_CZ/modulebuilder.lang
+++ b/htdocs/langs/cs_CZ/modulebuilder.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=Tento nástroj musí používat pouze zkušení uživatelé nebo vývojáři. Poskytuje nástroje pro sestavení nebo úpravu vlastního modulu. Dokumentace pro alternativní <a href="%s" target="_blank">manuální vývoj je zde</a> .
 EnterNameOfModuleDesc=Zadejte název modulu/aplikace pro vytvoření bez mezer. Použijte velká slova k oddělení slov (například: MyModule, EcommerceForShop, SyncWithMySystem ...)
 EnterNameOfObjectDesc=Zadejte název objektu, který chcete vytvořit, bez mezer. Použijte velká písmena pro oddělení slov (například: MyObject, Student, Teacher ...). Bude vygenerován soubor třídy CRUD, ale také soubor API, stránky pro zápis / přidání / úpravy / odstranění objektů a souborů SQL.
-ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc2=Cesta, kde jsou moduly generovány/editovány (první adresář pro externí moduly definované v %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generované / upravitelné moduly nalezené: <strong> %s </strong>
 ModuleBuilderDesc4=Modul je detekován jako "upravitelný", když soubor <strong> %s </strong> existuje v kořenovém adresáři modulu
 NewModule=Nový modul
@@ -21,10 +21,11 @@ ModuleBuilderDesctriggers=To je pohled na spouštěče poskytované modulem. Chc
 ModuleBuilderDeschooks=Tato karta je určena pro háčky.
 ModuleBuilderDescwidgets=Tato karta je určena pro správu / vytváření widgetů.
 ModuleBuilderDescbuildpackage=Zde můžete vygenerovat soubor balíčku "připravený k distribuci" (normalizovaný soubor .zip) modulu a dokumentační soubor "připraven k distribuci". Stačí kliknout na tlačítko pro vytvoření souboru balíčku nebo dokumentace.
-EnterNameOfModuleToDeleteDesc=Modul zde můžete smazat. UPOZORNĚNÍ: VŠECHNY soubory modulu a strukturované údaje a dokumentace budou smazány!
-EnterNameOfObjectToDeleteDesc=Objekt zde můžete smazat. UPOZORNĚNÍ: Všechny soubory související s objektem budou smazány!
+EnterNameOfModuleToDeleteDesc=Modul můžete smazat. VAROVÁNÍ: Všechny kódovací soubory modulu (vytvořené nebo vytvořené ručně) A strukturovaná data a dokumentace budou vymazány!
+EnterNameOfObjectToDeleteDesc=Objekt můžete odstranit. VAROVÁNÍ: Všechny kódované soubory (vytvořené nebo vytvořené ručně) související s objektem budou vymazány!
 DangerZone=Nebezpečná zóna
-BuildPackage=Build package
+BuildPackage=Sestavte balíček
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Vytvoření dokumentace
 ModuleIsNotActive=Tento modul ještě není aktivován. Přejděte na %s, aby se zobrazila nebo klikněte zde:
 ModuleIsLive=Tento modul byl aktivován. Jakákoli změna na něm může narušit aktuální aktivní funkci.
@@ -40,13 +41,14 @@ PageForAgendaTab=Stránka PHP pro kartu události
 PageForDocumentTab=Stránka PHP pro kartu dokumentu
 PageForNoteTab=Stránka PHP pro kartu poznámky
 PathToModulePackage=Cesta k zip modulu / aplikačního balíčku
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
+PathToModuleDocumentation=Cesta k souboru dokumentace modulu/aplikace (%s)
 SpaceOrSpecialCharAreNotAllowed=Mezery nebo speciální znaky nejsou povoleny.
 FileNotYetGenerated=Soubor dosud nebyl vytvořen
-RegenerateClassAndSql=Vymažte a regenerujte soubory třídy a sql
+RegenerateClassAndSql=Vynutit aktualizaci souborů .class a .sql
 RegenerateMissingFiles=Generovat chybějící soubory
-SpecificationFile=File of documentation
+SpecificationFile=Soubor dokumentace
 LanguageFile=Soubor pro jazyk
+ObjectProperties=Vlastnosti objektu
 ConfirmDeleteProperty=Opravdu chcete odstranit vlastnost <strong> %s </strong>? Tím se změní kód ve třídě PHP, ale také odstraníme sloupec z definice tabulky objektu.
 NotNull=Ne NULL záznam
 NotNullDesc=1 = Nastavte databázi na hodnotu NULL. -1 = Povolit hodnoty null a hodnotu síly na hodnotu NULL, pokud je prázdná ('' nebo 0).
@@ -63,8 +65,10 @@ ChangeLog=Soubor ChangeLog
 TestClassFile=Soubor pro testovací jednotku PHP Unit
 SqlFile=Sql soubor
 PageForLib=Soubor pro knihovny PHP
+PageForObjLib=Soubor pro knihovnu PHP určenou pro objekt
 SqlFileExtraFields=Soubor Sql pro doplňkové atributy
 SqlFileKey=Sql soubor pro klíče
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=Objekt již existuje s tímto názvem a jiným případem
 UseAsciiDocFormat=Můžete použít formát Markdown, ale doporučujeme použít formát Asciidoc (porovnat mezi .md a .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Je to opatření
@@ -76,13 +80,15 @@ ListOfMenusEntries=Seznam položek menu
 ListOfPermissionsDefined=Seznam definovaných oprávnění
 SeeExamples=Viz příklady zde
 EnabledDesc=Podmínka, aby bylo toto pole aktivní (příklady: 1 nebo $ conf-> global-> MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example: preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
+VisibleDesc=Je pole viditelné? (Příklady: 0 = Nikdy viditelné, 1 = Viditelné na seznamu a vytváření/aktualizace/zobrazení formulářů, 2 = Viditelné pouze v seznamu, 3 = Viditelné pouze pro formulář pro vytvoření / aktualizaci / zobrazení (není seznam), 4 = Viditelné v seznamu a pouze aktualizovat / prohlížet formulář (nevytvářet) Použití pole záporné hodnoty není ve výchozím nastavení zobrazeno na seznamu, ale může být vybráno pro prohlížení). Může to být výraz, například: preg_match (&#39;/ public /&#39;, $ _SERVER [&#39;PHP_SELF&#39;])? 0: 1
 IsAMeasureDesc=Může být hodnota pole kumulativní, aby se dostala do seznamu celkem? (Příklady: 1 nebo 0)
 SearchAllDesc=Používá se pole pro vyhledávání pomocí nástroje rychlého vyhledávání? (Příklady: 1 nebo 0)
 SpecDefDesc=Zadejte zde veškerou dokumentaci, kterou chcete poskytnout s modulem, která ještě nebyla definována jinými kartami. Můžete použít .md nebo lepší, bohatou syntaxi .asciidoc.
 LanguageDefDesc=Do těchto souborů zadejte všechny klíče a překlad pro každý soubor jazyka.
-MenusDefDesc=Zde definujte nabídky poskytované modulem (po definování jsou viditelné v editoru menu %s)
-PermissionsDefDesc=Zde definujte nová oprávnění poskytovaná modulem (po definování jsou viditelná ve výchozím nastavení oprávnění %s)
+MenusDefDesc=Zde definujte nabídky poskytované vaším modulem
+PermissionsDefDesc=Zde definujte nová oprávnění poskytovaná vaším modulem
+MenusDefDescTooltip=Nabídky poskytované modulem / aplikací jsou definovány v <strong>menu $ this-&gt;</strong> do souboru deskriptoru modulu. Tento soubor můžete upravit ručně nebo použít vložený editor. <br><br> Poznámka: Po definování (a opětovném aktivaci modulu) jsou menu zobrazena také v editoru menu, který je k dispozici administrátorům na %s.
+PermissionsDefDescTooltip=Oprávnění poskytnutá vaším modulem / aplikací jsou definována do pole <strong>$ this-> práva</strong> do souboru deskriptoru modulu. Tento soubor můžete upravit ručně nebo použít vložený editor. <br><br> Poznámka: Po definování (a opětovném aktivaci modulu) jsou oprávnění viditelná ve výchozím nastavení oprávnění %s.
 HooksDefDesc=Definujte v <b> module_parts ['hooks'] </b> vlastnost, v deskriptoru modulu, kontext háčků, které chcete spravovat (seznam kontextů lze nalézt při hledání na '<b> initHooks (</b>' v jádrovém kódu) <br> Editovat soubor háku přidáte kód vašich háknutých funkcí (hákovatelné funkce lze nalézt při hledání na '<b> executeHooks </b>' v jádrovém kódu).
 TriggerDefDesc=Definujte ve spouštěcím souboru kód, který chcete provést pro každou provedenou událost.
 SeeIDsInUse=Viz ID používané ve vaší instalaci
@@ -101,12 +107,13 @@ UseDocFolder=Zakázat složku dokumentace
 UseSpecificReadme=Použijte konkrétní ReadMe
 RealPathOfModule=Reálná cesta modulu
 ContentCantBeEmpty=Obsah souboru nemůže být prázdný
-WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
-CLIDesc=You can generate here some command line scripts you want to provide with your module.
-CLIFile=CLI File
-NoCLIFile=No CLI files
-UseSpecificEditorName = Use a specific editor name
-UseSpecificEditorURL = Use a specific editor URL
-UseSpecificFamily = Use a specific family
-UseSpecificAuthor = Use a specific author
-UseSpecificVersion = Use a specific initial version
+WidgetDesc=Zde můžete generovat a upravovat widgety, které budou vloženy do vašeho modulu.
+CLIDesc=Zde můžete generovat některé příkazové řádky, které chcete s modulem poskytnout.
+CLIFile=Soubor CLI
+NoCLIFile=Žádné soubory CLI
+UseSpecificEditorName = Použijte specifický název editoru
+UseSpecificEditorURL = Použijte specifickou adresu URL editoru
+UseSpecificFamily = Použijte konkrétní rodinu
+UseSpecificAuthor = Použijte specifického autora
+UseSpecificVersion = Použijte specifickou počáteční verzi
+ModuleMustBeEnabled=Nejprve musí být aktivován modul / aplikace
diff --git a/htdocs/langs/cs_CZ/multicurrency.lang b/htdocs/langs/cs_CZ/multicurrency.lang
index 62485d96823..463f47b837e 100644
--- a/htdocs/langs/cs_CZ/multicurrency.lang
+++ b/htdocs/langs/cs_CZ/multicurrency.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - multicurrency
-MultiCurrency=Multi currency
-ErrorAddRateFail=Error in added rate
-ErrorAddCurrencyFail=Error in added currency
-ErrorDeleteCurrencyFail=Error delete fail
-multicurrency_syncronize_error=Synchronisation error: %s
-MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use date of document to find currency rate, instead of using latest known rate
-multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the latest known rate)
+MultiCurrency=Více měn
+ErrorAddRateFail=Chyba přidané rychlosti
+ErrorAddCurrencyFail=Chyba v přidané měně
+ErrorDeleteCurrencyFail=Chyba při odstranění chyby
+multicurrency_syncronize_error=Chyba synchronizace: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Chcete-li zjistit měnovou sazbu, použijte datum dokumentu namísto použití nejnovější známé rychlosti
+multicurrency_useOriginTx=Když je objekt vytvořen jiným, zachovat původní rychlost od zdrojového objektu (jinak použijte nejnovější známou rychlost)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality<br>Get your <b>API key</b><br />If you use a free account you can't change the <b>currency source</b> (USD by default)<br />But if your main currency isn't USD you can use the <b>alternate currency source</b> to force you main currency<br /><br />You are limited at 1000 synchronizations per month
-multicurrency_appId=API key
-multicurrency_appCurrencySource=Currency source
-multicurrency_alternateCurrencySource=Alternate currency source
-CurrenciesUsed=Currencies used
-CurrenciesUsed_help_to_add=Add the differents currencies and rates you need to use on you <b>proposals</b>, <b>orders</b>, etc.
-rate=rate
-MulticurrencyReceived=Received, original currency
-MulticurrencyRemainderToTake=Remaining amout, original currency
+CurrencyLayerAccount_help_to_synchronize=Abyste mohli tuto funkci používat, musíte si vytvořit účet na webu %s. <br> Získejte <b>klíč API</b> . <br> Pokud používáte bezplatný účet, nemůžete změnit <b>zdrojovou měnu</b> (standardně USD). <br> Pokud vaše hlavní měna není USD, aplikace ji automaticky přepočítá. <br><br> Jste omezeni na 1000 synchronizací měsíčně.
+multicurrency_appId=Klíč API
+multicurrency_appCurrencySource=Zdrojová měna
+multicurrency_alternateCurrencySource=Alternativní zdrojová měna
+CurrenciesUsed=Použité měny
+CurrenciesUsed_help_to_add=Přidejte na své <b> návrhy</b>, <b> objednávky </b> různé měny a sazby, které je třeba použít.
+rate=hodnotit
+MulticurrencyReceived=Přijatá, původní měna
+MulticurrencyRemainderToTake=Zbývající částka, původní měna
 MulticurrencyPaymentAmount=Výše platby, původní měna
-AmountToOthercurrency=Amount To (in currency of receiving account)
+AmountToOthercurrency=Částka (v měně přijatého účtu)
diff --git a/htdocs/langs/cs_CZ/paybox.lang b/htdocs/langs/cs_CZ/paybox.lang
index a6da89f3606..4f0a56ba649 100644
--- a/htdocs/langs/cs_CZ/paybox.lang
+++ b/htdocs/langs/cs_CZ/paybox.lang
@@ -3,14 +3,14 @@ PayBoxSetup=Nastavení modulu PayBox
 PayBoxDesc=Tento modul nabízejí stránky, které umožní platby na <a href="http://www.paybox.com" target="_blank">Paybox</a> zákazníky. Toho lze využít pro volnou platbu nebo platbu na určitý objekt Dolibarr (faktury, objednávky, ...)
 FollowingUrlAreAvailableToMakePayments=Přes URL jsou k dispozici nabízené stránky, které zákazníkovi umožní provést platbu na Dolibarr objektech
 PaymentForm=Formulář platby
-WelcomeOnPaymentPage=Welcome to our online payment service
+WelcomeOnPaymentPage=Vítejte v naší online platební službě
 ThisScreenAllowsYouToPay=Tato obrazovka vám umožní provést on-line platbu %s.
 ThisIsInformationOnPayment=Jsou zde informace o provedené platbě
 ToComplete=Chcete-li dokončit
 YourEMail=E-mail pro potvrzení platby
 Creditor=Věřitel
 PaymentCode=Platební kód
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Proveďte platbu
 YouWillBeRedirectedOnPayBox=Budete přesměrováni na zabezpečené stránky Paybox pro vstupní informace o kreditní kartě
 Continue=Další
@@ -20,11 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL nabízí %s on-line platební uživate
 ToOfferALinkForOnlinePaymentOnContractLine=URL nabízí %s on-line platební uživatelské rozhraní pro řádky smluv
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL nabízí %s on-line platební uživatelské rozhraní pro volnou částku
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL nabízí %s on-line platební uživatelské rozhraní pro členské předplatné
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL, která nabízí online platbu %s, uživatelské rozhraní pro platbu daru
 YouCanAddTagOnUrl=Můžete také přidat parametr URL <b>&tag = <i>hodnota</i></b> na některou z těchto URL (nutné pouze pro volné platby) a přidat vlastní komentář platby.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Nastavte svůj Paybox pomocí url <b> %s </b> aby se platba automaticky vytvořila při ověření Payboxu.
 YourPaymentHasBeenRecorded=Tato stránka potvrzuje, že platba byla zaznamenána. Děkuju.
-YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Platba nebyla zaznamenána a transakce byla zrušena. Děkuji.
 AccountParameter=Parametry účtu
 UsageParameter=Použité parametry
 InformationToFindParameters=Pomozte najít %s informace o účtu
@@ -37,3 +37,4 @@ PAYBOX_PAYONLINE_SENDEMAIL=E-mail pro upozornění po platbě (úspěch nebo sel
 PAYBOX_PBX_SITE=Hodnota PBX SITE
 PAYBOX_PBX_RANG=Hodnota pro PBX rozsah
 PAYBOX_PBX_IDENTIFIANT=Hodnota pro PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/cs_CZ/paypal.lang b/htdocs/langs/cs_CZ/paypal.lang
index a5a590a2590..c916ca53cca 100644
--- a/htdocs/langs/cs_CZ/paypal.lang
+++ b/htdocs/langs/cs_CZ/paypal.lang
@@ -1,34 +1,36 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Nastavení modulu PayPal
-PaypalDesc=Tento modul nabízejí stránky, které umožní zákazníkům platby prostřednictvím <a href="http://www.paypal.com" target="_blank">PayPal</a>. Toho lze využít pro snadnou platbu nebo platbu na určitý objekt Dolibarr (faktury, objednávky, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Plaťte s PayPal
+PaypalDesc=Tento modul umožňuje platby zákazníky prostřednictvím <a href="http://www.paypal.com" target="_blank"> PayPal </a>. To může být použito pro ad hoc platbu nebo pro platbu související s objektem Dolibarr (faktura, objednávka, ...)
+PaypalOrCBDoPayment=Plaťte s PayPal (kartou nebo PayPal)
+PaypalDoPayment=Zaplaťte službou PayPal
 PAYPAL_API_SANDBOX=Testovací/sandbox režim
 PAYPAL_API_USER=API uživatelské jméno
 PAYPAL_API_PASSWORD=API heslo
 PAYPAL_API_SIGNATURE=API podpis
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Nabídka platby "integral" (Kreditní karta+Paypal) nebo pouze "Paypal" 
+PAYPAL_SSLVERSION=Curl SSL verze
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Nabídněte "integrální" platbu (pouze kreditní kartou + PayPal) nebo "PayPal"
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=Pouze PayPal
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Volitelná URL adresa CSS stylu na stránce plateb online
 ThisIsTransactionId=Toto je id transakce: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Přidat URL platby PayPal při odeslání dokumentu e-mailem
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
-NewOnlinePaymentReceived=New online payment received
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Upozorňující e-mail po platbě (úspěch nebo zamítnutí)
+PAYPAL_ADD_PAYMENT_URL=Zahrňte adresu URL platby PayPal při odeslání dokumentu e-mailem
+NewOnlinePaymentReceived=Byla přijata nová platba online
+NewOnlinePaymentFailed=Nová platba online se pokusila, ale selhala
+ONLINE_PAYMENT_SENDEMAIL=E-mailová adresa pro oznámení po každém pokusu o platbu (pro úspěch a neúspěch)
 ReturnURLAfterPayment=Návratová URL po platbě
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
-SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
-DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
-ErrorSeverityCode=Error Severity Code
-OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfOnlinePaymentFailed=Ověření online platby se nezdařilo
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Stránka s potvrzením platby byla volána platebním systémem a vrátila se chyba
+SetExpressCheckoutAPICallFailed=Volání API SetExpressCheckout se nezdařilo.
+DoExpressCheckoutPaymentAPICallFailed=Volání API DoExpressCheckoutPayment se nezdařilo.
+DetailedErrorMessage=Podrobná chybová zpráva
+ShortErrorMessage=Krátká chybová zpráva
+ErrorCode=Chybový kód
+ErrorSeverityCode=Kód závažnosti chyby
+OnlinePaymentSystem=Online platební systém
+PaypalLiveEnabled=PayPal "živý" režim zapnutý (jinak režim test /sandbox)
+PaypalImportPayment=Importujte platby PayPal
+PostActionAfterPayment=Odeslání akcí po platbách
+ARollbackWasPerformedOnPostActions=Pro všechny akcí pro příspěvky byla provedena revize. Musíte dokončit akce po ruce, pokud je to nutné.
+ValidationOfPaymentFailed=Ověření platby selhalo
+CardOwner=Držitel karty
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 41a2e60af89..4f4de2bb874 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -260,7 +260,7 @@ AddVariable=Přidat proměnnou
 AddUpdater=Přidat Update
 GlobalVariables=Globální proměnné
 VariableToUpdate=Aktualizovat proměnnou
-GlobalVariableUpdaters=Aktualizace globálních proměnných
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Analyzuje JSON data ze zadané adresy URL, VALUE určuje umístění příslušné hodnoty
 GlobalVariableUpdaterHelpFormat0=Formát požadavku {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Produktový list
 ServiceSheet=Servisní list
 PossibleValues=Možné hodnoty
 GoOnMenuToCreateVairants=Přejděte do nabídky %s - %s a připravte varianty atributů (například barvy, velikost, ...)
-UseProductFournDesc=Použijte popis dodavatele produktů v dokumentech dodavatelů
+UseProductFournDesc=Přidání funkce pro definování popisů produktů definovaných dodavateli vedle popisů pro zákazníky
 ProductSupplierDescription=Popis dodavatele produktu
 #Attributes
 VariantAttributes=Atributy variant
@@ -338,4 +338,5 @@ CloneDestinationReference=Cílová položka produktu
 ErrorCopyProductCombinations=Při kopírování variant produktu došlo k chybě
 ErrorDestinationProductNotFound=Cílový produkt nebyl nalezen
 ErrorProductCombinationNotFound=Produkt nebyl nalezen
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ActionAvailableOnVariantProductOnly=Akce je k dispozici pouze u varianty výrobku
+ProductsPricePerCustomer=Ceny produktů na zákazníky
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 4fe3ef105dd..535c15f31b1 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Strávený čas
 TimeSpentByYou=Váš strávený čas
 TimeSpentByUser=Čas strávený uživatelem
 TimesSpent=Strávený čas
-RefTask=Číslo. úkolu
-LabelTask=Název úkolu
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Čas strávený na úkolech
 TaskTimeUser=Uživatel
 TaskTimeNote=Poznámka
@@ -57,8 +58,8 @@ NewTimeSpent=Strávený čas
 MyTimeSpent=Můj strávený čas
 BillTime=Bill strávený čas
 BillTimeShort=Bill čas
-TimeToBill=Time not billed
-TimeBilled=Time billed
+TimeToBill=Čas není účtován
+TimeBilled=Čas účtován
 Tasks=Úkoly
 Task=Úkol
 TaskDateStart=Datum zahájení úkolu
@@ -125,7 +126,7 @@ DeleteATimeSpent=Odstranit strávený čas
 ConfirmDeleteATimeSpent=Jste si jisti, že chcete smazat tento strávený čas?
 DoNotShowMyTasksOnly=Viz také úkoly mě nepřidělené
 ShowMyTasksOnly=Zobrazit pouze úkoly mě přidělené
-TaskRessourceLinks=Contacts of task
+TaskRessourceLinks=Kontakty úkolu
 ProjectsDedicatedToThisThirdParty=Projekty této třetí strany
 NoTasks=Žádné úkoly na tomto projektu
 LinkedToAnotherCompany=Připojené k jiné třetí straně
@@ -209,7 +210,7 @@ YouCanCompleteRef=Chcete-li doplnit odkaz nějakou příponou, doporučujeme př
 OpenedProjectsByThirdparties=Otevření projektů subjekty
 OnlyOpportunitiesShort=pouze příležitosti
 OpenedOpportunitiesShort=otevřené příležitosti
-NotOpenedOpportunitiesShort=Not an open lead
+NotOpenedOpportunitiesShort=Není to otevřené vedení
 NotAnOpportunityShort=Není to příležitost
 OpportunityTotalAmount=Celkový počet potenciálních zákazníků
 OpportunityPonderatedAmount=Vážené množství potenciálních zákazníků
@@ -242,4 +243,4 @@ TimeSpentForInvoice=Strávený čas
 OneLinePerUser=Jeden řádek na uživatele
 ServiceToUseOnLines=Služba pro použití na tratích
 InvoiceGeneratedFromTimeSpent=Faktura %s byla vygenerována z času stráveného na projektu
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Zkontrolujte, zda zadáváte časový rozvrh úkolů projektu A plánujete generovat fakturu (y) z časového rozvrhu pro účtování zákazníkovi projektu (nekontrolujte, zda plánujete vytvořit fakturu, která není založena na zadaných výkazech).
diff --git a/htdocs/langs/cs_CZ/stripe.lang b/htdocs/langs/cs_CZ/stripe.lang
index ba128bb8d31..a51be24d80a 100644
--- a/htdocs/langs/cs_CZ/stripe.lang
+++ b/htdocs/langs/cs_CZ/stripe.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
-StripeOrCBDoPayment=Pay with credit card or Stripe
+StripeSetup=Nastavení modulu Stripe
+StripeDesc=Nabídněte zákazníkům Stripe online platební stránku pro platby kreditními / cebitovými kartami prostřednictvím <a href="http://www.stripe.com" target="_blank"> Stripe </a>. To může být použito k tomu, aby umožnilo vašim zákazníkům provádět ad hoc platby nebo platby související s konkrétním předmětem Dolibarr (faktura, objednávka, ...)
+StripeOrCBDoPayment=Platba kreditní kartou nebo Stripe
 FollowingUrlAreAvailableToMakePayments=Přes URL jsou k dispozici nabízené stránky, které zákazníkovi umožní provést platbu na Dolibarr objektech
 PaymentForm=Formulář platby
-WelcomeOnPaymentPage=Vítáme Vás na naší on-line platební službě
+WelcomeOnPaymentPage=Vítejte v naší online platební službě
 ThisScreenAllowsYouToPay=Tato obrazovka vám umožní provést on-line platbu %s.
 ThisIsInformationOnPayment=Jsou zde informace o provedené platbě
 ToComplete=Chcete-li dokončit
 YourEMail=E-mail pro potvrzení platby
-STRIPE_PAYONLINE_SENDEMAIL=Upozorňující e-mail po platbě (úspěch nebo zamítnutí)
+STRIPE_PAYONLINE_SENDEMAIL=E-mailové oznámení po pokusu o platbu (úspěch nebo neúspěch)
 Creditor=Věřitel
 PaymentCode=Platební kód
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
-YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=Budete přesměrováni na zabezpečené stránce Stripe, abyste mohli zadat informace o kreditní kartě
 Continue=Další
 ToOfferALinkForOnlinePayment=URL pro %s platby
 ToOfferALinkForOnlinePaymentOnOrder=URL nabízí %s on-line platební uživatelské rozhraní pro objednávky zákazníka
@@ -22,44 +22,46 @@ ToOfferALinkForOnlinePaymentOnContractLine=URL nabízí %s on-line platební už
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL nabízí %s on-line platební uživatelské rozhraní pro volnou částku
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL nabízí %s on-line platební uživatelské rozhraní pro členské předplatné
 YouCanAddTagOnUrl=Můžete také přidat parametr URL <b>&tag = <i>hodnota</i></b> na některou z těchto URL (nutné pouze pro volné platby) a přidat vlastní komentář platby.
-SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=Tato stránka potvrzuje, že platba byla zaznamenána. Děkuju.
-YourPaymentHasNotBeenRecorded=Vaše platba nebyla zaznamenána a transakce byla zrušena. Děkuju.
+SetupStripeToHavePaymentCreatedAutomatically=Nastavte Stripe pomocí url <b> %s </b>, aby se platba automaticky vytvořila při ověření Stripe.
 AccountParameter=Parametry účtu
 UsageParameter=Použité parametry
 InformationToFindParameters=Pomozte najít %s informace o účtu
-STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+STRIPE_CGI_URL_V2=Url modulu Stripe CGI pro platbu
 VendorName=Název dodavatele
 CSSUrlForPaymentForm=CSS styly url platebního formuláře
-NewStripePaymentReceived=New Stripe payment received
-NewStripePaymentFailed=New Stripe payment tried but failed
-STRIPE_TEST_SECRET_KEY=Secret test key
-STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
-STRIPE_LIVE_SECRET_KEY=Secret live key
-STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
-StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
-StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
-StripeGateways=Stripe gateways
-OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
-OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
-BankAccountForBankTransfer=Bank account for fund payouts
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
-StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+NewStripePaymentReceived=Byla obdržena nová platba Stripe
+NewStripePaymentFailed=Pokus o novou Stripe platbu, ta ale selhala
+STRIPE_TEST_SECRET_KEY=Tajný testovací klíč
+STRIPE_TEST_PUBLISHABLE_KEY=Testovatelný klíč pro publikování
+STRIPE_TEST_WEBHOOK_KEY=Testovací klíč Webhook
+STRIPE_LIVE_SECRET_KEY=Tajný živý klíč
+STRIPE_LIVE_PUBLISHABLE_KEY=Klíč pro publikování živého
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live klíč
+ONLINE_PAYMENT_WAREHOUSE=Sklad, který se má použít k poklesu akcií, když je hotovo on-line platba <br> (TODO Pokud se volba k poklesu zásob uskuteční na akci na faktuře a on-line platba vygeneruje fakturu?)
+StripeLiveEnabled=Stripe live povoleno (jinak testovací režim / režim sandbox)
+StripeImportPayment=Platby importu Stripe
+ExampleOfTestCreditCard=Příklad kreditní karty pro test: %s (platný), %s (chyba CVC), %s (uplynula), %s (poplatek selže)
+StripeGateways=Brána Stripe
+OAUTH_STRIPE_TEST_ID=Připojení klienta Stripe Connect (ca _...)
+OAUTH_STRIPE_LIVE_ID=Připojení klienta Stripe Connect (ca _...)
+BankAccountForBankTransfer=Bankovní účet pro výplaty fondů
+StripeAccount=Stripe účet
+StripeChargeList=Seznam Stripe poplatků
+StripeTransactionList=Seznam transakcí Stripe
+StripeCustomerId=Stripe ID zákazníka
+StripePaymentModes=Stripe režimy platby
+LocalID=Místní identifikační číslo
+StripeID=ID Stripe
+NameOnCard=jméno na kartě
+CardNumber=Číslo karty
+ExpiryDate=Datum ukončení platnosti
 CVN=CVN
-DeleteACard=Delete Card
-ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
-CreateCustomerOnStripe=Create customer on Stripe
-CreateCardOnStripe=Create card on Stripe
-ShowInStripe=Show in Stripe
+DeleteACard=Smazat kartu
+ConfirmDeleteCard=Opravdu chcete tuto kreditní nebo debetní kartu smazat?
+CreateCustomerOnStripe=Vytvořte zákazníka na Stripe
+CreateCardOnStripe=Vytvořte kartu na Stripe
+ShowInStripe=Zobrazit ve Stripe
+StripeUserAccountForActions=Uživatelský účet, který se má používat pro e-mailové upozornění na některé události Stripe (Stripe výplaty)
+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)
diff --git a/htdocs/langs/cs_CZ/trips.lang b/htdocs/langs/cs_CZ/trips.lang
index 9dfeb58bbff..8c2edad907c 100644
--- a/htdocs/langs/cs_CZ/trips.lang
+++ b/htdocs/langs/cs_CZ/trips.lang
@@ -73,7 +73,7 @@ EX_PAR_VP=Parkování PV
 EX_CAM_VP=Údržba a opravy PV
 DefaultCategoryCar=Výchozí režim dopravy
 DefaultRangeNumber=Výchozí číslo rozsahu
-UploadANewFileNow=Upload a new document now
+UploadANewFileNow=Nahrát nový dokument
 Error_EXPENSEREPORT_ADDON_NotDefined=Chyba, pravidlo pro vyčíslení výkazů výdajů ref nebylo definováno do nastavení modulu 'Expense Report'
 ErrorDoubleDeclaration=Deklaroval jste další hlášení výdajů do podobného časového období.
 AucuneLigne=Neexistuje žádná zpráva o právě deklarovaném výdaji
@@ -148,4 +148,4 @@ nolimitbyEX_EXP=po řádku (bez omezení)
 CarCategory=Kategorie auta
 ExpenseRangeOffset=Vyvážená částka: %s
 RangeIk=Rozsah kilometrů
-AttachTheNewLineToTheDocument=Attach the new line to an existing document
+AttachTheNewLineToTheDocument=Připojte řádek k nahranému dokumentu
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index 8dc2129a440..b860fd511d6 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -18,7 +18,7 @@ HtmlHeaderPage=Záhlaví HTML (pouze pro tuto stránku)
 PageNameAliasHelp=Název nebo alias stránky. <br> Tento alias je také používán k vytvoření adresy URL při běhu webových stránek z virtuálního hostitele webového serveru (jako Apacke, Nginx, ...). Pomocí tlačítka "<strong> %s </strong>" upravte tento alias.
 EditTheWebSiteForACommonHeader=Poznámka: Pokud chcete definovat osobní hlavičku pro všechny stránky, upravte záhlaví na úrovni webu namísto na stránce / kontejneru.
 MediaFiles=knihovna multimédií
-EditCss=Edit website properties
+EditCss=Upravit vlastnosti webu
 EditMenu=Úprava menu
 EditMedias=Upravit média
 EditPageMeta=Edit page/container properties
@@ -95,4 +95,9 @@ InternalURLOfPage=Interní adresa URL stránky
 ThisPageIsTranslationOf=Tato stránka / kontejner je překladem
 ThisPageHasTranslationPages=Tato stránka / kontejner obsahuje překlad
 NoWebSiteCreateOneFirst=Dosud nebyla vytvořena žádná webová stránka. Nejprve vytvořte jednu.
-GoTo=Go to
+GoTo=Jít do
+DynamicPHPCodeContainsAForbiddenInstruction=Přidáte dynamický PHP kód, který obsahuje instrukci PHP  '<strong>%s</strong>  ' která je implicitně zakázána jako dynamický obsah (viz skryté možnosti WEBSITE_PHP_ALLOW_xxx pro zvýšení seznamu povolených příkazů).
+NotAllowedToAddDynamicContent=Nemáte oprávnění přidávat nebo upravovat dynamický obsah PHP na webových stránkách. Požádejte o svolení nebo ponechte kód v tagech php beze změny.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 7d89cd7832a..2ccb65fd407 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Bogfør Udgiftsrapport
 CreateMvts=Opret ny transaktion
 UpdateMvts=Rediger en transaktion
 ValidTransaction=Bekræft transaktion
-WriteBookKeeping=Bogfør transaktioner i hovedbogen
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Hovedbog
 AccountBalance=Kontobalance
 ObjectsRef=Objektreference
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Regnskabskonto som standard for købte varer (hvis ikke defineret for varen)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Regnskabskonto som standard for solgte varer (hvis ikke defineret for varen)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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=Regnskabskonto som standard for købte ydelser (hvis ikke defineret for varen)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Regnskabskonto som standard for solgte ydelser (hvis ikke defineret for varen)
 
@@ -177,6 +177,7 @@ LabelAccount=Kontonavn
 LabelOperation=Bilagstekst
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Kladde
 JournalLabel=Journal label
 NumPiece=Partsnummer
@@ -288,8 +289,10 @@ 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=Eksporter CSV Konfigurerbar
-Modelcsv_FEC=Eksporter FEC (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=ID for kontoplan
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=Denne side kan bruges til at angive en standardkonto, der ska
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=Indstillinger
 OptionModeProductSell=Salg
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Køb
 OptionModeProductSellDesc=Vis alle varer med salgskonto.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Vis alle varer med købskonto.
 CleanFixHistory=Fjern regnskabskode fra linjer, der ikke eksisterer som posteringer på konto
 CleanHistory=Nulstil alle bogføringer for det valgte år
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 91b6d833600..3447a61c426 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Også hvis du har et stort antal tredjeparter (>
 UseSearchToSelectContactTooltip=Også hvis du har et stort antal tredjeparter (> 100 000), kan du øge hastigheden ved at indstille konstant CONTACT_DONOTSEARCH_ANYWHERE til 1 i Setup-> Other. Søgningen er så begrænset til starten af ​​strengen.
 DelaiedFullListToSelectCompany=Vent, indtil der trykkes på en nøgle, inden du læser indholdet i kombinationslisten fra tredjepart. <br> Dette kan øge ydeevnen, hvis du har et stort antal tredjeparter, men det er mindre praktisk.
 DelaiedFullListToSelectContact=Vent, indtil der trykkes på en tast, inden du lægger indholdet på kontakt-kombinationsliste. <br> Dette kan øge ydeevnen, hvis du har et stort antal kontakter, men det er mindre praktisk)
-NumberOfKeyToSearch=NBR af tegn til at udløse søgning: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Ikke tilgængelige, når Ajax handicappede
 AllowToSelectProjectFromOtherCompany=På tredjeparts dokument kan man vælge et projekt knyttet til en anden tredjepart
 JavascriptDisabled=JavaScript slået
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=Dette er navnet på HTML-feltet. Teknisk viden er nø
 PageUrlForDefaultValues=Du skal indtaste den relative vej til siden URL. Hvis du indbefatter parametre i URL, vil standardværdierne være effektive, hvis alle parametre er indstillet til samme værdi.
 PageUrlForDefaultValuesCreate= <br> Eksempel: <br> For formularen til oprettelse af en ny tredjepart er det <strong> %s </strong>. <br> For URL for eksterne moduler installeret i brugerdefineret mappe, skal du ikke inkludere "custom /", så brug sti som <strong> mymodule / mypage.php </strong> og ikke custom / mymodule / mypage.php. <br> Hvis du kun vil have standardværdi, hvis url har nogle parametre, kan du bruge <strong> %s </strong>
 PageUrlForDefaultValuesList= <br> Eksempel: <br> For siden der viser tredjeparter er den <strong> %s </strong>. <br> For URL til eksterne moduler installeret i brugerdefineret bibliotek, skal du ikke inkludere "custom /" så brug en sti som <strong> mymodule / mypagelist.php </strong> og ikke custom / mymodule / mypagelist.php. <br> Hvis du kun vil have standardværdi, hvis url har nogle parametre, kan du bruge <strong> %s </strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Aktivér tilpasning af standardværdier
 EnableOverwriteTranslation=Aktivér brug af overskrevet oversættelse
 GoIntoTranslationMenuToChangeThis=Der er fundet en oversættelse for nøglen med denne kode. For at ændre denne værdi skal du redigere den fra Hjem-Indstillinger-oversættelse.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual Server navn
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Database vært
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System oplysninger er diverse tekniske oplysninger du får i read
 SystemAreaForAdminOnly=Dette område er kun tilgængeligt for administratorbrugere. Dolibarr bruger tilladelser kan ikke ændre denne begrænsning.
 CompanyFundationDesc=Rediger virksomhedens / enhedens oplysninger. Klik på "%s" eller "%s" knappen nederst på siden.
 AccountantDesc=Rediger oplysningerne om din revisor / bogholder
-AccountantFileNumber=Fil nummer
+AccountantFileNumber=Accountant code
 DisplayDesc=Parametre, der påvirker udseende og opførsel af Dolibarr kan ændres her.
 AvailableModules=Tilgængelige app / moduler
 ToActivateModule=For at  aktivere moduler, skal du gå til Opsætning (Hjem->Opsætning->Moduler).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Fakturaer og kreditnotaer nummerressourcer modul
 BillsPDFModules=Faktura dokumenter modeller
 BillsPDFModulesAccordindToInvoiceType=Faktura dokumenter modeller efter faktura type
 PaymentsPDFModules=Betalingsdokumenter modeller
-CreditNote=Kreditnota
-CreditNotes=Kreditnotaer
 ForceInvoiceDate=Force fakturadatoen til bekræftelse dato
 SuggestedPaymentModesIfNotDefinedInInvoice=Foreslåede betalinger tilstand på fakturaen som standard, hvis ikke defineret for faktura
 SuggestPaymentByRIBOnAccount=Foreslå betaling ved tilbagetrækning på konto
@@ -1819,7 +1819,7 @@ ChartLoaded=Kort over konto indlæst
 SocialNetworkSetup=Opsætning af modul Sociale netværk
 EnableFeatureFor=Aktivér funktioner til <strong> %s </ strong>
 VATIsUsedIsOff=Bemærk: Muligheden for at bruge salgsafgift eller moms er blevet indstillet til <strong> Fra </strong> i menuen %s - %s, så Salgsskat eller moms anvendes altid 0 for salg.
-SwapSenderAndRecipientOnPDF=Byt afsender og modtageradresse på PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Advarsel, funktion understøttes kun på tekstfelter. Også en URL parameter handling = create or action = edit skal indstilles ELLER sidens navn skal slutte med 'new.php' for at udløse denne funktion.
 EmailCollector=Email samler
 EmailCollectorDescription=Tilføj et planlagt job og en opsætningsside for at scanne jævnligt emailkasser (ved hjælp af IMAP-protokollen) og optag e-mails, der er modtaget i din ansøgning, på det rigtige sted og / eller lav nogle poster automatisk (som kundeemner).
@@ -1828,7 +1828,9 @@ EMailHost=Vært af e-mail-IMAP-server
 MailboxSourceDirectory=Postkasse kilde bibliotek
 MailboxTargetDirectory=Postkasse målkatalog
 EmailcollectorOperations=Operationer at gøre af samleren
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Indsamle nu
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID ikke fundet
 FormatZip=Postnummer
 MainMenuCode=Menu indtastningskode (hovedmenu)
 ECMAutoTree=Vis automatisk ECM-træ
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Åbningstider
 OpeningHoursDesc=Indtast her firmaets almindelige åbningstider.
 ResourceSetup=Konfiguration af ressource modul
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang
index d9abf6a01af..182978d3ebe 100644
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Begivenheder, for hvilke Dolibarr vil skabe en indsats på dagsord
 EventRemindersByEmailNotEnabled=Hændelsesindkaldelser via e-mail blev ikke aktiveret til %s modulopsætning.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tredjepart %s oprettet
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Kontrakt %s bekræftet
 CONTRACT_DELETEInDolibarr=Kontrakt %s slettet
 PropalClosedSignedInDolibarr=Forslag %s underskrevet
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Projekt %s ændret
 PROJECT_DELETEInDolibarr=Projekt %s slettet
 TICKET_CREATEInDolibarr=Sag %s oprettet
 TICKET_MODIFYInDolibarr=Billet %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Billet %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index 858dbbb1705..8efd1caeb10 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Kontanter
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Diverse betalinger
 MenuNewVariousPayment=Ny Diverse betaling
 BankName=Bank navn
 FinancialAccount=Konto
 BankAccount=Bankkonto
 BankAccounts=Bankkonti
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bankkonti | Gateways
 ShowAccount=Vis konto
 AccountRef=Finansiel konto ref
 AccountLabel=Finansiel konto etiket
@@ -30,7 +30,7 @@ AllTime=Fra starten
 Reconciliation=Afstemning
 RIB=Bankkontonummer
 IBAN=IBAN nummer
-BIC=BIC/SWIFT nummer
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT gyldig
 SwiftVNotalid=BIC/SWIFT er ikke gyldig
 IbanValid=BAN gyldig
@@ -42,11 +42,11 @@ AccountStatementShort=Udmelding
 AccountStatements=Kontoudtog
 LastAccountStatements=Seneste kontoudtog
 IOMonthlyReporting=Månedlig rapportering
-BankAccountDomiciliation=Konto adresse
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Konto land
 BankAccountOwner=Konto ejer navn
 BankAccountOwnerAddress=Konto ejer adresse
-RIBControlError=Integritetscheck af værdier fejler. Det betyder, at oplysningerne for dette kontonummer er ufuldstændige eller forkerte (tjek land, numre og IBAN).
+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=Opret konto
 NewBankAccount=Ny konto
 NewFinancialAccount=Ny finansiel konto
@@ -98,14 +98,14 @@ BankLineConciliated=Indhold afstemt
 Reconciled=Afstemt
 NotReconciled=Ikke afstemt
 CustomerInvoicePayment=Kunde betaling
-SupplierInvoicePayment=Leverandør betaling
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Abonnementsbetaling
 WithdrawalPayment=Tilbagetrækning betaling
 SocialContributionPayment=Social / skattemæssig skat betaling
 BankTransfer=bankoverførsel
 BankTransfers=Bankoverførsler
 MenuBankInternalTransfer=Intern overførsel
-TransferDesc=Overførsel fra en konto til en anden, Dolibarr vil skrive to poster (en debitering i kildekonto og en kredit i målkonto). Det samme beløb (uden fortegn), etiket og dato vil blive brugt til denne transaktion)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Fra
 TransferTo=Til
 TransferFromToDone=En overførsel fra <b> %s </b> til <b> %s </b> af <b> %s </b> %s er blevet optaget.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank post
 AllAccounts=Alle bank- og kontantekonti
 BackToAccount=Tilbage til konto
 ShowAllAccounts=Vis for alle konti
-FutureTransaction=Transaktion i fremtiden. Ingen måde at forene.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Vælg / filtrer checks for at inkludere i kontokortet og klik på "Opret".
 InputReceiptNumber=Vælg kontoudskrift relateret til forliget. Brug en sorterbar numerisk værdi: ÅÅÅÅMM eller ÅÅÅÅMMDD
 EventualyAddCategory=Til sidst skal du angive en kategori, hvor klasserne skal klassificeres
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Tjek tilbage, og fakturaer genåbnes
 BankAccountModelModule=Dokumentskabeloner til bankkonti
 DocumentModelSepaMandate=Skabelon af SEPA mandat. Nyttig til europæiske lande kun i EØF.
 DocumentModelBan=Skabelon til at udskrive en side med BAN-oplysninger.
-NewVariousPayment=Nye diverse betalinger
-VariousPayment=Diverse betalinger
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Diverse betalinger
-ShowVariousPayment=Vis diverse betalinger
-AddVariousPayment=Tilføj diverse betalinger
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandat
 YourSEPAMandate=Dit SEPA mandat
 FindYourSEPAMandate=Dette er dit SEPA-mandat til at give vores firma tilladelse til at foretage en direkte debitering til din bank. Ret det underskrevet (scan af det underskrevne dokument) eller send det pr. Mail til
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 2aef890dd34..fecdf5e9714 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=i fakturaer valuta
 PaidBack=Tilbagebetalt
 DeletePayment=Slet betaling
 ConfirmDeletePayment=Er du sikker på, at du vil slette denne betaling?
-ConfirmConvertToReduc=Ønsker du at konvertere denne %s til en absolut rabat? <br> Beløbet vil blive gemt blandt alle rabatter og kan fremover bruges som rabat for en nuværende eller en fremtidig faktura for denne kunde.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Leverandørbetalinger
 ReceivedPayments=Modtagne betalinger
 ReceivedCustomersPayments=Modtagne kundebetalinger
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Betalingsbetingelser
 PaymentConditionsShort=Betalingsbetingelser
 PaymentAmount=Betalingsbeløb
-ValidatePayment=Godkend betaling
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validér fakturaer automatisk
 GeneratedFromRecurringInvoice=Genereret fra skabelon tilbagevendende faktura %s
 DateIsNotEnough=Dato er endnu ikke nået
 InvoiceGeneratedFromTemplate=Faktura %s genereret fra tilbagevendende fakturaskabelon %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Advarsel, fakturadato er højere end den aktuelle dato
 WarningInvoiceDateTooFarInFuture=Advarsel, fakturadato er for langt fra den aktuelle dato
 ViewAvailableGlobalDiscounts=Se ledige rabatter
diff --git a/htdocs/langs/da_DK/cashdesk.lang b/htdocs/langs/da_DK/cashdesk.lang
index ee25e856301..9a662efab42 100644
--- a/htdocs/langs/da_DK/cashdesk.lang
+++ b/htdocs/langs/da_DK/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Historie
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index 388599c74b9..8b9fd83d40f 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Tilføj skat/afgift
 ContributionsToPay=Skatter/afgifter til betaling
 AccountancyTreasuryArea=Fakturering og betalingsområde
 NewPayment=Ny betaling
-Payments=Betalinger
 PaymentCustomerInvoice=Betaling for kundefaktura
 PaymentSupplierInvoice=leverandør faktura betaling
 PaymentSocialContribution=Betaling af skat/afgift
@@ -205,7 +204,6 @@ SellsJournal=Salgskladder
 PurchasesJournal=Købskladder
 DescSellsJournal=Salgskladder
 DescPurchasesJournal=Købskladder
-InvoiceRef=Faktura ref.
 CodeNotDef=Ikke defineret
 WarningDepositsNotIncluded=Fakturaer med afdragsordning er ikke inkluderet i denne version af regnskabsmodulet.
 DatePaymentTermCantBeLowerThanObjectDate=Betalingsfristen kan ikke være lavere end objektdatoen.
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 572fb0851e1..7e5554c1f5b 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/da_DK/holiday.lang b/htdocs/langs/da_DK/holiday.lang
index 2ed8bb645e6..a00641582fd 100644
--- a/htdocs/langs/da_DK/holiday.lang
+++ b/htdocs/langs/da_DK/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 7a3bf26551f..7ab0a384cb0 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -371,6 +371,7 @@ Percentage=Procent
 Total=I alt
 SubTotal=Sum
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=I alt (Inkl. moms)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send bekræftelses Email
 SendMail=Send Email
 Email=EMail
 NoEMail=Ingen Email
-Email=EMail
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=Ingen mobil telefon
@@ -671,7 +671,6 @@ Method=Metode
 Receive=Modtag
 CompleteOrNoMoreReceptionExpected=Komplet eller intet mere at forvente
 ExpectedValue=Forventet værdi
-CurrentValue=Nuværende værdi
 PartialWoman=Delvis
 TotalWoman=I alt
 NeverReceived=Aldrig modtaget
@@ -834,6 +833,7 @@ RelatedObjects=Relaterede objekter
 ClassifyBilled=Klassificere faktureret
 ClassifyUnbilled=Klassificer Ikke faktureret
 Progress=Fremskridt
+ProgressShort=Progr.
 FrontOffice=Forreste kontor
 BackOffice=Back office
 View=Udsigt
@@ -842,6 +842,11 @@ Exports=Eksporter
 ExportFilteredList=Eksporter filtreret liste
 ExportList=Eksportliste
 ExportOptions=Eksport indstillinger
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Diverse
 Calendar=Kalender
 GroupBy=Gruppér efter
@@ -854,7 +859,7 @@ Download=Hent
 DownloadDocument=Hent dokument
 ActualizeCurrency=Opdater valutakurs
 Fiscalyear=Regnskabsår
-ModuleBuilder=Modulbygger
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Indstil valuta
 BulkActions=Masse handlinger
 ClickToShowHelp=Klik for at vise værktøjs tips
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index 0045aa61b89..fd4610abae1 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -4,15 +4,15 @@ MemberCard=Medlem kortet
 SubscriptionCard=Subscription kortet
 Member=Medlem
 Members=Medlemmer
-ShowMember=Vis medlem kortet
+ShowMember=Vis medlemskort
 UserNotLinkedToMember=Brugeren ikke er knyttet til et medlem
-ThirdpartyNotLinkedToMember=Tredjepart, der ikke er knyttet til et medlem
-MembersTickets=Medlemmer Billetter
-FundationMembers=Instituttets medlemmer
-ListOfValidatedPublicMembers=Liste over validerede offentlige medlemmer
-ErrorThisMemberIsNotPublic=Dette medlem er ikke offentlige
+ThirdpartyNotLinkedToMember=Third party not linked to a member
+MembersTickets=Medlemsbilletter
+FundationMembers=Organisationens medlemmer
+ListOfValidatedPublicMembers=Liste over bekræftede offentlige medlemmer
+ErrorThisMemberIsNotPublic=Denne medlem er ikke offentligt
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Et andet medlem <b>(navn: %s, login: %s)</b> er allerede knyttet til en <b>tredjepart %s.</b> Fjern dette link første fordi en tredjepart ikke kan forbindes med kun et medlem (og omvendt).
-ErrorUserPermissionAllowsToLinksToItselfOnly=Af sikkerhedsmæssige grunde skal du være tildelt tilladelser til at redigere alle brugere til at kunne knytte et medlem til en bruger, der ikke er dit.
+ErrorUserPermissionAllowsToLinksToItselfOnly=Af sikkerhedsmæssige grunde skal du have tilladelser til at redigere alle brugere for at kunne linke en medlem til en bruger, der ikke er din.
 SetLinkToUser=Link til en Dolibarr bruger
 SetLinkToThirdParty=Link til en Dolibarr tredjepart
 MembersCards=Medlemmer udskrive kort
@@ -24,7 +24,7 @@ MembersListNotUpToDate=Liste over gyldige medlemmer med abonnement uaktuel
 MembersListResiliated=Liste over opsatte medlemmer
 MembersListQualified=Liste over kvalificerede medlemmer
 MenuMembersToValidate=Udkast til medlemmer
-MenuMembersValidated=Valideret medlemmer
+MenuMembersValidated=Bekræftet medlemmer
 MenuMembersUpToDate=Ajour medlemmer
 MenuMembersNotUpToDate=Uaktuel medlemmer
 MenuMembersResiliated=Afsluttede medlemmer
@@ -39,10 +39,10 @@ MemberType=Medlem type
 MemberTypeId=Medlem type id
 MemberTypeLabel=Medlem type label
 MembersTypes=Medlemstyper
-MemberStatusDraft=Udkast (skal valideres)
+MemberStatusDraft=Udkast (skal bekræftes)
 MemberStatusDraftShort=Udkast til
-MemberStatusActive=Valideret (venter abonnement)
-MemberStatusActiveShort=Valideret
+MemberStatusActive=Bekræftet (venter abonnement)
+MemberStatusActiveShort=Bekræftet
 MemberStatusActiveLate=Abonnement udløbet
 MemberStatusActiveLateShort=Udløbet
 MemberStatusPaid=Subscription ajour
@@ -54,7 +54,7 @@ MembersStatusResiliated=Afsluttede medlemmer
 NewCotisation=Nye bidrag
 PaymentSubscription=Nye bidrag betaling
 SubscriptionEndDate=Subscription slutdato
-MembersTypeSetup=Medlemmer type setup
+MembersTypeSetup=Opsætning af medlemstype
 MemberTypeModified=Medlemstype ændret
 DeleteAMemberType=Slet en medlemstype
 ConfirmDeleteMemberType=Er du sikker på, at du vil slette denne medlemstype?
@@ -67,11 +67,11 @@ Subscriptions=Abonnementer
 SubscriptionLate=Sen
 SubscriptionNotReceived=Subscription aldrig modtaget
 ListOfSubscriptions=Liste over abonnementer
-SendCardByMail=Send kort
+SendCardByMail=Send card by email
 AddMember=Opret medlem
-NoTypeDefinedGoToSetup=Intet medlem definerede typer. Gå til opsætning - Medlemmer typer
+NoTypeDefinedGoToSetup=Ingen medlemstyper er defineret. Gå til menuen "Medlemstyper"
 NewMemberType=Nyt medlem type
-WelcomeEMail=Velkommen e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Kræver abonnement
 DeleteType=Slet
 VoteAllowed=Afstemning tilladt
@@ -79,16 +79,16 @@ Physical=Fysisk
 Moral=Moral
 MorPhy=Moralske / Fysisk
 Reenable=Genaktivere
-ResiliateMember=Afslut et medlem
-ConfirmResiliateMember=Er du sikker på at du vil opsige dette medlem?
+ResiliateMember=Afslut en medlem
+ConfirmResiliateMember=Er du sikker på at du vil opsige denne medlem?
 DeleteMember=Slet medlem
-ConfirmDeleteMember=Er du sikker på, at du vil slette dette medlem (Sletter et medlem vil slette alle hans abonnementer)?
+ConfirmDeleteMember=Er du sikker på, at du vil slette dette medlem (Sletning af et medlem vil slette alle dens abonnementer)?
 DeleteSubscription=Slet abonnement
 ConfirmDeleteSubscription=Er du sikker på, at du vil slette dette abonnement?
 Filehtpasswd=htpasswd fil
-ValidateMember=Validere et medlem
-ConfirmValidateMember=Er du sikker på, at du vil validere dette medlem?
-FollowingLinksArePublic=De følgende links er åbne sider ikke er beskyttet af nogen Dolibarr tilladelse. De er ikke formated sider, gives som eksempel for at vise, hvordan man listen medlemmer database.
+ValidateMember=Bekræfte et medlem
+ConfirmValidateMember=Er du sikker på, at du vil bekræfte denne medlem?
+FollowingLinksArePublic=Følgende links er åbne sider, der ikke er beskyttet af Dolibarr-tilladelse. De er ikke formaterede sider, der er angivet som eksempel for at vise, hvordan man kan oprette medlemmernes database.
 PublicMemberList=Offentlige medlem liste
 BlankSubscriptionForm=Offentlig selvtilmeldingsblanket
 BlankSubscriptionFormDesc=Dolibarr kan give dig en offentlig webadresse / hjemmeside for at give eksterne besøgende mulighed for at anmode om at abonnere på fundamentet. Hvis et online betalingsmodul er aktiveret, kan et betalingsformular også automatisk leveres.
@@ -102,38 +102,38 @@ String=String
 Text=Tekst
 Int=Int
 DateAndTime=Dato og tid
-PublicMemberCard=Medlem offentlige kortet
+PublicMemberCard=Medlemskort
 SubscriptionNotRecorded=Abonnement ikke registreret
 AddSubscription=Opret abonnement
 ShowSubscription=Vis tegning
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
-SendingEmailOnCancelation=Sending email on cancelation
+SendingAnEMailToMember=Afsendelse af e-mail til medlem
+SendingEmailOnAutoSubscription=Afsendelse af e-mail ved automatisk registrering
+SendingEmailOnMemberValidation=Afsendelse af e-mail ved bekræftelse af nye medlemmer
+SendingEmailOnNewSubscription=Afsendelse af e-mail på nyt abonnement
+SendingReminderForExpiredSubscription=Sender påmindelse om udløbne abonnementer
+SendingEmailOnCancelation=Afsendelse af e-mail ved annullering
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
-YourMembershipWasCanceled=Your membership was canceled
+YourMembershipRequestWasReceived=Dit medlemskab blev modtaget.
+YourMembershipWasValidated=Dit medlemskab blev bekræftet
+YourSubscriptionWasRecorded=Dit nye abonnement blev registreret
+SubscriptionReminderEmail=Abonnement påmindelse
+YourMembershipWasCanceled=Dit medlemskab blev annulleret
 CardContent=Indholdet af din medlem kortet
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Emne af den e-mail, der modtages i tilfælde af automatisk indtastning af en gæst
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail modtaget i tilfælde af automatisk indtastning af en gæst
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender e-mail for automatiske e-mails
+ThisIsContentOfYourMembershipRequestWasReceived=Vi vil gerne fortælle dig, at din anmodning om medlemskab blev modtaget. <br> <br>
+ThisIsContentOfYourMembershipWasValidated=Vi vil gerne fortælle dig, at dit medlemskab blev bekræftet med følgende oplysninger: <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=Vi vil gerne fortælle dig, at dit nye abonnement blev registreret. <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Etiketter format
 DescADHERENT_ETIQUETTE_TEXT=Tekst udskrives på medlems adresseblade
 DescADHERENT_CARD_TYPE=Format af kort side
@@ -143,7 +143,7 @@ DescADHERENT_CARD_TEXT_RIGHT=Tekst trykt på medlem-kort (tilpasning til højre)
 DescADHERENT_CARD_FOOTER_TEXT=Tekst trykt på bunden af medlem-kort
 ShowTypeCard=Vis type ' %s'
 HTPasswordExport=htpassword fil generation
-NoThirdPartyAssociatedToMember=Ingen tredjepart forbundet til dette medlem
+NoThirdPartyAssociatedToMember=Ingen tredjepart forbundet til denne medlem
 MembersAndSubscriptions= Medlemmer og Subscriptions
 MoreActions=Supplerende aktion om kontrolapparatet
 MoreActionsOnSubscription=Supplerende handling, som standard foreslået, når du optager et abonnement
@@ -152,18 +152,18 @@ MoreActionBankViaInvoice=Opret en faktura og en betaling på bankkonto
 MoreActionInvoiceOnly=Opret en faktura uden betaling
 LinkToGeneratedPages=Generer besøg kort
 LinkToGeneratedPagesDesc=Denne skærm giver dig mulighed for at generere PDF-filer med visitkort til alle dine medlemmer eller et bestemt medlem.
-DocForAllMembersCards=Generer visitkort for alle medlemmer (Format for output faktisk setup: <b>%s)</b>
+DocForAllMembersCards=Generer visitkort til alle medlemmer
 DocForOneMemberCards=Generer visitkort for et bestemt medlem (Format for output faktisk setup: <b>%s)</b>
 DocForLabels=Generer adresse ark (Format for output faktisk setup: <b>%s)</b>
 SubscriptionPayment=Abonnement betaling
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Medlemmer statistik efter land
 MembersStatisticsByState=Medlemmer statistikker stat / provins
 MembersStatisticsByTown=Medlemmer statistikker byen
 MembersStatisticsByRegion=Medlemsstatistik efter region
 NbOfMembers=Antal medlemmer
-NoValidatedMemberYet=Ingen validerede medlemmer fundet
+NoValidatedMemberYet=Ingen bekræftede medlemmer fundet
 MembersByCountryDesc=Denne skærm viser dig statistikker over medlemmer af lande. Grafisk afhænger dog på Google online-graf service og er kun tilgængelig, hvis en internetforbindelse virker.
 MembersByStateDesc=Denne skærm viser dig statistikker om medlemmer fra staten / provinser / Canton.
 MembersByTownDesc=Denne skærm viser dig statistikker over medlemmer af byen.
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Medlemsstatistik af natur
 MembersByNature=Denne skærm viser dig statistik over medlemmer af natur.
 MembersByRegion=Denne skærm viser statistik over medlemmer efter region.
 VATToUseForSubscriptions=Moms sats at bruge til abonnementer
-NoVatOnSubscription=Ingen TVA til abonnementer
-MEMBER_PAYONLINE_SENDEMAIL=Email til brug for e-mail advarsel, når Dolibarr modtager en bekræftelse af en valideret betaling for et abonnement (Eksempel: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt anvendt til abonnementslinje i faktura: %s
 NameOrCompany=Navn eller firma
-SubscriptionRecorded=Subscription recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+SubscriptionRecorded=Abonnement registreret
+NoEmailSentToMember=Ingen email sendt til medlem
+EmailSentToMember=E-mail sendt til medlem på %s
+SendReminderForExpiredSubscriptionTitle=Send påmindelse via email for udløbet abonnement
+SendReminderForExpiredSubscription=Send påmindelse via e-mail til medlemmer, når abonnementet er ved at udløbe (parameter er antal dage før afslutningen af ​​abonnementet for at sende påmindelsen. Det kan være en liste over dage adskilt af et semikolon, for eksempel '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
diff --git a/htdocs/langs/da_DK/modulebuilder.lang b/htdocs/langs/da_DK/modulebuilder.lang
index 8ca4a8f91aa..462b000cb95 100644
--- a/htdocs/langs/da_DK/modulebuilder.lang
+++ b/htdocs/langs/da_DK/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Indtast navnet på modulet / programmet for at oprette uden mellemrum. Brug store bogstaver til at adskille ord (For eksempel: MyModule, EcommerceForShop, SyncWithMySystem ...)
 EnterNameOfObjectDesc=Indtast navnet på objektet, der skal oprettes uden mellemrum. Brug store bogstaver til at adskille ord (For eksempel: MyObject, Student, Lærer ...). CRUD-klassefilen, men også API-filen, vil der blive genereret sider til liste / tilføj / rediger / slet objekt og SQL-filer.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=Dette er udsigten til udløsere, der leveres af dit mo
 ModuleBuilderDeschooks=Denne fane er dedikeret til kroge.
 ModuleBuilderDescwidgets=Denne fane er dedikeret til at administrere / opbygge widgets.
 ModuleBuilderDescbuildpackage=Du kan generere her en "klar til at distribuere" pakkefil (en normaliseret .zip-fil) af dit modul og en "klar til at distribuere" dokumentationsfil. Bare klik på knappen for at opbygge pakken eller dokumentationsfilen.
-EnterNameOfModuleToDeleteDesc=Du kan slette dit modul. ADVARSEL: Alle modulets filer OG strukturerede data og dokumentation slettes!
-EnterNameOfObjectToDeleteDesc=Du kan slette et objekt. ADVARSEL: Alle filer relateret til objekt vil blive slettet!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Farezone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Byg dokumentation
 ModuleIsNotActive=Dette modul er ikke aktiveret endnu. Gå til %s for at gøre det levende eller klik her:
-ModuleIsLive=Dette modul er blevet aktiveret. Enhver ændring på den kan ødelægge en aktuel aktiv funktion.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Lang beskrivelse
 EditorName=Redaktørens navn
 EditorUrl=URL til redaktør
@@ -43,10 +44,11 @@ PathToModulePackage=Sti til zip af modul / applikationspakke
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Mellemrum eller specialtegn er ikke tilladt.
 FileNotYetGenerated=Filen er endnu ikke genereret
-RegenerateClassAndSql=Slet og regenerere klasse- og sql-filer
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generer manglende filer
 SpecificationFile=File of documentation
 LanguageFile=Fil til sprog
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Er du sikker på, at du vil slette ejendommen <strong> %s </ strong>? Dette vil ændre kode i PHP klasse, men også fjerne kolonne fra tabeldefinition af objekt.
 NotNull=Ikke NULL
 NotNullDesc=1 = Indstil database til IKKE NULL. -1 = Tillad null værdier og tving værdien til NULL, hvis tom ('' eller 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme-fil
 ChangeLog=ChangeLog-fil
 TestClassFile=Fil til PHP Unit Test klasse
 SqlFile=SQL-fil
-PageForLib=Fil til PHP biblioteker
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=SQL-fil for komplementære attributter
 SqlFileKey=Sql-fil for nøgler
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=Der findes allerede et objekt med dette navn og en anden sag
 UseAsciiDocFormat=Du kan bruge Markdown-format, men det anbefales at bruge Asciidoc-format (omparison mellem .md og .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Er en foranstaltning
@@ -81,8 +85,10 @@ IsAMeasureDesc=Kan værdien af ​​feltet akkumuleres for at få en samlet lis
 SearchAllDesc=Er feltet brugt til at foretage en søgning fra hurtigsøgningsværktøjet? (Eksempler: 1 eller 0)
 SpecDefDesc=Indtast her alt dokumentation, du vil levere med dit modul, som ikke allerede er defineret af andre faner. Du kan bruge .md eller bedre den rige .asciidoc-syntaks.
 LanguageDefDesc=Indtast i denne fil, alle nøgler og oversættelsen for hver sprogfil.
-MenusDefDesc=Definer her menuerne fra dit modul (når de er defineret, er de synlige i menufunktionen %s)
-PermissionsDefDesc=Definer her de nye tilladelser fra dit modul (når de er defineret, er de synlige i standard tilladelsesopsætningen %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Definer i egenskaben <b> module_parts ['hooks'] </b> i modulbeskrivelsen den kontekst af kroge, du vil administrere (liste over sammenhænge kan findes ved en søgning på '<b> initHooks (</b> 'i kernekode). <br> Rediger krogfilen for at tilføje kode for dine hooked funktioner (hookable funktioner kan findes ved en søgning på' <b> executeHooks </b> 'i kernekode).
 TriggerDefDesc=Definer i udløseren filen den kode, du vil udføre for hver forretningsbegivenhed, der udføres.
 SeeIDsInUse=Se ID'er i brug i din installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/da_DK/paybox.lang b/htdocs/langs/da_DK/paybox.lang
index 79a1257db9e..bd7fe9e8213 100644
--- a/htdocs/langs/da_DK/paybox.lang
+++ b/htdocs/langs/da_DK/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=For at fuldføre
 YourEMail=E-mail til bekræftelse af betaling,
 Creditor=Kreditor
 PaymentCode=Betaling kode
-PayBoxDoPayment=Betal med kredit eller betalingskort (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Udfør betaling
 YouWillBeRedirectedOnPayBox=Du bliver omdirigeret om sikret Paybox siden til input du kreditkort informationer
 Continue=Næste
 ToOfferALinkForOnlinePayment=URL til %s betaling
-ToOfferALinkForOnlinePaymentOnOrder=URL til at tilbyde en %s online betaling brugergrænseflade til en ordre
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL til at tilbyde en %s online betaling brugergrænseflade til en faktura
 ToOfferALinkForOnlinePaymentOnContractLine=URL til at tilbyde en %s online betaling brugergrænseflade til en kontrakt linje
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL til at tilbyde en %s online betaling brugergrænseflade til et frit beløb
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL for at tilbyde en %s netbetalingsbrugergrænseflade via abonnement
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Du kan også tilføje webadresseparameter <b>& tag= <i>værdi</i></b> til nogen af disse URL (kræves kun for fri betaling) for at tilføje din egen betaling kommentere tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Opsæt din Paybox med url <b> %s </ b> for at få betaling oprettet automatisk, når den er godkendt af Paybox.
 YourPaymentHasBeenRecorded=Denne side bekræfter, at din betaling er registreret. Tak.
@@ -33,7 +33,8 @@ VendorName=Navn på leverandør
 CSSUrlForPaymentForm=CSS stylesheet url til indbetalingskort
 NewPayboxPaymentReceived=Ny Paybox modtaget
 NewPayboxPaymentFailed=Ny Paybox betaling forsøgt men mislykkedes
-PAYBOX_PAYONLINE_SENDEMAIL=E-mail for at advare efter en betaling (succes eller mislykket)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Værdi for PBX SITE
 PAYBOX_PBX_RANG=Værdi for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Værdi for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/da_DK/paypal.lang b/htdocs/langs/da_DK/paypal.lang
index bfbbeff7e93..86b6debc788 100644
--- a/htdocs/langs/da_DK/paypal.lang
+++ b/htdocs/langs/da_DK/paypal.lang
@@ -1,25 +1,24 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal-modul opsætning
-PaypalDesc=Dette modul tilbyder sider til at tillade betaling på <a href="http://www.paypal.com" target="_blank">PayPal</a> af kunderne. Dette kan bruges til en gratis betaling eller til en betaling på en bestemt Dolibarr objekt (faktura, ordre, ...)
-PaypalOrCBDoPayment=Betal med Paypal (Kreditkort eller Paypal)
-PaypalDoPayment=Betal med Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Betal med PayPal
 PAYPAL_API_SANDBOX=Mode test / sandkasse
 PAYPAL_API_USER=API brugernavn
 PAYPAL_API_PASSWORD=API kodeord
 PAYPAL_API_SIGNATURE=API signatur
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Tilbyder betaling &quot;integreret&quot; (kreditkort + Paypal) eller &quot;Paypal&quot; kun
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=Kun PayPal
 ONLINE_PAYMENT_CSS_URL=Valgfri URL til CSS stilark på online betalingsside
 ThisIsTransactionId=Dette er id af transaktionen: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Tilsæt url Paypal betaling, når du sender et dokument med posten
-YouAreCurrentlyInSandboxMode=Du er i øjeblikket i %s "sandbox" -tilstanden
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=Ny online betaling modtaget
 NewOnlinePaymentFailed=Ny online betaling forsøgt men mislykkedes
-ONLINE_PAYMENT_SENDEMAIL=E-mail for at advare efter en betaling (succes eller ej)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Returadresse efter betaling
-ValidationOfOnlinePaymentFailed=Validering af online betaling mislykkedes
+ValidationOfOnlinePaymentFailed=Bekræftelse af online betaling mislykkedes
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Betalingsbekræftelsessiden blev kaldt af betalings system returnerede en fejl
 SetExpressCheckoutAPICallFailed=SetExpressCheckout API-opkald mislykkedes.
 DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API-opkald mislykkedes.
@@ -28,7 +27,10 @@ ShortErrorMessage=Kort fejlmeddelelse
 ErrorCode=Fejlkode
 ErrorSeverityCode=Fejl Severity Code
 OnlinePaymentSystem=Online betalings system
-PaypalLiveEnabled=Paypal live aktiveret (ellers test / sandbox mode)
-PaypalImportPayment=Import Paypal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Importer PayPal-betalinger
+PostActionAfterPayment=Indsend handlinger efter betalinger
+ARollbackWasPerformedOnPostActions=En tilbagekaldelse blev udført på alle posthandlinger. Du skal færdiggøre posthandlinger manuelt, hvis de er nødvendige.
+ValidationOfPaymentFailed=Bekræftelse af betaling er mislykket
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 26e0d453654..1b4acfb73a7 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -260,7 +260,7 @@ AddVariable=Tilføj variabel
 AddUpdater=Tilføj opdaterer
 GlobalVariables=Globale variabler
 VariableToUpdate=Variabel for opdatering
-GlobalVariableUpdaters=Globale variable opdateringer
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Analyserer JSON-data fra den angivne webadresse, VALUE angiver placeringen af ​​den relevante værdi,
 GlobalVariableUpdaterHelpFormat0=Formatér for anmodning {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Vareside
 ServiceSheet=Serviceblad
 PossibleValues=Mulige værdier
 GoOnMenuToCreateVairants=Gå på menu %s - %s for at forberede attributvarianter (som farver, størrelse, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributter
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=Der opstod en fejl under kopiering af varianter af
 ErrorDestinationProductNotFound=Destination produkt ikke fundet
 ErrorProductCombinationNotFound=Varevariant ikke fundet
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 693fc1bd2b1..81b2f06d3bd 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Tid brugt
 TimeSpentByYou=Tid brugt af dig
 TimeSpentByUser=Tid brugt af brugeren
 TimesSpent=Tid brugt
-RefTask=Ref. opgave
-LabelTask=Label opgave
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Tid brugt på opgaver
 TaskTimeUser=Bruger
 TaskTimeNote=Note
diff --git a/htdocs/langs/da_DK/stripe.lang b/htdocs/langs/da_DK/stripe.lang
index 05b936d795c..97a9225e981 100644
--- a/htdocs/langs/da_DK/stripe.lang
+++ b/htdocs/langs/da_DK/stripe.lang
@@ -1,65 +1,67 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe-modul opsætning
-StripeDesc=Modul til at tilbyde en online betalingsside, der accepterer betalinger med kredit- / betalingskort via <a href="http://www.stripe.com" target="_blank"> stripe </a>. Dette kan bruges til at give dine kunder mulighed for at foretage gratis betalinger eller til betaling på et bestemt Dolibarr-objekt (faktura, ordre, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Betal med kreditkort eller stripe
-FollowingUrlAreAvailableToMakePayments=Følgende webadresser findes til at tilbyde en side til en kunde for at foretage en indbetaling på Dolibarr objekter
-PaymentForm=Betaling form
-WelcomeOnPaymentPage=Velkommen på vores online betalingstjenesten
+FollowingUrlAreAvailableToMakePayments=Følgende webadresser oprettet som tilbyde en side til en kunde, hvor til der kan foretage indbetalinger på Dolibarr objekter
+PaymentForm=Betalings formular
+WelcomeOnPaymentPage=Velkommen til vores online betalingstjeneste
 ThisScreenAllowsYouToPay=Dette skærmbillede giver dig mulighed for at foretage en online-betaling til %s.
 ThisIsInformationOnPayment=Dette er informationer om betaling for at gøre
 ToComplete=For at fuldføre
 YourEMail=E-mail til bekræftelse af betaling,
-STRIPE_PAYONLINE_SENDEMAIL=E-mail for at advare efter en betaling (succes eller ej)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Kreditor
-PaymentCode=Betaling kode
-StripeDoPayment=Betal med kredit eller betalingskort (Stripe)
+PaymentCode=Betalingskode
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=Du bliver omdirigeret på sikret stripeside for at indtaste dig kreditkortoplysninger
 Continue=Næste
 ToOfferALinkForOnlinePayment=URL til %s betaling
-ToOfferALinkForOnlinePaymentOnOrder=URL til at tilbyde en %s online betaling brugergrænseflade til en ordre
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL til at tilbyde en %s online betaling brugergrænseflade til en faktura
 ToOfferALinkForOnlinePaymentOnContractLine=URL til at tilbyde en %s online betaling brugergrænseflade til en kontrakt linje
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL til at tilbyde en %s online betaling brugergrænseflade til et frit beløb
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL til at tilbyde en %s online betaling brugergrænseflade til et medlem abonnement
 YouCanAddTagOnUrl=Du kan også tilføje webadresseparameter <b>& tag= <i>værdi</i></b> til nogen af disse URL (kræves kun for fri betaling) for at tilføje din egen betaling kommentere tag.
-SetupStripeToHavePaymentCreatedAutomatically=Indstil din stripe med url <b> %s </ b> for at få betaling oprettet automatisk, når valideret af Stripe.
-YourPaymentHasBeenRecorded=Denne side bekræfter, at din betaling er registreret. Tak.
-YourPaymentHasNotBeenRecorded=Du betalingen ikke er blevet registreret, og transaktionen er blevet aflyst. Tak.
-AccountParameter=Konto parametre
-UsageParameter=Usage parametre
+SetupStripeToHavePaymentCreatedAutomatically=Indstil din stripe med url <b> %s </ b> for at få betaling oprettet automatisk, når bekræftet af Stripe.
+AccountParameter=Kontoparametre
+UsageParameter=Anvendelsesparametre
 InformationToFindParameters=Hjælp til at finde din %s kontooplysninger
 STRIPE_CGI_URL_V2=Url af Stripe CGI-modul til betaling
 VendorName=Navn på leverandør
-CSSUrlForPaymentForm=CSS stylesheet url til indbetalingskort
+CSSUrlForPaymentForm=CSS stilark url for betalingsformular
 NewStripePaymentReceived=Ny Stripe betaling modtaget
 NewStripePaymentFailed=Ny Stripe betaling forsøgt men mislykkedes
 STRIPE_TEST_SECRET_KEY=Hemmelig testnøgle
 STRIPE_TEST_PUBLISHABLE_KEY=Udgivelig testnøgle
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook testnøgle
 STRIPE_LIVE_SECRET_KEY=Secret levende nøgle
 STRIPE_LIVE_PUBLISHABLE_KEY=Udgivelig levende nøgle
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+STRIPE_LIVE_WEBHOOK_KEY=Webhook-livenøgle
+ONLINE_PAYMENT_WAREHOUSE=Lager til brug for lagerreduktion, når online betaling er færdig <br> (TODO Når valgmuligheden for at reducere lagerbeholdningen sker på en handling på faktura, og online betaling genererer selve fakturaen?)
 StripeLiveEnabled=Stripe live aktiveret (ellers test / sandbox mode)
-StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeImportPayment=Import Stripe betalinger
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
-OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
-OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
-BankAccountForBankTransfer=Bank account for fund payouts
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca. _...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca. _...)
+BankAccountForBankTransfer=Bankkonto for udbetaling af fond
+StripeAccount=Stripe konto
+StripeChargeList=Liste over Stripe afgifter
+StripeTransactionList=Liste over Stripe transaktioner
+StripeCustomerId=Stripe kunde id
+StripePaymentModes=Stripe betalingsformer
+LocalID=Lokalt id
 StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+NameOnCard=Navn på kort
+CardNumber=Kortnummer
+ExpiryDate=Udløbsdato
 CVN=CVN
-DeleteACard=Delete Card
-ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
-CreateCustomerOnStripe=Create customer on Stripe
-CreateCardOnStripe=Create card on Stripe
-ShowInStripe=Show in Stripe
+DeleteACard=Slet kort
+ConfirmDeleteCard=Er du sikker på, at du vil slette dette kredit- eller betalingskort?
+CreateCustomerOnStripe=Opret kunde på Stripe
+CreateCardOnStripe=Opret kort på Stripe
+ShowInStripe=Vis i 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)
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 9d6a5a9de85..a466ad7008a 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=Denne side / container har oversættelse
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/de_AT/banks.lang b/htdocs/langs/de_AT/banks.lang
index 78f8663fd90..f1a5e5b07a3 100644
--- a/htdocs/langs/de_AT/banks.lang
+++ b/htdocs/langs/de_AT/banks.lang
@@ -19,7 +19,6 @@ AccountStatementShort=Kontenauszug
 AccountStatements=Kontoauszug
 LastAccountStatements=letzter Kontoauszug
 IOMonthlyReporting=monatlicher Report
-BankAccountDomiciliation=Konto-Adresse
 LabelBankCashAccount=Bank- oder Kassabezeichnung
 BankType0=Sparkonto\n
 BankType2=Kassa
diff --git a/htdocs/langs/de_AT/members.lang b/htdocs/langs/de_AT/members.lang
index f90be1011c1..68c9de6f598 100644
--- a/htdocs/langs/de_AT/members.lang
+++ b/htdocs/langs/de_AT/members.lang
@@ -13,7 +13,6 @@ MemberStatusActiveLateShort=abgelaufen
 SubscriptionEndDate=Abonnementauslaufdatum
 SubscriptionLate=Versätet
 NewMemberType=Neues Mitgliedsrt
-WelcomeEMail=Willkommens-E-Mail
 DeleteType=Löschen
 Physical=Physisch
 Moral=Rechtlich
diff --git a/htdocs/langs/de_AT/paybox.lang b/htdocs/langs/de_AT/paybox.lang
index da7c64f344b..7a982a1ac13 100644
--- a/htdocs/langs/de_AT/paybox.lang
+++ b/htdocs/langs/de_AT/paybox.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - paybox
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL um Ihren Kunden eine %s Online-Bezahlseite für Abonnements anzubieten
 YourPaymentHasBeenRecorded=Diese Seite wird bestätigt, dass Ihre Zahlung aufgezeichnet wurde. Danke.
-YourPaymentHasNotBeenRecorded=Sie Zahlung wurde nicht aufgezeichnet und Transaktion wurde abgebrochen. Danke.
 AccountParameter=Konto-Parameter
diff --git a/htdocs/langs/de_AT/paypal.lang b/htdocs/langs/de_AT/paypal.lang
index 62448a2d365..86201142770 100644
--- a/htdocs/langs/de_AT/paypal.lang
+++ b/htdocs/langs/de_AT/paypal.lang
@@ -1,13 +1,10 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal-Modul Setup
-PaypalDesc=Dieses Modul bieten Seiten, die Zahlung ermöglichen <a href="http://www.paypal.com" target="_blank">PayPal</a> von Kunden. Dies kann für eine kostenlose Zahlung oder eine Zahlung zu einem bestimmten Dolibarr Objekt verwendet werden (Rechnung, Bestellung, ...)
-PaypalDoPayment=Bezahlen Sie mit Paypal
 PAYPAL_API_USER=API Benutzername
 PAYPAL_API_PASSWORD=API Passwort
 PAYPAL_API_SIGNATURE=API Unterschrift
 PaypalModeOnlyPaypal=nur PayPal
 ThisIsTransactionId=Dies ist id Geschäftsart: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Fügen Sie die URL der Paypal Zahlung, wenn Sie ein Dokument per E-Mail senden
 ReturnURLAfterPayment=Rückkehr zur URL nach der Zahlung
 DetailedErrorMessage=genaue Fehlermeldung
 ShortErrorMessage=kurze Fehlermeldung
diff --git a/htdocs/langs/de_AT/projects.lang b/htdocs/langs/de_AT/projects.lang
index 225e6c62dad..febb477ca2a 100644
--- a/htdocs/langs/de_AT/projects.lang
+++ b/htdocs/langs/de_AT/projects.lang
@@ -5,7 +5,6 @@ ProjectsDesc=Diese Ansicht zeigt alle Projekte (Ihre Benutzerberechtigung erlaub
 TasksPublicDesc=Diese Ansicht zeigt alle für Sie sichtbaren Aufgaben.
 TasksDesc=Diese Ansicht zeigt alle Aufgaben (Ihre Benutzerberechtigung erlaubt Ihnen eine volle Einsicht aller Aufgaben).
 NoProject=Kein Projekt definiert
-RefTask=Aufgaben Nr.
 MyActivities=Meine Tätigkeiten
 CloseAProject=Schließe Projekt
 ReOpenAProject=Öffne Projekt
diff --git a/htdocs/langs/de_AT/sms.lang b/htdocs/langs/de_AT/sms.lang
index e795440909c..083b5455c29 100644
--- a/htdocs/langs/de_AT/sms.lang
+++ b/htdocs/langs/de_AT/sms.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - sms
 SmsTitle=Beschreibung
-SmsStatusValidated=Bestätigt
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index c9c5a42ea20..68921c9dd3c 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -18,6 +18,7 @@ ConfigAccountingExpert=Einstellungen des erweiterten Buchhaltungsmoduls
 Journalization=Journalisierung
 JournalFinancial=Finanzjournal
 BackToChartofaccounts=Zeige Kontenplan
+Chartofaccounts=Kontenplan
 CurrentDedicatedAccountingAccount=Aktuell zugewiesenes Konto
 AssignDedicatedAccountingAccount=Neues zugewiesenes Konto
 InvoiceLabel=Rechnungsbezeichung
@@ -68,7 +69,6 @@ TheJournalCodeIsNotDefinedOnSomeBankAccount=Hoppla - nicht alle Bankkonten haben
 Selectchartofaccounts=Wähle deinen Kontenplan.
 ChangeAndLoad=Lade und ersetze
 Addanaccount=Buchhaltungskonto hinzüfügen
-SubledgerAccount=Nebenbuchkonto
 SubledgerAccountLabel=Bezeichnung Nebenbuchkonto
 ShowAccountingAccount=Zeige Buchhaltungskonto
 ShowAccountingJournal=Zeige Buchhaltungssjournal
@@ -84,12 +84,11 @@ TransferInAccounting=Umbuchung
 RegistrationInAccounting=Verbuchen
 Binding=Kontoverknüpfung
 CustomersVentilation=Verknüpfung für Kundenrechnungen
-SuppliersVentilation=Verknüpfung für Anbieterrechnungen
+SuppliersVentilation=Zuordnung Lieferantenrechnungen
 ExpenseReportsVentilation=Verknüpfung für Spesenabrechnungen
 CreateMvts=Neue Transaktion
 UpdateMvts=Transaktion bearbeiten
 ValidTransaction=Transaktion freigeben
-WriteBookKeeping=Transaktionen in Hauptbuch eintragen
 AccountBalance=Saldo
 ObjectsRef=Referenz des Quellobjektes
 CAHTF=Einkaufsaufwand von Steuern
@@ -137,8 +136,8 @@ DONATION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Spenden
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Abonnemente
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard - Buchhaltungskonto für gekaufte Produkte\n(Wird verwendet, wenn kein Konto in der Produktdefinition hinterlegt ist)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard - Buchhaltungskonto für verkaufte Produkte\n(Wird verwendet, wenn kein Konto in der Produktdefinition hinterlegt ist)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Standardkonto für Verkäufe in EWR - Staaten.
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Standardkonto für Verkäufe an nicht EWR - Staaten (sofern nicht anders im Produkt hinterlegt)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Standardkonto für Verkäufe in EWR - Staaten.
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Standardkonto für Verkäufe an nicht EWR - Staaten (sofern nicht anders im Produkt hinterlegt)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard - Buchhaltungskonto für gekaufte Leistungen\n(Wird verwendet, wenn kein Konto in der Leistungsdefinition  hinterlegt ist)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard - Buchhaltungskonto für verkaufte Leistungen\n(Wird verwendet, wenn kein Konto in der Leistungsdefinition hinterlegt ist)
 LabelAccount=Kontobezeichnung
@@ -234,7 +233,6 @@ Modelcsv_ebp=EBP - Format
 Modelcsv_cogilog=EBP  - Format
 Modelcsv_agiris=Agiris - Format
 Modelcsv_configurable=Konfigurierbares CSV  - Format
-Modelcsv_FEC=FEC (Art. L47 A)  - Format (Test)
 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.
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 50bf393cec4..681ea2e1ad7 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Verein
 Publisher=Herausgeber
 VersionLastInstall=Erste installierte Version
 VersionLastUpgrade=Version der letzten Aktualisierung
@@ -10,6 +9,7 @@ FileIntegritySomeFilesWereRemovedOrModified=Datei-Integrität konnte NICHT best
 MakeIntegrityAnalysisFrom=Mache Integrität Analyse von Anwendungsdateien aus
 LocalSignature=Eingebettete lokale Signatur (weniger zuverlässig)
 RemoteSignature=Remote entfernte Unterschrift (mehr zuverlässig)
+FilesUpdated=Dateien ersetzt
 FilesAdded=Angehängte Dateien
 FileCheckDolibarr=Überprüfen Sie die Integrität der Anwendungsdateien
 AvailableOnlyOnPackagedVersions=Die lokale Datei für die Integritätsprüfung ist nur verfügbar, wenn Dolibarr von einer offiziellen Veröffentlichung installiert worden ist.
@@ -20,17 +20,19 @@ ConfirmPurgeSessions=Wollen Sie wirklich alle Sessions beenden ? Dadurch werden
 NoSessionListWithThisHandler=Wegen der aktuellen PHP-Konfiguration kann ich die aktuellen Sitzungen nicht anzeigen.
 ConfirmLockNewSessions=Bist du sicher, dass du jede neue Dolibarr - Verbindung auf dich selbst einschränken willst? Danach kann nur noch der Benutzer <b>%s</b> zugreifen.
 NoSessionFound=Die PHP - Konfiguration erlaubt wahrscheinlich die Anzeige aktiver Sitzungen nicht.\nDas Verzeichnis "<b>%s</b>" könnte geschützt sein - durch eingeschränkte Ordnerberechtigungen durch das Serverbetriebssystem, oder durch PHP selbst via der Direktive "open_basedir".
+DBSortingCharset=Zeichensatz der Datenbank-Sortierung
 ClientCharset=Benutzer-Zeichensatz
 ClientSortingCharset=Datenbankclient - Kollation
+DolibarrSetup=dolibarr Installation oder Upgrade
 GUISetup=Anzeige
+UploadNewTemplate=Neue Vorlage(n) hochladen
 FormToTestFileUploadForm=Formular für das Testen von Datei-Uplads (je nach Konfiguration)
 RemoveLock=Um das Update- und Installationstool verwenden zu können, lösche bitte die Datei  <b>%s</b> oder benenne sie um
 RestoreLock=Damit das Update- und Installationstool gesperrt wird, stelle die Datei <b>%s</b>mit Nur-Leserechten wieder her.
 SecurityFilesDesc=Sicherheitseinstellungen für den Dateiupload definieren.
 ErrorModuleRequirePHPVersion=Fehler: Dieses Modul benötigt PHP Version %s oder höher
 ErrorModuleRequireDolibarrVersion=Fehler: Dieses Moduls erfordert Dolibarr Version %s oder höher
-DictionarySetup=Wörterbuch Einstellungen
-Dictionary=Wörterbücher
+DictionarySetup=Stammdaten Einstellungen
 ErrorCodeCantContainZero=Code darf keinen Wert 0 enthalten
 DisableJavascript=JavaScript - und Ajaxfunktionen ausschalten
 DisableJavascriptNote=Obacht, das ist nur zu Test- und Debugzwecken. Eingabehilfen für Sehbehinderte und Optimierung für Textbrowser setzest du lieber im Benutzerprofil.
@@ -38,9 +40,13 @@ UseSearchToSelectCompanyTooltip=Wenn Sie eine grosse Anzahl von Geschäftspartne
 UseSearchToSelectContactTooltip=Wenn Sie eine grosse Anzahl von Kontakten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante CONTACT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 DelaiedFullListToSelectCompany=Nicht so eingängig, aber schneller geht's in der Combo List - Ansicht, wenn ich auf Tastendruck warten soll, bevor ich die Partnerliste lade.
 DelaiedFullListToSelectContact=Nicht so eingängig, aber schneller geht's in der Combo List - Ansicht, wenn ich auf Tastendruck warten soll, bevor ich die Kontaktliste lade.
+NumberOfKeyToSearch=Anzahl der Zeichen, die die Suche auslösen sollen:  1 %s
 AllowToSelectProjectFromOtherCompany=Erlaube bei den Elementen eines Partners, die Projekte von anderen Partnern zu verlinken
+UsePreviewTabs=Vorschautabs verwenden
+MySQLTimeZone=Aktuelle Zeitzone von MySql (Datenbank)
 TZHasNoEffect=Kalenderdaten werden als Text in der Datenbank abgelegt und ausgelesen. Die Datenbank - Zeitzone sollte so keinen Einfluss auf Dolibarr haben, auch wenn Sie nach Eingabe von Daten geändert wird. Nur wenn die UNIX_TIMESTAMP - Funktion verwendet wird, was man in Dolibarr nicht sollte, kann die Datenbank - Zeitzone Auswirkungen haben.
 Space=Raum
+NextValueForDeposit=Nächster Wert (Anzahlung)
 MustBeLowerThanPHPLimit=Hinweis: <b>Deine</b> PHP Konfigurationslimite für Uploads ist aktuell  <b>%s</b> %s pro Datei - unabhängig vom Wert dieses Parameters.
 NoMaxSizeByPHPLimit=Hinweis: In Ihren PHP-Einstellungen sind keine Grössenbeschränkungen hinterlegt
 MaxSizeForUploadedFiles=Maximale Grösse für Dateiuploads (0 verbietet jegliche Uploads)
@@ -53,20 +59,27 @@ DetailPosition=Reihungsnummer für definition der Menüposition
 OtherOptions=Andere Optionen
 OtherSetup=Andere Einstellungen
 LocalisationDolibarrParameters=Lokalisierungsparameter
+PHPTZ=Zeitzone der PHP-Version
 CurrentSessionTimeOut=Aktuelle Session timeout
 YouCanEditPHPTZ=Nicht zwingend - aber du kannst via .htaccess - Datei versuchen, die Zeitzone zu übersteuern (Eintrag: SetEnv TZ Europe/Zurich zum Beispiel)
 HoursOnThisPageAreOnServerTZ=Obacht - hier ist ausnahmsweise die Serverzeit angegeben, nicht deine lokale.
+Box=Box
+Boxes=Boxen
 MaxNbOfLinesForBoxes=Setze die maximale Zeilenhöhe für Boxen
+AllWidgetsWereEnabled=Alle verfügbaren Widgets sind aktiviert
 MenusDesc=In der Menüverwaltung können Sie den Inhalt der beiden Menüleisten (Horizontal und Vertikal) festlegen
 MenusEditorDesc=Mit dem Menü-Editor können Sie benutzerdefinierte Menüeinträge erstellen. Verwenden Sie dies vorsichtig, um Instabilität und dauerhaft unerreichbare Menüeinträge zu vermeiden. <br> Einige Module fügen Menüeinträge hinzu (meistens im Menü <b> Alle </b>). Wenn Sie einen dieser Einträge versehentlich entfernen, können Sie ihn wiederherstellen, indem Sie das Modul deaktivieren und erneut aktivieren.
+LangFile=Datei .lang
 Language_en_US_es_MX_etc=Sprache setzen (de_CH, en_GB,...)
 SystemToolsAreaDesc=Dieser Bereich ist voll mit Administratorfunktionen - Wähle im Menu aus.
+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=Alle temporären Dateien löschen (kein Datenverlustrisiko)
 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.
 PurgeNDirectoriesDeleted=<b>%s</b> Dateien oder Verzeichnisse gelöscht.
 PurgeNDirectoriesFailed=Löschen von <b>%s</b> Dateien oder Verzeichnisse fehlgeschlagen.
+PurgeAuditEvents=Bereinige alle Sicherheitsereignisse
 ConfirmPurgeAuditEvents=Möchten Sie wirklich alle Sicherheitsereignisse löschen? Alle Sicherheits-Logs werden gelöscht, aber keine anderen Daten entfernt.
 YouCanDownloadBackupFile=Du kannst die erstellte Sicherungsdatei jetzt herunterladen
 NoBackupFileAvailable=Keine verfügbare Sicherungsdatei
@@ -74,6 +87,8 @@ ExportMethod=Export-Methode
 ImportMethod=Import-Methode
 ImportMySqlDesc=Erstellte MySQL - Backupdateien importierst du in deiner Hostingumgebung. Entweder über phpMyAdmin oder über die MySql - Konsole, zum Beispiel mit dem Befehl:
 FileNameToGenerate=Name der zu erstellenden Datei
+AddDropDatabase=DROP DATABASE Befehl hinzufügen
+AddDropTable=DROP TABLE Befehl hinzufügen
 IgnoreDuplicateRecords=Fehler durch doppelte Zeilen ignorieren (INSERT IGNORE)
 BoxesDesc=Boxen (Widgets) sind Informationsblöcke, die man für personalisierte Ansichten verwenden kann. Gib bei einer Box an, auf welcher Ansicht Sie erscheinen soll und Klicke auf "Aktivieren" - oder entferne eine Box über das Papierkorbsymbol.
 ModulesDesc=Über Module steuerst du die Funktionsvielfalt deiner Dolibarr - Umgebung. Schalte die gewünschten Module einfach mit dem Schiebeschalter daneben ein und aus. Setze dann benutzerspezifische Rechte für deine Anwender.
@@ -84,6 +99,7 @@ ModulesDevelopYourModule=Entwicklen Sie Ihre eigenes Modul/Anwendung
 ModulesDevelopDesc=Dir fehlt eine Funktionalität? Baue dir selber ein Modul, oder wähle einen Partner, der das für dich erledigt.
 DOLISTOREdescriptionLong=Dieses Werkzeug kann direkt im externen Modulmarktplatz suchen - das ist eventuell etwas langsam und braucht Internetzugang.\nVia <a href="https://www.dolistore.com">www.dolistore.com</a> erreichst du ebenfalls alle exernen Module.
 FreeModule=Kostenlose Module
+CompatibleUpTo=Kompatibel mit Version %s
 NotCompatible=Dieses Modul scheint nicht mit Ihrer Dolibarr Version %s (Min %s - Max %s) kompatibel zu sein.
 CompatibleAfterUpdate=Dieses Modul benötigt eine Update Ihrer Dolibarr Version %s (Min %s - Max %s).
 SeeInMarkerPlace=Siehe im Marktplatz
@@ -95,8 +111,10 @@ BoxesActivated=Aktivierte Boxen
 DoNotStoreClearPassword=Verschlüssle die Passwörter in der Datenbank - das ist sehr empfohlen, sonst werden Sie in Klartext abgelegt.
 MainDbPasswordFileConfEncrypted=Verschlüssle die Passwörter in der Dolibarr - Konfigurationsdatei (conf.php) - das ist sehr empfohlen, sonst werden Sie in Klartext abgelegt.
 ProtectAndEncryptPdfFiles=Schütze von Dolibarr generierte PDFs - der Haken: Wenn das aktiv ist, kann ich keine Massen - PDFs mehr herstellen.
+ProtectAndEncryptPdfFilesDesc=Die Aktivierung des PDF-Dokumentschutzes erhält die Lesbarkeit und Druckfähigkeit des Dokuments, Bearbeitung und Kopien sind jedoch nicht mehr möglich. Bitte beachten Sie, dass nach Aktivierung dieser Funktion auch die Stapelverarbeitung von PDF-Dokumenten (z.B. alle offenen Rechnungen zusammenführen) nicht mehr funktioniert.
 Developpers=Entwickler/Mitwirkende
 OfficialWebSite=Offizielle Dolibarr - Homepage
+OfficialWebSiteLocal=Lokale Webseite (%s)
 OfficialWiki=Dolibarr Wiki / Dokumentation
 OfficialDemo=Dolibarr Offizielle Demo
 OfficialMarketPlace=Offizieller Marktplatz für Module/Erweiterungen
@@ -108,8 +126,14 @@ ForAnswersSeeForum=Für alle anderen Fragen / Hilfe, können Sie die Dolibarr Fo
 HelpCenterDesc1=Hier findest du weitere Anlaufstellen für Hilfe und Unterstützung zu Dolibarr.
 HelpCenterDesc2=Einige dieser Ressourcen gibt es nur auf <b>Englisch</b>.
 MeasuringUnit=Masseinheit
+LeftMargin=Linker Rand
+TopMargin=Oberer Rand
+Orientation=Orientierung
+SpaceX=Leerraum X
+SpaceY=Leerraum Y
 NoticePeriod=Kündigungsfrist
 EMailsDesc=Normalerweise gibt es hier nichts zu ändern. - Wenn der Mailversand nicht einfach so funktioniert, kannst du hier trotzdem die Mail - Einstellungen deiner Webserverumbegung übersteuern.
+EmailSenderProfiles=Absenderprofil
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS - Portnummer (aktuelle Konfiguration in PHP ist: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS - Portnummer (aktuelle Konfiguration in PHP ist: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS - Portnummer (in UNIX - Umgebungen nicht in PHP konfiguriert)
@@ -124,21 +148,26 @@ MAIN_MAIL_SENDMODE=Methode zum Senden von E-Mails
 MAIN_MAIL_SMTPS_ID=SMTP - Benutzer (wenn Authentifizierung durch Ausgangsserver erforderlich)
 MAIN_MAIL_SMTPS_PW=SMTP - Passwort (wenn Authentifizierung durch Ausgangsserver erforderlich)
 MAIN_MAIL_EMAIL_TLS=TLS (SSL)-Verschlüsselung verwenden
-MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) Verschlüsselung verwenden
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Authentiziere dich durch DKIM - E-Mail Signatur
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=DKIM Domäne
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=DKIM - Selector
 MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Privater DKIM - Schlüssel
+MAIN_DISABLE_ALL_SMS=Alle SMS-Funktionen abschalten (für Test- oder Demozwecke)
+MAIN_SMS_SENDMODE=Methode zum Senden von SMS
 MAIN_MAIL_SMS_FROM=Standard - Mobilnummer für SMS Versand
 MAIN_MAIL_DEFAULT_FROMTYPE=E-Mail - Absender für manuell erzeugte Nachrichten (Benutzer- oder Firmenadresse)
+UserEmail=Email des Benutzers
 CompanyEmail=Firmen - E-Mailadresse
 SubmitTranslation=Du hast Übersetzungsfehler gefunden? Hilf uns, indem du die Sprachdateien im Verzeichnis '<b>langs/%s</b>' anpasst und die Verbesserungen auf "www.transifex.com/dolibarr-association/dolibarr/" einreichst.
 SubmitTranslationENUS=Sollte die Übersetzung für eine Sprache nicht vollständig sein oder Fehler beinhalten, können Sie die entsprechenden Sprachdateien im Verzeichnis <b>langs/%s</b>  bearbeiten und anschliessend Ihre Änderungen an dolibarr.org/forum oder für Entwickler auf github.com/Dolibarr/dolibarr. übertragen.
-ModuleFamilyCrm=Kundenbeziehungsmanagement (CRM)
 ModuleFamilySrm=Lieferantenbeziehungsmanagement (VRM)
 ModuleFamilyProducts=Produktmanagement (PM)
+ModuleFamilyHr=Personalverwaltung (PM)
 ModuleFamilyProjects=Projektverwaltung/Zusammenarbeit
+ModuleFamilyECM=Inhaltsverwaltung (ECM)
 ModuleFamilyPortal=Homepages und weitere Frontanwendungen
+DoNotUseInProduction=Nicht in Produktion nutzen
+ThisIsAlternativeProcessToFollow=Dies ist ein alternativer Setup-Prozess:
 FindPackageFromWebSite=Finde das passende Dolibarrpaket (zum Beispiel auf der Dolibarr - Website %s)
 DownloadPackageFromWebSite=Lade das gefundene Paket herunter (zum Beispiel von der offiziellen Dolibarr Website %s).
 UnpackPackageInDolibarrRoot=Entpacke das Archiv in dein aktuelles Dolibarr Verzeichnis: <b>%s</b>.
@@ -146,14 +175,24 @@ UnpackPackageInModulesRoot=Zum Einbinden eines externen Moduls entpackst du dere
 SetupIsReadyForUse=Modulinstallation abgeschlossen. Aktiviere und konfiguriere nun das Modul im Menu "<a href="%s">%s</a>".
 InfDirExample=<br>Dann deklariere in <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>\n"#" heisst, die Variablen sind auskommentiert und werden nicht berücksichtigt.\nEntferne einfach "#", um die Variablen scharf zu schalten.
 YouCanSubmitFile=Du kannst das Modul - Archiv auch hochladen:
+UpdateServerOffline=Update-Server offline
 WithCounter=Zähler verwalten
 GenericMaskCodes=Sie können ein beliebiges Numerierungsschema wählen. Dieses Schema könnte z.B. so aussehen:<br><b>{000000}</b> steht für eine 6-stellige Nummer, die sich bei jedem neuen %s automatisch erhöht. Wählen Sie die Anzahl der Nullen je nach gewünschter Nummernlänge. Der Zähler füllt sich automatisch bis zum linken Ende mit Nullen um das gewünschte Format abzubilden. <br><b>{000000+000}</b> führt zu einem ähnlichen Ergebnis, allerdings mit einem Wertsprung in Höhe des Werts rechts des Pluszeichens, der beim ersten %s angewandt wird. <br><b>{000000@x}</b> wie zuvor, jedoch stellt sich der Zähler bei Erreichen des Monats x (zwischen 1 und 12) automatisch auf 0 zurück. Ist diese Option gewählt und x hat den Wert 2 oder höher, ist die Folge {mm}{yy} or {mm}{yyyy} ebenfalls erfoderlich. <br><b>{dd}</b> Tag (01 bis 31).<br><b>{mm}</b> Monat (01 bis 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> Jahreszahl 1-, 2- oder 4-stellig. <br>
 GenericMaskCodes2=<b>{cccc}</b> der Kunden-Code mit n Zeichen<br><b>{cccc000}</b> der Kunden-Code mit n Zeichen, gefolgt von der dem Kunden zugeordneten Partner ID. Dieser Zähler wird gleichzeitig mit dem Globalen Zähler zurückgesetzt.<br><b>{tttt}</b> Die Partner ID mit n Zeichen (siehe unter Einstellungen->Stammdaten->Arten von Partnern). Wenn diese Option aktiv ist, wird für jede Partnerart ein separater Zähler geführt.<br>
+GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben. <br> Leerzeichen sind nicht zulässig. <br>
+GenericMaskCodes4a=<u>Beispiel auf der 99. %s des Partners DieFirma, mit Datum 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Beispiel für Dritte erstellt am 2007-03-01:</u> <br>
+GenericMaskCodes4c=<u>Beispiel für ein Produkt erstellt am 2007-03-01:</u> <br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> ergibt <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> ergibt <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> ergibt <b>IN0701-0099-A</b> falls die Partnerart 'Responsable Inscripto' ist und der Typcode 'A_RI'  ist
 ServerAvailableOnIPOrPort=Server ist verfügbar unter der Adresse <b>%s</b> auf Port <b>%s</b>
+ServerNotAvailableOnIPOrPort=Server nicht verfügbar unter Adresse <b>%s</b> auf Port <b>%s</b>
 DoTestSend=Test senden
 UMask=Umask Parameter für neue Dateien auf Unix/Linux/BSD-Dateisystemen.
 UMaskExplanation=Über diesen Parameter können Sie die standardmässigen Dateiberechtigungen für vom System erzeugte/verwaltete Inhalte festlegen. <br>Erforderlich ist ein Oktalwert (0666 bedeutet z.B. Lesen und Schreiben für alle). <br>Auf Windows-Umgebungen haben diese Einstellungen keinen Effekt.
+SeeWikiForAllTeam=Schaue die Wiki-Seite mit der Liste der Mitwirkenden und ihrer Organisation an.
+AddCRIfTooLong=Es gibt keine automatische Textformatierung, zu langer Text wird in Dokumenten nicht angezeigt. Bitte fügen Sie bei Bedarf Zeilenumbrüche im Textfeld hinzu.
+ListOfDirectoriesForModelGenODT=Liste der Verzeichnisse mit Vorlagendateien mit OpenDocument-Format.<br><br>Fügen Sie hier den vollständigen Pfad der Verzeichnisse ein.<br>Trennen Sie jedes Verzeichnis mit einer Zeilenschaltung<br>Verzeichnisse des ECM-Moduls fügen Sie z.B. so ein <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Dateien in diesen Verzeichnissen müssen mit <b>.odt</b>  oder <b>.ods</b> enden.
+ResponseTimeout=Antwort Timeout
 PDFDesc=Globale Einstellungen für automatisch generierte PDFs
 PDFRulesForSalesTax=Regeln für die MWST
 PlaceCustomerAddressToIsoLocation=ISO Position für die Kundenadresse verwenden
@@ -172,37 +211,65 @@ ExtrafieldCheckBoxFromList=Kontrollkästchen aus Tabelle
 LibraryToBuildPDF=Verwendete Bibliothek zur PDF-Erzeugung
 SetAsDefault=Als Standard definieren
 BarcodeInitForProductsOrServices=Alle Strichcodes für Produkte oder Services initialisieren oder zurücksetzen
+EraseAllCurrentBarCode=Alle aktuellen Barcode-Werte löschen
 ConfirmEraseAllCurrentBarCode=Wirklich alle aktuellen Barcode-Werte löschen?
+AllBarcodeReset=Alle Barcode-Werte wurden entfernt
 NoBarcodeNumberingTemplateDefined=Mir fehlt ein aktives Barcode - Nummernschema. Das wird im Modul "Barcodes" aktiviert.
 DisplayCompanyManagers=Anzeige der Namen der Geschäftsführung
 EnableAndSetupModuleCron=Wenn du diese Rechnung in regelmässigem Abstand automatisch erzeugen lassen willst, musst du das Modul '%s' aktivieren und konfigurieren. Natürlich kannst du weiterhin hier die Rechnung manuell auslösen. Du wirst gewarnt, falls du die Rechnung manuell auslösen willst, aber bereits eine automatisch erstellte da ist.
+ModuleCompanyCodePanicum=Leeren Kontierungscode zurückgeben.
 Use3StepsApproval=Standardmässig, Einkaufsaufträge müssen durch zwei unterschiedlichen Benutzer erstellt und freigegeben werden (ein Schritt/Benutzer zum Erstellen und ein Schritt/Benutzer für die Freigabe). Beachten Sie, wenn ein Benutzer beide Rechte hat - zum Erstellen und Freigeben, dann reicht ein Benutzer für diesen Vorgang. Optional können Sie einen zusätzlichen Schritt/User für die Freigabe einrichten, wenn der Betrag einen bestimmten dedizierten Wert übersteigt (wenn der Betrag höher wird, werden 3 Stufen notwendig: 1=Validierung, 2=erste Freigabe und 3=Gegenfreigabe.<br>Lassen Sie das Feld leer, wenn eine Freigabe (2 Schritte) ausreicht; tragen Sie einen sehr niedrigen Wert (0.1) ein, wenn eine zweite Freigabe notwendig ist.
 UseDoubleApproval=3-fach Verarbeitungsschritte verwenden, wenn der Betrag (ohne Steuer) höher ist als ...
 WarningPHPMail=Obacht: Wenn du eine externe Mailadresse verwendest (also nicht die deines aktuellen Hostings hier, gibst du hier den Mailserver, der zu deiner gewünschten E-Mail Adresse passt, ein (z.B. den SMTP von GMX, wenn du eine GMX - Adresse hinterlegst.)<br/> Trage hier also Mailserver / Benutzer / Passwort deines externen Anbieters ein.<br/> Sonst kann es vorkommen, dass Mails hier nicht herausgeschickt werden, weil der lokale Maildienst einen Absender mit falscher Domäne erhält, und das blockiert.
 WarningPHPMail2=Falls dein Anbieter Mailclients auf einen IP-Adressbereich einschränkt, hier die IP deines E-Mail Benutzerprogramms hier in Dolibarr: <strong>%s</strong>.
 ClickToShowDescription=Klicken um die Beschreibung zu sehen
 DependsOn=Dieses Modul benötigt die folgenden Module
+RequiredBy=Diese Modul wird durch folgende Module verwendet
 WarningSettingSortOrder=Warnung: Änderungen an der Standardsortierreihenfolge können zu Fehlern führen, falls das betreffende Feld nicht vorhanden ist. Falls dies passiert, entfernen sie das betreffende Feld oder stellen die den Defaultwert wieder her.
 ProductDocumentTemplates=Dokumentvorlagen zur Erstellung von Produktdokumenten
 WatermarkOnDraftExpenseReports=Wasserzeichen auf Entwurf von Ausgabenbelegen
 AttachMainDocByDefault=Setzen Sie diesen Wert auf 1, wenn Sie das Hauptdokument standardmässig per E-Mail anhängen möchten (falls zutreffend).
 DAVSetup=Einstellungen de Moduls "DAV"
+Module10Desc=Einfache Buchhaltungsberichte (Journale, Umsätze) auf Basis von Datenbankinhalten. Es wird keine Hauptbuch-Tabelle verwendet.
 Module20Desc=Angeboteverwaltung
 Module22Desc=E-Mail-Kampagnenverwaltung
+Module40Name=Lieferanten
 Module49Desc=Bearbeiterverwaltung
+Module52Name=Produktbestände
+Module54Name=Verträge/Abonnements
 Module70Name=Arbeitseinsätze
 Module80Name=Auslieferungen
+Module100Desc=Hinzufügen eines Links zu einer externen Website als Icon im Hauptmenü. Die Webseite wird in einem Dolibarr-Frame unter dem Haupt-Menü angezeigt.
+Module105Desc=Mailman oder SPIP Schnittstelle für die Mitgliedsmodul
 Module240Desc=Werkzeug zum Datenexport (mit Assistent)
+Module250Desc=Tool zum Importieren von Daten in Dolibarr (mit Unterstützung)
 Module310Desc=Management von Mitglieder einer Stiftung/Vereins
+Module330Desc=Erstellen Sie Verknüpfungen zu den internen oder externen Seiten, auf die Sie häufig zugreifen (Favoriten).
+Module400Name=Projekte oder Interessenten
+Module400Desc=Management von Projekten, Interessenten/Chancen und/oder Aufgaben. Sie können auch jedes beliebige Element (Rechnung, Auftrag, Offerte, Intervention,...) einem Projekt zuordnen und erhalten eine Querschnittsansicht aus der Projektsicht.
+Module510Desc=Erfassen und Verfolgen von Vergütungen der Mitarbeiter
+Module520Name=Kredite
 Module600Desc=Ereignisbasierte E-Mail - Benachrichtigungen<ul> <li>Für Benutzer, gemäss Einstellungen im Benutzerprofil</li><li> Für Geschäftspartner, gemäss Einstellungen in Partnerkontakten</li> <li>Für selbstgewählte E-Mail Adressen</li></ul>
 Module600Long=Obacht: Hier geht es um automatisierte Benachrichtigungen für Geschäftsvorfälle. Kalendererinnerungen legst du im Modul "Kalender" fest.
+Module610Desc=Erstellung von Produktvarianten (Farbe, Größe etc.)
+Module770Desc=Verwaltung von Reisekostenabrechnungen (Verkehrsmittel, Verpflegung,....)
 Module1200Desc=Mantis-Integation
 Module1520Desc=E-Mail Kampagnendokument erstellen
 Module1780Name=Kategorien/#tags
+Module2000Desc=Ermöglicht die Bearbeitung von Textfeldern mit dem CKEditor (html).
+Module2400Name=Ereignisse/Termine
+Module2400Desc=Ereignisse verfolgen. Lassen Sie Dolibarr automatische Ereignisse zur Verfolgung protokollieren oder nehmen Sie manuelle Ereignisse oder Besprechungen auf. Dies ist das Hauptmodul für ein gutes Management von Kunden- oder Lieferanten-Beziehungen.
+Module2660Desc=Aktivieren Sie den Dolibarr Webservice-Client (Kann verwendet werden, um Daten/Anfragen an externe Server zu übertragen. Nur Lieferantenbestellungen werden derzeit unterstützt.)
 Module2700Desc=Benutze den Gravatar - Dienst, um Fotos von deinen Benutzern und Mitgliedern darzustellen. (www.gravatar.com)
+Module20000Desc=Mitarbeiterurlaubsanträge erfassen und verfolgen
+Module40000Desc=Verwendung alternativer Währungen in Preisen und Dokumenten
 Module50100Desc=Kassenmodul (Simple POS)
 Module50150Desc=Kassenmodul (TouchPOS)
+Module50400Desc=Buchhaltungsverwaltung (doppelte Buchhaltung, unterstützt Haupt- und Nebenbücher). Export des Hauptbuchs in verschiedene andere Buchhaltungssoftware-Formate.
 Module55000Name=Befragung, Umfrage oder Abstimmung
+Module55000Desc=Modul zur Erstellung von Online-Umfragen, Umfragen oder Abstimmungen (wie Doodle, Studs, Rdvz,....)
+Module62000Name=Lieferbedingungen
+Module62000Desc=Hinzufügen von Funktionen zur Verwaltung von Lieferbedingungen (Incoterms)
 Permission26=Angebote schliessen
 Permission61=Leistungen ansehen
 Permission62=Leistungen erstellen/bearbeiten
@@ -217,17 +284,25 @@ Permission144=Löschen Sie alle Projekte und Aufgaben (einschliesslich privater
 Permission172=Reise- und Spesenabrechnung erstellen/ändern
 Permission193=Leitungen abbrechen
 Permission203=Bestellungsverbindungen Bestellungen
+Permission311=Leistungen einsehen
 Permission331=Lesezeichen einsehen
 Permission332=Lesezeichen erstellen/bearbeiten
+Permission401=Rabatte einsehen
+Permission520=Darlehen einsehen
 Permission525=Darlehens-rechner
+Permission527=Exportiere Darlehen
+Permission531=Leistungen einsehen
+Permission701=Spenden einsehen
 Permission1235=Lieferantenrechnungen per E-Mail versenden
 Permission2414=Aktionen und Aufgaben anderer exportieren
 Permission59002=Gewinspanne definieren
+DictionaryCompanyJuridicalType=Rechtsformen von Unternehmen
 DictionaryActions=Arten von Kalenderereignissen
 DictionaryVAT=MwSt.-Sätze
 DictionaryPaperFormat=Papierformate
 DictionaryEMailTemplates=E-Mail Textvorlagen
 SetupSaved=Setup gespeichert
+BackToDictionaryList=Zurück zu der Stammdatenliste
 LocalTax1IsNotUsedDescES=Standardmässig werden die vorgeschlagenen RE 0 ist. Ende der Regel.
 LocalTax2IsNotUsedDescES=Standardmässig werden die vorgeschlagenen IRPF 0 ist. Ende der Regel.
 DriverType=Treiber Typ
@@ -359,10 +434,11 @@ MAIN_PDF_MARGIN_RIGHT=Rechter Seitenrand im PDF
 MAIN_PDF_MARGIN_TOP=Oberer Seitenrand im PDF
 MAIN_PDF_MARGIN_BOTTOM=Unterer Seitenrand im PDF.
 NothingToSetup=Dieses Modul braucht keine weiteren Einstellungen.
+HelpOnTooltip=Hilfetext, der auf dem Tooltip angezeigt werden soll
+HelpOnTooltipDesc=Legen Sie hier einen Text oder einen Übersetzungsschlüssel an, damit dieser Text im Tooltip angezeigt wird, wenn dieses Feld in einem Formular erscheint.
 SocialNetworkSetup=Modul Soziale Netzwerke einrichten
-SwapSenderAndRecipientOnPDF=Absender- / Empfängeradresse im PDF vertauschen.
 EmailCollector=E-Mail Sammeldienst
-EmailCollectorDescription=Hier kannst du zeitgesteuert IMAP - Mailboxen regelmässig abfragen und korrekt in deiner Umgebung zuweisen. Weiter kannst du daraus automatisch Objekte erzeugen, z.B. Leads.
+EmailCollectorDescription=Hier kannst du zeitgesteuert IMAP - Mailboxen regelmässig abfragen und korrekt in deiner Umgebung zuweisen. Weiter kannst du daraus automatisch Objekte erzeugen, z.B. Interessenten.
 NewEmailCollector=Neuer E-Mail - Sammeldienst
 EMailHost=IMAP Server Host
 EmailCollectorConfirmCollectTitle=E-Mail - Sammeldienst Bestätigung
diff --git a/htdocs/langs/de_CH/bookmarks.lang b/htdocs/langs/de_CH/bookmarks.lang
index d0f8444ec83..850b6bea770 100644
--- a/htdocs/langs/de_CH/bookmarks.lang
+++ b/htdocs/langs/de_CH/bookmarks.lang
@@ -2,9 +2,6 @@
 AddThisPageToBookmarks=Füge diese Seite zu deinen Lesezeichen hinzu.
 EditBookmarks=Lesezeichen anzeigen und bearbeiten
 OpenANewWindow=Neuen Tab öffnen
-ReplaceWindow=Aktuellen Tab ersetzen
-BookmarkTargetNewWindowShort=Neuer Tab
-BookmarkTargetReplaceWindowShort=Aktueller Tab
 BookmarkTitle=Name des Lesezeichens
 BehaviourOnClick=Was soll passieren, wenn ein Lesezeichen - Link angewählt wird?
 SetHereATitleForLink=Gib dem Lesezeichen einen Namen
diff --git a/htdocs/langs/de_CH/boxes.lang b/htdocs/langs/de_CH/boxes.lang
index ef64ec414f9..477ecc4581a 100644
--- a/htdocs/langs/de_CH/boxes.lang
+++ b/htdocs/langs/de_CH/boxes.lang
@@ -2,12 +2,13 @@
 BoxProductsAlertStock=Lagerbestandeswarnungen für Produkte
 BoxLastProductsInContract=%s zuletzt in Verträgen verwendete Produkte/Leistungen
 BoxOldestUnpaidCustomerBills=Älteste offene Kundenrechnungen
+BoxLastProposals=Neueste Angebote
 BoxLastProspects=Zuletzt bearbeitete Leads
 BoxLastCustomers=Zuletzt bearbeitete Kunden
 BoxLastActions=Neueste Aktionen
+BoxLastMembers=Neueste Mitglieder
 BoxFicheInter=Neueste Arbeitseinsätze
 BoxTitleLastRssInfos=%s neueste News von %s
-BoxTitleLastCustomersOrProspects=%s neueste Kunden oder Leads
 BoxTitleLastFicheInter=%s zuletzt bearbietet Eingriffe
 BoxLastExpiredServices=%s älteste Kontakte mit aktiven abgelaufenen Leistungen
 BoxTitleLastActionsToDo=%s neueste Aktionen zu erledigen
@@ -15,5 +16,8 @@ BoxTitleLastModifiedDonations=%s zuletzt geänderte Spenden
 BoxTitleLastModifiedExpenses=%s zuletzt bearbeitete Spesenabrechnungen
 BoxGoodCustomers=Guter Kunde
 LastRefreshDate=Datum der letzten Aktualisierung
+NoRecordedCustomers=Keine erfassten Kunden
+NoRecordedContacts=Keine erfassten Kontakte
+NoRecordedProspects=Keine erfassten Leads
 NoRecordedInterventions=Keine verzeichneten Einsätze
 LastXMonthRolling=%s letzte Monate gleitend
diff --git a/htdocs/langs/de_CH/categories.lang b/htdocs/langs/de_CH/categories.lang
index 0ea72f900fc..2146cad9197 100644
--- a/htdocs/langs/de_CH/categories.lang
+++ b/htdocs/langs/de_CH/categories.lang
@@ -53,7 +53,7 @@ ProjectsCategoriesShort=Projektschlagworte / -kateorien
 ThisCategoryHasNoAccount=Dieser Kategorie sind keine Konten zugewiesen.
 ThisCategoryHasNoProject=Mit dieser Kategorie ist kein Projekt verknüpft.
 CategId=Schlagwort / Kategorie ID
-CatCusList=Liste der Kunden-/ Leadschlagworte / -kategorien
+CatCusList=Liste der Kunden-/ Interessentenschlagworte / -kategorien
 CatProdList=Liste der Produktschlagworte / -kategorien
 CatMemberList=Liste der Mitgliederschlagworte / -kategorien
 CatContactList=Liste der Kontaktschlagworte / -kategorien
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index 06db4dab9cb..1565f2d23e9 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -16,13 +16,10 @@ IdThirdParty=Geschäftspartner ID
 IdCompany=Unternehmens ID
 IdContact=Kontakt ID
 ThirdPartyContact=Geschäftspartner-Kontakt
-AliasNames=Alias-Name (Geschäftsname, Marke, ...)
 CountryIsInEEC=EU - Staat
 PriceFormatInCurrentLanguage=Währungsanzeige dieser Sprache
 ThirdPartyName=Name des Geschäftspartners
 ThirdPartyEmail=E-Mail des Geschäftspartners
-ThirdParty=Geschäftspartner
-ThirdParties=Geschäftspartner
 ThirdPartyType=Typ des Geschäftspartners
 ToCreateContactWithSameName=Erzeuge einen Kontakt mit den selben Angaben, wie der Geschäftspartner. Meistens (auch wenn der Partner eine natürliche Person ist), braucht es das nicht.
 ReportByMonth=Monatsbericht
@@ -112,7 +109,6 @@ ContactNotLinkedToCompany=Kontakt keinem Geschäftspartner zugeordnet
 DolibarrLogin=Dolibarr Benutzername
 ConfirmDeleteFile=Sind Sie sicher dass Sie diese Datei löschen möchten?
 AllocateCommercial=Vertriebsmitarbeiter zuweisen
-Organization=Organisation
 FiscalMonthStart=Ab Monat des Geschäftsjahres
 YouMustCreateContactFirst=Sie müssen erst E-Mail-Kontakte beim Geschäftspartner anlegen, um E-Mail-Benachrichtigungen hinzufügen zu können.
 InActivity=Offen
diff --git a/htdocs/langs/de_CH/ecm.lang b/htdocs/langs/de_CH/ecm.lang
index dae004fa8b9..edf769c70f1 100644
--- a/htdocs/langs/de_CH/ecm.lang
+++ b/htdocs/langs/de_CH/ecm.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Anzahl der Dokumente im Verzeichnis
 ECMSectionManual=Manuelle Ordner
 ECMSectionAuto=Automatische Ordner
 ECMSectionsManual=Manuelle Hierarchie
@@ -9,7 +8,6 @@ ECMNbOfSubDir=Anzahl der Unterordner
 ECMAreaDesc2=* In den automatischen Verzeichnissen werden die vom System erzeugeten Dokumente abgelegt. <br> * Die manuellen Verzeichnisse können Sie selbst verwalten und zusätzliche nicht direkt zuordenbare Dokument hinterlegen.
 ECMSectionWasRemoved=Der Ordner <b>%s</b> wurde gelöscht.
 ECMSearchByKeywords=Suche nach Stichwörter
-ECMSectionOfDocuments=Dokumentenordner
 ECMDocsBySocialContributions=Verlinke Dokumente zu Sozialabgaben oder Steuerinformationen
 ECMDocsByThirdParties=Mit Geschäftspartnern verknüpfte Dokumente
 ECMDocsByInterventions=Mit Eingriffen verknüpfte Dokumente
diff --git a/htdocs/langs/de_CH/holiday.lang b/htdocs/langs/de_CH/holiday.lang
index a4cc4829690..b72e1e8e070 100644
--- a/htdocs/langs/de_CH/holiday.lang
+++ b/htdocs/langs/de_CH/holiday.lang
@@ -35,11 +35,13 @@ TitleDeleteCP=Ferienantrag löschen
 ConfirmDeleteCP=Wollen Sie diesen Ferienantrag wirklich löschen?
 ErrorCantDeleteCP=Fehler: Sie haben nicht die Berechtigung, diesen Ferienantrag zu löschen.
 CantCreateCP=Sie haben nicht die Berechtigung Ferien zu beantragen.
+InvalidValidatorCP=Sie müssen einen Vorgesetzten wählen, der Ihre Urlaubsanfrage genehmigt.
 NoDateDebut=Sie müssen ein Ferienbeginn Datum wählen.
 NoDateFin=Sie müssen ein Ferienende Datum wählen.
 ErrorDureeCP=Ihr Ferienantrag enthält keine Werktage.
 TitleValidCP=Ferienantrag genehmigen
 ConfirmValidCP=Möchten Sie diesen Ferienantrag wirklich genehmigen?
+DateValidCP=Datum genehmigt
 TitleToValidCP=Ferienantrag senden
 ConfirmToValidCP=Möchten Sie diesen Ferienantrag wirklich senden?
 TitleRefuseCP=Ferienantrag ablehnen
@@ -50,6 +52,7 @@ DateCancelCP=Datum der Absage
 DefineEventUserCP=Sonderferien für einen Anwender zuweisen
 addEventToUserCP=Ferien zuweisen
 NotTheAssignedApprover=Du bist nicht der zugewiesene Genehmiger.
+UserCP=Benutzer
 ErrorAddEventToUserCP=Ein Fehler ist beim Erstellen der Sonderferien aufgetreten.
 AddEventToUserOkCP=Das Hinzufügen der Sonderferien wurde abgeschlossen.
 LogCP=Protokoll über Aktualisierungen von verfügbaren Ferientagen
@@ -65,7 +68,6 @@ LastHolidays=Die neuesten %s Ferienanträge
 AllHolidays=Alle Ferienanträge
 HalfDay=Halbtag
 LEAVE_PAID=Bezahlte Ferien
-LEAVE_SICK=Krankheit
 LEAVE_OTHER=Andere Ferien
 LEAVE_PAID_FR=Bezahlte Ferien
 Module27130Name=Verwaltung der Ferienanträge
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index 9f45b4c957f..e0c8dd351c3 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -114,7 +114,7 @@ MinuteShort=min
 CurrencyRate=Wechselkurs
 UserAuthor=Erstellt von
 UserModif=Zuletzt geändert durch
-DefaultValues=Standartwerte
+DefaultValues=Standardwerte
 PriceCurrency=Währung
 UnitPriceHTCurrency=Nettopreis
 PriceUTTC=E.P. (inkl. Steuern)
@@ -191,7 +191,6 @@ ByUsers=Nach Benutzer
 NoneOrSeveral=Keine oder einige
 LateDesc=Wann ein Eintrag auf "verspätet" gesetzt wird, hängt von den Systemeinstellungen ab. Ein Administrator passt die im Menu "Warnungen" an.
 NoItemLate=Es gibt keine verspätete Artikel
-Login=Anmeldung
 LoginEmail=Benutzer Email - Adresse
 LoginOrEmail=Benutzername oder Email - Adresse
 EnterLoginDetail=Gib die Zugangsdaten ein
@@ -219,7 +218,7 @@ RecordsModified=Geänderte Einträge: %s
 RecordsDeleted=Gelöschte Einträge: %s
 RecordsGenerated=Erzeugte Einträge: %s
 CompleteOrNoMoreReceptionExpected=Vollständig oder keine Aktionen mehr erwartet
-YouCanChangeValuesForThisListFromDictionarySetup=Du kannst die Werte für diese Liste in Einstellungen -> Wörterbücher anpassen.
+YouCanChangeValuesForThisListFromDictionarySetup=Du kannst die Werte für diese Liste in Einstellungen -> Stammdaten anpassen.
 YouCanChangeValuesForThisListFrom=Du kannst die Werte für diese Liste im Menu %s einstellen.
 YouCanSetDefaultValueInModuleSetup=Der Standardwert für neue Einträge wird in den Einstellungen zu diesem Modul gesetzt.
 CurrentTheme=Aktuelle Oberfläche
@@ -297,6 +296,7 @@ ListOpenLeads=Offene Leads
 ListOpenProjects=Offene Projekte
 NewLeadOrProject=Neuer Lead / Neues Projekt
 LineNb=Position Nr.
+IncotermLabel=Lieferbedingungen
 TabLetteringCustomer=Kundenbezeichnung
 TabLetteringSupplier=Lieferantenbezeichnung
 ShortTuesday=D
diff --git a/htdocs/langs/de_CH/members.lang b/htdocs/langs/de_CH/members.lang
index 06f8e227a90..f1606b59016 100644
--- a/htdocs/langs/de_CH/members.lang
+++ b/htdocs/langs/de_CH/members.lang
@@ -1,9 +1,7 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=Mitgliederbereich
 MemberCard=Mitgliederkarte
 ShowMember=Mitgliederkarte anzeigen
 UserNotLinkedToMember=Benutzer nicht mit einem Mitglied verknüpft
-ThirdpartyNotLinkedToMember=Partner nicht mit einem Mitglied verknüpft
 FundationMembers=Gründungsmitglieder
 ListOfValidatedPublicMembers=Liste der verifizierten öffentlichen Mitglieder
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Ein anderes Mitglied (Name: <b>%s</b>, login: <b>%s</b>) ist schon mit Partner <b>%s</b> verknüpft. Entfernen Sie zuerst die Verknüpfung, da immer nur ein Mitglied zugewiesen sein kann (und umgekehrt).
@@ -23,9 +21,7 @@ MemberStatusDraft=Entwürfe (benötigen Bestätigung)
 MemberStatusDraftShort=Entwurf
 Subscriptions=Abonnemente
 ListOfSubscriptions=Liste der Abonnemente
-SendCardByMail=Karte per E-Mail senden
 NewMemberType=Neue Mitgliederart
-WelcomeEMail=Begrüssungsemail
 SubscriptionRequired=Abonnement notwendig
 VoteAllowed=Abstimmen erlaubt
 ShowSubscription=Abonnement anzeigen
@@ -37,4 +33,5 @@ MembersStatisticsByCountries=Mitgliederstatistik nach Land
 MembersStatisticsByState=Mitgliederstatistik nach Kanton
 MembersStatisticsByTown=Mitgliederstatistik nach Ort
 NoValidatedMemberYet=Keine verifizierten Mitglieder gefunden
+LatestSubscriptionDate=Enddatum des Abonnementes
 Public=Informationen sind öffentlich
diff --git a/htdocs/langs/de_CH/paybox.lang b/htdocs/langs/de_CH/paybox.lang
index 3cc650f9d09..5106ba52404 100644
--- a/htdocs/langs/de_CH/paybox.lang
+++ b/htdocs/langs/de_CH/paybox.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - paybox
 ThisIsInformationOnPayment=Informationen zu der vorzunehmenden Zahlunge
 YourPaymentHasBeenRecorded=Hiermit Bestätigen wir die Zahlung ausgeführt wurde. Vielen Dank.
-YourPaymentHasNotBeenRecorded=Die Zahlung wurde abgebrochen und nicht ausgeführt. Vielen Dank.
 PAYBOX_CGI_URL_V2=Url für das Paybox Zahlungsmodul "CGI Modul"
-PAYBOX_PAYONLINE_SENDEMAIL=Status-Email nach einer Zahlung (erfolgreich oder nicht)
+VendorName=Name des Anbieters
diff --git a/htdocs/langs/de_CH/printing.lang b/htdocs/langs/de_CH/printing.lang
index ae4aab23426..d8736396f5c 100644
--- a/htdocs/langs/de_CH/printing.lang
+++ b/htdocs/langs/de_CH/printing.lang
@@ -1,5 +1,27 @@
 # Dolibarr language file - Source file is en_US - printing
-NoDefaultPrinterDefined=Kein Standarddrucker defininert
+Module64000Desc=Direktdrucksystem aktivieren
+PrintingSetup=Direktdrucksystem einrichten
+MenuDirectPrinting=Direktdruck - Jobs
+PrintingDriverDesc=Konfigurationsvariablen für den Druckertreiber.
+FileWasSentToPrinter=Die Datei %s wurde an den Drucker gesendet
+ViaModule=über das Druckmodul
+NoActivePrintingModuleFound=Ich habe keinen Druckertreiber gefunden. Bitte kontrolliere die Einstellungen des Moduls %s.
+PleaseSelectaDriverfromList=Wähle einen Treiber aus der Liste.
+PleaseConfigureDriverfromList=Richte den gewählten Druckertreiber ein.
+PRINTGCP_INFO=Google OAuth Schnittstelle einrichten
+GCP_OwnerName=Besitzer
+GCP_connectionStatus=On- oder Offline?
+PRINTIPP_USER=Benutzer
+NoDefaultPrinterDefined=Du hast keinen Standarddrucker defininert.
+DefaultPrinter=Standarddrucker
+IPP_Uri=Drucker Uri
+IPP_State_reason=Statusgrund
+IPP_State_reason1=Statusgrund1
 IPP_BW=schwarz / weiss
+IPP_Media=Druckmedium
+DirectPrintingJobsDesc=Hier siehst du die laufenden Druckjobs aller verfügbaren Drucker.
+GoogleAuthConfigured=Die Google OAuth - Zugangsdaten sind im Modul OAuth eingetragen.
 PrintingDriverDescprintgcp=Konfigurationsvariablen für Google Cloud Print.
+PrintingDriverDescprintipp=Cups Driver - Konfigurationsvariablen
 PrintTestDescprintgcp=Druckerliste für Google Cloud Print
+PrintTestDescprintipp=Cups Druckerliste
diff --git a/htdocs/langs/de_CH/projects.lang b/htdocs/langs/de_CH/projects.lang
index 1bb2f136ce8..b05aed59c73 100644
--- a/htdocs/langs/de_CH/projects.lang
+++ b/htdocs/langs/de_CH/projects.lang
@@ -1,16 +1,25 @@
 # Dolibarr language file - Source file is en_US - projects
 ProjectsArea=Projektbereiche
 PrivateProject=Projekt Kontakte
+AllProjects=Alle Projekte
 TasksOnProjectsPublicDesc=Diese Ansicht zeigt alle Projektaufgaben, die Sie Lesenberechtigt sind.
 TasksOnProjectsDesc=Es werden alle Projekteaufgaben aller Projekte angezeigt (Ihre Berechtigungen berechtigen Sie alles zu sehen).
 OnlyOpenedProject=Nur offene Projekte sind sichtbar. (Projekte im Entwurf- oder Geschlossenstatus sind nicht sichtbar)
+NewProject=Neues Projekt
+OpenedProjects=Offene Projekte
+OpenedTasks=Offene Aufgaben
+ShowProject=Zeige Projekt
+SetProject=Projekt setzen
 TimeSpentByYou=Dein Zeitaufwand
+MyTimeSpent=Mein Zeitaufwand
+NewTask=Neue Aufgabe
 MyProjectsArea=Mein Projektbereich
 GoToListOfTimeConsumed=Zur Stundenaufwandsliste wechseln
 GoToListOfTasks=Zur Aufgabenliste gehen
 ChildOfProjectTask=Kindelement von Projekt/Aufgabe
 CloseAProject=Projekt schliessen
 ProjectsDedicatedToThisThirdParty=Mit diesem Geschäftspartner verknüpfte Projekte
+NoTasks=Keine Aufgaben für dieses Projekt
 LinkedToAnotherCompany=Mit Geschäftspartner verknüpft
 ThisWillAlsoRemoveTasks=Diese Aktion löscht ebenfalls alle Aufgaben zum Projekt (<b>%s</b> akutelle Aufgaben) und alle Zeitaufwände.
 CloneTaskFiles=Aufgabe (n) clonen beigetreten Dateien (falls Aufgabe (n) geklont)
diff --git a/htdocs/langs/de_CH/resource.lang b/htdocs/langs/de_CH/resource.lang
index 86fb40a308f..3c9bfd07bba 100644
--- a/htdocs/langs/de_CH/resource.lang
+++ b/htdocs/langs/de_CH/resource.lang
@@ -4,5 +4,4 @@ ResourceCard=Ressourcen-Karte
 ResourceFormLabel_ref=Name der Ressource
 ResourceType=Typ der Ressource
 ResourceFormLabel_description=Beschreibung
-IdResource=Ressourcen ID
 ResourceTypeCode=Ressourcentyp - Code
diff --git a/htdocs/langs/de_CH/stripe.lang b/htdocs/langs/de_CH/stripe.lang
deleted file mode 100644
index f4f450d3d92..00000000000
--- a/htdocs/langs/de_CH/stripe.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stripe
-STRIPE_PAYONLINE_SENDEMAIL=Status-Email nach einer Zahlung (erfolgreich oder nicht)
diff --git a/htdocs/langs/de_CH/suppliers.lang b/htdocs/langs/de_CH/suppliers.lang
index 9f0b145b834..b9d8e2e366c 100644
--- a/htdocs/langs/de_CH/suppliers.lang
+++ b/htdocs/langs/de_CH/suppliers.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Lieferanten
 ShowSupplierInvoice=Lieferantenrechnung anzeigen
 NewSupplier=Erzeuge Lieferant
 ListOfSuppliers=Lieferantenliste
@@ -8,8 +7,6 @@ BuyingPriceMinShort=Bester Einkaufspreis
 TotalBuyingPriceMinShort=Summe der Einkaufspreise der Unterprodukte
 TotalSellingPriceMinShort=Summe der Verkaufspreise der Unterprodukte
 SomeSubProductHaveNoPrices=Einige Unterprodukte haben keinen Preis hinterlegt.
-ChangeSupplierPrice=Einkaufspreis ändern
-SupplierPrices=Lieferantenpreise
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Diese Lieferanten - Referenz ist bereits mit dem Produkt %s verbunden.
 NoRecordedSuppliers=Es gibt dafür keinen Lieferanten
 SupplierPayment=Lieferantenzahlung
@@ -35,4 +32,3 @@ ReputationForThisProduct=Bewertung
 BuyerName=Einkäufer
 AllProductServicePrices=Alle Preise für Produkte und Dienstleisitungen
 AllProductReferencesOfSupplier=Alle dem Lieferanten zugewiesenen Produkte und Dienstleistungen
-BuyingPriceNumShort=Lieferantenpreise
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 2195ca499db..84ff07b49ae 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -21,8 +21,8 @@ ConfigAccountingExpert=Konfiguration des Experten-Buchhaltungsmoduls
 Journalization=Journalisieren
 Journaux=Journale
 JournalFinancial=Finanzjournale
-BackToChartofaccounts=Zurück zum  Kontenplan
-Chartofaccounts=Kontenplan
+BackToChartofaccounts=Zurück zur  Kontenplanvorlage
+Chartofaccounts=Kontenplanvorlagen
 CurrentDedicatedAccountingAccount=Aktuelles dediziertes Konto
 AssignDedicatedAccountingAccount=Neues Konto zuweisen
 InvoiceLabel=Rechnungsanschrift
@@ -30,7 +30,7 @@ OverviewOfAmountOfLinesNotBound=Übersicht über die Anzahl der nicht an ein Buc
 OverviewOfAmountOfLinesBound=Übersicht über die Anzahl der bereits an ein Buchhaltungskonto zugeordneten Zeilen
 OtherInfo=Zusatzinformationen
 DeleteCptCategory=Buchhaltungskonto aus Gruppe entfernen
-ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
+ConfirmDeleteCptCategory=Soll dieses Buchhaltungskonto wirklich aus der Gruppe entfernt werden?
 JournalizationInLedgerStatus=Status der Journalisierung
 AlreadyInGeneralLedger=Schon ins Hauptbuch übernommen
 NotYetInGeneralLedger=Noch nicht ins Hauptbuch übernommen
@@ -42,13 +42,13 @@ CountriesInEEC=EU-Länder
 CountriesNotInEEC=Nicht-EU Länder
 CountriesInEECExceptMe=EU-Länder außer %s
 CountriesExceptMe=Alle Länder außer %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Buchhaltungsdokumente exportieren
 
 MainAccountForCustomersNotDefined=Standardkonto für Kunden im Setup nicht definiert
 MainAccountForSuppliersNotDefined=Standardkonto für Lieferanten die nicht im Setup definiert sind
 MainAccountForUsersNotDefined=Standardkonto für Benutzer ist im Setup nicht definiert
 MainAccountForVatPaymentNotDefined=Standardkonto für MWSt Zahlungen ist im Setup nicht definiert
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Standardkonto für wiederkehrende Zahlungen ist im Setup nicht definiert
 
 AccountancyArea=Bereich Buchhaltung
 AccountancyAreaDescIntro=Die Verwendung des Buchhaltungsmoduls erfolgt in mehreren Schritten:
@@ -78,13 +78,13 @@ AccountancyAreaDescAnalyze=SCHRITT %s: Vorhandene Transaktionen hinzufügen oder
 
 AccountancyAreaDescClosePeriod=SCHRITT %s: Schließen Sie die Periode, damit wir in Zukunft keine Veränderungen vornehmen können.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Eine erofrderliche Einrichtung wurde nicht abgeschlossen. (Kontierungsinformationen fehlen bei einigen Finanzkonten)
-Selectchartofaccounts=Kontenplan wählen
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Eine erforderliche Einrichtung wurde nicht abgeschlossen. (Kontierungsinformationen fehlen bei einigen Bankkonten)
+Selectchartofaccounts=Aktiven Kontenplan wählen
 ChangeAndLoad=Ändere und Lade
 Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu
 AccountAccounting=Buchhaltungskonto
 AccountAccountingShort=Konto
-SubledgerAccount=Subledger account
+SubledgerAccount=Nebenbuchkonto
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Buchhaltungskonten anzeigen
 ShowAccountingJournal=Buchhaltungsjournal anzeigen
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Spesenabrechnung Zuordnung
 CreateMvts=Neue Transaktion erstellen
 UpdateMvts=Änderung einer Transaktion
 ValidTransaction=Transaktion bestätigen
-WriteBookKeeping=Buchungen ins Hauptbuch übernehmen
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Hauptbuch
 AccountBalance=Saldo Sachkonto
 ObjectsRef=Quellreferenz
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Buchhaltungskonto standardmäßig für die gekauften Produkte (wenn nicht im Produktblatt definiert)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Buchhaltungskonto für die verkauften Produkte (wenn nicht anders im Produktblatt definiert)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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=Standard-Buchhaltungskonto für die gekauften Leistungen (wenn nicht anders im Produktblatt definiert)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Buchhaltungskonto für die verkauften Leistungen (wenn nicht anders im Produktblatt definiert)
 
@@ -177,6 +177,7 @@ LabelAccount=Konto-Beschriftung
 LabelOperation=Bezeichnung der Operation
 Sens=Zweck
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Teilenummer
@@ -192,7 +193,7 @@ NotMatch=undefiniert
 DeleteMvt=Zeilen im Hauptbuch löschen
 DelYear=Jahr zu entfernen
 DelJournal=Journal zu entfernen
-ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criterion is required.
+ConfirmDeleteMvt=Es werden alle Zeilen des Hauptbuchs für das gewählte Jahr und/oder des gewählten Journals gelöscht. Mindestens eine Auswahl ist notwendig.
 ConfirmDeleteMvtPartial=Die Buchung wird aus dem Hauptbuch gelöscht (Alle Einträge aus dieser Buchung werden gelöscht)
 FinanceJournal=Finanzjournal
 ExpenseReportsJournal=Spesenabrechnungsjournal
@@ -288,8 +289,10 @@ 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=Konfigurierbarer CSV Export
-Modelcsv_FEC=Export FEC (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Kontenplan ID
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=Diese Seite kann verwendet werden, um ein Standardkonto festz
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=Optionen
 OptionModeProductSell=Modus Verkauf
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Modus Einkäufe
 OptionModeProductSellDesc=Alle Artikel mit Sachkonten für Vertrieb anzeigen
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Alle Artikel mit Sachkonten für Einkauf anzeigen
 CleanFixHistory=Nicht existierenden Buchhaltungskonten von Positionen entfernen, die im Kontenplan nicht vorkommen.
 CleanHistory=Aller Zuordungen für das selektierte Jahr zurücksetzen
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 33363d6f947..7a82b0301c9 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -9,7 +9,7 @@ VersionExperimental=Experimentell
 VersionDevelopment=Entwicklung
 VersionUnknown=Unbekannt
 VersionRecommanded=Empfohlen
-FileCheck=Datei-Integritätsprüfungen
+FileCheck=Dateigruppen Integritätsprüfungen
 FileCheckDesc=Dieses Tool ermöglicht es Ihnen, die  Datei-Integrität und das Setup der Anwendung zu überprüfen, indem jede Datei mit der offiziellen Version verglichen wird. Der Wert einiger Setup-Konstanten kann ebenso überprüft werden. Sie können dieses Tool verwenden, um festzustellen, ob Dateien verändert wurden (z.B. durch einen Hacker). 
 FileIntegrityIsStrictlyConformedWithReference=Datei-Integrität entspricht genau der Referenz.
 FileIntegrityIsOkButFilesWereAdded=Die Dateiintegritätsprüfung wurde bestanden, jedoch wurden einige neue Dateien hinzugefügt.
@@ -19,7 +19,7 @@ MakeIntegrityAnalysisFrom=Quelle der Signaturdatei für die Prüfung auswählen
 LocalSignature=Eingebettete lokale Signatur-Datei (weniger zuverlässig)
 RemoteSignature=Signatur-Datei von Dolibarr-Server (zuverlässiger)
 FilesMissing=Fehlende Dateien
-FilesUpdated=Dateien ersetzt
+FilesUpdated=erneuerte Dateien
 FilesModified=Geänderte Dateien
 FilesAdded=Hinzugefügte Dateien
 FileCheckDolibarr=Überprüfen Sie die Integrität von Anwendungsdateien
@@ -37,24 +37,24 @@ UnlockNewSessions=Sperrung neuer Sitzungen aufheben
 YourSession=Ihre Sitzung
 Sessions=Benutzersitzungen
 WebUserGroup=WebServer Benutzer/Gruppen
-NoSessionFound=Ihre PHP -Konfiguration scheint keine Auflistung aktiver Sitzungen zuzulassen. Eventuell ist die Speicherung im Verzeichnis (<b>%s</b>) durch fehlende Berechtigungen blockiert (z.B. Betriebssystemberechtigungen oder open_basedir-Beschränkungen). 
+NoSessionFound=Ihre PHP -Konfiguration scheint keine Auflistung aktiver Sitzungen zuzulassen. Eventuell ist die Speicherung im Verzeichnis (<b>%s</b>) durch fehlende Berechtigungen blockiert (zum Beispiel: Betriebssystemberechtigungen oder open_basedir-Beschränkungen). 
 DBStoringCharset=Zeichensatz der Datenbank-Speicherung
-DBSortingCharset=Zeichensatz der Datenbank-Sortierung
+DBSortingCharset=Datenbank-Zeichensatz zum Sortieren von Daten
 ClientCharset=Client-Zeichensatz
 ClientSortingCharset=Client Sortierreihenfolge
 WarningModuleNotActive=Modul <b>%s</b> muss aktiviert sein
 WarningOnlyPermissionOfActivatedModules=Achtung, hier werden nur Berechtigungen im Zusammenhang mit aktivierten Module angezeigt. Weitere Module können Sie unter Start->Einstellungen-Module aktivieren.
-DolibarrSetup=dolibarr Installation oder Upgrade
+DolibarrSetup=Dolibarr Installation oder Upgrade
 InternalUser=Interner Benutzer
 ExternalUser=Externer Benutzer
 InternalUsers=Interne Benutzer
 ExternalUsers=Externe Benutzer
 GUISetup=Benutzeroberfläche
 SetupArea=Einstellungen
-UploadNewTemplate=Neue Vorlage(n) hochladen
+UploadNewTemplate=Neue Druckvorlage(n) hochladen
 FormToTestFileUploadForm=Formular für das Testen von Datei-Uploads
 IfModuleEnabled=Anmerkung: Ist nur wirksam wenn Modul <b>%s</b> aktiviert ist
-RemoveLock=Entfernen oder umbennen Sie die Datei <b>%s</b>, falls vorhanden, um die Benutzung des Installations-/Update-Tools zu erlauben.
+RemoveLock=Sie müssen die Datei <b>%s</b>  entfernen oder umbennen, falls vorhanden, um die Benutzung des Installations-/Update-Tools zu erlauben.
 RestoreLock=Stellen Sie die Datei <b>%s</b> mit ausschließlicher Leseberechtigung wieder her, um die Benutzung des Installations-/Update-Tools zu deaktivieren.
 SecuritySetup=Sicherheitseinstellungen
 SecurityFilesDesc=Sicherheitseinstellungen für Dateiupload festlegen
@@ -64,24 +64,26 @@ ErrorDecimalLargerThanAreForbidden=Fehler: Eine höhere Genauigkeit als <b>%s</b
 DictionarySetup=Stammdaten
 Dictionary=Stammdaten
 ErrorReservedTypeSystemSystemAuto=Die Werte 'system' und 'systemauto' für Typ sind reserviert. Sie können 'user' als Wert verwenden, um Ihren eigenen Datensatz hinzuzufügen
-ErrorCodeCantContainZero=Fehler, Code darf keinen Wert 0 enthalten
+ErrorCodeCantContainZero=Fehler:  Code darf keinen Wert 0 enthalten
 DisableJavascript=JavaScript- und Ajax-Funktionen deaktivieren
-DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=Hinweis: Zu Test- oder Debug-Zwecken. Zur Optimierung für Blinde oder Textbrowser können Sie das Setup auch für das Benutzer verwenden
 UseSearchToSelectCompanyTooltip=Wenn Sie eine große Anzahl von Partnern (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante COMPANY_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 UseSearchToSelectContactTooltip=Wenn Sie eine große Anzahl von Kontakten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante CONTACT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
-DelaiedFullListToSelectCompany=Warte auf Tastendruck, bevor der Inhalt der Partner-Combo-Liste geladen wird (Dies kann die Leistung verbessern, wenn Sie eine große Anzahl von Partnern haben).
-DelaiedFullListToSelectContact=Warte auf Tastendruck, bevor der Inhalt der Partner-Combo-Liste geladen wird (Dies kann die Leistung verbessern, wenn Sie eine große Anzahl von Partnern haben).
-NumberOfKeyToSearch=Anzahl der Buchstaben um eine Suche auszulösen: %s
+DelaiedFullListToSelectCompany=Warte auf Tastendruck, bevor der Inhalt der Partner-Combo-Liste geladen wird <br> Dies kann die Leistung verbessern, wenn Sie eine große Zahl von Partnern haben.
+DelaiedFullListToSelectContact=Warte auf Tastendruck, bevor der Inhalt der Kontakt-Combo-Liste geladen wird <br> Dies kann die Leistung verbessern, wenn Sie eine große Zahl von Kontakte haben).
+NumberOfKeyToSearch=Zahl der Zeichen, die die Suche auslösen sollen: %s
+NumberOfBytes=Anzahl an Bytes
+SearchString=Suchbegriff
 NotAvailableWhenAjaxDisabled=Nicht verfügbar, wenn Ajax deaktiviert
 AllowToSelectProjectFromOtherCompany=Bei den Elementen eines Partners, ist es möglich Projekte von anderen Partnern zu verlinken
 JavascriptDisabled=JavaScript deaktiviert
-UsePreviewTabs=Vorschautabs verwenden
+UsePreviewTabs=Vorschau-Tabs verwenden
 ShowPreview=Vorschau anzeigen
 PreviewNotAvailable=Vorschau nicht verfügbar
 ThemeCurrentlyActive=derzeit aktivierte grafische Oberfläche
 CurrentTimeZone=Aktuelle Zeitzone des PHP-Servers
-MySQLTimeZone=Aktuelle Zeitzone von MySql (Datenbank)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+MySQLTimeZone=Aktuelle Zeitzone der SQL-Datenbank
+TZHasNoEffect=Daten werden vom Datenbank-Server gespeichert und zurückgeliefert, als würde der eingegebene String abgelegt werden. Die Zeitzone hat nur dann eine Auswirkung, wenn die UNIX_TIMESTAMP-Funktion benutzt wird (Dolibarr nutzt diese nicht, daher sollte die Datenbank-TZ keine Rolle spielen, selbst wenn diese nach Dateneingabe geändert wird).
 Space=Platz
 Table=Tabelle
 Fields=Felder
@@ -90,7 +92,7 @@ Mask=Maske
 NextValue=Nächster Wert
 NextValueForInvoices=Nächster Wert (Rechnungen)
 NextValueForCreditNotes=Nächster Wert (Gutschriften)
-NextValueForDeposit=Nächster Wert (Anzahlung)
+NextValueForDeposit=nächster Wert  (Anzahlung)
 NextValueForReplacements=Nächster Wert (Ersatz)
 MustBeLowerThanPHPLimit=Hinweis: <b>Ihre</b> PHP-Einstellungen beschränken die Größe für Dateiuploads auf <b>%s</b>%s ungeachtet dieser Einstellung
 NoMaxSizeByPHPLimit=Hinweis: In Ihren PHP-Einstellungen sind keine Größenbeschränkungen hinterlegt
@@ -123,38 +125,38 @@ LocalisationDolibarrParameters=Länderspezifische Parameter
 ClientTZ=Zeitzone Kunde (Benutzer)
 ClientHour=Uhrzeit (Benutzer)
 OSTZ=Zeitzone des Serverbetriebssystems
-PHPTZ=Zeitzone der PHP-Version
+PHPTZ=Zeitzone des PHP-Server
 DaylingSavingTime=Sommerzeit (Benutzer)
 CurrentHour=PHP-Zeit (Server)
 CurrentSessionTimeOut=Aktuelles Session-Timeout
 YouCanEditPHPTZ=Um eine andere PHP Zeitzone einzustellen (optional), ist es auch möglich eine Zeile, bspw. "SetEnv TZ Europe/Paris", in der Datei .htaccess hinzuzufügen.
 HoursOnThisPageAreOnServerTZ=Warnung: Im Gegensatz zu anderen Darstellungen, sind Stunden auf dieser Seite nicht in Ihrer lokalen Zeitzone, sondern in der Zeitzone des Servers.
-Box=Box
-Boxes=Boxen
-MaxNbOfLinesForBoxes=Max. Zeilenanzahl in Widgets.
-AllWidgetsWereEnabled=Alle verfügbaren Widgets sind aktiviert
+Box=Box (Widget)
+Boxes=Boxen (Widgets)
+MaxNbOfLinesForBoxes=Max. Zeilenanzahl in Boxen/Widgets.
+AllWidgetsWereEnabled=Alle verfügbaren Boxen (Widgets) sind aktiviert.
 PositionByDefault=Standardposition
 Position=Position
 MenusDesc=In der Menüverwaltung können Sie den Inhalt der beiden Menüleisten (Oben und Links) festlegen
 MenusEditorDesc=Mit dem Menü-Editor können Sie benutzerdefinierte Menüeinträge erstellen. Seihen Sie vorsichtig, um Instabilität und dauerhaft unerreichbare Menüeinträge zu vermeiden. <br> Einige Module fügen Menüeinträge hinzu (meistens im Menü <b> Alle </b>). Wenn Sie einen dieser Einträge versehentlich entfernen, können Sie ihn wiederherstellen, indem Sie das Modul deaktivieren und erneut aktivieren.
 MenuForUsers=Benutzermenü
-LangFile=Datei .lang
-Language_en_US_es_MX_etc=Sprache (de_DE, en_GB, es_MX, ...)
+LangFile=Sprachdatei  .lang
+Language_en_US_es_MX_etc=Sprache  (de_DE, de_AT, de_CH, en_GB,  ...)
 System=System
 SystemInfo=Systeminformationen
 SystemToolsArea=Systemwerkzeugsübersicht
-SystemToolsAreaDesc=In diesem Bereich finden Sie die Verwaltungsfunktionen. Verwenden Sie das Menü zur Auswahl der gesuchten Funktion.
-Purge=Säubern
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
+SystemToolsAreaDesc=In diesem Bereich finden Sie die Verwaltungsfunktionen. Verwenden Sie das Menü zur Auswahl der gesuchten Funktion. 
+Purge=Bereinigen
+PurgeAreaDesc=Auf dieser Seite können Sie alle von Dolibarr erzeugten oder gespeicherten Dateien (temporäre Dateien oder alle Dateien im Verzeichnis <b>%s</b> ) löschen. Die Verwendung dieser Funktion ist in der Regel nicht erforderlich. Es wird als Workaround für Benutzer bereitgestellt, deren Dolibarr von einem Anbieter gehostet wird, der keine Berechtigungen zum löschen von Dateien anbietet, die vom Webserver erzeugt wurden.
 PurgeDeleteLogFile=Löschen der Protokolldateien, einschließlich <b>%s</b>, die für das Syslog-Modul definiert wurden (kein Risiko Daten zu verlieren)
-PurgeDeleteTemporaryFiles=Löschen der Temporärdateien (Kein Risiko von Datenverlust)
+PurgeDeleteTemporaryFiles=Löschen aller temporären Dateien  (kein Datenverlust möglich)
 PurgeDeleteTemporaryFilesShort=temporäre Dateien löschen
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeDeleteAllFilesInDocumentsDir=Alle Dateien im Verzeichnis: <b>%s</b> löschen: <br>Dadurch werden alle erzeugten Dokumente löschen, die sich auf verknüpfte (Dritte, Rechnungen usw....), Dateien, die in das ECM Modul hochgeladen wurden, Datenbank, Backup, Dumps und temporäre Dateien beziehen.
 PurgeRunNow=Jetzt bereinigen
 PurgeNothingToDelete=Keine zu löschenden Verzeichnisse oder Dateien
 PurgeNDirectoriesDeleted=<b>%s</b> Datei(en) oder Verzeichnis(se) gelöscht.
 PurgeNDirectoriesFailed=<b>%s</b> Datei(en) oder Verzeichnis(se) konnte(n) nicht gelöscht werden.
-PurgeAuditEvents=Bereinige alle Sicherheitsereignisse
+PurgeAuditEvents=lösche alle Sicherheitsereignisse
 ConfirmPurgeAuditEvents=Möchten Sie wirklich alle Sicherheitsereignisse löschen ?
 GenerateBackup=Sicherung erzeugen
 Backup=Sichern
@@ -162,7 +164,7 @@ Restore=Wiederherstellen
 RunCommandSummary=Die Sicherung wird über folgenden Befehl ausgeführt
 BackupResult=Sicherung Ergebnisse
 BackupFileSuccessfullyCreated=Sicherungsdatei erfolgreich erzeugt
-YouCanDownloadBackupFile=Die erzeugte Datei kann jetzt heruntergeladen werden
+YouCanDownloadBackupFile=Die erstellte Sicherungsdatei kann jetzt heruntergeladen werden.
 NoBackupFileAvailable=Keine Sicherungsdatei verfügbar
 ExportMethod=Export Methode
 ImportMethod=Import Methode
@@ -181,8 +183,8 @@ PostgreSqlExportParameters= PostgreSQL Export-Parameter
 UseTransactionnalMode=Transaktionsmodus verwenden
 FullPathToMysqldumpCommand=Vollständiger Pfad zum mysqldump-Befehl
 FullPathToPostgreSQLdumpCommand=Vollständiger Pfad zum pg_dump-Befehl
-AddDropDatabase=DROP DATABASE Befehl hinzufügen
-AddDropTable=DROP TABLE Befehl hinzufügen
+AddDropDatabase=Befehl "DROP DATABASE" hinzufügen
+AddDropTable=Befehl "DROP TABLE" hinzufügen
 ExportStructure=Struktur
 NameColumn=Name der Spalten
 ExtendedInsert=Erweiterte INSERTS
@@ -193,29 +195,29 @@ IgnoreDuplicateRecords=Doppelte Zeilen Fehler ignorieren (INSERT IGNORE)
 AutoDetectLang=Automatische Erkennung (Browser-Sprache)
 FeatureDisabledInDemo=Funktion in der Demoversion deaktiviert
 FeatureAvailableOnlyOnStable=Diese Funktion steht nur in offiziellen stabilen Versionen zur Verfügung
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
+BoxesDesc=Boxen sind Komponenten, die einige Informationen anzeigen, die Sie hinzufügen können, um einige Seiten zu personalisieren. Sie können wählen, ob Sie die Box anzeigen möchten oder nicht, indem Sie die Zielseite auswählen und auf 'Aktivieren' klicken oder indem Sie auf den Papierkorb klicken, um es zu deaktivieren.
 OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt.
 ModulesDesc=Die Module / Anwendungen bestimmen, welche Funktionen in Dolibarr verfügbar sind. Für einige Module müssen den Benutzern nach der Aktivierung des Moduls Berechtigungen erteilt werden. Klicken Sie auf die Schaltfläche Ein / Aus (am Ende der Modulzeile), um ein Modul / eine Anwendung zu aktivieren / deaktivieren.
 ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Web-Sites...
-ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
+ModulesDeployDesc=DateiWenn es die Berechtigungen in Ihrem Dateisystem zulassen, können Sie mit diesem Tool ein externes Modul bereitstellen. Das Modul ist dann auf der Registerkarte <strong>%s</strong> sichtbar. 
 ModulesMarketPlaces=Zusatzmodule / Erweiterungen
-ModulesDevelopYourModule=Eigene App/Modul entwickeln
-ModulesDevelopDesc=Sie können ihre eigenen Module programmieren oder einen Partner finden der die Module für sie programmiert
-DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
+ModulesDevelopYourModule=Eigene Anwendungen / Module entwickeln
+ModulesDevelopDesc=Sie können ihr eiges Modul programmieren oder einen Partner finden, der es für Sie programmiert.
+DOLISTOREdescriptionLong=Anstatt die Website <a href="https://www.dolistore.com">www.dolistore.com einzuschalten</a> , um ein externes Modul zu finden, können Sie dieses eingebettete Tool verwenden, das die Suche auf dem externen Marktplatz für Sie durchführt (möglicherweise langsam, benötigen Sie einen Internetzugang) ...
 NewModule=Neu
 FreeModule=Frei
-CompatibleUpTo=Kompatibel mit Version %s
-NotCompatible=Dieses Modul scheint nicht mit Ihrere Dolibarr Version %skompatibel zu sein. (Min %s - Max %s).
-CompatibleAfterUpdate=Dieses Modul benötigt ein Upgrade Ihrere Dolibarr Installation %s ( Min %s - Max %s).
-SeeInMarkerPlace=Siehe Marktplatz
+CompatibleUpTo=Kompatibel mit Version  %s
+NotCompatible=Dieses Modul scheint nicht mit ihrer Dolibarr Version %s kompatibel zu sein. (Min %s - Max %s).
+CompatibleAfterUpdate=Dieses Modul benötigt ein Upgrade ihrer Dolibarr Installation %s  (Min %s - Max %s).
+SeeInMarkerPlace=siehe Marktplatz
 Updated=Aktualisiert
 Nouveauté=Neuheit
 AchatTelechargement=Kaufen / Herunterladen
-GoModuleSetupArea=Um ein neues Modul zu installieren/verteilen, gehen Sie auf die Modul-Setup Seite <a href="%s">%s</a>.
+GoModuleSetupArea=Um ein neues Modul zu installieren/verteilen, gehen Sie in den Modul-Setup Bereich <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, der offizielle Marktplatz für dolibarr Module/Erweiterungen
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module.
+DoliPartnersDesc=Liste der Unternehmen, die speziell entwickelte Module oder Funktionen bereitstellen. <br> Hinweis: Da Dolibarr eine Open Source-Anwendung ist, kann <i>jeder, der</i> Erfahrung mit PHP-Programmierung hat, ein Modul entwickeln.
 WebSiteDesc=Externe Webseiten mit zusätzlichen Add-on (nicht zum Grundumfang gehörend) Modulen ...
-DevelopYourModuleDesc=Lösungen um eigene Module zu entwickeln...
+DevelopYourModuleDesc=einige Lösungen um eigene Module zu entwickeln ...
 URL=Link
 BoxesAvailable=Verfügbare Boxen
 BoxesActivated=Boxen aktiviert
@@ -232,13 +234,13 @@ MainDbPasswordFileConfEncrypted=Datenbankpasswort in der Konfigurationsdatei con
 InstrucToEncodePass=Um das Kennwort in der Konfigurationsdatei <b>conf.php</b> verschlüsselt zu speichern, ersetzen Sie die Zeile <br><b>$dolibarr_main_db_pass="...";</b><br>durch<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Um das Kennwort unverschlüsselt (im Klartext) in der Konfigurationsdatei <b>conf.php</b> zu speichern, ersetzen Sie die Zeile<br><b>$dolibarr_main_db_pass="crypted:...";</b><br>durch<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=PDF-Dokumentenschutz aktivieren (Die Aktivierung wird nicht empfohlen, weil dadurch die Stapelerzeugung von PDFs nicht mehr funktioniert)
-ProtectAndEncryptPdfFilesDesc=Die Aktivierung des PDF-Dokumentschutzes erhält die Lesbarkeit und Druckfähigkeit des Dokuments, Bearbeitung und Kopien sind jedoch nicht mehr möglich. Bitte beachten Sie, dass nach Aktivierung dieser Funktion auch die Stapelverarbeitung von PDF-Dokumenten (z.B. alle offenen Rechnungen zusammenführen) nicht mehr funktioniert.
+ProtectAndEncryptPdfFilesDesc=Die Aktivierung des PDF-Dokumentschutzes erhält die Lesbarkeit und Druckfähigkeit des Dokuments, Bearbeitung und Kopien sind jedoch nicht mehr möglich. Bitte beachten Sie, dass nach Aktivierung dieser Funktion auch die Stapelverarbeitung von PDF-Dokumenten, z.B. alle offenen Rechnungen zusammenführen, nicht mehr funktioniert.
 Feature=Funktion
 DolibarrLicense=Lizenz
 Developpers=Entwickler / Mitwirkende
 OfficialWebSite=Offizielle Dolibarr Website
-OfficialWebSiteLocal=Lokale Webseite (%s)
-OfficialWiki=Dolibarr Dokumentation/Wiki
+OfficialWebSiteLocal=lokale Website (%s)
+OfficialWiki=Dolibarr Dokumentation / Wiki
 OfficialDemo=Offizielle Dolibarr-Demos
 OfficialMarketPlace=Offizieller Marktplatz für Module / Erweiterungen
 OfficialWebHostingService=Offizielle Hosting-Services (Cloud Hosting und SaaS)
@@ -252,96 +254,96 @@ HelpCenterDesc1=In diesem Bereich finden Sie eine Übersicht an verfügbaren Que
 HelpCenterDesc2=Einige dieser Angebote sind nur in <b>Englisch</b> verfügbar. 
 CurrentMenuHandler=Aktuelle Menü-Handler
 MeasuringUnit=Maßeinheit
-LeftMargin=Linker Rand
-TopMargin=Oberer Rand
+LeftMargin=linker Rand
+TopMargin=oberer Rand
 PaperSize=Papiersorte
-Orientation=Orientierung
-SpaceX=Leerraum X
-SpaceY=Leerraum Y
+Orientation=Ausrichtung
+SpaceX=Ausdehnung  X
+SpaceY=Ausdehnung  Y
 FontSize=Schriftgröße
 Content=Inhalt
 NoticePeriod=Einreichefrist
 NewByMonth=Neu nach Monat
 Emails=E-Mail
 EMailsSetup=E-Mail Einstellungen
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
-EmailSenderProfiles=Absenderprofil
+EMailsDesc=Auf dieser Seite können Sie Ihre Standardparameter für den e-Mail-Versand überschreiben. In den meisten Fällen ist das PHP-Setup unter Unix/Linux-Betriebssystem korrekt und diese Parameter sind unnötig.
+EmailSenderProfiles=E-Mail Absenderprofil
 MAIN_MAIL_SMTP_PORT=SMTP(S)-Port (Standardwert Ihrer php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP(S)-Server (Standardwert Ihrer php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS-Port (nicht in PHP definiert in Unix-Umgebungen)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-Host (nicht in PHP definiert auf Unix-Umgebungen)
-MAIN_MAIL_EMAIL_FROM=Absender Email für automatische Emails (Standardwert in php.ini: <b>%s</b>)
+MAIN_MAIL_EMAIL_FROM=Absender e-Mail für automatische Emails (Standardwert in php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Standard-E-Mail-Adresse für Fehlerrückmeldungen (beispielsweise unzustellbare E-Mails)
 MAIN_MAIL_AUTOCOPY_TO= Blindkopie (Bcc) aller gesendeten Emails an
 MAIN_DISABLE_ALL_MAILS=Alle E-Mail-Funktionen deaktivieren (für Test- oder Demonstrationszwecke)
 MAIN_MAIL_FORCE_SENDTO=Sende alle E-Mails an den folgenden anstatt an die tatsächlichen Empfänger (für Testzwecke)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Füge Mitarbeiter mit E-Mail-Adresse der Liste der zugelassenen Empfänger hinzu
-MAIN_MAIL_SENDMODE=Sendemethode für Emails
+MAIN_MAIL_SENDMODE=e-Mail Sendemethode
 MAIN_MAIL_SMTPS_ID=SMTP-Benutzer (falls der Server eine Authentifizierung benötigt)
 MAIN_MAIL_SMTPS_PW=SMTP-Passwort (falls der Server eine Authentifizierung benötigt) 
 MAIN_MAIL_EMAIL_TLS=TLS (SSL) Verschlüsselung verwenden
-MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS)-Verschlüsselung verwenden
-MAIN_MAIL_EMAIL_DKIM_ENABLED=Verwende DKIM um die Email Signatur zu erstellen
-MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain für die Verwendung mit DKIM
-MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
-MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Privater Schlüssel für die DKIM Signatur
-MAIN_DISABLE_ALL_SMS=Alle SMS-Funktionen abschalten (für Test- oder Demozwecke)
-MAIN_SMS_SENDMODE=Methode zum Senden von SMS
-MAIN_MAIL_SMS_FROM=Standard Versendetelefonnummer der SMS-Funktion
-MAIN_MAIL_DEFAULT_FROMTYPE=Standard Absender-E-Mail für manuelle Sendungen (Benutzer- oder Firmen-E-Mail)
-UserEmail=Email des Benutzers
-CompanyEmail=Email der Firma
+MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) Verschlüsselung verwenden
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Verwende DKIM um die e-Mail Signatur zu erstellen
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=e-Mail Domain für die Verwendung mit DKIM
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name des DKIM-Selektors
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Privater Schlüssel für die DKIM-Signatur
+MAIN_DISABLE_ALL_SMS=alle SMS-Funktionen abschalten  (für Test- oder Demozwecke)
+MAIN_SMS_SENDMODE=Methode zum Versenden von SMS
+MAIN_MAIL_SMS_FROM=Standard Versandrufnummer der SMS-Funktion
+MAIN_MAIL_DEFAULT_FROMTYPE=Standard Absender e-Mail für manuelle Sendungen (Benutzer e-Mail oder Unternehmen e-Mail)
+UserEmail=E-Mail des Benutzers
+CompanyEmail=Unternehmens-E-Mail 
 FeatureNotAvailableOnLinux=Diese Funktion ist auf Unix-Umgebungen nicht verfügbar. Testen Sie Ihr Programm sendmail lokal.
-SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslation=Wenn die Übersetzung für diese Sprache nicht vollständig ist oder Sie Fehler finden, können Sie dies korrigieren, indem Sie Dateien im Verzeichnis <b>langs/%s</b> bearbeiten und Ihre Änderung an www.transifex.com/dolibarr-association/dolibarr/ senden.
 SubmitTranslationENUS=Sollte die Übersetzung für eine Sprache nicht vollständig sein oder Fehler beinhalten, können Sie die entsprechenden Sprachdateien im Verzeichnis <b>langs/%s</b> bearbeiten und anschließend Ihre Änderungen mit der Entwicklergemeinschaft auf www.dolibarr.org teilen.
 ModuleSetup=Moduleinstellung
 ModulesSetup=Modul-/Applikationseinstellung
 ModuleFamilyBase=System
-ModuleFamilyCrm=Kunden-Beziehungs-Management (CRM)
-ModuleFamilySrm=Verkäufermanagement (VRM)
-ModuleFamilyProducts=Produktverwaltung (WW)
-ModuleFamilyHr=Personalverwaltung (PM)
+ModuleFamilyCrm=Kundenbeziehungsmanagement (CRM)
+ModuleFamilySrm=Lieferantenmanagement  (VRM - Vendor Relationship Management)
+ModuleFamilyProducts=Produktmanagement  (WW/PM)
+ModuleFamilyHr=Personalmanagement  (PM/HR)
 ModuleFamilyProjects=Projektverwaltung / Zusammenarbeit
 ModuleFamilyOther=Andere
 ModuleFamilyTechnic=Multi-Module Werkzeuge
 ModuleFamilyExperimental=Experimentelle Module
 ModuleFamilyFinancial=Finanzmodule (Rechnungswesen/Finanzen)
-ModuleFamilyECM=Inhaltsverwaltung (ECM)
+ModuleFamilyECM=Dokumenten-Verwaltung (ECM)
 ModuleFamilyPortal=Websites und weitere Frontend-Anwendung
 ModuleFamilyInterface=Schnittstellen zu externen Systemen
 MenuHandlers=Menü-Handler
 MenuAdmin=Menü-Editor
-DoNotUseInProduction=Nicht in Produktion nutzen
+DoNotUseInProduction=Nicht im Realbetrieb nutzen
 ThisIsProcessToFollow=Aktualisierungsablauf:
-ThisIsAlternativeProcessToFollow=Dies ist ein alternativer Setup-Prozess:
+ThisIsAlternativeProcessToFollow=Dies ist ein alternativer manueller Setup-Prozess:
 StepNb=Schritt %s
 FindPackageFromWebSite=Finden Sie ein Paket, das die gewünschten Funktionen beinhaltet (zum Beispiel auf der offiziellen Website %s).
-DownloadPackageFromWebSite=Installationspaket herunterladen (z.B. von offizieller Webseite %s).
-UnpackPackageInDolibarrRoot=Entpacken des Pakets in den Stammordner der Systeminstallation <b>%s</b>
-UnpackPackageInModulesRoot=Um eine externes Modul bereit zu stellen, entpacken Sie die gepackten Dateien in das Serververzeichnis für Module: <br><b>%s</b>
-SetupIsReadyForUse=Modul-Installation abgeschlossen, es muss aber noch aktiviert und konfiguriert werden: <a href="%s">%s</a>.
+DownloadPackageFromWebSite=Installationspaket herunterladen (zum Beispiel, von der offiziellen Webseite %s).
+UnpackPackageInDolibarrRoot=Entpacken des Pakets in das Verzeichnis der Systeminstallation <b>%s</b>
+UnpackPackageInModulesRoot=Um eine externes Modul bereit zu stellen, entpacken Sie die gepackten Dateien in das Verzeichnis für Module: <br><b>%s</b>
+SetupIsReadyForUse=Modul Installation abgeschlossen, das Modul muss aber noch aktiviert und konfiguriert werden: <a href="%s">%s</a>.
 NotExistsDirect=Das alternative Stammverzeichnis ist nicht zu einem existierenden Verzeichnis definiert.<br>
 InfDirAlt=Seit Version 3 ist es möglich, ein alternatives Stammverzeichnis anzugeben. Dies ermöglicht, Erweiterungen und eigene Templates am gleichen Ort zu speichern.<br>Erstellen Sie einfach ein Verzeichis im Hauptverzeichnis von Dolibarr an (z.B. "custom").<br>
 InfDirExample=<br>Danach in der Datei <strong>conf.php</strong> deklarieren<br> $dolibarr_main_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Wenn diese Zeilen mit "#" auskommentiert sind, um sie zu aktivieren, einfach das Zeichen "#" entfernen.
-YouCanSubmitFile=Alternativ kann eine Module-Paket-ZIP-Datei hochgeladen werden:
+YouCanSubmitFile=Hier kann ein Modul als .zip Datei hochgeladen werden:
 CurrentVersion=Aktuelle dolibarr-Version
 CallUpdatePage=Zur Aktualisierung der Daten und Datenbankstrukturen zur Seite %s gehen.
 LastStableVersion=Letzte stabile Version
 LastActivationDate=Datum der letzten Aktivierung
 LastActivationAuthor=Benutzer der letzten Aktivierung
 LastActivationIP=IP der letzten Aktivierung
-UpdateServerOffline=Update-Server offline
+UpdateServerOffline=Update-Server offline  (nicht erreichbar)
 WithCounter=Zähler verwenden
 GenericMaskCodes=Sie können ein beliebiges Numerierungsschema wählen. Dieses Schema könnte z.B. so aussehen:<br><b>{000000}</b> steht für eine 6-stellige Nummer, die sich bei jedem neuen %s automatisch erhöht. Wählen Sie die Anzahl der Nullen je nach gewünschter Nummernlänge. Der Zähler füllt sich automatisch bis zum linken Ende mit Nullen um das gewünschte Format abzubilden. <br><b>{000000+000}</b> führt zu einem ähnlichen Ergebnis, allerdings mit einem Wertsprung in Höhe des Werts rechts des Pluszeichens, der beim ersten %s angewandt wird. <br><b>{000000@x}</b> wie zuvor, jedoch stellt sich der Zähler bei Erreichen des Monats x (zwischen 1 und 12) automatisch auf 0 zurück. Ist diese Option gewählt und x hat den Wert 2 oder höher, ist die Folge {mm}{yy} or {mm}{yyyy} ebenfalls erforderlich. <br><b>{dd}</b> Tag (01 bis 31).<br><b>{mm}</b> Monat (01 bis 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> Jahreszahl 1-, 2- oder 4-stellig. <br>
-GenericMaskCodes2=<b>{cccc}</b> der Kunden-Code mit n Zeichen<br><b>{cccc000}</b> der Kunden-Code mit n Zeichen, gefolgt von dem den zu dem Kunden zugeordneten Partner ID. Dieser Zähler wird gleichzeitig mit dem Globalen Zähler zurückgesetzt.<br><b>{tttt}</b> Die Partner ID mit n Zeichen (siehe unter Einstellungen->Stammdaten->Arten von Partnern). Wenn diese Option aktiv ist, wird für jede Partnerart ein separater Zähler geführt.<br>
-GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben. <br> Leerzeichen sind nicht zulässig. <br>
-GenericMaskCodes4a=<u>Beispiel auf der 99. %s des Partners DieFirma, mit Datum 2007-01-31:</u> <br>
-GenericMaskCodes4b=<u>Beispiel für Partner erstellt am 2007-03-01:</u> <br>
-GenericMaskCodes4c=<u>Beispiel für ein Produkt erstellt am 2007-03-01:</u> <br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> ergibt <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> ergibt <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> ergibt <b>IN0701-0099-A</b> falls die Partnerart 'Responsable Inscripto' ist und der Typcode 'A_RI'  ist
+GenericMaskCodes2=<b>{cccc}</b> der Kunden-Code mit n Zeichen <br> <b>{cccc000} Nach</b> dem Client-Code mit n Zeichen folgt ein Zähler, der für den Kunden <b>reserviert</b> ist. Dieser dem Kunden gewidmete Zähler wird gleichzeitig mit dem globalen Zähler zurückgesetzt. <br> <b>{tttt}</b> Der Code eines Drittanbieters setzt sich aus n Zeichen zusammen (siehe Menü Home - Setup - Dictionary - Typen von Drittanbietern). Wenn Sie dieses Tag hinzufügen, ist der Zähler für jeden Typ von Drittanbietern unterschiedlich. <br>
+GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben erhalten. <br> \nLeerzeichen sind nicht zulässig. <br>
+GenericMaskCodes4a=<u>Beispiel auf der 99. %s des Drittanbieters DieFirma, mit Datum 2007-01-31:</u> <br> 
+GenericMaskCodes4b=<u>Beispiel für Partner erstellt am 2018-10-27:</u> <br>
+GenericMaskCodes4c=<u>Beispiel für ein Produkt erstellt am 2018-10-27:</u> <br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{0000000000}</b> ergibt <b>ABC0701-000099</b><br><b>{000000+100@1}-ZZZZ/{dd}/XXX</b> ergibt <b>0199-ZZZ/31/XXX</b><br><b>IN{yyy}{mm}-{000000}-{t}</b> ergibt <b>IN0701-0099-A</b>, wenn das Unternehmen als Typ 'Verantwortliches Inscripto' mit Code für den Typ ist, der 'A_RI' ist. 
 GenericNumRefModelDesc=Liefert eine anpassbare Nummer nach vordefiniertem Schema
 ServerAvailableOnIPOrPort=Der Server ist unter der Adresse <b>%s</b> auf Port <b>%s</b> verfügbar.
-ServerNotAvailableOnIPOrPort=Server nicht verfügbar unter Adresse <b>%s</b> auf Port <b>%s</b>
+ServerNotAvailableOnIPOrPort=Server nicht erreichbar unter Adresse <b>%s</b> auf Port <b>%s</b>
 DoTestServerAvailability=Serververfügbarkeit testen
 DoTestSend=Test-E-Mail senden
 DoTestSendHTML=HTML-Test senden
@@ -354,46 +356,46 @@ UseACacheDelay= Verzögerung für den Export der Cache-Antwort in Sekunden (0 od
 DisableLinkToHelpCenter=Link mit "<b>Benötigen Sie Hilfe oder Unterstützung</b>" auf der Anmeldeseite ausblenden
 DisableLinkToHelp=Link zur Online-Hilfe "<b>%s</b>" ausblenden
 AddCRIfTooLong=Bitte beachten Sie, dass kein automatischer Zeilenumbruch erfolgt und zu langer Text nicht angezeigt wird. Falls benötigt fügen Sie Zeilenumbrüche bitte manuell ein.
-ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
+ConfirmPurge=Sind Sie sicher, dass Sie diese Bereinigung durchführen möchten?<br> dadurch werden alle Ihre Datendateien dauerhaft gelöscht, ohne dass Sie sie wiederherstellen können (ECM-Dateien, angehängte Dateien....).
 MinLength=Mindestlänge
 LanguageFilesCachedIntoShmopSharedMemory=.lang-Sprachdateien in gemeinsamen Cache geladen
 LanguageFile=Sprachdatei
 ExamplesWithCurrentSetup=Beispiele mit der aktuellen Systemkonfiguration
 ListOfDirectories=Liste der OpenDocument-Vorlagenverzeichnisse
-ListOfDirectoriesForModelGenODT=Liste der Verzeichnisse mit Vorlagendateien mit OpenDocument-Format.<br><br>Fügen Sie hier den vollständigen Pfad der Verzeichnisse ein.<br>Trennen Sie jedes Verzeichnis mit einer Zeilenschaltung<br>Verzeichnisse des ECM-Moduls fügen Sie z.B. so ein <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Dateien in diesen Verzeichnissen müssen mit <b>.odt</b>  oder <b>.ods</b> enden.
+ListOfDirectoriesForModelGenODT=Liste der Verzeichnisse mit Vorlagendateien im OpenDocument-Format.<br><br>Fügen Sie hier den vollständigen Pfad der Verzeichnisse ein.<br>Trennen Sie jedes Verzeichnis mit einem Zeilenumbruch.<br>Verzeichnisse des ECM-Moduls fügen Sie z.B. so ein <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Dateien in diesen Verzeichnissen müssen mit <b>.odt</b>  oder <b>.ods</b> enden.
 NumberOfModelFilesFound=Anzahl der in diesen Verzeichnissen gefundenen .odt/.ods-Dokumentvorlagen
 ExampleOfDirectoriesForModelGen=Beispiele für Syntax:<br>c:\\mydir<br>/Home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Lesen Sie die Wiki Dokumentation um zu wissen, wie Sie Ihre odt Dokumentenvorlage erstellen, bevor Sie diese in den Kategorien speichern:
-FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Reihenfolge von Vor- und Nachname
 DescWeather=Die folgenden Symbole werden auf der Startseite angezeigt, wenn die entsprechenden Toleranzwerte erreicht werden:
 KeyForWebServicesAccess=Schlüssel um Web Services (Parameter "dolibarrkey" in webservices) zu benützen
 TestSubmitForm=Formular Eingabeüberprüfung
-ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
+ThisForceAlsoTheme=Wenn Sie dieses Menü verwenden, verwendet der Manager auch ein eigenes Design, unabhängig von der Wahl des Benutzer. Auch dieser auf Smartphones spezialisierte Menü-Manager funktioniert nicht auf allen Smartphones. Verwenden Sie einen anderen Menü-Manager, wenn Sie Probleme mit Ihrem haben.
 ThemeDir=Verzeichnis Layout-Vorlagen
-ConnectionTimeout=Verbindung Timeout
-ResponseTimeout=Antwort Timeout
+ConnectionTimeout=Verbindung Zeitüberschreitung (Timeout)
+ResponseTimeout=Zeitüberschreitung für Antwort (Timeout)
 SmsTestMessage=Test Nachricht von __PHONEFROM__ zu __PHONETO__
-ModuleMustBeEnabledFirst=Modul <b>%s</b> muss aktiviert sein wenn Sie dieses Feature benötigen.
+ModuleMustBeEnabledFirst=Modul <b>%s</b> muss aktiviert sein, wenn Sie dieses Feature benötigen.
 SecurityToken=Schlüssel um die URLs zu entschlüsseln
-NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+NoSmsEngine=Kein SMS-Sendermanager verfügbar. Ein SMS-Sendermanager ist nicht mit der Standardverteilung installiert, da er von einem externen Anbieter abhängig ist, können Sie einige davon finden unter %s
 PDF=PDF
 PDFDesc=Globale Einstellungen für die PDF-Erzeugung
 PDFAddressForging=Zusätzliche Felder im Adressfeld
 HideAnyVATInformationOnPDF=Alle Informationen zu Steuern und MWSt. im generierten PDF ausblenden
 PDFRulesForSalesTax=Regeln für Umsatzsteuer / MwSt.
 PDFLocaltax=Regeln für %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Steuersatz%s in der Spalte Steuerverkauf ausblenden
 HideDescOnPDF=Verstecke Produktbeschreibung
-HideRefOnPDF=Produkt-Nr. nicht anzeigen
-HideDetailsOnPDF=Verstecke Produktdetail-Zeilen
+HideRefOnPDF=Artikelnummer nicht anzeigen
+HideDetailsOnPDF=Verstecke Produkt-Zeilen Details
 PlaceCustomerAddressToIsoLocation=Benutze Standardposition in Frankreich (La Posteà für Position der Kundenadresse
 Library=Bibliothek
 UrlGenerationParameters=Parameter zum Sichern von URLs
 SecurityTokenIsUnique=Verwenden Sie einen eindeutigen Sicherheitsschlüssel für jede URL
 EnterRefToBuildUrl=Geben Sie eine Referenz für das Objekt %s ein
 GetSecuredUrl=Holen der berechneten URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Ausblenden von Schaltflächen für Nicht-Administrator für nicht autorisierte Aktionen, anstatt grau unterlegte deaktivierte Schaltflächen anzuzeigen.
 OldVATRates=Alter Umsatzsteuer-Satz
 NewVATRates=Neuer Umsatzsteuer-Satz
 PriceBaseTypeToChange=Ändern Sie den Basispreis definierte nach
@@ -419,16 +421,16 @@ ExtrafieldCheckBox=Kontrollkästchen / Dropdownliste (mehrere Option auswählbar
 ExtrafieldCheckBoxFromList=Kontrollkästchen / Dropdownliste aus DB-Tabelle (mehrere Option auswählbar)
 ExtrafieldLink=Verknüpftes Objekt
 ComputedFormula=Berechnetes Feld
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
-ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ComputedFormulaDesc=Sie können hier eine Formel eingeben, indem Sie andere Eigenschaften des Objekts oder eine beliebige PHP-Codierung verwenden, um einen dynamisch berechneten Wert zu erhalten. Sie können alle PHP-kompatiblen Formeln verwenden, einschließlich des &quot;?&quot; Bedingungsoperator und folgendes globales Objekt: <strong>$ db, $ conf, $ langs, $ mysoc, $ user, $ object</strong> . <br> <strong>WARNUNG</strong> : Möglicherweise sind nur einige Eigenschaften von $ object verfügbar. Wenn Sie Eigenschaften benötigen, die nicht geladen sind, holen Sie sich das Objekt wie im zweiten Beispiel in Ihre Formel. <br> Wenn Sie ein berechnetes Feld verwenden, können Sie keinen Wert von der Schnittstelle eingeben. Wenn ein Syntaxfehler vorliegt, gibt die Formel möglicherweise auch nichts zurück. <br><br> Beispiel der Formel: <br> $ object-&gt; id &lt;10? round ($ object-&gt; id / 2, 2): ($ object-&gt; id + 2 * $ user-&gt; id) * (int) substr ($ mysoc-&gt; zip, 1, 2) <br><br> Beispiel zum erneuten Laden eines Objekts <br> (($ reloadedobj = new Societe ($ db)) &amp;&amp; ($ reloadedobj-&gt; fetch ($ obj-&gt; id? $ obj-&gt; id: ($ obj-&gt; rowid? $ obj-&gt; rowid: $ object-&gt; id ))&gt; 0))? $ reloadedobj-&gt; array_options [&#39;options_extrafieldkey&#39;] * $ reloadedobj-&gt; capital / 5: &#39;-1&#39; <br><br> Ein weiteres Beispiel für eine Formel zum Erzwingen des Ladens eines Objekts und seines übergeordneten Objekts: <br> (($ reloadedobj = neue Aufgabe ($ db)) &amp;&amp; ($ reloadedobj-&gt; Abrufen ($ object-&gt; id)&gt; 0) &amp;&amp; ($ secondloadedobj = neues Projekt ($ db)) &amp;&amp; ($ secondloadedobj-&gt; Abrufen ($ reloadedobj-&gt; fk_project)&gt; 0))? $ secondloadedobj-&gt; ref: &#39;Übergeordnetes Projekt nicht gefunden&#39;
+ExtrafieldParamHelpPassword=Wenn Sie dieses Feld leer lassen, wird dieser Wert unverschlüsselt gespeichert (das Feld darf nur mit einem Stern auf dem Bildschirm ausgeblendet werden). <br> Stellen Sie 'auto'; ein, um die Standardverschlüsselungsregel zum Speichern des Kennworts in der Datenbank zu verwenden (dann ist der gelesene Wert nur der Hash, keine Möglichkeit, den ursprünglichen Wert abzurufen).
+ExtrafieldParamHelpselect=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht &#39;0&#39; sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> Code3, Wert3 <br> ... <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> 1, value1 | options_ <i>parent_list_code</i> : parent_key <br> 2, value2 | options_ <i>parent_list_code</i> : parent_key <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> 1, value1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
+ExtrafieldParamHelpcheckbox=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht &#39;0&#39; sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpradio=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht &#39;0&#39; sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpsellist=Die Liste der Werte stammt aus einer Tabelle <br> Syntax: table_name: label_field: id_field :: filter <br> Beispiel: c_typent: libelle: id :: filter <br><br> - idfilter ist notwendigerweise ein primärer int-Schlüssel <br> - Filter kann ein einfacher Test sein (z. B. aktiv = 1), um nur den aktiven Wert anzuzeigen <br> Sie können $ ID $ auch in Filtern verwenden, bei denen es sich um die aktuelle ID des aktuellen Objekts handelt <br> Verwenden Sie $ SEL $, um ein SELECT im Filter durchzuführen <br> Wenn Sie nach Extrafeldern filtern möchten, verwenden Sie die Syntax extra.fieldcode = ... (wobei field code der Code des Extrafelds ist) <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Bibliothek zum Erstellen von PDF-Dateien
-LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Einige Länder erheben möglicherweise zwei oder drei Steuern auf jede Rechnungsposition. Wenn dies der Fall ist, wählen Sie den Typ für die zweite und dritte Steuer und ihren Steuersatz. Mögliche Typen sind: <br> 1: auf Produkte und Dienstleistungen ohne Mehrwertsteuer wird eine örtliche Steuer erhoben (die örtliche Steuer wird auf den Betrag ohne Mehrwertsteuer berechnet) <br> 2: Für Produkte und Dienstleistungen einschließlich Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag + die Hauptsteuer berechnet). <br> 3: auf Produkte ohne Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag ohne Mehrwertsteuer berechnet) <br> 4: Für Produkte einschließlich Mehrwertsteuer wird eine lokale Steuer erhoben (die Mehrwertsteuer wird auf den Betrag + die Haupt-Mehrwertsteuer berechnet). <br> 5: auf Dienstleistungen ohne Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag ohne Mehrwertsteuer berechnet) <br> 6: Für Dienstleistungen einschließlich Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag und die Steuer berechnet).
 SMS=SMS
 LinkToTestClickToDial=Geben Sie die anzurufende Telefonnr ein, um einen Link zu zeigen, mit dem die ClickToDial-URL für den Benutzer <strong>%s</strong> getestet werden kann
 RefreshPhoneLink=Aktualisierungslink
@@ -438,39 +440,40 @@ DefaultLink=Standardlink
 SetAsDefault=Als Standard setzen
 ValueOverwrittenByUserSetup=Achtung, dieser Wert kann durch den Benutzer überschrieben werden (jeder kann seine eigene ClickToDial-URL setzen)
 ExternalModule=Externes Modul - im Verzeichnis %s installiert
-BarcodeInitForthird-parties=Alle Strichcodes für Drittanbieter initialisieren
+BarcodeInitForthird-parties=alle Barcodes für Geschäftspartner initialisieren
 BarcodeInitForProductsOrServices=Alle Barcodes für Produkte oder Services initialisieren oder zurücksetzen
 CurrentlyNWithoutBarCode=Zur Zeit gibt es <strong>%s</strong> Datensätze in <strong>%s</strong> %s ohne Barcode.
 InitEmptyBarCode=Startwert für die nächsten %s leeren Datensätze
-EraseAllCurrentBarCode=Alle aktuellen Barcode-Werte löschen
-ConfirmEraseAllCurrentBarCode=Wirklich alle aktuellen Barcode-Werte löschen
-AllBarcodeReset=Alle Barcode-Werte wurden entfernt
+EraseAllCurrentBarCode=alle aktuellen Barcode-Werte löschen
+ConfirmEraseAllCurrentBarCode=Möchten Sie wirklich alle aktuellen Barcode-Werte löschen?
+AllBarcodeReset=alle Barcode-Werte wurden entfernt
 NoBarcodeNumberingTemplateDefined=Im Barcode-Modul wurde kein Numerierungs-Schema aktiviert.
 EnableFileCache=Dateicache aktivieren
 ShowDetailsInPDFPageFoot=Weitere Details in der PDF-Fußzeile anzeigen (bspw. Firmenadresse / Name des CEOs)
 NoDetails=Keine weiteren Details in der Fußzeile
 DisplayCompanyInfo=Firmenadresse anzeigen
-DisplayCompanyManagers=Anzeige Namen der Geschäftsführung
+DisplayCompanyManagers=Namen der Geschäftsführung anzeigen
 DisplayCompanyInfoAndManagers=Firmenanschrift und Managernamen anzeigen
 EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
-ModuleCompanyCodeCustomerAquarium=%sgefolgt vom Kundenpartnercode für eine Kundenkontonummer
+ModuleCompanyCodeCustomerAquarium=%s gefolgt von Kundennummer für eine Kundenkontonummer
 ModuleCompanyCodeSupplierAquarium=%s gefolgt vom Lieferantenpartnercode für eine Lieferantenkontonummer
-ModuleCompanyCodePanicum=Leeren Kontierungscode zurückgeben.
+ModuleCompanyCodePanicum=leeren Kontierungscode zurückgeben
 ModuleCompanyCodeDigitaria=Accounting code depends on third-party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third-party code.
 Use3StepsApproval=Standardmäßig, Einkaufsaufträge müssen durch zwei unterschiedlichen Benutzer erstellt und freigegeben werden (ein Schritt/Benutzer zu erstellen und ein Schritt/Benutzer für die Freigabe). Beachten Sie wenn ein Benutzer beide Rechte hat - zum erstellen und freigeben, dann reicht ein Benutzer für diesen Vorgang. Optional können Sie ein zusätzlicher Schritt/User für die Freigabe einrichten, wenn der Betrag einen bestimmten dedizierten Wert übersteigt (wenn der Betrag übersteigt wird, werden 3 Stufen notwendig: 1=Validierung, 2=erste Freigabe und 3=Gegenfreigabe.<br>Lassen Sie den Feld leer wenn eine Freigabe (2 Schritte) ausreicht; Tragen Sie einen sehr niedrigen Wert (0.1) wenn eine zweite Freigabe notwendig ist.
 UseDoubleApproval=3-Fach Verarbeitungsschritte verwenden wenn der Betrag (ohne Steuer) höher ist als ...
 WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
-WarningPHPMail2=Falls Ihm E-Mailprovider den Zugriff für den Emailclient auf eine IP Adresse einschränken muss (Sehr selten), dann ist dies die IP Adresse für ihr ERP CRM System: <strong>%s</strong>.
+WarningPHPMail2=Wenn Ihr E-Mail-SMTP-Anbieter den E-Mail-Client auf einige IP-Adressen beschränken muss (sehr selten), dann ist dies die IP-Adresse des Mail User Agent (MUA) für ihr Dolibarr-System: <strong>%s</strong>.
 ClickToShowDescription=Klicke um die Beschreibung zu sehen
-DependsOn=Diese Modul benötigt die folgenden Module
-RequiredBy=Diese Modul wird durch folgende Module verwendet
-TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+DependsOn=Diese Modul benötigt folgenden Module
+RequiredBy=Diese Modul ist für folgende Module notwendig
+TheKeyIsTheNameOfHtmlField=Das ist der Name des HTML Feldes. \nSie benötigen HTML Kenntnisse, um den Namen des Feldes aus der HTML Seite zu ermitteln.
+PageUrlForDefaultValues=Sie müssen den relativen Pfad der Seiten-URL eingeben. \nWenn Sie Parameter in der URL einschließen, werden die Standardwerte wirksam, wenn alle Parameter auf denselben Wert festgelegt sind.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-EnableDefaultValues=Enable customization of default values
-EnableOverwriteTranslation=Enable usage of overwritten translation
-GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
+EnableDefaultValues=Anpassung der Standardwerte ermöglichen
+EnableOverwriteTranslation=Verwendung der eigenen Übersetzung aktivieren
+GoIntoTranslationMenuToChangeThis=Für den Schlüssel mit diesem Code wurde eine Übersetzung gefunden. Um diesen Wert zu ändern, müssen Sie ihn in der Home-Setup-Übersetzung bearbeiten.
 WarningSettingSortOrder=Warnung: Änderung an der Standardsortierreihenfolge können zu Fehlern führen, falls das betreffende Feld nicht vohanden ist. Falls dies passiert, entfernen sie das betreffende Feld oder stellen die den Defaultwert wieder her.
 Field=Feld
 ProductDocumentTemplates=Dokumentvorlage(n)
@@ -479,23 +482,23 @@ WatermarkOnDraftExpenseReports=Wasserzeichen auf Ausgabenbelegentwurf (leerlasse
 AttachMainDocByDefault=Setzen Sie diesen Wert auf 1, wenn Sie das Hauptdokument standardmäßig per E-Mail anhängen möchten (falls zutreffend).
 FilesAttachedToEmail=Datei hinzufügen
 SendEmailsReminders=Erinnerung per E-Mail versenden
-davDescription=Einen WebDAV-Server einrichten
-DAVSetup=DAV Modul einrichten
-DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
-DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
-DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
+davDescription=einen WebDAV-Server einrichten
+DAVSetup=DAV-Modul einrichten
+DAV_ALLOW_PRIVATE_DIR=Aktivieren Sie das generische private Verzeichnis (WebDAV dediziertes Verzeichnis namens "private" - Anmeldung erforderlich).
+DAV_ALLOW_PRIVATE_DIRTooltip=Das generische private Verzeichnis ist ein WebDAV-Verzeichnis, auf das jeder mit seiner Anwendung login/pass zugreifen kann.
+DAV_ALLOW_PUBLIC_DIR=Aktivieren Sie das allgemeine öffentliche Verzeichnis \n(WebDAV-dediziertes Verzeichnis mit dem Namen &quot;public&quot; - keine Anmeldung erforderlich).
 DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
-DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
+DAV_ALLOW_ECM_DIR=Aktivieren Sie das private DMS / ECM-Verzeichnis \n(Stammverzeichnis des DMS / ECM-Moduls - Anmeldung erforderlich)
 DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
 # Modules
 Module0Name=Benutzer & Gruppen
 Module0Desc=Benutzer / Mitarbeiter und Gruppen Administration
-Module1Name=Partner
+Module1Name=Geschäftspartner
 Module1Desc=Partner- und Kontakteverwaltung (Kunden, Interessenten, ...)
 Module2Name=Vertrieb
 Module2Desc=Vertriebsverwaltung
-Module10Name=Accounting (simplified)
-Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module10Name=Buchhaltung (vereinfacht)
+Module10Desc=Berichte für die einfache Buchhaltung (Zeitschriften, Umsatz) auf Basis der Datenbank. Es wird keine Ledger-Tabelle verwendet.
 Module20Name=Angebote
 Module20Desc=Angebotsverwaltung
 Module22Name=E-Mail-Kampagnen
@@ -503,31 +506,31 @@ Module22Desc=E-Mail-Kampagnen-Verwaltung
 Module23Name=Energie
 Module23Desc=Überwachung des Energieverbrauchs
 Module25Name=Verkaufsaufträge
-Module25Desc=Sales order management
+Module25Desc=Auftrag- und Verkaufsverwaltung
 Module30Name=Rechnungen
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
-Module40Name=Lieferanten
-Module40Desc=Vendors and purchase management (purchase orders and billing)
+Module30Desc=Verwaltung von Rechnungen und Gutschriften für Kunden. Verwaltung von Rechnungen und Gutschriften für Lieferanten
+Module40Name=Lieferanten/Hersteller
+Module40Desc=Lieferanten- und Einkaufsmanagement (Bestellungen und Fakturierung)
 Module42Name=Debug Logs
 Module42Desc=Protokollierungsdienste (Syslog). Diese Logs dienen der Fehlersuche/Analyse.
 Module49Name=Bearbeiter
 Module49Desc=Editorverwaltung
 Module50Name=Produkte
-Module50Desc=Management of Products
+Module50Desc=Produktverwaltung
 Module51Name=Postwurfsendungen
 Module51Desc=Verwaltung von Postwurf-/Massensendungen
-Module52Name=Produktbestände
-Module52Desc=Stock management (for products only)
+Module52Name=Produkt-/Warenbestände
+Module52Desc=Lagerverwaltung (nur für Produkte)
 Module53Name=Leistungen
-Module53Desc=Management of Services
-Module54Name=Verträge/Abonnements
-Module54Desc=Management of contracts (services or recurring subscriptions)
+Module53Desc=Management von Dienstleistungen
+Module54Name=Verträge / Abonnements
+Module54Desc=Verwaltung von Verträgen (Dienstleistungen oder wiederkehrende Abonnements)
 Module55Name=Barcodes
 Module55Desc=Barcode-Verwaltung
 Module56Name=Telefonie
 Module56Desc=Telefonie-Integration
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module57Name=Lastschrifteinzug
+Module57Desc=Verwaltung von Lastschriftzahlungsaufträgen. Es beinhaltet die Erstellung einer SEPA-Datei für europäische Länder.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial-Integration
 Module59Name=Bookmark4u
@@ -537,13 +540,13 @@ Module70Desc=Serviceverwaltung
 Module75Name=Spesen- und Reiseaufzeichnungen
 Module75Desc=Reise- und Fahrtspesenverwaltung
 Module80Name=Lieferungen
-Module80Desc=Shipments and delivery note management
+Module80Desc=Versand- und Lieferscheinverwaltung
 Module85Name=Banken | Kassen
 Module85Desc=Verwaltung von Bank- oder Bargeldkonten
 Module100Name=Externe Website
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module100Desc=Fügen Sie einen Link zu einer externen Website als Hauptmenüpunkt hinzu. Die Website wird in einem Rahmen unter dem oberen Menü angezeigt.
 Module105Name=Mailman und SPIP
-Module105Desc=Mailman oder SPIP Schnittstelle für die Mitgliedsmodul
+Module105Desc=Mailman oder SPIP Schnittstelle für Mitglieder-Modul
 Module200Name=LDAP
 Module200Desc=LDAP-Verzeichnissynchronisation
 Module210Name=PostNuke
@@ -551,49 +554,49 @@ Module210Desc=PostNuke-Integration
 Module240Name=Daten Exporte
 Module240Desc=Datenexport-Werkzeug (mit einem Assistenten)
 Module250Name=Daten Importe
-Module250Desc=Tool to import data into Dolibarr (with assistants)
+Module250Desc=Tool zum Importieren von Daten in Dolibarr (mit Assistenten)
 Module310Name=Mitglieder
 Module310Desc=Mitgiederverwaltung für Stiftungen und Vereine
 Module320Name=RSS Feed
-Module320Desc=Add a RSS feed to Dolibarr pages
+Module320Desc=Einen RSS-Feed zu den Dolibarr-Seiten hinzufügen
 Module330Name=Lesezeichen
-Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
+Module330Desc=Erstellen Sie Verknüpfungen zu den internen oder externen Seiten, auf die Sie häufig zugreifen, und zwar immer zugänglich.
 Module400Name=Projekt- und Aufgabenverwaltung
 Module400Desc=Verwaltung von Projekten und Aufgaben mit der Möglichkeit projektrelevante Dokumente (Rechnungen, Bestellungen, Angebote usw.) innerhalb eines Projekts zu verknüpfen und damit die Übersicht zu behalten. Mit diesem Modul lassen sich zudem Gantt-Diagramme erstellen.
 Module410Name=Webkalender
 Module410Desc=Webkalenderintegration
-Module500Name=Taxes & Special Expenses
+Module500Name=Steuern & Sonderausgaben
 Module500Desc=Verwalten von weiteren Ausgaben (Steuern, Sozialabgaben, Dividenden, ...)
 Module510Name=Löhne
-Module510Desc=Record and track employee payments
-Module520Name=Kredite
+Module510Desc=Erfassen und Verfolgen von Mitarbeiterzahlungen
+Module520Name=Kredite / Darlehen
 Module520Desc=Verwaltung von Darlehen
 Module600Name=Benachrichtigungen
-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=Produkt Varianten
+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
 Module610Desc=Erlaubt das Erstellen von Produktvarianten, basierend auf Merkmalen (Farbe, Grösse, ...)
 Module700Name=Spenden
 Module700Desc=Spendenverwaltung
-Module770Name=Expense Reports
-Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
+Module770Name=Spesenabrechnungen
+Module770Desc=Verwaltung von Spesenabrechnungen (Transport, Essen,....)
+Module1120Name=Geschäftsvorschläge von Anbietern
 Module1120Desc=Anfordern von Lieferanten-Angeboten und Preise
 Module1200Name=Mantis
 Module1200Desc=Mantis-Integration
 Module1520Name=Dokumente erstellen
-Module1520Desc=Mass email document generation
+Module1520Desc=Generierung von Massen-e-Mail-Dokumenten
 Module1780Name=Kategorien
 Module1780Desc=Kategorien erstellen (Produkte, Kunden, Lieferanten, Kontakte oder Mitglieder)
 Module2000Name=FCKeditor
 Module2000Desc=Erweiterter Editor für Textfelder (basierend auf dem CKEditor)
 Module2200Name=Dynamische Preise
-Module2200Desc=Use maths expressions for auto-generation of prices
+Module2200Desc=Verwenden Sie mathematische Ausdrücke für die automatische Generierung von Preisen.
 Module2300Name=Geplante Aufträge
 Module2300Desc=Verwaltung geplanter Aufgaben (Cron oder chrono Tabelle)
-Module2400Name=Ereignisse/Termine
-Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
-Module2500Name=DMS / CMS
+Module2400Name=Ereignisse / Termine
+Module2400Desc=Ereignisse verfolgen. Protokollieren Sie automatische Ereignisse zu Verfolgungszwecken oder zeichnen Sie manuelle Ereignisse oder Besprechungen auf. Dies ist ein wichtiges Modul für ein gutes Kunden- oder Lieferantenbeziehungsmanagement.
+Module2500Name=DMS / ECM
 Module2500Desc=Speicherung und Verteilung von Dokumenten. Automatische organisation der generierten oder gespeicherten Dokumente. Teilen Sie sie bei Bedarf.
 Module2600Name=API/Webservice (SOAP Server)
 Module2600Desc=Aktivieren Sie Dolibarr SOAP Server,  unterstütztes API-Service.
@@ -602,7 +605,7 @@ Module2610Desc=Aktiviere der Dolibarr REST Serverdienst
 Module2660Name=WebServices aufrufen (SOAP Client)
 Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
 Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2700Desc=Verwenden Sie den Online-Dienst 'Gravatar' (www.gravatar.com) für die Anzeige von Benutzer- und Mitgliederbildern (Zuordnung über E-Mail-Adressen). Hierfür benötigen Sie eine aktive Internetverbindung. 
 Module2800Desc=FTP-Client
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind Konvertierung
@@ -623,16 +626,16 @@ Module39000Desc=Verwaltung von Chargen- und Seriennummern sowie von Haltbarkeits
 Module40000Name=Mehrere Währungen
 Module40000Desc=Use alternative currencies in prices and documents
 Module50000Name=PayBox
-Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
-Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale module SimplePOS (simple POS).
-Module50150Name=POS TakePOS
+Module50000Desc=Bieten Sie Ihren Kunden Onlinezahlungen via PayBox an (Kredit- / Debitkarten). Dies kann verwendet werden, um Ihren Kunden Ad-hoc-Zahlungen oder Zahlungen in Bezug auf ein bestimmtes Dolibarr-Objekt (Rechnung, Bestellung usw.) zu ermöglichen.
+Module50100Name=einfaches POS-Kassensystem
+Module50100Desc=einfaches POS Kassenmodul (Simple POS)
+Module50150Name=Kassensystem  TakePOS
 Module50150Desc=Point of Sale module TakePOS (touchscreen POS).
-Module50200Name=Paypal
-Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50200Name=PayPal
+Module50200Desc=Bieten Sie Kunden eine PayPal-Online-Zahlungsseite (PayPal-Konto oder Kredit- / Debitkarten). Dies kann verwendet werden, um Ihren Kunden Ad-hoc-Zahlungen oder Zahlungen in Bezug auf ein bestimmtes Dolibarr-Objekt (Rechnung, Bestellung usw.) zu ermöglichen.
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
-Module50400Name=Accounting (double entry)
+Module50400Name=Buchhaltung (erweitert) 
 Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
@@ -643,9 +646,9 @@ Module59000Desc=Modul zur Verwaltung von Gewinnspannen
 Module60000Name=Kommissionen
 Module60000Desc=Modul zur Verwaltung von Kommissionen
 Module62000Name=Incoterms
-Module62000Desc=Add features to manage Incoterms
+Module62000Desc=Funktionen zum Verwalten von Incoterms hinzufügen
 Module63000Name=Ressourcen
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Module63000Desc=Verwalten Sie Ressourcen (Drucker, Autos, Räume, ...) für zugeordnete Ereignisse
 Permission11=Rechnungen einsehen
 Permission12=Rechnungen erstellen/bearbeiten
 Permission13=Rechnungsfreigabe aufheben
@@ -667,7 +670,7 @@ Permission36=Projekte/Leistungen exportieren
 Permission38=Produkte exportieren
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects I'm contact for)
+Permission44=Projekte löschen (gemeinsame Projekte und Projekte, in denen ich Ansprechpartner bin)
 Permission45=Projekte exportieren
 Permission61=Serviceaufträge ansehen
 Permission62=Serviceaufträge erstellen/bearbeiten
@@ -700,10 +703,10 @@ Permission109=Sendungen löschen
 Permission111=Finanzkonten einsehen
 Permission112=Transaktionen erstellen/ändern/löschen und vergleichen
 Permission113=Einstellungen Finanzkonten (erstellen, Kategorien verwalten)
-Permission114=Reconcile transactions
+Permission114=Transaktionen ausgleichen
 Permission115=Transaktionen und Kontoauszüge exportieren
 Permission116=Transfers zwischen Konten
-Permission117=Manage checks dispatching
+Permission117=Schecks verwalten
 Permission121=Mit Benutzer verbundene Partner einsehen
 Permission122=Mit Benutzer verbundene Partner erstellen/bearbeiten
 Permission125=Mit Benutzer verbundene Partner löschen
@@ -729,14 +732,14 @@ Permission173=Reise- und Spesenabrechnung verwerfen
 Permission174=Alle Reise- und Spesenabrechnung einsehen
 Permission178=Reise- und Spesenabrechnung exportieren
 Permission180=Lieferanten einsehen
-Permission181=Read purchase orders
-Permission182=Create/modify purchase orders
-Permission183=Validate purchase orders
-Permission184=Approve purchase orders
-Permission185=Order or cancel purchase orders
-Permission186=Receive purchase orders
-Permission187=Close purchase orders
-Permission188=Cancel purchase orders
+Permission181=Lieferantenbestellungen anzeigen
+Permission182=Lieferantenbestellungen erstellen/bearbeiten
+Permission183=Lieferantenbestellungen freigeben
+Permission184=Lieferantenbestellungen bestätigen/genehmigen
+Permission185=Lieferantenbestellungen ausführen oder verwerfen
+Permission186=Lieferantenbestellungen empfangen
+Permission187=Lieferantenbestellungen schließen
+Permission188=Lieferantenbestellungen stornieren
 Permission192=Leitungen erstellen
 Permission193=Zeilen stornieren
 Permission194=Read the bandwidth lines
@@ -764,7 +767,7 @@ Permission244=Inhalte versteckter Kategorien einsehen
 Permission251=Andere Benutzer und Gruppen einsehen
 PermissionAdvanced251=Andere Benutzer einsehen
 Permission252=Berechtigungen andere Benutzer einsehen
-Permission253=Create/modify other users, groups and permissions
+Permission253=erstellen / bearbeiten von Benutzern & Gruppen (inkl. Rechteverwaltung)
 PermissionAdvanced253=Andere interne/externe Benutzer und Gruppen erstellen/bearbeiten (inkl. Rechteverwaltung)
 Permission254=Nur externe Benutzer erstellen/bearbeiten
 Permission255=Andere Passwörter ändern
@@ -779,13 +782,13 @@ Permission283=Kontakte löschen
 Permission286=Kontakte exportieren
 Permission291=Tarife einsehen
 Permission292=Berechtigungen der Tarife einstellen
-Permission293=Modify customer's tariffs
-Permission300=Barcodes auslesen
+Permission293=Kundentarife ändern
+Permission300=Barcodes anzeigen
 Permission301=Barcodes erstellen/bearbeiten
 Permission302=Barcodes löschen
-Permission311=Leistungen einsehen
+Permission311=Leistungen anzeigen
 Permission312=Leistung/Abonnement einem Vertrag zuordnen
-Permission331=Favoriten einsehen
+Permission331=Favoriten anzeigen
 Permission332=Favoriten erstellen/bearbeiten
 Permission333=Lesezeichen löschen
 Permission341=Eigene Berechtigungen einsehen
@@ -797,25 +800,25 @@ Permission352=Gruppenberechtigungen einsehen
 Permission353=Gruppen erstellen/bearbeiten
 Permission354=Gruppen löschen oder deaktivieren
 Permission358=Benutzer exportieren
-Permission401=Rabatte einsehen
+Permission401=Rabatte anzeigen
 Permission402=Rabatte erstellen/bearbeiten
 Permission403=Rabatte freigeben
 Permission404=Rabatte löschen
 Permission511=Read payments of salaries
-Permission512=Create/modify payments of salaries
+Permission512=Lohnzahlungen anlegen / ändern
 Permission514=Delete payments of salaries
 Permission517=Löhne exportieren
-Permission520=Darlehen einsehen
+Permission520=Darlehen anzeigen
 Permission522=Darlehen erstellen/bearbeiten
 Permission524=Lösche Darlehen
-Permission525=Darlehensrechner
-Permission527=Exportiere Darlehen
-Permission531=Leistungen einsehen
+Permission525=Zugriff auf Darlehensrechner
+Permission527=Darlehen exportieren
+Permission531=Leistungen anzeigen
 Permission532=Leistungen erstellen/bearbeiten
 Permission534=Leistungen löschen
 Permission536=Versteckte Leistungen einsehen/verwalten
 Permission538=Leistungen exportieren
-Permission701=Spenden einsehen
+Permission701=Spenden anzeigen
 Permission702=Spenden erstellen/bearbeiten
 Permission703=Spenden löschen
 Permission771=Spesenabrechnungen einsehen (eigene und die der Untergebenen)
@@ -835,10 +838,10 @@ Permission1102=Lieferscheine erstellen/bearbeiten
 Permission1104=Lieferscheine freigeben
 Permission1109=Lieferscheine löschen
 Permission1181=Lieferanten einsehen
-Permission1182=Read purchase orders
-Permission1183=Create/modify purchase orders
-Permission1184=Validate purchase orders
-Permission1185=Approve purchase orders
+Permission1182=Lieferantenbestellungen anzeigen
+Permission1183=Lieferantenbestellungen erstellen/bearbeiten
+Permission1184=Lieferantenbestellungen freigeben
+Permission1185=Lieferantenbestellungen bestätigen/genehmigen
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
@@ -846,11 +849,11 @@ Permission1190=Approve (second approval) purchase orders
 Permission1201=Exportresultate einsehen
 Permission1202=Export erstellen/bearbeiten
 Permission1231=Read vendor invoices
-Permission1232=Create/modify vendor invoices
-Permission1233=Validate vendor invoices
+Permission1232=Lieferantenrechnungen (Eingangsrechnungen) erstellen/bearbeiten 
+Permission1233=Lieferantenrechnungen freigeben 
 Permission1234=Lieferantenrechnungen löschen
-Permission1235=Send vendor invoices by email
-Permission1236=Export vendor invoices, attributes and payments
+Permission1235=Lieferantenrechnungen per e-Mail versenden 
+Permission1236=Lieferantenrechnungen & -zahlungen exportieren 
 Permission1237=Export purchase orders and their details
 Permission1251=Massenimports von externen Daten ausführen (data load)
 Permission1321=Kundenrechnungen, -attribute und -zahlungen exportieren
@@ -879,7 +882,7 @@ Permission2503=Dokumente bestätigen oder löschen
 Permission2515=Dokumentverzeichnisse verwalten
 Permission2801=FTP-Client im Lesemodus nutzen (nur ansehen und herunterladen)
 Permission2802=FTP-Client im Schreibmodus nutzen (Dateien löschen oder hochladen)
-Permission50101=Use Point of Sale
+Permission50101=benutze Kasse (POS)
 Permission50201=Transaktionen einsehen
 Permission50202=Transaktionen importieren
 Permission54001=Drucken
@@ -892,20 +895,20 @@ Permission63001=Ressourcen anzeigen
 Permission63002=Ressource erstellen/bearbeiten
 Permission63003=Ressource löschen
 Permission63004=Verbinden von  Ressourcen zu Ereignissen
-DictionaryCompanyType=Third-party types
-DictionaryCompanyJuridicalType=Third-party legal entities
+DictionaryCompanyType=Arten von Partnern 
+DictionaryCompanyJuridicalType=Rechtsformen von Partnern
 DictionaryProspectLevel=Lead-Potenzial
-DictionaryCanton=States/Provinces
+DictionaryCanton=Bundesland/Kanton
 DictionaryRegion=Regionen
 DictionaryCountry=Länder
 DictionaryCurrency=Währungen
-DictionaryCivility=Title of civility
+DictionaryCivility=Titel & Anreden
 DictionaryActions=Typen von Kalender Ereignissen
-DictionarySocialContributions=Types of social or fiscal taxes
+DictionarySocialContributions=Arten von Steuern oder Sozialabgaben
 DictionaryVAT=USt.-Sätze
 DictionaryRevenueStamp=Steuermarken Beträge
 DictionaryPaymentConditions=Zahlungsbedingungen
-DictionaryPaymentModes=Payment Modes
+DictionaryPaymentModes=Zahlungsarten
 DictionaryTypeContact=Kontaktarten
 DictionaryTypeOfContainer=Website - Type of website pages/containers
 DictionaryEcotaxe=Ökosteuern (WEEE)
@@ -913,7 +916,7 @@ DictionaryPaperFormat=Papierformat
 DictionaryFormatCards=Card formats
 DictionaryFees=Spesenabrechnung - Arten von Spesenabrechnungszeilen
 DictionarySendingMethods=Versandarten
-DictionaryStaff=Number of Employees
+DictionaryStaff=Anzahl der Beschäftigten
 DictionaryAvailability=Lieferverzug
 DictionaryOrderMethods=Bestellmethoden
 DictionarySource=Quelle der Angebote/Aufträge
@@ -922,7 +925,7 @@ DictionaryAccountancysystem=Kontenplan Modul
 DictionaryAccountancyJournal=Buchhaltungsjournale
 DictionaryEMailTemplates=Emailvorlagen
 DictionaryUnits=Einheiten
-DictionaryMeasuringUnits=Measuring Units
+DictionaryMeasuringUnits=Maßeinheiten
 DictionaryProspectStatus=Lead-Status
 DictionaryHolidayTypes=Urlaubsarten
 DictionaryOpportunityStatus=Verkaufschancen für Projekt/Lead
@@ -931,12 +934,12 @@ DictionaryExpenseTaxRange=Spesenreport - Bereich pro Transportkategorie
 SetupSaved=Einstellungen gespeichert
 SetupNotSaved=Einstellungen nicht gespeichert
 BackToModuleList=Zurück zur Modulübersicht
-BackToDictionaryList=Back to Dictionaries list
+BackToDictionaryList=Zurück zur Wörterbuchübersicht
 TypeOfRevenueStamp=Art der Steuermarke
-VATManagement=Sales Tax Management
+VATManagement=MwSt-Verwaltung 
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Die vorgeschlagene USt. ist standardmäßig 0 für alle Fälle wie Stiftungen, Einzelpersonen oder Kleinunternehmen.
-VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
+VATIsUsedExampleFR=In Frankreich sind damit Unternehmen oder Organisationen gemeint, die ein echtes Steuersystem haben (vereinfacht oder normal). Ein System, in dem die Mehrwertsteuer deklariert wird.
 VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
@@ -961,7 +964,7 @@ LocalTax2ManagementES=EKSt. Management
 LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
 LocalTax2IsNotUsedDescES=Standardmäßig werden die vorgeschlagenen IRPF 0 ist. Ende der Regel.
 LocalTax2IsUsedExampleES=In Spanien, Freiberufler und unabhängigen Fachleuten, die ihre Dienstleistungen und Unternehmen, die das Steuersystem von Modulen gewählt haben.
-LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
+LocalTax2IsNotUsedExampleES=In Spanien sind das Unternehmen, die nicht dem Steuersystem für Module unterliegen.
 CalcLocaltax=Berichte über lokale Steuern
 CalcLocaltax1=Sales - Käufe
 CalcLocaltax1Desc=Lokale Steuer-Reports werden mit der Differenz von lokalen Verkaufs- und Einkaufs-Steuern berechnet
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Name des virtuellen Servers
 OS=OS
 PhpWebLink=PHP Web-Link
-Browser=Browser
 Server=Server
 Database=Datenbank
 DatabaseServer=Datenbankserver
@@ -1036,7 +1038,7 @@ OwnerOfBankAccount=Kontoinhaber %s
 BankModuleNotActive=Finanzkontenmodul nicht aktiv
 ShowBugTrackLink=Zeige Link  <strong>%s</strong>
 Alerts=Benachrichtigungen
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+DelaysOfToleranceBeforeWarning=Verzögerung, bevor eine Warnmeldung angezeigt wird für:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
 Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
@@ -1044,11 +1046,11 @@ Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Auftrag nicht bearbeitet
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Angebot nicht geschlossen
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Anzahl Tage bis Benachrichtigung über noch nicht in Rechnung gestellte Angebote
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Anzahl Tage bis Benachrichtigung über zu aktivierende Leistungen
+Delays_MAIN_DELAY_RUNNING_SERVICES=Anzahl Tage bis Warnung für überfällige Leistungen
 Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Anzahl Tage bis Benachrichtigung über unbezahlte Kundenrechnungen
 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
@@ -1057,7 +1059,7 @@ SetupDescription1=Bevor Sie mit Dolibarr arbeiten können müssen grundlegende E
 SetupDescription2=Die folgenden zwei Punkte sind obligatorisch:
 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.
-SetupDescription5=Other Setup menu entries manage optional parameters.
+SetupDescription5=Andere Setup-Menüs verwalten optionale Parameter.
 LogEvents=Protokollierte Ereignisse
 Audit=Protokoll
 InfoDolibarr=Über Dolibarr
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Verschiedene systemrelevante, technische Informationen - Lesemodu
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=Dateinummer
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Verfügbare Module
 ToActivateModule=Zum Aktivieren von Modulen gehen Sie zu Start->Einstellungen->Module
@@ -1110,13 +1112,13 @@ BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) contain
 BackupDesc3=Für die Sicherung der Datenbank (<b>%s</b>) über Dump-Befehl können Sie den folgenden Assistenten verwenden.
 BackupDescX=Bewahren Sie die archvierten Verzeichnisse an einem sicheren Ort auf.
 BackupDescY=Bewahren Sie den Datenbank-Dump an einem sicheren Ort auf.
-BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
+BackupPHPWarning=Die Datensicherung kann mit dieser Methode nicht garantiert werden. \nEs wird die vorherige Methode empfohlen.
 RestoreDesc=Um eine vollständige Systemsicherung wiederherzustellen sind folgende Schritte notwendig:
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL Import
 ForcedToByAModule= Diese Regel wird <b>%s</b> durch ein aktiviertes Modul aufgezwungen
-PreviousDumpFiles=Existing backup files
+PreviousDumpFiles=bestehende Datensicherungsdateien
 WeekStartOnDay=Wochenstart
 RunningUpdateProcessMayBeRequired=Eine Systemaktualisierung scheint erforderlich (Programmversion %s unterscheidet sich von Datenbankversion %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Diesen Befehl müssen Sie auf der Kommandozeile (nach Login auf der Shell mit Benutzer <b>%s</b>) ausführen.
@@ -1126,7 +1128,7 @@ SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where
 ShowProfIdInAddress=Erweiterte Kundendaten im Adressfeld anzeigen
 ShowVATIntaInAddress=Umsatzsteuer-ID im Adressfeld ausblenden
 TranslationUncomplete=Teilweise Übersetzung
-MAIN_DISABLE_METEO=Disable meteorological view
+MAIN_DISABLE_METEO=Wetteransicht deaktivieren
 MeteoStdMod=Standart Modus
 MeteoStdModEnabled=Standardmodus aktiviert
 MeteoPercentageMod=Prozentmodus
@@ -1134,7 +1136,7 @@ MeteoPercentageModEnabled=Prozentmodus aktiviert
 MeteoUseMod=Ancklicken um %s zu verwenden
 TestLoginToAPI=Testen Sie sich anmelden, um API
 ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
-ExternalAccess=External/Internet Access
+ExternalAccess=externer / interner Zugriff
 MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
 MAIN_PROXY_HOST=Proxyservers: IP-Adresse / DNS-Name
 MAIN_PROXY_PORT=Proxyserver: Port
@@ -1176,18 +1178,18 @@ OriginalValueWas=Original-Übersetzung überschrieben. Der frühere Wert war:<br
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
 TotalNumberOfActivatedModules=Aktivierte Anwendungen/Module: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Sie müssen mindestens 1 Modul aktivieren
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+ClassNotFoundIntoPathWarning=Klasse %s nicht im PHP-Pfad gefunden
 YesInSummer=Ja im Sommer
 OnlyFollowingModulesAreOpenedToExternalUsers=Hinweis: Nur die folgenden Module sind für externe Nutzer verfügbar (unabhängig von der Berechtigung dieser Benutzer), und auch nur, wenn die Rechte zugeteilt wurden:
 SuhosinSessionEncrypt=Sitzungsspeicher durch Suhosin verschlüsselt
 ConditionIsCurrently=Einstellung ist aktuell %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.
+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.
 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.
-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.
+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.
 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".
@@ -1203,10 +1205,10 @@ PasswordGenerationPerso=Ein Passwort entsprechend der persönlich definierten Ko
 SetupPerso=Nach Ihrer Konfiguration
 PasswordPatternDesc=Beschreibung für Passwortmuster
 ##### Users setup #####
-RuleForGeneratedPasswords=Rules to generate and validate passwords
+RuleForGeneratedPasswords=Regeln für die Erstellung und Freigabe von Passwörtern 
 DisableForgetPasswordLinkOnLogonPage='Passwort vergessen'-Link nicht auf der Anmeldeseite anzeigen
 UsersSetup=Benutzermoduleinstellungen
-UserMailRequired=Email required to create a new user
+UserMailRequired=Für die Anlage eines neuen Benutzers ist eine E-Mail-Adresse erforderlich 
 ##### HRM setup #####
 HRMSetup=Personal Modul Einstellungen
 ##### Company setup #####
@@ -1221,7 +1223,7 @@ ModelModules=Dokumentenvorlage(n)
 DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Wasserzeichen auf Entwurf
 JSOnPaimentBill=Feature aktivieren, um Zahlungs-Zeilen in Zahlungs-Formularen automatisch zu füllen
-CompanyIdProfChecker=Rules for Professional IDs
+CompanyIdProfChecker=Regeln für gewerbliche Identifikationsnummern 
 MustBeUnique=Muss es eindeutig sein ?
 MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
 MustBeInvoiceMandatory=Erforderlich, um Rechnungen freizugeben ?
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Rechnungs- und Gutschriftsnumerierungsmodul
 BillsPDFModules=PDF-Rechnungsvorlagen
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Zahlungsvorlagen
-CreditNote=Gutschrift
-CreditNotes=Gutschriften
 ForceInvoiceDate=Rechnungsdatum ist zwingend Freigabedatum
 SuggestedPaymentModesIfNotDefinedInInvoice=Empfohlene Zahlungsart für Rechnung falls nicht in gesondert definiert
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1647,13 +1647,13 @@ BankOrderGlobal=General
 BankOrderGlobalDesc=Allgemeine Anzeige-Reihenfolge
 BankOrderES=Spanisch
 BankOrderESDesc=Spanisch Anzeigereihenfolge
-ChequeReceiptsNumberingModule=Schecknummerierungsmodul
+ChequeReceiptsNumberingModule=Modul zur Nummerierung von Belegen prüfen
 ##### Multicompany #####
 MultiCompanySetup=Einstellungen des Modul Mandanten
 ##### Suppliers #####
-SuppliersSetup=Lieferantenmoduleinstellungen
-SuppliersCommandModel=Vollständige Vorlage für Lieferantenbestellungen (Logo, ...)
-SuppliersInvoiceModel=Vollständige Vorlage der Lieferantenrechnung (logo. ..)
+SuppliersSetup=Einrichtung des Lieferantenmoduls
+SuppliersCommandModel=Vollständige Vorlage der Bestellung/Auftrag (Logo....)
+SuppliersInvoiceModel=Vollständige Vorlage der Lieferantenrechnung (Logo....)
 SuppliersInvoiceNumberingModel=Lieferantenrechnungen Zähl-Modell
 IfSetToYesDontForgetPermission=Wenn auf Ja gesetzt, vergessen Sie nicht, die Berechtigungen den dafür erlaubten Gruppen oder Benutzern auch das Recht für die zweite Zustimmung zu geben.
 ##### GeoIPMaxmind #####
@@ -1669,7 +1669,7 @@ ProjectsSetup=Projekteinstellungenmodul
 ProjectsModelModule=Projektvorlagenmodul
 TasksNumberingModules=Modul zur Numerierung von Aufgaben
 TaskModelModule=Vorlage für Arbeitsberichte
-UseSearchToSelectProject=Warte auf Tastendruck, bevor der Inhalt der Partner-Combo-Liste geladen wirdv<br> (Dies kann die Leistung verbessern, wenn Sie eine große Anzahl von Partnern haben, verschlechtert aber die Nutzungsfreundlichkeit).
+UseSearchToSelectProject=Warte auf Tastendruck, bevor der Inhalt der Projekt-Combo-Liste geladen wird<br> Dies kann die Leistung verbessern, wenn Sie eine große Zahl von Partnern haben, verschlechtert aber die Nutzungsfreundlichkeit.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
 AccountingPeriods=Buchhaltungs Perioden
@@ -1690,13 +1690,13 @@ NoAmbiCaracAutoGeneration=Verwende keine mehrdeutigen Zeichen ("1", "l", "i", "|
 SalariesSetup=Einstellungen des Gehaltsmodul
 SortOrder=Sortierreihenfolge
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0: Zahlungsart Kunde  /  1: Zahlungsart Lieferant  /  2: Zahlungsart Kunde und Lieferant
 IncludePath=Include-Pfad (in Variable '%s' definiert)
 ExpenseReportsSetup=Einstellungen des Moduls Spesenabrechnung
 TemplatePDFExpenseReports=Dokumentvorlagen zur Erstellung einer Spesenabrechnung
-ExpenseReportsIkSetup=Einstellungen des Spesenmoduls - Meilenindex
-ExpenseReportsRulesSetup=Setup des Moduls Spesen - Regeln
-ExpenseReportNumberingModules=Nummerierung Spesenabrechnungen
+ExpenseReportsIkSetup=Einstellungen vom Modul Spesenabrechnungen - Meilenindex
+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*
@@ -1709,7 +1709,7 @@ BackupDumpWizard=Assistent zum Erstellen der Datenbank-Sicherung
 SomethingMakeInstallFromWebNotPossible=Die Installation von dem externen Modul ist aus folgenden Gründen vom Web-Interface nicht möglich:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
 InstallModuleFromWebHasBeenDisabledByFile=Installieren von externen Modul aus der Anwendung wurde von Ihrem Administrator deaktiviert. \nSie müssen ihn bitten, die Datei<strong>%s</strong> zu entfernen, um diese Funktion zu ermöglichen.
-ConfFileMustContainCustom=Um ein externes Modul zu erstellen oder installieren, müssen die Dateien im Verzeichnis <strong>%s</strong> gespeichert werden. Damit dieses Verzeichnis durch Dolibarr verwendet wird, muss in den Einstellungen <strong>conf/conf.php</strong> die folgenden beiden Zeilen hinzugefügt werden:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMustContainCustom=Um ein externes Modul zu erstellen oder installieren, müssen die Modul Dateien im Verzeichnis <strong>%s</strong> gespeichert werden. Damit dieses Verzeichnis durch Dolibarr verwendet wird, muss in den Einstellungen <strong>conf/conf.php</strong> die folgenden 2 Zeilen hinzugefügt werden:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Zeilen hervorheben bei Mouseover
 HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
 HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
@@ -1725,7 +1725,7 @@ BackgroundTableTitleColor=Hintergrundfarbe für Titelzeilen in Tabellen
 BackgroundTableTitleTextColor=Textfarbe der Tabellenüberschrift
 BackgroundTableLineOddColor=Hintergrundfarbe für ungerade Tabellenzeilen
 BackgroundTableLineEvenColor=Hintergrundfarbe für gerade Tabellenzeilen
-MinimumNoticePeriod=Mindestanzahl an Tagen, die zum Zeitpunkt der Antragsstellung bis zum gewünschten Urlaubsbeginn verbleiben müssen
+MinimumNoticePeriod=Mindestkündigungsfrist (Ihr Urlaubsantrag muss vor dieser Frist gestellt werden)
 NbAddedAutomatically=Anzahl Tage die den Benutzern jeden Monat (automatisch) hinzuaddiert werden
 EnterAnyCode=Dieses Feld enthält eine Referenz um die Zeile zu identifizieren. Geben Sie einen beliebigen Wert ohne Sonderzeichen ein.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
@@ -1762,7 +1762,7 @@ ByDefaultInList=Standardanzeige als Listenansicht
 YouUseLastStableVersion=Sie verwenden die letzte stabile Version
 TitleExampleForMajorRelease=Beispielnachricht, die Sie nutzen können, um eine Hauptversion anzukündigen. Sie können diese auf Ihrer Website verwenden.
 TitleExampleForMaintenanceRelease=Beispielnachricht, die Sie nutzen können, um ein Wartungsupdate anzukündigen. Sie können diese auf Ihrer Website verwenden.
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s ist verfügbar. Version %s ist eine Hauptversion mit vielen neuen Features für Benutzer und Entwickler. Sie können die Version aus dem Downloadbereich des Portals http://www.dolibarr.org laden (Unterverzeichnis "stabile Versionen"). Lesen Sie die komplette Liste der <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">Änderungen</a>.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s ist verfügbar. Version %s ist eine Hauptversion mit vielen neuen Features für Benutzer und Entwickler. Sie können die Version aus dem Download-Bereich des Portals https://www.dolibarr.org laden (Unterverzeichnis "stabile Versionen"). Lesen Sie die komplette Liste der <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">Änderungen</a>.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Vorlagen für Produktdokumente
@@ -1793,10 +1793,10 @@ activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is mis
 CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
 LandingPage=Einstiegsseite
 SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
-ModuleEnabledAdminMustCheckRights=Das Modul wurde aktiviert. Rechte wurden nur Admin-Benutzern gewährt. Wenn nötig, müssen Sie anderen Benutzern oder Gruppen Rechte manuell zuweisen.
+ModuleEnabledAdminMustCheckRights=Das Modul wurde aktiviert. Die Berechtigungen für aktiviertes Modul(e) wurden nur für den/die Administrator/Gruppe vergeben. Möglicherweise müssen Sie anderen Benutzern oder Gruppen bei Bedarf manuell Berechtigungen erteilen.
 UserHasNoPermissions=Dieser Benutzer hat keine Rechte
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
-BaseCurrency=Basiswährung des Unternehmens (Kann in den Unternehmenseinstellungen verändert werden)
+BaseCurrency=Unternehmen-Basiswährung (Kann in den Einsttelungen unter Unternehmen verändert werden)
 WarningNoteModuleInvoiceForFrenchLaw=Dieses Modul %s erfüllt die Französische Gesetzgebung (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=Modul %s entspricht der französischen Gesetzgebung (Loi Finance 2016), weil das Modul "Unveränderbare Logs" automatisch aktiviert wird.
 WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
@@ -1804,7 +1804,7 @@ MAIN_PDF_MARGIN_LEFT=Linker Rand im PDF
 MAIN_PDF_MARGIN_RIGHT=Rechter Rand im PDF
 MAIN_PDF_MARGIN_TOP=Oberer Rand im PDF
 MAIN_PDF_MARGIN_BOTTOM=Unterer Rand im PDF
-NothingToSetup=Es gibt nichts Spezielles zu konfigurieren.
+NothingToSetup=Dieses Modul benötigt keine speziellen Einstellungen.
 SetToYesIfGroupIsComputationOfOtherGroups=Setzen Sie dieses Fehld auf Ja, wenn diese Gruppe eine Berechnung von anderen Gruppen ist
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Mehrere Sprachvarianten gefunden
@@ -1816,10 +1816,10 @@ HelpOnTooltip=Anzeigen des Hilfetextes im Tooltip
 HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
 YouCanDeleteFileOnServerWith=Löschen dieser Datei auf dem Server mit diesem Kommandozeilenbefehl <br>%s 
 ChartLoaded=Chart of account loaded
-SocialNetworkSetup=Einstellungen des Moduls Soziale Medien (Social Networks)
+SocialNetworkSetup=Einstellungen vom Modul für Soziale Medien
 EnableFeatureFor=Aktiviere Features für <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Vertauschen von Absender- und Empfängeradresse im PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,13 +1828,15 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Jetzt abrufen
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
-NoNewEmailToProcess=No new email (matching filters) to process
+NoNewEmailToProcess=Keine neue e-Mail (passende Filter) zum Verarbeiten
 NothingProcessed=Nicht ausgeführt
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
@@ -1847,38 +1849,45 @@ LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not f
 WithDolTrackingID=Dolibarr Tracking ID gefunden
 WithoutDolTrackingID=Dolibarr Tracking ID nicht gefunden
 FormatZip=PLZ
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+MainMenuCode=Menüpunktcode (Hauptmenü)
+ECMAutoTree=Automatischen ECM-Baum anzeigen
+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.
 OpeningHours=Öffnungszeiten
-OpeningHoursDesc=Geben sie hier die regulären Öffnungszeiten ihres Unternehmens an.
-ResourceSetup=Configuration of Resource module
+OpeningHoursDesc=Geben sie hier die regulären Öffnungszeiten vom Unternehmen an.
+ResourceSetup=Konfiguration vom Ressourcenmodul
 UseSearchToSelectResource=Verwende ein Suchformular um eine Ressource zu wählen (eher als eine Dropdown-Liste) zu wählen.
 DisabledResourceLinkUser=Funktion deaktivieren, um eine Ressource mit Benutzern zu verknüpfen
-DisabledResourceLinkContact=Funktion deaktivieren, um eine Ressource mit Kontakten zu verknüpfen
+DisabledResourceLinkContact=Funktion zum deaktivieren, dass eine Resource mit Kontakte verknüpft wird.
 ConfirmUnactivation=Modul zurücksetzen bestätigen
 OnMobileOnly=Nur auf kleinen Bildschirmen (Smartphones)
-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.
-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.
-RootCategoryForProductsToSell=Root category of products to sell
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
-DebugBar=Debug Bar
-DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
-DebugBarSetup=DebugBar Setup
-GeneralOptions=General Options
-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
-EXPORTS_SHARE_MODELS=Export models are share with everybody
-ExportSetup=Setup of module Export
-InstanceUniqueID=Unique ID of the instance
-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/.
+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.
+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.
+RootCategoryForProductsToSell=Hauptkategorie der zu verkaufenden Produkte
+RootCategoryForProductsToSellDesc=Wenn definiert, sind nur Produkte dieser Kategorie oder Kinder dieser Kategorie in der Verkaufsstelle erhältlich.
+DebugBar=Debug Leiste
+DebugBarDesc=Symbolleiste, die mit einer Vielzahl von Werkzeugen ausgestattet ist, um das Debuggen zu vereinfachen.
+DebugBarSetup=DebugBar Einstellungen
+GeneralOptions=Allgemeine Optionen
+LogsLinesNumber=Zahl der Zeilen, die auf der Registerkarte Logs angezeigt werden sollen 
+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.
+EXPORTS_SHARE_MODELS=Exportmodelle sind für jeden zugänglich.
+ExportSetup=Einrichtung Modul Export
+InstanceUniqueID=Eindeutige ID dieser Instanz
+SmallerThan=Kleiner als
+LargerThan=Größer als
+IfTrackingIDFoundEventWillBeLinked=Beachten Sie, dass,wenn in eingehenden e-Mail eine Tracking-ID gefunden wird, das Ereignis automatisch mit den verwanten/verknüpfte Objekte verknüpft wird.
+WithGMailYouCanCreateADedicatedPassword=Wenn Sie bei einem GMail-Konto die 2-stufige Validierung aktiviert haben, wird empfohlen, ein spezielles zweites Passwort für die Anwendung zu erstellen, anstatt Ihr eigenes Konto-Passwort von https://myaccount.google.com/. zu verwenden.
+IFTTTSetup=IFTTTT Modul Setup
+IFTTT_SERVICE_KEY=IFTTTT Dienstleistung Schlüssel
+IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Sicherheitsschlüssel zum Schutz der Endpunkt-URL, die vom IFTTT verwendet wird, um Nachrichten an Ihre Dolibarrinstanz zu senden.
+IFTTTDesc=Dieses Modul wurde entwickelt, um Ereignisse auf IFTTT auszulösen und/oder eine Aktion auf externe IFTTT-Trigger auszuführen.
+UrlForIFTTT=URL-Endpunkt für IFTTT
+YouWillFindItOnYourIFTTTAccount=Sie finden es auf Ihrem IFTTTT-Konto.
+EndPointFor=End point for %s : %s
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index b6118c82740..471e4005872 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Veranstaltungen zur automatischen Übernahme in die Agenda
 EventRemindersByEmailNotEnabled=Aufgaben-/Terminerinnerungen via E-Mail sind in den Einstellungen des Moduls %s nicht aktiviert.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Partner %s erstellt
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Vertrag %s freigegeben
 CONTRACT_DELETEInDolibarr=Vertrag %s gelöscht
 PropalClosedSignedInDolibarr=Angebot %s unterschrieben
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Projekt %s geändert
 PROJECT_DELETEInDolibarr=Projekt %s gelöscht
 TICKET_CREATEInDolibarr=Ticket %s erstellt
 TICKET_MODIFYInDolibarr=Ticket %s geändert
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s wurde gelöscht
 ##### End agenda events #####
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 60356a5fa76..8dfb7808f89 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Bargeld
+MenuBankCash=Bank/Kassa
 MenuVariousPayment=Sonstige Zahlungen
 MenuNewVariousPayment=Neue sonstige Zahlung
 BankName=Name der Bank
@@ -30,7 +30,7 @@ AllTime=Vom Start
 Reconciliation=Zahlungsausgleich
 RIB=Bank Kontonummer
 IBAN=IBAN Nummer
-BIC=BIC/Swift Code
+BIC=BIC / SWIFT Code
 SwiftValid=BIC/SWIFT gültig
 SwiftVNotalid=BIC/SWIFT ungültig
 IbanValid=Bankkonto gültig
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Kontoadresse
 BankAccountCountry=Bankkonto Land
 BankAccountOwner=Kontoinhaber
 BankAccountOwnerAddress=Kontoinhaber-Adresse
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Konto erstellen
 NewBankAccount=Neues Konto
 NewFinancialAccount=Neues Finanzkonto
@@ -98,14 +98,14 @@ BankLineConciliated=Transaktion ausgeglichen
 Reconciled=ausgelichen
 NotReconciled=nicht ausgeglichen
 CustomerInvoicePayment=Kundenzahlung
-SupplierInvoicePayment=Lieferanten-Zahlung
+SupplierInvoicePayment=Lieferanten Zahlung
 SubscriptionPayment=Beitragszahlung
 WithdrawalPayment=Lastschriftzahlung
 SocialContributionPayment=Zahlung von Sozialabgaben/Steuern
 BankTransfer=Kontentransfer
 BankTransfers=Kontentransfers
 MenuBankInternalTransfer=interner Transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Von
 TransferTo=An
 TransferFromToDone=Eine Überweisung <b>von %s nach %s iHv %s %s</b> wurde verbucht.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank-Transaktionen
 AllAccounts=Alle Finanzkonten
 BackToAccount=Zurück zum Konto
 ShowAllAccounts=Alle Finanzkonten
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Wählen Sie den Kontoauszug  der mit der Zahlung übereinstimmt. Verwenden Sie einen sortierbaren numerischen Wert: YYYYMM oder YYYYMMDD
 EventualyAddCategory=Wenn möglich Kategorie angeben, in der die Daten eingeordnet werden
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Scheck zurückgewiesen und Rechnungen wieder ge
 BankAccountModelModule=Dokumentvorlagen für Bankkonten
 DocumentModelSepaMandate=Vorlage für SEPA Mandate. Nur sinnvoll in EU Ländern.
 DocumentModelBan=Template für den Druck von Seiten mit Bankkonto-Nummern Eintrag.
-NewVariousPayment=Neue sonstige Zahlungen
-VariousPayment=Sonstige Zahlungen
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Sonstige Zahlungen
-ShowVariousPayment=Zeige sonstige Zahlungen
-AddVariousPayment=Sonstige Zahlung hinzufügen
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA Mandat
 YourSEPAMandate=Ihr SEPA-Mandat
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 9c9b52f49f2..3a2f1f00e1f 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in Rechnungswährung
 PaidBack=Zurück bezahlt
 DeletePayment=Lösche Zahlung
 ConfirmDeletePayment=Möchten Sie diese Zahlung wirklich löschen?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Lieferanten Zahlung
 ReceivedPayments=Erhaltene Zahlungen
 ReceivedCustomersPayments=Erhaltene Anzahlungen von Kunden
@@ -89,7 +91,6 @@ PaymentTerm=Zahlungsbedingung
 PaymentConditions=Zahlungsbedingungen
 PaymentConditionsShort=Zahlungsbedingungen
 PaymentAmount=Zahlungsbetrag
-ValidatePayment=Zahlung freigeben
 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.
@@ -143,8 +144,8 @@ BillShortStatusClosedUnpaid=Geschlossen
 BillShortStatusClosedPaidPartially=Bezahlt (teilweise)
 PaymentStatusToValidShort=zu bestätigen
 ErrorVATIntraNotConfigured=Intrakommunale UID-Nr. noch nicht definiert
-ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorNoPaiementModeConfigured=Keine standardmäßige Zahlungsart definiert. \nBeheben Sie diesen Fehler im Setup des Rechnungsmoduls. 
+ErrorCreateBankAccount=Legen Sie ein Bankkonto an und definieren Sie anschließend die Zahlungsarten im Setup des Rechnungsmoduls. 
 ErrorBillNotFound=Rechnung %s existiert nicht
 ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Fehler: Dieser Rabatt ist bereits verbraucht.
@@ -250,8 +251,8 @@ ClassifyBill=Rechnung einordnen
 SupplierBillsToPay=Unbezahlte Lieferantenrechnungen
 CustomerBillsUnpaid=Offene Kundenrechnungen
 NonPercuRecuperable=Nicht erstattungsfähig
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
+SetConditions=Zahlungskonditionen definieren
+SetMode=Zahlungsart definieren
 SetRevenuStamp=Steuermarke setzen
 Billed=In Rechnung gestellt
 RecurringInvoices=Wiederkehrende Rechnungen
@@ -334,9 +335,9 @@ ConfirmRemoveDiscount=Sind Sie sicher, dass sie diesen Rabatt löschen wollen?
 RelatedBill=Ähnliche Rechnung
 RelatedBills=Ähnliche Rechnungen
 RelatedCustomerInvoices=Ähnliche Kundenrechnungen
-RelatedSupplierInvoices=Related vendor invoices
+RelatedSupplierInvoices=verbundene Lieferantenrechnungen 
 LatestRelatedBill=Letzte ähnliche Rechnung
-WarningBillExist=Warning, one or more invoices already exist
+WarningBillExist=Achtung, es existiert bereits mindestens eine Rechnung hierzu
 MergingPDFTool=PDF zusammenführen
 AmountPaymentDistributedOnInvoice=Zahlungsbetrag verteilt auf Rechnung
 PaymentOnDifferentThirdBills=Erlaube Zahlungen für Rechnungen an verschiedene Partner der selben Firma.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Rechnungen automatisch freigeben
 GeneratedFromRecurringInvoice=Erstelle wiederkehrende Rechnung %s aus Vorlage
 DateIsNotEnough=Datum noch nicht erreicht
 InvoiceGeneratedFromTemplate=Rechnung %s erstellt aus Vorlage für wiederkehrende Rechnung %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Achtung, das Rechnungsdatum ist höher als das aktuelle Datum
 WarningInvoiceDateTooFarInFuture=Achtung, das Rechnungsdatum ist zu weit entfernt vom aktuellen Datum
 ViewAvailableGlobalDiscounts=Zeige verfügbare Rabatte
@@ -395,7 +397,7 @@ PaymentConditionShort14D=14 Tage
 PaymentCondition14D=14 Tage
 PaymentConditionShort14DENDMONTH=14 Tage nach Monatsende
 PaymentCondition14DENDMONTH=Innerhalb von 14 Tagen nach Monatsende
-FixAmount=Fixed amount
+FixAmount=fester Betrag
 VarAmount=Variabler Betrag (%% tot.)
 VarAmountOneLine=Variabler Betrag (%% Total) -1 Position mit Label '%s'
 # PaymentType
@@ -421,9 +423,9 @@ BankDetails=Bankverbindung
 BankCode=Bankleitzahl
 DeskCode=Branch code
 BankAccountNumber=Kontonummer
-BankAccountNumberKey=Checksum
+BankAccountNumberKey=Prüfsumme (checksum)
 Residence=Adresse
-IBANNumber=IBAN account number
+IBANNumber=IBAN Kontennummer
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC / SWIFT Code
diff --git a/htdocs/langs/de_DE/bookmarks.lang b/htdocs/langs/de_DE/bookmarks.lang
index 25634d7a2d0..5889a0f085f 100644
--- a/htdocs/langs/de_DE/bookmarks.lang
+++ b/htdocs/langs/de_DE/bookmarks.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Diese Seite zu den Lesezeichen hinzufügen
+AddThisPageToBookmarks=Aktuelle Ansicht zu Lesezeichen hinzufügen
 Bookmark=Lesezeichen
 Bookmarks=Lesezeichen
 ListOfBookmarks=Liste der Lesezeichen
-EditBookmarks=Lesezeichen auslisten/ändern
+EditBookmarks=Alle Lesezeichen anzeigen / ändern
 NewBookmark=Neues Lesezeichen
 ShowBookmark=Zeige Lesezeichen
-OpenANewWindow=Neues Fenster öffnen
-ReplaceWindow=Aktuelles Fenster ersetzen
-BookmarkTargetNewWindowShort=Neues Fenster
-BookmarkTargetReplaceWindowShort=Aktuelles Fenster
-BookmarkTitle=Titel des Lesezeichens
+OpenANewWindow=In neuem Tab öffnen
+ReplaceWindow=Aktuellen Tab ersetzen
+BookmarkTargetNewWindowShort=Neuer Tab
+BookmarkTargetReplaceWindowShort=Aktueller Tab
+BookmarkTitle=Benennung des Lesezeichens
 UrlOrLink=Link
-BehaviourOnClick=Verhalten wenn ein Lesezeichen angewählt wird
+BehaviourOnClick=Öffnungsverhalten
 CreateBookmark=Lesezeichen erstellen
-SetHereATitleForLink=Erfasse hier einen Titel für das Lesezeichen
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Verwenden Sie eine absolute externe URL oder eine relative Dolibarr URL
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Wählen Sie aus, ob die Seite in einen neuem Fenster geöffnet werden soll
+SetHereATitleForLink=Erfassen Sie hier einen Namen für das Lesezeichen
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Verwenden Sie einen externen / absoluten Link (z.B.: https://URL) oder Links relativ zum Systempfad (z.B.: /DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Wählen Sie aus, ob die verlinkte Seite auf der aktuellen Registerkarte oder auf einer neuen Registerkarte geöffnet werden soll.
 BookmarksManagement=Verwalten von Lesezeichen
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index be45c69fbf5..7bcded342c8 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -4,11 +4,11 @@ BoxLastRssInfos=Informationen RSS Feed
 BoxLastProducts=Neueste %s Produkte/Leistungen
 BoxProductsAlertStock=Bestandeswarnungen für Produkte
 BoxLastProductsInContract=Zuletzt in Verträgen aufgenomme Produkte/Leistungen (maximal %s)
-BoxLastSupplierBills=Neueste Lieferantenrechnungen
-BoxLastCustomerBills=Neueste Kundenrechnungen
+BoxLastSupplierBills=neueste Lieferantenrechnungen
+BoxLastCustomerBills=neueste Kundenrechnungen
 BoxOldestUnpaidCustomerBills=Älteste unbezahlte Kundenrechnungen
-BoxOldestUnpaidSupplierBills=Älteste unbezahlte Lieferantenrechnungen
-BoxLastProposals=Neueste Angebote
+BoxOldestUnpaidSupplierBills=älteste unbezahlte Lieferantenrechnungen
+BoxLastProposals=neueste Angebote
 BoxLastProspects=Zuletzt bearbeitete Interessenten
 BoxLastCustomers=Zuletzt berarbeitete Kunden
 BoxLastSuppliers=Zuletzt bearbeitete Lieferanten
@@ -16,7 +16,7 @@ BoxLastCustomerOrders=Neueste Lieferantenbestellungen
 BoxLastActions=Neuste Aktionen
 BoxLastContracts=Neueste Verträge
 BoxLastContacts=Neueste Kontakte/Adressen
-BoxLastMembers=Neueste Mitglieder
+BoxLastMembers=neueste Mitglieder
 BoxFicheInter=Neueste Serviceaufträge
 BoxCurrentAccounts=Saldo offene Konten
 BoxTitleLastRssInfos=%s neueste Neuigkeiten von %s
@@ -49,8 +49,8 @@ FailedToRefreshDataInfoNotUpToDate=Fehler beim RSS-Abruf. Letzte erfolgreiche Ak
 LastRefreshDate=Letzte Aktualisierung
 NoRecordedBookmarks=Keine Lesezeichen gesetzt. Klicken Sie <a href="%s">hier</a>, um ein Lesezeichen zu setzen.
 ClickToAdd=Hier klicken um hinzuzufügen.
-NoRecordedCustomers=Keine erfassten Kunden
-NoRecordedContacts=Keine erfassten Kontakte
+NoRecordedCustomers=keine erfassten Kunden
+NoRecordedContacts=keine erfassten Kontakte
 NoActionsToDo=Keine Aufgaben/Termine zu erledigen
 NoRecordedOrders=Keine erfassten Kundenaufträge
 NoRecordedProposals=Keine erfassten Angebote
@@ -59,7 +59,7 @@ NoUnpaidCustomerBills=Keine offenen Kundenrechnungen
 NoUnpaidSupplierBills=Keine offenen Lieferantenrechnungen
 NoModifiedSupplierBills=Keine erfassten Lieferantenrechnungen
 NoRecordedProducts=Keine erfassten Produkte/Leistungen
-NoRecordedProspects=Keine erfassten Leads
+NoRecordedProspects=Keine erfassten Interessenten
 NoContractedProducts=Keine Produkte/Leistungen im Auftrag
 NoRecordedContracts=Keine Verträge erfasst
 NoRecordedInterventions=Keine verzeichneten Serviceaufträge
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
index cc1d7c6a0f5..d6d13ac7d7c 100644
--- a/htdocs/langs/de_DE/cashdesk.lang
+++ b/htdocs/langs/de_DE/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Verlauf
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index d20ae4409d9..bfadacb34eb 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -7,7 +7,7 @@ NoCategoryYet=Sie haben noch keine Kategorie dieser Art erstellt
 In=Übergeordnete Kategorie
 AddIn=Übergeordnete Kategorie
 modify=Ändern
-Classify=Einordnen
+Classify=zuordnen
 CategoriesArea=Übersicht Kategorien
 ProductsCategoriesArea=Übersicht Produkt-/Leistungskategorien
 SuppliersCategoriesArea=Vendors tags/categories area
@@ -16,7 +16,7 @@ MembersCategoriesArea=Übersicht Mitgliederkategorien
 ContactsCategoriesArea=Übersicht Kontaktkategorien
 AccountsCategoriesArea=Übersicht Kontenkategorien
 ProjectsCategoriesArea=Übersicht Projektkategorien
-UsersCategoriesArea=Benutzer Tags/Kategorien Bereich
+UsersCategoriesArea=Bereich:  Benutzer Tags/Kategorien
 SubCats=Unterkategorie(n)
 CatList=Liste der Kategorien
 NewCategory=Neue Kategorie
@@ -48,18 +48,18 @@ ContentsNotVisibleByAllShort=Privater Inhalt
 DeleteCategory=Kategorie löschen
 ConfirmDeleteCategory=Möchten Sie diese Kategorie wirklich löschen?
 NoCategoriesDefined=Keine Kategorie definiert
-SuppliersCategoryShort=Vendors tag/category
+SuppliersCategoryShort=Lieferanten-Kategorie
 CustomersCategoryShort=Kundenkategorie
 ProductsCategoryShort=Produktkategorie
 MembersCategoryShort=Mitgliederkategorie
-SuppliersCategoriesShort=Vendors tags/categories
+SuppliersCategoriesShort=Lieferanten-Kategorien
 CustomersCategoriesShort=Kundenkategorie(n)
 ProspectsCategoriesShort=Interessentenkategorie(n)
 CustomersProspectsCategoriesShort=Kunden-/Interessentenkategorien
 ProductsCategoriesShort=Produktkategorien
 MembersCategoriesShort=Mitgliederkategorien
 ContactCategoriesShort=Kontaktkategorien
-AccountsCategoriesShort=Kontokategorien
+AccountsCategoriesShort=Konten-Kategorien
 ProjectsCategoriesShort=Projektkategorien
 UsersCategoriesShort=Benutzerkategorien
 ThisCategoryHasNoProduct=Diese Kategorie enthält keine Produkte.
@@ -70,7 +70,7 @@ ThisCategoryHasNoContact=Diese Kategorie enthält keine Kontakte.
 ThisCategoryHasNoAccount=Diese Kategorie enthält keine Konten.
 ThisCategoryHasNoProject=Diese Kategorie enthält keine Projekte.
 CategId=Kategorie-ID
-CatSupList=List of vendor tags/categories
+CatSupList=Liste der Lieferanten-Kategorien
 CatCusList=Liste der Kunden-/ Interessentenkategorien
 CatProdList=Liste der Produktkategorien
 CatMemberList=Liste der Mitgliederkategorien
@@ -78,7 +78,7 @@ CatContactList=Liste der Kontaktkategorien
 CatSupLinks=Verbindung zwischen Lieferanten und Kategorien
 CatCusLinks=Verbindung zwischen Kunden-/Leads und Kategorien
 CatProdLinks=Verbindung zwischen Produkten/Leistungen und Kategorien
-CatProJectLinks=Links zwischen Projekten und Kategorien bzw. Suchwörtern
+CatProJectLinks=Verbindung zwischen Projekten und Kategorien bzw. Suchwörtern
 DeleteFromCat=Aus Kategorie entfernen
 ExtraFieldsCategories=Ergänzende Attribute
 CategoriesSetup=Kategorie-Einstellungen
diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang
index a6bff185467..f7058c6b7a9 100644
--- a/htdocs/langs/de_DE/commercial.lang
+++ b/htdocs/langs/de_DE/commercial.lang
@@ -3,9 +3,9 @@ Commercial=Einkauf | Vertrieb
 CommercialArea=Vertrieb - Übersicht
 Customer=Kunde
 Customers=Kunden
-Prospect=Lead
-Prospects=Leads
-DeleteAction=Löschen eines Ereignis
+Prospect=Interessent
+Prospects=Interessenten
+DeleteAction=Ereignis löschen
 NewAction=erstelle Termin/Aufgabe
 AddAction=Termin/Aufgabe erstellen
 AddAnAction=Erstelle Termin/Aufgabe
@@ -15,8 +15,8 @@ CardAction=Ereignis - Karte
 ActionOnCompany=Verknüpftes Unternehmen
 ActionOnContact=Verknüpfter Kontakt
 TaskRDVWith=Termin mit %s
-ShowTask=Zeige Aufgabe
-ShowAction=Ereignisse anzeigen
+ShowTask=Aufgabe anzeigen
+ShowAction=Ereignis anzeigen
 ActionsReport=Ereignis Journal
 ThirdPartiesOfSaleRepresentative=Partner mit Vertriebsmitarbeiter
 SaleRepresentativesOfThirdParty=Vertriebsmittarbeiter des Partners
@@ -25,9 +25,9 @@ SalesRepresentatives=Vertreter
 SalesRepresentativeFollowUp=Vertriebsmitarbeiter (Follow-up)
 SalesRepresentativeSignature=Vertriebsmitarbeiter (Unterschrift)
 NoSalesRepresentativeAffected=Keine besonderen Vertriebsmitarbeiter betroffen
-ShowCustomer=Zeige Kunden
-ShowProspect=Zeige Lead
-ListOfProspects=Leads-Liste
+ShowCustomer=Kunden anzeigen
+ShowProspect=Interessent anzeigen
+ListOfProspects=Liste der Interessenten
 ListOfCustomers=Kundenliste
 LastDoneTasks=Letzte %s erledigte Aufgaben
 LastActionsToDo=%s älteste nicht erledigte Aufgaben
@@ -49,10 +49,10 @@ LastProspectContactDone=Kontaktaufnahme erledigt
 ActionAffectedTo=Ereignis zugewiesen an
 ActionDoneBy=Ereignis erledigt von
 ActionAC_TEL=Anruf
-ActionAC_FAX=Fax versenden
-ActionAC_PROP=Angebot senden
+ActionAC_FAX=Fax senden
+ActionAC_PROP=Angebot per Post senden
 ActionAC_EMAIL=E-Mail senden
-ActionAC_EMAIL_IN=Reception of Email
+ActionAC_EMAIL_IN=Empfang von E-Mails
 ActionAC_RDV=Termine
 ActionAC_INT=Serviceaufträge vor Ort
 ActionAC_FAC=Kundenrechnung senden
@@ -68,10 +68,10 @@ ActionAC_OTH_AUTO=Automatisch eingefügte Ereignisse
 ActionAC_MANUAL=Manuell eingefügte Ereignisse
 ActionAC_AUTO=Automatisch eingefügte Ereignisse
 ActionAC_OTH_AUTOShort=Automatisch
-Stats=Verkaufsstatistik
-StatusProsp=Lead Status
+Stats=Verkaufsstatistiken
+StatusProsp=Kontaktstatus
 DraftPropals=Entworfene Angebote
-NoLimit=Kein Limit
+NoLimit=ohne Begrenzung
 ToOfferALinkForOnlineSignature=Link zur Onlinesignatur
 WelcomeOnOnlineSignaturePage=Wilkommen auf der Seite um Angebote von %s zu akzeptieren
 ThisScreenAllowsYouToSignDocFrom=Auf dieser Seite können Angebote akzeptiert und unterschreiben oder ablehnt werden
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 9eede4dee1d..eb7a7196675 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -5,41 +5,41 @@ SelectThirdParty=Wähle einen Partner
 ConfirmDeleteCompany=Möchten Sie diesen Partner und alle damit verbundenen Informationen wirklich löschen?
 DeleteContact=Löschen eines Kontakts/Adresse
 ConfirmDeleteContact=Möchten Sie diesen Partner und alle damit verbundenen Informationen wirklich löschen?
-MenuNewThirdParty=Neuer Partner
-MenuNewCustomer=Neuer Kunde
+MenuNewThirdParty=neuer Geschäftspartner
+MenuNewCustomer=neuer Kunde
 MenuNewProspect=Neuer Interessent
-MenuNewSupplier=Neuer Lieferant
+MenuNewSupplier=neuer Lieferant
 MenuNewPrivateIndividual=Neue Privatperson
-NewCompany=Neue Firma  (Interessent, Kunde, Lieferant)
-NewThirdParty=Neuer Partner (Interessent, Kunde, Lieferant)
-CreateDolibarrThirdPartySupplier=Neuen Lieferanten erstellen 
+NewCompany=neue Firma  (Interessent, Kunde, Lieferant)
+NewThirdParty=neuer Partner (Interessent, Kunde, Lieferant)
+CreateDolibarrThirdPartySupplier=neuen Lieferanten erstellen 
 CreateThirdPartyOnly=Partner erstellen
 CreateThirdPartyAndContact=Neuen Partner und Unteradresse erstellen
 ProspectionArea=Übersicht Geschäftsanbahnung
 IdThirdParty=Partner-ID
-IdCompany=Unternehmen-ID
+IdCompany=Firmen-ID
 IdContact=Kontakt-ID
 Contacts=Kontakte/Adressen
 ThirdPartyContacts=Partnerkontakte
-ThirdPartyContact=Partnerkontakt
+ThirdPartyContact=Partner-Kontakt/-Adresse
 Company=Firma
 CompanyName=Firmenname
-AliasNames=Alias (Geschäftsname, Marke, ...)
+AliasNames=Alias-Name (Geschäftsname, Marke, ...)
 AliasNameShort=Alias-Name
-Companies=Unternehmen
-CountryIsInEEC=Land ist innerhalb der EU
-PriceFormatInCurrentLanguage=Preis Format in aktueller Währung
+Companies=Firmen
+CountryIsInEEC=Land ist EU-Mitglied
+PriceFormatInCurrentLanguage=Preisanzeigeformat in der aktuellen Sprache und Währung
 ThirdPartyName=Name des Partners
 ThirdPartyEmail=Partner-Email
-ThirdParty=Partner
-ThirdParties=Partner
-ThirdPartyProspects=Leads
-ThirdPartyProspectsStats=Leads
+ThirdParty=Geschäftspartner
+ThirdParties=Geschäftspartner
+ThirdPartyProspects=Interessenten
+ThirdPartyProspectsStats=Interessenten
 ThirdPartyCustomers=Kunden
 ThirdPartyCustomersStats=Kunden
 ThirdPartyCustomersWithIdProf12=Kunden mit %s oder %s
 ThirdPartySuppliers=Lieferanten
-ThirdPartyType=Typ des Partners
+ThirdPartyType=Partner-Typ
 Individual=Privatperson
 ToCreateContactWithSameName=Erzeugt automatisch einen Kontakt/Adresse mit der gleichen Information wie der Partner unter dem Partner. In den meisten Fällen, auch wenn Ihr Partner eine natürliche Person ist, reicht die Anlage nur eines Partners aus.
 ParentCompany=Muttergesellschaft
@@ -60,7 +60,7 @@ StateShort=Staat
 Region=Region
 Region-State=Bundesland
 Country=Land
-CountryCode=Ländercode
+CountryCode=Länderkennung
 CountryId=Länder-ID
 Phone=Telefon
 PhoneShort=Tel.
@@ -77,16 +77,16 @@ Town=Stadt
 Web=Internetseite
 Poste= Posten
 DefaultLang=Standard-Sprache
-VATIsUsed=inkl. MwSt.
+VATIsUsed=Umsatzsteuerpflichtig
 VATIsUsedWhenSelling=Dies definiert ob dieser Partner Steuern auf der Rechnung an seine eigenen Kunden ausweist oder nicht
-VATIsNotUsed=exkl. MwSt.
+VATIsNotUsed=Umsatzsteuerbefreit
 CopyAddressFromSoc=Übernehme die Adresse vom Partner
 ThirdpartyNotCustomerNotSupplierSoNoRef=Partner ist weder Kunde noch Lieferant, keine verbundenen Objekte
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Partner ist weder Kunde noch Lieferant, Rabatte sind nicht verfügbar
 PaymentBankAccount=Bankkonto für Zahlungen
 OverAllProposals=Angebote
 OverAllOrders=Bestellungen
-OverAllInvoices=Rechnungen
+OverAllInvoices=(Kunden-)Rechnungen
 OverAllSupplierProposals=Preisanfragen
 ##### Local Taxes #####
 LocalTax1IsUsed=Nutze zweiten Steuersatz
@@ -287,8 +287,8 @@ SupplierAbsoluteDiscountAllUsers=Absolute Lieferantenrabatte (von allen Benutzer
 SupplierAbsoluteDiscountMy=Absolute Lieferantenrabatte (durch sie erfasst)
 DiscountNone=Keine
 Vendor=Lieferant
-AddContact=Kontakt erstellen
-AddContactAddress=Kontakt/Adresse erstellen
+AddContact=Kontakt anlegen
+AddContactAddress=Kontakt/Adresse anlegen
 EditContact=Kontakt bearbeiten
 EditContactAddress=Kontakt/Adresse bearbeiten
 Contact=Kontakt
@@ -296,7 +296,7 @@ ContactId=Kontakt-ID
 ContactsAddresses=Kontakte/Adressen
 FromContactName=Name:
 NoContactDefinedForThirdParty=Für diesen Partner ist kein Kontakt eingetragen
-NoContactDefined=Kein Kontakt für diesen Partner
+NoContactDefined=kein Kontakt für diesen Partner
 DefaultContact=Standardkontakt
 AddThirdParty=Partner erstellen
 DeleteACompany=Löschen eines Unternehmens
@@ -307,7 +307,7 @@ SupplierCode=Lieferantennummer
 CustomerCodeShort=Kundennummer
 SupplierCodeShort=Lieferantennummer
 CustomerCodeDesc=eindeutige Kundennummer
-SupplierCodeDesc=Lieferantennummer, eindeutig über alle Lieferanten
+SupplierCodeDesc=eindeutige Lieferantennummer
 RequiredIfCustomer=Erforderlich falls Partner Kunde oder Interessent ist
 RequiredIfSupplier=Erforderlich falls Partner Lieferant ist
 ValidityControledByModule=Gültigkeit kontrolliert von Modul
@@ -317,9 +317,9 @@ CompanyDeleted=Firma "%s" aus der Datenbank gelöscht.
 ListOfContacts=Liste der Kontakte
 ListOfContactsAddresses=Liste der Kontakte
 ListOfThirdParties=Liste der Partner
-ShowCompany=Partner zeigen
+ShowCompany=Partner anzeigen
 ShowContact=Kontakt  anzeigen
-ContactsAllShort=Alle (Kein Filter)
+ContactsAllShort=Alle  (kein Filter)
 ContactType=Kontaktart
 ContactForOrders=Bestellungskontakt
 ContactForOrdersOrShipments=Kontakt für den Auftrag oder die Lieferung
@@ -333,7 +333,7 @@ NoContactForAnyContract=Kein Kontakt für Verträge definiert
 NoContactForAnyInvoice=Kein Kontakt für Rechnungen definiert
 NewContact=Neuer Kontakt
 NewContactAddress=Neuer Kontakt/Adresse
-MyContacts=Meine Kontakte
+MyContacts=meine Kontakte
 Capital=Kapital
 CapitalOf=Stammkapital: %s
 EditCompany=Unternehmen bearbeiten
@@ -349,8 +349,8 @@ JuridicalStatus=Rechtsform
 Staff=Mitarbeiter
 ProspectLevelShort=Potenzial
 ProspectLevel=Lead-Potenzial
-ContactPrivate=Privat
-ContactPublic=Öffentlich
+ContactPrivate=privat
+ContactPublic=öffentlich
 ContactVisibility=Sichtbarkeit
 ContactOthers=Sonstige
 OthersNotLinkedToThirdParty=Andere, nicht mit einem Partner verknüpfte Projekte
@@ -370,18 +370,18 @@ TE_RETAIL=Händler
 TE_WHOLE=Grosshändler
 TE_PRIVATE=Privatperson
 TE_OTHER=Andere
-StatusProspect-1=Nicht kontaktieren
-StatusProspect0=Noch kein Kontaktversuch
+StatusProspect-1=nicht kontaktieren
+StatusProspect0=noch nie kontaktiert
 StatusProspect1=Zu kontaktieren
 StatusProspect2=Kontaktierung läuft
-StatusProspect3=Erfolgreich kontaktiert
+StatusProspect3=erfolgreich kontaktiert
 ChangeDoNotContact=Ändern Sie den Status auf 'Nicht kontaktieren'
 ChangeNeverContacted=Ändern Sie den Status auf 'Noch kein Kontaktversuch'
 ChangeToContact=Status auf 'Zu kontaktieren' ändern
 ChangeContactInProcess=Ändern Sie den Status auf 'Kontaktaufnahme läuft'
 ChangeContactDone=Ändern Sie den Status auf 'Erfolgreich kontaktiert'
-ProspectsByStatus=Leads nach Status
-NoParentCompany=Keine Mutterfirma
+ProspectsByStatus=Interessenten nach Status
+NoParentCompany=keine Muttergesellschaft
 ExportCardToFormat=Karte in Format exportieren
 ContactNotLinkedToCompany=Kontakt keinem Partner zugeordnet
 DolibarrLogin=Dolibarr-Benutzername
@@ -393,7 +393,7 @@ ImportDataset_company_2=Kontakte/Adressen und Attribute
 ImportDataset_company_3=Bankkonten des Partners
 ImportDataset_company_4=Partner - Außendienstmitarbeiter (Zuweisen von Außendienstmitarbeitern zu Unternehmen)
 PriceLevel=Preisstufe
-PriceLevelLabels=Price Level Labels
+PriceLevelLabels=Preisniveau Etiketten
 DeliveryAddress=Lieferadresse
 AddAddress=Adresse hinzufügen
 SupplierCategory=Lieferantenkategorie
@@ -401,9 +401,9 @@ JuridicalStatus200=Unabhängig
 DeleteFile=Datei löschen
 ConfirmDeleteFile=Möchten Sie diese Datei wirklich löschen?
 AllocateCommercial=Dem Vertriebsmitarbeiter zugewiesen
-Organization=Partner
+Organization=Organisation
 FiscalYearInformation=Geschäftsjahr
-FiscalMonthStart=Erster Monat des Geschäftsjahres
+FiscalMonthStart=erster Monat des Geschäftsjahres
 YouMustAssignUserMailFirst=Sie müssen zunächst eine E-Mail-Adresse für diesen Benutzer anlegen, um E-Mail-Benachrichtigungen zu ermöglichen.
 YouMustCreateContactFirst=Um E-mail-Benachrichtigungen anlegen zu können, müssen Sie zunächst einen Kontakt mit gültiger Email-Adresse zum Partner hinzufügen.
 ListSuppliersShort=Liste der Lieferanten
@@ -411,9 +411,9 @@ ListProspectsShort=Liste der Interessenten
 ListCustomersShort=Liste der Kunden
 ThirdPartiesArea=Partner und Kontakte
 LastModifiedThirdParties=%s zuletzt bearbeitete Partner
-UniqueThirdParties=Gesamte Anzahl Partner
-InActivity=Aktiv
-ActivityCeased=Inaktiv
+UniqueThirdParties=Gesamtzahl Partner
+InActivity=aktiv
+ActivityCeased=inaktiv
 ThirdPartyIsClosed=Partner ist geschlossen
 ProductsIntoElements=Liste von Produkten/Leistungen in %s
 CurrentOutstandingBill=Aktuell ausstehende Rechnung
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index eb40cb5bacd..c63e60d6e23 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Sozialabgabe / Steuersatz hinzufügen
 ContributionsToPay=Sozialabgaben/Unternehmenssteuern zu bezahlen
 AccountancyTreasuryArea=Rechnungs- und Zahlungsbereich
 NewPayment=Neue Zahlung
-Payments=Zahlungen
 PaymentCustomerInvoice=Zahlung Kundenrechnung
 PaymentSupplierInvoice=Zahlung Lieferantenrechnung
 PaymentSocialContribution=Sozialabgaben-/Steuer Zahlung
@@ -205,11 +204,10 @@ SellsJournal=Verkaufsjournal
 PurchasesJournal=Einkaufsjournal
 DescSellsJournal=Verkaufsjournal
 DescPurchasesJournal=Einkaufsjournal
-InvoiceRef=Rechnungs-Nr.
 CodeNotDef=Nicht definiert
 WarningDepositsNotIncluded=Anzahlungsrechnungen werden in dieser Version des Rechnungswesens nicht berücksichtigt.
 DatePaymentTermCantBeLowerThanObjectDate=Die Zahlungsfrist darf nicht kleiner als das Objektdatum sein
-Pcg_version=Kontenplan
+Pcg_version=Kontenrahmen
 Pcg_type=Klasse des Kontos
 Pcg_subtype=Klasse des Kontos 
 InvoiceLinesToDispatch=versandbereite Rechnungspositionen
@@ -232,7 +230,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER=Standard Buchhaltungskonto für Kunden/Debitoren (we
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
 ACCOUNTING_ACCOUNT_SUPPLIER=Buchhaltungskonto für Lieferanten
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
-ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneTax=Duplizierung der Steuer-/Sozialabgaben bestätigen
 CloneTaxForNextMonth=Für nächsten Monat duplizieren
 SimpleReport=Einfache Berichte
 AddExtraReport=Zusätzliche Berichte (Fügen Sie fremde und nationalen Kundenbericht hinzu)
diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang
index 17e8268046e..45b881d7861 100644
--- a/htdocs/langs/de_DE/contracts.lang
+++ b/htdocs/langs/de_DE/contracts.lang
@@ -64,7 +64,8 @@ DateStartRealShort=effektives Startdatum
 DateEndReal=Effektives Ende
 DateEndRealShort=effektives Enddatum
 CloseService=Leistung schließen
-BoardRunningServices=Abgelaufene, aktive Leistungen
+BoardRunningServices=Services running
+BoardExpiredServices=Services expired
 ServiceStatus=Leistungs-Status
 DraftContracts=Vertragsentwürfe
 CloseRefusedBecauseOneServiceActive=Der Vertrag kann nicht geschlossen werden, da noch mindestens eine offene Leistung vorhanden ist.
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index 0a2afb0847d..745118e8c24 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -6,13 +6,13 @@ Permission23102 = Erstelle/ändere geplanten Job
 Permission23103 = Lösche geplanten Job
 Permission23104 = Führe geplanten Job aus
 # Admin
-CronSetup= Jobverwaltungs-Konfiguration
+CronSetup=Jobverwaltungs-Konfiguration
 URLToLaunchCronJobs=URL zum Prüfen und Starten von speziellen Jobs
 OrToLaunchASpecificJob=Oder zum Prüfen und Starten von speziellen Jobs
 KeyForCronAccess=Sicherheitsschlüssel für URL zum Starten von Cronjobs
 FileToLaunchCronJobs=Befehlszeile zum Überprüfen und Starten von qualifizierten Cron-Jobs
 CronExplainHowToRunUnix=In Unix-Umgebung sollten Sie die folgenden crontab-Eintrag verwenden, um die Befehlszeile alle 5 Minuten ausführen
-CronExplainHowToRunWin=In Microsoft(tm) Windows Umgebungen kannst Du die Aufgabenplanung benutzen um die Kommandozeile jede 5 Minuten aufzurufen
+CronExplainHowToRunWin=In Microsoft™ Windows Umgebungen kannst Du die Aufgabenplanung benutzen, um die Kommandozeile alle 5 Minuten aufzurufen.
 CronMethodDoesNotExists=Klasse %s enthält keine Methode %s
 CronJobDefDesc=Cron-Jobprofile sind in der Moduldeskriptordatei definiert. Wenn das Modul aktiviert ist, sind diese geladen und verfügbar, so dass Sie die Jobs über das Menü admin tools %s verwalten können.
 CronJobProfiles=Liste vordefinierter Cron-Jobprofile
@@ -42,8 +42,8 @@ CronModule=Modul
 CronNoJobs=Keine Jobs eingetragen
 CronPriority=Rang
 CronLabel=Bezeichnung
-CronNbRun=Anzahl Starts
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Jede
 JobFinished=Job gestartet und beendet
 #Page card
@@ -61,11 +61,11 @@ CronStatusInactiveBtn=Deaktivieren
 CronTaskInactive=Dieser Job ist deaktiviert
 CronId=ID
 CronClassFile=Dateiname mit Klasse
-CronModuleHelp=Name des Dolibarr-Modulverzeichnisses (funktioniert auch mit externem Dolibarr-Modul). <BR> Um zum Beispiel die Fetch-Methode des Dolibarr-Produktobjekts /htdocs/<u>product</u>/class/product.class.php aufzurufen, ist der Wert für das Modul ein <i> Produkt </ i>
-CronClassFileHelp=Der relative Pfad und Dateiname, der geladen werden soll (Pfad ist relativ zum Webserver-Stammverzeichnis). <BR> Um zum Beispiel die Fetch-Methode des Dolibarr-Produktobjekts htdocs / product / class / <u> product.class.php </ u> aufzurufen, lautet der Wert für den Klassendateinamen: <i> product / class / product.class.php </ i>
-CronObjectHelp=Der Objektname, der geladen werden soll. <BR> Um zum Beispiel die Fetch-Methode des Dolibarr-Produktobjekts /htdocs/product/class/product.class.php aufzurufen, lautet der Wert für den Klassendateinamen <br> <i> Produkt </ i>
-CronMethodHelp=Die zu startende Objektmethode. <BR> Um zum Beispiel die Fetch-Methode des Dolibarr-Produktobjekts /htdocs/product/class/product.class.php aufzurufen, lautet der Wert für Methode: <i><i></ i>
-CronArgsHelp=Das Methodenargument.<BR>  Um zum Beispiel die Methode fetch des Dolibarr Produkt Objektes /htdocs/product/class/product.class.php aufzurufen, ist der Input-Parameter-Wert <i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+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=Die auszuführende System-Kommandozeile
 CronCreateJob=Erstelle neuen cronjob
 CronFrom=Von
@@ -79,5 +79,5 @@ CronCannotLoadObject=Die Klassendatei %s wurde geladen, aber das Objekt %s wurde
 UseMenuModuleToolsToAddCronJobs=Gehen Sie in Menü "Start - Module Hilfsprogramme - Geplante Aufträge" um geplante Aufträge zu sehen/bearbeiten.
 JobDisabled=Aufgabe deaktiviert
 MakeLocalDatabaseDumpShort=lokales Datenbankbackup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Bitte beachten: Aus Leistungsgründen können Ihre Jobs um bis zu %s Stunden verzögert werden, unabhängig vom nächsten Ausführungstermin.
diff --git a/htdocs/langs/de_DE/deliveries.lang b/htdocs/langs/de_DE/deliveries.lang
index d26a639e2b9..aabd4dea18c 100644
--- a/htdocs/langs/de_DE/deliveries.lang
+++ b/htdocs/langs/de_DE/deliveries.lang
@@ -18,7 +18,7 @@ StatusDeliveryCanceled=Storniert
 StatusDeliveryDraft=Entwurf
 StatusDeliveryValidated=erhalten
 # merou PDF model
-NameAndSignature=Name und Unterschrift:
+NameAndSignature=Name / Unterschrift:
 ToAndDate=An___________________________________ am ____/_____/__________
 GoodStatusDeclaration=Wir haben die oben genannten Waren in einwandfreiem Zustand erhalten,
 Deliverer=Lieferant:
@@ -28,3 +28,4 @@ ErrorStockIsNotEnough=Nicht genügend Bestand
 Shippable=Versandfertig
 NonShippable=Nicht versandfertig
 ShowReceiving=Zustellbestätigung anzeigen
+NonExistentOrder=Auftrag existiert nicht
diff --git a/htdocs/langs/de_DE/dict.lang b/htdocs/langs/de_DE/dict.lang
index 0583e48f940..74c29f3c653 100644
--- a/htdocs/langs/de_DE/dict.lang
+++ b/htdocs/langs/de_DE/dict.lang
@@ -6,7 +6,7 @@ CountryES=Spanien
 CountryDE=Deutschland
 CountryCH=Schweiz
 # Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
-CountryGB=England
+CountryGB=Großbritannien
 CountryUK=England
 CountryIE=Irland
 CountryCN=China
@@ -227,7 +227,7 @@ CountryTC=Turks-und Cailos Inseln
 CountryTV=Elliceanisch
 CountryUG=Uganda
 CountryUA=Ukraine
-CountryAE=Vereinigte Arabische Emirate
+CountryAE=Vereinigte Arabische Emirate  (VAE)
 CountryUM=United States Minor Outlying Islands
 CountryUY=Uruguay
 CountryUZ=Usbekistan
@@ -290,7 +290,7 @@ CurrencyXOF=CFA Francs BCEAO
 CurrencySingXOF=CFA Franc BCEAO
 CurrencyXPF=CFP Francs
 CurrencySingXPF=CFP Franc
-CurrencyCentEUR=cents
+CurrencyCentEUR=Cent
 CurrencyCentSingEUR=Cent
 CurrencyCentINR=Paisa
 CurrencyCentSingINR=Paise
diff --git a/htdocs/langs/de_DE/donations.lang b/htdocs/langs/de_DE/donations.lang
index 0b1e8ba28b3..36bfb8b8229 100644
--- a/htdocs/langs/de_DE/donations.lang
+++ b/htdocs/langs/de_DE/donations.lang
@@ -6,7 +6,7 @@ Donor=Spender
 AddDonation=Spende erstellen
 NewDonation=Neue Spende
 DeleteADonation=Ein Spende löschen
-ConfirmDeleteADonation=Are you sure you want to delete this donation?
+ConfirmDeleteADonation=Sind Sie sicher, dass Sie diese Spende löschen möchten?
 ShowDonation=Spenden anzeigen
 PublicDonation=Öffentliche Spenden
 DonationsArea=Spenden - Übersicht
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index 976e09fdf1d..35b0520a78f 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -1,52 +1,52 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=No. of documents in directory
+ECMNbOfDocs=Anzahl der Dokumente im Verzeichnis
 ECMSection=Verzeichnis
 ECMSectionManual=Manueller Ordner
 ECMSectionAuto=Automatischer Ordner
 ECMSectionsManual=manuelle Hierarchie
 ECMSectionsAuto=automatische Hierarchie
-ECMSections=Ordner
-ECMRoot=Stammordner
+ECMSections=Verzeichnisse (Ordner)
+ECMRoot=Stammverzeichnis
 ECMNewSection=Neuer Ordner
-ECMAddSection=Ordner hinzufügen
+ECMAddSection=Verzeichnis hinzufügen
 ECMCreationDate=Erstellungsdatum
-ECMNbOfFilesInDir=Anzahl der Dateien im Ordner
-ECMNbOfSubDir=Anzahl Unterordner
-ECMNbOfFilesInSubDir=Anzahl Dateien in Unterordnern
+ECMNbOfFilesInDir=Anzahl der Dateien im Verzeichnis
+ECMNbOfSubDir=Anzahl Unterverzeichnisse
+ECMNbOfFilesInSubDir=Anzahl der Dateien in Unterverzeichnissen
 ECMCreationUser=Autor
-ECMArea=DMS/CMS Bereich
-ECMAreaDesc=Das ECM (Electronic Content Management)-System erlaubt Ihnen das Speichern, Teilen und rasche Auffinden von Dokumenten.
-ECMAreaDesc2=* In den automatischen Verzeichnissen werden die vom System erzeugten Dokumente abgelegt. <br> * Die manuellen Verzeichnisse können Sie selbst verwalten und zusätzliche nicht direkt zuordenbare Dokument hinterlegen.
+ECMArea=DMS/ECM Bereich
+ECMAreaDesc=Das ECM-System (Electronic Content Management) erlaubt Ihnen das Speichern, Teilen und rasche Auffinden von Dokumenten.
+ECMAreaDesc2=* In den automatischen Verzeichnissen werden die vom System erzeugten Dokumente abgelegt. <br> * Die manuellen Verzeichnisse können Sie selbst verwalten und zusätzliche nicht direkt zuordenbare Dokumente hinterlegen.
 ECMSectionWasRemoved=Verzeichnis <b>%s</b> wurde gelöscht.
 ECMSectionWasCreated=Verzeichnis <b>%s</b> wurde erstellt.
 ECMSearchByKeywords=Suche nach Stichwörtern
-ECMSearchByEntity=Suche nach Objekt
-ECMSectionOfDocuments=Dokumentenordnern
+ECMSearchByEntity=Suche nach Objekten/Belegarten
+ECMSectionOfDocuments=Dokumentenordner
 ECMTypeAuto=Automatisch
-ECMDocsBySocialContributions=Mit Sozialabgaben oder Steuerinformationen verknüpfte Dokumente
-ECMDocsByThirdParties=Mit Partnern verknüpfte Dokumente
-ECMDocsByProposals=Mit Angeboten verknüpfte Dokumente
-ECMDocsByOrders=Mit Kundenaufträgen verknüpfte Dokumente
-ECMDocsByContracts=Mit Verträgen verknüpfte Dokumente
-ECMDocsByInvoices=Mit Kundenrechnungen verknüpfte Dokumente
-ECMDocsByProducts=Mit Produkten verknüpfte Dokumente
-ECMDocsByProjects=Mit Projekten verknüpfte Dokumente
-ECMDocsByUsers=Mit Benutzern verknüpfte Dokumente
-ECMDocsByInterventions=Mit Serviceaufträgen verknüpfte Dokumente
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
-ECMNoDirectoryYet=Noch kein Ordner erstellt
-ShowECMSection=Ordner anzeigen
+ECMDocsBySocialContributions=mit Sozialabgaben oder Steuerinformationen verknüpfte Dokumente
+ECMDocsByThirdParties=mit Partnern verknüpfte Dokumente
+ECMDocsByProposals=mit Angeboten verknüpfte Dokumente
+ECMDocsByOrders=mit Kundenaufträgen verknüpfte Dokumente
+ECMDocsByContracts=mit Verträgen verknüpfte Dokumente
+ECMDocsByInvoices=mit Kundenrechnungen verknüpfte Dokumente
+ECMDocsByProducts=mit Produkten verknüpfte Dokumente
+ECMDocsByProjects=mit Projekten verknüpfte Dokumente
+ECMDocsByUsers=mit Benutzern verknüpfte Dokumente
+ECMDocsByInterventions=mit Serviceaufträgen verknüpfte Dokumente
+ECMDocsByExpenseReports=mit Spesenabrechnungen verknüpfte Dokumente
+ECMDocsByHolidays=mit Feier-/Urlaubstagen verknüpfte Dokumente
+ECMDocsBySupplierProposals=mit Lieferantenangeboten verknüpfte Dokumente
+ECMNoDirectoryYet=noch kein Verzeichnis erstellt
+ShowECMSection=Verzeichnis anzeigen
 DeleteSection=Verzeichnis löschen
 ConfirmDeleteSection=Möchten Sie dieses Verzeichnis <b>%s</b> wirklich löschen?
-ECMDirectoryForFiles=Relatives Verzeichnis für Dateien
-CannotRemoveDirectoryContainsFilesOrDirs=Entfernen nicht möglich, da es Dateien oder Unterverzeichnisse enthält
-CannotRemoveDirectoryContainsFiles=Entfernen nicht möglich, da es Dateien enthält
+ECMDirectoryForFiles=relatives Verzeichnis für Dateien
+CannotRemoveDirectoryContainsFilesOrDirs=Entfernen nicht möglich, da es Dateien oder Unterverzeichnisse enthält.
+CannotRemoveDirectoryContainsFiles=Entfernen nicht möglich, da noch Dateien enthalten sind.
 ECMFileManager=Dateiverwaltung
-ECMSelectASection=Wähle einen Ordner aus der Baumansicht...
-DirNotSynchronizedSyncFirst=Dieses Verzeichnis scheint außerhalb des ECM Moduls erstellt oder verändert worden zu sein. Sie müssten auf den "Aktualisieren"-Button klicken, um den Inhalt der Festplatte mit der Datenbank zu synchronisieren.
-ReSyncListOfDir=Liste der Verzeichnisse nochmals synchronisieren
+ECMSelectASection=Wählen Sie ein Verzeichnis aus der Baumansicht aus.
+DirNotSynchronizedSyncFirst=Dieses Verzeichnis scheint ausserhalb des ECM Moduls erstellt oder verändert worden zu sein. Sie müssen auf den "Aktualisieren"-Button klicken, um den Inhalt der Festplatte mit der Datenbank neu zu synchronisieren.
+ReSyncListOfDir=Liste der Verzeichnisse nochmal synchronisieren
 HashOfFileContent=Hashwert der Datei
 NoDirectoriesFound=Keine Verzeichnisse gefunden
-FileNotYetIndexedInDatabase=Datei noch nicht in Datenbank indiziert (Datei nochmals hochladen)
+FileNotYetIndexedInDatabase=Datei noch nicht in Datenbank indiziert (bitte Datei nochmals hochladen)
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index c3a50f172d0..fc26047b0bf 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Fehlerhafte Syntax für param keyforcontent.
 ErrorVariableKeyForContentMustBeSet=Fehler, die Konstante mit dem Namen %s (mit Textinhalt zum Anzeigen) oder %s (mit externer URL zum Anzeigen) muss gesetzt sein.
 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
 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
diff --git a/htdocs/langs/de_DE/exports.lang b/htdocs/langs/de_DE/exports.lang
index 50926e7fb62..975a9904678 100644
--- a/htdocs/langs/de_DE/exports.lang
+++ b/htdocs/langs/de_DE/exports.lang
@@ -1,39 +1,39 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Exportübersicht
-ImportArea=Importübersicht
-NewExport=Neuer Export
-NewImport=Neuer Import
+ExportsArea=Exporte
+ImportArea=Import
+NewExport=neuer Export
+NewImport=neuer Import
 ExportableDatas=Exportfähige Datensätze
 ImportableDatas=Importfähige Datensätze
 SelectExportDataSet=Wählen Sie den zu exportierenden Datensatz...
 SelectImportDataSet=Wählen Sie den zu importierenden Datensatz...
-SelectExportFields=Wählen Sie die zu exportierenden Felder oder ein vordefiniertes Exportprofil
-SelectImportFields=Wählen Sie die Felder der Quelldatei, die Sie in die Datenbank importieren möchten und ihrem Zielbereich, indem Sie sie mit dem Anker %s nach oben und unten ziehen, oder wählen Sie ein vordefiniertes Importprofil:
+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=Quelldateifelder nicht importiert
-SaveExportModel=Speichern Sie diese Exportprofil für eine spätere Verwendung...
-SaveImportModel=Speichern Sie diese Importprofil für eine spätere Verwendung...
+SaveExportModel=Save your selections as an export profile/template (for reuse).
+SaveImportModel=Import-Profil speichern  (für spätere Wiederverwendung)
 ExportModelName=Name des Exportprofils
-ExportModelSaved=Exportprofil unter dem Namen <b>%s</b> gespeichert
+ExportModelSaved=Exportprofil gespeichert unter dem Namen <b>%s</b>  
 ExportableFields=Exportfähige Felder
 ExportedFields=Exportierte Felder
 ImportModelName=Name des Importprofils
-ImportModelSaved=Importprofil unter dem Namen <b>%s</b> gespeichert
+ImportModelSaved=Importprofil gespeichert unter dem Namen <b>%s</b>
 DatasetToExport=Zu exportierender Datensatz
 DatasetToImport=Zu importierender Datensatz
 ChooseFieldsOrdersAndTitle=Wählen Sie die Reihenfolge und Bezeichnung der Felder...
 FieldsTitle=Feldtitel
 FieldTitle=Feldbezeichnung
-NowClickToGenerateToBuildExportFile=Wählen Sie das Exportformat aus dem Auswahlfeld und klicken Sie auf "Erstellen" um die Datei zu generieren...
-AvailableFormats=Verfügbare Formate
+NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
+AvailableFormats=verfügbare Formate 
 LibraryShort=Bibliothek
 Step=Schritt
-FormatedImport=Import-Assistent
-FormatedImportDesc1=Dieser Bereich erlaubt Ihnen den einfachen Import persönlicher Daten über einen Assistenten (ohne techn. Kenntnisse).
-FormatedImportDesc2=Wählen Sie zuerst den Dateityp für den Import, dann die entsprechende Datei und zuletzt die zu importierenden Felder.
-FormatedExport=Export-Assistent
-FormatedExportDesc1=Dieser Bereich erlaubt Ihnen den einfachen Export persönlicher Daten über einen Assistenten (ohne techn. Kenntnisse).
-FormatedExportDesc2=Wählen Sie zuerst einen vordefinierten Datensatz, dann die zu exportierenden Felder und ihre Reihenfolge.
-FormatedExportDesc3=Wenn die Daten für den Export ausgewählt haben, können Sie das Format der Export-Datei festlegen.
+FormatedImport=Import-Assistent 
+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-Assistent 
+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=Blatt
 NoImportableData=Keine importfähigen Daten (kein Modul mit Erlaubnis für Datenimport)
 FileSuccessfullyBuilt=Dateien erstellt
@@ -44,16 +44,16 @@ LineDescription=Beschreibung der Zeile
 LineUnitPrice=Stückpreis der Zeile
 LineVATRate=Steuersatz der Zeile
 LineQty=Menge der Zeile
-LineTotalHT=Nettobetrag der Zeile
+LineTotalHT=Betrag ohne Steuern (netto)
 LineTotalTTC=Bruttobetrag der Zeile
 LineTotalVAT=Steuerbetrag der Zeile
 TypeOfLineServiceOrProduct=Art der Zeile (0=Produkt, 1=Leistung)
 FileWithDataToImport=Datei mit zu importierenden Daten
 FileToImport=Quelldatei für Import
-FileMustHaveOneOfFollowingFormat=Die Importdatei muss in einem der folgenden Formate vorliegen
-DownloadEmptyExample=Leere Beispiel-Quelldatei herunterladen
-ChooseFormatOfFileToImport=Wählen Sie das Format der Importdatei durch einen Klick auf das %s Symbol...
-ChooseFileToImport=Wählen Sie zu importierende Datei und klicken Sie anschließend auf das %s Symbol...
+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=Quelldateiformat
 FieldsInSourceFile=Felder in der Quelldatei
 FieldsInTargetDatabase=Zielfelder in der Systemdatenbank (fett=erforderlich)
@@ -68,55 +68,55 @@ FieldsTarget=Zielfelder
 FieldTarget=Zielfeld
 FieldSource=Feldquelle
 NbOfSourceLines=Zeilenanzahl in der Quelldatei
-NowClickToTestTheImport=Überprüfen Sie jetzt die gewählten Importeinstellungen. Sind diese korrekt, klicken Sie bitte auf die Schaltfläche "<b>%s</b>" um einen Importvorgang zu simulieren (dabei werden noch keine Daten im System verändert, nur Testlauf) ...
-RunSimulateImportFile=Importsimulation starten
+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=Simulation Datenimport starten
 FieldNeedSource=Dieses Feld benötigt Daten aus der Quelldatei
 SomeMandatoryFieldHaveNoSource=Einige erforderliche Felder haben keine Entsprechung in der Quelldatei
 InformationOnSourceFile=Informationen über die Quelldatei
 InformationOnTargetTables=Informationen über die Zieltabellen
 SelectAtLeastOneField=Bitte wählen Sie zumindest ein Feld für den Datenbankexport aus der Auswahlliste
 SelectFormat=Wählen Sie das Format der Importdatei
-RunImportFile=Dateiimport starten
-NowClickToRunTheImport=Überprüfen Sie das Ergebnis der Importsimulation. Ist das Ergebnis zufriedenstellend, können Sie den Importvorgang jetzt starten.
-DataLoadedWithId=Alle Daten werden mit der Import-ID: <b>%s</b> geladen
-ErrorMissingMandatoryValue=Für das erforderliche Feld <b>%s</b> konnte in der Quelldatei kein Wert gefunden werden
-TooMuchErrors=Es gibt noch <b>%s</b> weitere, fehlerhafte Zeilen. Die Ausgabe wurde beschränkt.
-TooMuchWarnings=Es gibt noch <b>%s</b> weitere Zeilen mit Warnungen. Die Ausgabe wurde beschränkt.
+RunImportFile=Datenimport starten
+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=Leerzeile (verworfen)
-CorrectErrorBeforeRunningImport=Beheben Sie zuerst alle Fehler bevor Sie den endgültigen Import starten.
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
 FileWasImported=Datei wurde mit der Nummer <b>%s</b> importiert.
-YouCanUseImportIdToFindRecord=Sie können alle importierten Einträge in der Datenbank finden, indem Sie über das Feld <b>import_key='%s'</b> filtern.
+YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
 NbOfLinesOK=Zeilenanzahl ohne Fehler und Warnungen: <b>%s</b>.
 NbOfLinesImported=Anzahl der erfolgreich importierten Zeilen: <b>%s</b>.
 DataComeFromNoWhere=Der einzufügende Wert kommt nicht aus der Quelldatei.
 DataComeFromFileFieldNb=Der einzufügende Wert stammt aus Feldnummer <b>%s</b> der Quelldatei.
-DataComeFromIdFoundFromRef=Der Wert aus Feldnummer <b>%s</b> der Quelldatei wird zur Auffindung der ID des zu verwendenden Elternelements verwendet (entsprechend muss das Objekt <b>%s</b> mit der Nummer aus der Quelldatei im System vorhanden sein).
-DataComeFromIdFoundFromCodeId=Der Eintrag aus der Quelldatei mit der Feldnummer <b>%s</b> wird zur Referenzierung verwendet. Dazu muss die ID des Objektes in den Stammdaten für <b>%s</b> existieren. Ist Ihnen die ID bekannt, dann können Sie auch diese in der Quelldatei - anstelle des Codes - eintragen. Der Import sollte in beiden Fällen funktionieren.
+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=Die Quelldateidaten werden in folgendes Feld eingefügt:
-DataIDSourceIsInsertedInto=Die ID des mittels Quelldatei ermittelten Elternelements werden in folgendes Feld eingefügt:
+DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
 DataCodeIDSourceIsInsertedInto=Die gefundene, übergeordnete ID aus dem Code wird in das folgende Feld eingefügt:
 SourceRequired=Datenwert erforderlich
 SourceExample=Beispiel möglicher Datenwerte
 ExampleAnyRefFoundIntoElement=Ein Referenz für das Element <b>%s</b> gefunden
 ExampleAnyCodeOrIdFoundIntoDictionary=Jeder Code/ID aus den Stammdaten <b>%s</b>
-CSVFormatDesc=<b>Comma Separated Value</b> Format (.csv). <br> Dies ist ein Textdatei-Format, bei dem einzelne Spalten durch ein Trennzeichen [ %s ] getrennt sind. Wird innerhalb eines Feldes das Trennzeichen gefunden, wird der Wert des entsprechenden Feldes über ein Rundungszeichen [ %s ] gerundet. Das Escape-Zeichen für die Rundung ist [ %s ].
-Excel95FormatDesc=<b>Excel</b> Dateiformat (.xls)<br>Dies ist das Excel 95 Format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> Dateiformat (.xlsx)<br>Dies ist das Excel 2007 Format (XML).
+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>Tabulator getrennte Werte</b> Dateiformat (.tsv)<br>Dies ist ein Textdatei-Format. Felder werden mit einem Tabulator [tab] getrennt.
 ExportFieldAutomaticallyAdded=Das Feld <b>%s</b> wurde automatisch hinzugefügt - Dadurch wird vermieden, daß ähnliche Zeilen als doppelt erkannt werden (durch das hinzufügen dieses Feldes hat jede Zeile eine eigene ID).
-CsvOptions=CSV Optionen
-Separator=Trennzeichen
-Enclosure=Beilage
+CsvOptions=Optionen für CSV-Format
+Separator=Feld-Trennzeichen
+Enclosure=String Delimiter
 SpecialCode=Spezialcode
 ExportStringFilter=%% erlaubt die Ersetzung eines oder mehrerer Zeichen im Text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filtert nach einem Jahr/Monat/Tag<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filtert über einen Bereich von Jahren/Monaten/Tagen<br>'>YYYY' '>YYYYMM' '>YYYYMMDD': filtert auf die folgenden Jahre/Monate/Tage<br>'<YYYY' '<YYYYMM' '<YYYYMMDD': filtert auf die vorhergehenden Jahre/Monate/Tage
+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' filtert genau einen Wert<br>'NNNNN+NNNNN' filtert einen Wertebereich<br>'< NNNNN' filtert nach kleineren Werten<br>'> NNNNN' filtert nach größeren Werten
 ImportFromLine=Import beginnen bei Zeile
 EndAtLineNb=Ende bei Zeile
-ImportFromToLine=Importiere Zeilen mit Nr. (von - bis)
-SetThisValueTo2ToExcludeFirstLine=Setzen Sie beispielsweise den Wert auf 3, um die ersten beiden Zeilen auszuschliessen.
-KeepEmptyToGoToEndOfFile=Dieses Feld leer lassen, um die Datei bis zum Ende zu bearbeiten.
-SelectPrimaryColumnsForUpdateAttempt=Spalte(n) auswählen die als Primärschlüssel für Aktualisierungen beim Import verwendet werden sollen
+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=Aktualisierungen werden für diesen Importtyp nicht unterstützt (Nur neue Datensätze importieren)
 NoUpdateAttempt=Keine Aktualisierungen gemacht, nur neue Datensätze
 ImportDataset_user_1=Benutzer (Mitarbeiter und andere) sowie Eigenschaften
@@ -127,7 +127,7 @@ FilteredFields=Gefilterte Felder
 FilteredFieldsValues=Filter Wert
 FormatControlRule=Regel für die Formatkontrolle
 ## imports updates
-KeysToUseForUpdates=Schlüssel zu verwenden, um Daten zu aktualisieren
+KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Anzahl eingefügter Zeilen: %s
 NbUpdate=Anzahl geänderter Zeilen: %s
 MultipleRecordFoundWithTheseFilters=Mehrere Ergebnisse wurden mit diesen Filtern gefunden: %s
diff --git a/htdocs/langs/de_DE/externalsite.lang b/htdocs/langs/de_DE/externalsite.lang
index 8a91fc705e6..4d4f246299f 100644
--- a/htdocs/langs/de_DE/externalsite.lang
+++ b/htdocs/langs/de_DE/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Konfigurations-Link auf externe Webseite
 ExternalSiteURL=URL der externen Seite
-ExternalSiteModuleNotComplete=Module ExternalSite wurde nicht richtig konfiguriert.
+ExternalSiteModuleNotComplete=Modul ExternalSite wurde nicht richtig konfiguriert.
 ExampleMyMenuEntry=Mein Menü-Eintrag
diff --git a/htdocs/langs/de_DE/ftp.lang b/htdocs/langs/de_DE/ftp.lang
index 059b131141e..b620f05a5ce 100644
--- a/htdocs/langs/de_DE/ftp.lang
+++ b/htdocs/langs/de_DE/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
 FTPClientSetup=FTP-Verbindungseinstellungen
-NewFTPClient=Neue FTP-Verbindungseinstellungen
-FTPArea=FTP-Übersicht
-FTPAreaDesc=Dieser Bildschirm zeigt Ihnen den Inhalt eines FTP-Servers
+NewFTPClient=Neue FTP-Verbindung
+FTPArea=FTP-Verbindung(en)
+FTPAreaDesc=Diese Ansicht zeigt Ihnen den Inhalt eines FTP-Servers an.
 SetupOfFTPClientModuleNotComplete=Die Einstellungen des FTP-Verbindungsmoduls scheinen unvollständig zu sein.
-FTPFeatureNotSupportedByYourPHP=Ihre PHP unterstützt keine FTP-Funktionen
-FailedToConnectToFTPServer=Konnte keine Verbindung zum FTP-Server aufbauen (Server %s, Port %s)
-FailedToConnectToFTPServerWithCredentials=Anmeldung am FTP-Server mit dem eingegebenen Benutzername/Passwort-Paar fehlgeschlagen
-FTPFailedToRemoveFile=Konnte Datei <b>%s</b> nicht entfernen.
+FTPFeatureNotSupportedByYourPHP=Ihre eingesetzte PHP-Version unterstützt keine FTP-Funktionen
+FailedToConnectToFTPServer=Fehler beim Verbindungsaufbau zum FTP-Server %s, Port %s
+FailedToConnectToFTPServerWithCredentials=Anmeldung am FTP-Server mit dem eingegebenen Benutzername / Passwort fehlgeschlagen
+FTPFailedToRemoveFile=Konnte Datei <b>%s</b> nicht entfernen. Überprüfen Sie die Berechtigungen.
 FTPFailedToRemoveDir=Konnte Verzeichnis <b>%s</b> nicht entfernen. Überprüfen Sie die Berechtigungen und ob das Verzeichnis leer ist.
 FTPPassiveMode=Passives FTP
-ChooseAFTPEntryIntoMenu=Wählen Sie einen FTP Eintrag im Menü ...
-FailedToGetFile=Folgende Dateien konnten nicht geladen werden: %s
+ChooseAFTPEntryIntoMenu=Wählen Sie eine FTP-Adresse im Menü aus
+FailedToGetFile=Folgende Datei(en) konnte(n) nicht geladen werden: %s
diff --git a/htdocs/langs/de_DE/help.lang b/htdocs/langs/de_DE/help.lang
index 740c521309f..ca98304afec 100644
--- a/htdocs/langs/de_DE/help.lang
+++ b/htdocs/langs/de_DE/help.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=Forum/Wiki Unterstützung
+CommunitySupport=Forum-/Wiki-Unterstützung
 EMailSupport=E-Mail-Unterstützung
-RemoteControlSupport=Fernwartungs-Support
+RemoteControlSupport=Online real-time / remote support
 OtherSupport=Weitere Unterstützung
-ToSeeListOfAvailableRessources=Hier sehen Sie die verfügbaren Ressourcen:
-HelpCenter=Hilfe-Center
-DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=Type of support
+ToSeeListOfAvailableRessources=Verfügbare Ressourcen:
+HelpCenter=Hilfebereich
+DolibarrHelpCenter=Hilfe- und Supportbereich
+ToGoBackToDolibarr=Um zur Startseite von Dolibarr zurückzukehren klicken Sie bitte <a href="%s">hier</a>.
+TypeOfSupport=Art des Supports
 TypeSupportCommunauty=Community (kostenlos)
 TypeSupportCommercial=Kommerzieller Support
 TypeOfHelp=Hilfe-Typ
@@ -15,9 +15,9 @@ NeedHelpCenter=Benötigen Sie Hilfe oder Unterstützung?
 Efficiency=Effizienz
 TypeHelpOnly=Ausschließlich Hilfe
 TypeHelpDev=Hilfe & Entwicklung
-TypeHelpDevForm=Help+Development+Training
-BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+TypeHelpDevForm=Hilfe, Entwicklung & Ausbildung
+BackToHelpCenter=Klicken Sie hier, um zur <a href="%s">Hilfeseite</a> zurückzukehren. 
 LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Unterstützte Sprachen
-SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=Für offizielle Dolibarr Unterstützung in Ihrer Sprache: br><b><a href="%s" target="_blank">%s</a></b>
+SubscribeToFoundation=Helfen auch Sie dem Dolibarr-Projekt und unterstützen uns mit einer Spende. 
+SeeOfficalSupport=Für offiziellen Dolibarr-Support in Ihrer Sprache: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index 4a458b7f9d3..84cf7c7aedd 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -4,29 +4,29 @@ Holidays=Urlaub
 CPTitreMenu=Urlaub
 MenuReportMonth=Monatsaufstellung
 MenuAddCP=Neuer Urlaubsantrag
-NotActiveModCP=You must enable the module Leave to view this page.
-AddCP=Erstellen Sie ein Urlaubs-Antrag
+NotActiveModCP=Sie müssen das Modul Leave aktivieren, um diese Seite anzuzeigen.
+AddCP=Neuer Urlaubsantrag
 DateDebCP=Urlaubsbeginn
 DateFinCP=Urlaubsende
 DateCreateCP=Erstellungsdatum
 DraftCP=Entwurf
-ToReviewCP=Wartet auf Genehmigung
+ToReviewCP=wartet auf Genehmigung
 ApprovedCP=genehmigt
 CancelCP=Storniert
 RefuseCP=abgelehnt
 ValidatorCP=Genehmiger
-ListeCP=List of leave
+ListeCP=Liste des Urlaubs
 LeaveId=Urlaubs ID
 ReviewedByCP=Wird geprüft von
 UserForApprovalID=Benutzer für die Genehmigungs-ID
-UserForApprovalFirstname=First name of approval user
-UserForApprovalLastname=Last name of approval user
+UserForApprovalFirstname=Vorname des Genehmigungsbenutzers
+UserForApprovalLastname=Nachname des Genehmigungsbenutzers
 UserForApprovalLogin=Login des Genehmigers
 DescCP=Beschreibung
-SendRequestCP=Erstelle Urlaubs-Antrag
+SendRequestCP=Entwurf erstellen
 DelayToRequestCP=Urlaubsanträge müssen mindestens <b>%s Tage</b> im voraus gestellt werden.
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+MenuConfCP=Verwaltung Urlaubsanspruch
+SoldeCPUser=Ihr aktueller Urlaubssaldo beträgt <b>%s</b> Tag(e).
 ErrorEndDateCP=Sie müssen ein Urlaubsende-Datum wählen, dass nach dem Urlaubsbeginn-Datum liegt.
 ErrorSQLCreateCP=Ein SQL Fehler trat auf bei der Erstellung von:
 ErrorIDFicheCP=Fehler aufgetreten: der Urlaubsantrag existiert nicht.
@@ -38,29 +38,29 @@ TitreRequestCP=Urlaubsantrag
 TypeOfLeaveId=Art der Urlaubs-ID
 TypeOfLeaveCode=Art des Urlaubscodes
 TypeOfLeaveLabel=Art des Urlaubslabels
-NbUseDaysCP=Anzahl von konsumierten Tagen des Urlaubs
-NbUseDaysCPShort=Tage verbraucht
-NbUseDaysCPShortInMonth=Tage im Monat verbraucht
+NbUseDaysCP=Anzahl genommene Urlaubstage
+NbUseDaysCPShort=genommene Tage
+NbUseDaysCPShortInMonth=Urlaubstage im Monat
 DateStartInMonth=Startdatum im Monat
 DateEndInMonth=Enddatum im Monat
 EditCP=Bearbeiten
-DeleteCP=Lösche Gruppe
+DeleteCP=Urlaubsantrag löschen
 ActionRefuseCP=Ablehnen
 ActionCancelCP=Stornieren
 StatutCP=Status
 TitleDeleteCP=Urlaubsantrag löschen
-ConfirmDeleteCP=Wollen Sie diesen Urlaubsantrag wirklich löschen?
+ConfirmDeleteCP=Möchten Sie diesen Urlaubsantrag wirklich löschen?
 ErrorCantDeleteCP=Fehler: Sie haben nicht die Berechtigung, diesen Urlaubsantrag zu löschen.
 CantCreateCP=Sie haben nicht die Berechtigung Urlaub zu beantragen.
-InvalidValidatorCP=Sie müssen einen Vorgesetzten wählen, der Ihre Urlaubsanfrage genehmigt.
-NoDateDebut=Sie müssen ein Urlaubsbeginn-Datum wählen.
-NoDateFin=Sie müssen ein Urlaubsende-Datum wählen.
+InvalidValidatorCP=Bitte wählen Sie einen Vorgesetzten, der Ihren Urlaubsantrag prüft.
+NoDateDebut=Bitte wählen Sie ein Datum für den gewünschten Beginn Ihres Urlaubs
+NoDateFin=Bitte wählen Sie ein Datum für das gewünschte Ende Ihres Urlaubs
 ErrorDureeCP=Ihr Urlaubsantrag enthält keine Werktage.
 TitleValidCP=Urlaubsantrag genehmigen
 ConfirmValidCP=Möchten Sie diesen Urlaubsantrag wirklich genehmigen?
-DateValidCP=Datum genehmigt
-TitleToValidCP=Urlaubsantrag senden
-ConfirmToValidCP=Möchten Sie diesen Urlaubsantrag wirklich senden?
+DateValidCP=Datum der Genehmigung
+TitleToValidCP=Urlaub einreichen
+ConfirmToValidCP=Möchten Sie diesen Urlaub wirklich einreichen?
 TitleRefuseCP=Urlaubsantrag ablehnen
 ConfirmRefuseCP=Möchten Sie diesen Urlaubsantrag wirklich ablehnen?
 NoMotifRefuseCP=Sie müssen einen Grund für die Ablehnung angeben.
@@ -73,7 +73,7 @@ DefineEventUserCP=Sonderurlaub für einen Anwender zuweisen
 addEventToUserCP=Urlaub zuweisen
 NotTheAssignedApprover=Sie sind nicht der zugeordnete Genehmiger
 MotifCP=Grund
-UserCP=Benutzer
+UserCP=Mitarbeiter
 ErrorAddEventToUserCP=Ein Fehler ist beim Erstellen des Sonderurlaubs aufgetreten.
 AddEventToUserOkCP=Das Hinzufügen des Sonderurlaubs wurde abgeschlossen.
 MenuLogCP=Zeige Änderungsprotokoll
@@ -82,7 +82,7 @@ ActionByCP=Ausgeführt von
 UserUpdateCP=Für den Benutzer
 PrevSoldeCP=Vorherige Übersicht
 NewSoldeCP=Neuer Saldo
-alreadyCPexist=Ein Urlaubsantrag wurde für diese Periode bereits erstellt.
+alreadyCPexist=Für den gewählten Zeitraum wurde bereits ein Urlaubsantrag erstellt.
 FirstDayOfHoliday=Erster Tag des Urlaubs
 LastDayOfHoliday=Letzter Tag des Urlaubs
 BoxTitleLastLeaveRequests=%s zuletzt bearbeitete Urlaubsanträge
@@ -90,40 +90,41 @@ HolidaysMonthlyUpdate=Monatliches Update
 ManualUpdate=Manuelles Update
 HolidaysCancelation=Urlaubsantrag stornieren
 EmployeeLastname=Mitarbeiter Nachname
-EmployeeFirstname=Vorname des Mitarbeiters
+EmployeeFirstname=Mitarbeiter Vorname
 TypeWasDisabledOrRemoved=Abreise-Art (Nr %s) war deaktiviert oder entfernt
 LastHolidays=%sneuste Ferienanträge
 AllHolidays=Allen Ferienanträge
 HalfDay=Halber Tag
 NotTheAssignedApprover=Sie sind nicht der zugeordnete Genehmiger
 LEAVE_PAID=bezahlter Urlaub
-LEAVE_SICK=Krankheitstag
+LEAVE_SICK=Krankheit
 LEAVE_OTHER=Andere Gründe
 LEAVE_PAID_FR=bezahlter Urlaub
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+LastUpdateCP=Letzte automatische Aktualisierung der Urlaubszuordnung
+MonthOfLastMonthlyUpdate=Monat der letzten automatischen Aktualisierung der Urlaubszuordnung
 UpdateConfCPOK=Erfolgreich bearbeitet.
 Module27130Name= Verwaltung von Urlaubsanträgen
 Module27130Desc= Verwaltung von Urlaubsanträgen
 ErrorMailNotSend=Ein Fehler ist beim E-Mail-Senden aufgetreten:
-NoticePeriod=Kündigungsfrist
+NoticePeriod=Einreichefrist
 #Messages
 HolidaysToValidate=Genehmige Urlaubsanträge
 HolidaysToValidateBody=Es folgt ein Urlaubsantrag zur Freigabe
 HolidaysToValidateDelay=Dieser Urlaub wird in weniger als %s Tagen stattfinden.
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysToValidateAlertSolde=Dem Benutzer, der diese Urlaubsanfrage gestellt hat, stehen nicht genügend Tage zur Verfügung.
 HolidaysValidated=Genehmigte Urlaubsanträge
 HolidaysValidatedBody=Ihr Antrag auf Urlaub von %s bis %s wurde bewilligt.
 HolidaysRefused=Anfrage abgelehnt
-HolidaysRefusedBody=Ihr Antrag auf Urlaub von %s bis %s wurde aus folgendem Grund abgelehnt:
+HolidaysRefusedBody=Ihr Urlaubsantrag von %s bis %s wurde aus folgendem Grund abgelehnt
 HolidaysCanceled=stornierter Urlaubsantrag
 HolidaysCanceledBody=Ihr Urlaubsantrag von %s bis %s wurde storniert.
-FollowedByACounter=1: Diese Art von Antrag muss mit einem Zähler versehen werden. Der Zähler wird manuell oder automatisch erhöht und verringert, wenn der Urlaubsantrag geprüft wurde.<br>0: nicht mit einem Zähler versehen
-NoLeaveWithCounterDefined=Es gibt keine definierten Antragsarten , die mit einem Zähler versehen werden müssen.
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Holiday
-HolidaysNumberingModules=Leave requests numbering models
-TemplatePDFHolidays=Template for leave requests PDF
-FreeLegalTextOnHolidays=Free text on PDF
-WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+FollowedByACounter=0 = Zähler nicht verwenden<br>1 = Zähler verwenden (diese Art von Urlaub wird mit einem Zähler für den mitarbeiterbezogenen Urlaubsanspruch versehen. Der Zähler wird manuell oder automatisch erhöht oder verringert, wenn der Urlaubsantrag genehmigt wurde.)
+NoLeaveWithCounterDefined=Es sind keine Urlaubsarten definiert, die durch einen Zähler überwacht sind.
+GoIntoDictionaryHolidayTypes=Öffnen Sie das Menü <strong>Start - Einstellungen - Stammdaten - Urlaubsarten </strong> um die verschiedenen Urlaubsarten zu konfigurieren.
+HolidaySetup=Einrichtung des Moduls Holiday
+HolidaysNumberingModules=Hinterlegen Sie die Nummerierung der Anforderungsmodelle
+TemplatePDFHolidays=Vorlage für Urlaubsanträge PDF
+FreeLegalTextOnHolidays=Freitext als PDF
+WatermarkOnDraftHolidayCards=Wasserzeichen auf Urlaubsantragsentwurf (leerlassen wenn keines benötigt wird)
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/de_DE/hrm.lang b/htdocs/langs/de_DE/hrm.lang
index 024c5cd5037..bb966df08b9 100644
--- a/htdocs/langs/de_DE/hrm.lang
+++ b/htdocs/langs/de_DE/hrm.lang
@@ -5,13 +5,13 @@ Establishments=Einrichtungen
 Establishment=Einrichtung
 NewEstablishment=Neue Einrichtung
 DeleteEstablishment=Einrichtung löschen
-ConfirmDeleteEstablishment=Are-you sure to delete this establishment?
+ConfirmDeleteEstablishment=Sind Sie sicher, dass Sie diese Einrichtung löschen wollen? 
 OpenEtablishment=Einrichtung öffnen
 CloseEtablishment=Einrichtung schliessen
 # Dictionary
 DictionaryDepartment=PV - Abteilungsliste
 DictionaryFunction=PV - Stellenbezeichnungen Liste
 # Module
-Employees=Mitarbeiter
-Employee=Mitarbeiter
-NewEmployee=Neuer Mitarbeiter
+Employees=die Mitarbeiter
+Employee=Mitarbeiter/in
+NewEmployee=neuer Mitarbeiter
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index 61bb82cf152..92e61c2793d 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -17,14 +17,14 @@ PHPSupportUTF8=Ihre PHP-Konfiguration unterstützt die UTF8-Funktionen.
 PHPSupportIntl=This PHP supports Intl functions.
 PHPMemoryOK=Die Sitzungsspeicherbegrenzung ihrer PHP-Konfiguration steht auf <b>%s</b>. Dies sollte ausreichend sein.
 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
+Recheck=Klicken Sie hier für einen detailierteren Test.
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Ihre PHP-Version unterstützt die Erweiterung Curl nicht
 ErrorPHPDoesNotSupportUTF8=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.
 ErrorDirDoesNotExists=Das Verzeichnis %s existiert nicht.
-ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorGoBackAndCorrectParameters=Gehen Sie zurück und prüfen/korrigieren Sie die Parameter.
 ErrorWrongValueForParameter=Sie haben einen falschen Wert für den Parameter '%s' eingegeben.
 ErrorFailedToCreateDatabase=Fehler beim Erstellen der Datenbank '%s'.
 ErrorFailedToConnectToDatabase=Es konnte keine Verbindung zur Datenbank ' %s'.
@@ -51,10 +51,10 @@ ServerAddressDescription=Name or ip address for the database server. Usually 'lo
 ServerPortDescription=Datenbankserver-Port. Lassen Sie dieses Feld im Zweifel leer.
 DatabaseServer=Datenbankserver
 DatabaseName=Name der Datenbank
-DatabasePrefix=Database table prefix
+DatabasePrefix=Präfix für die Datenbanktabellen
 DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
 AdminLogin=User account for the Dolibarr database owner.
-PasswordAgain=Retype password confirmation
+PasswordAgain=Passworteingabe bestätigen
 AdminPassword=Passwort des dolibarr-Datenbankadministrators
 CreateDatabase=Datenbank erstellen
 CreateUser=Create user account or grant user account permission on the Dolibarr database
@@ -63,7 +63,7 @@ CheckToCreateDatabase=Check the box if the database does not exist yet and so mu
 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
+SaveConfigurationFile=Konfigurationsdaten werden gespeichert 
 ServerConnection=Serververbindung
 DatabaseCreation=Erstellung der Datenbank
 CreateDatabaseObjects=Anlegen der Datenbankobjekte
@@ -74,9 +74,9 @@ CreateOtherKeysForTable=Erstellen der Fremdschlüssel und Indizes für Tabelle %
 OtherKeysCreation=Erstellen der Fremdschlüssel und Indizes
 FunctionsCreation=Erstellen der Funktionen
 AdminAccountCreation=Erstellen des Administrationskontos
-PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Passwords differs, please try again!
+PleaseTypePassword=Bitte geben Sie ein Passwort ein. Leere Passwörter sind nicht erlaubt.
+PleaseTypeALogin=Bitte geben Sie den Benutzernamen ein. 
+PasswordsMismatch=Die eingegebenen Passwörter stimmen nicht überein. \nBitte versuchen Sie es erneut! 
 SetupEnd=Ende der Erstkonfiguration
 SystemIsInstalled=Die Installation wurde erfolgreich abgeschlossen.
 SystemIsUpgraded=Der Aktualisierungsvorgang wurde erfolgreich abgeschlossen.
@@ -87,10 +87,10 @@ GoToSetupArea=Zu den dolibarr-Einstellungen
 MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Noch einmal zur Aktualisierungsseite
 WithNoSlashAtTheEnd=Ohne Schrägstrich "/" am Ende
-DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
+DirectoryRecommendation=Es empfiehlt sich die Verwendung eines Ordners außerhalb Ihres Webverzeichnisses. 
 LoginAlreadyExists=Dieser Benutzername ist bereits vergeben
 DolibarrAdminLogin=Anmeldung für dolibarr-Administrator
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+AdminLoginAlreadyExists=Ein Administratorkonto '<b>%s</b>' ist bereits vorhanden. \nGehen Sie zurück um ein anderes Konto zu erstellen.
 FailedToCreateAdminLogin=Fehler beim erstellen des Dolibarr Administrator Kontos.
 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=Diese Funktion steht in Ihrer eingesetzten PHP-Version nicht zur Verfügung.
@@ -101,12 +101,12 @@ ProcessMigrateScript=Script-Verarbeitung
 ChooseYourSetupMode=Wählen Sie Ihre Installationsart und klicken Sie anschließend auf "Start"...
 FreshInstall=Neue Installation
 FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
-Upgrade=Aktualisierung
+Upgrade=Aktualisierung / Upgrade
 UpgradeDesc=Verwenden Sie diesen Modus zum Ersetzen Ihrer bisherigen Dolibarr-Version durch eine Neuere. Hiermit werden Ihre Daten und der Inhalt Ihrer Datenbank aktualisiert.
 Start=Start
 InstallNotAllowed=Die in der Konfigurationsdatei <b>conf.php</b> gesetzten Berechtigungen verhindern eine Ausführung des Installationsvorganges.
 YouMustCreateWithPermission=Für den Installationsvorgang erstellen Sie bitte die Datei %s und machen Sie diese für Ihren Webserver beschreibbar.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+CorrectProblemAndReloadPage=Bitte beheben Sie das Problem und drücken anschließend auf F5 um die Seite neu zu laden. 
 AlreadyDone=Migration bereits durchgeführt
 DatabaseVersion=Datenbankversion
 ServerVersion=Version des Datenbankservers
@@ -123,7 +123,7 @@ ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>"
 InstallChoiceRecommanded=Es empfiehlt sich eine Aktualisierung auf Version <b>%s</b>. Ihre aktuelle Version ist <b>%s</b>.
 InstallChoiceSuggested=<b>Vom Installationsassistenten vorgeschlagene Wahl</b>
 MigrateIsDoneStepByStep=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.
+CheckThatDatabasenameIsCorrect=Bitte überprüfen Sie, ob der Datenbankname "<b>%s</b>" korrekt ist.
 IfAlreadyExistsCheckOption=Sollte dieser Name korrekt und die Datenbank noch nicht vorhanden sein, aktivieren Sie bitte das Kontrollkästchen "Datenbank erstellen".
 OpenBaseDir=PHP openbasedir Einstellungen
 YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
@@ -154,7 +154,7 @@ MigrationSupplierOrder=Datenmigration für Lieferantenaufträge
 MigrationProposal=Datenmigration für Angebote
 MigrationInvoice=Datenmigration für Kundenrechnungen
 MigrationContract=Datenmigration für Verträge
-MigrationSuccessfullUpdate=Aktualisierung erfolgreich
+MigrationSuccessfullUpdate=Aktualisierung erfolgreich abgeschlossen
 MigrationUpdateFailed=Aktualisierungsvorgang fehlgeschlagen.
 MigrationRelationshipTables=Datenmigration für Relationentabellen (%s)
 MigrationPaymentsUpdate=Update Zahlungen (n-n Link Rechnungszahlungen)
@@ -194,9 +194,9 @@ MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Datenmigration des Feldes fk_user_resp von llx_projet nach llx_element_contact
 MigrationProjectTaskTime=Aktualisiere aufgewandte Zeit (in Sekunden)
 MigrationActioncommElement=Aktualisiere die Termine/Aufgaben
-MigrationPaymentMode=Data migration for payment type
+MigrationPaymentMode=Migration der Daten für die Zahlungsart 
 MigrationCategorieAssociation=Migration von Kategorien
-MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEvents=Ereignisse migrieren, um den Ereigniseigentümer in die Zuordnungstabelle aufzunehmen
 MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Aktualisieren Sie den Wert des Feld "entity" der Tabelle "llx_societe_remise"
 MigrationRemiseExceptEntity=Aktualisieren Sie den Wert des Feld "entity" der Tabelle "llx_societe_remise_except"
diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
index 2e8f54bbd27..6571e73cfa2 100644
--- a/htdocs/langs/de_DE/interventions.lang
+++ b/htdocs/langs/de_DE/interventions.lang
@@ -29,7 +29,7 @@ InterventionClassifyUnBilled=Als "nicht verrechnet" markieren
 InterventionClassifyDone=Classify "Done"
 StatusInterInvoiced=Angekündigt
 SendInterventionRef=Einreichung von Serviceauftrag %s
-SendInterventionByMail=Send intervention by email
+SendInterventionByMail=Serviceauftrag per E-Mail versenden 
 InterventionCreatedInDolibarr=Serviceauftrag %s erstellt
 InterventionValidatedInDolibarr=Serviceauftrag %s freigegeben
 InterventionModifiedInDolibarr=Serviceauftrag %s geändert
diff --git a/htdocs/langs/de_DE/ldap.lang b/htdocs/langs/de_DE/ldap.lang
index 75a9c2db651..db0bdeaf78f 100644
--- a/htdocs/langs/de_DE/ldap.lang
+++ b/htdocs/langs/de_DE/ldap.lang
@@ -24,4 +24,4 @@ MemberTypeSynchronized=Mitgliedsart synchronisiert
 ContactSynchronized=Kontakt synchronisiert
 ForceSynchronize=Erzwinge Synchronisation  Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Fehler beim Lesen der LDAP-Datenbank. Überprüfen Sie die Verfügbarkeit der Datenbank sowie die entsprechenden Moduleinstellungen.
-PasswordOfUserInLDAP=Password of user in LDAP
+PasswordOfUserInLDAP=Passwort des Benutzers in LDAP
diff --git a/htdocs/langs/de_DE/link.lang b/htdocs/langs/de_DE/link.lang
index fc0757b539f..9c561230019 100644
--- a/htdocs/langs/de_DE/link.lang
+++ b/htdocs/langs/de_DE/link.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - languages
-LinkANewFile=Verknüpfe eine neue Datei /Dokument
+LinkANewFile=Verknüpfe eine neue Datei / ein Dokument
 LinkedFiles=Verknüpfte Dateien und Dokumente
 NoLinkFound=Keine  verknüpften Links
-LinkComplete=Die Datei wurde erfolgreich verlinkt
-ErrorFileNotLinked=Die Datei konnte nicht verlinkt werden
+LinkComplete=Die Datei wurde erfolgreich verlinkt.
+ErrorFileNotLinked=Die Datei konnte nicht verlinkt werden.
 LinkRemoved=Der Link %s wurde entfernt
 ErrorFailedToDeleteLink= Fehler beim entfernen des Links  '<b>%s</b>'
 ErrorFailedToUpdateLink= Fehler beim aktualisieren des Link  '<b>%s</b>'
-URLToLink=URL zum Verlinken
+URLToLink=URL zum verlinken
diff --git a/htdocs/langs/de_DE/loan.lang b/htdocs/langs/de_DE/loan.lang
index 46deed0a541..e286daf02db 100644
--- a/htdocs/langs/de_DE/loan.lang
+++ b/htdocs/langs/de_DE/loan.lang
@@ -10,7 +10,7 @@ LoanCapital=Kapital
 Insurance=Versicherung
 Interest=Zins
 Nbterms=Anzahl der Bedingungen
-Term=Term
+Term=Bedingungen
 LoanAccountancyCapitalCode=Buchhaltungskonto Kapital
 LoanAccountancyInsuranceCode=Buchhaltungskonto Versicherung
 LoanAccountancyInterestCode=Buchhaltungskonto Zinsen
@@ -20,12 +20,12 @@ ConfirmPayLoan=Bestätigen Sie das Löschen dieses Kredites
 LoanPaid=Kredit bezahlt
 ListLoanAssociatedProject=Liste der Darlehen in dem Projekt
 AddLoan=Darlehen erstellen
-FinancialCommitment=Financial commitment
+FinancialCommitment=Finanzielle Verpflichtung
 InterestAmount=Zins
-CapitalRemain=Capital remain
+CapitalRemain=Verbleibendes Kapital
 # Admin
 ConfigLoan=Konfiguration des Modul Kredite
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standard-Buchhaltungskonto Kapital
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Standard-Buchhaltungskonto Zinsen
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Standard-Buchhaltungskonto Versicherung
-CreateCalcSchedule=Edit financial commitment
+CreateCalcSchedule=Finanzielle Verpflichtung bearbeiten
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 7feb6971c85..c038968386c 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -15,10 +15,12 @@ MailToUsers=An Empfänger:
 MailCC=Kopie an
 MailToCCUsers=Kopie an Empfänger
 MailCCC=Blindkopie an
-MailTopic=Email topic
+MailTopic=e-Mail Betreff
 MailText=Inhalt
 MailFile=Angehängte Dateien
 MailMessage=E-Mail Text
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Zeige E-Mail-Kampagne
 ListOfEMailings=Liste der E-Mail-Kampagnen
 NewMailing=Neue E-Mail-Kampagne
@@ -57,7 +59,7 @@ YouCanAddYourOwnPredefindedListHere=Für nähere Informationen zur Erstellung Ih
 EMailTestSubstitutionReplacedByGenericValues=Im Testmodus werden die Variablen durch generische Werte ersetzt
 MailingAddFile=Ausgewählte Datei anhängen
 NoAttachedFiles=Keine angehängten Dateien
-BadEMail=Bad value for Email
+BadEMail=falsche Wert für e-Mail
 ConfirmCloneEMailing=Möchten Sie diese E-Mail-Kampagne wirklich duplizieren?
 CloneContent=Inhalt duplizieren
 CloneReceivers=Empfängerliste duplizieren
@@ -67,7 +69,7 @@ SentTo=Versendet an <b>%s</b>
 MailingStatusRead=gelesen
 YourMailUnsubcribeOK=Die E-Mail-Adresse <b>%s</b> wurde erfolgreich aus der Mailing-Liste ausgetragen.
 ActivateCheckReadKey=Schlüssel um die URL für die Funktion der versteckten Lesebestätigung und den "Abmelden"-Link zu generieren
-EMailSentToNRecipients=Email sent to %s recipients.
+EMailSentToNRecipients=E-Mail an %s Empfänger gesendet 
 EMailSentForNElements=Email sent for %s elements.
 XTargetsAdded=<b>%s</b> Empfänger der Liste zugefügt
 OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index ad0462aad12..68d80ba1add 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -333,7 +333,7 @@ Copy=Kopieren
 Paste=Einfügen
 Default=Standard
 DefaultValue=Standardwert
-DefaultValues=Standard Werte/Filter/Sortierung
+DefaultValues=Standard-Werte/Filter/Sortierung
 Price=Preis
 PriceCurrency=Preis (Währung)
 UnitPrice=Stückpreis
@@ -371,6 +371,7 @@ Percentage=Prozentsatz
 Total=Gesamt
 SubTotal=Zwischensumme
 TotalHTShort=Nettosumme
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Summe (Netto in Währung)
 TotalTTCShort=Gesamt (inkl. Ust)
 TotalHT=Nettosumme
@@ -525,7 +526,7 @@ DeletePicture=Bild löschen
 ConfirmDeletePicture=Bild wirklich löschen?
 Login=Benutzername
 LoginEmail=Benutzer (Email)
-LoginOrEmail=Benutzername oder Emailadresse
+LoginOrEmail=Benutzername oder E-Mail-Adresse
 CurrentLogin=Aktuelle Anmeldung
 EnterLoginDetail=Bitte geben ie Ihre Login-Daten ein
 January=Januar
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Bestätigungsmail senden
 SendMail=sende E-Mail
 Email=E-Mail
 NoEMail=Keine E-Mail
-Email=E-Mail
 AlreadyRead=Bereits gelesen
 NotRead=Nicht gelesen
 NoMobilePhone=Kein Handy
@@ -671,7 +671,6 @@ Method=Methode
 Receive=Erhalten
 CompleteOrNoMoreReceptionExpected=Vollständig oder nichts mehr erwartet
 ExpectedValue=Erwarteter Wert
-CurrentValue=Aktueller Wert
 PartialWoman=Teilweise
 TotalWoman=Vollständig
 NeverReceived=Nie erhalten
@@ -834,6 +833,7 @@ RelatedObjects=Verknüpfte Objekte
 ClassifyBilled=Als verrechnet markieren
 ClassifyUnbilled=als "nicht berechnet" markieren
 Progress=Entwicklung
+ProgressShort=Progr.
 FrontOffice=Frontoffice
 BackOffice=Backoffice
 View=Ansicht
@@ -842,6 +842,11 @@ Exports=Exporte
 ExportFilteredList=Exportiere gefilterte Auswahl
 ExportList=Liste exportieren
 ExportOptions=Exportoptionen
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Verschiedenes
 Calendar=Terminkalender
 GroupBy=Gruppiere nach ...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Dokument herunterladen
 ActualizeCurrency=Update-Wechselkurs
 Fiscalyear=Fiskalisches Jahr
-ModuleBuilder=Modul-Generator
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Währung festlegen
 BulkActions=Massenaktionen
 ClickToShowHelp=Klicken um die Tooltiphilfe anzuzeigen
@@ -970,3 +975,7 @@ TMenuMRP=Stücklisten
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang
index cd0b821f9ab..52dbeb68119 100644
--- a/htdocs/langs/de_DE/margins.lang
+++ b/htdocs/langs/de_DE/margins.lang
@@ -17,21 +17,21 @@ ProductMargins=Produkt-Gewinnspannen
 CustomerMargins=Kunden-Gewinnspannen
 SalesRepresentativeMargins=Vertreter-Gewinnspannen
 UserMargins=Spannen nach Benutzer
-ProductService=Produkt oder Service
+ProductService=Produkt oder Dienstleistung
 AllProducts=Alle Produkte und Leistungen
 ChooseProduct/Service=Produkt oder Service wählen
 ForceBuyingPriceIfNull=Benutze EK-Preis/Herstellkosten als Verkaufspreis, wenn nicht definiert
 ForceBuyingPriceIfNullDetails=Falls die Option aktiviert ist, wird die Spanne der Zeile mit Null angezeigt (EK-Preis/Herstellkosten = Verkaufspreis). Ist die Option deaktiviert, wird die Spanne gleich der Voreinstellung sein.
 MARGIN_METHODE_FOR_DISCOUNT=Margin-Methode für globale Rabatte
-UseDiscountAsProduct=Als Produkt
-UseDiscountAsService=Als Service
-UseDiscountOnTotal=Auf Zwischensumme
+UseDiscountAsProduct=als Produkt
+UseDiscountAsService=als Dienstleistung
+UseDiscountOnTotal=auf Zwischensumme
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definiert, ob ein globaler Rabatt als Produkt, Service oder nur als Zwischensumme für die Gewinnberechnung benutzt wird.
 MARGIN_TYPE=Kaufpreis / Kosten standardmäßig vorgeschlagen für Standardmargenkalkulation empfohlen\n
-MargeType1=Margin on Best vendor price
+MargeType1=Marge beim günstigsten Einkaufspreis
 MargeType2=gewichtete Durchschnittspreis (WAP)
 MargeType3=Marge auf Herstellkosten
-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=Selbstkostenpreis
 UnitCharges=Einheit Kosten
 Charges=Kosten
@@ -41,4 +41,4 @@ rateMustBeNumeric=Die Rate muss ein numerischer Wert sein
 markRateShouldBeLesserThan100=Die markierte Rate sollte kleiner sein als 100
 ShowMarginInfos=Zeige Rand-Informationen
 CheckMargins=Detail zu Gewinnspanne
-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=Der Margenbericht pro Benutzer verwendet den Link zwischen Partnern und Verkäufern um die Margen pro Verkäufer zu berechnen. Weil manche Partner keinen Verkäufer zugewiesen haben, werden machen Beträge in diesem Bericht fehlen (Wenn kein Verkäufer definiert ist) und andere kommen auf verschiedenen Zeilen (Für alle Verkäufer).
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index 70a0cf5e2b3..fe9e9fc18c3 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=Mitglieder-Übersicht
-MemberCard=Mitglied - Karte
+MembersArea=Mitgliederbereich
+MemberCard=Mitgliedskarte
 SubscriptionCard=Abonnement - Karte
 Member=Mitglied
 Members=Mitglieder
 ShowMember=Zeige Mitgliedskarte
 UserNotLinkedToMember=Der Benutzer ist keinem Mitglied zugewiesen
-ThirdpartyNotLinkedToMember=Partner ist nicht mit einem Mitglied verknüpft
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Tickets von Mitgliedern
 FundationMembers=Stiftungsmitglieder
 ListOfValidatedPublicMembers=Liste der freigegebenen, öffentlichen Mitglieder
@@ -67,11 +67,11 @@ Subscriptions=Mitgliedschaften / Beiträge
 SubscriptionLate=Verspätet
 SubscriptionNotReceived=Abonnement nie erhalten
 ListOfSubscriptions=Liste der Beiträge
-SendCardByMail=Karte per E-Mail versenden
+SendCardByMail=Send card by email
 AddMember=Mitglied erstellen
 NoTypeDefinedGoToSetup=Sie haben noch keine Mitgliedsarten definiert. Sie können dies unter Einstellungen-Mitgliedsarten vornehmen.
 NewMemberType=Neue Mitgliedsart
-WelcomeEMail=Willkommen E-Mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Abonnement erforderlich
 DeleteType=Lösche Gruppe
 VoteAllowed=Stimmrecht
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Sind Sie sicher, dass diese Buchung löschen wollen?
 Filehtpasswd=htpasswd Datei
 ValidateMember=Mitglied freigeben
 ConfirmValidateMember=Möchten Sie dieses Mitglied wirklich aktivieren?
-FollowingLinksArePublic=Die folgenden Links sind öffentlich zugängliche Seiten und als solche nicht durch die Dolibarr-Zugriffskontrolle geschützt. Es handelt sich dabei zudem um unformatierte Seiten, die beispielsweise eine Liste aller in der Datenbank eingetragenen Mitglieder anzeigen.
+FollowingLinksArePublic=Die folgenden Links sind öffentlich zugängliche Seiten und als solche nicht durch die Dolibarr-Zugriffskontrolle geschützt. Es handelt sich dabei zudem um unformatierte Seiten, die beispielsweise eine Liste aller in der Datenbank eingetragenen Mitglieder anzeigen. 
 PublicMemberList=Liste öffentlicher Mitglieder
 BlankSubscriptionForm=Öffentliches Selbstabonnement
 BlankSubscriptionFormDesc=Dolibarr kann Ihnen eine öffentliche URL / Website zur Verfügung stellen, die es externen Besuchern erlaubt, die Stiftung zu abonnieren. Wenn ein Online-Zahlungsmodul aktiviert ist, kann auch automatisch ein Zahlungsformular bereitgestellt werden.
@@ -107,33 +107,33 @@ SubscriptionNotRecorded=Mitgliedschaft nicht erfasst
 AddSubscription=Abonnement erstellen
 ShowSubscription=Zeige Abonnement
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
-SendingEmailOnCancelation=Sending email on cancelation
+SendingAnEMailToMember=Informationsmail an Mitglied senden
+SendingEmailOnAutoSubscription=E-Mail bei Selbstregistrierung senden
+SendingEmailOnMemberValidation=E-Mail bei Mitgliedervalidierung senden
+SendingEmailOnNewSubscription=E-Mail bei neuem Abonnement senden
+SendingReminderForExpiredSubscription=E-Mail Erinnerung für abgelaufene Abonnemente senden
+SendingEmailOnCancelation=E-Mail bei Stornierung senden
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
-YourMembershipWasCanceled=Your membership was canceled
+YourMembershipRequestWasReceived=Ihr Mitgliedsantrag wurde erhalten.
+YourMembershipWasValidated=Ihre Mitgleidschaft wurde validiert
+YourSubscriptionWasRecorded=Ihr Abonnement wurde registriert
+SubscriptionReminderEmail=Abonnementserinnerung
+YourMembershipWasCanceled=Ihre Mitgliedschaft wurde beendet
 CardContent=Inhalt der Mitgliedskarte
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Betreff der E-Mail im Falle der automatischen Registrierung eines Gastes 
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Empfangene E-Mail im Falle der automatischen Registrierung eines Gastes 
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Absender E-Mail-Adresse für automatische Mails
+ThisIsContentOfYourMembershipRequestWasReceived=Wir haben Ihren Mitgliedsantrag erhalten.<br><br>
+ThisIsContentOfYourMembershipWasValidated=Ihr Mitgliedsantrag wurde mit diesem Resultat geprüft:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=Ihr neues Abonnement wurde erfasst.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format der Etikettenseite
 DescADHERENT_ETIQUETTE_TEXT=Text für den Druck auf der Mitglieds-Adresskarte
 DescADHERENT_CARD_TYPE=Format der Kartenseite
@@ -156,8 +156,8 @@ DocForAllMembersCards=Visitenkarten für alle Mitglieder erstellen (Gewähltes A
 DocForOneMemberCards=Visitenkarten für ein bestimmtes Mitglied erstellen (Gewähltes Ausgabeformat: <b>%s</b>)
 DocForLabels=Etiketten erstellen (Gewähltes Ausgabeformat: <b>%s</b>)
 SubscriptionPayment=Beitragszahlung 
-LastSubscriptionDate=Letztes Abo-Datum
-LastSubscriptionAmount=Letzter Abo-Betrag
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Mitgliederstatistik nach Ländern
 MembersStatisticsByState=Mitgliederstatistik nach Bundesländern
 MembersStatisticsByTown=Mitgliederstatistik nach Städten
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Natürliche Mitgliederstatistiken
 MembersByNature=Dieser Bildschirm zeigt ihre Statistiken über ihre Mitgliedschaft.
 MembersByRegion=Dieser Bildschirm zeigt Ihnen Statistiken über Mitglieder nach Regionen.
 VATToUseForSubscriptions=Mehrwertsteuersatz für Mitgliedschaften
-NoVatOnSubscription=Kein USt. auf Mitgliedschaft.
-MEMBER_PAYONLINE_SENDEMAIL=E-Mail-Adresse, die E-Mail-Benachrichtungen verwendet werden soll, wenn Dolibarr die Bestätigung einer freigegebenen Zahlung für eine Mitgliedschaft erhält (Beispiel: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt/Leistung verwendet für den Beitrag in der Rechnungszeile: %s
 NameOrCompany=Name oder Firma
-SubscriptionRecorded=Subscription recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+SubscriptionRecorded=Abonnement erfasst
+NoEmailSentToMember=Kein E-Mail an Mitglied gesendet
+EmailSentToMember=E-Mail an Mitglied %s versendet
+SendReminderForExpiredSubscriptionTitle=E-Mailerinnerung für abgelaufene Abonnemente senden
+SendReminderForExpiredSubscription=Erinnerungen per email an Mitglieder senden, wenn deren Abonnement am ablaufen ist. (Parameter ist die Anzahl Tage vor dem Abonnementsende, um die Erinnerung zu senden. Es können mehrere Tage sein, mit Semikolon getrennt aufgelistet, z.B.  '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
diff --git a/htdocs/langs/de_DE/modulebuilder.lang b/htdocs/langs/de_DE/modulebuilder.lang
index 3d47e9718d5..754835ce4c8 100644
--- a/htdocs/langs/de_DE/modulebuilder.lang
+++ b/htdocs/langs/de_DE/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Geben Sie den Namen des Moduls/der Anwendung ohne Leerzeichen ein, das erstellt werden soll. Verwenden Sie Großbuchstaben, um Wörter zu trennen (z.B.: MyModule, EcommerceForShop, SyncWithMySystem....).
 EnterNameOfObjectDesc=Geben Sie den Namen des zu erstellenden Objekts ohne Leerzeichen ein. Verwenden Sie Großbuchstaben, um Wörter zu trennen (z.B. MyObject, Student, Teacher....). Die CRUD-Klassendatei, aber auch die API-Datei, Seiten zum Auflisten, Hinzufügen, Bearbeiten und Löschen von Objekten und SQL-Dateien werden generiert.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=Dies ist die Ansicht der von Ihrem Modul bereitgestell
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=Sie können hier eine "ready to distribute" Paketdatei (eine normalisierte.zip-Datei) Ihres Moduls und eine "ready to distribute" Dokumentationsdatei erzeugen. Klicken Sie einfach auf die Schaltfläche, um das Paket oder die Dokumentationsdatei zu erstellen.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Gefahrenzone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Dokumentation erstellen
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Pfad des zu komprimierenden Moduls/Anwendungspakets
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Leer- oder Sonderzeichen sind nicht erlaubt.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme Datei
 ChangeLog=ChangeLog Datei
 TestClassFile=Datei für PHP Unit Testklasse
 SqlFile=Sql Datei
-PageForLib=Datei für PHP Bibliotheken
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=SQL Datei für zusätzliche Eigenschaften
 SqlFileKey=SQL Datei für Schlüsselwerte
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Geben Sie in diese Dateien alle Schlüssel und entsprechende Übersetzung für jede Sprachdatei ein.
-MenusDefDesc=Definieren Sie hier die Menüs Ihres Moduls (einmal definiert, sind diese im Menü-Editor %s sichtbar)
-PermissionsDefDesc=Definieren Sie hier die neuen Berechtigungen, die von Ihrem Modul zur Verfügung gestellt werden (sobald diese definiert sind, sind sie in den Standard-Berechtigungseinstellungen %s sichtbar)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Definieren Sie in der Eigenschaft <b> module_parts ['hooks'] </b> im Moduldeskriptor den Kontext der Hooks, die Sie verwalten möchten (die Liste der Kontexte kann durch eine Suche nach '<b> initHooks (</b> 'im Hauptcode) gefunden werden. <br> Bearbeiten Sie die Hook-Datei, um Ihrer hooked-Funktionen Code hinzuzufügen (hookable functions können durch eine Suche nach' <b> executeHooks </b> 'im Core-Code gefunden werden).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=Zeige die ID's die in Ihrer Installation verwendet werden
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/de_DE/multicurrency.lang b/htdocs/langs/de_DE/multicurrency.lang
index 1e8d7b67a1c..0d9a41c09be 100644
--- a/htdocs/langs/de_DE/multicurrency.lang
+++ b/htdocs/langs/de_DE/multicurrency.lang
@@ -4,17 +4,17 @@ ErrorAddRateFail=Fehler in hinzugefügtem Währungskurs
 ErrorAddCurrencyFail=Fehler in hinzugefügter Währung
 ErrorDeleteCurrencyFail=Fehler, konnte Daten nicht löschen
 multicurrency_syncronize_error=Synchronisationsfehler: %s
-MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Dokumentendatum zum Ermitteln des Währungskurs verwenden, sonst wird der aktuelle Währungskurs verwendet.
-multicurrency_useOriginTx=Wenn ein Objekt anhand eines anderen Erstellt wird, den Währungskurs des Originals beibehalten (Ansonsten wird der aktuelle Währungskurs verwendet)
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Datum des Dokumentes benutzen, um den Währungskurs zu bestimmmen, sonst wird der zuletzt bekannte Kurs genutzt.
+multicurrency_useOriginTx=Wenn ein Beleg anhand eines anderen erstellt wird, den Währungskurs des Originals beibehalten. \n(Ansonsten wird der aktuelle Währungskurs verwendet.)
 CurrencyLayerAccount=Währungslayer API
-CurrencyLayerAccount_help_to_synchronize=Erstellen Sie ein Konto auf ihrer Webseite um die Funktionalität <br> nutzen zu können. <br />Erhalten sie ihren <b>API key</b><br />Bei Gratisaccounts kann die <b>Währungsquelle</b> nicht verändert werden (USD Standard)<br />Wenn ihre Basiswährung nicht USD ist, kann die <b>Alternative Währungsquelle</b> zum übersteuern der Hauptwährung verwendet werden<br />Sie sind auf 1000 Synchronisationen pro Monat begrenzt
-multicurrency_appId=API key
-multicurrency_appCurrencySource=Währungsquelle
-multicurrency_alternateCurrencySource=Alternative Währungsquelle
-CurrenciesUsed=Verwendete Währungen
-CurrenciesUsed_help_to_add=Währungen und Währungskurse erfassen, die Sie für <b>Angebote</b>, <b>Bestellungen</b>, etc. benötigen
-rate=Währungskurs
-MulticurrencyReceived=Erhalten, Originalwährung
-MulticurrencyRemainderToTake=Verbleibender Betrag, Originalwährung
-MulticurrencyPaymentAmount=Zahlungsbetrag, Originalwährung
-AmountToOthercurrency=Betrag (In der Währung des Empfängers)
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API Schlüssel
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=verwendete Währungen
+CurrenciesUsed_help_to_add=Fügen Sie die Währungen und Währungskurse hinzu, die Sie für ihre <b>Angebote</b>, <b>Bestellungen</b>, etc. benötigen 
+rate=Währungskurs / Wechselkurs
+MulticurrencyReceived=erhaltener Betrag (Originalwährung)
+MulticurrencyRemainderToTake=verbleibender Betrag  (Originalwährung)
+MulticurrencyPaymentAmount=Zahlungsbetrag  (Originalwährung)
+AmountToOthercurrency=Betrag  (in der Währung des Empfängers)
diff --git a/htdocs/langs/de_DE/opensurvey.lang b/htdocs/langs/de_DE/opensurvey.lang
index f40a2062e82..30ada367160 100644
--- a/htdocs/langs/de_DE/opensurvey.lang
+++ b/htdocs/langs/de_DE/opensurvey.lang
@@ -1,30 +1,30 @@
 # Dolibarr language file - Source file is en_US - opensurvey
 Survey=Umfrage
 Surveys=Umfragen
-OrganizeYourMeetingEasily=Organisieren Sie einfach Besprechungen und Umfragen. Zuerst den Umfrage-Typ wählen...
+OrganizeYourMeetingEasily=Lassen Sie über Termine und andere Optionen ganz einfach abstimmen. Bitte wählen Sie zuerst den Umfragen-Typ:
 NewSurvey=Neue Umfrage
 OpenSurveyArea=Umfragen-Übersicht
-AddACommentForPoll=Sie können einen Kommentar zur Umfrage hinzufügen...
+AddACommentForPoll=Hier können Sie einen Kommentar zur Umfrage hinzufügen:
 AddComment=Kommentar hinzufügen
-CreatePoll=Abstimmung erstellen
-PollTitle=Abstimmungstitel
-ToReceiveEMailForEachVote=E-Mail für jede Stimme erhalten
-TypeDate=Typ Datum
-TypeClassic=Typ Standard
-OpenSurveyStep2=Wählen Sie Ihre Daten aus den freien Tagen (grau). Die ausgewählten Tage erscheinen grün. Sie können einen bereits ausgewählten Tag durch anklicken wieder abwählen.
+CreatePoll=Umfrage erstellen
+PollTitle=Titel der Umfrage
+ToReceiveEMailForEachVote=E-Mail für jede abgegebene Stimme erhalten
+TypeDate=Datumsumfrage
+TypeClassic=Standardumfrage
+OpenSurveyStep2=Wählen Sie Ihre Daten aus den freien Tagen (Grau). Ausgewählte Tage erscheinen Grün und lassen sich durch erneutes Anklicken wieder abwählen.
 RemoveAllDays=Alle Tage entfernen
-CopyHoursOfFirstDay=Stunden vom ersten Tag kopieren
-RemoveAllHours=Alle Stunden entfernen
+CopyHoursOfFirstDay=Zeiten vom ersten Tag kopieren
+RemoveAllHours=Alle Zeiten entfernen
 SelectedDays=Ausgewählte Tage
-TheBestChoice=Die beste Möglichkeit ist momentan
-TheBestChoices=Die besten Möglichkeiten sind momentan
+TheBestChoice=Die beste Option / Möglichkeit ist momentan
+TheBestChoices=Die besten Optionen / Möglichkeiten sind momentan
 with=mit
-OpenSurveyHowTo=Wenn Sie an dieser Abstimmung teilnehmen möchten, nennen Sie Ihren Namen, wählen Sie die am besten passenden Werte und bestätigen mit dem Plus-Button am Ende der Zeile.
-CommentsOfVoters=Kommentare der Wähler
-ConfirmRemovalOfPoll=Sind Sie sicher, dass Sie diese Umfrage löschen wollen (mit allen gespeicherten Stimmen)
-RemovePoll=Entferne Abstimmung
-UrlForSurvey=Öffentliche URL für einen Direktzugriff zur Umfrage
-PollOnChoice=Sie erstellen eine Umfrage mit einer Multiple Choice-Variante. Geben Sie zuerst alle möglichen Varianten für die Abstimmung ein:
+OpenSurveyHowTo=Wenn Sie an dieser Abstimmung teilnehmen möchten, tragen Sie Ihren Namen ein, wählen Sie die für Sie beste Option / Möglichkeit und bestätigen mit dem Plus-Zeichen am Ende der Zeile.
+CommentsOfVoters=Kommentare der Teilnehmer
+ConfirmRemovalOfPoll=Sind Sie sicher, dass Sie diese Umfrage löschen wollen (inklusive aller gespeicherten Stimmen)
+RemovePoll=Entferne Umfrage
+UrlForSurvey=URL für einen Direktzugriff auf die Umfrage
+PollOnChoice=Sie erstellen eine Multiple-Choice-Umfrage. Geben Sie alle möglichen Varianten für die Abstimmung ein und wählen Sie den gewünschten Typ.
 CreateSurveyDate=Erstelle Datums-Umfrage
 CreateSurveyStandard=Erstelle Standard-Umfrage
 CheckBox=Einfaches Kontrollkästchen
@@ -32,13 +32,13 @@ YesNoList=Liste (leer/ja/nein)
 PourContreList=Liste (leer/dafür/dagegen)
 AddNewColumn=Neue Spalte hinzufügen
 TitleChoice=Beschreibung wählen
-ExportSpreadsheet=Exportiere Resultattabelle
+ExportSpreadsheet=Exportiere Abstimmungsergebnis
 ExpireDate=Frist
-NbOfSurveys=Anzahl Umfragen
-NbOfVoters=Anzahl Wähler
-SurveyResults=Resultate
-PollAdminDesc=Sie sind berechtigt, sämtliche Abstimmungszeilen mit dem Button "Edit" zu verändern. Sie können zusätzlich auch eine Spalte oder Zeile mit %s entfernen. Sie können auch eine neue Spalte hinzufügen mit %s.
-5MoreChoices=5 weitere Möglichkeiten
+NbOfSurveys=Anzahl an Umfragen
+NbOfVoters=Anzahl der Wähler
+SurveyResults=Abstimmungsergebnis(se)
+PollAdminDesc=Sie sind berechtigt sämtliche Abstimmungszeilen mit dem Button "Bearbeiten" zu verändern. Zudem können Sie auch eine Spalte oder Zeile mit dem %s-Symbol entfernen oder eine neue Spalte durch Klicken auf %s hinzuzufügen.
+5MoreChoices=5 weitere Optionen / Möglichkeiten hinzufügen ==>
 Against=Dagegen
 YouAreInivitedToVote=Sie sind eingeladen, Ihre Stimme abzugeben
 VoteNameAlreadyExists=Dieser Name wurde für diese Abstimmung schon benutzt
@@ -48,14 +48,14 @@ AddEndHour=Endzeit hinzufügen
 votes=Stimme(n)
 NoCommentYet=Bisher gibt es keine Kommentare für diese Abstimmung
 CanComment=Teilnehmer können kommentieren
-CanSeeOthersVote=Teilnehmer können die Auswahl anderer sehen
-SelectDayDesc=Für jeden ausgewählten Tag kann man die Besprechungszeiten im folgenden Format auswählen:<br>- leer,<br>- "8h", "8H" oder "8:00" für eine Besprechungs-Startzeit,<br>- "8-11", "8h-11h", "8H-11H" oder "8:00-11:00" für eine Besprechungs-Start und -Endzeit,<br>- "8h15-11h15", "8H15-11H15" oder "8:15-11:15" für das Gleiche aber mit Minuten.
+CanSeeOthersVote=Teilnehmer können die Auswahl Anderer sehen
+SelectDayDesc=Für jeden ausgewählten Tag kann man Zeiten im folgenden Format angeben:<br>- leer<br>- "8h", "8H" oder "8:00" für eine Startzeit<br>- "8-11", "8h-11h", "8H-11H" oder "8:00-11:00" für eine Start- und Endzeit<br>- "8h15-11h15", "8H15-11H15" oder "8:15-11:15" für eine Start- und Endzeit mit Minutenangabe.
 BackToCurrentMonth=Zurück zum aktuellen Monat
 ErrorOpenSurveyFillFirstSection=Sie haben den ersten Teil der Umfrage-Erstellung nicht ausgefüllt
-ErrorOpenSurveyOneChoice=Geben Sie mindestens eine Auswahl an
-ErrorInsertingComment=Beim Eintragen Ihres Kommentars ist ein Fehler aufgetreten
-MoreChoices=Geben Sie weitere Wahlmöglichkeiten ein
-SurveyExpiredInfo=Die Umfrage ist geschlossen oder beendet.
-EmailSomeoneVoted=%s hat eine Zeile gefüllt. Sie können Ihre Umfrage unter dem Link  finden: %s
+ErrorOpenSurveyOneChoice=Geben Sie mindestens eine Option an
+ErrorInsertingComment=Beim Erstellen Ihres Kommentars ist ein Fehler aufgetreten
+MoreChoices=Geben Sie weitere Optionen / Möglichkeiten ein
+SurveyExpiredInfo=Die Umfrage wurde geschlossen oder ist bereits beendet.
+EmailSomeoneVoted=%s hat eine Stimme abgegeben. Sie können Ihre Umfrage unter folgendem Link finden: %s
 ShowSurvey=Umfrage anzeigen
-UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
+UserMustBeSameThanUserUsedToVote=Um einen Kommentar hinzuzufügen müssen Sie bereits abgestimmt haben und den gleichen Benutzernamen wie bei Ihrer Abstimmung verwenden.
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index 595d6fb289c..94de9689408 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -19,10 +19,10 @@ SuppliersOrdersRunning=Aktuelle Lieferantenbestellungen
 CustomerOrder=Bestellung
 CustomersOrders=Verkaufsaufträge
 CustomersOrdersRunning=Aktuelle Kundenbestellungen
-CustomersOrdersAndOrdersLines=Sales orders and order details
+CustomersOrdersAndOrdersLines=Kundenaufträge und Auftragspositionen 
 OrdersDeliveredToBill=Gelieferte Kundenbestellungen zu verrechnen
 OrdersToBill=Gelieferte Kundenaufträge
-OrdersInProcess=Sales orders in process
+OrdersInProcess=Kundenaufträge in Bearbeitung 
 OrdersToProcess=Zu bearbeitende Kundenaufträge
 SuppliersOrdersToProcess=Lieferantenbestellung in Bearbeitung
 StatusOrderCanceledShort=Storniert
@@ -71,7 +71,7 @@ CancelOrder=Bestellung stornieren
 OrderReopened= Auftrag %s wieder geöffnet
 AddOrder=Bestellung erstellen
 AddToDraftOrders=Zu Bestellentwurf hinzufügen
-ShowOrder=Zeige Bestellung
+ShowOrder=Bestellung anzeigen
 OrdersOpened=Bestellungen zu bearbeiten
 NoDraftOrders=Keine Auftrags-Entwürfe
 NoOrder=Kein Auftrag
@@ -106,7 +106,7 @@ RefOrderSupplierShort=Lieferanten-BestellNr.
 SendOrderByMail=Bestellung per Post versenden
 ActionsOnOrder=Ereignisse zu dieser Bestellung
 NoArticleOfTypeProduct=Keine Artikel vom Typ 'Produkt' und deshalb keine Versandkostenposition
-OrderMode=Bestellweise
+OrderMode=Bestellmethode
 AuthorRequest=Autor/Anforderer
 UserWithApproveOrderGrant=Benutzer mit Berechtigung zur 'Bestellfreigabe'
 PaymentOrderRef=Zahlung zur Bestellung %s
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 70aad9a6394..b79e8d73ab4 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -36,10 +36,10 @@ Notify_ORDER_SENTBYMAIL=Kundenbestellung per E-Mail versendet
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Lieferantenbestellung per E-Mail zugestellt
 Notify_ORDER_SUPPLIER_VALIDATE=Lieferantenbestellung bestätigt
 Notify_ORDER_SUPPLIER_APPROVE=Lieferantenbestellung freigegeben
-Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+Notify_ORDER_SUPPLIER_REFUSE=Lieferantenbestellung abgelehnt 
 Notify_PROPAL_VALIDATE=Angebot freigegeben
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_CLOSE_SIGNED=geschlossene unterzeichnete Kundenangebote
+Notify_PROPAL_CLOSE_REFUSED=verworfene Kundenangebote, geschlossen
 Notify_PROPAL_SENTBYMAIL=Angebot mit E-Mail gesendet
 Notify_WITHDRAW_TRANSMIT=Transaktion zurückziehen
 Notify_WITHDRAW_CREDIT=Kreditkarten Rücknahme
diff --git a/htdocs/langs/de_DE/paybox.lang b/htdocs/langs/de_DE/paybox.lang
index 0a4fa7bd690..f789e067b5e 100644
--- a/htdocs/langs/de_DE/paybox.lang
+++ b/htdocs/langs/de_DE/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Vervollständigen
 YourEMail=E-Mail-Adresse für die Zahlungsbestätigung
 Creditor=Zahlungsempfänger
 PaymentCode=Zahlungscode
-PayBoxDoPayment=Mit Kredit- oder Debit-Karte bezahlen (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Zahlung tätigen
 YouWillBeRedirectedOnPayBox=Zur Eingabe Ihrer Kreditkartendaten werden Sie an eine sichere Bezahlseite weitergeleitet.
 Continue=Fortfahren
 ToOfferALinkForOnlinePayment=URL für %s Zahlung
-ToOfferALinkForOnlinePaymentOnOrder=URL um Ihren Kunden eine %s Online-Bezahlseite für Bestellungen anzubieten
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL um Ihren Kunden eine %s Online-Bezahlseite für Rechnungen anzubieten
 ToOfferALinkForOnlinePaymentOnContractLine=URL um Ihren Kunden eine %s Online-Bezahlseite für Vertragspositionen anzubieten
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL um Ihren Kunden eine %s Online-Bezahlseite für frei wählbare Beträge anzubieten
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL um Ihren Mitgliedern eine %s Online-Bezahlseite für Mitgliedsbeiträge
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Sie können auch den URL-Parameter <b>&tag=<i>value</i></b> an eine beliebige dieser URLs anhängen (erforderlich nur bei der freien Zahlung) um einen eigenen Zahlungskommentar hinzuzufügen.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Hiermit Bestätigen wir, dass die Zahlung ausgeführt wurde. Vielen Dank.
@@ -33,7 +33,8 @@ VendorName=Name des Lieferanten
 CSSUrlForPaymentForm=CSS-Datei für das Zahlungsmodul
 NewPayboxPaymentReceived=Neue Paybox-Zahlung erhalten
 NewPayboxPaymentFailed=Neue Paybox-Zahlungen probiert, aber fehlgeschlagen
-PAYBOX_PAYONLINE_SENDEMAIL=Status-E-Mail nach einer Zahlung (erfolgreich oder nicht)
+PAYBOX_PAYONLINE_SENDEMAIL=E-Mail Benachrichtigung nach Zahlungsversuch (erfolgreich oder fehlgeschlagen)
 PAYBOX_PBX_SITE=Wert für PayBox Seite
 PAYBOX_PBX_RANG=Wert für PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Wert für PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/de_DE/paypal.lang b/htdocs/langs/de_DE/paypal.lang
index e123cb94e6d..d1cfaafc469 100644
--- a/htdocs/langs/de_DE/paypal.lang
+++ b/htdocs/langs/de_DE/paypal.lang
@@ -1,20 +1,19 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal Moduleinstellungen
-PaypalDesc=Dieses Modul ermöglicht es Zahlungen von Kunden per <a href="http://www.paypal.com" target="_blank">PayPal</a> zu tätigen.
-PaypalOrCBDoPayment=Mit Paypal (Kreditkarte oder Paypal) bezahlen
-PaypalDoPayment=Zahlen mit Paypal
-PAYPAL_API_SANDBOX=Testmoduds/Sandbox
+PaypalDesc=Dieses Modul ermöglicht Zahlungen von Kunden über <a href="http://www.paypal.com" target="_blank">PayPal</a> zu tätigen. Es können ad-hoxc Zahlungen oder Zahlungen zu Vorgängen aus Dolibarr (Rechnungen, Bestellungen ...) erfolgen
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Zahlung mit PayPal 
+PAYPAL_API_SANDBOX=Testmodus/Sandbox
 PAYPAL_API_USER=Paypal Benutzername
 PAYPAL_API_PASSWORD=Paypal Passwort
 PAYPAL_API_SIGNATURE=Paypal Signatur
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Bieten Sie Zahlungen "integral" (Kreditkarte + Paypal) an, oder nur per "Paypal"?
-PaypalModeIntegral=Integral
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Integrierte Zahlung (Kreditkarte + PayPal) oder nur basic (PayPal)
+PaypalModeIntegral=Integriert
 PaypalModeOnlyPaypal=Nur PayPal
-ONLINE_PAYMENT_CSS_URL=Optionale Adresse der CSS-Datei für die Onlinebezahlseite
+ONLINE_PAYMENT_CSS_URL=Optionale URL des CSS-Stylesheet auf Zahlungsseite
 ThisIsTransactionId=Die Transaktions ID lautet: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Fügen Sie die Webadresse für Paypal Zahlungen hinzu, wenn Sie ein Dokument per E-Mail versenden.
-YouAreCurrentlyInSandboxMode=Sie befinden sich derzeit im %s "Sandbox" -Modus
+PAYPAL_ADD_PAYMENT_URL=Webadresse für Paypal Zahlungen hinzufügen für den Dokumentenversand per Email
 NewOnlinePaymentReceived=Neue Onlinezahlung erhalten
 NewOnlinePaymentFailed=Neue Onlinezahlung versucht, aber fehlgeschlagen
 ONLINE_PAYMENT_SENDEMAIL=Status-E-Mail nach einer Zahlung (erfolgreich oder nicht)
@@ -28,7 +27,10 @@ ShortErrorMessage=verkürzte Fehlermeldung
 ErrorCode=Fehlercode
 ErrorSeverityCode=Fehlercode Schwierigkeitsgrad
 OnlinePaymentSystem=Online Zahlungssystem
-PaypalLiveEnabled=Paypal live aktiviert (Nicht im Test/Sandbox Modus)
-PaypalImportPayment=Paypal-Zahlungen importieren
+PaypalLiveEnabled=PayPal live aktiviert (ansonsten im Test/Sandbox Modus) 
+PaypalImportPayment=Importieren der PayPal-Zahlungen
 PostActionAfterPayment=Aktionen nach Zahlungseingang
 ARollbackWasPerformedOnPostActions=Bei allen Post-Aktionen wurde ein Rollback durchgeführt. Sie müssen die Post-Aktionen manuell durchführen, wenn sie notwendig sind.
+ValidationOfPaymentFailed=Validierung der Paypal-Zahlung gescheitert
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/de_DE/printing.lang b/htdocs/langs/de_DE/printing.lang
index 9e7a056190d..644e1323244 100644
--- a/htdocs/langs/de_DE/printing.lang
+++ b/htdocs/langs/de_DE/printing.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - printing
 Module64000Name=Direkt drucken
 Module64000Desc=Direkt-Druck-System aktivieren 
-PrintingSetup=Direkt-Druck-System einrichten
-PrintingDesc=Dieses Modul fügt einen "Drucken"-Button zu, um Dokumente direkt zu einen Drucker zu senden. Dies erfordert ein Linux-System mit installiertem CUPS.
-MenuDirectPrinting=Direkte Druckjobs
+PrintingSetup=Einstellungen Direkt-Druck-System
+PrintingDesc=Dieses Modul fügt einen "Drucken"-Button zu verschiedenen Modulen hinzu, damit Dokumente direkt auf einem Drucker gedruckt werden können, ohne dass das Dokument in einer anderen Anwendung geöffnet werden muss.
+MenuDirectPrinting=direkte Druckaufträge
 DirectPrint=Direkt drucken
-PrintingDriverDesc=Konfigurationsvariablen für den Druck-Treiber.
+PrintingDriverDesc=Konfigurationsvariablen für den Drucker-Treiber.
 ListDrivers=Treiberliste
 PrintTestDesc=Druckerliste
 FileWasSentToPrinter=Datei %s wurde an den Drucker gesendet
@@ -19,34 +19,36 @@ UserConf=Pro Benutzer einrichten
 PRINTGCP_INFO=Google OAuth API Einrichtung
 PRINTGCP_AUTHLINK=Authentifizierung
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PrintGCPDesc=Dieser Treiber erlaubt das direkte senden zu ein Drucker via Google Cloud Print
+PrintGCPDesc=Dieser Treiber erlaubt das direkte Senden an ein Drucker via Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Angezeigter Name
 GCP_Id=Drucker ID
 GCP_OwnerName=Besitzername
 GCP_State=Druckerstatus
-GCP_connectionStatus=Online-Zustand
+GCP_connectionStatus=Online-Status
 GCP_Type=Druckertyp
-PrintIPPDesc=Dieser Treiber erlaubt es Dokumente direkt an einen Drucker zu senden. Es ist dafür erforderlich, ein Linux System mit CUPS installiert zu haben.
+PrintIPPDesc=Dieser Treiber erlaubt es, Dokumente direkt an einen Drucker zu senden. \nEs ist dafür erforderlich, ein Linux System mit CUPS installiert zu haben. 
 PRINTIPP_HOST=Druckserver
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Anmeldung
+PRINTIPP_USER=Anmeldung (Login)
 PRINTIPP_PASSWORD=Passwort
-NoDefaultPrinterDefined=Kein Standarddrucker definiert
+NoDefaultPrinterDefined=kein Standarddrucker definiert
 DefaultPrinter=Standard-Drucker
 Printer=Drucker
-IPP_Uri=Drucker Uri
+IPP_Uri=Drucker URI
 IPP_Name=Druckername
 IPP_State=Druckerstatus
 IPP_State_reason=Status Grund
 IPP_State_reason1=Status Grund 1
 IPP_BW=schwarz / weiß
 IPP_Color=Farbe
-IPP_Device=IPP Gerät
-IPP_Media=Druckermedium
+IPP_Device=Gerät
+IPP_Media=Druckermedien
 IPP_Supported=Medientyp
-DirectPrintingJobsDesc=Diese Seite zeigt Druckjobs für verfügbar Drucker.
-GoogleAuthNotConfigured=Google OAuth Einrichtung nicht vorhanden. Aktivieren Sie das Modul OAuth und geben eine Google ID/einen Schlüssel an.
+DirectPrintingJobsDesc=Diese Seite listet Druckaufträge auf, die für verfügbare Drucker gefunden wurden.
+GoogleAuthNotConfigured=Google OAuth wurde nicht eingerichtet. \nAktivieren Sie das Modul OAuth und geben Sie Google-ID / Schlüssel ein.
 GoogleAuthConfigured=Google OAuth Anmeldedaten wurden in der Einrichtung des Moduls OAuth gefunden.
 PrintingDriverDescprintgcp=Konfigurationsvariablen für Google Cloud Print
+PrintingDriverDescprintipp=Konfigurationsvariablen für das CUPS Drucksystem.
 PrintTestDescprintgcp=Druckerliste für Google-Coud Druck
+PrintTestDescprintipp=Liste der Drucker für CUPS
diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang
index 1a20ae5f306..2c9fba27f18 100644
--- a/htdocs/langs/de_DE/productbatch.lang
+++ b/htdocs/langs/de_DE/productbatch.lang
@@ -1,24 +1,24 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Verwende Lot / Seriennummer
-ProductStatusOnBatch=Ja (Lot / Seriennummer erforderlich)
-ProductStatusNotOnBatch=Nein (Lot / Seriennummer nicht verwendet)
+ManageLotSerial=Chargen-/Serien-Nr. benutzen 
+ProductStatusOnBatch=Ja  (Chargen-/Serien-Nr. Pflicht)
+ProductStatusNotOnBatch=Nein  (keine Chargen-/Serien-Nr.)
 ProductStatusOnBatchShort=Ja
 ProductStatusNotOnBatchShort=Keine
-Batch=Charge / Serie
-atleast1batchfield=Verzehr-bis oder Verkaufen-bis Datum oder Lot / Seriennummer
-batch_number=Lot / Seriennummer
-BatchNumberShort=Charge / Serie
+Batch=Charge / Seriennr.
+atleast1batchfield="Verzehr bis" oder "Verkaufen bis"-Datum oder Chargen- / Seriennummer
+batch_number=Chargen-/Seriennummer
+BatchNumberShort=Charge / Seriennr.
 EatByDate=Haltbarkeitsdatum 
 SellByDate=Verkaufslimitdatum
-DetailBatchNumber=Charge / Serie Details
-printBatch=Charge / Serie: %s
+DetailBatchNumber=Details zur Chargen-/Seriennummer
+printBatch=Chargen-/Serien-Nr.: %s
 printEatby=Verzehren bis: %s
 printSellby=Verkaufen bis: %s
 printQty=Menge: %d
-AddDispatchBatchLine=Fügen Sie eine Zeile für Haltbarkeit Versendung
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=Dieses Produkt verwendet keine Lose oder Seriennummern
-ProductLotSetup=Verwaltung von Modul Charge / Seriennummern
-ShowCurrentStockOfLot=Warenbestand anzeigen für Produkt/Charge
-ShowLogOfMovementIfLot=Zeige Bewegungen für Produkt/Chargen
-StockDetailPerBatch=Lagerdetail pro Los
+AddDispatchBatchLine=Fügen Sie eine Zeile für den Versand bis Haltbarkeit hinzu
+WhenProductBatchModuleOnOptionAreForced=Wenn das Modul Chargen- und Seriennummernverwaltung aktiviert ist, wird die automatische Warenbestandsanpassung gezwungen beim Ereignis "versendet" den tatsächlichen Bestand zu verringern und beim Ereignis "manuelles Buchen in ein Warenlager" die tatsächlichen Bestand zu erhöhen. Dies kann nicht beeinflusst werden. Andere Optionen können wie gewünscht definiert werden.
+ProductDoesNotUseBatchSerial=Dieses Produkt hat keine Chargen-/Seriennummer
+ProductLotSetup=Einstellungen des Moduls Chargen- und Seriennummernverwaltung
+ShowCurrentStockOfLot=Warenbestand für diese Chargen-/Seriennummer anzeigen
+ShowLogOfMovementIfLot=Bewegungen für diese Chargen-/Seriennummer anzeigen
+StockDetailPerBatch=Lagerdetail nach Chargen
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 629daa77add..63630192f48 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -16,7 +16,7 @@ Create=Speichern
 Reference=Nummer
 NewProduct=Neues Produkt
 NewService=Neue Leistung
-ProductVatMassChange=Global VAT Update
+ProductVatMassChange=systemweite MwSt-Aktualisierung
 ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
 MassBarcodeInit=Initialisierung Barcodes
 MassBarcodeInitDesc=Hier können Objekte mit einem Barcode initialisiert werden, die noch keinen haben. Stellen Sie vor Benutzung sicher, dass die Einstellungen des Barcode-Moduls vollständig sind!
@@ -63,7 +63,7 @@ UpdateDefaultPrice=Aktualisiere Standard Preis
 UpdateLevelPrices=Preise für jede Ebene aktivieren
 AppliedPricesFrom=Applied from
 SellingPrice=Verkaufspreis
-SellingPriceHT=Selling price (excl. tax)
+SellingPriceHT=Verkaufspreis (ohne Steuern) 
 SellingPriceTTC=Verkaufspreis (inkl. USt.)
 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.
@@ -71,7 +71,7 @@ CostPriceUsage=Dieser Wert könnte für Margenberechnung genutzt werden.
 SoldAmount=Verkaufte Menge
 PurchasedAmount=angeschaffte Menge
 NewPrice=Neuer Preis
-MinPrice=Min. sell price
+MinPrice=Mindestverkaufspreis 
 EditSellingPriceLabel=Verkaufspreisschild bearbeiten
 CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne USt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben.
 ContractStatusClosed=Geschlossen
@@ -229,8 +229,8 @@ FillBarCodeTypeAndValueFromProduct=Barcode-Typ und -Wert eines Produkts überneh
 FillBarCodeTypeAndValueFromThirdParty=Barcode-Typ und -Wert eines Partners übernehmen.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
 DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
-BarCodeDataForProduct=Barcode information of product %s:
-BarCodeDataForThirdparty=Barcode information of third party %s:
+BarCodeDataForProduct=Barcode-Informationen zum Produkt %s:
+BarCodeDataForThirdparty=Barcode-Informationen zu Partner %s:
 ResetBarcodeForAllRecords=Definiere Barcode-Wert für alle Datensätze (dies überschreibt auch bereits definierte Barcodes mit neuen Werten!)
 PriceByCustomer=unterschiedliche Preise für jeden Kunden
 PriceCatalogue=Ein einziger Preis pro Produkt/Leistung
@@ -239,7 +239,7 @@ AddCustomerPrice=Preis je Kunde hinzufügen
 ForceUpdateChildPriceSoc=Lege den gleichen Preis für Kunden-Tochtergesellschaften fest
 PriceByCustomerLog=Protokoll der vorangegangenen Kundenpreise
 MinimumPriceLimit=Mindestpreis darf nicht kleiner als %s sein
-MinimumRecommendedPrice=Minimum recommended price is: %s
+MinimumRecommendedPrice=minimal empfohlener Preis: %s
 PriceExpressionEditor=Preis Ausdrucks Editor
 PriceExpressionSelected=Ausgewählter Preis Ausdruck
 PriceExpressionEditorHelp1="Preis = 2 + 2" oder "2 + 2" für die Einstellung der Preis. \nVerwende ; um Ausdrücke zu trennen
@@ -260,7 +260,7 @@ AddVariable=Variable hinzufügen
 AddUpdater=Updater hinzufügen
 GlobalVariables=Globale Variablen
 VariableToUpdate=Variable, die aktualisiert wird
-GlobalVariableUpdaters=Globale Variablen aktualisieren
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON Daten
 GlobalVariableUpdaterHelp0=Analysiert JSON-Daten von angegebener URL, VALUE gibt den Speicherort des entsprechenden Wertes,
 GlobalVariableUpdaterHelpFormat0=Format für Anfrage {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Datenblatt
 ServiceSheet=Wartungsblatt
 PossibleValues=Mögliche Werte
 GoOnMenuToCreateVairants=Rufen Sie das Menü %s - %s auf, um Attributvarianten (wie Farben, Größe, ...) vorzubereiten.
-UseProductFournDesc=Verwenden Sie Lieferantenbeschreibungen von Produkten in Lieferantendokumenten
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variante Attribute
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=Es gab einen Fehler, während Produkt Varianten kop
 ErrorDestinationProductNotFound=Zielprodukt nicht gefunden 
 ErrorProductCombinationNotFound=Produktvariante nicht gefunden
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 89b3d67154b..73967c79610 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -3,13 +3,13 @@ RefProject=Projekt-Nr.
 ProjectRef=Chance
 ProjectId=Projekt-ID
 ProjectLabel=Projektbezeichnung
-ProjectsArea=Projektübersicht
+ProjectsArea=Projekte - Übersicht
 ProjectStatus=Projekt Status
 SharedProject=Jeder
 PrivateProject=Projektkontakte
 ProjectsImContactFor=Projekte bei denen ich ein direkter Kontakt bin
 AllAllowedProjects=Alle Projekte die ich sehen kann (Eigene + Öffentliche)
-AllProjects=Alle Projekte
+AllProjects=alle Projekte
 MyProjectsDesc=Diese Ansicht ist beschränkt auf Projekte bei denen Sie als Ansprechpartner eingetragen sind.
 ProjectsPublicDesc=Diese Ansicht zeigt alle Projekte, für die Sie zum Lesen berechtigt sind.
 TasksOnProjectsPublicDesc=Diese Ansicht zeigt alle Aufgaben der Projekte, für die Sie zum Lesen berechtigt sind.
@@ -25,28 +25,29 @@ AllTaskVisibleButEditIfYouAreAssigned=Alle Aufgaben für qualifizierte Projekte
 OnlyYourTaskAreVisible=Nur Ihnen zugewiesene Aufgaben sind sichtbar. Weisen Sie sich die Aufgabe zu, wenn Sie Zeiten auf der Aufgabe erfassen müssen.
 ImportDatasetTasks=Aufgaben der Projekte
 ProjectCategories=Projektkategorien/Tags
-NewProject=Neues Projekt
+NewProject=neues Projekt
 AddProject=Projekt erstellen
 DeleteAProject=Löschen eines Projekts
 DeleteATask=Löschen einer Aufgabe
 ConfirmDeleteAProject=Sind Sie sicher, dass diese Vertragsposition löschen wollen?
 ConfirmDeleteATask=Sind Sie sicher, dass diese Aufgabe löschen wollen?
-OpenedProjects=Offene Projekte
-OpenedTasks=Offene Aufgaben
+OpenedProjects=offene Projekte
+OpenedTasks=offene Aufgaben
 OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
 OpportunitiesStatusForProjects=Leads amount of projects by status
-ShowProject=Zeige Projekt
-ShowTask=Zeige Aufgabe
-SetProject=Projekt setzen
+ShowProject=Projekt anzeigen
+ShowTask=Aufgabe anzeigen
+SetProject=Projekt einstellen
 NoProject=Kein Projekt definiert oder keine Rechte
-NbOfProjects=Anzahl der Projekte
+NbOfProjects=Anzahl Projekte
 NbOfTasks=Anzahl Aufgaben
 TimeSpent=Zeitaufwand
-TimeSpentByYou=Ihr Zeitaufwand
+TimeSpentByYou=eigener Zeitaufwand
 TimeSpentByUser=Zeitaufwand von Benutzer ausgegeben
 TimesSpent=Zeitaufwände
-RefTask=Aufgaben-Nr.
-LabelTask=Aufgabenbezeichnung
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Zeitaufwände für Aufgaben
 TaskTimeUser=Benutzer
 TaskTimeNote=Hinweis
@@ -54,7 +55,7 @@ TaskTimeDate=Datum
 TasksOnOpenedProject=Aufgaben in offenen Projekten
 WorkloadNotDefined=Arbeitsaufwand nicht definiert
 NewTimeSpent=Zeitaufwände
-MyTimeSpent=Mein Zeitaufwand
+MyTimeSpent=mein Zeitaufwand
 BillTime=Zeitaufwand verrechnen
 BillTimeShort=Bill time
 TimeToBill=Time not billed
@@ -64,7 +65,7 @@ Task=Aufgabe
 TaskDateStart=Startdatum der Aufgabe
 TaskDateEnd=Enddatum der Aufgabe
 TaskDescription=Aufgaben-Beschreibung
-NewTask=Neue Aufgabe
+NewTask=neue Aufgabe
 AddTask=Aufgabe erstellen
 AddTimeSpent=Erfassen verbrauchte Zeit 
 AddHereTimeSpentForDay=Zeitaufwand für diesen Tag/Aufgabe hier erfassen
@@ -72,7 +73,7 @@ Activity=Tätigkeit
 Activities=Aufgaben/Tätigkeiten
 MyActivities=Meine Aufgaben/Tätigkeiten
 MyProjects=Meine Projekte
-MyProjectsArea=Meine Projekte
+MyProjectsArea=meine Projekte - Übersicht
 DurationEffective=Effektivdauer
 ProgressDeclared=Angegebener Fortschritt
 ProgressCalculated=Kalkulierter Fortschritt
@@ -80,7 +81,7 @@ Time=Zeitaufwand
 ListOfTasks=Aufgabenliste
 GoToListOfTimeConsumed=Liste der verwendeten Zeit aufrufen
 GoToListOfTasks=Liste der Aufgaben aufrufen
-GoToGanttView=Zur Gantansicht
+GoToGanttView=zum Gantt-Diagramm
 GanttView=Gantt-Diagramm
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -88,14 +89,14 @@ ListInvoicesAssociatedProject=List of customer invoices related to the project
 ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
 ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
 ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
-ListContractAssociatedProject=List of contracts related to the project
+ListContractAssociatedProject=Liste der projektbezogenen Verträge
 ListShippingAssociatedProject=List of shippings related to the project
 ListFichinterAssociatedProject=List of interventions related to the project
 ListExpenseReportsAssociatedProject=List of expense reports related to the project
-ListDonationsAssociatedProject=List of donations related to the project
+ListDonationsAssociatedProject=mit dem Projekt verknüpfte Spendenliste
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
 ListSalariesAssociatedProject=List of payments of salaries related to the project
-ListActionsAssociatedProject=List of events related to the project
+ListActionsAssociatedProject=Liste der projektbezogenen Ereignisse
 ListTaskTimeUserProject=Liste mit Zeitaufwand der Projektaufgaben
 ListTaskTimeForTask=Zeitaufwand auf Aufgaben
 ActivityOnProjectToday=Projektaktivitäten von heute
@@ -117,7 +118,7 @@ AlsoCloseAProject=Das Projekt auch schließen (lassen Sie es offen, wenn Sie noc
 ReOpenAProject=Projekt öffnen
 ConfirmReOpenAProject=Möchten Sie dieses Projekt wirklich wiedereröffnen?
 ProjectContact=Kontakte zum Projekt
-TaskContact=Kontakte der Aufgabe
+TaskContact=Kontakte zur Aufgabe
 ActionsOnProject=Projektaktionen
 YouAreNotContactOfProject=Sie sind diesem privaten Projekt nicht als Kontakt zugeordnet.
 UserIsNotContactOfProject=Benutzer ist kein Kontakt dieses privaten Projektes
@@ -125,9 +126,9 @@ DeleteATimeSpent=Lösche einen Zeitaufwand
 ConfirmDeleteATimeSpent=Sind Sie sicher, dass diesen Zeitaufwand löschen wollen?
 DoNotShowMyTasksOnly=Zeige auch die Aufgaben der Anderen
 ShowMyTasksOnly=Zeige nur meine Aufgaben
-TaskRessourceLinks=Contacts of task
+TaskRessourceLinks=Kontakte für die Aufgabe
 ProjectsDedicatedToThisThirdParty=Mit diesem Partner verknüpfte Projekte
-NoTasks=Keine Aufgaben für dieses Projekt
+NoTasks=Keine Aufgaben zu diesem Projekt vorhanden.
 LinkedToAnotherCompany=Mit Partner verknüpft
 TaskIsNotAssignedToUser=Aufgabe ist keinem Benutzer zugeteilt. Verwenden Sie den Knopf '<strong>%s</strong>' um die Aufgabe jetzt zuzuweisen.
 ErrorTimeSpentIsEmpty=Zeitaufwand ist leer
@@ -196,7 +197,7 @@ AssignTask=Zuweisen
 ProjectOverview=Projekt-Übersicht
 ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
 ManageOpportunitiesStatus=Verwende Projekte um Leads und Chancen zu verwalten
-ProjectNbProjectByMonth=No. of created projects by month
+ProjectNbProjectByMonth=Anzahl der erstellten Projekte pro Monat 
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
@@ -207,12 +208,12 @@ TaskAssignedToEnterTime=Aufgabe zugewiesen. Eingabe der Zeit zu diese Aufgabe so
 IdTaskTime=ID Zeit Aufgabe
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
 OpenedProjectsByThirdparties=Offene Projekte nach Partner
-OnlyOpportunitiesShort=nur Leads/Verkaufschancen
+OnlyOpportunitiesShort=nur Interessenten
 OpenedOpportunitiesShort=offene Verkaufschancen
 NotOpenedOpportunitiesShort=Not an open lead
 NotAnOpportunityShort=Not a lead
 OpportunityTotalAmount=Gesamtbetrag Leads/Verkaufschancen
-OpportunityPonderatedAmount=Weighted amount of leads
+OpportunityPonderatedAmount=erwarteter Betrag der Leads
 OpportunityPonderatedAmountDesc=Leads amount weighted with probability
 OppStatusPROSP=Geschäftsanbahnung
 OppStatusQUAL=Qualifikation
diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang
index edaa0b26ca4..da1f31182c0 100644
--- a/htdocs/langs/de_DE/propal.lang
+++ b/htdocs/langs/de_DE/propal.lang
@@ -3,33 +3,33 @@ Proposals=Angebote
 Proposal=Angebot
 ProposalShort=Angebot
 ProposalsDraft=Angebotsentwürfe
-ProposalsOpened=Offene Angebote
+ProposalsOpened=offene Angebote
 CommercialProposal=Angebot
 PdfCommercialProposalTitle=Angebot
 ProposalCard=Angebot - Karte
 NewProp=Neues Angebot
-NewPropal=Neues Angebot
+NewPropal=neues Angebot
 Prospect=Interessent
 DeleteProp=Angebot löschen
 ValidateProp=Angebot freigeben
 AddProp=Angebot erstellen
 ConfirmDeleteProp=Möchten Sie dieses Angebot wirklich löschen?
 ConfirmValidateProp=Möchten Sie dieses Angebot wirklich unter dem Namen <b>%s</b> freigeben?
-LastPropals=Neueste %s Angebote
+LastPropals=neueste %s Angebote
 LastModifiedProposals=Letzte %s bearbeitete Angebote
 AllPropals=Alle Angebote
 SearchAProposal=Angebot suchen
-NoProposal=Kein Entwurf
+NoProposal=kein Angebot
 ProposalsStatistics=Angebote - Statistiken
 NumberOfProposalsByMonth=Anzahl pro Monat
-AmountOfProposalsByMonthHT=Betrag pro Monat (excl. Steuern)
+AmountOfProposalsByMonthHT=Betrag pro Monat  (ohne Steuern)
 NbOfProposals=Anzahl der Angebote
 ShowPropal=Zeige Angebot
 PropalsDraft=Entwürfe
 PropalsOpened=geöffnet
 PropalStatusDraft=Entwurf (freizugeben)
 PropalStatusValidated=Freigegeben (Angebot wieder geöffnet)
-PropalStatusSigned=Unterzeichnet (ist zu verrechnen)
+PropalStatusSigned=Unterzeichnet  (ist zu verrechnen)
 PropalStatusNotSigned=Nicht unterzeichnet (geschlossen)
 PropalStatusBilled=Verrechnet
 PropalStatusDraftShort=Entwurf
@@ -40,7 +40,7 @@ PropalStatusNotSignedShort=Nicht unterzeichnet
 PropalStatusBilledShort=Verrechnet
 PropalsToClose=Zu schließende Angebote
 PropalsToBill=Unterzeichnete Angebote zur Verrechnung
-ListOfProposals=Liste der Angebote
+ListOfProposals=Liste Angebote
 ActionsOnPropal=Ereignisse zum Angebot
 RefProposal=Angebots-Nr.
 SendPropalByMail=Angebot per E-Mail versenden
@@ -55,7 +55,7 @@ NoDraftProposals=Keine Angebotsentwürfe
 CopyPropalFrom=Erstelle neues Angebot durch Kopieren eines vorliegenden Angebots
 CreateEmptyPropal=Erstelle leeres Angebot oder aus der Liste der Produkte/Leistungen
 DefaultProposalDurationValidity=Standardmäßige Gültigkeitsdauer (Tage)
-UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Verwenden Sie Kontakt / Adresse mit dem Typ &quot;Kontakt-Folgeangebot&quot;, wenn anstelle der Adresse eines Drittanbieters eine Empfängeradresse für das Angebot definiert wurde
 ConfirmClonePropal=Sind Sie sicher, dass Sie dieses Angebot <b>%s</b> duplizieren möchten?
 ConfirmReOpenProp=Sind Sie sicher, dass Sie dieses Angebot <b>%s</b> wieder öffnen möchten ?
 ProposalsAndProposalsLines=Angebote und Positionen
diff --git a/htdocs/langs/de_DE/receiptprinter.lang b/htdocs/langs/de_DE/receiptprinter.lang
index 62e15c2aff0..46dee79c373 100644
--- a/htdocs/langs/de_DE/receiptprinter.lang
+++ b/htdocs/langs/de_DE/receiptprinter.lang
@@ -5,15 +5,15 @@ PrinterUpdated=Drucker %s geändert
 PrinterDeleted=Drucker %s gelöscht
 TestSentToPrinter=Sende Test zu Drucker %s
 ReceiptPrinter=Quittungsdrucker
-ReceiptPrinterDesc=Einrichten des Quittungsdruckers
+ReceiptPrinterDesc=Einstellungen  Quittungsdrucker
 ReceiptPrinterTemplateDesc=Einrichtung von Vorlagen
 ReceiptPrinterTypeDesc=Beschreibung des Typs des Quittungsdruckers
 ReceiptPrinterProfileDesc=Beschreibung des Profils des Quittungsdruckers
 ListPrinters=Druckerliste
 SetupReceiptTemplate=Vorlagen Setup
 CONNECTOR_DUMMY=Dummy Drucker
-CONNECTOR_NETWORK_PRINT=Netzwerk Drucker
-CONNECTOR_FILE_PRINT=Lokale Drucker
+CONNECTOR_NETWORK_PRINT=Netzwerk-Drucker
+CONNECTOR_FILE_PRINT=lokaler Drucker
 CONNECTOR_WINDOWS_PRINT=lokaler Windows Drucker
 CONNECTOR_DUMMY_HELP=Simulierter Drucker zum Testen, hat keine Funktion
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
@@ -29,9 +29,9 @@ PROFILE_SIMPLE_HELP=Einfaches Profil ohne Grafik
 PROFILE_EPOSTEP_HELP=Epos Tep Profil Hilfe
 PROFILE_P822D_HELP=P822D Profil ohne Grafik
 PROFILE_STAR_HELP=Star Profil
-DOL_ALIGN_LEFT=Linksbündiger Text
-DOL_ALIGN_CENTER=Zentrierter Text
-DOL_ALIGN_RIGHT=Rechtsbündiger Text
+DOL_ALIGN_LEFT=linksbündiger Text
+DOL_ALIGN_CENTER=zentrierter Text
+DOL_ALIGN_RIGHT=rechtsbündiger Text
 DOL_USE_FONT_A=Zeichensatz A des Druckers benutzen
 DOL_USE_FONT_B=Zeichensatz B des Druckers benutzen
 DOL_USE_FONT_C=Zeichensatz C des Druckers benutzen
@@ -41,4 +41,4 @@ DOL_CUT_PAPER_FULL=Quittung komplett abtrennen
 DOL_CUT_PAPER_PARTIAL=Quittung teilweise abtrennen
 DOL_OPEN_DRAWER=Kassenschublade
 DOL_ACTIVATE_BUZZER=Summer aktivieren
-DOL_PRINT_QRCODE=QR Code drucken
+DOL_PRINT_QRCODE=QR-Code drucken
diff --git a/htdocs/langs/de_DE/resource.lang b/htdocs/langs/de_DE/resource.lang
index ff7243d2c77..92cf4e653f3 100644
--- a/htdocs/langs/de_DE/resource.lang
+++ b/htdocs/langs/de_DE/resource.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - resource
 MenuResourceIndex=Ressourcen
-MenuResourceAdd=Neue Ressource
+MenuResourceAdd=neue Ressource
 DeleteResource=Ressource löschen
-ConfirmDeleteResourceElement=Bitte Löschung der Ressource dieses Elements bestätigen
-NoResourceInDatabase=Keine Ressource in Datenbank
-NoResourceLinked=Keine Ressource verknüpft
-
+ConfirmDeleteResourceElement=Löschung der Ressource zu diesem Element bestätigen
+NoResourceInDatabase=Keine Ressource in der Datenbank
+NoResourceLinked=keine Ressource verknüpft
+ActionsOnResource=Ereignisse zu dieser Ressource
 ResourcePageIndex=Liste der Ressourcen
 ResourceSingular=Ressource
-ResourceCard=Ressource - Karte
+ResourceCard=Ressource - Übersicht
 AddResource=Ressource erstellen
 ResourceFormLabel_ref=Ressourcen-Name
 ResourceType=Ressourcen-Typ
@@ -18,7 +18,7 @@ ResourcesLinkedToElement=mit Element verknüpfte Ressourcen
 
 ShowResource=Ressource anzeigen
 
-ResourceElementPage=Element-Ressourcen
+ResourceElementPage=Ressourcen-Element
 ResourceCreatedWithSuccess=Ressource erfolgreich erstellt
 RessourceLineSuccessfullyDeleted=Ressourcen-Zeile erfolgreich gelöscht
 RessourceLineSuccessfullyUpdated=Ressourcen-Zeile erfolgreich aktualisiert
@@ -30,7 +30,7 @@ DictionaryResourceType=Ressourcen-Typ
 
 SelectResource=Ressource wählen
 
-IdResource=Resourcen ID
+IdResource=Ressourcen ID
 AssetNumber=Seriennummer
 ResourceTypeCode=Ressourcen-Typ Code
 ImportDataset_resource_1=Ressourcen
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index ed7ab3354df..fc55f511440 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -52,10 +52,10 @@ ActionsOnShipping=Hinweis zur Lieferung
 LinkToTrackYourPackage=Link zur Paket- bzw. Sendungsverfolgung
 ShipmentCreationIsDoneFromOrder=Lieferscheine müssen aus einer Bestellung generiert werden
 ShipmentLine=Zeilen Lieferschein
-ProductQtyInCustomersOrdersRunning=Product quantity into open customer orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into open purchase orders
-ProductQtyInShipmentAlreadySent=Bereits gelieferte Produktmenge aus offenem Kundenauftrag
-ProductQtyInSuppliersShipmentAlreadyRecevied=Bereits erhaltene Produktmenge aus Lieferantenbestellung
+ProductQtyInCustomersOrdersRunning=Produktmenge in offenen Kundenaufträgen
+ProductQtyInSuppliersOrdersRunning=Produktmenge in offenen Lieferantenbestellungen
+ProductQtyInShipmentAlreadySent=Produktmenge von open sales order already gesendet
+ProductQtyInSuppliersShipmentAlreadyRecevied=Produktmenge aus offener Bestellung bereits erhalten
 NoProductToShipFoundIntoStock=Kein Artikel zum Versenden gefunden im Lager <b>%s</b>. Korrigieren Sie den Lagerbestand oder wählen Sie ein anderes Lager.
 WeightVolShort=Gew./Vol.
 ValidateOrderFirstBeforeShipment=Sie müssen den Auftrag erst bestätigen bevor Sie eine Lieferung machen können.
@@ -69,4 +69,4 @@ SumOfProductWeights=Summe der Produktgewichte
 
 # warehouse details
 DetailWarehouseNumber= Warenlagerdetails
-DetailWarehouseFormat= W:%s (Menge : %d)
+DetailWarehouseFormat= W:%s  (Menge: %d) 
diff --git a/htdocs/langs/de_DE/sms.lang b/htdocs/langs/de_DE/sms.lang
index d0ac5b1e013..425c5adf4ff 100644
--- a/htdocs/langs/de_DE/sms.lang
+++ b/htdocs/langs/de_DE/sms.lang
@@ -3,32 +3,32 @@ Sms=SMS
 SmsSetup=SMS Einstellungen
 SmsDesc=Auf dieser Seite haben Sie die Möglichkeit globale Einstellungen der SMS-Funktionen vorzunehmen
 SmsCard=SMS Karte
-AllSms=Alle SMS Aktionen
+AllSms=alle SMS Kampagnen
 SmsTargets=Ziele
 SmsRecipients=Empfänger
 SmsRecipient=Empfänger
 SmsTitle=Titel
 SmsFrom=Absender
 SmsTo=Ziel
-SmsTopic=Thema der SMS
+SmsTopic=Thema der SMS (Betreff)
 SmsText=Nachricht
 SmsMessage=SMS Nachricht
-ShowSms=SMS Anzeigen
-ListOfSms=Liste der SMS Aktionen
-NewSms=Neue SMS Aktion
+ShowSms=SMS anzeigen
+ListOfSms=Liste der SMS Kampagnen
+NewSms=neue SMS Kampagne
 EditSms=SMS bearbeiten
 ResetSms=Erneut senden
-DeleteSms=SMS Aktion löschen
-DeleteASms=Entfernen Sie eine SMS Aktion
+DeleteSms=Lösche SMS Kampagne
+DeleteASms=Entferne eine SMS Kampagne
 PreviewSms=SMS Vorschau
-PrepareSms=SMS vorbeiten
-CreateSms=SMS erstellen
+PrepareSms=SMS vorbereiten
+CreateSms=Erstelle SMS
 SmsResult=Ergebnis des SMS Versands
 TestSms=Test SMS
 ValidSms=SMS bestätigen
 ApproveSms=SMS genehmigen
 SmsStatusDraft=Entwurf
-SmsStatusValidated=Bestätigen
+SmsStatusValidated=Bestätigt
 SmsStatusApproved=Genehmigt
 SmsStatusSent=Gesendet
 SmsStatusSentPartialy=Teileweise gesendet
@@ -38,13 +38,13 @@ SmsStatusNotSent=Nicht gesendet
 SmsSuccessfulySent=SMS korrekt gesendet (von %s an %s)
 ErrorSmsRecipientIsEmpty=Anzahl der Empfänger ist leer
 WarningNoSmsAdded=Keine neuen Rufnummern zum hinzufügen an die Empfängerliste gefunden
-ConfirmValidSms=Bestätigen Sie das aktivieren dieser Kampagne?
+ConfirmValidSms=Bestätigen Sie die Freigabe dieser Kampagne?
 NbOfUniqueSms=Anzahl der eindeutigen Rufnummern
 NbOfSms=Anzahl der Rufnummern
 ThisIsATestMessage=Dies ist eine Testnachricht
 SendSms=SMS senden
 SmsInfoCharRemain=Anzahl der verbleibenden Zeichen
-SmsInfoNumero= (Format der Rufnummer: ++33899701761)
+SmsInfoNumero= (internationales Rufnummernformat, Bsp.: +33899701761)
 DelayBeforeSending=Warten vor dem Senden (in Minuten)
 SmsNoPossibleSenderFound=Kein Sender verfügbar. Prüfen Sie die Einstellungen Ihres SMS Providers.
 SmsNoPossibleRecipientFound=Keine möglichen Empfänger gefunden. Prüfen Sie die Einstellungen Ihres SMS Anbieters.
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index fbd333cd379..93a2a51a292 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -3,32 +3,34 @@ WarehouseCard=Warenlager - Karte
 Warehouse=Warenlager
 Warehouses=Warenlager
 ParentWarehouse=Übergeordnetes Lager
-NewWarehouse=Neues Warenlager
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Warenlager bearbeiten
 MenuNewWarehouse=Neues Warenlager
 WarehouseSource=Ursprungslager
 WarehouseSourceNotDefined=Keine Lager definiert,
-AddWarehouse=Create warehouse
+AddWarehouse=Lager erstellen
 AddOne=Hinzufügen
-DefaultWarehouse=Default warehouse
+DefaultWarehouse=Standardlager
 WarehouseTarget=Ziellager
 ValidateSending=Lieferung freigeben
 CancelSending=Lieferung stornieren
 DeleteSending=Lieferung löschen
 Stock=Warenbestand
 Stocks=Warenbestände
-StocksByLotSerial=Lagerbestand pro Charge/Seriennummer
+StocksByLotSerial=Lagerbestand nach Chargen-/Seriennummer
 LotSerial=Chargen/Serien-Nummern
-LotSerialList=Liste der Chargen/Serien-Nummern
+LotSerialList=Liste der Chargen-/Seriennummern
 Movements=Lagerbewegungen
 ErrorWarehouseRefRequired=Warenlager-Referenz erforderlich
 ListOfWarehouses=Liste der Warenlager
 ListOfStockMovements=Liste der Lagerbewegungen
-ListOfInventories=List of inventories
+ListOfInventories=Inventarliste
 MovementId=Bewegungs ID
 StockMovementForId=Lagerbewegung Nr. %d
 ListMouvementStockProject=Lagerbewegungen für Projekt
 StocksArea=Warenlager - Übersicht
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Standort
 LocationSummary=Kurzbezeichnung Standort
 NumberOfDifferentProducts=Anzahl unterschiedlicher Produkte
@@ -44,7 +46,6 @@ TransferStock=Bestand umbuchen
 MassStockTransferShort=Massen-Bestandsumbuchung
 StockMovement=Lagerbewegung
 StockMovements=Lagerbewegungen
-LabelMovement=Lagerbewegungs-Etikett
 NumberOfUnit=Anzahl der Einheiten
 UnitPurchaseValue=Einkaufspreis pro Stück
 StockTooLow=Mindestbestand unterschritten
@@ -54,21 +55,21 @@ PMPValue=Gewichteter Warenwert
 PMPValueShort=DSWP
 EnhancedValueOfWarehouses=Lagerwert
 UserWarehouseAutoCreate=Automatisch ein Lager erstellen wenn ein neuer Benutzer erstellt wird
-AllowAddLimitStockByWarehouse=Ermöglicht es, Grenzwerte und erwünschten Lagerbestand pro Produkt+Warenlager zu definieren, anstelle nur pro Produkt
-IndependantSubProductStock=Produkt Lager und Unterprodukt Lager sind unabhängig
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Produkt- und Unterproduktbestände sind unabhängig voneinander
 QtyDispatched=Versandmenge
 QtyDispatchedShort=Menge versandt
 QtyToDispatchShort=Menge zu versenden
 OrderDispatch=Wareneingang
-RuleForStockManagementDecrease=Regel für automatische Verringerung der Bestände (manuelle Verringerung ist immer möglich, selbst wenn die automatische Verringerung aktiviert ist).
-RuleForStockManagementIncrease=Regel für automatische Erhöhung der Bestände (manuelle Erhöhung ist immer möglich, selbst wenn die automatische Erhöhung aktiviert ist).
-DeStockOnBill=Verringere reale Bestände bei Bestätigung von Rechnungen/Gutschriften
-DeStockOnValidateOrder=Verringere reale Bestände bei Bestätigung von Kundenbestellungen
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Verringere reale Bestände bei Bestädigung von Lieferungen
 DeStockOnShipmentOnClosing=Verringere Lagerbestände beim Schließen der Versanddokumente
-ReStockOnBill=Erhöhung der tatsächlichen Bestände in den Rechnungen / Gutschriften
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
 OrderStatusNotReadyToDispatch=Auftrag wurde noch nicht oder nicht mehr ein Status, der Erzeugnisse auf Lager Hallen Versand ermöglicht.
 StockDiffPhysicTeoric=Begründung für Differenz  zwischen Inventurbestand und Lagerbestand
 NoPredefinedProductToDispatch=Keine vordefinierten Produkte für dieses Objekt. Also kein Versand im Lager erforderlich ist.
@@ -76,12 +77,12 @@ DispatchVerb=Versand
 StockLimitShort=Grenzwert für Alarm
 StockLimit=Mindestbestand vor Warnung
 StockLimitDesc=(leer) bedeutet keine Warnung. <br> 0 kann für eine Warnung verwendet werden, sobald der Bestand leer ist.
-PhysicalStock=Istbestand
+PhysicalStock=Physical Stock
 RealStock=Realer Lagerbestand
-RealStockDesc=Physikalischer Lagerbestand ist die Stückzahl die aktuell in Ihren Warenlagern vorhanden ist.
-RealStockWillAutomaticallyWhen=Der Lagerbestand wird automatisch anhand dieser Regeln angepasst (Siehe Lagermodul Setup):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Theoretisches Warenlager
-VirtualStockDesc=Virtueller Lagerbestand ist der verbleibende Bestand nachdem alle geplanten Buchungen ausgeführt wurden. (Lagereingang aus Bestellungen, Lieferungen an Kunden, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Warenlager ID
 DescWareHouse=Beschreibung Warenlager
 LieuWareHouse=Standort Warenlager
@@ -101,7 +102,7 @@ ThisWarehouseIsPersonalStock=Dieses Lager bezeichnet den persönlichen Bestand v
 SelectWarehouseForStockDecrease=Wählen Sie das Lager für die Entnahme
 SelectWarehouseForStockIncrease=Wählen Sie das Lager für den Wareneingang
 NoStockAction=Keine Vorratsänderung
-DesiredStock=Gewünschter optimaler Bestand
+DesiredStock=Desired Stock
 DesiredStockDesc=Dieser Lagerbestand wird von der Nachbestellfunktion verwendet.
 StockToBuy=zu bestellen
 Replenishment=Nachbestellung
@@ -114,13 +115,13 @@ CurentSelectionMode=Aktueller Auswahl-Modus
 CurentlyUsingVirtualStock=Theoretisches Warenlager
 CurentlyUsingPhysicalStock=Physisches Warenlager
 RuleForStockReplenishment=Regeln für Nachbestellungen
-SelectProductWithNotNullQty=Wählen Sie mindestens ein Produkt mit einer Menge ungleich Null und einen Lieferanten
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Nur Warnungen
 WarehouseForStockDecrease=Das Lager <b>%s</b> wird für Entnahme verwendet 
 WarehouseForStockIncrease=Das Lager <b>%s</b> wird für Wareneingang verwendet 
 ForThisWarehouse=Für dieses Lager
-ReplenishmentStatusDesc=Diese Liste enthält Produkte mit einem Bestand unter dem gewünschten Bestand (oder kleiner als der Alarmwert, wenn das Kästchen "Nur Alarm" aktiviert ist). Mit diesem Kästchen können Sie Bestellungen erstellen, um die Differenzen auszugleichen.
-ReplenishmentOrdersDesc=Die ist eine Liste aller offenen Lieferantenbestellungen mit vordefinierten Produkten. Nur offene Bestellungen mit vordefinierten Produktion, also Bestellungen, welche den Vorrat beeinflussen, sind hier sichtbar.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Nachbestellung
 NbOfProductBeforePeriod=Menge des Produkts %s im Lager vor der gewählten Periode (< %s)
 NbOfProductAfterPeriod=Menge des Produkts %s im Lager nach der gewählten Periode (> %s)
@@ -130,25 +131,26 @@ RecordMovement=Umbuchung
 ReceivingForSameOrder=Empfänger zu dieser Bestellung
 StockMovementRecorded=aufgezeichnete Lagerbewegungen
 RuleForStockAvailability=Regeln für Bestands-Verfügbarkeit
-StockMustBeEnoughForInvoice=Der Lagerbestand muss ausreichend sein um ein Produkt/Dienstleistung zum Versand hinzuzufügen. (Die Prüfung erfolgt auf Basis des aktuellen realen Lagerbestandes, wenn eine Zeile zur Rechnung hinzugefügt wird, unabhängig von der Regel zur automatischen Veränderung des Lagerbestands.)
-StockMustBeEnoughForOrder=Der Lagerbestand muss ausreichend sein um ein Produkt/Dienstleistung zum Versand hinzuzufügen. (Die Prüfung erfolgt auf Basis des aktuellen realen Lagerbestandes, wenn eine Zeile zum Auftrag hinzugefügt wird, unabhängig von der Regel zur automatischen Veränderung des Lagerbestands.)
-StockMustBeEnoughForShipment= Der Lagerbestand muss ausreichend sein um ein Produkt/Dienstleistung zum Versand hinzuzufügen. (Die Prüfung erfolgt auf Basis des aktuellen realen Lagerbestandes, wenn eine Zeile zum Versand hinzugefügt wird, unabhängig von der Regel zur automatischen Veränderung des Lagerbestands.)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Titel der Lagerbewegung
+TypeMovement=Type of movement
 DateMovement=Datum Lagerbewegung
 InventoryCode=Bewegungs- oder Bestandscode
 IsInPackage=In Paket enthalten
 WarehouseAllowNegativeTransfer=Bestand kann negativ sein
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferIsNotEnough=Sie verfügen über nicht genügend Lagerbestand im Ursprungslager und negative Lagerbestände sind im Setup nicht erlaubt.
 ShowWarehouse=Zeige Lager
 MovementCorrectStock=Lagerkorrektur für Produkt %s
 MovementTransferStock=Umlagerung des Produkt %s in ein anderes Lager
-InventoryCodeShort=Inv. / Mov. Kode
-NoPendingReceptionOnSupplierOrder=Keine anstehenden Liefereingänge aufgrund offener Lieferantenbestellungen
+InventoryCodeShort=Bewegungs- oder Bestandscode
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=Diese Charge / Seriennummer (<strong>%s</strong>) ist bereits vorhanden, jedoch mit unterschiedlichen Haltbarkeits- oder Verfallsdatum. \n(Gefunden: <strong>%s</strong> Erfasst: <strong>%s</strong>) 
 OpenAll=Verfügbar für alle Aktionen
 OpenInternal=Verfügbar für interne Aktionen
-UseDispatchStatus=Empfangstatus (akzeptiert/abgelehnt) für Produktzeilen bei Lieferungseingang verwenden
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
+OptionMULTIPRICESIsOn=Option "Unterschiedliche Preise pro Segment" ist aktiviert. Dadurch hat ein Produkt verschiedene Verkaufspreise, weshalb der Verakufspreis nicht berechnet werden kann
 ProductStockWarehouseCreated=Bestandeswert für Benachrichtigung und erwünschtem optimalem Lagerbestand erstellt
 ProductStockWarehouseUpdated=Bestandeswert für Benachrichtigung und erwünschtem optimalem Lagerbestand aktualisiert
 ProductStockWarehouseDeleted=Bestandeswert für Benachrichtigung und erwünschtem optimalem Lagerbestand gelöscht
@@ -171,16 +173,16 @@ inventoryValidate=Bestätigt
 inventoryDraft=In Arbeit
 inventorySelectWarehouse=Lager auswählen
 inventoryConfirmCreate=Erstelle
-inventoryOfWarehouse=Inventar für Lager: %s
-inventoryErrorQtyAdd=Fehler: Menge ist <= 0
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By Inventar
 inventoryWarningProductAlreadyExists=Dieses Produkt ist schon in der Liste
 SelectCategory=Kategoriefilter
-SelectFournisseur=Filter nach Lieferant
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventur
-INVENTORY_DISABLE_VIRTUAL=Lagerbestand für Komponenten bei Inventur eines zusammengesetzen Produktes nicht heruntersetzen
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Verwendet den Kaufpreis, wenn kein letzter Kaufpreis gefunden werden kann
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Die Lagerbewegung hat ein Inventardatum
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Durchschnittspreis änderbar
 ColumnNewPMP=Neuer Durchschnittsstückpreis
 OnlyProdsInStock=Fügen sie kein Produkt ohne Bestand hinzu
@@ -195,12 +197,16 @@ AddInventoryProduct=Produkt zu Inventar hinzufügen
 AddProduct=Hinzufügen
 ApplyPMP=Durchschnittspreis übernehmen 
 FlushInventory=Inventur leeren
-ConfirmFlushInventory=Aktion wirklich ausführen?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventar wurde gelöscht
-ExitEditMode=Exit edition
+ExitEditMode=Berarbeiten beenden
 inventoryDeleteLine=Zeile löschen
 RegulateStock=Lager ausgleichen
 ListInventory=Liste
-StockSupportServices=Unterstützung bei der Lagerverwaltung
-StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
-ReceiveProducts=Receive items
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
+ReceiveProducts=Erhaltene Positionen
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/de_DE/stripe.lang b/htdocs/langs/de_DE/stripe.lang
index b2539924f30..ad2684355a3 100644
--- a/htdocs/langs/de_DE/stripe.lang
+++ b/htdocs/langs/de_DE/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Strip Moduleeinstellungen
-StripeDesc=Modul zur Bereitstellung einer Online-Zahlungsseite für Zahlungen mit Kredit- / Debitkarten über <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Dies kann verwendet werden, um Ihren Kunden eine kostenlose Zahlung oder eine Zahlung für ein bestimmtes Dolibarr-Objekt (Rechnung, Bestellung, ...) zu ermöglichen.
+StripeSetup=Karten Moduleeinstellungen
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Zahlen mit Kreditkarte oder Stripe
 FollowingUrlAreAvailableToMakePayments=Für Kundenzahlungen stehen Ihnen die folgenden URLs zur Verfügung:
 PaymentForm=Zahlungsformular
@@ -9,14 +9,14 @@ ThisScreenAllowsYouToPay=Über dieses Fenster können Sie Online-Zahlungen an %s
 ThisIsInformationOnPayment=Informationen zu der vorzunehmenden Zahlung
 ToComplete=Vervollständigen
 YourEMail=E-Mail-Adresse für die Zahlungsbestätigung
-STRIPE_PAYONLINE_SENDEMAIL=Status-E-Mail nach einer Zahlung (erfolgreich oder nicht)
+STRIPE_PAYONLINE_SENDEMAIL=E-Mail-Benachrichtigung nach einem Zahlungsversuch (erfolgreich oder fehlgeschlagen)
 Creditor=Zahlungsempfänger
 PaymentCode=Zahlungscode
-StripeDoPayment=Bezahlen mit Kredit- oder Debitkarte (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=Zur Eingabe Ihrer Kreditkartendaten werden Sie auf die sichere Bezahlseite von Stripe weitergeleitet.
 Continue=Nächster
 ToOfferALinkForOnlinePayment=URL für %s Zahlung
-ToOfferALinkForOnlinePaymentOnOrder=URL um Ihren Kunden eine %s Online-Bezahlseite für Bestellungen anzubieten
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL um Ihren Kunden eine %s Online-Bezahlseite für Rechnungen anzubieten
 ToOfferALinkForOnlinePaymentOnContractLine=URL um Ihren Kunden eine %s Online-Bezahlseite für Vertragspositionen anzubieten
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL um Ihren Kunden eine %s Online-Bezahlseite für frei wählbare Beträge anzubieten
@@ -25,7 +25,7 @@ YouCanAddTagOnUrl=Sie können auch den URL-Parameter <b>&tag=<i>value</i></b> an
 SetupStripeToHavePaymentCreatedAutomatically=Richten Sie Stripe mit der URL <b>%s</b> ein, um nach Freigabe durch Stripe eine Zahlung anzulegen.
 AccountParameter=Konto Parameter
 UsageParameter=Einsatzparameter
-InformationToFindParameters=Hilfe für das Finden der %s Kontoinformationen
+InformationToFindParameters=Hilfe beim Auffinden Ihrer %s Kontoinformationen
 STRIPE_CGI_URL_V2=URL für das Stripe CGI Zahlungsmodul
 VendorName=Name des Lieferanten
 CSSUrlForPaymentForm=CSS-Datei für das Zahlungsmodul
@@ -33,31 +33,35 @@ NewStripePaymentReceived=Neue Stripezahlung erhalten
 NewStripePaymentFailed=Neue Stripezahlung versucht, aber fehlgeschlagen
 STRIPE_TEST_SECRET_KEY=Geheimer Testschlüssel
 STRIPE_TEST_PUBLISHABLE_KEY=Öffentlicher Testschlüssel
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook Testschlüssel
 STRIPE_LIVE_SECRET_KEY=Geheimer Produktivschlüssel
 STRIPE_LIVE_PUBLISHABLE_KEY=Öffentlicher Produktivschlüssel
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+STRIPE_LIVE_WEBHOOK_KEY=Webhook Produktivschlüssel
+ONLINE_PAYMENT_WAREHOUSE=Lager verwenden um den Bestand bei Onlinezahlungen vermindern<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice?)
 StripeLiveEnabled=Stripe live aktiviert (Nicht im Test/Sandbox Modus)
-StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
-StripeGateways=Stripe gateways
-OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
-OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
-BankAccountForBankTransfer=Bank account for fund payouts
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
-StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+StripeImportPayment=Kartenzahlungen importieren
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+StripeGateways=Kartengateways
+OAUTH_STRIPE_TEST_ID=Karten Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Karten Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bankkonto für Auszahlungen
+StripeAccount=Kartenkonto
+StripeChargeList=Liste der Kartengebühren
+StripeTransactionList=Liste der Kartentransaktionen
+StripeCustomerId=Kundennummer Karte
+StripePaymentModes=Kartenzahlungsarten
+LocalID=Lokale ID
+StripeID=Karte ID
+NameOnCard=Name auf Karte
+CardNumber=Kartennummer
+ExpiryDate=Ablaufdatum
 CVN=CVN
-DeleteACard=Delete Card
-ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
-CreateCustomerOnStripe=Create customer on Stripe
-CreateCardOnStripe=Create card on Stripe
-ShowInStripe=Show in Stripe
+DeleteACard=Karte löschen
+ConfirmDeleteCard=Wollen Sie diese Debit- oder Kreditkarte wirklich löschen?
+CreateCustomerOnStripe=Kunde mit Karte erstellen
+CreateCardOnStripe=Karte auf Stripe erstellen
+ShowInStripe=In Karte anzeigen
+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)
diff --git a/htdocs/langs/de_DE/supplier_proposal.lang b/htdocs/langs/de_DE/supplier_proposal.lang
index 2b496e1d88d..184afda2fec 100644
--- a/htdocs/langs/de_DE/supplier_proposal.lang
+++ b/htdocs/langs/de_DE/supplier_proposal.lang
@@ -14,7 +14,7 @@ SupplierProposalShort=Lieferanten Angebot
 SupplierProposals=Lieferantenangebote
 SupplierProposalsShort=Lieferantenangebote
 NewAskPrice=neue Preisanfrage
-ShowSupplierProposal=Presianfrage anzeigen
+ShowSupplierProposal=Preisanfrage anzeigen
 AddSupplierProposal=Preisanfrage erstellen
 SupplierProposalRefFourn=Lieferantenreferenz
 SupplierProposalDate=Liefertermin
@@ -28,7 +28,7 @@ SupplierProposalStatusClosed=Geschlossen
 SupplierProposalStatusSigned=Bestätigt
 SupplierProposalStatusNotSigned=Abgelehnt
 SupplierProposalStatusDraftShort=Entwurf
-SupplierProposalStatusValidatedShort=Bestätigt
+SupplierProposalStatusValidatedShort=Freigegeben
 SupplierProposalStatusClosedShort=Geschlossen
 SupplierProposalStatusSignedShort=Bestätigt
 SupplierProposalStatusNotSignedShort=Abgelehnt
@@ -50,5 +50,5 @@ ListOfSupplierProposals=Liste von Angebotsanfragen für Lieferanten
 ListSupplierProposalsAssociatedProject=Liste der Zuliefererangebote, die mit diesem Projekt verknüpft sind
 SupplierProposalsToClose=zu schließende Lieferantenangebote 
 SupplierProposalsToProcess=Lieferantenangebote zu Verarbeiten
-LastSupplierProposals=Letzte %s Preisanfragen
+LastSupplierProposals=letzte %s Preisanfragen
 AllPriceRequests=Alle Anfragen
diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
index d0a340d89a1..847c6e61b95 100644
--- a/htdocs/langs/de_DE/suppliers.lang
+++ b/htdocs/langs/de_DE/suppliers.lang
@@ -1,29 +1,29 @@
-# Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Lieferant
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Lieferanten
 SuppliersInvoice=Lieferantenrechnung
-ShowSupplierInvoice=Zeige Lieferanten Rechnung
-NewSupplier=Neuer Lieferant
+ShowSupplierInvoice=Zeige Lieferantenrechnung
+NewSupplier=neuer Lieferant
 History=Verlauf
 ListOfSuppliers=Liste der Lieferanten
-ShowSupplier=Zeige Lieferant
+ShowSupplier=zeige Lieferant
 OrderDate=Bestelldatum
-BuyingPriceMin=Bester Einkaufspreis
+BuyingPriceMin=bester Einkaufspreis
 BuyingPriceMinShort=min. EK
 TotalBuyingPriceMinShort=Summe Unterprodukte Einkaufspreis
 TotalSellingPriceMinShort=Summe  Unterprodukte Verkaufspreis
-SomeSubProductHaveNoPrices=Einige Unterprodukte haben keinen Preis 
+SomeSubProductHaveNoPrices=Einige Unterprodukte haben keinen Preis.
 AddSupplierPrice=Einkaufspreis anlegen
-ChangeSupplierPrice=Ändere Einkaufspreis
-SupplierPrices=Lieferanten Preise
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Für dieses Produkt existiert bereits ein Lieferantenpreis vom gewählten Anbieter: %s
-NoRecordedSuppliers=Kein Lieferant vorhanden
-SupplierPayment=Lieferanten Zahlung
-SuppliersArea=Lieferanten Bereich
+ChangeSupplierPrice=Einkaufspreis ändern
+SupplierPrices=Lieferantenpreise
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
+NoRecordedSuppliers=kein Lieferant vorhanden
+SupplierPayment=Lieferanten Zahlvorgang
+SuppliersArea=Lieferanten Übersicht
 RefSupplierShort=Lieferanten Zeichen
 Availability=Verfügbarkeit
 ExportDataset_fournisseur_1=Lieferantenrechnungen und Positionen
 ExportDataset_fournisseur_2=Lieferantenrechnungen und Zahlungen
-ExportDataset_fournisseur_3=Lieferantenbestellungen und Auftragszeilen
+ExportDataset_fournisseur_3=Lieferantenbestellungen und Positionen
 ApproveThisOrder=Bestellung bestätigen
 ConfirmApproveThisOrder=Möchten Sie diese Bestellung <b>%s</b>  wirklich bestätigen?
 DenyingThisOrder=Bestellung ablehnen
@@ -33,15 +33,15 @@ AddSupplierOrder=Lieferantenbestellung erstellen
 AddSupplierInvoice=Lieferantenrechnung erstellen
 ListOfSupplierProductForSupplier=Liste der Produkte und Preise für Lieferanten <b> %s </b>
 SentToSuppliers=An Lieferanten versandt
-ListOfSupplierOrders=Liste der Lieferanten Bestellungen
+ListOfSupplierOrders=Liste der Lieferantenbestellungen
 MenuOrdersSupplierToBill=Bestellungen zu Rechnungen
-NbDaysToDelivery=Lieferverzug in Tagen
-DescNbDaysToDelivery=Max. Verspätungstoleranz bei Lieferverzögerungen bei Produkten aus dieser Bestellung
+NbDaysToDelivery=Lieferverzug (Tage)
+DescNbDaysToDelivery=Die längste Lieferverzögerung der Produkte aus dieser Bestellung
 SupplierReputation=Lieferanten Reputation
 DoNotOrderThisProductToThisSupplier=Nicht sortieren
-NotTheGoodQualitySupplier=Ungültige Qualität
+NotTheGoodQualitySupplier=Geringe Qualität
 ReputationForThisProduct=Reputation
 BuyerName=Käufer
 AllProductServicePrices=Alle Produkt/Leistung Preise
-AllProductReferencesOfSupplier=Alle Produkt- / Service-Referenzen des Lieferanten
-BuyingPriceNumShort=Lieferanten Preise
+AllProductReferencesOfSupplier=Alle Produkt- / Servicereferenzen des Anbieters
+BuyingPriceNumShort=Lieferantenpreise
diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang
index 7811ef50c9a..c29e6bda5c1 100644
--- a/htdocs/langs/de_DE/trips.lang
+++ b/htdocs/langs/de_DE/trips.lang
@@ -58,7 +58,7 @@ EX_TAX=Verschiedene Steuern
 EX_IND=Transportversicherung
 EX_SUM=Wartungsmaterial
 EX_SUO=Büromaterial
-EX_CAR=Automiete
+EX_CAR=Autovermietung
 EX_DOC=Dokumentation
 EX_CUR=Kundengeschenk
 EX_OTR=Anderes Geschenk
@@ -73,7 +73,7 @@ EX_PAR_VP=Parkgebühr
 EX_CAM_VP=Unterhalt und Reparatur Privatauto
 DefaultCategoryCar=Standardmäßiges Verkehrsmittel
 DefaultRangeNumber=Standradreichweite
-UploadANewFileNow=Upload a new document now
+UploadANewFileNow=Neues Dokument jetzt hochladen
 Error_EXPENSEREPORT_ADDON_NotDefined=Fehler, die Regeln für Spesenabrechnungnummerierung wurde im Setup des Moduls "Spesenabrechnung" nicht definiert
 ErrorDoubleDeclaration=Sie haben bereits eine andere Spesenabrechnung in einem ähnlichen Datumsbereich erstellt.
 AucuneLigne=Es wurde noch keine Spesenabrechnung erstellt.
@@ -148,4 +148,4 @@ nolimitbyEX_EXP=pro Zeile (Nicht Begrenzt)
 CarCategory=Fahrzeug Kategorie
 ExpenseRangeOffset=Offset Betrag: %s
 RangeIk=Reichweite
-AttachTheNewLineToTheDocument=Attach the new line to an existing document
+AttachTheNewLineToTheDocument=Zeile an hochgeladenes Dokument anhängen
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index e5d215640ea..f1bc8025f27 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -35,7 +35,7 @@ SuperAdministrator=Super-Administrator
 SuperAdministratorDesc=Administrator mit allen Rechten
 AdministratorDesc=Administrator
 DefaultRights=Standardberechtigungen
-DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
+DefaultRightsDesc=Legen Sie die <u>Standard</u>-Berechtigungen fest, die einem <u>neuen</u> Benutzer automatisch zugewiesen werden. (Um Berechtigungen von bestehenden Benutzern zu ändern, wechseln Sie in die Benutzer-Karte.)
 DolibarrUsers=Benutzer
 LastName=Nachname
 FirstName=Vorname
@@ -69,8 +69,8 @@ InternalUser=Interne Benutzer
 ExportDataset_user_1=Benutzer und -eigenschaften
 DomainUser=Domain-Benutzer %s
 Reactivate=Reaktivieren
-CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=Dieses Formular erlaubt Ihnen das Anlegen eines Internen Benutzers in Ihrem Unternehmen oder Organisation. Zum Anlegen eines externen Benutzers (Kunden, Lieferanten, ...), verwenden Sie bitte die 'Kontakt/Adresse erstellen'-Schaltfläche in der Kontaktkarte des jeweiligen Partners.
+InternalExternalDesc=Ein <b>interner</b> Benutzer ist Teil Ihres Unternehmens/Ihrer Organisation.<br>Ein <b>externer</b> Benutzer ist ein Kunde, Lieferant oder Sonstiges.<br><br>In beiden Fällen können Berechtigungen in Dolibarr definiert werden. Externe Benutzer können auch ein anderes Menü angezeigt bekommen als interne Benutzer (Siehe Start - Einstellungen - Anzeige).
 PermissionInheritedFromAGroup=Berechtigung durch eine Gruppenzugehörigkeit geerbt.
 Inherited=Geerbt
 UserWillBeInternalUser=Erstellter Benutzer ist intern (mit keinem bestimmten Partner verknüpft)
@@ -109,4 +109,4 @@ UserLogoff=Benutzer abmelden
 UserLogged=Benutzer angemeldet
 DateEmployment=Beschäftigungsbeginn
 DateEmploymentEnd=Beschäftigungsende
-CantDisableYourself=You can't disable your own user record
+CantDisableYourself=Sie können Ihr eigenes Benutzerkonto nicht deaktivieren
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index bf132d35dac..56a2fb50105 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -25,7 +25,7 @@ EditPageMeta=Edit page/container properties
 EditInLine=Edit inline
 AddWebsite=Website hinzufügen
 Webpage=Webseite / Container
-AddPage=Seite/Container hinzufügen
+AddPage=Seite / Container hinzufügen
 HomePage=Startseite
 PageContainer=Seite / Container
 PreviewOfSiteNotYetAvailable=Vorschau ihrer Webseite <strong>%s</strong> noch nicht verfügbar. Zuerst muss eine '<strong>Webseiten-Vorlage importiert</strong>' oder '<strong>Seite / Container hinzugefügt</strong>' werden.
@@ -53,8 +53,8 @@ YouCanCreatePageOrImportTemplate=You can create a new page or import a full webs
 SyntaxHelp=Hilfe zu bestimmten Syntaxtipps
 YouCanEditHtmlSourceckeditor=Sie können den HTML-Quellcode über die Schaltfläche "Quelle" im Editor bearbeiten.
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-ClonePage=Seite klonen
-CloneSite=Seite klonen
+ClonePage=Seite / Container klonen
+CloneSite=Website klonen
 SiteAdded=Website hinzugefügt 
 ConfirmClonePage=Bitte geben Sie den Code / Alias ​​einer neuen Seite ein und ob es sich um eine Übersetzung der geklonten Seite handelt.
 PageIsANewTranslation=Die neue Seite ist eine Übersetzung der aktuellen Seite?
@@ -65,16 +65,16 @@ CreateByFetchingExternalPage=Erstellen Sie eine Seite / einen Container, indem S
 OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Abrufen und erstellen
 ExportSite=Website exportieren
-ImportSite=Webseiten-Vorlage importieren
+ImportSite=Website-Vorlage importieren
 IDOfPage=ID der Seite
 Banner=Banner
 BlogPost=Blog Eintrag
 WebsiteAccount=Website Konto
 WebsiteAccounts=Website Konten
-AddWebsiteAccount=Erstellen Sie ein Website-Konto
+AddWebsiteAccount=Website-Konto erstellen
 BackToListOfThirdParty=Zurück zur Liste für Drittanbieter
 DisableSiteFirst=Webseite zuerst deaktivieren
-MyContainerTitle=Titel der Webseite
+MyContainerTitle=Titel der Website
 AnotherContainer=Ein weiterer Container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Benutzertabelle für Webseite aktivieren
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=Bisher wurde noch keine Website erstellt. Erstellen sie diese zuerst.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/de_DE/workflow.lang b/htdocs/langs/de_DE/workflow.lang
index 0e86cb4d349..84ac37001a7 100644
--- a/htdocs/langs/de_DE/workflow.lang
+++ b/htdocs/langs/de_DE/workflow.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow Moduleinstellungen
-WorkflowDesc=Dieses Modul ermöglicht, das Verhalten von automatischen Aktionen in den Anwendungen zu verändern. Standardmäßig wird der Prozess offen sein (Sie können die Dinge in der gewünschten Reihenfolge tun). Sie können automatische Aktionen aktivieren, die Sie interessieren.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=Es sind keine Workflow-Änderungen möglich mit den aktivierten Modulen.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Erstellen Sie automatisch einen Kundenauftrag, nachdem ein kommerzielles Angebot unterschrieben wurde (neue Bestellung hat denselben Betrag wie Angebot)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Erstellen Sie automatisch eine Kundenrechnung, nachdem ein kommerzielles Angebot unterzeichnet wurde (die neue Rechnung hat den gleichen Betrag wie das Angebot)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Erstelle automatisch eine Kundenrechnung, nachdem der Vertrag bestätigt wurde.
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Erstellen Sie automatisch eine Kundenrechnung, nachdem eine Kundenbestellung geschlossen wurde (die neue Rechnung hat den gleichen Betrag wie die Bestellung)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Die verbundenen Quellangebote auf abgerechnet setzen, wenn die Kunden-Bestellung als abgerechnet gesetzt wurde (und der Betrag der Bestellung gleich mit dem der gezeichneten verbundenen Angebote ist)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
 AutomaticCreation=automatische Erstellung
 AutomaticClassification=Automatische Klassifikation
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index dc864f556fa..a04afc621c4 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Δημιουργήστε μία νέα συναλλαγή
 UpdateMvts=Τροποποίηση συναλλαγής
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Ετικέτα λογαριασμού
 LabelOperation=Label operation
 Sens=Σημασία
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Ημερολόγιο
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=Επιλογές
 OptionModeProductSell=Κατάσταση πωλήσεων
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Κατάσταση αγορών
 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
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 423b7931b10..ee2961b334e 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -66,12 +66,14 @@ Dictionary=Λεξικά
 ErrorReservedTypeSystemSystemAuto=Αξία «system» και «systemauto» για τον τύπο είναι κατοχυρωμένα. Μπορείτε να χρησιμοποιήσετε το «χρήστη» ως αξία για να προσθέσετε το δικό σας μητρώο
 ErrorCodeCantContainZero=Ο κώδικας δεν μπορεί να περιέχει την τιμή 0
 DisableJavascript=Απενεργοποίηση συναρτήσεων JavaScript και Ajax
-DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=Σημείωση: Για σκοπούς δοκιμής ή σφαλμάτων. Για βελτιστοποίηση για τυφλούς χρήστες ή προγράμματα περιήγησης κειμένου, μπορείτε να προτιμήσετε να χρησιμοποιήσετε τη ρύθμιση στο προφίλ του χρήστη
 UseSearchToSelectCompanyTooltip=Επίσης, αν έχετε ένα μεγάλο αριθμό Πελ./Προμ. (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τον καθορισμό της σταθερά COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο Setup->Other. Η αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς.
 UseSearchToSelectContactTooltip=Επίσης, αν έχετε ένα μεγάλο αριθμό Πελ./Προμ. (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τον καθορισμό της σταθερά COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο Setup->Other. Η αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς.
 DelaiedFullListToSelectCompany=Περιμένετε μέχρι να πατηθεί κάποιο πλήκτρο πριν φορτώσετε το περιεχόμενο της λίστας συνδυασμών τρίτων μερών. <br>Αυτό μπορεί να αυξήσει την απόδοση εάν έχετε μεγάλο αριθμό τρίτων, αλλά είναι λιγότερο βολικό.
 DelaiedFullListToSelectContact=Περιμένετε έως ότου πατήσετε ένα πλήκτρο πριν φορτώσετε το περιεχόμενο της λίστας επαφών combo.<br>Αυτό μπορεί να αυξήσει την απόδοση εάν έχετε μεγάλο αριθμό επαφών, αλλά είναι λιγότερο βολικό)
-NumberOfKeyToSearch=Πλήθος χαρακτήρων για να ξεκινήσει η αναζήτηση: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Δεν είναι διαθέσιμο όταν η Ajax είναι απενεργοποιημένη
 AllowToSelectProjectFromOtherCompany=Σε έγγραφο τρίτου μέρους, μπορείτε να επιλέξετε ένα έργο που συνδέεται με άλλο τρίτο μέρος
 JavascriptDisabled=Η JavaScript είναι απενεργοποιημένη
@@ -149,7 +151,7 @@ PurgeAreaDesc=Αυτή η σελίδα σας επιτρέπει να διαγρ
 PurgeDeleteLogFile=Διαγράψτε τα αρχεία καταγραφής, συμπεριλαμβανομένων<b>%s</b> που είναι ορισμένα για τη χρήση της μονάδας Syslog (χωρίς κίνδυνο απώλειας δεδομένων)
 PurgeDeleteTemporaryFiles=Διαγραφή ολών των προσωρινών αρχείων (δεν υπάρχει κίνδυνος απώλειας δεδομένων)
 PurgeDeleteTemporaryFilesShort=Διαγραφή προσωρινών αρχείων
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeDeleteAllFilesInDocumentsDir=Διαγράψτε όλα τα αρχεία στον κατάλογο: <b>%s</b> . <br> Αυτό θα διαγράψει όλα τα παραγόμενα έγγραφα που σχετίζονται με στοιχεία (τρίτα μέρη, τιμολόγια κ.λπ.), αρχεία που έχουν φορτωθεί στη μονάδα ECM, αρχεία από αντίγραφα ασφαλείας βάσεων δεδομένων και προσωρινά αρχεία.
 PurgeRunNow=Διαγραφή τώρα
 PurgeNothingToDelete=Δεν υπάρχει κατάλογος ή αρχείο για διαγραφή.
 PurgeNDirectoriesDeleted=<b>%s</b> αρχεία ή κατάλογοι που διαγραφήκαν.
@@ -167,7 +169,7 @@ NoBackupFileAvailable=Δεν υπάρχουν διαθέσιμα αρχεία α
 ExportMethod=Μέθοδος Εξαγωγής
 ImportMethod=Μέθοδος Εισαγωγής
 ToBuildBackupFileClickHere=Για να δημιουργήσετε ένα αρχείο αντιγράφων ασφαλείας, κάντε κλίκ <a href="%s">εδώ</a>.
-ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
+ImportMySqlDesc=Για να εισαγάγετε ένα αρχείο αντιγράφων ασφαλείας MySQL, μπορείτε να χρησιμοποιήσετε το phpMyAdmin μέσω του προγράμματος φιλοξενίας σας ή να χρησιμοποιήσετε την εντολή mysql από τη γραμμή εντολών. <br> Για παράδειγμα:
 ImportPostgreSqlDesc=Για την εισαγωγή ενός αντιγράφου ασφαλείας, πρέπει να χρησιμοποιήσετε pg_restore εντολή από την γραμμή εντολών:
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
@@ -189,11 +191,11 @@ ExtendedInsert=Εκτεταμένη INSERT
 NoLockBeforeInsert=Δεν υπάρχουν εντολές κλειδώματος ασφαλείας γύρω από INSERT
 DelayedInsert=Καθυστέρηση ένθετου
 EncodeBinariesInHexa=Κωδικοποίηση δυαδικών δεδομένων σε δεκαεξαδική
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+IgnoreDuplicateRecords=Αγνόηση σφαλμάτων διπλότυπων εγγραφών (INSERT IGNORE)
 AutoDetectLang=Αυτόματη Ανίχνευση (γλώσσα φυλλομετρητή)
 FeatureDisabledInDemo=Δυνατότητα απενεργοποίησης στο demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
+FeatureAvailableOnlyOnStable=Το χαρακτηριστικό είναι διαθέσιμο μόνο σε επίσημες σταθερές εκδόσεις
+BoxesDesc=Τα γραφικά στοιχεία είναι στοιχεία που εμφανίζουν ορισμένες πληροφορίες που μπορείτε να προσθέσετε για να προσαρμόσετε ορισμένες σελίδες. Μπορείτε να επιλέξετε μεταξύ εμφάνισης του γραφικού στοιχείου ή όχι επιλέγοντας τη σελίδα προορισμού και κάνοντας κλικ στην επιλογή &#39;Ενεργοποίηση&#39; ή κάνοντας κλικ στο καλάθι απορριμάτων για να το απενεργοποιήσετε.
 OnlyActiveElementsAreShown=Μόνο στοιχεία από <a href="%s">ενεργοποιημένα modules</a> προβάλλονται.
 ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Θύρα
 VirtualServerName=Virtual server name
 OS=Λ.Σ.
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Βάση Δεδομένων
 DatabaseServer=Υπολογιστής ΒΔ
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Τιμολόγια και πιστωτικά τιμολόγ
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Πιστωτικό τιμολόγιο
-CreditNotes=Πιστωτικά τιμολόγια
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index 191e0b11e1b..6f123b81075 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Γεγονότα για τα οποία θα δημιουργήσ
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Συμβόλαιο %s επικυρώθηκε
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Πρόσφορα %s υπεγράφη
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 825a7b02c8d..1a302a45d4e 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Τράπεζα
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Όνομα Τράπεζας
 FinancialAccount=Λογαριασμός
 BankAccount=Τραπεζικός Λογαριασμός
 BankAccounts=Τραπεζικοί Λογαριασμοί
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Εμφάνιση λογαριασμού
 AccountRef=Αναγνωριστικό Λογιστικού Λογαριασμού
 AccountLabel=Ετικέτα Λογιστικού Λογαριασμού
@@ -30,7 +30,7 @@ AllTime=Από την αρχή
 Reconciliation=Πραγματοποίηση Συναλλαγών
 RIB=Αριθμός Τραπ. Λογαριασμού
 IBAN=IBAN
-BIC=Αριθμός BIC/SWIFT
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Κίνηση
 AccountStatements=Κινήσεις Λογαριασμού
 LastAccountStatements=Τελευταίες Κινήσεις Λογαριασμού
 IOMonthlyReporting=Μηνιαία Αναφορά
-BankAccountDomiciliation=Πάγια Εντολή
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Χώρα λογαριασμού
 BankAccountOwner=Ιδιοκτήτης Λογαριασμού
 BankAccountOwnerAddress=Διεύθυνση Ιδιοκτήτη
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Δημιουργία Λογαριασμού
 NewBankAccount=Νέος Λογαριασμός
 NewFinancialAccount=Νέος Λογιστικός Λογαριασμός
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Πληρωμή Πελάτη
-SupplierInvoicePayment=Πληρωμή προμηθευτή
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Πληρωμή συνδρομής
 WithdrawalPayment=Ανάκληση πληρωμής
 SocialContributionPayment=Σίγουρα θέλετε να μαρκάρετε αυτό το αξιόγραφο σαν απορριφθέν;
 BankTransfer=Τραπεζική Μεταφορά
 BankTransfers=Τραπεζικές Μεταφορές
 MenuBankInternalTransfer=Εσωτερική μεταφορά
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Από
 TransferTo=Προς
 TransferFromToDone=Η μεταφορά από <b>%s</b> στον <b>%s</b> του <b>%s</b> %s έχει καταγραφεί.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Επιστροφή στον λογαριασμό
 ShowAllAccounts=Εμφάνιση Όλων των Λογαριασμών
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Επιλέξτε την κατάσταση των τραπεζών που συνδέονται με τη διαδικασία συνδιαλλαγής. Χρησιμοποιήστε μια σύντομη αριθμητική τιμή όπως: YYYYMM ή YYYYMMDD
 EventualyAddCategory=Τέλος, καθορίστε μια κατηγορία στην οποία θα ταξινομηθούν οι εγγραφές
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Ελέγξτε την επιστροφή και
 BankAccountModelModule=Πρότυπα εγγράφων για τραπεζικούς λογαριασμούς
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Πρότυπο για εκτύπωση σελίδας με πληροφορίες BAN.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 335bec812bd..3ff30a5d4fc 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Διαγραφή Πληρωμής
 ConfirmDeletePayment=Είστε σίγουροι ότι θέλετε να διαγράψετε την πληρωμή;
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Ληφθείσες Πληρωμές
 ReceivedCustomersPayments=Ληφθείσες Πληρωμές από πελάτες
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Σύνολο πληρωμής
-ValidatePayment=Επικύρωση πληρωμής
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Αυτόματη επικύρωση τιμολογίων
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index 36775bceac7..59f0a6fb495 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Ιστορικό
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 2c2d7cc13b6..819ceb80e64 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Κοινωνικές/Φορολογικές εισφορές προς πληρωμή
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Νέα Πληρωμή
-Payments=Πληρωμές
 PaymentCustomerInvoice=Πληρωμή τιμολογίου πελάτη
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Πληρωμή Κοινωνικής/Φορολογικής εισφοράς
@@ -205,7 +204,6 @@ SellsJournal=Ημερολόγιο πωλήσεων
 PurchasesJournal=Ημερολόγιο Αγορών
 DescSellsJournal=Ημερολόγιο πωλήσεων
 DescPurchasesJournal=Ημερολόγιο Αγορών
-InvoiceRef=Αρ. Τιμολογίου
 CodeNotDef=Δεν προσδιορίζεται
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 722ee8fe0e5..4d36d0a8a43 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/el_GR/holiday.lang b/htdocs/langs/el_GR/holiday.lang
index e43fb094c36..cf4fecb398f 100644
--- a/htdocs/langs/el_GR/holiday.lang
+++ b/htdocs/langs/el_GR/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Επικυρώθηκαν οι αιτήσεις άδειας
 HolidaysValidatedBody=Η αίτηση αδείας %s στο %s έχει επικυρωθεί.
 HolidaysRefused=Αίτηση αρνήθηκε
-HolidaysRefusedBody=Η αίτηση αδείας σας για %s στο %s έχει απορριφθεί για τον ακόλουθο λόγο:
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Ακυρώθηκε το αίτημα αδείας
 HolidaysCanceledBody=Η αίτηση αδείας σας για %s στο %s έχει ακυρωθεί.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index b1d682f64ab..9b49242e3b3 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -371,6 +371,7 @@ Percentage=Ποσοστό
 Total=Σύνολο
 SubTotal=Υποσύνολο
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Σύνολο (με Φ.Π.Α.)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Αποστολή email επιβεβαίωσης
 SendMail=Αποστολή email
 Email=Email
 NoEMail=Χωρίς email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=Χωρείς κινητό τηλέφωνο
@@ -671,7 +671,6 @@ Method=Μέθοδος
 Receive=Παραλαβή
 CompleteOrNoMoreReceptionExpected=Ολοκληρώθηκε ή δεν αναμένετε κάτι περισσότερο
 ExpectedValue=Expected Value
-CurrentValue=Τρέχουσα Τιμή
 PartialWoman=Μερική
 TotalWoman=Συνολικές
 NeverReceived=Δεν παραλήφθηκε
@@ -834,6 +833,7 @@ RelatedObjects=Σχετικά Αντικείμενα
 ClassifyBilled=Χαρακτηρισμός ως τιμολογημένο
 ClassifyUnbilled=Classify unbilled
 Progress=Πρόοδος
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=Προβολή
@@ -842,6 +842,11 @@ Exports=Εξαγωγές
 ExportFilteredList=Εξαγωγή φιλτραρισμένης λίστας
 ExportList=Εξαγωγή λίστας
 ExportOptions=Επιλογές Εξαγωγής
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Ημερολόγιο
 GroupBy=Ομαδοποίηση κατά...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Οικονομικό έτος
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index d81d291808c..d6fd8245df5 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -6,7 +6,7 @@ Member=Μέλος
 Members=Μέλη
 ShowMember=Εμφάνιση καρτέλα μέλους
 UserNotLinkedToMember=Ο χρήστης δεν συνδέετε με κάποιο μέλος
-ThirdpartyNotLinkedToMember=Πελ./Προμ. δεν συνδέεται με κανένα μέλος
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Tickets Μελών
 FundationMembers=Μέλη οργανισμού
 ListOfValidatedPublicMembers=Λίστα πιστοποιημένων δημοσίων μελών
@@ -67,11 +67,11 @@ Subscriptions=Συνδρομές
 SubscriptionLate=Καθυστ.
 SubscriptionNotReceived=Ποσό Συνδρομής δεν έχει παραληφθεί
 ListOfSubscriptions=Λίστα Συνδρομών
-SendCardByMail=Αποστολή Κάρτας Μέλους με Email
+SendCardByMail=Send card by email
 AddMember=Δημιουργία μέλους
 NoTypeDefinedGoToSetup=Νέος τύπος μέλους. Πηγαίνετε στις Ρυθμίσεις -> Τύποι μελών
 NewMemberType=Νέος τύπος μέλους
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Απαιτείται Συνδρομή
 DeleteType=Διαγραφή
 VoteAllowed=Δικαίωμα ψήφου
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Είστε σίγουροι ότι θέλετε να 
 Filehtpasswd=htpasswd file
 ValidateMember=Επικύρωση ενός μέλους
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Λίστα δημόσιων μελών
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Περιεχόμενα καρτέλας
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members (Format for output
 DocForOneMemberCards=Generate business cards for a particular member (Format for output actually setup: <b>%s</b>)
 DocForLabels=Generate address sheets (Format for output actually setup: <b>%s</b>)
 SubscriptionPayment=Πληρωμή συνδρομής
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Ποσό τελευταίας Συνδρομής
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Μέλη στατιστικές ανά χώρα
 MembersStatisticsByState=Τα μέλη στατιστικών στοιχείων από πολιτεία / επαρχία
 MembersStatisticsByTown=Τα μέλη στατιστικών στοιχείων από την πόλη
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Αυτή η οθόνη εμφανίζει στατιστικά για τα μέλη του από τη φύση τους.
 MembersByRegion=Αυτή η οθόνη εμφανίζει στατιστικά για τα μέλη κατά περιοχή.
 VATToUseForSubscriptions=Συντελεστή ΦΠΑ που θα χρησιμοποιηθεί για τις συνδρομές
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Χρήση email για χρήση ενημέρωσης όταν το Dolibarr λαμβάνει επιβεβαίωση για πιστοποιημένη πληρωμή συνδρομής (Παράδειγμα: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Το προϊόν χρησιμοποιείται για τη γραμμή από συνδρομές στο τιμολόγιο: %s
 NameOrCompany=Όνομα ή Επωνυμία
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/el_GR/modulebuilder.lang b/htdocs/langs/el_GR/modulebuilder.lang
index 9b3b8ae7ad1..fe28fe78ae9 100644
--- a/htdocs/langs/el_GR/modulebuilder.lang
+++ b/htdocs/langs/el_GR/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Αρχείο sql
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/el_GR/paybox.lang b/htdocs/langs/el_GR/paybox.lang
index 20d737872ff..44e57b33e12 100644
--- a/htdocs/langs/el_GR/paybox.lang
+++ b/htdocs/langs/el_GR/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Για να ολοκληρώσετε
 YourEMail=E-mail για να λάβετε επιβεβαίωση της πληρωμής
 Creditor=Πιστωτής
 PaymentCode=Κωδικός Πληρωμής
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Εισαγωγή Πληρωμής
 YouWillBeRedirectedOnPayBox=Θα μεταφερθείτε σε προστατευμένη σελίδα Paybox να εισάγετε τα στοιχεία της πιστωτικής σας κάρτας
 Continue=Επόμενη
 ToOfferALinkForOnlinePayment=URL για %s πληρωμής
-ToOfferALinkForOnlinePaymentOnOrder=URL για να προσφέρει μια %s online διεπαφή χρήστη πληρωμή για την παραγγελία
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL για να προσφέρει μια %s online διεπαφή χρήστη για την πληρωμή του τιμολογίου
 ToOfferALinkForOnlinePaymentOnContractLine=URL για να προσφέρει μια %s online διεπαφή χρήστη πληρωμή για μια γραμμή σύμβαση
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL για να προσφέρει μια %s online διεπαφή χρήστη πληρωμή για ένα ελεύθερο ποσό
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL για να προσφέρει μια %s online διεπαφή χρήστη πληρωμή για μια συνδρομή μέλους
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Μπορείτε επίσης να προσθέσετε την παράμετρο url <b>&amp; tag = <i>αξία</i></b> σε κανένα από αυτά τα URL (απαιτείται μόνο για την ελεύθερη πληρωμής) για να προσθέσετε το δικό σας σχόλιο ετικέτα πληρωμής.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Η σελίδα αυτή επιβεβαιώνει ότι η πληρωμή σας έχει καταγραφεί. Σας ευχαριστώ.
@@ -33,7 +33,8 @@ VendorName=Όνομα του πωλητή
 CSSUrlForPaymentForm=Url CSS φύλλο στυλ για το έντυπο πληρωμής
 NewPayboxPaymentReceived=Νέα πληρωμή Paybox που λήφθηκε
 NewPayboxPaymentFailed=Νέα πληρωμή Paybox προσπάθησαν αλλά απέτυχαν
-PAYBOX_PAYONLINE_SENDEMAIL=Στείλτε e-mail προειδοποιήσεις μετά από πληρωμή (επιτυχία ή όχι)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Τιμή για PBX SITE
 PAYBOX_PBX_RANG=Τιμή για PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Τιμή για PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/el_GR/paypal.lang b/htdocs/langs/el_GR/paypal.lang
index e942b27048d..8979404260e 100644
--- a/htdocs/langs/el_GR/paypal.lang
+++ b/htdocs/langs/el_GR/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Άμεση εγκατάσταση μονάδας
-PaypalDesc=Αυτή η ενότητα σας επιτρέπει πληρωμές <a href="http://www.paypal.com" target="_blank">PayPal</a> από τους πελάτες. Αυτό μπορεί να χρησιμοποιηθεί για μια ελεύθερη πληρωμής ή πληρωμή σε ένα συγκεκριμένο αντικείμενο Dolibarr (τιμολόγιο, ώστε, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Πληρώστε με Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Λειτουργία δοκιμής / sandbox
 PAYPAL_API_USER=API όνομα χρήστη
 PAYPAL_API_PASSWORD=API κωδικό πρόσβασης
 PAYPAL_API_SIGNATURE=API υπογραφή
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Προσφορά πληρωμής  "ενσωματωμένο"  (Πιστωτική κάρτα + Paypal) ή "Paypal" μόνο
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Ενσωματωμένο
 PaypalModeOnlyPaypal=PayPal μόνο
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=Αυτό είναι id της συναλλαγής: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Προσθέστε το url του Paypal πληρωμής όταν στέλνετε ένα έγγραφο με το ταχυδρομείο
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Στείλτε e-mail προειδοποιήσεις μετά από πληρωμή (επιτυχία ή όχι)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Επιστροφή στο URL μετά από την πληρωμή
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Λάθος κωδικός
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 0e9c1c8b207..aeec8f5d587 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -260,7 +260,7 @@ AddVariable=Προσθήκη μεταβλητής
 AddUpdater=Add Updater
 GlobalVariables=Καθολικές μεταβλητές
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index a444d1b06a1..b79fe5d0678 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Χρόνος που δαπανήθηκε
 TimeSpentByYou=Χρόνος που δαπανάται από εσάς
 TimeSpentByUser=Χρόνος που δαπανάται από τον χρήστη
 TimesSpent=Ο χρόνος που δαπανάται
-RefTask=Αναφ. εργασίας
-LabelTask=Ετικέτα εργασίας
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Ο χρόνος που δαπανάται σε εργασίες
 TaskTimeUser=Χρήστης
 TaskTimeNote=Σημείωση
diff --git a/htdocs/langs/el_GR/stripe.lang b/htdocs/langs/el_GR/stripe.lang
index 58a88459b1f..246e61d8d00 100644
--- a/htdocs/langs/el_GR/stripe.lang
+++ b/htdocs/langs/el_GR/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Μετά από τις διευθύνσεις URL είναι διαθέσιμοι να προσφέρουν μια σελίδα σε έναν πελάτη να προβεί σε πληρωμή σε Dolibarr αντικείμενα
 PaymentForm=Έντυπο πληρωμής
-WelcomeOnPaymentPage=Καλώς ήρθατε στην online υπηρεσία πληρωμών μας
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Αυτή η οθόνη σας επιτρέπει να κάνετε μια online πληρωμή %s.
 ThisIsInformationOnPayment=Πρόκειται για πληροφορίες σχετικά με την πληρωμή να γίνει
 ToComplete=Για να ολοκληρώσετε
 YourEMail=E-mail για να λάβετε επιβεβαίωση της πληρωμής
-STRIPE_PAYONLINE_SENDEMAIL=Στείλτε e-mail προειδοποιήσεις μετά από πληρωμή (επιτυχία ή όχι)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Πιστωτής
 PaymentCode=Κωδικός Πληρωμής
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Επόμενη
 ToOfferALinkForOnlinePayment=URL για %s πληρωμής
-ToOfferALinkForOnlinePaymentOnOrder=URL για να προσφέρει μια %s online διεπαφή χρήστη πληρωμή για την παραγγελία
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL για να προσφέρει μια %s online διεπαφή χρήστη για την πληρωμή του τιμολογίου
 ToOfferALinkForOnlinePaymentOnContractLine=URL για να προσφέρει μια %s online διεπαφή χρήστη πληρωμή για μια γραμμή σύμβαση
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL για να προσφέρει μια %s online διεπαφή χρήστη πληρωμή για ένα ελεύθερο ποσό
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL για να προσφέρει μια %s online διεπαφή χρήστη πληρωμή για μια συνδρομή μέλους
 YouCanAddTagOnUrl=Μπορείτε επίσης να προσθέσετε την παράμετρο url <b>&amp; tag = <i>αξία</i></b> σε κανένα από αυτά τα URL (απαιτείται μόνο για την ελεύθερη πληρωμής) για να προσθέσετε το δικό σας σχόλιο ετικέτα πληρωμής.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=Η σελίδα αυτή επιβεβαιώνει ότι η πληρωμή σας έχει καταγραφεί. Σας ευχαριστώ.
-YourPaymentHasNotBeenRecorded=Η πληρωμή σας δεν έχει καταγραφεί και η συναλλαγή έχει ακυρωθεί. Σας ευχαριστώ.
 AccountParameter=Παράμετροι λογαριασμού
 UsageParameter=Παράμετροι χρήσης
 InformationToFindParameters=Βοήθεια για να βρείτε %s τα στοιχεία του λογαριασμού σας
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -58,8 +56,12 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card
+DeleteACard=Διαγραφή κάρτας
 ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index dca2e49331d..7ae9d1709c4 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index 505685df396..f792eabe51a 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -4,4 +4,4 @@ NewVATRates=New GST rate
 DictionaryVAT=GST Rates or Sales Tax Rates
 OptionVatMode=GST due
 LinkColor=Colour of links
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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/banks.lang b/htdocs/langs/en_AU/banks.lang
index 3746466ea96..f0293e36d7f 100644
--- a/htdocs/langs/en_AU/banks.lang
+++ b/htdocs/langs/en_AU/banks.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - banks
+WithdrawalPayment=Withdrawal payment
 BankChecks=Bank cheques
 ShowCheckReceipt=Show cheque deposit receipt
 RejectCheck=Cheque returned
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index c08fb8f1ada..e5e33b73dd6 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -3,4 +3,4 @@ LocalTax1Management=PST Management
 CompanyZip=Postal code
 LDAPFieldZip=Postal code
 FormatZip=Postal code
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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 ed4ccf2f985..ed606456013 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -41,7 +41,6 @@ CustomersVentilation=Linked Customer invoice
 SuppliersVentilation=Vendor invoice linking
 ExpenseReportsVentilation=Expense report links
 UpdateMvts=Modify a transaction
-WriteBookKeeping=Journalise transactions in Ledger
 InvoiceLines=Lines of invoices to link
 InvoiceLinesDone=Linked lines of invoices
 ExpenseReportLines=Lines of expense reports to link
@@ -84,6 +83,7 @@ ListeMvts=List of transactions
 ErrorDebitCredit=Debit and Credit fields cannot have values at the same time
 AddCompteFromBK=Add finance accounts to the group
 ListAccounts=List of the financial accounts
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
 Pcgtype=Group account
 Pcgsubtype=Subgroup account
 DescVentilCustomer=View the list of customer invoice lines linked (or not) to a product financial account
@@ -115,6 +115,7 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already in use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Financial account for Sales Tax is defined in menu <b>%s</b> - <b>%s</b>
 Modelcsv=Example of export
 Selectmodelcsv=Select an example of export
+Modelcsv_FEC=Export FEC (Art. L47 A)
 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.
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index 29082562fee..29af3e502f6 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -47,4 +47,4 @@ 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
 FormatZip=Postcode
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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/banks.lang b/htdocs/langs/en_GB/banks.lang
index 240839e6bea..014253318ed 100644
--- a/htdocs/langs/en_GB/banks.lang
+++ b/htdocs/langs/en_GB/banks.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - banks
+WithdrawalPayment=Withdrawal payment
 CheckTransmitter=Drawer
 BankChecks=Bank cheques
 ShowCheckReceipt=Show cheque deposit receipt
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index 0114b2c34f0..e3cc80d5cea 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -14,4 +14,4 @@ ProposalsPDFModules=Quotation documents models
 FreeLegalTextOnProposal=Free text on quotations
 WatermarkOnDraftProposal=Watermark on draft quotations (none if empty)
 MailToSendProposal=Customer quotations
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index b0f15bb72fa..24bccccfe21 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -68,7 +68,6 @@ ExpenseReportsVentilation=Encuadernación del informe de gastos
 CreateMvts=Crear nueva transacción
 UpdateMvts=Modificación de una transacción
 ValidTransaction=Validar transacción
-WriteBookKeeping=Registrar transacciones en Ledger
 Bookkeeping=Libro mayor
 ObjectsRef=Referencia de objeto de origen
 TotalExpenseReport=Informe de gastos totales
@@ -127,6 +126,7 @@ ListeMvts=Lista de movimientos
 ErrorDebitCredit=Débito y crédito no pueden tener el mismo valor
 AddCompteFromBK=Agregar cuentas de contabilidad al grupo
 ListAccounts=Lista de cuentas contables
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
 PaymentsNotLinkedToProduct=Pago no vinculado a ningún producto / servicio
 TotalVente=Volumen de negocios total antes de impuestos
 TotalMarge=Margen total de ventas
@@ -162,6 +162,7 @@ AccountingAccountForSalesTaxAreDefinedInto=Nota: La cuenta de contabilidad para
 ExportDraftJournal=Exportar borrador del diario
 Selectmodelcsv=Seleccione un modelo
 Modelcsv_normal=Exportación clasica
+Modelcsv_FEC=Export FEC (Art. L47 A)
 ChartofaccountsId=Plan de cuentas Id
 InitAccountancy=Contabilidad inicial
 InitAccountancyDesc=Esta página se puede usar para inicializar una cuenta de contabilidad en productos y servicios que no tienen una cuenta de contabilidad definida para ventas y compras.
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 8631fe25609..eab645cdc09 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -38,7 +38,6 @@ DictionarySetup=Configuración del diccionario
 ErrorReservedTypeSystemSystemAuto=El valor 'sistema' y 'systemauto' para el tipo está reservado. Puede usar 'user' como valor para agregar su propio registro
 UseSearchToSelectCompanyTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad estableciendo constante COMPANY_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otro. La búsqueda se limitará al inicio de la cadena.
 UseSearchToSelectContactTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad estableciendo CONTACT_DONOTSEARCH_ANYWHERE constante en 1 en Configuración-> Otro. La búsqueda se limitará al inicio de la cadena.
-NumberOfKeyToSearch=Número de caracteres para activar la búsqueda: %s
 NotAvailableWhenAjaxDisabled=No disponible cuando Ajax está deshabilitado
 AllowToSelectProjectFromOtherCompany=En el documento de un tercero, puede elegir un proyecto vinculado a otro tercero
 JavascriptDisabled=JavaScript deshabilitado
@@ -522,7 +521,6 @@ BrowserOS=Sistema operativo del navegador
 ListOfSecurityEvents=Lista de eventos de seguridad de Dolibarr
 AreaForAdminOnly=Los parámetros de configuración solo pueden modificarse por <b>usuarios administradores</b>.
 SystemInfoDesc=La información del sistema es información técnica miscelánea que obtienes en modo solo lectura y visible solo para los administradores.
-AccountantFileNumber=Número de expediente
 AvailableModules=Aplicación / módulos disponibles
 ToActivateModule=Para activar los módulos, vaya al Área de configuración (Inicio-> Configuración-> Módulos).
 SessionTimeOut=Tiempo de espera para la sesión
@@ -594,8 +592,6 @@ BillsSetup=Configuración del módulo de facturas
 BillsNumberingModule=Modelo de numeración de facturas y notas de crédito
 BillsPDFModules=Modelos de documentos de factura
 PaymentsPDFModules=Modelos de documentos de pago
-CreditNote=Nota de crédito
-CreditNotes=Notas de crédito
 ForceInvoiceDate=Forzar fecha de factura a fecha de validación
 SuggestedPaymentModesIfNotDefinedInInvoice=Modo de pago sugerido en la factura por defecto si no está definido para la factura
 FreeLegalTextOnInvoices=Texto libre en las facturas
@@ -926,6 +922,7 @@ ModuleEnabledAdminMustCheckRights=Módulo ha sido activado. Los permisos para lo
 BaseCurrency=Moneda de referencia de la empresa (entre en la configuración de la empresa para cambiar esto)
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto en sí si este grupo es un cálculo de otros grupos
 SeveralLangugeVariatFound=Varias variantes de lenguaje encontradas
+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.
 UseSearchToSelectResource=Use un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
 DisabledResourceLinkUser=Deshabilitar característica para vincular un recurso a los usuarios
 DisabledResourceLinkContact=Deshabilitar característica para vincular un recurso a contactos
diff --git a/htdocs/langs/es_CL/banks.lang b/htdocs/langs/es_CL/banks.lang
index cd9413f895f..986887cb0c5 100644
--- a/htdocs/langs/es_CL/banks.lang
+++ b/htdocs/langs/es_CL/banks.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - banks
-MenuBankCash=Banco | Efectivo
 MenuVariousPayment=Pagos diversos
 MenuNewVariousPayment=Nuevo pago misceláneo
 BankAccount=cuenta bancaria
@@ -65,7 +64,6 @@ AddBankRecord=Añadir entrada
 AddBankRecordLong=Agregar entrada manualmente
 DateConciliating=Fecha de conciliación
 BankLineConciliated=Entrada reconciliada
-SupplierInvoicePayment=Pago del proveedor
 WithdrawalPayment=Pago de retiros
 SocialContributionPayment=Pago de impuestos sociales/fiscales
 BankTransfer=transferencia bancaria
@@ -106,10 +104,6 @@ ConfirmRejectCheck=¿Seguro que quieres marcar este cheque como rechazado?
 RejectCheckDate=Fecha en que se devolvió el cheque
 BankAccountModelModule=Plantillas de documentos para cuentas bancarias
 DocumentModelBan=Plantilla para imprimir una página con información de BAN.
-NewVariousPayment=Nuevos pagos misceláneos
-VariousPayment=Pagos diversos
 VariousPayments=Pagos diversos
-ShowVariousPayment=Mostrar pagos diversos
-AddVariousPayment=Agregar pagos diversos
 SEPAMandate=Mandato de la SEPA
 YourSEPAMandate=Su mandato de SEPA
diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang
index 047e2b5d65e..84353e435a0 100644
--- a/htdocs/langs/es_CL/bills.lang
+++ b/htdocs/langs/es_CL/bills.lang
@@ -50,7 +50,6 @@ PaymentsBackAlreadyDone=Pagos ya hechos
 PaymentRule=Regla de pago
 PaymentTypeDC=Tarjeta de crédito débito
 PaymentAmount=Monto del pago
-ValidatePayment=Validar el pago
 PaymentHigherThanReminderToPay=Pago más alto que un recordatorio para pagar
 ClassifyUnBilled=Clasificar 'Unbilled'
 CreateCreditNote=Crear nota de crédito
@@ -188,6 +187,8 @@ AddCreditNote=Crear nota de crédito
 ShowDiscount=Mostrar descuento
 ShowReduc=Muestra la deducción
 GlobalDiscount=Descuento global
+CreditNote=Nota de crédito
+CreditNotes=Notas de crédito
 Deposit=Pago inicial
 Deposits=Bajo pago
 DiscountFromCreditNote=Descuento de la nota de crédito %s
@@ -209,6 +210,7 @@ IdSocialContribution=Identificación de pago de impuesto social / fiscal
 PaymentId=Identificación de pago
 PaymentRef=Pago ref.
 InvoiceId=Id de factura
+InvoiceRef=Factura ref.
 InvoiceDateCreation=Fecha de creación de la factura
 InvoiceStatus=Estado de la factura
 InvoiceNote=Nota de factura
diff --git a/htdocs/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang
index d02dd3080f2..6c137808035 100644
--- a/htdocs/langs/es_CL/compta.lang
+++ b/htdocs/langs/es_CL/compta.lang
@@ -169,7 +169,6 @@ ToDispatch=Para despachar
 ThirdPartyMustBeEditAsCustomer=El tercero debe definirse como un cliente
 SellsJournal=Libro de Ventas
 DescSellsJournal=Libro de Ventas
-InvoiceRef=Factura ref.
 CodeNotDef=No definida
 WarningDepositsNotIncluded=Las facturas de anticipo no están incluidas en esta versión con este módulo contable.
 DatePaymentTermCantBeLowerThanObjectDate=La fecha del plazo de pago no puede ser menor que la fecha del objeto.
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index 1427caf52dc..478076f9114 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -334,6 +334,7 @@ DocumentModelStandardPDF=Plantilla PDF estándar
 PrintContentArea=Mostrar página para imprimir área de contenido principal
 MenuManager=Administrador de menú
 CoreErrorMessage=Disculpe, ocurrió un error. Póngase en contacto con el administrador del sistema para verificar los registros o deshabilitar $ dolibarr_main_prod = 1 para obtener más información.
+ValidatePayment=Validar el pago
 FieldsWithAreMandatory=Campos con <b>%s</b> son obligatorios
 RequiredField=campo requerido
 ToTest=Prueba
@@ -398,7 +399,6 @@ DirectDownloadLink=Enlace de descarga directa (público / externo)
 DirectDownloadInternalLink=Enlace de descarga directa (debe registrarse y necesita permisos)
 DownloadDocument=Descargar documento
 ActualizeCurrency=Actualizar la tasa de cambio
-ModuleBuilder=Constructor de módulos
 ClickToShowHelp=Haga clic para mostrar la ayuda de información sobre herramientas
 ExpenseReport=Informe de gastos
 ExpenseReports=Reporte de gastos
diff --git a/htdocs/langs/es_CL/members.lang b/htdocs/langs/es_CL/members.lang
index 974e25135ed..47a154b3ae1 100644
--- a/htdocs/langs/es_CL/members.lang
+++ b/htdocs/langs/es_CL/members.lang
@@ -3,7 +3,6 @@ MembersArea=Área de miembros
 MemberCard=Tarjeta de miembro
 SubscriptionCard=Tarjeta de suscripción
 ShowMember=Mostrar tarjeta de miembro
-ThirdpartyNotLinkedToMember=Tercero no vinculado a un miembro
 MembersTickets=Entradas de los miembros
 FundationMembers=Miembros de la fundación
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: <b>%s</b>, login: <b>%s</b>) ya está asignado al tercero <b>%s</b>. Primero elimine la asignación, porque un tercero no puede vincularse solo a un miembro (y viceversa).
@@ -50,9 +49,7 @@ Subscriptions=Suscripciones
 SubscriptionLate=Tarde
 SubscriptionNotReceived=Suscripción nunca recibida
 ListOfSubscriptions=Lista de suscripciones
-SendCardByMail=Enviar tarjeta por correo electrónico
 NoTypeDefinedGoToSetup=Ningún tipo de miembro definido. Ir al menú "Tipos de miembros"
-WelcomeEMail=Correo electrónico de bienvenida
 SubscriptionRequired=Suscripción requerida
 DeleteType=Borrar
 VoteAllowed=Voto permitido
@@ -65,7 +62,6 @@ DeleteSubscription=Eliminar una suscripción
 ConfirmDeleteSubscription=¿Seguro que quieres eliminar esta suscripción?
 Filehtpasswd=archivo htpasswd
 ConfirmValidateMember=¿Seguro que quieres validar este miembro?
-FollowingLinksArePublic=Los siguientes enlaces son páginas abiertas que no están protegidas por ningún permiso de Dolibarr. No son páginas formateadas, proporcionadas como ejemplo para mostrar cómo enumerar la base de datos de miembros.
 PublicMemberList=Lista de miembros públicos
 BlankSubscriptionForm=Forma de auto-suscripción pública
 BlankSubscriptionFormDesc=Dolibarr puede proporcionarle una URL / sitio web público para permitir que los visitantes externos soliciten suscribirse a la fundación. Si se habilita un módulo de pago en línea, también se puede proporcionar automáticamente un formulario de pago.
@@ -81,22 +77,13 @@ SendingAnEMailToMember=Envío de información de correo electrónico al miembro
 SendingEmailOnAutoSubscription=Envío de correo electrónico en el registro automático
 SendingEmailOnMemberValidation=Enviando un correo electrónico sobre la validación de un nuevo miembro
 SendingEmailOnNewSubscription=Envío de correo electrónico con nueva suscripción
+SendingReminderForExpiredSubscription=Envío de recordatorio para suscripciones caducadas
 SendingEmailOnCancelation=Enviando un correo electrónico sobre la cancelación
 YourMembershipWasValidated=Su membresía fue validada
 YourSubscriptionWasRecorded=Su nueva suscripción fue grabada
 YourMembershipWasCanceled=Su membresía fue cancelada
 CardContent=Contenido de su tarjeta de miembro
 ThisIsContentOfYourMembershipRequestWasReceived=Queremos informarle que se recibió su solicitud de membresía. <br> <br>
-ThisIsContentOfSubscriptionReminderEmail=Queremos informarle que su suscripción está a punto de caducar. Esperamos que pueda renovarlo. <br> <br>
-ThisIsContentOfYourCard=Esto es un recordatorio de la información que obtenemos sobre usted. No dude en contactarnos si algo parece estar mal. <br> <br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Asunto del correo electrónico recibido en caso de inscripción automática de un invitado
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail recibido en caso de auto inscripción de un invitado
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Plantilla Correo electrónico para usar para enviar correos electrónicos a un miembro sobre la suscripción automática de miembros
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Plantilla de correo electrónico para usar para enviar correos electrónicos a un miembro sobre la validación de miembro
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Plantilla de correo electrónico para usar para enviar correos electrónicos a un miembro en una nueva grabación de suscripción
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Plantilla de correo electrónico para utilizar para enviar un recordatorio por correo electrónico cuando la suscripción está a punto de caducar
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla Correo electrónico a utilizar para enviar un correo electrónico a un miembro sobre la cancelación del miembro
-DescADHERENT_MAIL_FROM=Remitente Correo electrónico para correos electrónicos automáticos
 DescADHERENT_ETIQUETTE_TYPE=Formato de la página de etiquetas
 DescADHERENT_ETIQUETTE_TEXT=Texto impreso en las hojas de direcciones de los miembros
 DescADHERENT_CARD_TYPE=Página de formato de tarjetas
@@ -118,8 +105,6 @@ DocForAllMembersCards=Genera tarjetas de visita para todos los miembros
 DocForOneMemberCards=Genera tarjetas de visita para un miembro en particular
 DocForLabels=Generar hojas de direcciones
 SubscriptionPayment=Pago de suscripción
-LastSubscriptionDate=Última fecha de suscripción
-LastSubscriptionAmount=Último monto de suscripción
 MembersStatisticsByState=Estadísticas de miembros por estado / provincia
 MembersStatisticsByTown=Estadísticas de miembros por ciudad
 NoValidatedMemberYet=No se encontraron miembros validados
@@ -143,10 +128,8 @@ MembersStatisticsByProperties=Estadísticas de miembros por naturaleza
 MembersByNature=Esta pantalla muestra estadísticas de los miembros por naturaleza.
 MembersByRegion=Esta pantalla muestra estadísticas de los miembros por región.
 VATToUseForSubscriptions=Tipo de IVA para suscripciones
-NoVatOnSubscription=Sin TVA para suscripciones
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto utilizado para la línea de suscripción en la factura: %s
 SubscriptionRecorded=Suscripción grabada
 NoEmailSentToMember=No se envió ningún correo electrónico al miembro
 EmailSentToMember=Correo electrónico enviado al miembro al %s
 SendReminderForExpiredSubscriptionTitle=Enviar recordatorio por correo electrónico para la suscripción caducada
-SendReminderForExpiredSubscription=Enviar recordatorio por correo electrónico a los miembros cuando la suscripción esté a punto de caducar (parámetro es el número de días antes del final de la suscripción para enviar el recordatorio)
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index 369dc7cda0e..5514d75f4c1 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -123,7 +123,6 @@ DynamicPriceConfiguration=Configuración dinámica de precios
 AddVariable=Agregar variable
 AddUpdater=Agregar actualización
 VariableToUpdate=Variable para actualizar
-GlobalVariableUpdaters=Actualizadores variables globales
 GlobalVariableUpdaterType0=Datos JSON
 GlobalVariableUpdaterHelp0=Analiza los datos JSON de la URL especificada, VALOR especifica la ubicación del valor relevante,
 GlobalVariableUpdaterHelpFormat0=Formato para la solicitud {"URL": "http://example.com/urlofjson", "VALOR": "array1, array2, targetvalue"}
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index 443175ca4d1..7d7fa48df2e 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -26,7 +26,6 @@ NoProject=Ningún proyecto definido o propiedad
 TimeSpentByYou=Tiempo pasado por ti
 TimeSpentByUser=Tiempo dedicado por el usuario
 TimesSpent=Tiempo dedicado
-LabelTask=Etiqueta de tarea
 TaskTimeSpent=Tiempo dedicado a tareas
 NewTimeSpent=Tiempo dedicado
 BillTime=Bill el tiempo pasado
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 840517ddf2c..313150bca14 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -46,7 +46,6 @@ UseSearchToSelectCompanyTooltip=Además, si tiene un gran número de terceros (>
 UseSearchToSelectContactTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad configurando la constante CONTACT_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otro. La búsqueda se limitará entonces al inicio de la cadena.
 DelaiedFullListToSelectCompany=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de Terceros. Esto puede aumentar el rendimiento si tiene un gran número de terceros, pero es menos conveniente.
 DelaiedFullListToSelectContact=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de contactos. Esto puede aumentar el rendimiento si tiene una gran cantidad de contactos, pero es menos conveniente.
-NumberOfKeyToSearch=Nro de caracteres para activar la búsqueda: %s
 NotAvailableWhenAjaxDisabled=No disponible con Ajax desactivado
 AllowToSelectProjectFromOtherCompany=En el documento de un tercero, puede elegir un proyecto vinculado a otro tercero
 JavascriptDisabled=JavaScript desactivado
@@ -668,7 +667,6 @@ AreaForAdminOnly=Los parámetros de configuración solo pueden ser configurados
 SystemInfoDesc=La información del sistema es información técnica diversa que se obtiene en modo de solo lectura y visible solo para administradores.
 CompanyFundationDesc=Editar la información de la empresa / entidad. Haga clic en el botón "%s" o "%s" en la parte inferior de la página.
 AccountantDesc=Edite los detalles de su contador / contador
-AccountantFileNumber=Número de expediente
 AvailableModules=Aplicación / módulos disponibles
 ToActivateModule=Para activar los módulos, vaya al área de configuración (Inicio-> Configuración-> Módulos).
 SessionTimeOut=Tiempo fuera para sesión
@@ -761,8 +759,6 @@ BillsNumberingModule=Modelo de numeración de facturas y notas de crédito.
 BillsPDFModules=Modelos de documentos de facturas.
 BillsPDFModulesAccordindToInvoiceType=La factura documenta los modelos según el tipo de factura.
 PaymentsPDFModules=Modelos de documentos de pago.
-CreditNote=Nota de crédito
-CreditNotes=Notas de credito
 ForceInvoiceDate=Forzar fecha de factura a fecha de validación
 SuggestedPaymentModesIfNotDefinedInInvoice=Modo de pago sugerido en la factura por defecto si no está definido para la factura
 FreeLegalTextOnInvoices=Texto libre en las facturas.
@@ -1165,6 +1161,7 @@ EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
 NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
 RecordEvent=Grabar evento de correo electrónico
 FormatZip=Cremallera
+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.
 DisabledResourceLinkUser=Deshabilitar la función para vincular un recurso a los usuarios
 DisabledResourceLinkContact=Deshabilitar función para vincular un recurso a contactos
 ConfirmUnactivation=Confirmar el reinicio del módulo
diff --git a/htdocs/langs/es_CO/banks.lang b/htdocs/langs/es_CO/banks.lang
index 902359fcfb0..57dab5bc877 100644
--- a/htdocs/langs/es_CO/banks.lang
+++ b/htdocs/langs/es_CO/banks.lang
@@ -3,6 +3,7 @@ BankAccounts=cuentas bancarias
 BankBalance=Equilibrar
 StatusAccountOpened=Activo
 StatusAccountClosed=Cerrado
+WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Pago de impuestos sociales / fiscales
 BankTransfer=transferencia bancaria
 TransferTo=A
diff --git a/htdocs/langs/es_CO/bills.lang b/htdocs/langs/es_CO/bills.lang
index 4dbd50bc986..b018909f2aa 100644
--- a/htdocs/langs/es_CO/bills.lang
+++ b/htdocs/langs/es_CO/bills.lang
@@ -45,7 +45,6 @@ PaymentsBack=Pagos devueltos
 paymentInInvoiceCurrency=en facturas moneda
 DeletePayment=Eliminar pago
 ConfirmDeletePayment=¿Estás seguro de que quieres eliminar este pago?
-ConfirmConvertToReduc=¿Desea convertir este %s en un descuento absoluto? <br> El monto se guardará entre todos los descuentos y podría utilizarse como un descuento para una factura actual o futura para este cliente.
 ReceivedCustomersPayments=Pagos recibidos de los clientes.
 ReceivedCustomersPaymentsToValid=Recibimos pagos de clientes para validar.
 PaymentsReportsForYear=Informes de pagos para %s
@@ -53,7 +52,6 @@ PaymentsAlreadyDone=Pagos ya hechos
 PaymentsBackAlreadyDone=Pagos devueltos ya hechos
 PaymentRule=Regla de pago
 PaymentTypeDC=Tarjeta de crédito débito
-ValidatePayment=Validar pago
 PaymentHigherThanReminderToPay=Pago más alto que el recordatorio de pago
 HelpPaymentHigherThanReminderToPay=Atención, el monto de pago de una o más facturas es mayor que el monto pendiente de pago. <br> Edite su entrada, de lo contrario confirme y considere crear una nota de crédito por el exceso recibido por cada factura pagada en exceso.
 HelpPaymentHigherThanReminderToPaySupplier=Atención, el monto de pago de una o más facturas es mayor que el monto pendiente de pago. <br> Edite su entrada, de lo contrario confirme y considere crear una nota de crédito por el exceso pagado por cada factura pagada en exceso.
@@ -205,6 +203,8 @@ AddCreditNote=Crear nota de credito
 ShowDiscount=Mostrar descuento
 ShowReduc=Mostrar la deduccion
 GlobalDiscount=Descuento global
+CreditNote=Nota de crédito
+CreditNotes=Notas de credito
 Deposit=Pago inicial
 Deposits=Bajo pago
 DiscountFromCreditNote=Descuento de la nota de crédito %s
@@ -228,6 +228,7 @@ IdSocialContribution=Identificación de pago fiscal social / fiscal
 PaymentId=Identificación de pago
 PaymentRef=Pago ref.
 InvoiceId=Identificación de la factura
+InvoiceRef=Factura ref.
 InvoiceDateCreation=Fecha de creación de la factura.
 InvoiceStatus=Estado de la factura
 InvoiceNote=Nota de factura
diff --git a/htdocs/langs/es_CO/compta.lang b/htdocs/langs/es_CO/compta.lang
index 626b79ad442..c35bb1a59e1 100644
--- a/htdocs/langs/es_CO/compta.lang
+++ b/htdocs/langs/es_CO/compta.lang
@@ -176,7 +176,6 @@ Dispatch=Despacho
 Dispatched=Enviado
 ToDispatch=Para el despacho
 ThirdPartyMustBeEditAsCustomer=El tercero debe ser definido como un cliente
-InvoiceRef=Factura ref.
 CodeNotDef=No definida
 WarningDepositsNotIncluded=Las facturas de anticipo no se incluyen en esta versión con este módulo de contabilidad.
 DatePaymentTermCantBeLowerThanObjectDate=La fecha del plazo de pago no puede ser inferior a la fecha del objeto.
diff --git a/htdocs/langs/es_CO/holiday.lang b/htdocs/langs/es_CO/holiday.lang
index bbe934efe0a..6918375b8fd 100644
--- a/htdocs/langs/es_CO/holiday.lang
+++ b/htdocs/langs/es_CO/holiday.lang
@@ -1,4 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
+Holidays=Salir
+CPTitreMenu=Salir
+DateDebCP=Fecha de inicio
+DateFinCP=Fecha final
+ApprovedCP=Aprobado
 CancelCP=Cancelado
+RefuseCP=Rechazado
 EditCP=Editar
 MotifCP=Razón
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index af4ead62f5a..473a66ef44d 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -208,7 +208,6 @@ DirectDownloadLink=Enlace de descarga directa (público / externo)
 DirectDownloadInternalLink=Enlace de descarga directa (necesita ser registrado y necesita permisos)
 DownloadDocument=Descargar documento
 ActualizeCurrency=Tasa de cambio de moneda
-ModuleBuilder=Generador de módulos
 ClickToShowHelp=Haga clic para mostrar la ayuda de ayuda.
 ExpenseReport=Informe de gastos
 ExpenseReports=Reporte de gastos
diff --git a/htdocs/langs/es_CO/members.lang b/htdocs/langs/es_CO/members.lang
index 7a4eb06e0d6..463ed1141e9 100644
--- a/htdocs/langs/es_CO/members.lang
+++ b/htdocs/langs/es_CO/members.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - members
+MemberStatusDraft=Borrador (necesita ser validado)
 SubscriptionLate=Retraso
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index de5b4962aa6..79fb1cc6155 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -7,3 +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
+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 6b95e4b66ac..90081f4e9a9 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -50,7 +50,6 @@ UseSearchToSelectCompanyTooltip=Además, si tiene un gran número de clientes (>
 UseSearchToSelectContactTooltip=Además, si tiene una gran cantidad de clientes (> 100 000), puede aumentar la velocidad estableciendo constante CONTACT_DONOTSEARCH_ANYWHERE es 1 en: configuración-> Otros. La búsqueda se limitará entonces al inicio de la cadena.
 DelaiedFullListToSelectCompany=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de Terceros. Esto puede aumentar el rendimiento si tiene un gran número de terceros, pero es menos conveniente.
 DelaiedFullListToSelectContact=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de contactos. Esto puede aumentar el rendimiento si tiene una gran cantidad de contactos, pero es menos conveniente.
-NumberOfKeyToSearch=Número de caracteres para activar la búsqueda: %s
 NotAvailableWhenAjaxDisabled=No disponible cuando Ajax está inhabilitado.
 AllowToSelectProjectFromOtherCompany=En el documento de un cliente, puede elegir un proyecto vinculado a otro cliente
 JavascriptDisabled=JavaScript desactivado
@@ -813,7 +812,6 @@ AreaForAdminOnly=Los parámetros de configuración sólo pueden ser establecidos
 SystemInfoDesc=La información del sistema es la información técnica diversa que se obtiene en el modo de solo lectura y visible sólo para los administradores.
 CompanyFundationDesc=Editar la información de la empresa / entidad. Haga clic en el botón " %s" o " %s" en la parte inferior de la página.
 AccountantDesc=Edite los detalles de su contador / contador
-AccountantFileNumber=Número de expediente
 AvailableModules=Aplicaciones / módulos disponibles
 ToActivateModule=Para activar los módulos, vaya a área de configuración (Inicio-> Configuración-> Módulos).
 SessionTimeOut=Tiempo de espera para la sesión
@@ -944,8 +942,6 @@ BillsNumberingModule=Modelo de numeración de facturas y notas de crédito.
 BillsPDFModules=Modelos de documentos de factura
 BillsPDFModulesAccordindToInvoiceType=La factura documenta los modelos según el tipo de factura.
 PaymentsPDFModules=Modelos de documentos de pago
-CreditNote=Nota de crédito
-CreditNotes=Notas de crédito
 ForceInvoiceDate=Forzar la fecha de la factura a la fecha de validación
 SuggestedPaymentModesIfNotDefinedInInvoice=Modo de pagos sugerido en la factura por defecto si no se define para la factura
 SuggestPaymentByRIBOnAccount=Sugerir pago por retiro en cuenta
@@ -1419,6 +1415,7 @@ RecordEvent=Grabar evento de correo electrónico
 CreateLeadAndThirdParty=Crear plomo (y tercero si es necesario)
 CodeLastResult=Último código de resultado
 ECMAutoTree=Mostrar arbol ECM automatico
+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.
 ResourceSetup=Configuración del módulo de recursos
 UseSearchToSelectResource=Use un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
 DisabledResourceLinkUser=Deshabilitar la característica para vincular un recurso a los usuarios
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index eb1d560dec6..6c4bf30eaf3 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -446,7 +446,6 @@ SomeTranslationAreUncomplete=Algunos de los idiomas ofrecidos pueden estar solo
 DirectDownloadLink=Enlace de descarga directa (público/externo)
 DownloadDocument=Descargar documento
 ActualizeCurrency=Actualizar tipo de cambio
-ModuleBuilder=Generador de módulos
 ClickToShowHelp=Haga clic para mostrar ayuda sobre herramientas
 WebSites=Sitios Web
 ExpenseReport=Informe de gastos
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 2cb4371a438..75d170e4bae 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cuenta contable para registrar subscripc
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable predeterminada para los productos comprados (si no se define en el producto)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable predeterminada para los productos vendidos (si no se define en el producto)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Cuenta contable predeterminada para los productos vendidos en la CEE (si no se define en el producto)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Cuenta contable predeterminada para los productos vendidos fuera de la CEE (si no se define en el producto)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Cuenta contable predeterminada para los productos vendidos en la CEE (si no se define en el producto)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Cuenta contable predeterminada para los productos vendidos fuera de la CEE (si no se define en el producto)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable predeterminada para los servicios comprados (si no se define en el servicio)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos (si no se define en el servico)
 
@@ -177,6 +177,7 @@ LabelAccount=Descripción
 LabelOperation=Etiqueta operación
 Sens=Sentido
 LetteringCode=Cogido de letras
+Lettering=Letras
 Codejournal=Diario
 JournalLabel=Etiqueta del diario
 NumPiece=Apunte
@@ -288,8 +289,10 @@ Modelcsv_quadratus=Exportar a Quadratus QuadraCompta
 Modelcsv_ebp=Exportar a EBP
 Modelcsv_cogilog=Eportar a Cogilog
 Modelcsv_agiris=Exportar a Agiris
+Modelcsv_openconcerto=Exportar a OpenConcerto (En pruebas)
 Modelcsv_configurable=Exportación CSV Configurable
-Modelcsv_FEC=Exportación FEC (Art. L47 A) (Prueba)
+Modelcsv_FEC=Exportación FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Exportación a Sage 50 Suiza
 ChartofaccountsId=Id plan contable
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=Esta página puede usarse para establecer una cuenta predeter
 DefaultClosureDesc=Esta página se puede usar para configurar los parámetros que se usarán para incluir un balance general.
 Options=Opciones
 OptionModeProductSell=Modo ventas
+OptionModeProductSellIntra=Modo Ventas exportación CEE
+OptionModeProductSellExport=Modo ventas exportación otros paises
 OptionModeProductBuy=Modo compras
 OptionModeProductSellDesc=Mostrar todos los productos con cuenta contable de ventas
+OptionModeProductSellIntraDesc=Mostrar todos los productos con cuenta contable para ventas en CEE.
+OptionModeProductSellExportDesc=Mostrar todos los productos con cuenta contable para otras ventas al exterior.
 OptionModeProductBuyDesc=Mostrar todos los productos con cuenta contable de compras
 CleanFixHistory=Eliminar código contable de las líneas que no existen en el plan contable
 CleanHistory=Resetear todos los vínculos del año seleccionado
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index e81ae9c8ac5..530bca323a5 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=También si tiene un gran número de terceros (>
 UseSearchToSelectContactTooltip=También si usted tiene un gran número de terceros (> 100 000), puede aumentar la velocidad mediante el establecimiento CONTACT_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena.
 DelaiedFullListToSelectCompany=Esperar a que presione una tecla antes de cargar el contenido de la lista combinada de terceros <br>Esto puede incrementar el rendimiento si tiene un gran número de terceros, pero es menos conveniente.
 DelaiedFullListToSelectContact=Esperar a que presione una tecla antes de cargar el contenido de la lista combinada de contactos. <br> Esto puede incrementar el rendimiento si tiene un gran número de contactos, pero es menos conveniente.
-NumberOfKeyToSearch=Nº de caracteres para desencadenar la búsqueda: %s
+NumberOfKeyToSearch=Número de caracteres para desencadenar la búsqueda: %s
+NumberOfBytes=Número de Bytes
+SearchString=Buscar cadena
 NotAvailableWhenAjaxDisabled=No disponible cuando Ajax esté desactivado
 AllowToSelectProjectFromOtherCompany=En un documento de un tercero, puede elegir un proyecto vinculado a otro tercero
 JavascriptDisabled=Javascript desactivado
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=Este es el nombre del del campo HTML. Son necesarios
 PageUrlForDefaultValues=Debe introducir aquí la URL relativa de la página. Si incluye parámetros en la URL, los valores predeterminados serán efectivos si todos los parámetros están configurados con el mismo valor.
 PageUrlForDefaultValuesCreate=<br> Ejemplo: <br> Para el formulario para crear un nuevo tercero, es <strong> %s </strong>. <br> Para la URL de los módulos externos instalados en el directorio custom, no incluya "custom/", así que use la ruta como <strong> mymodule/mypage.php </strong> y no custom/mymodule/mypage.php. <br> Si desea un valor predeterminado solo si la url tiene algún parámetro, puede usar <strong> %s</strong>
 PageUrlForDefaultValuesList=<br> Ejemplo: <br> Para la página que lista a terceros, es <strong> %s </strong>. <br> Para la URL de los módulos externos instalados en el directorio custom, no incluya "custom/" así que use la ruta como <strong> mymodule/mypagelist.php </strong> y no custom/mymodule/mypagelist.php. <br> Si desea un valor predeterminado solo si url tiene algún parámetro, puede usar <strong> %s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=También tenga en cuenta que la sobrescritura de valores predeterminados para la creación de formularios funciona solo para las páginas que se diseñaron correctamente (por lo tanto, con el parámetro action = create o presend ...)
 EnableDefaultValues=Habilitar el uso de valores predeterminados personalizados
 EnableOverwriteTranslation=Habilitar el uso de la traducción sobrescrita
 GoIntoTranslationMenuToChangeThis=Se ha encontrado una traducción para la clave con este código. Para cambiar este valor, debe editarlo desde Inicio-Configuración-Traducción.
@@ -494,7 +497,7 @@ Module1Name=Terceros
 Module1Desc=Gestión de terceros y contactos (clientes, clientes potenciales...)
 Module2Name=Comercial
 Module2Desc=Gestión comercial
-Module10Name=Accounting (simplified)
+Module10Name=Contabilidad (simple)
 Module10Desc=Activación de informes simples de contabilidad (diarios, ventas) basados en el contenido de la base de datos. No utiliza ninguna tabla de contabilidad.
 Module20Name=Presupuestos
 Module20Desc=Gestión de presupuestos/propuestas comerciales
@@ -541,7 +544,7 @@ Module80Desc=Gestión de envíos y albaranes.
 Module85Name=Bancos y Caja
 Module85Desc=Gestión de las cuentas financieras de tipo cuentas bancarias, postales o efectivo
 Module100Name=Sitio web externo
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module100Desc=Añade un enlace a un sitio web externo como icono del menú principal. El sitio web se muestra en un marco debajo del menú superior.
 Module105Name=Mailman y SPIP
 Module105Desc=Interfaz con Mailman o SPIP para el módulo Miembros
 Module200Name=LDAP
@@ -632,7 +635,7 @@ Module50200Name=Paypal
 Module50200Desc=Ofrece a los clientes pagos online  vía PayPal (cuenta PayPal o tarjetas de crédito/débito). Esto puede ser usado para permitir a sus clientes realizar pagos libres o pagos en un objeto de Dolibarr en particular (factura, pedido...)
 Module50300Name=Stripe
 Module50300Desc=Ofrece a los clientes pagos online vía Stripe (tarjetas de crédito/débito). Esto puede ser usado para permitir a sus clientes realizar pagos libres o pagos en un objeto de Dolibarr en particular (factura, pedido...)
-Module50400Name=Accounting (double entry)
+Module50400Name=Contabilidad (doble partida)
 Module50400Desc=Gestión contable (doble partida, libros generales y auxiliares). Exporte a varios formatos de software de contabilidad.
 Module54000Name=PrintIPP
 Module54000Desc=La impresión directa (sin abrir los documentos) usa el interfaz Cups IPP (La impresora debe ser visible por el servidor y CUPS debe estar instalado en el servidor)
@@ -989,7 +992,6 @@ Port=Puerto
 VirtualServerName=Nombre del servidor virtual
 OS=SO
 PhpWebLink=Vínculo Web-PHP
-Browser=Navegador
 Server=Servidor
 Database=Base de datos
 DatabaseServer=Host de la base de datos
@@ -1077,7 +1079,7 @@ SystemInfoDesc=La información del sistema es información técnica accesible so
 SystemAreaForAdminOnly=Esta área está disponible solo para usuarios administradores. Los permisos de usuario de Dolibarr no pueden cambiar esta restricción.
 CompanyFundationDesc=Edite la información de la empresa o institución. Haga clic en el botón "%s" o "%s" a pié de página
 AccountantDesc=Edite los detalles de su contable/auditor
-AccountantFileNumber=Número de archivo
+AccountantFileNumber=Código contable
 DisplayDesc=Los parámetros que afectan el aspecto y el comportamiento de Dolibarr se pueden modificar aquí.
 AvailableModules=Módulos disponibles
 ToActivateModule=Para activar los módulos, vaya al área de Configuración (Inicio->Configuración->Módulos).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Módulo de numeración de facturas y abonos
 BillsPDFModules=Modelo de documento de facturas
 BillsPDFModulesAccordindToInvoiceType=Modelos de documentos de facturas según tipo de factura
 PaymentsPDFModules=Modelo de documentos de pago
-CreditNote=Abono
-CreditNotes=Abonos
 ForceInvoiceDate=Forzar la fecha de factura a la fecha de validación
 SuggestedPaymentModesIfNotDefinedInInvoice=Formas de pago sugeridas para las facturas si no están definidas explícitamente
 SuggestPaymentByRIBOnAccount=Sugerir el pago por domiciliación en la cuenta
@@ -1711,8 +1711,8 @@ SomethingMakeInstallFromWebNotPossible2=Por esta razón, explicaremos aquí los
 InstallModuleFromWebHasBeenDisabledByFile=La instalación de módulos externos desde la aplicación se encuentra desactivada por el administrador. Debe requerirle que elimine el archivo <strong>%s</strong> para habilitar esta funcionalidad.
 ConfFileMustContainCustom=La instalación o construcción de 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: <br><strong>$dolibarr_main_url_root_alt = '/custom';</strong><br><strong> $dolibarr_main_document_root_alt = '%s/custom';</strong>
 HighlightLinesOnMouseHover=Resaltar líneas de los listados cuando el ratón pasa por encima de ellas
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+HighlightLinesColor=Resalta el color de la línea cuando el ratón pasa por encima (usar 'ffffff' para no resaltar)
+HighlightLinesChecked=Resalta el color de la línea cuando se marca (use 'ffffff' para no resaltar)
 TextTitleColor=Color para la página de título
 LinkColor=Color para los enlaces
 PressF5AfterChangingThis=Para que sea eficaz el cambio, presione CTRL+F5 en el teclado o borre la memoria caché del navegador después de cambiar este valor
@@ -1819,7 +1819,7 @@ ChartLoaded=Plan contable cargado
 SocialNetworkSetup=Configuración del módulo de redes sociales.
 EnableFeatureFor=Habilitar funciones para <strong> %s </strong>
 VATIsUsedIsOff=Nota: La opción de usar el IVA se ha establecido como <strong>Desactivado</strong> en el menú %s - %s, por lo que el IVA usado siempre será 0 para las ventas.
-SwapSenderAndRecipientOnPDF=Intercambiar dirección de remitente y destinatario en PDF
+SwapSenderAndRecipientOnPDF=Intercambiar dirección de remitente y destinatario en documentos PDF
 FeatureSupportedOnTextFieldsOnly=Advertencia, función compatible solo en los campos de texto. También se debe establecer un parámetro de URL action=create o action=edit o el nombre de la página debe terminar con 'new.php' para activar esta función.
 EmailCollector=Recolector de correo
 EmailCollectorDescription=Añade una tarea programada y una página de configuración para escanear los buzones de e-mail con regularidad (utilizando el protocolo IMAP) y registra los e-mails recibidos en su aplicación, en el lugar correcto y/o crea registros automáticamente (como leads).
@@ -1828,28 +1828,30 @@ EMailHost=Host del servidor de e-mail IMAP
 MailboxSourceDirectory=Directorio fuente del buzón
 MailboxTargetDirectory=Directorio de destino del buzón
 EmailcollectorOperations=Operaciones a realizar por el colector
+MaxEmailCollectPerCollect=Número máximo de e-mails recolectados por la recolección
 CollectNow=Recoger ahora
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
-LastResult=Latest result
+ConfirmCloneEmailCollector=¿Está seguro de que desea clonar el recolector de e-mails %s?
+DateLastCollectResult=Fecha de última recolección probada
+DateLastcollectResultOk=Fecha última recolección exitosa
+LastResult=Último resultado
 EmailCollectorConfirmCollectTitle=Confirmación recolección e-mail
 EmailCollectorConfirmCollect=¿Desea ejecutar la recolección de este recolector ahora?
 NoNewEmailToProcess=No hay e-mails nuevos (filtros coincidentes) para procesar
 NothingProcessed=Nada hecho
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s e-mails analizados, %s e-mails procesados ​​con éxito (para %s registro/acciones realizadas)
 RecordEvent=Registro de evento de email
 CreateLeadAndThirdParty=Crear lead (y tercero si es necesario)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Crear ticket (y tercero si es necesario)
 CodeLastResult=Resultado último código
 NbOfEmailsInInbox=Número de emails en el directorio fuente
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+LoadThirdPartyFromName=Cargar terceros buscando en %s (solo carga)
+LoadThirdPartyFromNameOrCreate=Cargar terceros terceros buscando en %s (crear si no se encuentra)
 WithDolTrackingID=Dolibarr Tracking ID encontrado
 WithoutDolTrackingID=Dolibarr Tracking ID no encontrado
 FormatZip=Código postal
 MainMenuCode=Código de entrada del menú (menú principal)
 ECMAutoTree=Mostrar arbol automático GED
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Defina valores para usar para la acción, o cómo extraer valores. Por ejemplo: <br> objproperty1=SET:abc<br>objproperty1=SET:un valor con reemplazo de __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4 =EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:el nombre de mi empresa es\\s([^\\s]*) <br><br>Utilizar el caracter  ; como separador para extraer o configurar varias propiedades.
 OpeningHours=Horario de apertura
 OpeningHoursDesc=Teclea el horario normal de apertura de tu compañía.
 ResourceSetup=Configuración del módulo Recursos
@@ -1877,8 +1879,15 @@ WarningValueHigherSlowsDramaticalyOutput=Advertencia, los valores altos ralentiz
 DebugBarModuleActivated=El módulo debugbar está activado y ralentiza dramáticamente la interfaz
 EXPORTS_SHARE_MODELS=Los modelos de exportación son compartidos con todos.
 ExportSetup=Configuración del módulo de exportación.
-InstanceUniqueID=Unique ID of the instance
-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/.
+InstanceUniqueID=ID única de la instancia
+SmallerThan=Menor que
+LargerThan=Mayor que
+IfTrackingIDFoundEventWillBeLinked=Tenga en cuenta que si se encuentra un ID de seguimiento en el e-mail entrante, el evento se vinculará automáticamente a los objetos relacionados.
+WithGMailYouCanCreateADedicatedPassword=Con una cuenta de GMail, si habilitó la validación de 2 pasos, se recomienda crear una segunda contraseña dedicada para la aplicación en lugar de usar su propia contraseña de https://myaccount.google.com/.
+IFTTTSetup=Configuración del módulo IFTTT
+IFTTT_SERVICE_KEY=IFTTT Service key
+IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Clave de seguridad para proteger la URL del punto final utilizada por IFTTT para enviar mensajes a su Dolibarr.
+IFTTTDesc=Este módulo está diseñado para desencadenar eventos en IFTTT y/o para ejecutar alguna acción en desencadenadores IFTTT externos.
+UrlForIFTTT=URL endpoint de IFTTT
+YouWillFindItOnYourIFTTTAccount=Lo encontrará en su cuenta de IFTTT.
+EndPointFor=End point for %s : %s
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index 27863124943..63f573fc815 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Eventos para que Dolibarr cree un evento en la agenda de forma aut
 EventRemindersByEmailNotEnabled=Los recordatorios de eventos por e-mail no se activaron en la configuración del módulo %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tercero %s creado
+COMPANY_DELETEInDolibarr=Tercero %s eliminado
 ContractValidatedInDolibarr=Contrato %s validado
 CONTRACT_DELETEInDolibarr=Contrato %s eliminado
 PropalClosedSignedInDolibarr=Presupuesto %s firmado
@@ -95,7 +96,8 @@ PROJECT_MODIFYInDolibarr=Proyecto %s modificado
 PROJECT_DELETEInDolibarr=Proyecto %s eliminado
 TICKET_CREATEInDolibarr=Ticket %s creado
 TICKET_MODIFYInDolibarr=Ticket %s modificado
-TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_ASSIGNEDInDolibarr=Ticket %s asignado
+TICKET_CLOSEInDolibarr=Ticket %s cerrado
 TICKET_DELETEInDolibarr=Ticket %s eliminado
 ##### End agenda events #####
 AgendaModelModule=Plantillas de documentos para eventos
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 6bfc77a1807..0da047d7b2e 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -157,10 +157,10 @@ BankAccountModelModule=Modelos de documentos para cuentas bancarias
 DocumentModelSepaMandate=Plantilla de mandato SEPA. Útil únicamente para países miembros de la UEE
 DocumentModelBan=Plantilla para imprimir una página con la información IBAN.
 NewVariousPayment=Nuevo pago varios
-VariousPayment=Pagos varios
+VariousPayment=Pago varios
 VariousPayments=Pagos varios
 ShowVariousPayment=Mostrar pago varios
-AddVariousPayment=Añadir pagos varios
+AddVariousPayment=Añadir pago varios
 SEPAMandate=Mandato SEPA
 YourSEPAMandate=Su mandato SEPA
 FindYourSEPAMandate=Este es su mandato SEPA para autorizar a nuestra empresa a realizar un petición de débito directo a su banco. Gracias por devolverlo firmado (escaneo del documento firmado) o enviado por correo a
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index e06c1e6af84..fe375fa91c3 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=en la divisa de las facturas
 PaidBack=Reembolsado
 DeletePayment=Eliminar el pago
 ConfirmDeletePayment=¿Está seguro de querer eliminar este pago?
-ConfirmConvertToReduc=¿Desea convertir este %s en un descuento absoluto?<br>El importe se guardará entre todos los descuentos y podría utilizarse como descuento para una factura actual o futura para este cliente.
-ConfirmConvertToReducSupplier=¿Desea convertir este %s en un descuento absoluto?<br>El importe se guardará entre todos los descuentos y podría utilizarse como descuento para una factura actual o futura para este proveedor.
+ConfirmConvertToReduc=¿Desea convertir este %s en un descuento absoluto?
+ConfirmConvertToReduc2=El importe se guardará entre todos los descuentos y podría utilizarse como un descuento para una factura actual o futura para este cliente.
+ConfirmConvertToReducSupplier=¿Desea convertir este %s en un descuento absoluto?
+ConfirmConvertToReducSupplier2=El importe se guardará entre todos los descuentos y podría utilizarse como un descuento para una factura actual o futura de este proveedor.
 SupplierPayments=Pagos a proveedor
 ReceivedPayments=Pagos recibidos
 ReceivedCustomersPayments=Pagos recibidos de cliente
@@ -89,7 +91,6 @@ PaymentTerm=Condición de pago
 PaymentConditions=Condiciones de pago
 PaymentConditionsShort=Condiciones de pago
 PaymentAmount=Importe pago
-ValidatePayment=Validar este pago
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validar facturas automáticamente
 GeneratedFromRecurringInvoice=Generado desde la plantilla de facturas recurrentes %s
 DateIsNotEnough=Aún no se ha alcanzado la fecha
 InvoiceGeneratedFromTemplate=Factura %s generada desde la plantilla de factura recurrente %s
+GeneratedFromTemplate=Generado desde la plantilla de facturas recurrentes %s
 WarningInvoiceDateInFuture=Atención: la fecha de la factura es mayor que la fecha actual
 WarningInvoiceDateTooFarInFuture=Atención: la fecha de la factura es muy lejana a la fecha actual
 ViewAvailableGlobalDiscounts=Ver los descuentos disponibles
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index 163e607e62b..61355600521 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -35,7 +35,7 @@ BoxTitleOldestUnpaidCustomerBills=Facturas de clientes: %s más antiguas pendien
 BoxTitleOldestUnpaidSupplierBills=Las %s facturas de proveedores más antiguas pendientes de pago
 BoxTitleCurrentAccounts=Cuentas abiertas: saldos
 BoxTitleLastModifiedContacts=Últimos %s contactos/direcciones modificados
-BoxMyLastBookmarks=Bookmarks: latest %s
+BoxMyLastBookmarks=Marcadores: últimos %s
 BoxOldestExpiredServices=Servicios antiguos expirados
 BoxLastExpiredServices=Últimos %s contratos más antiguos con servicios expirados
 BoxTitleLastActionsToDo=Últimas %s acciones a realizar
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index 8a08c409d39..b287ad1f041 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Agrupar por tipo de IVA en los tickets
 AutoPrintTickets=Imprimir tickets automáticamente
 EnableBarOrRestaurantFeatures=Habilitar características para Bar o Restaurante
 ConfirmDeletionOfThisPOSSale=¿Está seguro de querer eliminar la venta actual?
+History=Histórico
+ValidateAndClose=Validar y cerrar
+Terminal=Terminal
+NumberOfTerminals=Número de terminales
+TerminalSelect=Seleccione el terminal que desea usar:
+POSTicket=Ticket POS
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 46951e4e07c..7d1aa5104f8 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -28,7 +28,7 @@ AliasNames=Apodo (comercial, marca registrada, ...)
 AliasNameShort=Apodo
 Companies=Empresas
 CountryIsInEEC=País dentro de la Comunidad Económica Europea
-PriceFormatInCurrentLanguage=Formato de precio en idioma actual
+PriceFormatInCurrentLanguage=Formato de visualización del precio en el idioma y moneda actual.
 ThirdPartyName=Nombre del tercero
 ThirdPartyEmail=E-mail tercero
 ThirdParty=Tercero
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 27cb8a20880..9c12e660773 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Añadir tasa social/fiscal
 ContributionsToPay=Tasas sociales/fiscales a pagar
 AccountancyTreasuryArea=Área facturación y pagos
 NewPayment=Nuevo pago
-Payments=Pagos
 PaymentCustomerInvoice=Cobro factura a cliente
 PaymentSupplierInvoice=Pago factura de proveedor
 PaymentSocialContribution=Pagos tasas sociales/fiscales
@@ -205,7 +204,6 @@ SellsJournal=Diario de ventas
 PurchasesJournal=Diario de compras
 DescSellsJournal=Diario de ventas
 DescPurchasesJournal=Diario de compras
-InvoiceRef=Ref. factura
 CodeNotDef=No definido
 WarningDepositsNotIncluded=Las facturas de anticipo no se encuentran incluidas en esta versión con este módulo de contabilidad
 DatePaymentTermCantBeLowerThanObjectDate=La fecha límite de pago no puede ser inferior a la fecha del objeto
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index 98f2b91b2ac..611c410bcc9 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -64,7 +64,8 @@ DateStartRealShort=Fecha inicio
 DateEndReal=Fecha real fin del servicio
 DateEndRealShort=Fecha real finalización
 CloseService=Finalizar servicio
-BoardRunningServices=Servicios activos expirados
+BoardRunningServices=Servicios activos
+BoardExpiredServices=Servicios expirados
 ServiceStatus=Estado del servicio
 DraftContracts=Contractos borrador
 CloseRefusedBecauseOneServiceActive=El contrato no puede ser cerrado ya que contiene al menos un servicio abierto.
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index c8f000b6422..fca72585f66 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -42,7 +42,7 @@ CronModule=Modulo
 CronNoJobs=Sin trabajos registrados
 CronPriority=Prioridad
 CronLabel=Etiqueta
-CronNbRun=Núm. ejec.
+CronNbRun=Número de ejecuciones
 CronMaxRun=Número máximo ejecuciones
 CronEach=Toda(s)
 JobFinished=Tareas lanzadas y finalizadas
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 96cb190a216..bc43d68b263 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -216,7 +216,8 @@ ErrorDuringChartLoad=Error al cargar plan contable. Si no se cargaron algunas cu
 ErrorBadSyntaxForParamKeyForContent=Sintaxis incorrecta para el parámetro keyforcontent. Debe tener un valor que comience con %s o %s
 ErrorVariableKeyForContentMustBeSet=Error, debe configurarse la constante con el nombre %s (con contenido de texto para mostrar) o %s (con url externa para mostrar).
 ErrorURLMustStartWithHttp=La URL %s debe comenzar con http:// o https://
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorNewRefIsAlreadyUsed=Error, la nueva referencia ya está en uso
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, no es posible eliminar un pago enlazado a una factura cerrada.
 # Warnings
 WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario.
 WarningMandatorySetupNotComplete=Haga clic aquí para configurar los parámetros obligatorios
diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
index faeadd1d3b1..c488bc90c66 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Modelos de numeración de petición de días libres
 TemplatePDFHolidays=Plantilla PDF para petición de días libres
 FreeLegalTextOnHolidays=Texto libre en el PDF
 WatermarkOnDraftHolidayCards=Marca de agua en las peticiones de días libres
+HolidaysToApprove=Vacaciones para aprobar
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index fcc5ab527fd..b5ce34afa8c 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -14,7 +14,7 @@ PHPSupportPOSTGETKo=Es posible que este PHP no soporte las variables POST y/o GE
 PHPSupportGD=Este PHP soporta las funciones gráficas GD.
 PHPSupportCurl=Este PHP soporta Curl
 PHPSupportUTF8=Este PHP soporta las funciones UTF8.
-PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportIntl=Este PHP soporta las funciones Intl.
 PHPMemoryOK=Su memoria máxima de sesión PHP esta definida a <b>%s</b>. Esto debería ser suficiente.
 PHPMemoryTooLow=Su memoria máxima de sesión PHP está definida en <b>%s</b> bytes. Esto es muy poco. Se recomienda modificar el parámetro <b>memory_limit</b> de su archivo <b>php.ini</b> a por lo menos <b>%s</b> bytes.
 Recheck=Haga click aquí para realizar un test más exhaustivo
@@ -22,7 +22,7 @@ ErrorPHPDoesNotSupportSessions=Su instalación PHP no soporta las sesiones. Esta
 ErrorPHPDoesNotSupportGD=Este PHP no soporta las funciones gráficas GD. Ningún gráfico estará disponible.
 ErrorPHPDoesNotSupportCurl=Su PHP no soporta Curl.
 ErrorPHPDoesNotSupportUTF8=Este PHP no soporta las funciones UTF8. Resuelva el problema antes de instalar Dolibarr ya que no podrá funcionar correctamente.
-ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupportIntl=Este PHP no soporta las funciones Intl.
 ErrorDirDoesNotExists=El directorio <b>%s</b> no existe o no es accesible.
 ErrorGoBackAndCorrectParameters=Vuelva atrás y corrija los parámetros inválidos...
 ErrorWrongValueForParameter=Indicó quizá un valor incorrecto para el parámetro '%s'.
diff --git a/htdocs/langs/es_ES/loan.lang b/htdocs/langs/es_ES/loan.lang
index c560af41726..5deea66ad24 100644
--- a/htdocs/langs/es_ES/loan.lang
+++ b/htdocs/langs/es_ES/loan.lang
@@ -10,7 +10,7 @@ LoanCapital=Capital
 Insurance=Seguro
 Interest=Interés
 Nbterms=Plazos
-Term=Term
+Term=Plazo
 LoanAccountancyCapitalCode=Cuenta contable capital
 LoanAccountancyInsuranceCode=Cuenta contable seguro
 LoanAccountancyInterestCode=Cuenta contable interés
@@ -22,7 +22,7 @@ ListLoanAssociatedProject=Listado de préstamos asociados al proyecto
 AddLoan=Crear crédito
 FinancialCommitment=Prestamo
 InterestAmount=Interés
-CapitalRemain=Capital remain
+CapitalRemain=Capital restante
 # Admin
 ConfigLoan=Configuración del módulo préstamos
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Cuenta contable por defecto para el capital
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index e70bb8fdf8a..a85ba7323a6 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Asunto del e-mail
 MailText=Mensaje
 MailFile=Archivo
 MailMessage=Texto utilizado en el cuerpo del mensaje
+SubjectNotIn=No en el asunto
+BodyNotIn=No en el cuerpo
 ShowEMailing=Mostrar E-Mailing
 ListOfEMailings=Listado de E-Mailings
 NewMailing=Nuevo E-Mailing
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index d5191f0c4ce..46a4e6b3eda 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -238,7 +238,7 @@ Limit=Límite
 Limits=Límites
 Logout=Desconexión
 NoLogoutProcessWithAuthMode=Sin funcionalidades de desconexión con el modo de autenticación <b>%s</b>
-Connection=Usuario
+Connection=Conexión
 Setup=Configuración
 Alert=Alerta
 MenuWarnings=Alertas
@@ -371,6 +371,7 @@ Percentage=Porcentaje
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Base imp.
+TotalHT100Short=Total  100%% (Base imp.)
 TotalHTShortCurrency=Base imponible (divisa)
 TotalTTCShort=Total
 TotalHT=Total (Base imp).
@@ -402,7 +403,7 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Additionnal cents
+LT1GC=Céntimos adicionales
 VATRate=Tasa IVA
 VATCode=Código tasa IVA
 VATNPR=Tasa NPR
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Enviar email de confirmación
 SendMail=Enviar e-mail
 Email=Correo
 NoEMail=Sin e-mail
-Email=Correo
 AlreadyRead=Ya leído
 NotRead=No lleído
 NoMobilePhone=Sin teléfono móvil
@@ -671,7 +671,6 @@ Method=Método
 Receive=Recepción
 CompleteOrNoMoreReceptionExpected=Completado o no se espera más
 ExpectedValue=Valor esperado
-CurrentValue=Valor actual
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca recibido
@@ -834,6 +833,7 @@ RelatedObjects=Objetos relacionados
 ClassifyBilled=Clasificar facturado
 ClassifyUnbilled=Clasificar no facturado
 Progress=Progreso
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=Ver
@@ -842,6 +842,11 @@ Exports=Exportaciones
 ExportFilteredList=Listado filtrado de exportación
 ExportList=Listado de exportación
 ExportOptions=Opciones de exportación
+IncludeDocsAlreadyExported=Incluir documentos ya exportados
+ExportOfPiecesAlreadyExportedIsEnable=Exportar piezas ya exportadas está activado
+ExportOfPiecesAlreadyExportedIsDisable=Exportar piezas ya exportadas está desactivado
+AllExportedMovementsWereRecordedAsExported=Todos los movimientos exportados han sido registrados como exportados
+NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos exportados pueden ser registrados como exportados
 Miscellaneous=Miscelánea
 Calendar=Calendario
 GroupBy=Agrupado por...
@@ -967,6 +972,10 @@ YouAreCurrentlyInSandboxMode=Actualmente se encuentra en el modo %s "sandbox"
 Inventory=Inventario
 AnalyticCode=Código analítico
 TMenuMRP=MRP
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
+ShowMoreInfos=Mostrar más información
+NoFilesUploadedYet=Por favor, cargue un documento primero
+SeePrivateNote=Ver nota privada
+PaymentInformation=Información del pago
+ValidFrom=Válido desde
+ValidUntil=Válido hasta
+NoRecordedUsers=Sin usuarios
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index 627ae6c53fa..a17afd53629 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -197,3 +197,4 @@ SendReminderForExpiredSubscriptionTitle=Enviar un recordatorio por E-Mail para l
 SendReminderForExpiredSubscription=Enviar recordatorio por e-mail a los miembros cuando la suscripción esté a punto de caducar (el parámetro es el número de días antes del final de la suscripción para enviar el recordatorio. Puede ser una lista de días separados por un punto y coma, por ejemplo, '10; 5; 0; -5 ')
 MembershipPaid=Membresía pagada por el período actual (hasta %s)
 YouMayFindYourInvoiceInThisEmail=Puede encontrar su factura adjunta a este e-mai
+XMembersClosed=%s miembro(s) cerrado(s)
diff --git a/htdocs/langs/es_ES/modulebuilder.lang b/htdocs/langs/es_ES/modulebuilder.lang
index 1390e7193c3..d727b3cc9e6 100644
--- a/htdocs/langs/es_ES/modulebuilder.lang
+++ b/htdocs/langs/es_ES/modulebuilder.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=Esta herramienta debe ser usada por usuarios experimentados o desarrolladores. Te facilitará utilidades para construir o editar tu propio módulo (Documentación para un manual alternativo de desarrollo <a href="%s" target="_blank">aquí</a>).
 EnterNameOfModuleDesc=Introduce el nombre del módulo/aplicación a crear sin espacios. Utilice mayúsculas para separar palabras (Por ejemplo: MiModulo, EcommerceParaTienda, SincronizarConMiSistema...)
 EnterNameOfObjectDesc=Introduce el nombre del objeto a crear sin espacios. Usa mayúsculas para separar palabras (Por ejemplo: MiObjeto, Estudiante, Profesor...). El archivo de clase CRUD, pero también archivo API, páginas para listar/añadir/editar/eliminar objetos y archivos SQL serán generados.
-ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc2=Ruta donde los módulos son generados/editados (primer directorio para módulos externos definido en %s): <strong>%s</strong>
 ModuleBuilderDesc3=Módulos generados/editables encontrados: <strong>%s</strong>
 ModuleBuilderDesc4=Un módulo se detecta como 'editable' cuando el archivo <strong>%s</strong> existe en la raíz del directorio del módulo
 NewModule=Nuevo módulo
@@ -21,10 +21,11 @@ ModuleBuilderDesctriggers=Esta es la vista de triggers proporcionada por tu mód
 ModuleBuilderDeschooks=Esta pestaña está dedicada a los hooks.
 ModuleBuilderDescwidgets=Esta pestaña está dedicada a administrar/crear widgets.
 ModuleBuilderDescbuildpackage=Puedes generar aquí un archivo comprimido "listo para distribuir" (un archivo .zip normalizado) de tu módulo y un archivo de documentación "listo para distribuir". Simplemente haga clic en el botón para crear el paquete o el archivo de documentación.
-EnterNameOfModuleToDeleteDesc=Puede eliminar su módulo. ATENCIÓN: ¡Todos los ficheros del módulo pero también los datos estructurados y la documentación será eliminada definitivamente!
-EnterNameOfObjectToDeleteDesc=Puede eliminar un objeto. ATENCIÓN: ¡Todos los ficheros relacionados con el objeto serán eliminados!
+EnterNameOfModuleToDeleteDesc=Puede eliminar su módulo. ATENCIÓN: ¡Todos los ficheros del módulo (generados o creados manualmente), los datos estructurados y la documentación será eliminada definitivamente!
+EnterNameOfObjectToDeleteDesc=Puede eliminar un objeto. ATENCIÓN: ¡Todos los ficheros (generados o creados manualmente) relacionados con el objeto serán eliminados!
 DangerZone=Zona peligrosa
 BuildPackage=Crear paquete
+BuildPackageDesc=Puede generar un paquete zip de su módulo para que esté listo para distribuirlo en cualquier Dolibarr. También puede distribuirlo o venderlo en un una tienda como <a href="https://www.dolistore.com">DoliStore.com</a> .
 BuildDocumentation=Generar documentación
 ModuleIsNotActive=Este módulo no ha sido activado todavía. Vaya a %s para activarlo o pulse aquí:
 ModuleIsLive=Este módulo ha sido activado. Cualquier cambio en él puede romper una característica activa actual.
@@ -40,13 +41,14 @@ PageForAgendaTab=Página de PHP para la pestaña de eventos
 PageForDocumentTab=Página de PHP para la pestaña de documento
 PageForNoteTab=Página de PHP para la pestaña de notas
 PathToModulePackage=Ruta al zip del módulo/aplicación
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
+PathToModuleDocumentation=Ruta a la documentación del módulo/aplicación (%s)
 SpaceOrSpecialCharAreNotAllowed=Espacios o caracteres especiales no son permitidos.
 FileNotYetGenerated=Fichero todavía no generado
-RegenerateClassAndSql=Borrar y regenerar archivos de clase y sql
+RegenerateClassAndSql=Forzar actualización de archivos .class y .sql
 RegenerateMissingFiles=Generar archivos no encontrados
-SpecificationFile=File of documentation
+SpecificationFile=Archivo de documentación
 LanguageFile=Archivo para el idioma
+ObjectProperties=Propiedades del objeto
 ConfirmDeleteProperty=¿Está seguro de querer eliminar la propiedad <strong>%s</strong>? Esto cambiará código en la clase PHP pero también eliminará la columna de la definición de la tabla del objeto.
 NotNull=No NULL
 NotNullDesc=1=Establecer la base de datos en NOT NULL. -1=Permitir valores nulos y forzar valor a NULL si está vacío ('' o 0).
@@ -62,9 +64,11 @@ ReadmeFile=Fichero leeme
 ChangeLog=Fichero ChangeLog
 TestClassFile=Archivo para la clase de PHP Test
 SqlFile=Fichero Sql
-PageForLib=Archivo para bibliotecas PHP
+PageForLib=Archivo para librería PHP
+PageForObjLib=Archivo para la librería PHP dedicada al objeto.
 SqlFileExtraFields=Archivo Sql para atributos complementarios
 SqlFileKey=Fichero Sql de claves
+SqlFileKeyExtraFields=Archivo Sql para campos adicionales
 AnObjectAlreadyExistWithThisNameAndDiffCase=Un objeto ya existe con este nombre y un caso diferente
 UseAsciiDocFormat=Puede usar el formato Markdown, pero se recomienda usar el formato Asciidoc (Comparación entre .md y .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Es una medida
@@ -76,13 +80,15 @@ ListOfMenusEntries=Lista de entradas de menú
 ListOfPermissionsDefined=Listado de permisos definidos
 SeeExamples=Vea ejemplos aquí
 EnabledDesc=Condición para tener este campo activo (Ejemplos: 1 o $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example: preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
+VisibleDesc=¿Es el campo visible? (Ejemplos: 0=Nunca visible, 1=Visible en listado y en formularios creación /actualización/visualización, 2=Visible en listado solamente, 3=Visible en formularios creación /actualización/visualización solamente (no en listados),4=Visible en listado y en formularios actualización/visualización solamente (no en creación) . Usar un valor negativo significa que no se muestra el campo predeterminado en el listado pero se puede seleccionar para verlo) Puede ser una expresión, por ejemplo: preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
 IsAMeasureDesc=¿Se puede acumular el valor del campo para obtener un total en el listado? (Ejemplos: 1 o 0)
 SearchAllDesc=¿El campo se usa para realizar una búsqueda desde la herramienta de búsqueda rápida? (Ejemplos: 1 o 0)
 SpecDefDesc=Ingrese aquí toda la documentación que desea proporcionar con su módulo que aún no está definido por otras pestañas. Puede usar .md o mejor, la rica sintaxis .asciidoc.
 LanguageDefDesc=Ingrese en estos archivos, todas las claves y las traduccións para cada archivo de idioma.
-MenusDefDesc=Defina aquí los menús provistos por su módulo (una vez definidos, son visibles en el editor de menú %s)
-PermissionsDefDesc=Defina aquí los nuevos permisos provistos por su módulo (una vez definidos, son visibles en la configuración de permisos predeterminada %s)
+MenusDefDesc=Defina aquí los menús proporcionados por su módulo.
+PermissionsDefDesc=Defina aquí los nuevos permisos proporcionados por su módulo.
+MenusDefDescTooltip=Los menús proporcionados por su módulo/aplicación se definen en la matriz <strong>$this->menus</strong> en el archivo descriptor del módulo. Puede editar manualmente este archivo o utilizar el editor incrustado. <br><br> Nota: Una vez definidos (y el módulo se haya reactivado), los menús también serán visibles en el editor de menú disponible para los usuarios administradores en %s.
+PermissionsDefDescTooltip=Los permisos proporcionados por su módulo / aplicación se definen en la matriz <strong>$this->rights</strong> en el archivo descriptor del módulo. Puede editar manualmente este archivo o utilizar el editor incrustado. <br><br> Nota: Una vez definidos (y el módulo se haya reactivado), los permisos serán visibles en la configuración de permisos predeterminada %s.
 HooksDefDesc=Defina en la propiedad <b>module_parts ['hooks']</b>, en el descriptor del módulo, el contexto de los hooks que desea administrar (puede encontrar la lista de contextos mediante una búsqueda de '<b>initHooks(</b>'  en el código del core). <br>Edite el archivo hook para agregar el código de sus funciones (las funciones se pueden encontrar mediante una búsqueda de  '<b>executeHooks</b>' en el código del core).
 TriggerDefDesc=Defina en el archivo trigger el código que desea ejecutar para cada evento ejecutado.
 SeeIDsInUse=Ver IDs en uso en su instalación
@@ -101,12 +107,13 @@ UseDocFolder=Desactivar directorio de documentación
 UseSpecificReadme=Usar un archivo Léame específico
 RealPathOfModule=Ruta real del módulo
 ContentCantBeEmpty=El contenido del archivo no puede estar vacío
-WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
-CLIDesc=You can generate here some command line scripts you want to provide with your module.
-CLIFile=CLI File
-NoCLIFile=No CLI files
-UseSpecificEditorName = Use a specific editor name
-UseSpecificEditorURL = Use a specific editor URL
-UseSpecificFamily = Use a specific family
-UseSpecificAuthor = Use a specific author
-UseSpecificVersion = Use a specific initial version
+WidgetDesc=Puede generar y editar aquí los paneles que se incrustarán con su módulo.
+CLIDesc=Puede generar aquí algunos scripts de línea de comandos que desea proporcionar con su módulo.
+CLIFile=Archivo CLI
+NoCLIFile=No hay archivos CLI
+UseSpecificEditorName = Usar un editor específico
+UseSpecificEditorURL = Usar un editor específico URL
+UseSpecificFamily = Usar una familia específica
+UseSpecificAuthor = Usar un autor especifico
+UseSpecificVersion = Usar una versión inicial específica
+ModuleMustBeEnabled=El módulo debe ser activado primero
diff --git a/htdocs/langs/es_ES/multicurrency.lang b/htdocs/langs/es_ES/multicurrency.lang
index 493c5f400a5..04f75b8f35c 100644
--- a/htdocs/langs/es_ES/multicurrency.lang
+++ b/htdocs/langs/es_ES/multicurrency.lang
@@ -7,7 +7,7 @@ multicurrency_syncronize_error=Error sincronización: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Usar fecha del documento para encontrar la tasa de la divisa, en lugar de usar la última tasa conocida
 multicurrency_useOriginTx=Cuando un objeto se crea desde otro, mantenga la conversión original del objeto de origen (de lo contrario, utilice la tasa de conversión más reciente conocida)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=Debe crear una cuenta en su sitio web para usar esta funcionalidad<br>Obtenga su <b>Clave API</b><br>Si usa una cuenta gratuita no puede cambiar la <b>moneda origen</b> (por defecto USD)<br>Pero si su moneda principal no es USD puede usar la <b>moneda origen alternativa</b> para forzar su moneda principal<br><br>Estará limitado a 1000 sincronizaciones por mes
+CurrencyLayerAccount_help_to_synchronize=Debe crear una cuenta en el sitio web %s para usar esta funcionalidad<br>Obtenga su <b>Clave API</b><br>Si usa una cuenta gratuita no puede cambiar la <b>moneda origen</b> (por defecto USD)<br>Pero si su moneda principal no es USD puede usar la <b>moneda origen alternativa</b> para forzar su moneda principal<br><br>Estará limitado a 1000 sincronizaciones por mes
 multicurrency_appId=Clave API
 multicurrency_appCurrencySource=Divisa origen
 multicurrency_alternateCurrencySource=Divisa origen alternativa
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index e509fa5d3c5..047bd238587 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -86,7 +86,7 @@ PredefinedMailTestHtml=__(Hello)__\nEste es un correo de <b> prueba</b> (la pala
 PredefinedMailContentContract=__(Hola)__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nAquí encontrará la factura __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nNos gustaría recordarle que la factura __REF__ parece no estar pagada. Así que le enviamos de nuevo la factura en el archivo adjunto, como un recordatorio.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nNos ponemos en contacto con usted para facilitarle el presupuesto __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nNos ponemos en contacto con usted para facilitarle el presupuesto __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nNos ponemos en contacto con usted para facilitarle nuestra solicitud de presupuesto __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nNos ponemos en contacto con usted para facilitarle el pedido __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nNos ponemos en contacto con usted para facilitarle nuestro pedido __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -246,10 +246,10 @@ YourPasswordHasBeenReset=Su contraseña ha sido restablecida con éxito
 ApplicantIpAddress=Dirección IP del solicitante
 SMSSentTo=SMS enviado a %s
 MissingIds=IDs no encontrados
-ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
-ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
-ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
-TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
+ThirdPartyCreatedByEmailCollector=Tercero creado por el recolector de e-mails del MSGID de e-mail %s
+ContactCreatedByEmailCollector=Contacto/dirección creada por el recolector de e-mails del MSGID de e-mail %s
+ProjectCreatedByEmailCollector=Proyecto creado por el recolector de e-mails del MSGID de e-mail %s
+TicketCreatedByEmailCollector=Ticket creado por el recolector de e-mails del MSGID de e-mail %s
 
 ##### Export #####
 ExportsArea=Área de exportaciones
@@ -268,5 +268,5 @@ WEBSITE_IMAGEDesc=Ruta relativa de las imágenes. Puede mantenerla vacío, ya qu
 WEBSITE_KEYWORDS=Claves
 LinesToImport=Líneas a importar
 
-MemoryUsage=Memory usage
-RequestDuration=Duration of request
+MemoryUsage=Uso de memoria
+RequestDuration=Duración de la solicitud
diff --git a/htdocs/langs/es_ES/paybox.lang b/htdocs/langs/es_ES/paybox.lang
index 63bedd326f4..8692b58441c 100644
--- a/htdocs/langs/es_ES/paybox.lang
+++ b/htdocs/langs/es_ES/paybox.lang
@@ -10,7 +10,7 @@ ToComplete=A completar
 YourEMail=E-Mail de confirmación de pago
 Creditor=Beneficiario
 PaymentCode=Código de pago
-PayBoxDoPayment=Pago con tarjeta de crédito o débito (Paybox)
+PayBoxDoPayment=Pagar con paybox
 ToPay=Emitir pago
 YouWillBeRedirectedOnPayBox=Va a ser redirigido a la página segura de  Paybox para indicar su tarjeta de crédito
 Continue=Continuar
@@ -37,3 +37,4 @@ PAYBOX_PAYONLINE_SENDEMAIL=E-Mail a avisar en caso de pago (con éxito o no)
 PAYBOX_PBX_SITE=Valor para PBX SITE
 PAYBOX_PBX_RANG=valor para PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Valor para PBX ID
+PAYBOX_HMAC_KEY=Clave HMAC
diff --git a/htdocs/langs/es_ES/paypal.lang b/htdocs/langs/es_ES/paypal.lang
index 73c014e8071..ab095badeb4 100644
--- a/htdocs/langs/es_ES/paypal.lang
+++ b/htdocs/langs/es_ES/paypal.lang
@@ -14,7 +14,6 @@ PaypalModeOnlyPaypal=Sólo PayPal
 ONLINE_PAYMENT_CSS_URL=URL opcional de la hoja de estilo CSS en la página de pago en línea
 ThisIsTransactionId=Identificador de la transacción: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Añadir la url del pago Paypal al enviar un documento por e-mail
-YouAreCurrentlyInSandboxMode=Actualmente se encuentra en el modo %s "sandbox"
 NewOnlinePaymentReceived=Nuevo pago en línea recibido
 NewOnlinePaymentFailed=Nuevo pago en línea intentado pero ha fallado
 ONLINE_PAYMENT_SENDEMAIL=E-Mail a avisar en caso de pago (con éxito o no)
@@ -33,3 +32,5 @@ PaypalImportPayment=Importe pagos Paypal
 PostActionAfterPayment=Acciones después de los pagos
 ARollbackWasPerformedOnPostActions=Se realizó una reversión en todas las acciones. Debe completar las acciones manualmente si son necesarias.
 ValidationOfPaymentFailed=La validación del pago Paypal ha fallado
+CardOwner=Titular de la tarjeta
+PayPalBalance=Crédito paypal
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index 62ddca8498c..1a6500487f1 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Caducidad: %s
 printSellby=Límite venta: %s
 printQty=Cant.: %d
 AddDispatchBatchLine=Añada una línea para despacho por caducidad
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=Cuando el módulo de lotes/series está activado, el incremento y disminución de stock se fuerza en la validación de los envíos y la recepción manual y no se puede editar. Las otras opciones pueden ser definidas como desee.
 ProductDoesNotUseBatchSerial=Este producto no usa lotes/series
 ProductLotSetup=Configuración del módulo lotes/series
 ShowCurrentStockOfLot=Mostrar el stock actual de este producto/lote
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index dcea1b5df46..bc67a8032d7 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -260,7 +260,7 @@ AddVariable=Añadir variable
 AddUpdater=Añadir Actualizador
 GlobalVariables=Variables globales
 VariableToUpdate=Variable a actualizar
-GlobalVariableUpdaters=Actualizaciones de variables globales
+GlobalVariableUpdaters=Actualizadores externos para variables
 GlobalVariableUpdaterType0=datos JSON
 GlobalVariableUpdaterHelp0=Analiza datos JSON desde la URL especificada, el valor especifica la ubicación de valor relevante,
 GlobalVariableUpdaterHelpFormat0=Formato para la petición {"URL": "http://example.com/urlofjson","VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Hoja de producto
 ServiceSheet=Hoja de servicio
 PossibleValues=Valores posibles
 GoOnMenuToCreateVairants=Vaya al menú %s - %s para preparar variantes de atributos (como colores, tamaño, ...)
-UseProductFournDesc=Usar las descripciones de los productos de los proveedores en los documentos del proveedor.
+UseProductFournDesc=Añade una funcionalidad para definir las descripciones de los productos definidos por los proveedores además de las descripciones para los clientes
 ProductSupplierDescription=Descripción del proveedor para el producto.
 #Attributes
 VariantAttributes=Atributos de variantes
@@ -338,4 +338,5 @@ CloneDestinationReference=Referencia de producto de destino
 ErrorCopyProductCombinations=Se ha producido un error al copiar las variantes de producto
 ErrorDestinationProductNotFound=Producto destino no encontrado
 ErrorProductCombinationNotFound=Variante de producto no encontrada
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ActionAvailableOnVariantProductOnly=Acción solo disponible en la variante del producto
+ProductsPricePerCustomer=Precios de producto por cliente
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index dddb9e9ff65..963924784e6 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -45,6 +45,7 @@ TimeSpent=Tiempo dedicado
 TimeSpentByYou=Tiempo dedicado por usted
 TimeSpentByUser=Tiempo dedicado por usuario
 TimesSpent=Tiempos dedicados
+TaskId=ID Tarea
 RefTask=Ref. tarea
 LabelTask=Etiqueta tarea
 TaskTimeSpent=Tiempo dedicado en tareas
@@ -57,8 +58,8 @@ NewTimeSpent=Tiempos dedicados
 MyTimeSpent=Mi tiempo dedicado
 BillTime=Facturar tiempo dedicado
 BillTimeShort=Facturación tiempo
-TimeToBill=Time not billed
-TimeBilled=Time billed
+TimeToBill=Tiempo no facturado
+TimeBilled=Tiempo facturado
 Tasks=Tareas
 Task=Tarea
 TaskDateStart=Fecha inicio
@@ -125,7 +126,7 @@ DeleteATimeSpent=Eliminación de tiempo dedicado
 ConfirmDeleteATimeSpent=¿Está seguro de querer eliminar este tiempo dedicado?
 DoNotShowMyTasksOnly=Ver también tareas no asignadas a mí
 ShowMyTasksOnly=Ver solamente tareas asignadas a mí
-TaskRessourceLinks=Contacts of task
+TaskRessourceLinks=Contactos de la tarea
 ProjectsDedicatedToThisThirdParty=Proyectos dedicados a este tercero
 NoTasks=Ninguna tarea para este proyecto
 LinkedToAnotherCompany=Enlazado a otra empresa
@@ -209,7 +210,7 @@ YouCanCompleteRef=Si desea completar la referencia con alguna información (para
 OpenedProjectsByThirdparties=Proyectos abiertos de terceros
 OnlyOpportunitiesShort=Sólo oportunidades
 OpenedOpportunitiesShort=Oportunidades abiertas
-NotOpenedOpportunitiesShort=Not an open lead
+NotOpenedOpportunitiesShort=No es una oportunidad abierta
 NotAnOpportunityShort=No es una oportunidad
 OpportunityTotalAmount=Importe total de oportunidades
 OpportunityPonderatedAmount=Importe medio de oportunidades
@@ -242,4 +243,4 @@ TimeSpentForInvoice=Tiempos dedicados
 OneLinePerUser=Una línea por usuario
 ServiceToUseOnLines=Servicio a utilizar en lineas.
 InvoiceGeneratedFromTimeSpent=Se ha generado la factura %s a partir del tiempo empleado en el proyecto
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Verifique si ingresa la hoja de tiempo en las tareas del proyecto y planea generar facturas de la hoja de tiempo para facturar al cliente del proyecto (No lo compruebe si planea crear una factura que no se base en los tiempos indicados).
diff --git a/htdocs/langs/es_ES/stripe.lang b/htdocs/langs/es_ES/stripe.lang
index e3e53247726..de38ab59e7a 100644
--- a/htdocs/langs/es_ES/stripe.lang
+++ b/htdocs/langs/es_ES/stripe.lang
@@ -12,7 +12,7 @@ YourEMail=E-Mail de confirmación de pago
 STRIPE_PAYONLINE_SENDEMAIL=E-Mail a avisar en caso de pago (con éxito o no)
 Creditor=Beneficiario
 PaymentCode=Código de pago
-StripeDoPayment=Pague con Tarjeta de Crédito o Débito (Stripe)
+StripeDoPayment=Pagar con Stripe
 YouWillBeRedirectedOnStripe=Se le redirigirá a la página de Stripe protegida para indicar la información de su tarjeta de crédito
 Continue=Continuar
 ToOfferALinkForOnlinePayment=URL de pago %s
@@ -40,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock para usar para la disminución de stock cuando se realiza el pago en línea <br> (TODO Cuando la opción para disminuir stock se realiza en una acción en la factura y el pago en línea se genera la factura?)
 StripeLiveEnabled=Stripe live activado (de lo contrario en modo test/sandbox)
 StripeImportPayment=Importar pagos Stripe
-ExampleOfTestCreditCard=Ejemplo de tarjeta de crédito para pruebas: %s(válido),%s (error CVC), %s (caducada), %s (la carga falla)
+ExampleOfTestCreditCard=Ejemplo de tarjeta de crédito para pruebas: %s=> válida,%s => error CVC, %s => caducada, %s => la carga falla
 StripeGateways=Pasarelas de Stripe
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca _...)
@@ -63,3 +63,5 @@ CreateCardOnStripe=Crea una tarjeta en Stripe
 ShowInStripe=Mostrar en Stripe
 StripeUserAccountForActions=Cuenta de usuario para usar en algunos e-mails de notificación de eventos Stripe (pagos de Stripe)
 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)
diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang
index 6c513b89933..9a5520922fe 100644
--- a/htdocs/langs/es_ES/trips.lang
+++ b/htdocs/langs/es_ES/trips.lang
@@ -73,7 +73,7 @@ EX_PAR_VP=Estacionamiento
 EX_CAM_VP=Mantenimiento y reparaciones
 DefaultCategoryCar=Modo de transporte predeterminado
 DefaultRangeNumber=Número de rango predeterminado
-UploadANewFileNow=Upload a new document now
+UploadANewFileNow=Subir un nuevo documento ahora
 Error_EXPENSEREPORT_ADDON_NotDefined=Error, no se ha definido regla de numeración del informe de gastos en la configuración del módulo 'Informe de gastos'
 ErrorDoubleDeclaration=Ha declarado otro gasto en un rango similar de fechas.
 AucuneLigne=No hay gastos declarados
@@ -148,4 +148,4 @@ nolimitbyEX_EXP=por línea (sin limitación)
 CarCategory=Categoría del coche
 ExpenseRangeOffset=Importe compensado: %s
 RangeIk=Rango de kilometraje
-AttachTheNewLineToTheDocument=Attach the new line to an existing document
+AttachTheNewLineToTheDocument=Adjuntar la línea a un documento subido
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index e7158d6dc56..013b9950dbf 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -109,4 +109,4 @@ UserLogoff=Usuario desconectado
 UserLogged=Usuario conectado
 DateEmployment=Fecha de inicio de empleo
 DateEmploymentEnd=Fecha de finalización de empleo
-CantDisableYourself=You can't disable your own user record
+CantDisableYourself=No puede deshabilitar su propio registro de usuario
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index b9bf7475fbe..b9dfcea43e5 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -95,4 +95,9 @@ InternalURLOfPage=URL interna de la página
 ThisPageIsTranslationOf=Esta página/contenedor es traducción de
 ThisPageHasTranslationPages=Esta página/contenedor tiene traducción
 NoWebSiteCreateOneFirst=Todavía no se ha creado ningún sitio web. Cree uno primero.
-GoTo=Go to
+GoTo=Ir a
+DynamicPHPCodeContainsAForbiddenInstruction=Ha añadido código PHP dinámico que contiene la instrucción de PHP  '<strong>%s</strong>' que está prohibida por defecto como contenido dinámico (vea las opciones ocultas WEBSITE_PHP_ALLOW_xxx para aumentar la lista de comandos permitidos).
+NotAllowedToAddDynamicContent=No tiene permiso para agregar o editar contenido dinámico de PHP en sitios web. Pida permiso o simplemente mantenga el código en las etiquetas php sin modificar.
+ReplaceWebsiteContent=Reemplazar el contenido del sitio web
+DeleteAlsoJs=¿Eliminar también todos los archivos javascript específicos de este sitio web?
+DeleteAlsoMedias=¿Eliminar también todos los archivos de medios específicos de este sitio web?
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index 8b47ff5ee4a..8150366c070 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -18,7 +18,6 @@ CustomersVentilation=Agregar factura de cliente
 CreateMvts=Crear nueva transaccion
 UpdateMvts=Modificación de una transacción
 ValidTransaction=Validar transacción
-WriteBookKeeping=Journalize transacciones en Ledger
 Bookkeeping=Libro mayor
 InvoiceLines=Líneas de facturas para enlazar
 InvoiceLinesDone=Líneas de facturas vinculadas
@@ -47,6 +46,7 @@ NewAccountingMvt=Nueva transacción
 NumMvts=Número de transacción
 ListeMvts=Lista de movimientos
 ErrorDebitCredit=Débito y Crédito no pueden tener un valor al mismo tiempo
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
 TotalVente=Facturación total antes de impuestos
 TotalMarge=Margen de ventas total
 DescVentilExpenseReport=Consulte aquí la lista de líneas de reporte de gastos vinculadas (o no) a una cuenta de contabilidad de comisiones
@@ -57,6 +57,7 @@ AccountingJournalType5=Informe de gastos
 AccountingJournalType9=Tiene nuevo
 ErrorAccountingJournalIsAlreadyUse=Este diario ya está en uso
 ExportDraftJournal=Exportar borrador de diario
+Modelcsv_FEC=Export FEC (Art. L47 A)
 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 253d2799a08..9747469d49d 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -44,7 +44,6 @@ ErrorReservedTypeSystemSystemAuto=Los valores de tipo 'system' y 'systemauto' es
 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=N° de caracteres para activar la búsqueda: %s
 NotAvailableWhenAjaxDisabled=No disponible cuando Ajax está desactivado
 JavascriptDisabled=JavaScript desactivado
 UsePreviewTabs=Utilizar pestañas de vista previa
@@ -131,9 +130,9 @@ Module30Name=Facturas
 DictionaryAccountancyJournal=Diarios de contabilidad
 DictionaryProspectStatus=Estatus del cliente potencial
 Upgrade=Actualizar
-CreditNote=Nota de crédito
 LDAPFieldFirstName=Nombre(s)
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda
 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
+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_MX/bills.lang b/htdocs/langs/es_MX/bills.lang
index 18d1359dc0c..8a0e2be81d3 100644
--- a/htdocs/langs/es_MX/bills.lang
+++ b/htdocs/langs/es_MX/bills.lang
@@ -39,6 +39,7 @@ BillFrom=De
 BillTo=Hacia
 StandingOrder=Orden de domiciliación bancaria
 CustomerBillsUnpaid=Facturas de clientes no pagadas
+CreditNote=Nota de crédito
 ReasonDiscount=Razón
 PaymentTypeCB=Tarjeta de crédito
 PaymentTypeShortCB=Tarjeta de crédito
diff --git a/htdocs/langs/es_MX/holiday.lang b/htdocs/langs/es_MX/holiday.lang
index 213091587cf..cad77273485 100644
--- a/htdocs/langs/es_MX/holiday.lang
+++ b/htdocs/langs/es_MX/holiday.lang
@@ -1,19 +1,14 @@
 # Dolibarr language file - Source file is en_US - holiday
-Holidays=Licencias
-CPTitreMenu=Licencias
 MenuAddCP=Nueva solicitud de licencia
-NotActiveModCP=Debe activar el módulo de licencias para ver esta página.
 AddCP=Hacer una solicitud de licencia
 DateDebCP=Fecha de inicio
 DateFinCP=Fecha de finalización
 ApprovedCP=Aprobado
 CancelCP=Cancelado
 RefuseCP=Rechazado
-ListeCP=Lista de licencias
 ReviewedByCP=Será aprobado por
 SendRequestCP=Crear solicitud de licencia
 DelayToRequestCP=Las solicitudes de permiso deben ser hechas al menos <b> %s día(s) </b> antes.
-MenuConfCP=Balance de licencias
 EditCP=Editar
 ActionCancelCP=Cancelar
 MotifCP=Razón
diff --git a/htdocs/langs/es_MX/paybox.lang b/htdocs/langs/es_MX/paybox.lang
index dd38b46a33b..b5e026cdced 100644
--- a/htdocs/langs/es_MX/paybox.lang
+++ b/htdocs/langs/es_MX/paybox.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - paybox
-WelcomeOnPaymentPage=Bienvenido a nuestro servicio de pago en línea
 Continue=Siguiente
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index 75e885f430e..5f6898087d4 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionUnknown=Desconocido
+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 18ccde6a541..c651b103468 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -19,7 +19,6 @@ Binding=Vinculación a cuentas
 CustomersVentilation=Fijación de la factura del cliente
 CreateMvts=Crear nueva transacción
 UpdateMvts=Modificación de una transacción
-WriteBookKeeping=Periodizar transacción en Libro Mayor
 InvoiceLines=Líneas de facturas para enlazar
 InvoiceLinesDone=Líneas de facturas vinculadas
 IntoAccount=Vincular la línea con la cuenta de contabilidad
@@ -44,4 +43,6 @@ ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta de contabilidad por defecto para los produ
 Sens=Significado
 Codejournal=Periódico
 FinanceJournal=Periodo Financiero
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
 TotalMarge=Margen total de ventas
+Modelcsv_FEC=Export FEC (Art. L47 A)
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index d85f878e1cb..cc415c6dda9 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -5,3 +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
+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 f6a51b3a338..878e85bb2e9 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -32,3 +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)
+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/holiday.lang b/htdocs/langs/es_VE/holiday.lang
deleted file mode 100644
index 5e4818c3ac1..00000000000
--- a/htdocs/langs/es_VE/holiday.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-GoIntoDictionaryHolidayTypes=Vaya a <strong>Inicoi - Configuración - Diccionarios - Tipos de vacaciones </strong> para configurar los diferentes tipos.
diff --git a/htdocs/langs/es_VE/main.lang b/htdocs/langs/es_VE/main.lang
index 8dd07d39592..259c361c916 100644
--- a/htdocs/langs/es_VE/main.lang
+++ b/htdocs/langs/es_VE/main.lang
@@ -32,6 +32,7 @@ MonthVeryShort03=L
 MonthVeryShort05=L
 MonthVeryShort09=D
 FindBug=Señalar un bug
+ValidatePayment=Validar este pago
 NewAttribute=Nuevo atributo
 AttributeCode=Código atributo
 LinkToOrder=Enlazar a un pedido
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 01db1ebce87..f103f951d34 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index edda736a6eb..f7cd5a80968 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Suure kolmandate isikute arvu korral (> 100 000)
 UseSearchToSelectContactTooltip=Suure kolmandate isikute arvu korral (> 100 000) saab kiiruse suurendamiseks seadistada Seadistamine->Muu menüüs konstandi CONTACT_DONOTSEARCH_ANYWHERE väärtuseks 1. Sellisel juhul piirdub otsing sõne algusega.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Sisestatud märkide arv otsingu käivitamiseks: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Ei ole saadaval, kui Ajax on välja lülitatud
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript on välja lülitatud
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtuaalserveri nimi
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Veebilehitseja
 Server=Server
 Database=Andmebaas
 DatabaseServer=Andmebaasi host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Süsteemi info sisaldab mitmesugust tehnilist infot, mida ei saa
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=Moodulite aktiveerimiseks mine süsteemi seadistusesse (Kodu->Seadistamine->Moodulid).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Arvete ja kreeditarvete numeratsiooni mudel
 BillsPDFModules=Arve dokumentide mudelid
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Kreeditarve
-CreditNotes=Kreeditarved
 ForceInvoiceDate=Sunni arve kuupäevaks arve kinnitamise kuupäev
 SuggestedPaymentModesIfNotDefinedInInvoice=Soovitatav vaikimisi makseviis arvel, kui seda pole arvel määratletud
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Postiindeks
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang
index 162755d4bb0..0bd909eb402 100644
--- a/htdocs/langs/et_EE/agenda.lang
+++ b/htdocs/langs/et_EE/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Tegevused, mille kohta lisab Dolibarr automaatselt päevakavasse s
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index 8a259c319af..7a04075f18e 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Pank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Panga nimi
 FinancialAccount=Konto
 BankAccount=Pangakonto
 BankAccounts=Pangakontod
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Finantskonto viide
 AccountLabel=Finantskonto silt
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Vastavusse viimine
 RIB=Arvelduskonto number
 IBAN=IBAN number
-BIC=BIC/SWIFT number
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Väljavõte
 AccountStatements=Kontoväljavõtted
 LastAccountStatements=Viimased kontoväljavõtted
 IOMonthlyReporting=Igakuine aruandlus
-BankAccountDomiciliation=Konto aadress
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Konto riik
 BankAccountOwner=Konto omaniku nimi
 BankAccountOwnerAddress=Konto omaniku aadress
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Loo uus konto
 NewBankAccount=Uus konto
 NewFinancialAccount=Uus finantskonto
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Kliendi laekumi
-SupplierInvoicePayment=Hankija makse
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Liikmemaks
 WithdrawalPayment=Väljamakse
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Pangaülekanne
 BankTransfers=Pangaülekanded
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Kust
 TransferTo=Kuhu
 TransferFromToDone=Kanne kontolt <b>%s</b> kontole <b>%s</b> väärtuses <b>%s</b> %s on registreeritud.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Tagasi konto juurde
 ShowAllAccounts=Näita kõigil kontodel
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Lõpuks vali kategooria, mille alla kanded klassifitseerida
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index 6a8fa2a2119..3d3140d1068 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Tagasi makstud
 DeletePayment=Kustuta makse
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Laekunud maksed
 ReceivedCustomersPayments=Klientidelt laekunud maksed
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Makse summa
-ValidatePayment=Kinnita makse
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/et_EE/cashdesk.lang b/htdocs/langs/et_EE/cashdesk.lang
index 53affa8c851..41eeabff320 100644
--- a/htdocs/langs/et_EE/cashdesk.lang
+++ b/htdocs/langs/et_EE/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Ajalugu
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 5922947ad87..501fd91bdd1 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Uus makse
-Payments=Maksed
 PaymentCustomerInvoice=Müügiarve makse
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Müügireskontro
 PurchasesJournal=Ostureskontro
 DescSellsJournal=Müügireskontro
 DescPurchasesJournal=Ostureskontro
-InvoiceRef=Arve viide
 CodeNotDef=Määratlemata
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Maksetähtaja kuupäev ei saa olla väiksem objekti kuupäevast.
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index a8eed6ce66b..886c3e18f8a 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/et_EE/holiday.lang b/htdocs/langs/et_EE/holiday.lang
index f810d3a8825..ecb10d79497 100644
--- a/htdocs/langs/et_EE/holiday.lang
+++ b/htdocs/langs/et_EE/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index c92633b1518..61150076e73 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -371,6 +371,7 @@ Percentage=Protsent
 Total=Kokku
 SubTotal=Vahesumma
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Kokku (km-ga)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Saada e-kiri
 Email=E-post
 NoEMail=E-posti aadress puudub
-Email=E-post
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=Mobiiltelefon puudub
@@ -671,7 +671,6 @@ Method=Meetod
 Receive=Võta vastu
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Praegune väärtus
 PartialWoman=Osaline
 TotalWoman=Täielik
 NeverReceived=Pole vastu võetud
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Liigita arve esitatud
 ClassifyUnbilled=Classify unbilled
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Keskkontor
 View=View
@@ -842,6 +842,11 @@ Exports=Eksportimised
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Eksportimise seaded
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Muu
 Calendar=Kalender
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Majandusaasta
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index 921971689aa..7c9cbdc4dd8 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -6,7 +6,7 @@ Member=Liige
 Members=Liikmed
 ShowMember=Kuva liikme kaar
 UserNotLinkedToMember=Kasutaja ei ole liikmega seostatud
-ThirdpartyNotLinkedToMember=Kolmas isik ei ole ühegi liikmega seostatud
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Liikmete piletid
 FundationMembers=Ühenduse liikmed
 ListOfValidatedPublicMembers=Avalike kinnitatud liikmete nimekiri
@@ -67,11 +67,11 @@ Subscriptions=Liikmemaksud
 SubscriptionLate=Hilinenud
 SubscriptionNotReceived=Liikmemaksu pole kunagi saanud
 ListOfSubscriptions=Liikmemaksude nimekir
-SendCardByMail=Saada kaart e-postiga
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=Liikmetüüpe pole määratletud. Mine menüüsse "Liikmetüübid"
 NewMemberType=Uus liikmetüüp
-WelcomeEMail=E-kiri tervitamiseks
+WelcomeEMail=Welcome email
 SubscriptionRequired=Liikmemaks nõutud
 DeleteType=Kustuta
 VoteAllowed=Hääletamine lubatud
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd fail
 ValidateMember=Kinnita liige
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=Järgmised lingid on avalikud lehed, mis ei ole Dolibarri õigustega kaitstud. Nad ei ole kujundatud lehed ning on näitematerjaliks, kuidas kasutada liikmete andmebaasi nimekirja.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Liikmete avalik nimekiri
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Sinu liikmekaardi sisu
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Külalise automaatse liikmeks astumise puhul saadetava e-kirja teema
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Külalise automaatse liikmeks astumise puhul saadetav e-kir
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Automaatsete e-kirjade saatja aadress
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Siltide lehe formaat
 DescADHERENT_ETIQUETTE_TEXT=Liikmete aadressikaartidele trükitav tekst
 DescADHERENT_CARD_TYPE=Kaartide lehe formaat
@@ -156,8 +156,8 @@ DocForAllMembersCards=Loo kõigi liikmete kohta visiitkaardid
 DocForOneMemberCards=Loo mõne kindla liikme visiitkaart
 DocForLabels=Loo aadressilehed
 SubscriptionPayment=Liikmemaks
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Liikmete statistika riigi alusel
 MembersStatisticsByState=Liikmete statistika osariigi/provintsi alusel
 MembersStatisticsByTown=Liikmete statistika linna alusel
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Liikmemaksude jaoks kasutatav KM määr
-NoVatOnSubscription=Liikmemaksudel ei ole KM
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/et_EE/modulebuilder.lang b/htdocs/langs/et_EE/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/et_EE/modulebuilder.lang
+++ b/htdocs/langs/et_EE/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/et_EE/paybox.lang b/htdocs/langs/et_EE/paybox.lang
index 721018fe62a..738fd5ba087 100644
--- a/htdocs/langs/et_EE/paybox.lang
+++ b/htdocs/langs/et_EE/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Lõpuni viia
 YourEMail=E-posti aadress makse kinnituse saamiseks
 Creditor=Kreeditor
 PaymentCode=Makse kood
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Soorita makse
 YouWillBeRedirectedOnPayBox=Teid suunatakse turvalisele Payboxi lehele krediitkaardi info sisestamiseks
 Continue=Järgmine
 ToOfferALinkForOnlinePayment=Makse %s URL
-ToOfferALinkForOnlinePaymentOnOrder=Müügitellimuse eest maksmiseks kasutatava %s online makseteenuse URL
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=Müügiarve eest maksmiseks kasutatava %s online makseteenuse URL
 ToOfferALinkForOnlinePaymentOnContractLine=Lepingu rea eest maksmiseks kasutatava %s online makseteenuse URL
 ToOfferALinkForOnlinePaymentOnFreeAmount=Vaba rea eest maksmiseks kasutatava %s online makseteenuse URL
 ToOfferALinkForOnlinePaymentOnMemberSubscription=Liikmemaksu eest maksmiseks kasutatava %s online makseteenuse URL
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Samuti võid lisa URL parameetri <b>&tag=<i>value</i></b> igale nendest URLidest (nõutud vaid vaba makse jaoks) oma loodud makse kommentaari sildi jaoks.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=See lehekülg kinnitab, et makse on registreeritud. Täname!
@@ -33,7 +33,8 @@ VendorName=Müüja nim
 CSSUrlForPaymentForm=Maksmise vormi CSS stiililehtede URL
 NewPayboxPaymentReceived=Uus Payboxi makse vastu võetud
 NewPayboxPaymentFailed=Uut Payboxi makset prooviti sooritada, kuid see ebaõnnestus
-PAYBOX_PAYONLINE_SENDEMAIL=E-posti aadress, kuhu saadetakse sõnum pärast makset (õnnestus või mitte)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/et_EE/paypal.lang b/htdocs/langs/et_EE/paypal.lang
index b8fbb7d6ad8..8916af3530e 100644
--- a/htdocs/langs/et_EE/paypal.lang
+++ b/htdocs/langs/et_EE/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal mooduli seadistamine
-PaypalDesc=See moodul pakub lehti, mis võimaldavad <a href="http://www.paypal.com" target="_blank">PayPali</a> abil maksmist. Seda võib kasutada nii suvalise maksena kui maksena teatud Dolibarri objekti jaoks (arve, tellimus jne)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Maksa Paypaliga
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Testimise/liivakasti režii
 PAYPAL_API_USER=API kasutajanimi
 PAYPAL_API_PASSWORD=API parool
 PAYPAL_API_SIGNATURE=API signatuur
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Paku "terviklik" (krediitkaart + Paypal) või ainult "Paypal" makseviisi
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Terviklik
 PaypalModeOnlyPaypal=Ainult PayPal
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=See on tehingu ID: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Lisa PayPali makse URL, kui dokument saadetakse postiga
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=E-posti aadress pärast makset hoiatuse saatmiseks (õnnestus või mitte)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 13cfccbf1a9..df57806e5e2 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON andmed
 GlobalVariableUpdaterHelp0=Sõelu JSONi andmed määratletud URLilt, VALUE määrab ära seotud väärtuse asukoha
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 300b26d7069..07a4497af69 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Aega kulutatud
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Aega kulutatud
-RefTask=Ülesande viide
-LabelTask=Ülesande nimi
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Ülesannetel kulutatud aeg
 TaskTimeUser=Kasutaja
 TaskTimeNote=Märkus
diff --git a/htdocs/langs/et_EE/stripe.lang b/htdocs/langs/et_EE/stripe.lang
index 1384f445b68..0f080da0b2b 100644
--- a/htdocs/langs/et_EE/stripe.lang
+++ b/htdocs/langs/et_EE/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Dolibarri objektide põhjal maksete sooritamiseks on klientidele pakkuda järgnevate lehtede URLid:
 PaymentForm=Maksmise vorm
-WelcomeOnPaymentPage=Tere tulemast meie online makseteenusesse
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=See ekraan võimaldab teil teha online-makseid üksusele %s.
 ThisIsInformationOnPayment=See on makse sooritamise info
 ToComplete=Lõpuni viia
 YourEMail=E-posti aadress makse kinnituse saamiseks
-STRIPE_PAYONLINE_SENDEMAIL=E-posti aadress pärast makset hoiatuse saatmiseks (õnnestus või mitte)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Kreeditor
 PaymentCode=Makse kood
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Järgmine
 ToOfferALinkForOnlinePayment=Makse %s URL
-ToOfferALinkForOnlinePaymentOnOrder=Müügitellimuse eest maksmiseks kasutatava %s online makseteenuse URL
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=Müügiarve eest maksmiseks kasutatava %s online makseteenuse URL
 ToOfferALinkForOnlinePaymentOnContractLine=Lepingu rea eest maksmiseks kasutatava %s online makseteenuse URL
 ToOfferALinkForOnlinePaymentOnFreeAmount=Vaba rea eest maksmiseks kasutatava %s online makseteenuse URL
 ToOfferALinkForOnlinePaymentOnMemberSubscription=Liikmemaksu eest maksmiseks kasutatava %s online makseteenuse URL
 YouCanAddTagOnUrl=Samuti võid lisa URL parameetri <b>&tag=<i>value</i></b> igale nendest URLidest (nõutud vaid vaba makse jaoks) oma loodud makse kommentaari sildi jaoks.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=See lehekülg kinnitab, et makse on registreeritud. Täname!
-YourPaymentHasNotBeenRecorded=Makset ei ole registreeritud ja tehing on tühistatud. Täname!
 AccountParameter=Konto parameetrid
 UsageParameter=Kasutamise parameetrid
 InformationToFindParameters=Abi %s konto info leidmiseks
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index 9f5cc4e5b44..1bea0f4c586 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index ccba0841767..daa5b4ef413 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 318ba17fe20..5231c6df643 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Ajax ezgaituta dagoenean ez dago erabilgarri
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript ezgaituta
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Ataka
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang
index af1d71fc43e..bf08e333410 100644
--- a/htdocs/langs/eu_ES/agenda.lang
+++ b/htdocs/langs/eu_ES/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index 6d2f6f8dc4b..9cc27478cf9 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-BIC=BIC/SWIFT number
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Statement
 AccountStatements=Account statements
 LastAccountStatements=Last account statements
 IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Supplier payment
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 4b0c3b70df7..0a03fd602e1 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Ordainketa ezabatu
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Jasotako ordainketak
 ReceivedCustomersPayments=Bezeroen jasotako ordainketak
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Ordainketaren zenbatekoa
-ValidatePayment=Ordainketak balioztatu
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/eu_ES/cashdesk.lang b/htdocs/langs/eu_ES/cashdesk.lang
index 740e0acb8e1..f1b50e4ffab 100644
--- a/htdocs/langs/eu_ES/cashdesk.lang
+++ b/htdocs/langs/eu_ES/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 8011bc78a8a..4b74056ff87 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=New payment
-Payments=Ordainketak
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 68db165215d..b5a9d70cb70 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/eu_ES/holiday.lang b/htdocs/langs/eu_ES/holiday.lang
index 6ba427aa3b6..21c60d4f968 100644
--- a/htdocs/langs/eu_ES/holiday.lang
+++ b/htdocs/langs/eu_ES/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index bf0d622086e..3961eb46b5a 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=e-posta bidali
 Email=E-posta
 NoEMail=No email
-Email=E-posta
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Esportatzeko aukerak
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Egutegia
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index aed3f436e71..9f72095351e 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=Kideak
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=Late
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Ezabatu
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/eu_ES/modulebuilder.lang b/htdocs/langs/eu_ES/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/eu_ES/modulebuilder.lang
+++ b/htdocs/langs/eu_ES/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/eu_ES/paybox.lang b/htdocs/langs/eu_ES/paybox.lang
index 531838580ac..2a0e9c8bdef 100644
--- a/htdocs/langs/eu_ES/paybox.lang
+++ b/htdocs/langs/eu_ES/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Ordainketa egin
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Hurrengoa
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/eu_ES/paypal.lang b/htdocs/langs/eu_ES/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/eu_ES/paypal.lang
+++ b/htdocs/langs/eu_ES/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index a3bfb4791ce..926e97d0a30 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index aa00f6138d9..7b543688868 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Erabiltzailea
 TaskTimeNote=Oharra
diff --git a/htdocs/langs/eu_ES/stripe.lang b/htdocs/langs/eu_ES/stripe.lang
index 7f9d13aa46d..6186c14a9ec 100644
--- a/htdocs/langs/eu_ES/stripe.lang
+++ b/htdocs/langs/eu_ES/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditor
 PaymentCode=Payment code
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Hurrengoa
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index 94aa2551806..237ffc1b2f8 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index e1136e07530..1133ce3e5dc 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=بندشدن به گزارش هزینه‌ها
 CreateMvts=ایجاد تراکنش جدید
 UpdateMvts=ویرایش تراکنش
 ValidTransaction=اعتباردهی به تراکنش
-WriteBookKeeping=درج تراکنش‌ها در دفترکل
+WriteBookKeeping=ثبت تراکنش در دفترکل
 Bookkeeping=دفترکل
 AccountBalance=موجودی حساب
 ObjectsRef=مرجع شیء منبع
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=حساب حساب‌داری ثبت اش
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=حساب حساب‌داری پیش‌فرض برای محصولات خریداری شده (در صورت عدم تعریف در برگۀ محصولات استفاده می‌شود)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=حساب حساب‌داری پیش‌فرض برای محصولات فروخته شده (در صورت عدم تعریف در برگۀ محصولات استفاده می‌شود)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=حساب حساب‌داری پیش‌فرض برای محصولات فروخته شده در اتحادیۀ اروپا (در صورت عدم تعریف در برگۀ محصولات استفاده می‌شود)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=حساب حساب‌داری پیش‌فرض برای محصولات فروخته شده و صادر شده در خارج از اتحادیۀ اروپا (در صورت عدم تعریف در برگۀ محصولات استفاده می‌شود)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=حساب حساب‌داری پیش‌فرض برای محصولات فروخته شده در اتحادیۀ اروپا (در صورت عدم تعریف در برگۀ محصولات استفاده می‌شود)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=حساب حساب‌داری پیش‌فرض برای محصولات فروخته شده و صادر شده در خارج از اتحادیۀ اروپا (در صورت عدم تعریف در برگۀ محصولات استفاده می‌شود)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=حساب حساب‌داری پیش‌فرض برای خدمات خریداری شده (در صورت عدم تعریف در برگۀ خدمات استفاده می‌شود)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=حساب حساب‌داری پیش‌فرض برای خدمات فروخته شده (در صورت عدم تعریف در برگۀ خدمات استفاده می‌شود)
 
@@ -177,6 +177,7 @@ LabelAccount=برچسب حساب
 LabelOperation=عملیات برچسب
 Sens=Sens
 LetteringCode=کد حروف‌بندی
+Lettering=حروف‌بندی
 Codejournal=دفتر
 JournalLabel=برچسب دفتر
 NumPiece=شمارۀ بخش
@@ -288,8 +289,10 @@ Modelcsv_quadratus=صدور برای Quadratus QuadraCompta
 Modelcsv_ebp=صدور برای EBP
 Modelcsv_cogilog=صدور برای Cogilog
 Modelcsv_agiris=صدور برای Agiris
+Modelcsv_openconcerto=صادرکردن برای OpenConcerto  (آزمایشی)
 Modelcsv_configurable= صدور قابل پیکربندی CSV 
-Modelcsv_FEC=صدور FEC (Art. L47 A) (آزمایش)
+Modelcsv_FEC=صادرکردن برای FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=صادرکردن برای Sage 50 Switzerland
 ChartofaccountsId=ساختار شناسۀ حساب‌‌ها
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=این صفحه برای تنظیم یک حساب پیش‌ف
 DefaultClosureDesc=این صفحه برای تنظیم مؤلفه‌هائی برای پیوست کردن یک برگۀ تعدیل لازم است.
 Options=گزینه‌ها
 OptionModeProductSell=حالت فروش
+OptionModeProductSellIntra=حالت فروش به شکل EEC صادر می‌گردد
+OptionModeProductSellExport=حالت فروش به حالت سایر کشورها صادر می‌گرد
 OptionModeProductBuy=حالت خرید
 OptionModeProductSellDesc=نمایش همۀ محصولات دارای حساب‌حساب‌داری برای فروش
+OptionModeProductSellIntraDesc=نمایش همۀ محصولات در حساب حسابداری برای فروش در EEC
+OptionModeProductSellExportDesc=نمایش همۀ محصولات در حساب حسابداری برای سایر فروش‌های خارجی
 OptionModeProductBuyDesc=نمایش همۀ محصولات دارای حساب‌حساب‌داری برای خرید
 CleanFixHistory=حذف کد حساب‌داری از سطوری که در ساختار و نمودار حساب  وجود ندارند
 CleanHistory=بازسازی همۀ بندشدن‌ها برای سال انتخاب شده
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 47a31f899c5..5bf94c840ab 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=در صورتی که تعداد اشخاص‌س
 UseSearchToSelectContactTooltip=در صورتی که تعداد اشخاص‌سوم شما بسیار زیاد باشد (مثلا بیشتر از 100000)، شما می‌توانید از واحد برپاسازی->سایر با استفاده از تغییر مقدارثابت CONTACT_DONOTSEARCH_ANYWHERE به عدد 1، سرعت را زیاد کنید. جستجو در این حالت تنها به شروع عبارت محدود خواهد شد.
 DelaiedFullListToSelectCompany=انتظار تا هنگام فشرده شدن یک کلید قبل از بارگذاری فهرست ترکیبی اشخاص‌سوم. <br> در صورتی که تعداد زیادی شخص‌سوم داشته باشید این باعث افزایش کارآمدی خواهد شد اما راحتی آن کم‌تر است.
 DelaiedFullListToSelectContact=انتظار تا هنگام فشرده شدن یک کلید قبل از بارگذاری فهرست ترکیبی تماس‌ها در صورتی که تعداد زیادی ورودی تماس داشته باشید <br> این باعث افزایش کارآمدی خواهد شد اما راحتی آن کم‌تر است)
-NumberOfKeyToSearch=تعداد حروف برای به‌حرکت‌انداختن جستجو: %s
+NumberOfKeyToSearch=تعداد حروفی که عامل جستجو می‌شود: %s
+NumberOfBytes=مقدار بایت‌ها
+SearchString=عبارت جستجو
 NotAvailableWhenAjaxDisabled=در هنگام غیر فعال بودن AJAX در دسترس نیست
 AllowToSelectProjectFromOtherCompany=بر روی اسناد مربوط به یک شخص‌سوم، امکان انتخاب یک طرح‌کاری متصل به یک شخص سوم دیگر وجود دارد
 JavascriptDisabled=جاوا اسکریپت غیر فعال شده
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=این نام بخش مربوط به HTML است. ب
 PageUrlForDefaultValues=شما باید مسیر نسبی نشانی اینترنتی را وارد نمائید. در صورتی که در این نشانی مؤلفه و مقدار وارد کنید، در صورتی که همۀ مؤلفه‌ها به مقدار مشابه تنظیم شده باشد، مقادیر پیش‌فرض تاثیر خواهد داشت.
 PageUrlForDefaultValuesCreate=<br>مثال:<br>برای برگۀ ساخت یک شخص سوم، <strong>%s</strong> هست. <br> برای نشانی اینترنتی قسمت‌های خارجی که در پوشۀ دلخواه نصب کرده‌اید، پوشۀ "custom/" را شامل نکنید و مسیری همانند <strong>mymodule/mypage.php</strong> استفاده کنید، حتما مطمئن شوید این‌گونه نباشد  custom/mymodule/mypage.php. <br>‌ در صورتی که مقدار پیش‌فرض را نیاز دارید، در صورتی که نشانی اینترنتی در بردارندۀ مقادیر باشد، شما می‌توانید از <strong>%s</strong> استفاده نمائید.
 PageUrlForDefaultValuesList=<br>مثال:<br> برای صفحۀ فهرست اشخاص سوم، به شکل <strong>%s</strong> می‌باشد. <br> برای نشانی مربوط به قسمت‌های خارجی که در یک پوشۀ دلخواه نصب‌شده، از "custom/" استفاده ننمائید، بلکه از مسیری مثل <strong>mymodule/mypagelist.php</strong> و به شکل custom/mymodule/mypagelist.php نباشد. <br> در صورتی که مقدار پیش فرض را در صورت وجود مقادیر در نشانی اینترنتی مورد نظر دارید از <strong>%s</strong> استفاده کنید
+AlsoDefaultValuesAreEffectiveForActionCreate=به‌یاد داشته باشید که بازنویسی مقادیر پیش‌فرض برای ساخت برگۀ دریافت اطلاعات تنها برای صفحاتی کار می‌کند که درست طراحی شده باشند ( یعنی با مقدار action=create یا presend...)
 EnableDefaultValues=فعال‌کردن اختصاصی‌سازی مقادیر پیش‌فرض
 EnableOverwriteTranslation=فعال کردن استفاده از ترجمه‌های بازنویسی شده
 GoIntoTranslationMenuToChangeThis=برای این کلید با این کد یک ترجمه پیدا شده است. برای تغییر این مقدار، شما باید از گزینۀ خانه-برپاسازی-ترجمه استفاده نمائید.
@@ -494,7 +497,7 @@ Module1Name=اشخاص‌سوم
 Module1Desc=مدیریت شرکت‌ها و طرف‌های تماس (مشتریان، مشتریان‌احتمالی و ...)
 Module2Name=تجاری
 Module2Desc=مدیریت بازرگانی
-Module10Name=Accounting (simplified)
+Module10Name=حساب‌داری (ساده)
 Module10Desc=گزارش‌های سادۀ حساب‌داری (دفاتر، گردش‌مالی) مبنی بر محتوای بانک داده. از جداول دفترکل استفاده نمی‌کند.
 Module20Name=طرح‌های پیشنهادی
 Module20Desc=مدیریت طرح‌های پیشنهادی تجاری
@@ -541,7 +544,7 @@ Module80Desc=مدیریت یادداشت‌های تحویل و ارسال کا
 Module85Name=بانک‌های و دارائی‌های نقد
 Module85Desc=مدیریت بانک‌ها یا حساب‌های پول‌نقد
 Module100Name=وبگاه بیرونی
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module100Desc=افزودن یک پیوند به وبگاه بیرونی به‌عنوان نشانک فهرست اصلی . وبگاه در یک کادر در ذیل فهرست اصلی نمایش داده خواهد شد.
 Module105Name=پستچی و SPIP
 Module105Desc=پستچی و یا رابط SPIP برای واحد اعضاء
 Module200Name=LDAP
@@ -632,7 +635,7 @@ Module50200Name=Paypal
 Module50200Desc=امکان پرداخت از طریق PayPal برای مشتریان (حساب PayPal یا کارتهای اعتباری/نقدی). این به کاربران امکان پرداخت‌های اختصاصی برای اشیاء Dolibarr را می‌دهد (صورت‌حساب، سفارش و غیره)
 Module50300Name=Stripe
 Module50300Desc=امکان پرداخت از طریق Stripe برای مشتریان (کارتهای اعتباری/نقدی). این به کاربران امکان پرداخت‌های اختصاصی برای اشیاء Dolibarr را می‌دهد (صورت‌حساب، سفارش و غیره)
-Module50400Name=Accounting (double entry)
+Module50400Name=حساب‌داری (دو طرفه)
 Module50400Desc=مدیریت حساب‌داری (ورودی‌های دوگانه-حسابداری دوبل، پشتیبانی از دفتر کل و معین). صادرات دفترکل به شکل سایر نرم‌افزارهای مختلف حساب‌داری.
 Module54000Name=PrintIPP
 Module54000Desc=چاپ مستقیم (بدون باز کردن مستندات) با استفده از رابط Cups IPP (چاپ‌گر باید برای سرور قابل دیدن باشد و CUPS باید روی سرور نصب شده باشد).
@@ -989,7 +992,6 @@ Port=درگاه
 VirtualServerName=نام مجازی سرور
 OS=سیستم‌عامل
 PhpWebLink=پیوند Web-Php
-Browser=مرورگر
 Server=سرور
 Database=پایگاه داده
 DatabaseServer=میزبان پایگاه داده
@@ -1077,7 +1079,7 @@ SystemInfoDesc=اطلاعات سامانه، اطلاعاتی فنی است که
 SystemAreaForAdminOnly=این ناحیه تنها برای کاربران مدیر در دسترس است. مجوزهای کاربران Dolibarr  این محدودیت‌ها را تغییر نمی‌دهد.
 CompanyFundationDesc=ویرایش اطلاعات مربوط به شرکت/موجودیت. بر روی "%s" یا "%s" در انتهای صفحه کلیک نمائید.
 AccountantDesc=ویرایش جزئیات مربوط به حساب‌دار/دفتردار 
-AccountantFileNumber=شمارۀ فایل
+AccountantFileNumber=کد حساب‌دار
 DisplayDesc=مقادیری که بر شکل و رفتار Dolibarr اثرگذارند از این‌جا قابل تغییرند.
 AvailableModules=برنامه‌ها/واحد‌های دردسترس
 ToActivateModule=برای فعال‌کردن واحد‌ها، به صفحۀ برپاسازی مراجعه کنید (خانه->برپاسازی->واحد‌ها).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=طرز شماره‌دهی صورت‌حساب‌ها و ی
 BillsPDFModules=شکل مستندهای صورت‌حساب
 BillsPDFModulesAccordindToInvoiceType=شکل مستندهای صورت‌حساب با توجه به نوع صورت‌حساب
 PaymentsPDFModules=شکل مستندات پرداخت
-CreditNote=یادداشت اعتبار
-CreditNotes=یادداشت‌های اعتبار
 ForceInvoiceDate=الزام تاریخ صورت‌حساب به تاریخ تائیداعتبار
 SuggestedPaymentModesIfNotDefinedInInvoice=حالت‌های پیشنهادی و پیش‌فرض پرداخت در صورت‌حساب در صورتی که تعیین نشده باشد
 SuggestPaymentByRIBOnAccount=پیشنهاد پرداخت در صرف‌نظر کردن از حساب
@@ -1711,8 +1711,8 @@ SomethingMakeInstallFromWebNotPossible2=به این دلیل، روند به‌
 InstallModuleFromWebHasBeenDisabledByFile=نصب یک واحد خارجی از داخل برنامه توسط مدیر شما غیرفعال شده است. می‌توانید از وی بخواهید فایل <strong>%s</strong> را برای ایجاد اجازۀ نصب حذف نماید.
 ConfFileMustContainCustom=نصب یا ساخت یک واحد خارجی در برنامه نیازمند ذخیرۀ فایل‌های مربوطه در پوشۀ <strong>%s</strong> است. برای امکان پردازش این پوشه توسط Dolibarr شما باید به فایل <strong>conf/conf.php</strong> این 2 سطر دستوری را اضافه نمائید: <br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=برجسته‌کردن سطور جدول در هنگام عبور نشان‌گر موش
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+HighlightLinesColor=برجسته‌کردن رنگ سطر در هنگام عبور موشواره از آن (از 'ffffff' برای عدم رنگ‌دهی)
+HighlightLinesChecked=روشن‌کردن زرنگ سطر در هنگامی که کادرتائید فشرده شده است ( از 'ffffff' برای عدم روشن کردن استفاده کنید)
 TextTitleColor=رنگ نوشتۀ عنوان صفحه
 LinkColor=رنگ پیوندها
 PressF5AfterChangingThis=کلیدهای CTRL+F5 را روی صفحه‌کلید برای پاک‌کردن میان‌گیری پس از تغییر بفشرید تا تاثیر مقداردهی دیده شود.
@@ -1819,7 +1819,7 @@ ChartLoaded=نمودار حساب بارگذاری شد
 SocialNetworkSetup=برپاسازی واحد شبکه‌های اجتماعی
 EnableFeatureFor=فعال کردن‌قابلیت‌ها برای <strong>%s</strong>
 VATIsUsedIsOff=نکته: این گزینه برای استفاده از مالیات‌برفروش یا مالیات‌برارزش‌افزوده در فهرست %s - %s به حالت <strong>خاموش</strong> درآمده است، بنابراین مالیات‌برفروش و مالیات بر ارزش افزوده در عملیات فروش همواره برابر با 0 خواهد بود.
-SwapSenderAndRecipientOnPDF=جابجا کردن نشانی فرستنده و گیرنده در PDF
+SwapSenderAndRecipientOnPDF=جابه‌جا کردن محل ارسال‌کننده و دریافت کننده در سندهای PDF
 FeatureSupportedOnTextFieldsOnly=هشدار! این قابلیت تنها در بخش‌های نشوتاری پشتیبانی می‌شود. به‌هرحال مؤلفۀ نشانی اینترتی action=create و action=edit باید تنظیم شده یا این‌که نام صفحه باید با 'new.php' تمام شود تا این قابلیت را به‌حرکت‌اندازد.
 EmailCollector=جمع‌کنندۀ رایانامه
 EmailCollectorDescription=افزودن یک وظیفۀ زمان‌بندی شده و یک صفحۀ برپاسازی برای پویش منظم بخش‌های رایانامه (با استفاده از از پرتکل IMAP) و ثبت رایانامه‌هائی که در برنامۀ شما دریافت شده در محل درست و/یا ایجاد خودکار چند ردیف (مثل سرنخ‌ها).
@@ -1828,28 +1828,30 @@ EMailHost=میزبان سرور IMAP رایانامه
 MailboxSourceDirectory=پوشۀ منبع صندوق‌پستی
 MailboxTargetDirectory=پوشۀ مقصد صندوق‌پستی
 EmailcollectorOperations=عملیات قابل انجام جمع‌کننده
+MaxEmailCollectPerCollect=حداکثر تعداد رایانامه‌های جمع‌آوری شده در یک جمع‌آوری
 CollectNow=الآن جمع‌آوری شود
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
-LastResult=Latest result
+ConfirmCloneEmailCollector=آیا مطمئن هستید می‌خواهد جمع‌آورندۀ رایانامۀ %s را نسخه‌برداری کنید؟
+DateLastCollectResult=آخرین تاریخ تلاش برای جمع‌‌آوری
+DateLastcollectResultOk=آخرین تلاش جمع‌آوری موفق
+LastResult=آخرین نتیجه
 EmailCollectorConfirmCollectTitle=تائید جمع‌آوری رایانامه
 EmailCollectorConfirmCollect=آیا می‌خواهید عملیات جمع‌آوری این جمع‌آورنده را حالا اجرا کنید؟
 NoNewEmailToProcess=رایانامۀ جدیدی (با توجه به گزینش‌ها و صافی‌ها) پیدا نشد که پردازش شود
 NothingProcessed=کاری انجام نشد
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s رایانامه دارای شرایط لازم بود، %s رایانامه با موفقیت پردازش شد ( برای %s مورد ثبت/کنش انجام شد)
 RecordEvent=ثبت رخداد رایانامه
 CreateLeadAndThirdParty=افزودن سرنخ (و شخص سوم در صورت ضرورت)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
-CodeLastResult=Latest result code
+CreateTicketAndThirdParty=ساخت برگۀ‌پشتیبانی (و شخص‌سوم در صورت ضرورت)
+CodeLastResult=آخرین کد نتیجه
 NbOfEmailsInInbox=تعداد رایانامه‌های موجود در پوشۀ منبع
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+LoadThirdPartyFromName=بارگذاری جستجوی شخص‌سوم روی %s (فقط بارگذاری)
+LoadThirdPartyFromNameOrCreate=بارگذاری جستجوی شخص سوم روی %s (ساختن در صورت عدم یافتن)
 WithDolTrackingID=شناسۀ رهگیری Dolibarr پیدا شد
 WithoutDolTrackingID=شناسۀ رهگیری Dolibarr پیدا نشد
 FormatZip=کدپستی
 MainMenuCode=کد ورودی فهرست (فهرست اصلی)
 ECMAutoTree=نمایش ساختاردرختی خودکار ECM
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=مقادیر تعریف شده برای کنش-action یا چگونگی استخراج مقادیر را این‌جا تعریف کنید. برای مثال: <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> از یک ویرگول‌نقطۀ انگلیسی ; به‌عنوان جداکنندۀ یا استخراجی یا تنظیم چند گروه مشخصات استفاده کنید.
 OpeningHours=ساعات کار
 OpeningHoursDesc=ساعات کاری معمول شرکت خود را در این بخش وارد نمائید
 ResourceSetup=پیکربندی واحد منابع
@@ -1877,8 +1879,15 @@ WarningValueHigherSlowsDramaticalyOutput=هشدار! مقادیر بزرگ خر
 DebugBarModuleActivated=واحد نوار اشکال‌یابی فعال شده و رابط کاربری را به شدت کند می‌کند
 EXPORTS_SHARE_MODELS=اشکال صادارات با همگان به اشتراک گذاشته شدند
 ExportSetup=برپاسازی واحد صادرات
-InstanceUniqueID=Unique ID of the instance
-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/.
+InstanceUniqueID=شناسۀ منحصر به‌فرد نمونه
+SmallerThan=کوچک‌تر از
+LargerThan=بزرگتر از
+IfTrackingIDFoundEventWillBeLinked=توجه کنید در صورتی که یک شناسۀ ره‌گیری در یک رایانامۀ دریافتی یافت شود، روی‌داد به طور خودکار به اشیاء مربوطه متصل خواهد شد
+WithGMailYouCanCreateADedicatedPassword=با یک حساب GMail در صورتی که تائید 2 گامی را انتخاب کرده باشید، پیشنهاد می‌شود یک گذرواژۀ دوم برای استفادۀ برنامه به‌جای گذرواژۀ خودتان برای حساب بسازید. این کار از https://myaccount.google.com/ قابل انجام است.
+IFTTTSetup=برپاسازی واحد IFTTT
+IFTTT_SERVICE_KEY=کلید خدمات IFTTT
+IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=کلید امنیتی برای امن‌سازی نشانی نقطۀ نهائی که توسط IFTTT استفاده می‌شود تا در ارسال رایانامه از Dolibarr مورد استفاده قرار گیرد.
+IFTTTDesc=این واحد برای راه‌انداختن رخدادها بر IFTTT طراحی شده و یا این‌که به اجرای کنش‌هائی در راه‌اندازهای IFTTT بیرونی بپردازد
+UrlForIFTTT=نشانی اینترنتی نهائی برای IFTTT
+YouWillFindItOnYourIFTTTAccount=شما آن را بر حساب IFTTT خود پیدا خواهید کرد
+EndPointFor=نقطۀ آخر برای %s : %s
diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang
index e8a4800bef1..73f931ebe52 100644
--- a/htdocs/langs/fa_IR/agenda.lang
+++ b/htdocs/langs/fa_IR/agenda.lang
@@ -18,12 +18,12 @@ ToUserOfGroup=به همۀ کاربران این گروه
 EventOnFullDay=روی‌داد در تمام روز (ها)
 MenuToDoActions=همه روی‌دادهای ناقص
 MenuDoneActions=همۀ روی‌دادهای لغو شده
-MenuToDoMyActions=زوی‌دادهای ناقص من
-MenuDoneMyActions=زوی‌دادهای لغوشدۀ من
-ListOfEvents=فهرست زوی‌دادها (تقویم داخلی)
-ActionsAskedBy=زوی‌دادهای گزارش‌شده توسط
-ActionsToDoBy=زوی‌دادها اختصاص‌یافته به
-ActionsDoneBy=زوی‌دادهای انجام شده توسط
+MenuToDoMyActions=روی‌دادهای ناقص من
+MenuDoneMyActions=روی‌دادهای لغوشدۀ من
+ListOfEvents=فهرست روی‌دادها (تقویم داخلی)
+ActionsAskedBy=روی‌دادهای گزارش‌شده توسط
+ActionsToDoBy=روی‌دادها اختصاص‌یافته به
+ActionsDoneBy=روی‌دادهای انجام شده توسط
 ActionAssignedTo=روی‌داد اختصاص یافته به
 ViewCal=نمای ماهانه
 ViewDay=نمای روزانه
@@ -38,6 +38,7 @@ ActionsEvents=روی‌دادهائی که Dolibarr برای آن‌ها در ص
 EventRemindersByEmailNotEnabled=یادآورنده‌های روی‌داد توسط رایانامه در بخش برپاسازی واحد %s فعال نشده اند.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=شخص‌سوم %s ساخته شد
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=قرارداد %s تائید شد
 CONTRACT_DELETEInDolibarr=قرارداد %s حذف شد
 PropalClosedSignedInDolibarr=پیشنهاد %s امضا شد
@@ -95,7 +96,8 @@ PROJECT_MODIFYInDolibarr=طرح %s ویرایش شد
 PROJECT_DELETEInDolibarr=طرح %s حذف شد
 TICKET_CREATEInDolibarr=برگۀ‌پشتیبانی %s ساخته شد
 TICKET_MODIFYInDolibarr=برگۀ پشتیبانی %s ویرایش شد
-TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_ASSIGNEDInDolibarr=برگۀ %s نسبت‌داده شد 
+TICKET_CLOSEInDolibarr=برگۀ پشتیبانی %s بسته شده است
 TICKET_DELETEInDolibarr=برگۀ‌پشتیبانی %s حذف شد
 ##### End agenda events #####
 AgendaModelModule=قالب‌های مستند برای روی‌دادهای
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index 9d70cff8244..58284e96f00 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -156,11 +156,11 @@ CheckRejectedAndInvoicesReopened=چک برگشت‌خورد و صورت‌حسا
 BankAccountModelModule=قالب مستندات مربوط به حساب‌های بانکی
 DocumentModelSepaMandate=قالب SEPA mandate، تنها قابل استفاده در کشورهای عضو اتحادیۀ اروپا.
 DocumentModelBan=قالب چاپ صفحۀ اطلاعات BAN.
-NewVariousPayment=پرداخت جدید متفرقه
-VariousPayment=پرداخت‌های متفرقه
+NewVariousPayment=یک پرداخت متفرقه
+VariousPayment=پرداخت متفرقه
 VariousPayments=پرداخت‌های متفرقه
-ShowVariousPayment=نمایش پرداخت‌های متفرقه
-AddVariousPayment=همۀ پرداخت‌های متفرقه
+ShowVariousPayment=نمایش پرداخت متفرقه
+AddVariousPayment=افزودن پرداخت متفرقه
 SEPAMandate=تعهدنامۀ SEPA
 YourSEPAMandate=تعهدنامۀ SEPAی شما
 FindYourSEPAMandate=این تعهدنامۀ SEPAی شماست تا شرکت ما را مجاز کند سفارش پرداخت مستقیم از بانک داشته باشد. آن را امضا شده بازگردانید (نسخۀ اسکن‌شدۀ برگۀ امضا شده) یا آن را توسط رایانامه ارسال کنید:
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 97329882ed3..567e78c4bb7 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=به واحد‌پولی صورت‌حساب
 PaidBack=پرداخت برگردانده شد
 DeletePayment=حذف پرداخت
 ConfirmDeletePayment=آیا مطمئنید که می‌خواهید این پرداخت را حذف کنید؟
-ConfirmConvertToReduc=مطمئن هستید که می‌خواهید این %s را به یک تخفیف مطلق تبدیل کنید؟ <br> مبلغ برای همۀ تخفیف‌ها ذخیره خواهد شد و قابل استفاده به‌عنوان تخفیف برای یک صورت‌حساب جاری و آینده برای این مشتری خواهد بود.
-ConfirmConvertToReducSupplier=مطمئن هستید که می‌خواهید این %s را به یک تخفیف مطلق تبدیل کنید؟ <br> مبلغ برای همۀ تخفیف‌ها ذخیره خواهد شد و قابل استفاده به‌عنوان تخفیف برای یک صورت‌حساب جاری و آینده برای این فروشنده خواهد بود.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=پرداخت‌های فروشندگان
 ReceivedPayments=پول‌های دریافتی
 ReceivedCustomersPayments=پول‌های دریافت شده از مشتریان
@@ -89,7 +91,6 @@ PaymentTerm=شرایط پرداخت
 PaymentConditions=شرایط پرداخت
 PaymentConditionsShort=شرایط پرداخت
 PaymentAmount=مبلغ پرداختی
-ValidatePayment=تائید پرداخت
 PaymentHigherThanReminderToPay=پرداخت بیشتر از یادآوری برای پرداخت
 HelpPaymentHigherThanReminderToPay=توجه! مبلغ پرداخت یک یا چند صورت‌حساب پرداختی بیش از مبلغ قابل پرداخت است. <br> ورودی خود را ویرایش نمائید، در غیر این‌صورت ساخت یک یادداشت اعتباری را برای مبلغ اضافی دریافت شده برای هر صورت‌حساب را بررسی و تائید کنید.
 HelpPaymentHigherThanReminderToPaySupplier=توجه! مبلغ پرداخت یک یا چند صورت‌حساب پرداختی بیش از مبلغ قابل پرداخت است. <br> ورودی خود را ویرایش نمائید، در غیر این‌صورت ساخت یک یادداشت اعتباری را برای مبلغ اضافی پرداخت شده برای هر صورت‌حساب را بررسی و تائید کنید.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=تائید خودکار صورت‌حساب‌ها
 GeneratedFromRecurringInvoice=تولیدشده از صورت‌حساب تکرارشدنی قالبی %s
 DateIsNotEnough=هنوز به تاریخ مورد نظر نرسیده
 InvoiceGeneratedFromTemplate=صورت‌حساب %s از صورت‌حساب تکرارشدنی قالبی %s ساخته شده است
+GeneratedFromTemplate=تولید شده از قالب صورت‌حسابی %s
 WarningInvoiceDateInFuture=هشدار! تاریخ صورت‌حساب بیشتر از تاریخ کنونی است
 WarningInvoiceDateTooFarInFuture=هشدار! تاریخ صورت‌حساب از تاریخ امروز بسیار دور است
 ViewAvailableGlobalDiscounts=نمایش تخفیف‌های موجود
diff --git a/htdocs/langs/fa_IR/bookmarks.lang b/htdocs/langs/fa_IR/bookmarks.lang
index 79b0d175ede..8c085c5e6c5 100644
--- a/htdocs/langs/fa_IR/bookmarks.lang
+++ b/htdocs/langs/fa_IR/bookmarks.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Add current page to bookmarks
-Bookmark=عنوان
-Bookmarks=عنوان ها
-ListOfBookmarks=فهرست عناوین
-EditBookmarks=List/edit bookmarks
-NewBookmark=عنوان جدید
-ShowBookmark=نمایش عنوان
-OpenANewWindow=باز کردن یک پنجره جدید
-ReplaceWindow=جایگزینی پنجره
-BookmarkTargetNewWindowShort=پنجره جدید
-BookmarkTargetReplaceWindowShort=پنجره کنونی
-BookmarkTitle=تیتر عنوان
-UrlOrLink=یو ار ال
-BehaviourOnClick=Behaviour when a bookmark URL is selected
-CreateBookmark=ایجاد عنوان
-SetHereATitleForLink=تنظیم یک عنوان برای نظر نشانه
-UseAnExternalHttpLinkOrRelativeDolibarrLink=استفاده از URL های http خارجی و یا یک URL Dolibarr نسبی
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if linked page must open in new window or not
-BookmarksManagement=مدیریت بوک مارک ها
+AddThisPageToBookmarks=این صفحه را به فهرست نشانه‌ها اضافه کنید
+Bookmark=نشانه
+Bookmarks=نشانه‌ها
+ListOfBookmarks=فهرست نشانه‌ها
+EditBookmarks=فهرست/ویرایش نشانه‌ها
+NewBookmark=نشانۀ جدید
+ShowBookmark=نمایش نشان
+OpenANewWindow=باز کردن زبانۀ جدید
+ReplaceWindow=جایگزین کردن زبانۀ فعلی
+BookmarkTargetNewWindowShort=زبانۀ جدید
+BookmarkTargetReplaceWindowShort=زبانۀ فعلی
+BookmarkTitle=نام نشانه
+UrlOrLink=نشانی‌اینترنتی
+BehaviourOnClick=رفتار در هنگام انتخاب یک نشانی‌اینترنتی
+CreateBookmark=ساخت یک نشانه
+SetHereATitleForLink=یک نام برای نشانه انتخاب کنید
+UseAnExternalHttpLinkOrRelativeDolibarrLink=یک پیوند خارجی/مطلق  (https://URL) یا یک پیوند داخلی/نسبی (/DOLIBARR_ROOT/htdocs/...) استفاده کنید
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=صفحۀ پیوند شده در پنجرۀ جدیدی نمایش داده شود یا همان پنچره
+BookmarksManagement=مدیریت نشانه‌ها
diff --git a/htdocs/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang
index 3a206ba31c3..fa7543a8d3a 100644
--- a/htdocs/langs/fa_IR/boxes.lang
+++ b/htdocs/langs/fa_IR/boxes.lang
@@ -35,7 +35,7 @@ BoxTitleOldestUnpaidCustomerBills=صورت‌حساب مشتریان: قدیمی
 BoxTitleOldestUnpaidSupplierBills=صورت‌حساب فروشندگان: قدیمی‌ترین %s پرداخت نشده
 BoxTitleCurrentAccounts=حساب‌های باز: مانده حساب‌ها
 BoxTitleLastModifiedContacts=طرف‌های تماس/نشانی‌ها : آخرین %s تغییریافته
-BoxMyLastBookmarks=Bookmarks: latest %s
+BoxMyLastBookmarks=نشانه‌ها: آخرین %s
 BoxOldestExpiredServices=قدیمی تر خدمات منقضی فعال
 BoxLastExpiredServices=آخرین %s طرف‌تماس قدیمی با خدمات فعال منقضی‌شده
 BoxTitleLastActionsToDo=آخرین %s کار برای انجام
diff --git a/htdocs/langs/fa_IR/cashdesk.lang b/htdocs/langs/fa_IR/cashdesk.lang
index 2b51e2e6339..f57071c5fed 100644
--- a/htdocs/langs/fa_IR/cashdesk.lang
+++ b/htdocs/langs/fa_IR/cashdesk.lang
@@ -14,7 +14,7 @@ ShoppingCart=سبد خرید
 NewSell=فروش جدید
 AddThisArticle=اضافه کردن این مقاله
 RestartSelling=بازگشت در فروش
-SellFinished=Sale complete
+SellFinished=فروش تکمیل شد
 PrintTicket=چاپ بلیط
 NoProductFound=مقاله ای یافت نشد.
 ProductFound=محصول یافته شده
@@ -25,40 +25,46 @@ Difference=تفاوت
 TotalTicket=کل بلیط ها
 NoVAT=بدون مالیات بر ارزش افزوده برای این فروش
 Change=اضافی دریافت شد
-BankToPay=Account for payment
+BankToPay=حساب برای پرداخت
 ShowCompany=نمایش شرکت
 ShowStock=نمایش انبار
 DeleteArticle=برای حذف این مقاله کلیک کنید
 FilterRefOrLabelOrBC=جستجو (کد عکس / برچسب)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
-DolibarrReceiptPrinter=Dolibarr Receipt Printer
+UserNeedPermissionToEditStockToUsePos=شما می‌خواهید در ازای ساخت صورت‌حساب، موجودی کم شود؛ بنا بر این کاربری که از صندوق استفاده می‌کند، باید مجوز ویرایش موجودی را داشته باشد
+DolibarrReceiptPrinter=چاپ‌گر رسید Dolibarr
 PointOfSale=صندوق (نقطۀ فروش)
-PointOfSaleShort=POS
-CloseBill=Close Bill
-Floors=Floors
-Floor=Floor
-AddTable=Add table
-Place=Place
-TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
-SearchProduct=Search product
+PointOfSaleShort=صندوق
+CloseBill=بستن صورت‌حساب
+Floors=طبقه‌ها
+Floor=طبقه
+AddTable=ایجاد میز
+Place=محل
+TakeposConnectorNecesary=نیاز به "وصل‌کنندۀ TakePOS"
+OrderPrinters=مرتب‌کردن چاپ‌گرها
+SearchProduct=جستجوی محصول
 Receipt=دریافت
-Header=Header
-Footer=Footer
-AmountAtEndOfPeriod=Amount at end of period (day, month or year)
-TheoricalAmount=Theorical amount
-RealAmount=Real amount
-CashFenceDone=Cash fence done for the period
+Header=سربرگ
+Footer=پاورقی
+AmountAtEndOfPeriod=مبلغ در انتهای دوره (روز، ماه یا سال)
+TheoricalAmount=مبلغ نظری
+RealAmount=مقدار واقعی
+CashFenceDone=حصار نقدی برای دوره تعیین شده
 NbOfInvoices=Nb و از فاکتورها
-Paymentnumpad=Type of Pad to enter payment
-Numberspad=Numbers Pad
-BillsCoinsPad=Coins and banknotes Pad
-DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
-CashDeskBankAccountFor=Default account to use for payments in
-NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
-TicketVatGrouped=Group VAT by rate in tickets
-AutoPrintTickets=Automatically print tickets
-EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
-ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+Paymentnumpad=نوع بخش‌کناری
+Numberspad=بخش‌کناری عددی
+BillsCoinsPad=بخش‌کناری سکه‌ها و اسکناس‌ها
+DolistorePosCategory=واحدهای TakePOS و سایر واحدهای صندوق برای Dolibarr
+TakeposNeedsCategories=TakePOS نیازمند کار با دسته‌بندی محصولات است
+OrderNotes=مرتب کردن یادداشت‌ها
+CashDeskBankAccountFor=حساب پیش‌فرض برای ذخیرۀ پرداخت‌ها 
+NoPaimementModesDefined=در پیکربندی TakePOS هیچ حالت پرداختی تعریف نشده است
+TicketVatGrouped=در قبض م.ب.ا.ا توسط نرخ گروه‌بندی شو
+AutoPrintTickets=چاپ خودکار قبوض
+EnableBarOrRestaurantFeatures=فعال‌کردن موارد مربوط به کافه و رستوران
+ConfirmDeletionOfThisPOSSale=آیا مطمئن هستید می‌خواهید این فروش را حذف کنید؟
+History=تاریخ
+ValidateAndClose=تائید و بستن
+Terminal=پایانه
+NumberOfTerminals=تعداد پایانه‌ها
+TerminalSelect=پایانه‌ای که می‌خواهید استفاده کنید را انتخاب نمائید:
+POSTicket=برگۀ صندوق
diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang
index 0f6e1a754d3..f05ebaa2867 100644
--- a/htdocs/langs/fa_IR/categories.lang
+++ b/htdocs/langs/fa_IR/categories.lang
@@ -1,90 +1,90 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
+Rubrique=کلیدواژه/دسته‌بندی
 Rubriques=برچسب‌ها/دسته‌بندی‌ها
-RubriquesTransactions=Tags/Categories of transactions
-categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+RubriquesTransactions=کلیدواژه/دسته‌بندی‌های تراکنش‌ها
+categories=کلیدواژه‌ها/دسته‌بندی‌ها
+NoCategoryYet=از این نوع هیچ کلیدواژه/دسته‌بندی ساخته نشده است
 In=به
 AddIn=اضافه کردن در
 modify=تغییر دادن
 Classify=دسته بندی کردن
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
-SubCats=Sub-categories
-CatList=List of tags/categories
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
+CategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌ها
+ProductsCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های محصولات/خدمات
+SuppliersCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های فروشندگان
+CustomersCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های مشتریان
+MembersCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های اعضا
+ContactsCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های طرف‌های تماس
+AccountsCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های حساب‌ها
+ProjectsCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های طرح‌ها
+UsersCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های کاربران
+SubCats=زیردسته‌ها
+CatList=فهرست کلیدواژه‌ها/دسته‌بندی‌ها
+NewCategory=کلیدواژه/دسته‌بندی جدید
+ModifCat=ویرایش کلیدواژه/دسته‌بندی 
+CatCreated=کلیدواژه/دسته‌بندی  ساخته شد
+CreateCat=ساختن کلیدواژه/دسته‌بندی
+CreateThisCat=ایجاد این کلیدواژه/دسته‌بندی
 NoSubCat=بدون زیرشاخه.
 SubCatOf=زیرشاخه
-FoundCats=Found tags/categories
-ImpossibleAddCat=Impossible to add the tag/category %s
+FoundCats=کلیدواژه/دسته‌بندی یافته شده
+ImpossibleAddCat=امکان افزودن کلیدواژه/دسته‌بندی %s نبود
 WasAddedSuccessfully=<b>٪ s</b> با <b>موفقیت</b> اضافه شد.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-ProductIsInCategories=Product/service is linked to following tags/categories
-CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
-MemberIsInCategories=This member is linked to following members tags/categories
-ContactIsInCategories=This contact is linked to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This third party is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ProjectHasNoCategory=This project is not in any tags/categories
-ClassifyInCategory=Add to tag/category
-NotCategorized=Without tag/category
+ObjectAlreadyLinkedToCategory=عناصری که قبلا به این کلیدواژه/دسته‌بندی پیونده شده‌اند.
+ProductIsInCategories=محصول/خدماتی که به این کلیدواژه/دسته‌بندی‌ها پیوند شده‌اند
+CompanyIsInCustomersCategories=این شخص‌سوم به کلیدواژه/دسته‌بندی‌های مشتریان/مشتریان‌احتمالی ذیل پیوند شده است
+CompanyIsInSuppliersCategories=این شخص‌سوم به کلیدواژه/دسته‌بندی‌های فروشندگان ذیل پیوند شده است
+MemberIsInCategories=این شخص‌سوم به کلیدواژه/دسته‌بندی‌های اعضای ذیل پیوند شده است
+ContactIsInCategories=این شخص‌سوم به کلیدواژه/دسته‌بندی‌های طرف‌های تماس ذیل پیوند شده است
+ProductHasNoCategory=این محصول/خدمات در هیچ‌یک از این کلیدواژگان/دسته‌بندی‌ها وجود ندارد
+CompanyHasNoCategory=این شخص‌سوم در هیچ کلیدواژه/دسته‌بندی وجود ندارد
+MemberHasNoCategory=این عضو در هیچ کلیدواژه/دسته‌بندی وجود ندارد
+ContactHasNoCategory=این طرف‌تماس در هیچ کلیدواژه/دسته‌بندی وجود ندارد
+ProjectHasNoCategory=این طرح در هیچ کلیدواژه/دسته‌بندی وجود ندارد
+ClassifyInCategory=افزودن به کلیدواژه/دسته‌بندی
+NotCategorized=بدون کلیدواژه/دسته‌بندی
 CategoryExistsAtSameLevel=این رده در حال حاضر با این کد عکس وجود دارد
 ContentsVisibleByAllShort=مطالب توسط همه قابل مشاهده
 ContentsNotVisibleByAllShort=مطالب توسط همه قابل رویت نیست
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Vendors tag/category
-CustomersCategoryShort=Customers tag/category
-ProductsCategoryShort=Products tag/category
-MembersCategoryShort=Members tag/category
-SuppliersCategoriesShort=Vendors tags/categories
-CustomersCategoriesShort=Customers tags/categories
-ProspectsCategoriesShort=Prospects tags/categories
-CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
-AccountsCategoriesShort=Accounts tags/categories
-ProjectsCategoriesShort=Projects tags/categories
-UsersCategoriesShort=Users tags/categories
+DeleteCategory=حذف کلیدواژه/دسته‌بندی
+ConfirmDeleteCategory=آیا مطمئن هستید می‌خواهید این کلیدواژه/دسته‌بندی را حذف کنید؟
+NoCategoriesDefined=هیچ کلیدواژه/دسته‌بندی تعریف نشده است
+SuppliersCategoryShort=کلیدواژه/دسته‌بندی‌های فروشندگان
+CustomersCategoryShort=کلیدواژه/دسته‌بندی‌های مشتریان
+ProductsCategoryShort=کلیدواژه/دسته‌بندی‌های محصولات
+MembersCategoryShort=کلیدواژه/دسته‌بندی‌های اعضا
+SuppliersCategoriesShort=کلیدواژه/دسته‌بندی‌های فروشندگان
+CustomersCategoriesShort=کلیدواژه/دسته‌بندی‌های مشتریان
+ProspectsCategoriesShort=کلیدواژه/دسته‌بندی‌های مشتریان احتمالی
+CustomersProspectsCategoriesShort=کلیدواژه/دسته‌بندی‌های مشتری/احتمالی
+ProductsCategoriesShort=کلیدواژه/دسته‌بندی‌های محصولات
+MembersCategoriesShort=کلیدواژه/دسته‌بندی‌های اعضا
+ContactCategoriesShort=کلیدواژه/دسته‌بندی‌های طرف‌های‌تماس
+AccountsCategoriesShort=کلیدواژه/دسته‌بندی‌های حساب‌ها
+ProjectsCategoriesShort=کلیدواژه/دسته‌بندی‌های طرح‌ها
+UsersCategoriesShort=کلیدواژه/دسته‌بندی‌های کاربران
 ThisCategoryHasNoProduct=این رده در کل حاوی هر محصول نیست.
-ThisCategoryHasNoSupplier=This category does not contain any vendor.
+ThisCategoryHasNoSupplier=این دسته‌بندی دربردارندۀ هیچ فروشنده‌ای نیست.
 ThisCategoryHasNoCustomer=این رده در کل حاوی هر مشتری نیست.
 ThisCategoryHasNoMember=این رده در هیچ عضو نیست.
 ThisCategoryHasNoContact=این رده در کل حاوی هر گونه ارتباط نیست.
-ThisCategoryHasNoAccount=This category does not contain any account.
-ThisCategoryHasNoProject=This category does not contain any project.
-CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ThisCategoryHasNoAccount=این دسته‌بندی دربردارندۀ هیچ حسابی نیست.
+ThisCategoryHasNoProject=این دسته‌بندی دربردارندۀ هیچ طرحی نیست.
+CategId=شناسۀ کلیدواژه/دسته‌بندی 
+CatSupList=فهرست کلیدواژه/دسته‌بندی‌های فروشندگان
+CatCusList=فهرست کلیدواژه/دسته‌بندی‌های مشتریان/احتمالی‌ها
 CatProdList=فهرست گروه‌بندی‌ها/برچسب‌های محصولات
-CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
-CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
-DeleteFromCat=Remove from tags/category
+CatMemberList=فهرست کلیدواژه/دسته‌بندی‌های اعضا
+CatContactList=فهرست کلیدواژه/دسته‌بندی‌های طرف‌های تماس
+CatSupLinks=پیوندهای میان تامین‌کنندگان و کلیدواژه/دسته‌بندی‌ها
+CatCusLinks=پیوندهای میان مشتریان/احتمالی‌ها و کلیدواژه/دسته‌بندی‌ها
+CatProdLinks=پیوندهای میان محصولات/خدمات و کلیدواژه/دسته‌بندی‌ها
+CatProJectLinks=پیوندهای میان طرح‌ها و کلیدواژه/دسته‌بندی‌ها
+DeleteFromCat=حذف از کلیدواژه/دسته‌بندی
 ExtraFieldsCategories=ویژگی های مکمل
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
-CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
+CategoriesSetup=برپاسازی کلیدواژه/دسته‌بندی‌
+CategorieRecursiv=پیوند خودکار با کلیدواژه/دسته‌بندی والد
+CategorieRecursivHelp=اگر این گزینه روشن باشد، در هنگام افزودن یک محصول به یک زیردسته، محصول مورد نظر به دسته‌بندی وارد نیز اضافه خواهد شد
 AddProductServiceIntoCategory=افزودن پیگیری محصول/سرویس
-ShowCategory=Show tag/category
-ByDefaultInList=By default in list
-ChooseCategory=Choose category
+ShowCategory=نمایش کلیدواژه/دسته‌بندی
+ByDefaultInList=به طور پیش‌فرض در فهرست
+ChooseCategory=انتخاب دسته‌بندی
diff --git a/htdocs/langs/fa_IR/commercial.lang b/htdocs/langs/fa_IR/commercial.lang
index 1ac3013f8ba..f2d83b42c2e 100644
--- a/htdocs/langs/fa_IR/commercial.lang
+++ b/htdocs/langs/fa_IR/commercial.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - commercial
 Commercial=تجاری
-CommercialArea=منطقه تجاری
+CommercialArea=بخش تجاری
 Customer=مشتری
 Customers=مشتریان
 Prospect=مشتری‌احتمالی
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index 3bf40feddaf..a400f0772e7 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -28,7 +28,7 @@ AliasNames=سایر اسامی (نام تجاری، علامت‌تجاری و 
 AliasNameShort=سایر اسامی
 Companies=شرکت
 CountryIsInEEC=کشور مربوطه داخل جامعۀ اقتصادی اروپاست
-PriceFormatInCurrentLanguage=شکل مبالغ در زبان کنونی
+PriceFormatInCurrentLanguage=چگونگی نمایش قیمت در زبان و واحدپولی فعلی
 ThirdPartyName=نام شخص‌سوم
 ThirdPartyEmail=رایانامۀ شخص‌سوم
 ThirdParty=شخص‌سوم
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index c4250ece4a9..f9d8b9d0a1b 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -1,258 +1,256 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
-TaxModuleSetupToModifyRules=برو به <a href="%s">نصب ماژول مالیات</a> برای تغییر قوانین برای محاسبه
-TaxModuleSetupToModifyRulesLT=برو به <a href="%s">راه اندازی شرکت</a> برای تغییر قوانین برای محاسبه
-OptionMode=انتخاب برای حسابداری
-OptionModeTrue=انتخاب درآمدها، هزینه های
-OptionModeVirtual=گزینه ادعا، بدهی
-OptionModeTrueDesc=در این زمینه، گردش مالی بیش از پرداخت (تاریخ پرداخت) محاسبه می شود. اعتبار ارقام تضمین شده است تنها در صورتی که کتاب حفظ شده است از طریق ورودی / خروجی در حساب از طریق فاکتورها مورد بررسی قرار.
-OptionModeVirtualDesc=در این زمینه، گردش مالی بیش از فاکتورها (تاریخ اعتبار) محاسبه می شود. هنگامی که این فاکتورها به علت، آیا آنها پرداخت شده اند یا نه، آنها در خروجی گردش مالی ذکر شده است.
-FeatureIsSupportedInInOutModeOnly=ویژگی تنها در اعتبارات-بدهی حالت حسابداری موجود را ببینید (حسابداری پیکربندی ماژول)
-VATReportBuildWithOptionDefinedInModule=مقدار در اینجا نشان داده شده است با استفاده از قواعد تعریف شده توسط راه اندازی ماژول مالیات محاسبه می شود.
-LTReportBuildWithOptionDefinedInModule=مقدار در اینجا نشان داده شده است با استفاده از قواعد تعریف شده توسط راه اندازی شرکت محاسبه می شود.
-Param=برپایی
-RemainingAmountPayment=Amount payment remaining:
+MenuFinancial=صورت‌حساب | پرداخت
+TaxModuleSetupToModifyRules=به <a href="%s">برپاسازی واحد مالیات‌ها</a> رفته و قواعد محاسبه را تعیین کنید
+TaxModuleSetupToModifyRulesLT=به <a href="%s">برپاسازی شرکت</a> رفته تا قواعد محاسبه را تعیین کنید
+OptionMode=گزینۀ حساب‌داری
+OptionModeTrue=گزینۀ درآمد-هزینه
+OptionModeVirtual=گزینۀ طلب‌ها-بدهی‌ها
+OptionModeTrueDesc=در این زمنیه، گردش‌مالی بر اساس پرداخت‌ها محاسبه می‌گردد (تاریخ پرداخت‌ها). اعتبار ارقام تنها در صورتی قابل تضمین است که دفترداری مربوط به ورودی/خروجی حساب‌ها در برابر صورت‌حساب‌ها به دقت بررسی و موشکافی شود.
+OptionModeVirtualDesc=در این زمنیه، گردش‌مالی بر اساس صورت‌حساب‌ها محاسبه می‌گردد (تاریخ تائیداعتبار). هنگامی که موعد پرداخت این صورت‌حساب‌ها به سررسد، چه پرداخت شده باشند یا نه، در خروجی گردش مالی فهرست خواهند شد.
+FeatureIsSupportedInInOutModeOnly=این قابلیت صرفا در حالت حساب‌داری بستانکار-بدهکار فعال است ( پیکربندی واحد حساب‌داری را ملاحظه کنید)
+VATReportBuildWithOptionDefinedInModule=مقادیری که در این قسمت نمایش داده می‌شود توسط قواعد تعریف شده در پیکربندی واحد مالیات محاسبه می‌گردد.
+LTReportBuildWithOptionDefinedInModule=مقادیری که در این قسمت نمایش داده می‌شود توسط قواعد تعریف شده در پیکربندی شرکت محاسبه می‌گردد.
+Param=برپاسازی
+RemainingAmountPayment=مقدار باقی‌ماندۀ پرداخت:
 Account=حساب
-Accountparent=Parent account
-Accountsparent=Parent accounts
-Income=درامد
+Accountparent=حساب مادر
+Accountsparent=حساب‌های مادر
+Income=درآم
 Outcome=هزینه
 MenuReportInOut=درآمد / هزینه
-ReportInOut=Balance of income and expenses
-ReportTurnover=Turnover invoiced
-ReportTurnoverCollected=Turnover collected
-PaymentsNotLinkedToInvoice=پرداخت به هر فاکتور در ارتباط نیست، بنابراین به هر شخص ثالث مرتبط نیست
-PaymentsNotLinkedToUser=پرداخت به هر کاربر در ارتباط نیست
+ReportInOut=ماندۀ درآمدها و هزینه‌ها
+ReportTurnover=گردش‌مالی صورت‌حساب شده
+ReportTurnoverCollected=گردش‌مالی حاصل شده
+PaymentsNotLinkedToInvoice=پرداخت‌ها به هیچ صورت‌حسابی وصل نیست و بنابراین به هیچ شخص‌سومی نیز وصل نشده است
+PaymentsNotLinkedToUser=پرداخت‌ها به هیچ کاربری متصل نیست
 Profit=سود
-AccountingResult=Accounting result
-BalanceBefore=Balance (before)
-Balance=تعادل
-Debit=بدهی
-Credit=اعتبار
-Piece=حسابداری توضیحات.
-AmountHTVATRealReceived=شبکه جمع آوری
-AmountHTVATRealPaid=خالص پرداخت می شود
-VATToPay=Tax sales
-VATReceived=Tax received
-VATToCollect=Tax purchases
-VATSummary=Tax monthly
-VATBalance=Tax Balance
-VATPaid=Tax paid
-LT1Summary=Tax 2 summary
-LT2Summary=Tax 3 summary
-LT1SummaryES=RE موجودی
-LT2SummaryES=IRPF موجودی
-LT1SummaryIN=CGST Balance
-LT2SummaryIN=SGST Balance
-LT1Paid=Tax 2 paid
-LT2Paid=Tax 3 paid
-LT1PaidES=RE پرداخت
-LT2PaidES=IRPF پرداخت
-LT1PaidIN=CGST Paid
-LT2PaidIN=SGST Paid
-LT1Customer=Tax 2 sales
-LT1Supplier=Tax 2 purchases
-LT1CustomerES=RE فروش
-LT1SupplierES=RE خرید
-LT1CustomerIN=CGST sales
-LT1SupplierIN=CGST purchases
-LT2Customer=Tax 3 sales
-LT2Supplier=Tax 3 purchases
-LT2CustomerES=فروش IRPF
-LT2SupplierES=خرید IRPF
-LT2CustomerIN=SGST sales
-LT2SupplierIN=SGST purchases
-VATCollected=مالیات بر ارزش افزوده جمع آوری
-ToPay=به پرداخت
-SpecialExpensesArea=منطقه برای تمام پرداخت های ویژه
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
-LabelContrib=Label contribution
-TypeContrib=Type contribution
-MenuSpecialExpenses=هزینه های ویژه
-MenuTaxAndDividends=مالیات و سود سهام
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
-NewSocialContribution=New social/fiscal tax
-AddSocialContribution=Add social/fiscal tax
-ContributionsToPay=Social/fiscal taxes to pay
-AccountancyTreasuryArea=Billing and payment area
+AccountingResult=نتیجۀ حساب‌داری
+BalanceBefore=موجودی (قبلا)
+Balance=موجودی
+Debit=بدهکار
+Credit=بستانکار
+Piece=سند حساب‌داری
+AmountHTVATRealReceived=درآمد خالص
+AmountHTVATRealPaid=پرداختی خالص
+VATToPay=فروش مالیاتی
+VATReceived=دریافت مالیاتی
+VATToCollect=خرید مالیاتی
+VATSummary=مالیات ماهیانه
+VATBalance=ماندۀ مالیات
+VATPaid=مالیات پرداخت شده
+LT1Summary=جمع‌بندی مالیات 2
+LT2Summary=جمع بندی مالیات 3
+LT1SummaryES=مانده RE
+LT2SummaryES=مانده IRPF
+LT1SummaryIN=مانده CGST
+LT2SummaryIN=مانده SGST 
+LT1Paid=مالیات 2 پرداخت شده
+LT2Paid=مالیات 3 پرداخت شده
+LT1PaidES=RE پرداخت شده
+LT2PaidES=IRPF پرداخت شده
+LT1PaidIN=CGST پرداخت شده
+LT2PaidIN=SGST پرداخته شده
+LT1Customer=فروش‌های مالیات 2
+LT1Supplier=خریدهای مالیات 2
+LT1CustomerES=فروش‌های RE
+LT1SupplierES=خریدهای RE
+LT1CustomerIN=فروش‌های CGST
+LT1SupplierIN=خریدهای CGST
+LT2Customer=فروش‌های مالیات 3
+LT2Supplier=خریدهای مالیات 3
+LT2CustomerES=فروش‌های IRPF
+LT2SupplierES=خریدهای IRPF
+LT2CustomerIN=فروش‌های SGST
+LT2SupplierIN=خریدهای SGST
+VATCollected=مالیات‌بر‌ارزش‌افزودۀ جمع‌آوری شده
+ToPay=قابل پرداخت
+SpecialExpensesArea=ناحیۀ انجام همۀ پرداخت‌های خاص
+SocialContribution=مالیات اجتماعی و ساختاری
+SocialContributions=مالیات‌های اجتماعی و ساختاری
+SocialContributionsDeductibles=مالیات‌های اجتماعی و ساختاری کسرپذیر
+SocialContributionsNondeductibles=مالیات‌های اجتماعی و ساختاری کسرناپذیر
+LabelContrib=تسهیم برچسب
+TypeContrib=تسهیم نوع
+MenuSpecialExpenses=هزینه‌های ویژه
+MenuTaxAndDividends=مالیات و سودهای سها
+MenuSocialContributions=مالیات‌های اجتماعی/ساختاری
+MenuNewSocialContribution=مالیات جدید اجتماعی/ساختاری
+NewSocialContribution=مالیات جدید اجتماعی/ساختاری
+AddSocialContribution=افزودن مالیات اجتماعی/ساختاری
+ContributionsToPay=مالیات‌های قابل پرداخت اجتماعی/ساختاری
+AccountancyTreasuryArea=ناحیۀ صورت‌حساب و پرداخت‌ها
 NewPayment=پرداخت جدید
-Payments=پرداخت
-PaymentCustomerInvoice=پرداخت صورت حساب به مشتری
-PaymentSupplierInvoice=vendor invoice payment
-PaymentSocialContribution=پرداخت مالیات اجتماعی/سیاست مالی
-PaymentVat=پرداخت مالیات بر ارزش افزوده
-ListPayment=فهرست پرداخت
-ListOfCustomerPayments=لیست پرداخت های مشتری
-ListOfSupplierPayments=List of vendor payments
-DateStartPeriod=دوره تاریخ شروع
-DateEndPeriod=دوره تاریخ پایان
-newLT1Payment=New tax 2 payment
-newLT2Payment=New tax 3 payment
-LT1Payment=Tax 2 payment
-LT1Payments=Tax 2 payments
-LT2Payment=Tax 3 payment
-LT2Payments=Tax 3 payments
-newLT1PaymentES=پرداخت RE جدید
-newLT2PaymentES=پرداخت IRPF جدید
+PaymentCustomerInvoice=پرداخت صورت‌حساب مشتری
+PaymentSupplierInvoice=پرداخت صورت‌حساب فروشنده
+PaymentSocialContribution=پرداخت مالیات اجتماعی/ساختاری
+PaymentVat=پرداخت مالیات‌برارزش‌افزوده
+ListPayment=فهرست پرداخت‌ها
+ListOfCustomerPayments=فهرست پرداخت‌های مشتری
+ListOfSupplierPayments=فهرست‌پرداخت‌های مربوط به فروشنده
+DateStartPeriod=تاریخ شروع دوره
+DateEndPeriod=تاریخ پایان دوره
+newLT1Payment=یک پرداخت مربوط به مالیات 2
+newLT2Payment=یک پرداخت مربوط به مالیات 3
+LT1Payment=پرداخت مالیات 2
+LT1Payments=پرداخت‌های مالیات 2
+LT2Payment=پرداخت مالیات 3
+LT2Payments=پرداخت‌های مالیات 3
+newLT1PaymentES=پرداخت جدید RE
+newLT2PaymentES=پرداخت جدید IRPF
 LT1PaymentES=پرداخت RE
-LT1PaymentsES=RE پرداخت
+LT1PaymentsES=پرداخت‌های RE
 LT2PaymentES=پرداخت IRPF
-LT2PaymentsES=IRPF پرداخت
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATRefund=Sales tax refund
-NewVATPayment=New sales tax payment
-NewLocalTaxPayment=New tax %s payment
-Refund=Refund
-SocialContributionsPayments=Social/fiscal taxes payments
-ShowVatPayment=نمایش پرداخت مالیات بر ارزش افزوده
-TotalToPay=مجموع به پرداخت
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
-CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=vendor accounting code
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
+LT2PaymentsES=پرداخت‌های IRPF
+VATPayment=پرداخت مالیات بر فروش
+VATPayments=پرداخت‌های مالیات بر فروش
+VATRefund=بازپس‌گیری مالیات‌برفروش
+NewVATPayment=یک پرداخت جدید مالیات‌برفروش
+NewLocalTaxPayment=یک پرداخت جدید مالیات %s
+Refund=بازپس‌گیری
+SocialContributionsPayments=پرداخت‌های مالیات اجتماعی/ساختاری
+ShowVatPayment=نمایش پرداخت م.ب.ا.ا
+TotalToPay=مجموع قابل پرداخت
+BalanceVisibilityDependsOnSortAndFilters=موجودی در این فهرست تنها در صورتی قابل مشاهده خواهد بود که جدول به صورت صعودی برای %s انجام شده باشد و صافی برای 1 حساب بانکی تنظیم شده باشد
+CustomerAccountancyCode=کد حسابداری مشتری
+SupplierAccountancyCode=کد حساب‌داری فروشنده
+CustomerAccountancyCodeShort=کد حساب‌داری مشتری
+SupplierAccountancyCodeShort=کد حساب‌داری فروشنده
 AccountNumber=شماره حساب
-NewAccountingAccount=حساب کاربری جدید
-Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
-SalesTurnoverMinimum=Minimum turnover
-ByExpenseIncome=By expenses & incomes
-ByThirdParties=توسط اشخاص ثالث
-ByUserAuthorOfInvoice=توسط نویسنده فاکتور
-CheckReceipt=چک سپرده
-CheckReceiptShort=چک سپرده
-LastCheckReceiptShort=Latest %s check receipts
-NewCheckReceipt=تخفیف های جدید
-NewCheckDeposit=واریز چک های جدید
-NewCheckDepositOn=ایجاد رسید سپرده در حساب:٪ s را
-NoWaitingChecks=No checks awaiting deposit.
+NewAccountingAccount=حساب جدید
+Turnover=گردش‌مالی صورت‌حساب شده
+TurnoverCollected=گردش‌مالی حاصل شده
+SalesTurnoverMinimum=حداقل گردش‌مالی
+ByExpenseIncome=برحسب هزینه‌ها و درآمدها
+ByThirdParties=بر حسب اشخاص‌سوم
+ByUserAuthorOfInvoice=بر حسب صادرکنندۀ صورت‌حساب
+CheckReceipt=به‌حساب گذاشتن چک
+CheckReceiptShort=به‌حساب گذاشتن چک
+LastCheckReceiptShort=آخرین %s رسید چک
+NewCheckReceipt=تخفیف جدید
+NewCheckDeposit=به‌حساب‌گذاشتن جدید چک 
+NewCheckDepositOn=ساختن رسید برای به‌حساب‌گذاری چک در حساب: %s
+NoWaitingChecks=هیچ چکی در انتظار وصول شدن نیست
 DateChequeReceived=تاریخ دریافت چک
-NbOfCheques=No. of checks
-PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
-ExportDataset_tax_1=Social and fiscal taxes and payments
-CalcModeVATDebt=<b>حالت٪ SVAT در تعهد حسابداری٪ است.</b>
-CalcModeVATEngagement=<b>حالت٪ SVAT در درآمد، هزینه٪ است.</b>
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
-CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
-CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
-CalcModeLT1= <b>حالت٪ SRE در صورت حساب مشتری - تامین کنندگان فاکتورها از٪ s</b>
-CalcModeLT1Debt=<b>حالت٪ SRE در صورت حساب مشتری از٪ s</b>
-CalcModeLT1Rec= <b>حالت٪ SRE در تامین کنندگان فاکتورها از٪ s</b>
-CalcModeLT2= <b>حالت٪ sIRPF در صورت حساب مشتری - تامین کنندگان فاکتورها از٪ s</b>
-CalcModeLT2Debt=<b>حالت٪ sIRPF در صورت حساب مشتری از٪ s</b>
-CalcModeLT2Rec= <b>حالت٪ sIRPF در تامین کنندگان فاکتورها از٪ s</b>
-AnnualSummaryDueDebtMode=تعادل درآمد و هزینه، خلاصه سالانه
-AnnualSummaryInputOutputMode=تعادل درآمد و هزینه، خلاصه سالانه
-AnnualByCompanies=Balance of income and expenses, by predefined groups of account
-AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
-RulesAmountWithTaxIncluded=- مقدار نشان داده شده است با تمام مالیات گنجانده شده اند
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
-RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
-RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
-RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
-SeePageForSetup=See menu <a href="%s">%s</a> for setup
-DepositsAreNotIncluded=- Down payment invoices are not included
-DepositsAreIncluded=- Down payment invoices are included
-LT1ReportByCustomers=Report tax 2 by third party
-LT2ReportByCustomers=Report tax 3 by third party
-LT1ReportByCustomersES=گزارش شده توسط شخص ثالث RE
-LT2ReportByCustomersES=گزارش شده توسط شخص ثالث IRPF
-VATReport=Sale tax report
-VATReportByPeriods=Sale tax report by period
-VATReportByRates=Sale tax report by rates
-VATReportByThirdParties=Sale tax report by third parties
-VATReportByCustomers=Sale tax report by customer
-VATReportByCustomersInInputOutputMode=گزارش های مالیات بر ارزش افزوده مشتری جمع آوری و پرداخت
-VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
-LT1ReportByQuarters=Report tax 2 by rate
-LT2ReportByQuarters=Report tax 3 by rate
-LT1ReportByQuartersES=گزارش های نرخ RE
-LT2ReportByQuartersES=گزارش های نرخ IRPF
-SeeVATReportInInputOutputMode=<b>گزارش٪ SVAT قفسه٪ برای</b> محاسبه های استاندارد مشاهده
-SeeVATReportInDueDebtMode=<b>گزارش٪ SVAT در جریان٪ برای</b> محاسبه با گزینه ای در جریان مشاهده
-RulesVATInServices=- برای خدمات، این گزارش شامل مقررات مالیات بر ارزش افزوده در واقع دریافت و یا صادر شده بر اساس تاریخ پرداخت.
-RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
-RulesVATDueServices=- برای خدمات، این گزارش شامل فاکتور مالیات بر ارزش افزوده به علت، پرداخت می شود یا نه، بر اساس تاریخ فاکتور.
-RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
-OptionVatInfoModuleComptabilite=توجه: برای دارایی های مادی، باید از تاریخ تحویل به عادلانه تر استفاده کنید.
-ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
-PercentOfInvoice=٪٪ / فاکتور
-NotUsedForGoods=در محصولات استفاده نشده
-ProposalStats=آمار در طرح
-OrderStats=آمار در سفارشات
-InvoiceStats=آمار در صورت حساب
-Dispatch=توزیع
-Dispatched=اعزام
-ToDispatch=اعزام
-ThirdPartyMustBeEditAsCustomer=شخص ثالث باید به عنوان یک مشتری تعریف شده
-SellsJournal=مجله فروش
-PurchasesJournal=مجله خرید
-DescSellsJournal=مجله فروش
-DescPurchasesJournal=مجله خرید
-InvoiceRef=کد عکس فاکتور.
+NbOfCheques=تعداد چک‌ها
+PaySocialContribution=پرداخت مالیات اجتماعی/ساختاری
+ConfirmPaySocialContribution=آیا مطمئنید می‌خواهید این مالیات ساختاری یا اجتماعی را به صورت پرداخت شده طبقه‌بندی کنید؟
+DeleteSocialContribution=حذف یک پرداخت مالیات اجتماعی/ساختاری
+ConfirmDeleteSocialContribution=آیا مطمئن هستید می‌خواهید پرداخت این مالیات اجتماعی/ساختاری را حذف کنید؟
+ExportDataset_tax_1=مالیات‌های اجتماعی و ساختاری و پرداخت‌ها
+CalcModeVATDebt=حالت <b>%sحساب‌داری مالیات‌بر‌ارزش افزوده تعهدی%s</b>.
+CalcModeVATEngagement=حالت <b>%sمالیات بر ارزش افزوده در ازای درآمد-هزینه%s</b>.
+CalcModeDebt=تحلیل صورت‌حساب‌های معلوم و ثبت شده حتی در صورتی که هنوز در دفترکل حساب نشده باشند.
+CalcModeEngagement=تحلیل پرداخت‌های معلوم و ثبت شده حتی در صورتی که هنوز در دفترکل حساب نشده باشند.
+CalcModeBookkeeping=تحلیل داده‌های ثبت شده در دفتر روزنامه در جدول دفترداری دفترکل
+CalcModeLT1= حالت <b>%sRE بر حسب صورت‌حساب مشتری - صورت‌حساب تامین کننده%s</b>
+CalcModeLT1Debt=حالت <b>%sRE بر حسب صورت‌حساب مشتری%s</b>
+CalcModeLT1Rec= حالت <b>%sRE بر حسب صورت‌حساب تامین کننده %s</b>
+CalcModeLT2= حالت <b>%sIRPF بر حسب صورت‌حساب مشتری - صورت‌حساب تامین کننده%s</b>
+CalcModeLT2Debt=حالت <b>%sIRPF بر حسب صورت‌حساب مشتری %s</b>
+CalcModeLT2Rec= حالت <b>%sIRPF بر حسب صورت‌حساب تامین کننده%s</b>
+AnnualSummaryDueDebtMode=ماندۀ درآمدها و هزینه‌ها، جمع‌بندی سالانه
+AnnualSummaryInputOutputMode=ماندۀ درآمدها و هزینه‌ها، جمع‌بندی سالانه
+AnnualByCompanies=ماندۀ درآمدها و هزینه‌ها، بر حسب حساب‌های از گروه‌بندی شده
+AnnualByCompaniesDueDebtMode=ماندۀ درآمدها و هزینه‌ها، جزئیات بر حسب گروه‌های از قبل تعیین شده، حالت <b>%s طلب‌ها-بدهی‌ها%s</b> یا <b>حساب‌داری تعهدی</b>
+AnnualByCompaniesInputOutputMode=ماندۀ درآمدها و هزینه‌ها، جزئیات بر حسب گروه‌های از قبل تعیین شده، حالت <b>%sدرآمدها-هزینه‌ها%s</b> یا <b>حساب‌داری نقدی</b>.
+SeeReportInInputOutputMode=برای محاسبۀ پرداخت‌های حقیقی که حتی هنوز در دفترکل حساب نشده‌اند به %sتحلیل پرداخت‌ها%s نگاه کنید.
+SeeReportInDueDebtMode=برای محاسبۀ صورت‌حساب‌های ثبت شده که حتی هنوز در دفترکل حساب نشده‌اند به %sتحلیل صورت‌حساب‌ها %s نگاه کنید.
+SeeReportInBookkeepingMode=برای محاسبه‌ای بر روی <b>جدول حساب‌داری دفترکل</b> به <b>%sگزارش حساب‌داری%s</b> مراجعه کنید.
+RulesAmountWithTaxIncluded=- تمام مالیات‌ها در مقادیر نمایش داده شده، گنجانده شده‌اند
+RulesResultDue=- این شامل همۀ صورت‌حساب‌های پرداخت‌نشده، هزینه‌ها، مالیات بر ارزش افزوده، کمک‌های مالی پرداخت شده و نشده است. همچنین شامل حقوق‌های پرداخت شده می‌باشد. <br> - بسته به تاریخ تائید اعتبار در خصوص صورت‌حساب‌ها و مالیات بر ارزش افزوده و بر حسب تاریخ سررسید هزینه‌ها می‌باشد. برای حقوق‌هائی که در واحد حقوق‌ها تعریف شده است، از مقدار تاریخ پرداخت استفاده می‌شود.
+RulesResultInOut=- این شامل همۀ پرداخت‌های واقعی صورت‌حساب‌ها، هزینه‌ها، مالیات بر ارزش افزوده و حقوق‌ها است. <br>- بر حسب تاریخ پرداخت صورت‌حساب‌ها، هزینه‌ها، مالیات بر ارزش افزوده و حقوق‌ها می‌باشد. تاریخ کمک‌مالی برای کمک‌های مالی
+RulesCADue=- شامل صورت‌حساب‌های به موعد رسیدۀ مشتری، چه پرداخت شده باشند یا نه می‌باشد. <br> این بر حسب تاریخ تائید اعتبار این صورت‌حساب‌ها است. <br>
+RulesCAIn=- شامل همۀ پرداخت‌های دریافت‌شدۀ مؤثر صورت‌حساب‌های مشتریان است. <br> -این بسته به تاریخ پرداخت این صورت‌حساب‌هاست<br>
+RulesCATotalSaleJournal=شامل همۀ سطور بستانکار دفترفروش‌روزانه است
+RulesAmountOnInOutBookkeepingRecord=شامل همۀ ردیف‌های دفترکل دارای حساب‌حساب‌داری است که در گروه‌های "هزینه" یا "درآمد" باشند
+RulesResultBookkeepingPredefined=شامل همۀ ردیف‌های دفترکل دارای حساب‌حساب‌داری است که در گروه‌های "هزینه" یا "درآمد" باشند
+RulesResultBookkeepingPersonalized=نمایش دهندۀ ردیف دفترکل شما با حساب‌های حساب‌درای است <b> گروه‌بندی‌شده توسط گروه‌های شخصی‌سازی‌شده</b>
+SeePageForSetup=برای برپاسازی فهرست <a href="%s">%s</a> را ببینید
+DepositsAreNotIncluded=- صورت‌حساب‌های پیش‌پرداخت شامل نشده‌اند
+DepositsAreIncluded=- صورت‌حساب‌های پیش‌پرداخت شامل شده‌اند
+LT1ReportByCustomers=گزارش مالیات 2 توسط شخص سوم
+LT2ReportByCustomers=گزارش مالیات 3 توسط شخص سوم
+LT1ReportByCustomersES=گزارش توسط شخص سوم RE
+LT2ReportByCustomersES=گزارش توسط شخص سوم IRPF
+VATReport=گزارش مالیات‌برفروش
+VATReportByPeriods=گزارش مالیات‌برفروش بر حسب دورۀ زمانی
+VATReportByRates=گزارش مالیات‌برفروش بر حسب نرخ‌ها
+VATReportByThirdParties=گزارش مالیات‌برفروش بر حسب شخص‌سوم‌ها
+VATReportByCustomers=گزارش مالیات‌برفروش بر حسب مشتری
+VATReportByCustomersInInputOutputMode=گزارش بر حسب مالیات‌بر‌ارزش‌افزوده جمع‌آوری و پرداخت شده
+VATReportByQuartersInInputOutputMode=گزارش بر حسب مالیات‌برفروش جمع‌آوری و پرداخت شده
+LT1ReportByQuarters=گزارش مالیات 2 بر اساس نرخ
+LT2ReportByQuarters=گزارش مالیات 3 بر اساس نرخ
+LT1ReportByQuartersES=گزارش بر اساس نرخ RE
+LT2ReportByQuartersES=گزارش بر اساس نرخ IRPF
+SeeVATReportInInputOutputMode=گزارش <b>%sبخش‌بندی مالیات‌بر‌ارزش افزوده%s</b> را برای یک محاسبۀ استاندارد ببینید.
+SeeVATReportInDueDebtMode=گزارش <b>%s مالیات‌بر‌ارزش‌افزودۀ درجریان%s</b> را برای محاسبه با یک گزینۀ «درجریان» ببینید.
+RulesVATInServices=- در خصوص خدمات، این گزارش آئین‌نامه‌های مالیات‌برارزش‌افزوده‌ای که واقعا دریافت‌شده‌اند یا بر اساس تارخ پرداخت صادرشده‌اند را شامل می‌شوند.
+RulesVATInProducts=- برای دارائی‌های مادی،  این گزارش همۀ مالیات بر ارزش افزوده‌های دریافت شده یا بر اساس تاریخ پرداخت صادر شده را شامل می‌شود.
+RulesVATDueServices=- برای خدمات، گزارش شامل صورت‌حساب‌های مالیات‌برارزش‌افزودۀ به موعد رسیده که پرداخت شده باشند یا نه و بر اساس تاریخ صورت‌حساب است.
+RulesVATDueProducts=- برای دارائی‌های مادی، گزارش شامل صورت‌حساب‌های مالیات‌برارزش‌افزوده، بر اساس تاریخ صورت‌حساب است.
+OptionVatInfoModuleComptabilite=توجه: برای دارائی‌های مادی، باید برای انصاف بیشتر از تاریخ تحویل استفاده کنید.
+ThisIsAnEstimatedValue=این یک پیش‌نمایش است که بر اساس روی‌دادهای تجاری و نه از جدول دفترکل برگزیده شده است، لذا نتایج نهائی ممکن است با این مقادیر پیش‌نمایش متفاوت باشد.
+PercentOfInvoice=%%/صورت‌حساب
+NotUsedForGoods=در کالاها استفاده نشده
+ProposalStats=آمار برای پیشنهادها
+OrderStats=آمار برای سفارش‌ها
+InvoiceStats=آمار برای صورت‌حساب‌ها
+Dispatch=اعزام
+Dispatched=اعزام‌شده
+ToDispatch=برای اعزام
+ThirdPartyMustBeEditAsCustomer=شخص‌سوم باید به‌عنوان یک فروشنده تعریف شده باشد
+SellsJournal=دفتر فروش روزانه
+PurchasesJournal=دفتر خرید روزانه
+DescSellsJournal=دفتر فروش روزانه
+DescPurchasesJournal=دفتر خرید روزانه
 CodeNotDef=تعریف نشده
-WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
-DatePaymentTermCantBeLowerThanObjectDate=تاریخ شرایط پرداخت نمی‌تواند کم‌تر از تاریخ شیء باشد
-Pcg_version=Chart of accounts models
+WarningDepositsNotIncluded=صورت‌حساب‌های پیش‌پرداخت، در این نسخه از این واحد حساب‌داری شامل نشده‌اند
+DatePaymentTermCantBeLowerThanObjectDate=تاریخ موعد پرداخت نمی‌تواند قدیمی‌تر از تاریخ شیء باشد
+Pcg_version=انواع نمودار حساب‌ها
 Pcg_type=نوع PCG
 Pcg_subtype=زیر گروه PCG
-InvoiceLinesToDispatch=خطوط فاکتور به اعزام
-ByProductsAndServices=By product and service
-RefExt=کد عکس خارجی
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+InvoiceLinesToDispatch=سطور قابل ارسال صورت‌حساب
+ByProductsAndServices=بر حسب محصول و خدمات
+RefExt=ارجاع خارجی
+ToCreateAPredefinedInvoice=برای ساخت یک صورت‌حساب قالبی، یک صورت‌حساب استاندارد ساخته و سپس بدون تائیداعتبار آن روی کلید «%s» کلیک کنید.
 LinkedOrder=پیوند به سفارش
 Mode1=روش 1
 Mode2=روش 2
-CalculationRuleDesc=برای محاسبه مالیات بر ارزش افزوده در کل، دو روش وجود دارد: <br> روش 1 است گرد کردن مالیات بر ارزش افزوده در هر خط، و سپس جمع آنها. <br> روش 2 است جمع تمام مالیات بر ارزش افزوده در هر خط، و سپس گرد کردن نتیجه. <br> نتیجه نهایی ممکن است از چند سنت متفاوت است. حالت پیش فرض <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.
+CalculationRuleDesc=برای محاسبۀ مالیات‌برارزش‌افزوده، دو راه وجود دارد: <br> روش 1 ، در هر سطر مالیات بر ارزش افزوده را برای جمع‌بندی‌آن، گرد می‌کند. <br>روش 2، همۀ مالیات بر ارزش افزوده در هر سطر را جمع‌کرده و در نهایت نتیجه‌را گرد می‌کند.<br> نتیجۀ نهائی ممکن است به شکل جزئی تفاوت کند. حالت پیش‌فرض، حالت <b>%s</b> است.
+CalculationRuleDescSupplier=با توجه به فروشنده، حالت مناسب را برای قواعد محاسبۀ مشابه و نتایج مشابه برای حصول نتیجۀ مشابه با فروشنده انتخاب کنید.
+TurnoverPerProductInCommitmentAccountingNotRelevant=گزارش گردش‌مالی انجام شده بر حساب محصول فعال نیست. این گزارش تنها برای گردش‌مالی صورت‌حساب فعال است.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=گزارش گردش‌مالی بر حسب نرخ مالیات بر فروش فعال نیست. این گزارش صرفا بر حسب گردش مالی صورت‌حساب شده فعال است. 
 CalculationMode=حالت محاسبه
-AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
-ConfirmCloneTax=Confirm the clone of a social/fiscal tax
-CloneTaxForNextMonth=Clone it for next month
-SimpleReport=Simple report
-AddExtraReport=Extra reports (add foreign and national customer report)
-OtherCountriesCustomersReport=Foreign customers report
-BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
-SameCountryCustomersWithVAT=National customers report
-BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
-LinkedFichinter=Link to an intervention
-ImportDataset_tax_contrib=Social/fiscal taxes
-ImportDataset_tax_vat=Vat payments
-ErrorBankAccountNotFound=Error: Bank account not found
+AccountancyJournal=دفتر کد حسابداری
+ACCOUNTING_VAT_SOLD_ACCOUNT=حساب‌حساب‌داری پیش‌فرض برای مالیات‌برارزش‌افزوده در فروش ( در صورتی که در برپاسازی واژه‌نامۀ مالیات‌بر‌ارزش‌افزوده تعریف نشده باشد، استفاده می‌شود)
+ACCOUNTING_VAT_BUY_ACCOUNT=حساب‌حساب‌داری پیش‌فرض برای مالیات‌برارزش‌افزوده در خرید ( در صورتی که در برپاسازی واژه‌نامۀ مالیات‌بر‌ارزش‌افزوده تعریف نشده باشد، استفاده می‌شود)
+ACCOUNTING_VAT_PAY_ACCOUNT=حساب‌حساب‌داری پیش‌فرض برای پرداخت مالیات‌برارزش‌افزوده 
+ACCOUNTING_ACCOUNT_CUSTOMER=حساب‌حساب‌داری پیش‌فرض برای شخص‌سوم‌های مشتری
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=حساب‌حساب‌داری اختصاصی تعریف شده در کارت شخص‌سوم تنها برای حساب‌داری دفترمعین استفاده می‌شود. اگر حساب‌حساب‌داری اختصاصی مشتری در کارت شخص‌سوم تعریف نشده باشد، این یکی فقط برای دفترکل‌مرکزی و به‌عنوان مقدار پیش‌فرض حسابداری دفترمعین استفاده می‌شود.
+ACCOUNTING_ACCOUNT_SUPPLIER=حساب حساب‌داری استفاده شده برای اشخاص سوم
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=حساب‌حساب‌داری اختصاصی تعریف شده در کارت شخص‌سوم تنها برای حساب‌داری دفترمعین استفاده می‌شود. اگر حساب‌حساب‌داری اختصاصی مشتری در کارت شخص‌سوم تعریف نشده باشد، این یکی فقط برای دفترکل‌مرکزی و به‌عنوان مقدار پیش‌فرض حسابداری دفترمعین استفاده می‌شود.
+ConfirmCloneTax=نسخه‌برداری از یک مالیات اجتماعی/ساختاری را تائید کنید
+CloneTaxForNextMonth=نسخه‌برداری برای ماه آینده
+SimpleReport=گزارش ساده
+AddExtraReport=گزارش‌های دیگر (افزودن گزارش‌های مشتری خارجی و داخلی)
+OtherCountriesCustomersReport=گزارش مشتریان خارجی
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=بر حسب دو حرف اول شمارۀ مالیات‌بر‌ارزش‌افزوده متفاوت با کد کشوری شرکت شما
+SameCountryCustomersWithVAT=گزارش مشتریان داخلی
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=بر حسب دو حرف اول شمارۀ مالیات‌بر‌ارزش‌افزوده که مشابه کدکشوری شرکت شماست
+LinkedFichinter=پیوند به یک واسطه‌گری
+ImportDataset_tax_contrib=مالیات‌های اجتماعی/ساختاری
+ImportDataset_tax_vat=پرداخت‌های مالیات‌بر‌ارزش‌افزوده
+ErrorBankAccountNotFound=خطا: حساب‌بانکی پیدا نشد
 FiscalPeriod=دورۀ حساب‌داری
-ListSocialContributionAssociatedProject=List of social contributions associated with the project
-DeleteFromCat=Remove from accounting group
-AccountingAffectation=Accounting assignment
-LastDayTaxIsRelatedTo=Last day of period the tax is related to
-VATDue=Sale tax claimed
-ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
-ByVatRate=By sale tax rate
-TurnoverbyVatrate=Turnover invoiced by sale tax rate
-TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
-PurchasebyVatrate=Purchase by sale tax rate
+ListSocialContributionAssociatedProject=فهرست مشارکت‌های اجتماعی که با این طرح همراه شده‌اند
+DeleteFromCat=حذف از گروه حساب‌داری
+AccountingAffectation=انتساب حساب‌داری
+LastDayTaxIsRelatedTo=آخرین روز دورۀ مالیاتی مربوط به
+VATDue=مالیات بر فروش مطالبه شده
+ClaimedForThisPeriod=مطالبه شده برای دورۀ
+PaidDuringThisPeriod=پرداخت شده برای این دوره
+ByVatRate=بر حسب نرخ مالیات‌برفروش
+TurnoverbyVatrate=گردش‌مالی صورت‌حساب‌شده بر حسب نرخ مالیات بر فروش
+TurnoverCollectedbyVatrate=گردش‌مالی دریافت‌شده بر حسب نرخ مالیات بر فروش
+PurchasebyVatrate=خریدها بر اساس نرخ مالیات بر فروش
diff --git a/htdocs/langs/fa_IR/contracts.lang b/htdocs/langs/fa_IR/contracts.lang
index 4edb0f07a6b..8c56011b92b 100644
--- a/htdocs/langs/fa_IR/contracts.lang
+++ b/htdocs/langs/fa_IR/contracts.lang
@@ -1,97 +1,98 @@
 # Dolibarr language file - Source file is en_US - contracts
-ContractsArea=منطقه قرارداد
-ListOfContracts=فهرست قرارداد
-AllContracts=همه قراردادها
+ContractsArea=بخش قرارداد‌ها
+ListOfContracts=فهرست‌ قرارداد‌ها
+AllContracts=همۀ قراردادها
 ContractCard=کارت قرارداد
 ContractStatusNotRunning=در حال اجرا نیست
-ContractStatusDraft=پیش نویس
-ContractStatusValidated=اعتبار
-ContractStatusClosed=بسته
+ContractStatusDraft=پیش‌نویس
+ContractStatusValidated=معتبر است
+ContractStatusClosed=متوقف است
 ServiceStatusInitial=در حال اجرا نیست
-ServiceStatusRunning=در حال اجرا
-ServiceStatusNotLate=در حال اجرا، نه تمام شده
-ServiceStatusNotLateShort=تمام نشده است
-ServiceStatusLate=در حال اجرا، تمام شده
+ServiceStatusRunning=در حال اجراست 
+ServiceStatusNotLate=درحال اجرا بوده و منقضی نیست
+ServiceStatusNotLateShort=منقضی نیست
+ServiceStatusLate=در حال اجراست و منقضی شده
 ServiceStatusLateShort=منقضی شده
 ServiceStatusClosed=بسته
-ShowContractOfService=Show contract of service
+ShowContractOfService=نمایش قرارداد خدمات
 Contracts=قراردادها
-ContractsSubscriptions=قرارداد‌ها/اشتراک‌ه
-ContractsAndLine=Contracts and line of contracts
+ContractsSubscriptions=قراردادها/اشتراک‌ها
+ContractsAndLine=قراردادها و سطر قراردادها
 Contract=قرارداد
-ContractLine=Contract line
-Closing=Closing
-NoContracts=بدون قرارداد
+ContractLine=سطر قرارداد
+Closing=بستن
+NoContracts=قراردادی نیست
 MenuServices=خدمات
-MenuInactiveServices=خدمات فعال است
-MenuRunningServices=در حال اجرا خدمات
+MenuInactiveServices=خدمات فعال نیست
+MenuRunningServices=خدمات در حال اجرا
 MenuExpiredServices=خدمات منقضی شده
-MenuClosedServices=خدمات بسته شده
+MenuClosedServices=خدمات متوقف شده
 NewContract=قرارداد جدید
-NewContractSubscription=New contract/subscription
-AddContract=Create contract
+NewContractSubscription=قرارداد جدید/اشتراک جدید
+AddContract=ساخت قرارداد
 DeleteAContract=حذف یک قرارداد
-ActivateAllOnContract=Activate all services
+ActivateAllOnContract=فعال کردن همۀ خدما
 CloseAContract=بستن یک قرارداد
-ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
-ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
-ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
-ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
-ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
-ValidateAContract=اعتبار قرارداد
-ActivateService=فعال خدمات
-ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
-RefContract=قرارداد مرجع
-DateContract=تاریخ قرارداد
-DateServiceActivate=تاریخ فعال سازی سرویس
+ConfirmDeleteAContract=آیا مطمئن هستید می‌خواهید این قرارداد و همۀ خدمات مربوط به آن را حذف کنید؟
+ConfirmValidateContract=آیا مطمئن هستید می‌خواهید این قرارداد را تحت نام <b>%s</b> تائیداعتبار کنید؟
+ConfirmActivateAllOnContract=این همۀ خدمات را باز خواهد کرد (هنوز فعال نیست). آیا مطمئن هستید می‌خواهید همۀ خدمات را باز کنید؟
+ConfirmCloseContract=شما همۀ خدمات را خواهید بست (فعال یا غیر فعال). آیا مطمئن هستید می‌خواهید این قرارداد را ببندید؟
+ConfirmCloseService=آیا مطمئن هستید می‌خواهید این خدمات را با تاریخ <b>%s</b> ببندید؟
+ValidateAContract=تائیداعتبار یک قرارداد
+ActivateService=فعال‌کردن خدمات
+ConfirmActivateService=آیا مطمئن هستید می‌خواهید این خدمات با تاریخ <b>%s</b> را فعال کنید
+RefContract=مرجع قرارداد
+DateContract=تاریخ قراردا
+DateServiceActivate=تاریخ فعال سازی خدمات
 ListOfServices=فهرست خدمات
-ListOfInactiveServices=فهرست خدمات فعال است
+ListOfInactiveServices=فهرست خدمات غیرفعال
 ListOfExpiredServices=فهرست خدمات فعال منقضی شده
-ListOfClosedServices=فهرست خدمات بسته
-ListOfRunningServices=لیست خدمات در حال اجرا
-NotActivatedServices=خدمات غیر فعال (در قرارداد اعتبار)
-BoardNotActivatedServices=خدمات برای فعال سازی در قرارداد اعتبار
-LastContracts=Latest %s contracts
-LastModifiedServices=Latest %s modified services
+ListOfClosedServices=فهرسته خدمات بسته شده
+ListOfRunningServices=فعرست خدمات در حال اجرا
+NotActivatedServices=خدمات غیرفعال (در قراردادهای تائید شده)
+BoardNotActivatedServices=خدمات قابل فعال‌سازی در قراردادهای تائید شده
+LastContracts=آخرین %s قراردا
+LastModifiedServices=آخرین %s خدمات ویرایش شده
 ContractStartDate=تاریخ شروع
 ContractEndDate=تاریخ پایان
-DateStartPlanned=تاریخ شروع برنامه ریزی شده
-DateStartPlannedShort=تاریخ شروع برنامه ریزی شده
-DateEndPlanned=تاریخ پایان برنامه ریزی شده
-DateEndPlannedShort=تاریخ پایان برنامه ریزی شده
-DateStartReal=تاریخ شروع واقعی
+DateStartPlanned=تاریخ شروع برنامه‌ریزی شده
+DateStartPlannedShort=تاریخ شروع برنامه‌ریزی‌شده
+DateEndPlanned=تاریخ پایان برنامه‌ریزی شده
+DateEndPlannedShort=تاریخ پایان برنامه‌ریزی شده
+DateStartReal=تاریخ شروع حقیقی
 DateStartRealShort=تاریخ شروع واقعی
-DateEndReal=تاریخ پایان واقعی
+DateEndReal=تاریخ پایان حقیقی
 DateEndRealShort=تاریخ پایان واقعی
-CloseService=نزدیک خدمات
-BoardRunningServices=خدمات تمام شده در حال اجرا
+CloseService=متوقف‌کردن-بستن خدمات
+BoardRunningServices=خدمات در حال اجرا
+BoardExpiredServices=خدمات منقضی شده
 ServiceStatus=وضعیت خدمات
-DraftContracts=پیش نویس قرارداد
-CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
-ActivateAllContracts=Activate all contract lines
-CloseAllContracts=بستن تمام خطوط قرارداد
-DeleteContractLine=حذف یک خط قرارداد
-ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
-MoveToAnotherContract=انتقال خدمات به قرارداد دیگری.
-ConfirmMoveToAnotherContract=من انتخاب قرارداد هدف جدید و تایید من می خواهم به حرکت می کند این سرویس به این قرارداد.
-ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
-PaymentRenewContractId=تمدید قرارداد خط (تعداد٪ بازدید کنندگان)
+DraftContracts=قراردادهای پیش‌نویس
+CloseRefusedBecauseOneServiceActive=قرارداد نمی‌تواند بسته شود زیرا حداقل یک سرویس فعال در آن وجود دارد
+ActivateAllContracts=فعال‌کردن همۀ سطور قراردا
+CloseAllContracts=بستن همۀ سطور قراردا
+DeleteContractLine=حذف یک سطر از قراردا
+ConfirmDeleteContractLine=آیا مطمئن هستید می‌خواهید این سطر از قرارداد را حذف کنید؟
+MoveToAnotherContract=جابجا کردن خدمات به یک قرارداد دیگر.
+ConfirmMoveToAnotherContract=من یک قرارداد مقصد جدید انتخاب کردم و تائید می‌کنم که قصد دارم این خدمات را به این قرارداد جدید منتقل کنم.
+ConfirmMoveToAnotherContractQuestion=انتخاب کنید می‌خواهید این قرارداد را به قرارداد موجود (از همین شخص سوم) منتقل کنید؟
+PaymentRenewContractId=تمدید یک سطر قرارداد (شمارۀ %s)
 ExpiredSince=تاریخ انقضا
-NoExpiredServices=بدون خدمات فعال منقضی شده
-ListOfServicesToExpireWithDuration=فهرست خدمات به پایان می رسد در٪ s روز
-ListOfServicesToExpireWithDurationNeg=فهرست خدمات تمام شده از بیش از٪ s روز
-ListOfServicesToExpire=فهرست خدمات دات کام
-NoteListOfYourExpiredServices=این لیست فقط شامل خدمات قرارداد برای اشخاص ثالث به شما به عنوان یک نماینده فروش مرتبط است.
-StandardContractsTemplate=قراردادهای استاندارد قالب
-ContactNameAndSignature=برای٪ s، نام و امضا:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
-ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
-LowerDateEndPlannedShort=Lower planned end date of active services
-SendContractRef=Contract information __REF__
-OtherContracts=Other contracts
+NoExpiredServices=خدمات فعال منقضی شده وجود ندارد
+ListOfServicesToExpireWithDuration=فهرست خدماتی که در %s روز منقضی خواهند شد
+ListOfServicesToExpireWithDurationNeg=فهرست خدماتی که بیش از %s روز است که منقضی شده‌اند
+ListOfServicesToExpire=فهرست خدماتی که در حال انقضا هستن
+NoteListOfYourExpiredServices=این فهرست فقط شمامل خدماتی از قراردادهای مربوط به اشخاص سوم می‌شود که شما آنان را به عنوان نمایندۀ فروش پیوند کرده‌اید.
+StandardContractsTemplate=قالب قرارداد استاندارد
+ContactNameAndSignature=برای %s، نام و امضا:
+OnlyLinesWithTypeServiceAreUsed=تنها سطوری که از نوع "خدمات" هستند نسخه‌برداری خواهند شد.
+ConfirmCloneContract=آیا مطمئن هستید می‌خواهید قرارداد <b>%s</b> را نسخه‌برداری کنید؟
+LowerDateEndPlannedShort=حداقل تاریخ برنامه‌ریزی شدۀ پایان خدمات فعال
+SendContractRef=اطلاعات قرارداد ___REF___
+OtherContracts=قراردادهای دیگر
 ##### Types de contacts #####
-TypeContact_contrat_internal_SALESREPSIGN=نمایندگی فروش امضای قرارداد
-TypeContact_contrat_internal_SALESREPFOLL=نمایندگی فروش محصولات زیر را تا قرارداد
-TypeContact_contrat_external_BILLING=حسابداری ارتباط با مشتری
-TypeContact_contrat_external_CUSTOMER=پیگیری ارتباط با مشتری
-TypeContact_contrat_external_SALESREPSIGN=قرارداد امضای ارتباط با مشتری
+TypeContact_contrat_internal_SALESREPSIGN=قرارداد امضاشدۀ نمایندۀ فروش 
+TypeContact_contrat_internal_SALESREPFOLL=قرارداد امضاشدۀ پیگیری‌کنندۀ
+TypeContact_contrat_external_BILLING=طرف‌تماس حساب‌داری مشتری
+TypeContact_contrat_external_CUSTOMER=پیگیری‌کنندۀ حساب‌داری مشتری
+TypeContact_contrat_external_SALESREPSIGN=طرف‌تماس مشتری امضاکنندۀ قرارداد 
diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
index 9c1228d8628..0302013fc26 100644
--- a/htdocs/langs/fa_IR/cron.lang
+++ b/htdocs/langs/fa_IR/cron.lang
@@ -6,78 +6,78 @@ Permission23102 = ساخت/ویرایش  وظایف زمان‌بندی‌شده
 Permission23103 = حذف  وظایف زمان‌بندی‌شده
 Permission23104 = اجرای  وظایف زمان‌بندی‌شده
 # Admin
-CronSetup=برنامه ریزی راه اندازی مدیریت کار
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=و یا برای بررسی و راه اندازی یک کار خاص
-KeyForCronAccess=کلید امنیتی برای URL برای راه اندازی کارهای cron
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
-CronMethodDoesNotExists=Class %s does not contains any method %s
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronSetup=برپاسازی مدیریت وظایف زمان‌بندی‌شده
+URLToLaunchCronJobs=نشانی برای بررسی و اجرای وظایف‌زمان‌بندی‌شدۀ واجدشرایط 
+OrToLaunchASpecificJob=یا برای بررسی و اجرای یک وظیفۀ خاص
+KeyForCronAccess=کلیدامنیتی نشانی برای اجرای وظایف‌زمان‌بندی‌شده
+FileToLaunchCronJobs=خطفرمان برای بررسی و اجرای وظایف‌زمانی واجد شرایط
+CronExplainHowToRunUnix=در فضای لینوکس شما باید ورودی crontab زیر را استفاده کنید تا در هر 5 دقیقه فرمان اجرا شود
+CronExplainHowToRunWin=در فضای مایکروسافت ویندوز شما می‌توانید از ابزارهای وظایف زمان‌بندی شده استفاده کنید تا در هر 5 دقیقه دستور را اجرا کنید
+CronMethodDoesNotExists=کلاس %s دربردارندۀ هیچ متد %s نیست
+CronJobDefDesc=نمایه‌های وظایف زمانی‌بندی شده در فایل توضیح واحد مربوطه تعریف می‌شوند. در هنگامی که این واحد فعال شد، این فایل‌ها بارگذاری شده و در دسترس خواهند بود و در نتیجه شما می‌توانید واظیف را از فهرست ابزارهای مدیر %s مدیریت کنید.
+CronJobProfiles=نمایه‌های از پیش تعیین شدۀ وظایف‌زمان‌بندی‌شده
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=فعال‌شده و غیرفعال‌شده
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastOutput=آخرین خروجی پس از اجرا
+CronLastResult=آخرین کد نتیجه
 CronCommand=فرمان
-CronList=شغل برنامه ریزی
-CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
-CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
-CronTask=کار
-CronNone=هیچ یک
-CronDtStart=Not before
-CronDtEnd=Not after
-CronDtNextLaunch=اعدام بعدی
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
-CronFrequency=فرکانس
-CronClass=Class
-CronMethod=روش
+CronList=وظایف برنامه‌ریزی‌شده
+CronDelete=حذف وظایف‌برنامه‌ریزی‌شده
+CronConfirmDelete=آیا مطمئن هستید می‌خواهید این وظایف‌برنامه‌ریزی‌شده را حذف کنید؟
+CronExecute=اجرای وظیفۀ برنامه‌ریزی‌شده
+CronConfirmExecute=آیا مطمئن هستید می‌خواهید اکنون این وظیفۀ برنامه‌ریزی شده را اجرا کنید؟
+CronInfo=واحد وظایف‌برنامه‌ریزی‌شده  به شما امکان اجرای خودکار و زمان‌بندی‌شدۀ وظایف را می‌دهد. این وظایف همچنین امکان اجرای دلخواه دستی نیز دارند.
+CronTask=وظیفه
+CronNone=هیچ
+CronDtStart=قبل نیست
+CronDtEnd=بعد نیست
+CronDtNextLaunch=اجرای بعدی
+CronDtLastLaunch=تاریخ شروع آخرین اجرا
+CronDtLastResult=تاریخ پایان آخرین اجرا
+CronFrequency=بسآمد
+CronClass=کلاس
+CronMethod=متد
 CronModule=واحد
-CronNoJobs=بدون شغل ثبت نام
+CronNoJobs=هیچ وظیفه‌ای ثبت نشده
 CronPriority=اولویت
 CronLabel=برچسب
-CronNbRun=No. launches
-CronMaxRun=Maximum number of launches
+CronNbRun=تعداد اجراها
+CronMaxRun=حداکثر تعداد اجراها
 CronEach=هر
-JobFinished=کار راه اندازی به پایان رسید و
+JobFinished=وظیفه اجرا شده و به سرانجام رسید
 #Page card
-CronAdd= اضافه کردن شغل
-CronEvery=Execute job each
-CronObject=به عنوان مثال / شی برای ایجاد
-CronArgs=پارامترها
-CronSaveSucess=Save successfully
+CronAdd= اضافه‌کردن وظیفه
+CronEvery=اجرای وظیفه در هر
+CronObject=نمونه/شیء برای ساخت
+CronArgs=مؤلفه‌ها
+CronSaveSucess=ذخیره با موفقیت
 CronNote=توضیح
-CronFieldMandatory=زمینه های از٪ s الزامی است
-CronErrEndDateStartDt=تاریخ پایان نمی تواند قبل از تاریخ شروع می شود
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=قادر ساختن
-CronStatusInactiveBtn=از کار انداختن
-CronTaskInactive=این کار غیر فعال است
-CronId=شناسایی
-CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-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=خط فرمان سیستم را اجرا کند.
-CronCreateJob=Create new Scheduled Job
+CronFieldMandatory=بخش %s الزامی است
+CronErrEndDateStartDt=تاریخ پایان نمی‌تواند قبل از تاریخ شروع باشد
+StatusAtInstall=وضعیت نصب واحد
+CronStatusActiveBtn=فعال‌کردن
+CronStatusInactiveBtn=غیرفعال‌کردن
+CronTaskInactive=این وظیفه غیرفعال است
+CronId=شناسه
+CronClassFile=نام‌فایل حاوی کلاس
+CronModuleHelp=نام فهرست واحدهای Dolibarr (که همچنین با یک واحد خارجی Dolibarr نیز کار می‌کند). <BR> برای مثال برای فراخوان متد fetch از شیء محصولات Dolibarr از /htdocs/<u>product</u>/class/product.class.php استفاده می‌شود، مقدار واحد برابر است با <br><i>product</i>
+CronClassFileHelp=مسیر نسبی و نام فایل برای بارگذاری (مسیر به ریشۀ سرور وب نسبی است).<BR> برای مثال برای فراخوان متند fetch از شیء محصول Dolibarr از htdocs/product/class/<u>product.class.php</u>  استفاده می‌شود، مقدار مربوط به نام فایل کلاس برابر است با: <br><i> product/class/product.class.php </i>
+CronObjectHelp=نام شیء برای بارگذاری. <BR>برای مثال برای فراخوان متد fetch از شیء محصول Dolibarr از /htdocs/product/class/product.class.php استفاده شده، مقدار برای نام فایل کلاس برابر است با <br><i>Product</i>
+CronMethodHelp=نام شیء برای بارگذاری. <BR> برای مثال برای فراخوان متد fetch از شیء محصول Dolibarr از /htdocs/product/class/product.class.php استفاده شده، مقدار برای نام فایل کلاس برابر است با <br><i>fetch</i>
+CronArgsHelp=نشان‌وندهای-آرگومان‌های متد. <BR> برای مثال برای فراخوان یک متد از شیء محصولات Dolibarr از  /htdocs/product/class/product.class.php استفاده می‌شوند، مقادیر برای مؤلفه‌ها-پارامترها می‌تواند به شکل <br><i>0, ProductRef</i> باشد
+CronCommandHelp=خط‌فرمان سامان برای اجرا
+CronCreateJob=ساخت یک وظیفۀ برنامه ریزی شدۀ جدید
 CronFrom=از
 # Info
 # Common
-CronType=Job type
-CronType_method=Call method of a PHP Class
+CronType=نوع وظیفه
+CronType_method=روش-متد فراخوان یک کلاس PHP
 CronType_command=فرمان شل
-CronCannotLoadClass=Cannot load class file %s (to use class %s)
-CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
-JobDisabled=Job disabled
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+CronCannotLoadClass=امکان بارگذاری فایل کلاس %s (برای بارگذاری کلاس %s)
+CronCannotLoadObject=فایل کلاس %s بارگذاری شد، اما شیء %s درون آن پیدا نشد
+UseMenuModuleToolsToAddCronJobs=به فهرست "خانه-ابزارهای مدیر-وظایف زمان‌بندی شده" رفته تا این وظایف را مشاهده کرده یا ویرایش کنید.
+JobDisabled=وظیفه غیرفعال است
+MakeLocalDatabaseDumpShort=پشتیبان‌گیری از پایگاه داده محلی
+MakeLocalDatabaseDump=نسخه‌برداری-dump از پایگاه دادۀ محلی. مؤلفه‌های مربوطه از قرار: فشرده‌سازی ('gz'  یا 'bz' یا 'none')، نوع پشتیبان‌گیری  ('mysql', 'pgsql', 'auto'), 1, 'auto' یا نام فایلی که ساخته می‌شود, تعداد فایل‌هائی که نگه‌داری می‌شود است
+WarningCronDelayed=توجه، برای مقاصد بهینه‌سازی، زمان اجرای بعدی وظایف فعال، وظایف شما ممکن است حداکثر %s ساعت قبل از اجرا تاخیر داشته  باشد.
diff --git a/htdocs/langs/fa_IR/deliveries.lang b/htdocs/langs/fa_IR/deliveries.lang
index 6b4d4a9de1a..6d89bd47748 100644
--- a/htdocs/langs/fa_IR/deliveries.lang
+++ b/htdocs/langs/fa_IR/deliveries.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=تحویل
-DeliveryRef=Ref Delivery
-DeliveryCard=Receipt card
+DeliveryRef=ش.ارجاع تحویل
+DeliveryCard=کارت رسید
 DeliveryOrder=منظور تحویل
 DeliveryDate=تاریخ تحویل
-CreateDeliveryOrder=Generate delivery receipt
-DeliveryStateSaved=Delivery state saved
+CreateDeliveryOrder=تولید رسید تحویل
+DeliveryStateSaved=وضعیت تحویل ذخیره شد
 SetDeliveryDate=تنظیم تاریخ حمل و نقل
 ValidateDeliveryReceipt=اعتبارسنجی رسید تحویل
-ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
+ValidateDeliveryReceiptConfirm=آیا مطمئن هستید می‌خواهید این رسید تحویل را تائید کنید؟
 DeleteDeliveryReceipt=حذف رسید تحویل
-DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
+DeleteDeliveryReceiptConfirm=آیا مطمئن هستید می‌خواهید رسیدتحویل <b>%s</b> را حذف کنید؟
 DeliveryMethod=روش تحویل
 TrackingNumber=تعداد پیگیری
 DeliveryNotValidated=تحویل اعتبار نیست
@@ -18,14 +18,14 @@ StatusDeliveryCanceled=لغو شد
 StatusDeliveryDraft=پیش نویس
 StatusDeliveryValidated=رسیده
 # merou PDF model
-NameAndSignature=Name and Signature:
+NameAndSignature=نام و امضا:
 ToAndDate=To___________________________________ در ____ / ____ / __________
 GoodStatusDeclaration=محصولات فوق در شرایط خوبی دریافت کرده اند،
-Deliverer=Deliverer:
+Deliverer=تحویل دهنده:
 Sender=فرستنده
 Recipient=دریافت کننده
 ErrorStockIsNotEnough=این سهام به اندازه کافی وجود ندارد
 Shippable=حمل و نقلی
 NonShippable=حمل و نقلی نیست
-ShowReceiving=Show delivery receipt
-NonExistentOrder=Nonexistent order
+ShowReceiving=نمایش رسید تحویل
+NonExistentOrder=سفارش ناقص
diff --git a/htdocs/langs/fa_IR/dict.lang b/htdocs/langs/fa_IR/dict.lang
index f4871759ee8..64c28335fff 100644
--- a/htdocs/langs/fa_IR/dict.lang
+++ b/htdocs/langs/fa_IR/dict.lang
@@ -116,10 +116,10 @@ CountryHM=جزیره هرد و مک دونالد
 CountryVA=مقدس (شهر واتیکان)
 CountryHN=هندوراس
 CountryHK=هنگ کنگ
-CountryIS=Iceland
+CountryIS=ایسلند
 CountryIN=هندوستان
 CountryID=اندونزی
-CountryIR=ایران
+CountryIR=جمهوری اسلامی ایران
 CountryIQ=عراق
 CountryIL=اسرائيل
 CountryJM=جامائیکا
@@ -131,7 +131,7 @@ CountryKI=کیریباتی
 CountryKP=کره شمالی
 CountryKR=کره جنوبی
 CountryKW=کویت
-CountryKG=Kyrgyzstan
+CountryKG=قرقیزستان
 CountryLA=لائوس
 CountryLV=لتونی
 CountryLB=لبنان
@@ -139,7 +139,7 @@ CountryLS=لسوتو
 CountryLR=کشور لیبریا
 CountryLY=اهل لیبی
 CountryLI=لیختن اشتاین
-CountryLT=Lithuania
+CountryLT=لیتوانی
 CountryLU=لوکزامبورگ
 CountryMO=ماکائو
 CountryMK=مقدونیه، یوگسلاوی سابق
@@ -160,7 +160,7 @@ CountryMD=مولدووا
 CountryMN=مغولستان
 CountryMS=Monserrat از
 CountryMZ=موزامبیک
-CountryMM=Myanmar (Burma)
+CountryMM=میانمار (بورما)
 CountryNA=نامیبیا
 CountryNR=نائورو
 CountryNP=نپال
@@ -223,7 +223,7 @@ CountryTO=تونگا
 CountryTT=ترینیداد و توباگو
 CountryTR=بوقلمون
 CountryTM=ترکمنستان
-CountryTC=Turks and Caicos Islands
+CountryTC=جزایر ترکس و کایکوز
 CountryTV=تووالو
 CountryUG=اوگاندا
 CountryUA=اوکراین است
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=روپیه موریس
 CurrencySingMUR=روپیه موریس
 CurrencyNOK=krones نروژی
-CurrencySingNOK=Norwegian kronas
+CurrencySingNOK=کرون نروژ
 CurrencyTND=دینار تونس
 CurrencySingTND=دینار تونس
 CurrencyUSD=دلار آمریکا
@@ -290,10 +290,10 @@ CurrencyXOF=CFA BCEAO فرانک
 CurrencySingXOF=فرانک CFA BCEAO
 CurrencyXPF=فرانک CFP
 CurrencySingXPF=CFP فرانک
-CurrencyCentEUR=cents
+CurrencyCentEUR=سنت
 CurrencyCentSingEUR=در صد
-CurrencyCentINR=paisa
-CurrencyCentSingINR=paise
+CurrencyCentINR=پیس
+CurrencyCentSingINR=پیس
 CurrencyThousandthSingTND=هزارم
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=اینترنت
@@ -307,7 +307,7 @@ DemandReasonTypeSRC_WOM=دهان به دهان
 DemandReasonTypeSRC_PARTNER=شریک
 DemandReasonTypeSRC_EMPLOYEE=کارمند
 DemandReasonTypeSRC_SPONSORING=ضمانت
-DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+DemandReasonTypeSRC_SRC_CUSTOMER=طرف‌تماس مراجعۀکننده از سوی مشتری
 #### Paper formats ####
 PaperFormatEU4A0=نوع 4A0
 PaperFormatEU2A0=نوع 2A0
@@ -329,9 +329,9 @@ PaperFormatCAP4=نوع P4 کانادا
 PaperFormatCAP5=نوع P5 کانادا
 PaperFormatCAP6=نوع P6 کانادا
 #### Expense report categories ####
-ExpAutoCat=Car
-ExpCycloCat=Moped
-ExpMotoCat=Motorbike
+ExpAutoCat=خودرو
+ExpCycloCat=موتورپدالی
+ExpMotoCat=موتورسیکلت
 ExpAuto3CV=3 CV
 ExpAuto4CV=4 CV
 ExpAuto5CV=5 CV
@@ -342,18 +342,18 @@ ExpAuto9CV=9 CV
 ExpAuto10CV=10 CV
 ExpAuto11CV=11 CV
 ExpAuto12CV=12 CV
-ExpAuto3PCV=3 CV and more
-ExpAuto4PCV=4 CV and more
-ExpAuto5PCV=5 CV and more
-ExpAuto6PCV=6 CV and more
-ExpAuto7PCV=7 CV and more
-ExpAuto8PCV=8 CV and more
-ExpAuto9PCV=9 CV and more
-ExpAuto10PCV=10 CV and more
-ExpAuto11PCV=11 CV and more
-ExpAuto12PCV=12 CV and more
-ExpAuto13PCV=13 CV and more
-ExpCyclo=Capacity lower to 50cm3
-ExpMoto12CV=Motorbike 1 or 2 CV
-ExpMoto345CV=Motorbike 3, 4 or 5 CV
-ExpMoto5PCV=Motorbike 5 CV and more
+ExpAuto3PCV=3 CV و بیشتر
+ExpAuto4PCV=4 CV و بیشتر
+ExpAuto5PCV=5 CV و بیشتر
+ExpAuto6PCV=6 CV و بیشتر
+ExpAuto7PCV=7 CV و بیشتر
+ExpAuto8PCV=8 CV و بیشتر
+ExpAuto9PCV=9 CV و بیشتر
+ExpAuto10PCV=10 CV و بیشتر
+ExpAuto11PCV=11 CV و بیشتر
+ExpAuto12PCV=12 CV و بیشتر
+ExpAuto13PCV=13 CV و بیشتر
+ExpCyclo=گنجایش کم‌تر از 50 سانتیمتر 3 - منظور سانتیمتر مربع است
+ExpMoto12CV=موتورسیکلت 1 یا 2 CV
+ExpMoto345CV=موتورسیکل 3، 4 یا 5 CV
+ExpMoto5PCV=موتورسیکلت 5 CV یا بیشتر
diff --git a/htdocs/langs/fa_IR/donations.lang b/htdocs/langs/fa_IR/donations.lang
index 281139314d5..9f15e4ae3b2 100644
--- a/htdocs/langs/fa_IR/donations.lang
+++ b/htdocs/langs/fa_IR/donations.lang
@@ -1,34 +1,34 @@
 # Dolibarr language file - Source file is en_US - donations
-Donation=اهداء
-Donations=کمک های مالی
-DonationRef=کد عکس کمک مالی.
-Donor=دهنده
-AddDonation=Create a donation
-NewDonation=کمک مالی جدید
-DeleteADonation=Delete a donation
-ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=نمایش کمک مالی
-PublicDonation=کمک مالی عمومی
-DonationsArea=منطقه کمک مالی
-DonationStatusPromiseNotValidated=پیش نویس وعده
-DonationStatusPromiseValidated=وعده اعتبار
-DonationStatusPaid=کمک مالی دریافت کرد
-DonationStatusPromiseNotValidatedShort=پیش نویس
-DonationStatusPromiseValidatedShort=اعتبار
-DonationStatusPaidShort=رسیده
-DonationTitle=دریافت کمک مالی
+Donation=کمک‌مالی
+Donations=کمک‌های مالی
+DonationRef=ش.ارجاع کمک مالی
+Donor=پردازنده
+AddDonation=ایجاد یک عنوان کمک‌مالی
+NewDonation=کمک‌مالی جدید
+DeleteADonation=حذف یک کمک‌مالی
+ConfirmDeleteADonation=آیا مطمئن هستید می‌خواهید این کمک مالی را حذف کنید؟
+ShowDonation=نمایش کمک‌مالی
+PublicDonation=کمک‌مالی علنی
+DonationsArea=بخش کمک‌های مالی
+DonationStatusPromiseNotValidated=پیش‌نویس وعده
+DonationStatusPromiseValidated=وعدۀ معتبر
+DonationStatusPaid=کمک‌مالی دریافت شد
+DonationStatusPromiseNotValidatedShort=پیش‌نویس
+DonationStatusPromiseValidatedShort=معتبر شد
+DonationStatusPaidShort=دریافت شد
+DonationTitle=رسید کمک‌مالی
 DonationDatePayment=تاریخ پرداخت
-ValidPromess=اعتبار قول
-DonationReceipt=دریافت کمک مالی
-DonationsModels=اسناد مدل برای رسید کمک مالی
-LastModifiedDonations=آخرین %s کمک تغییریافته
-DonationRecipient=دریافت کننده کمک مالی
-IConfirmDonationReception=گیرنده اعلام پذیرش، به عنوان یک کمک مالی، از مقدار زیر
-MinimumAmount=Minimum amount is  %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
-DonationPayment=Donation payment
-DonationValidated=Donation %s validated
+ValidPromess=تائید وعده
+DonationReceipt=رسید کمک‌مالی
+DonationsModels=نمونه سند برای رسید کمک‌مالی
+LastModifiedDonations=آخرین %s کمک‌مالی ویرایش شده
+DonationRecipient=دریافت‌کنندۀ کمک‌مالی
+IConfirmDonationReception=دریافت کننده به معنای دریافت به‌شکل یک کمک مالی به صورت مبلغ ذیل است
+MinimumAmount=حداقل مبلغ برابر %s
+FreeTextOnDonations=متن درج شده در انتها
+FrenchOptions=گزینه‌های مربوط به فرانسه
+DONATION_ART200=نمایش مادۀ 200 از CGI در صورتی که مایلید
+DONATION_ART238=نمایش مادۀ 238 از CGI در صورتی که مایلید
+DONATION_ART885=نمایش مادۀ 885از CGI در صورتی که مایلید
+DonationPayment=پرداخت کمک‌مالی
+DonationValidated=کمک‌مالی %s تائید شد
diff --git a/htdocs/langs/fa_IR/ecm.lang b/htdocs/langs/fa_IR/ecm.lang
index ea1d45d22e0..d4994b3b7e7 100644
--- a/htdocs/langs/fa_IR/ecm.lang
+++ b/htdocs/langs/fa_IR/ecm.lang
@@ -1,52 +1,52 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=No. of documents in directory
-ECMSection=دایرکتوری
-ECMSectionManual=دایرکتوری دستی
-ECMSectionAuto=دایرکتوری ها به صورت خودکار
+ECMNbOfDocs=تعداد سندهای موجود در این پوشه
+ECMSection=پوشه
+ECMSectionManual=پوشۀ دستی
+ECMSectionAuto=پوشۀ خودکار
 ECMSectionsManual=درخت دستی
-ECMSectionsAuto=درخت ها به صورت خودکار
-ECMSections=راهنماها
-ECMRoot=ECM Root
-ECMNewSection=دایرکتوری جدید
-ECMAddSection=اضافه کردن دایرکتوری
+ECMSectionsAuto=درخت خودکار
+ECMSections=پوشه‌ه
+ECMRoot=ریشۀ ECM
+ECMNewSection=پوشۀ جدید
+ECMAddSection=ایجاد پوشه
 ECMCreationDate=تاریخ ایجاد
-ECMNbOfFilesInDir=تعداد فایل ها در دایرکتوری
-ECMNbOfSubDir=تعداد زیر دایرکتوری ها
-ECMNbOfFilesInSubDir=تعداد فایل ها در زیر دایرکتوری ها
-ECMCreationUser=خالق
-ECMArea=DMS/ECM area
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
-ECMAreaDesc2=* دایرکتوری ها به صورت خودکار به طور خودکار در هنگام اضافه کردن اسناد از کارت یک عنصر پر شده است. <br> * دایرکتوری دستی می توان برای ذخیره اسناد به یک عنصر خاصی پیوند ندارد.
-ECMSectionWasRemoved=<b>شاخه٪ s</b> حذف شده است.
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
-ECMSearchByKeywords=جستجو با کلمات کلیدی
-ECMSearchByEntity=جستجو توسط شی
-ECMSectionOfDocuments=راهنماها اسناد
-ECMTypeAuto=اتوماتیک
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=اسناد مربوط به اشخاص ثالث
-ECMDocsByProposals=اسناد مربوط به طرح
-ECMDocsByOrders=اسناد مربوط به سفارشات مشتریان
-ECMDocsByContracts=اسناد مربوط به قرارداد
-ECMDocsByInvoices=اسناد مربوط به صورت حساب مشتریان
-ECMDocsByProducts=اسناد مرتبط به محصولات
-ECMDocsByProjects=اسناد مربوط به پروژه
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
-ECMNoDirectoryYet=بدون دایرکتوری ایجاد شده
-ShowECMSection=نمایش دایرکتوری
-DeleteSection=حذف دایرکتوری
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
-ECMDirectoryForFiles=دایرکتوری نسبی برای فایل ها
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
-ECMFileManager=مدیریت فایل ها
-ECMSelectASection=Select a directory in the tree...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
-ReSyncListOfDir=Resync list of directories
-HashOfFileContent=Hash of file content
-NoDirectoriesFound=No directories found
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ECMNbOfFilesInDir=تعداد فایل‌های این پوشه
+ECMNbOfSubDir=تعداد زیرپوشه‌ه
+ECMNbOfFilesInSubDir=تعداد فایل‌های زیرپوشه‌ها
+ECMCreationUser=سازنده
+ECMArea=بخش مدیریت مستندات/محتواها
+ECMAreaDesc=بخش مدیریت مستندات/محتوا (سامانۀ مدیریت مستندات / مدیریت محتوای الکترونیک) به شما امکان ذخیره، اشتراک‌گذاری و جستجوی سریع هر سندی در Dolibarr را می‌دهد.
+ECMAreaDesc2=* پوشه‌های خودکار در هنگام افزودن سندهای مربوط به یک کارت موارد مختلف ایجاد و پر می‌شوند.<br>* پوشه‌های دستی، برای ذخیرۀ سندهائی که به هیچ موردی متصل نیستند قابل استفاده هستند.
+ECMSectionWasRemoved=پوشۀ <b>%s</b> حذف شد.
+ECMSectionWasCreated=پوشۀ <b>%s</b> ساخته شد.
+ECMSearchByKeywords=جستجو با کلمات‌کلیدی
+ECMSearchByEntity=جستجوی اشیاء
+ECMSectionOfDocuments=پوشه‌های سند
+ECMTypeAuto=خودکار
+ECMDocsBySocialContributions=اسناد مربوط به مالیات‌های ساختاری/اجتماعی
+ECMDocsByThirdParties=اسناد مربوط به شخص‌سوم‌ها
+ECMDocsByProposals=اسناد مربوط به پیشنهادها
+ECMDocsByOrders=اسناد مربوط به سفار مشتریان
+ECMDocsByContracts=اسناد مربوط به قراردادها
+ECMDocsByInvoices=اسناد مربوط به صورت‌حساب مشتریان
+ECMDocsByProducts=اسناد مربوط به محصولات
+ECMDocsByProjects=اسناد مربوط به طرح‌ه
+ECMDocsByUsers=اسناد مربوط به کاربران
+ECMDocsByInterventions=اسناد مربوط به پادرمیانی‌ها
+ECMDocsByExpenseReports=اسناد مربوط به گزارش‌های هزینه
+ECMDocsByHolidays=اسناد مربوط به روزهای تعطیل
+ECMDocsBySupplierProposals=اسناد مربوط به پیشنهادهای فروشندگان
+ECMNoDirectoryYet=پوشه‌ای ساخته نشد
+ShowECMSection=نمایش پوشه
+DeleteSection=حذف پوشه
+ConfirmDeleteSection=مطمئن هستید می‌خواهید این پوشۀ <b>%s</b> را حذف کنید؟
+ECMDirectoryForFiles=پوشۀ مربوط به فایل‌ها
+CannotRemoveDirectoryContainsFilesOrDirs=حذف پوشه ممکن نیست زیرا درون خود فایل و زیرپوشه دارد
+CannotRemoveDirectoryContainsFiles=حذف پوشه ممکن نیست چون داخل آن فایل وجود دارد
+ECMFileManager=مدیریت فایل‌ها
+ECMSelectASection=یک پوشه در ساختاردرختی انتخاب کندی
+DirNotSynchronizedSyncFirst=به نظر می‌رسد این پوشه در خارج از واحد مدیریت محتوای سازمانی ساخته شده است. شما باید کلید "بازهمگامی" را کلیک کلیک کنید تا پایگاه‌داده و حافظه را همگام‌سازی نمایید و محتوای پوشه را دریافت نمائید.
+ReSyncListOfDir=بازهمگامی فهرست پوشه‌ها
+HashOfFileContent=هاشور محتوای فایل
+NoDirectoriesFound=پوشه‌ای پیدا نشد
+FileNotYetIndexedInDatabase=فایل‌ها در پایگاه داده فهرست‌ نشده‌اند (تلاش کنید دوباره بالاگذاری کنید)
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index ec7bfb2cd1f..dd314e4657f 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -1,243 +1,244 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=بدون خطا، ما متعهد
+NoErrorCommitIsDone=خطائی نیست، حرکت می‌کنیم
 # Errors
-ErrorButCommitIsDone=خطاهای یافت اما ما با وجود این اعتبار
-ErrorBadEMail=Email %s is wrong
-ErrorBadUrl=آدرس٪ s در اشتباه است
-ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorLoginAlreadyExists=ورود به٪ s در حال حاضر وجود دارد.
-ErrorGroupAlreadyExists=گروه٪ s در حال حاضر وجود دارد.
-ErrorRecordNotFound=صفحه موجود نیست.
-ErrorFailToCopyFile=برای کپی کردن پرونده <b>«٪ s 'به'٪ s»</b> شکست خورد.
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToRenameFile=برای تغییر نام فایل <b>'٪ s'</b> را به <b>'٪ s</b> »شکست خورد.
-ErrorFailToDeleteFile=حذف پرونده <b>«٪ s»</b> شکست خورد.
-ErrorFailToCreateFile=برای ایجاد پرونده <b>«٪ s»</b> شکست خورد.
-ErrorFailToRenameDir=برای تغییر نام دایرکتوری <b>'٪ s'</b> را به <b>'٪ s</b> »شکست خورد.
-ErrorFailToCreateDir=برای ایجاد دایرکتوری <b>'٪ s</b> »شکست خورد.
-ErrorFailToDeleteDir=دایرکتوری <b>'٪ s' به</b> حذف انجام نشد.
-ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
-ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
-ErrorThisContactIsAlreadyDefinedAsThisType=این تماس در حال حاضر به عنوان تماس برای این نوع تعریف شده است.
-ErrorCashAccountAcceptsOnlyCashMoney=این حساب بانکی یک حساب نقدی، پس از آن پرداخت و تنها نوع پول نقد را می پذیرد.
-ErrorFromToAccountsMustDiffers=منبع و اهداف حساب های بانکی باید متفاوت باشد.
-ErrorBadThirdPartyName=Bad value for third-party name
-ErrorProdIdIsMandatory=٪ بازدید کنندگان الزامی است
-ErrorBadCustomerCodeSyntax=نحو بد برای کد مشتری
-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.
-ErrorCustomerCodeRequired=کد مشتریان مورد نیاز
-ErrorBarCodeRequired=Barcode required
-ErrorCustomerCodeAlreadyUsed=کد مشتری در حال حاضر استفاده می شود
-ErrorBarCodeAlreadyUsed=Barcode already used
-ErrorPrefixRequired=پیشوند مورد نیاز
-ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
-ErrorSupplierCodeRequired=Vendor code required
-ErrorSupplierCodeAlreadyUsed=Vendor code already used
-ErrorBadParameters=پارامترهای بد
-ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
-ErrorBadDateFormat=مقدار «٪ s 'است قالب تاریخ اشتباه
-ErrorWrongDate=تاریخ صحیح نمی باشد!
-ErrorFailedToWriteInDir=برای نوشتن در پوشه٪ s شکست خورد
-ErrorFoundBadEmailInFile=یافت نحو ایمیل نادرست برای٪ s خط در فایل (به عنوان مثال خط٪ با ایمیل =٪ بازدید کنندگان)
-ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=برخی از زمینه های مورد نیاز است نه شد.
-ErrorSubjectIsRequired=The email topic is required
-ErrorFailedToCreateDir=برای ایجاد یک دایرکتوری شکست خورده است. بررسی کنید که کاربر وب سرور دارای مجوز به ارسال به Dolibarr دایرکتوری اسناد. اگر <b>safe_mode</b> پارامتر در این PHP را فعال کنید، بررسی کنید که فایل های پی اچ پی Dolibarr صاحب به کاربر وب سرور (یا گروه).
-ErrorNoMailDefinedForThisUser=بدون پست تعریف شده برای این کاربر
-ErrorFeatureNeedJavascript=این قابلیت نیاز به جاوا اسکریپت را فعال شود به کار می کنند. تغییر این در نصب - صفحه نمایش.
-ErrorTopMenuMustHaveAParentWithId0=منو از نوع "بالا" می توانید یک منو پدر و مادر ندارد. 0 قرار دهید و در منو پدر و مادر و یا یک منو از نوع "چپ" را انتخاب کنید.
-ErrorLeftMenuMustHaveAParentId=منو از نوع "چپ" باید یک شناسه (شماره) پدر و مادر داشته باشد.
-ErrorFileNotFound=<b>پرونده٪ s</b> (مسیر نادرست، مجوز اشتباه و یا دسترسی های openbasedir PHP و یا پارامتر safe_mode) یافت نشد
-ErrorDirNotFound=<b>شاخه٪ s</b> (مسیر نادرست، مجوز اشتباه و یا دسترسی های openbasedir PHP و یا پارامتر safe_mode) یافت نشد
-ErrorFunctionNotAvailableInPHP=<b>تابع٪ برای</b> این ویژگی لازم است اما در دسترس در این نسخه / راه اندازی PHP نیست.
-ErrorDirAlreadyExists=یک دایرکتوری با این نام وجود دارد.
-ErrorFileAlreadyExists=یک فایل با این نام وجود دارد.
-ErrorPartialFile=فایل های سرور به طور کامل دریافت نکرده اند.
-ErrorNoTmpDir=موقت directy٪ s را می کند وجود ندارد.
-ErrorUploadBlockedByAddon=بارگذاری مسدود شده توسط یک پلاگین PHP / آپاچی.
-ErrorFileSizeTooLarge=حجم فایل بیش از حد بزرگ است.
-ErrorSizeTooLongForIntType=حجم بیش از حد طولانی برای نوع int (٪ s را حداکثر رقم)
-ErrorSizeTooLongForVarcharType=حجم بیش از حد طولانی برای نوع رشته (از٪ s کاراکتر حداکثر)
-ErrorNoValueForSelectType=لطفا ارزش برای انتخاب لیست را پر کنید
-ErrorNoValueForCheckBoxType=لطفا ارزش برای استخراج را پر کنید
-ErrorNoValueForRadioType=لطفا ارزش برای فهرست های رادیویی را پر کنید
-ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
-ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
-ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
-ErrorNoAccountancyModuleLoaded=بدون ماژول حسابداری فعال
-ErrorExportDuplicateProfil=این نام مشخصات در حال حاضر برای این مجموعه صادرات وجود دارد.
+ErrorButCommitIsDone=علیرغم وجود خطا، تائید می‌شود
+ErrorBadEMail=رایانامۀ %s غلط است
+ErrorBadUrl=نشانی‌اینترنتی %s اشتباه است
+ErrorBadValueForParamNotAString=برای مؤلفۀ موردنظر مقدار خطائی وارد شده است. عموما در هنگام فقدان ترجمه، الحاق می‌شود.
+ErrorLoginAlreadyExists=نام‌کاربری %s قبلا وجود داشته است.
+ErrorGroupAlreadyExists=گروه %s قبلا وجود داشته است.
+ErrorRecordNotFound=ردیف موجود نیست.
+ErrorFailToCopyFile=نسخه‌برداری از فایل '<b>%s</b>' به '<b>%s</b>' موفق نبود.
+ErrorFailToCopyDir=نسخه‌برداری از پوشۀ '<b>%s</b>' به '<b>%s</b>' موفق نبود.
+ErrorFailToRenameFile=تغییر نام فایل '<b>%s</b>' به '<b>%s</b>' موفق نبود.
+ErrorFailToDeleteFile=حذف فایل '<b>%s</b>' موفقیت‌آمیز نبود.
+ErrorFailToCreateFile=ساخت فایل '<b>%s</b>' موفقیت‌آمیز نبود
+ErrorFailToRenameDir=تغییر نام پوشۀ '<b>%s</b>' به '<b>%s</b>' موفق نبود.
+ErrorFailToCreateDir=ایجاد پوشۀ '<b>%s</b>' ممکن نبود.
+ErrorFailToDeleteDir=حذف پوشۀ '<b>%s</b>' ممکن نبود.
+ErrorFailToMakeReplacementInto=ایجاد جایگزین برای فایل '<b>%s</b>' مقدور نبود.
+ErrorFailToGenerateFile=تولید فایل '<b>%s</b>' مقدور نبود.
+ErrorThisContactIsAlreadyDefinedAsThisType=این طرف‌تماس قبلا به‌عنوان یک طرف‌تماس از همین نوع تعریف شده است.
+ErrorCashAccountAcceptsOnlyCashMoney=این حساب‌بانکی نقدی است و تنها پرداخت‌های نقدی را می‌پذیرد.
+ErrorFromToAccountsMustDiffers=مبدأ و مقصد حساب‌های بانکی باید متفاوت باشد.
+ErrorBadThirdPartyName=مقدار غیرقابل‌قبول برای نام شخص‌سوم
+ErrorProdIdIsMandatory=بخش %s الزامی است
+ErrorBadCustomerCodeSyntax=روش‌درج برای کدمشتری اشتباه است
+ErrorBadBarCodeSyntax=روش درج بارکد اشتباه است. ممکناست یک نوع بارکد اشتباه تنظیم کرده باشید یا یک پوشش-ماسک بارکد برای عددهی انتخاب کرده‌اید که با مقدار اسکن شده همخوان نیست.
+ErrorCustomerCodeRequired=کدمشتری الزامی است
+ErrorBarCodeRequired=بارکد الزامی است
+ErrorCustomerCodeAlreadyUsed=کدمشتری قبلا استفاده شده است
+ErrorBarCodeAlreadyUsed=بارکد قبلا استفاده شده است
+ErrorPrefixRequired=پیش‌وند الزامی است
+ErrorBadSupplierCodeSyntax=کد فروشنده اشتباه درج شده است
+ErrorSupplierCodeRequired=کدفروشنده الزامی است
+ErrorSupplierCodeAlreadyUsed=کدفروشنده قبلا استفاده شده است
+ErrorBadParameters=مقادیر اشتباه
+ErrorBadValueForParameter=مقدار غلط '%s' برای مؤلفۀ '%s'
+ErrorBadImageFormat=حالت فایل تصویری قابل قبول نیست (PHP نصب شدۀ شما از توابعی که فایل را از این حالت تبدیل کنند، در خود ندارد)
+ErrorBadDateFormat=روش درج تاریخ مقدار '%s' اشتباه است
+ErrorWrongDate=تاریخ، صحیح نمی‌باشد!
+ErrorFailedToWriteInDir=امکان نوشتن در پوشۀ %s وجود ندارد
+ErrorFoundBadEmailInFile=برای %s سطر در فایل روش‌اشتباه درج رایانامه پیدا شد (مثلا سطر %s با email=%s)
+ErrorUserCannotBeDelete=امکان حذف کاربر وجود ندارد. ممکن است با سایر اجزای Dolibarr در ارتباط باشد.
+ErrorFieldsRequired=برخی از بخش‌های الزامی، پر نشده‌اند.
+ErrorSubjectIsRequired=موضوع رایانامه الزامی است.
+ErrorFailedToCreateDir=ایجاد یک پوشه با شکست مواجه شد. بررسی کنید، کاربر سرور وب، دارای مجوزهای نوشتاری بر روی پوشۀ documents مربوط به Dolibarr باشد در صورتی که مؤلفۀ <b>safe_mode</b> روی این نسخه از PHP فعال باشد، بررسی کنید فایل‌های PHP مربوط به Dolibarr متعلق به کاربر سرور وب (یا گروه مربوطه) باشد.
+ErrorNoMailDefinedForThisUser=نشانی رایانامه برای این کاربر تعریف نشده است
+ErrorFeatureNeedJavascript=این قابلیت برای کار کردن نیاز به فعال بودن جاوااسکریپت دارد. این گزینه را در بخش برپاسازی-نمایش فعال کنید.
+ErrorTopMenuMustHaveAParentWithId0=فهرست‌هائی از نوع "بالا" می‌توانند دارای فهرست مادر باشند. برای این‌که فهرست "کنار" داشته باشید، عدد 0 را وارد کنید.
+ErrorLeftMenuMustHaveAParentId=فهرست‌های "کنار" باید یک شناسۀ مادر داشته باشند
+ErrorFileNotFound=فایل <b>%s</b> یافت نشد. (مسیر نادرست، مجوزهای اشتباه یا دسترسی بسته  توسط مؤلفه‌های openbasedir یا safe_mode می‌تواند عامل باشد)
+ErrorDirNotFound=پوشۀ <b>%s</b> یافت نشد. (مسیر نادرست، مجوزهای اشتباه یا دسترسی بسته توسط مؤلفه‌های openbasedir یا safe_mode می‌تواند عامل باشد)
+ErrorFunctionNotAvailableInPHP=برای این قابلیت، تابع <b>%s</b> نیاز است اما در این برپاسازی/نسخۀ PHP موجود نیست.
+ErrorDirAlreadyExists=قبلا یک پوشه با همین نام وجود داشته است.
+ErrorFileAlreadyExists=قبلا یک فایل به همین نام وجود داشته است.
+ErrorPartialFile=فایل به طور کامل توسط سرور دریافت نشده است.
+ErrorNoTmpDir=پوشۀ موقت %s وجود ندارد.
+ErrorUploadBlockedByAddon=امکان ارسال توسط یک افزونۀ PHP/Apache مسدود شده است
+ErrorFileSizeTooLarge=حجم فایل بسیار بزرگ است.
+ErrorSizeTooLongForIntType=برای این نوع عددصحیح اندازه بسیار بلند است (حداکثر %s رقم)
+ErrorSizeTooLongForVarcharType=برای این نوع رشتۀ حروقی اندازه بسیار بزرگ است (حداکثر %s نویسه)
+ErrorNoValueForSelectType=لطفا مقدار مربوط به فهرست انتخاب را وارد کنید
+ErrorNoValueForCheckBoxType=لطفا مقدار مربوط به کادر تائید را وارد کنید
+ErrorNoValueForRadioType=لطفا مقدار مربوط به فهرست رادیوئی را انتخاب کنید
+ErrorBadFormatValueList=مقدار این فهرست نمی‌تواند بیش از یک ویرگول داشته باشد: <u>%s</u>، اما حداقل باید یکی داشته باشد: key,value
+ErrorFieldCanNotContainSpecialCharacters=بخش <b>%s</b> نباید نویسه‌های خاص داشته باشد.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=بخش <b>%s</b> نباید نویسه‌های خاص، حروف بزرگ داشته باشد و نیز نباید فقط عددی باشد.
+ErrorFieldMustHaveXChar=بخش <b>%s</b> حداقل باید %s نویسه داشته باشد.
+ErrorNoAccountancyModuleLoaded=هیچ واحد حساب‌داری فعال نیست
+ErrorExportDuplicateProfil=این نام نمایه برای این مجموعۀ صادرات قبلا وجود داشته باشد
 ErrorLDAPSetupNotComplete=تطبیق Dolibarr-LDAP کامل نیست.
-ErrorLDAPMakeManualTest=فایل LDIF. شده است در شاخه٪ s تولید می شود. سعی کنید به آن بار دستی از خط فرمان به کسب اطلاعات بیشتر در مورد خطا است.
-ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=کد عکس مورد استفاده برای ایجاد وجود دارد.
-ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some child records.
-ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
-ErrorModuleRequireJavascript=جاوا اسکریپت نمی باید غیر فعال شود که این ویژگی کار. برای فعال کردن / غیر فعال کردن جاوا اسکریپت، رفتن به منو صفحه اصلی> راه اندازی> نمایش.
-ErrorPasswordsMustMatch=هر دو کلمه عبور تایپ شده باید با یکدیگر مطابقت
-ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
-ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
-ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
-ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
-ErrorsOnXLines=%s errors found
-ErrorFileIsInfectedWithAVirus=برنامه آنتی ویروس قادر به اعتبار فایل (فایل ممکن است توسط یک ویروس آلوده)
-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.
+ErrorLDAPMakeManualTest=یک فایل .ldif در پوشۀ  %s تولید شد. تلاش کنید آن را از خط فرمان به شکل دستی اجرا کنید تا اطلاعات بیشتری در مورد خطاها داشته باشید.
+ErrorCantSaveADoneUserWithZeroPercentage=در صورتی که بخش "انجام شده توسط" هم پر شده باشد، امکان ذخیرۀ یک کنش با "وضعیت شروع نشده" نیست.
+ErrorRefAlreadyExists=ارجاعی که برای مورد ساخته شده استفاده شده قبلا وجود داشته است.
+ErrorPleaseTypeBankTransactionReportName=لطفا نام اطلاعیۀ بانک را در خصوص چگونگی گزارش ورودی وارد کنید (حالت YYYYMM  یا YYYYMMDD)
+ErrorRecordHasChildren=هنگامی که یک ردیف دارای زیرمجموعه است، امکان حذف آن وجود ندارد.
+ErrorRecordHasAtLeastOneChildOfType=این شیء حداقل یک فرزند از نوع %s دارد
+ErrorRecordIsUsedCantDelete=امکان حذف این ردیف نیست، زیرا در یک شیء دیگر شامل شده یا مورد استفاده اسن.
+ErrorModuleRequireJavascript=برای کار کردن این قابلیت، جاواسکریپت نباید غیر فعال بشد. برای فعال کردن/غیرفعال کردن جاوااسکریپت، به فهرست خانه->برپاسازی->نمایش مراجعه کنید.
+ErrorPasswordsMustMatch=هر دو گذرواژۀ وارد شده باید مطابق با هم باشند
+ErrorContactEMail=یک خطای فنی رخ داد، لطفا با سرپرست سامانه با این نشانی <b>%s</b> تماس حاصل نموده و شمارۀ خطای <b>%s</b> را در میان بگذارید، یا یک نسخه از این صفحه را ارسال نمائید.
+ErrorWrongValueForField=بخش <b>%s</b>:'<b>%s</b>' با قواعد عبارات‌منظم <b>%s</b> نمی‌خواند
+ErrorFieldValueNotIn=بخش <b>%s</b>:'<b>%s</b>' جزو مقادیری که در بخش <b>%s</b> از <b>%s</b> هستند نیست.
+ErrorFieldRefNotIn=بخش <b>%s</b>:'<b>%s</b>' یک ارجاع موجود <b>%s</b> نیست
+ErrorsOnXLines=%s خطا بروز کرد
+ErrorFileIsInfectedWithAVirus=برنامۀ ضدویروس امکان تائید فایل را ندارد (ممکن است فایل ویروسی باشد)
+ErrorSpecialCharNotAllowedForField=نویسه‌های خاص در بخش "%s" مجاز نیستند
+ErrorNumRefModel=در پایگاه‌داده ( %s ) یک ارجاع  وجود دارد و با این قواعد شماره‌دهی همخوان نیست. ردیف مربوطه را حذف کرده یا ارجاع را تغییرنام دهید تا این واحد فعال شود
+ErrorQtyTooLowForThisSupplier=تعداد برای این فروشنده بیش‌ازحد پائین است یا این‌که برای این محصول مبلغی در خصوص این فروشنده تعریف نشده است
+ErrorOrdersNotCreatedQtyTooLow=برخی از سفارش‌ها ساخته نشدند چون تعداد‌ها کم‌تر از حد مطلوب بود
+ErrorModuleSetupNotComplete=برپاسازی این واحد ناقص به نظر می‌رسد. به بخش خانه - برپاسازی - واحدها رفته تا تکمیل کنید
 ErrorBadMask=خطا در ماسک
-ErrorBadMaskFailedToLocatePosOfSequence=خطا، ماسک بدون شماره ترتیب
-ErrorBadMaskBadRazMonth=خطا، مقدار تنظیم مجدد بد
-ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
-ErrorSelectAtLeastOne=خطا. حداقل یک ورودی را انتخاب کنید.
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
-ErrorProdIdAlreadyExist=٪ s را به یک سوم دیگر اختصاص داده
-ErrorFailedToSendPassword=برای ارسال رمز عبور ناموفق
-ErrorFailedToLoadRSSFile=نتواند به دریافت خوراک RSS. سعی کنید برای اضافه کردن MAIN_SIMPLEXMLLOAD_DEBUG ثابت اگر پیغام خطا می کند اطلاعات کافی را فراهم نمی کند.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
-ErrorForbidden2=اجازه این ورود می تواند توسط مدیر Dolibarr خود را از منوی٪ s->٪ s را تعریف شده است.
-ErrorForbidden3=به نظر می رسد که Dolibarr از طریق یک جلسه تصدیق استفاده نمی شود. نگاهی به اسناد و مدارک راه اندازی Dolibarr بدانید که چگونه برای مدیریت احراز اصالت (htaccess تغییر نام دهید، mod_auth و یا دیگر ...).
-ErrorNoImagickReadimage=کلاس Imagick در این PHP یافت نشد. بدون پیش نمایش را می توان در دسترس است. مدیران می توانند این برگه را از منوی راه اندازی غیر فعال کردن - نمایش.
-ErrorRecordAlreadyExists=ضبط از قبل وجود دارد
-ErrorLabelAlreadyExists=This label already exists
-ErrorCantReadFile=برای خواندن پرونده «٪ s» شکست خورد
-ErrorCantReadDir=برای خواندن دایرکتوری شکست خورد '٪ s' را
-ErrorBadLoginPassword=ارزش بد برای ورود و یا کلمه عبور
+ErrorBadMaskFailedToLocatePosOfSequence=خطا، ماسک بدون عدد متوالی
+ErrorBadMaskBadRazMonth=خطا، مقدار نادرست بازنشانی
+ErrorMaxNumberReachForThisMask=حداکثر رقم انتخائی برای این ماسک
+ErrorCounterMustHaveMoreThan3Digits=شمارنده حداقل باید 3 رقمه باشد
+ErrorSelectAtLeastOne=خطا. حداقل یک ورودی انتخاب کنید.
+ErrorDeleteNotPossibleLineIsConsolidated=حذف مقدور نیست زیرا ردیف به یک تراکنش بانکی متصل است که مسکوت است
+ErrorProdIdAlreadyExist=%s به یک‌سوم دیگر اختصاص داده شده
+ErrorFailedToSendPassword=ارسال گذرواژه موفقیت‌آمیز نبو
+ErrorFailedToLoadRSSFile=دریافت خوراک RSS ممکن نبود. در صورتی که پیام خطا اطلاعات کافی ارائه نمی‌دهد، تلاش کنید مقدارثابت MAIN_SIMPLEXMLLOAD_DEBUG  را فعال کنید.
+ErrorForbidden=دسترسی بسته است. <br> شما در تلاشید به صفحه، بخش یا قابلیتی از یک واحد غیرفعال مراجعه نموده یا این‌که این تلاش برای دسترسی توسط یک نشست بدون مجوز که برای نام کاربری شما مجاز نیست انجام می‌شود.
+ErrorForbidden2=مجوزهای این کاربر از فهرست %s->%s از صفحۀ مدیر Dolibarr قابل تعیین کردن است.
+ErrorForbidden3=به نظر می‌رسد Dolibarr از طریق یک نشست تصدیق شده مورد استفاده قرار نگرفته است. نگاهی به مستندات راهنمای برپاسازی Dolibarr نموده تا چگونگی مدیریت تصدیق‌ها را بدانید (htaccess، mod_auth یا غیره...).
+ErrorNoImagickReadimage=کلاس Imagick در این نسخۀ PHP یافت نشد. امکان ارائۀ پیش‌نمایش وجود ندارد. مدیران می‌توانند این زبانه را از فهرست برپاسازی - نمایش غیرفعال کنند.
+ErrorRecordAlreadyExists=این ردیف قبلا وجود داشته است
+ErrorLabelAlreadyExists=این برچسب قبلا وجود داشته است
+ErrorCantReadFile=امکان خواندن فایل '%s' نبود
+ErrorCantReadDir=امکان خواندن پوشۀ '%s' نبود
+ErrorBadLoginPassword=مقدار نادرست نام‌ورود و گذرواژه
 ErrorLoginDisabled=حساب شما غیر فعال شده است
-ErrorFailedToRunExternalCommand=برای اجرای دستور خارجی ها انجام نشد. آن را چک کنید در دسترس است و شده runnable توسط سرور PHP شما می باشد. اگر PHP <b>حالت Safe Mode</b> را فعال کنید، بررسی کنید که فرمان است در داخل یک پوشه تعریف شده توسط <b>safe_mode_exec_dir</b> پارامتر.
-ErrorFailedToChangePassword=برای تغییر رمز عبور ناموفق
-ErrorLoginDoesNotExists=کاربر با ورود <b>به٪ s را</b> می تواند یافت نمی شود.
-ErrorLoginHasNoEmail=این کاربر هیچ آدرس ایمیل. فرآیند سقط شده.
-ErrorBadValueForCode=ارزش بد برای کد امنیتی. دوباره سعی کنید با ارزش جدید ...
-ErrorBothFieldCantBeNegative=زمینه های٪ s و٪ s نمی تواند هر دو منفی
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
-ErrorWebServerUserHasNotPermission=حساب <b>کاربری٪ s را</b> برای اجرای وب سرور بدون اجازه که
-ErrorNoActivatedBarcode=بدون بارکد از نوع فعال
-ErrUnzipFails=برای جدا کردن٪ s با ZipArchive ناموفق
-ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=پرونده٪ s باید یک بسته فشرده Dolibarr است
-ErrorModuleFileRequired=You must select a Dolibarr module package file
-ErrorPhpCurlNotInstalled=PHP CURL نصب نشده است، این ضروری است که با پی پال صحبت
-ErrorFailedToAddToMailmanList=برای اضافه کردن رکورد٪ به پستچی فهرست٪ یا پایه SPIP ناموفق
-ErrorFailedToRemoveToMailmanList=برای حذف رکورد٪ به پستچی فهرست٪ یا پایه SPIP ناموفق
-ErrorNewValueCantMatchOldValue=ارزش های جدید را نمی توان به یکی از قدیمی برابر
-ErrorFailedToValidatePasswordReset=به راه اندازی مجدد کنتور رمز عبور شکست خورده است. ممکن است راه اندازی مجدد کنتور در حال حاضر انجام شده است (این لینک را می توان مورد استفاده فقط یک بار). اگر نه، سعی کنید به راه اندازی مجدد فرآیند راه اندازی مجدد کنتور.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
-ErrorFailedToAddContact=برای اضافه کردن مخاطب انجام نشد
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=حالت پرداخت به نوع٪ s را تعیین شد، اما راه اندازی فاکتور ماژول شد کامل نیست برای تعریف اطلاعات به این حالت پرداخت نشان می دهد.
-ErrorPHPNeedModule=خطا، PHP شما باید <b>بخش٪ s</b> نصب کرده باشید برای استفاده از این ویژگی.
-ErrorOpenIDSetupNotComplete=شما راه اندازی Dolibarr فایل پیکربندی اجازه می دهد تا احراز هویت ایجاد حساب کاربری، اما URL خدمات ایجاد حساب کاربری به٪ ثابت تعریف نشده
-ErrorWarehouseMustDiffers=منبع و هدف انبارها باید متفاوت
-ErrorBadFormat=فرمت بد!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=خطا، برخی از زایمان مرتبط با این حمل و نقل وجود دارد. حذف خودداری کرد.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Operator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=منبع و هدف انبارها باید متفاوت
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
-ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
-ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
-ErrorGlobalVariableUpdater2=Missing parameter '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
-ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
-ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
-ErrorSavingChanges=An error has occurred when saving the changes
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
-ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
-ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
-ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
-ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
-ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
-ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
-ErrorNoWarehouseDefined=Error, no warehouses defined.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
-ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
-ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
-ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
-ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
-ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
-ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
-ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
-ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
-ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
-ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
-ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorFailedToRunExternalCommand=اجرای دستور خارجی موفقیت‌آمیز نبود. مطمئن شوید در سرور PHP فعال و قابل اجراست. در صورتی که حالت <b>Safe Mode</b> در PHP فعال باشد، بررسی کنید دستور در پوشه‌ای است که توسط مؤلفۀ <b>safe_mode_exec_dir</b> قرار گرفته باشد.
+ErrorFailedToChangePassword=تغییر گذرواژه موفقیت‌آمیز نبود
+ErrorLoginDoesNotExists=کاربری که از نام‌ورود <b>%s</b> استفاده کند، پیدا نشد
+ErrorLoginHasNoEmail=کاربر هیچ نشانی رایانامه‌‌ای ندارد. پردازش متوقف شد.
+ErrorBadValueForCode=مقدار نادرست برای کد امنیتی. با یک مقدار جدید امتحان کنید...
+ErrorBothFieldCantBeNegative=بخش‌های %s و %s نمی‌توانند هر دو منفی باشند
+ErrorFieldCantBeNegativeOnInvoice=بخش <strong>%s</strong> در این نوع از صورت‌حساب نمی‌تواند منفی باشد. در صورتی که می‌خواهید یک سطر تخفیف داشته باشید، ابتدا در روی صفحه با استفاده از پیوند %s تخفیف را ساخته و سپس آن را به این صورت‌حساب نسبت دهید. شما همچنین می‌توانید  از مدیر بخواهید گزینۀ  FACTURE_ENABLE_NEGATIVE_LINES  را به 1 تغییر دهد تا این رفتار قدیمی را تجویز کند.
+ErrorQtyForCustomerInvoiceCantBeNegative=در صورت‌حساب مشتری تعداد برای یک سطر نمی‌‌تواند رقمی منفی باشد
+ErrorWebServerUserHasNotPermission=حساب کاربری <b>%s</b> برای اجرای یک سرور وب انتخاب شده اما مجوز آن را ندارد
+ErrorNoActivatedBarcode=هیچ نوع بارکدی فعال نشده
+ErrUnzipFails=امکان استخراج و unzip %s توسط ZipArchive وجود نداشت
+ErrNoZipEngine=هیچ موتوری برای فایل zip/unzip %s در این PHP وجود ندارد
+ErrorFileMustBeADolibarrPackage=فایل %s باید یک بستۀ zip از Dolibarr باشد
+ErrorModuleFileRequired=شما باید یک بستۀ واحد Dolibarr انتخاب کرده باشید
+ErrorPhpCurlNotInstalled=PHP CURL نصب نشده است، برای صحبت با Paypal ضروری است. 
+ErrorFailedToAddToMailmanList=اضافه کردن ردیف %s به فهرست Mailman %s یا پایگاه SPIP مقدور نبود
+ErrorFailedToRemoveToMailmanList=حذف ردیف %s از فهرست Mailman %s یا پایگاه SPIP مقدور نبود
+ErrorNewValueCantMatchOldValue=مقدار جدید نمی‌تواند برابر با مقدار قدیمی باشد
+ErrorFailedToValidatePasswordReset=بازسازی گذرواژه مقدور نبود. ممکن است این بازسازی قبلا انجام شده باشد (این پیوند فقط یک بار قابل استفاده است). در صورتی که چنین نیست، روند بازسازی را از سر بگیرید.
+ErrorToConnectToMysqlCheckInstance=اتصال به پایگاه‌داده مقدور نیست. مطمئن شوید سرور پایگاه داده فعال است. (برای مثال، Mysql/Mariadb شما می‌توانید از خط فرمان لینوکس دستور 'sudo service mysql start' را اجرا کنید).
+ErrorFailedToAddContact=اضافه کردن طرف‌تماس مقدور نبود
+ErrorDateMustBeBeforeToday=تاریخ نمی‌تواند بیشتر از امروز باشد
+ErrorPaymentModeDefinedToWithoutSetup=حالت پرداخت به %s تنظیم شده اما برپاسازی واحد صورت‌حساب کامل نیست تا اطلاعات مربوط به این حالت پرداخت را تعریف کرده و نمایش دهد.
+ErrorPHPNeedModule=خطا، برای استفاده از این قابلیت روی PHP شما باید واحد <b>%s</b> نصب شده باشد.
+ErrorOpenIDSetupNotComplete=شما تنظیمات Dolibarr را پیکربندی کرده‌اید تا تصدیق ورود OpenID  را مجاز کنید، اما نشانی خدمات openID در مقدارثابت %s تعریف نشده است
+ErrorWarehouseMustDiffers=انبار مبدأ و مقصد باید متفاوت باشند
+ErrorBadFormat=شکل بد!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=خطا، این عضو هنوز به هیچ شخص سوم موجودی متصل نشده است. این کار را بکنید یا این که قبل از ساخت یک عضویت با صورت‌حساب، یک شخص سوم جدید بسازید.
+ErrorThereIsSomeDeliveries=خطا، برخی از تحویل‌ها به این حمل‌ونقل وصل هستند. امکان حذف نیست.
+ErrorCantDeletePaymentReconciliated=امکان حذف پرداختی که یک ورودی بانکی ساخته که مسکوت است وجود ندارد.
+ErrorCantDeletePaymentSharedWithPayedInvoice=امکان حذف پرداختی که حداقل با یک صورت‌حساب با حالت پرداخت شده مشترک است وجود ندارد
+ErrorPriceExpression1=امکان انتساب به مقدار ثابت '%s' وجود ندارد
+ErrorPriceExpression2=امکان بازتعریف تابع درونی '%s' وجود ندارد
+ErrorPriceExpression3=متغیر '%s' در تعریف‌ تابع، تعریف نشده است
+ErrorPriceExpression4=نویسۀ غیرمجاز '%s'
+ErrorPriceExpression5='%s' غیرقابل قبول 
+ErrorPriceExpression6=تعداد نشانوندها غلط است (%s داده شده، %s مطلوب است)
+ErrorPriceExpression8=عمل‌گر '%s' نامطلوب است
+ErrorPriceExpression9=یک خطای غیرقابل‌پیش بینی رخ داده است
+ErrorPriceExpression10=عمل‌گر '%s' فاقد عمل‌وند است
+ErrorPriceExpression11='%s' مطلوب است
+ErrorPriceExpression14=تقسیم بر صفر
+ErrorPriceExpression17=متغیر تعریف نشده '%s'
+ErrorPriceExpression19=عبارت پیدا نشد
+ErrorPriceExpression20=عبارت خالی
+ErrorPriceExpression21=نتیجۀ خالی '%s'
+ErrorPriceExpression22=نتیجۀ منفی '%s'
+ErrorPriceExpression23=متغیر ناشناخته یا تعریف نشده '%s' در %s
+ErrorPriceExpression24=متغیر '%s' موجود است اما مقداری در خود ندارد
+ErrorPriceExpressionInternal=خطای داخلی '%s'
+ErrorPriceExpressionUnknown=خطای ناشناخته '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=مبدأ و مقصد انبارها باید متفاوت باشد
+ErrorTryToMakeMoveOnProductRequiringBatchData=خطا، تلاش برای جابجائی موجودی بدون اطلاعات سری‌ساخت/شماره سریال در خصوص محصول '%s' که نیاز به اطلاعات سری‌ساخت/شماره‌سریال دارد
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=همۀ دریافت‌های ثبت شده ابتدا باید قبل از این که این عمل را انجام دهند، مورد بررسی قرار گیرند (تائید یا رد شوند)
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=همۀ دریافت‌های ثبت شده ابتدا باید قبل از این که این عمل را انجام دهند، مورد بررسی قرار گیرند (تائید)
+ErrorGlobalVariableUpdater0=درخواست HTTP با خطای '%s' ناموفق بود
+ErrorGlobalVariableUpdater1=شکل نادرست JSON در '%s'
+ErrorGlobalVariableUpdater2=فاقد مؤلفۀ '%s
+ErrorGlobalVariableUpdater3=داده‌های درخواست شده در نتایج پیدا نشدند
+ErrorGlobalVariableUpdater4=متقاضی SOAP با خطای '%s' ناموفق بود
+ErrorGlobalVariableUpdater5=هیچ متغیر سراسری انتخاب نشده است
+ErrorFieldMustBeANumeric=بخش <b>%s</b> باید مقداری عددی باشد
+ErrorMandatoryParametersNotProvided=مؤلفه‌های الزامی درج نشده‌ان
+ErrorOppStatusRequiredIfAmount=شما مقداری تخمینی از این سرنخ وارد می‌کنید. بنابراین باید وضعیت آن را نیز تعیین کنید
+ErrorFailedToLoadModuleDescriptorForXXX=امکان بارگذاری کلاس توضیح‌دهندۀ واحد برای %s وجود نداشت
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=تعریف بد آرایۀ فهرست در توضیح‌دهندۀ واحد (مقدار برد برای کلید fk_menu)
+ErrorSavingChanges=در هنگام ذخیرۀ تغییرات یک اشکال رخ داد
+ErrorWarehouseRequiredIntoShipmentLine=در این سطر برای ارسال یک انبار مورد نیاز است
+ErrorFileMustHaveFormat=فایل باید به شکل %s باشد
+ErrorSupplierCountryIsNotDefined=برای این فروشنده کشور تعریف نشده است. ابتدا این را تصحیح کنید.
+ErrorsThirdpartyMerge=امکان ادغام دو ردیف وجود نداشت. درخواست لغو شد.
+ErrorStockIsNotEnoughToAddProductOnOrder=موجودی برای محصول %s برای افزودن در سفارش جدید کافی نیست.
+ErrorStockIsNotEnoughToAddProductOnInvoice=موجودی برای محصول %s برای افزودن در صورت‌حساب جدید کافی نیست.
+ErrorStockIsNotEnoughToAddProductOnShipment=موجودی برای محصول %s برای افزودن در حمل‌ونقل جدید کافی نیست.
+ErrorStockIsNotEnoughToAddProductOnProposal=موجودی برای محصول %s برای افزودن در پیشنهاد جدید کافی نیست.
+ErrorFailedToLoadLoginFileForMode=دریافت کلید ورود برای حالت '%s' مقدور نبود.
+ErrorModuleNotFound=فایل مربوط به واحد پیدا نشد
+ErrorFieldAccountNotDefinedForBankLine=مقدار حساب حسابداری در شناسۀ سطر مبدأ %s (%s) تعریف نشده است
+ErrorFieldAccountNotDefinedForInvoiceLine=مقدار حساب حسابداری در شناسۀ صورت‌حساب %s (%s)  تعریف نشده است
+ErrorFieldAccountNotDefinedForLine=مقدار حساب حسابداری برای سطر (%s) تعریف نشده است
+ErrorBankStatementNameMustFollowRegex=خطا، نام گواهی بانک باید از قواعد نگارشی %s تبعیت کند
+ErrorPhpMailDelivery=بررسی کنید شما تعداد بیش‌از حدی از دریافت کنندگان استفاده نکرده‌اید یا محتوای نامۀ شما شبیه به هرزنامه نباشد. همچنین از مدیر سرور بخواهید گزارش‌های سرور و دیوارۀ آتشین را برای اطلاعات کامل تر مورد بررسی قرار دهد.
+ErrorUserNotAssignedToTask=کاربر برای امکان محاسبۀ زمان صرف شده باید به یک وظیفه نسبت داده شود.
+ErrorTaskAlreadyAssigned=وظیفه قبلا به کاربر محول شده است
+ErrorModuleFileSeemsToHaveAWrongFormat=ظاهرا بستۀ واحد وضعیت نامناسبی دارد
+ErrorFilenameDosNotMatchDolibarrPackageRules=نام بستۀ واحد (<strong>%s</strong>) با نام مطلوب نگارش همخوان نیست: <strong>%s</strong>
+ErrorDuplicateTrigger=خطا، نام ماشه-تریگر %s تکراری است. قبلا از %s بارگذاری شده است.
+ErrorNoWarehouseDefined=خطا، هیچ انباری تعریف نشده است.
+ErrorBadLinkSourceSetButBadValueForRef=پیوندی که استفاده کرده‌اید، معتبر نیست. یک 'مبدأ' برای پرداخت تعریف شده اما مقدار 'ref' یا مرجع، معتبر نیست
+ErrorTooManyErrorsProcessStopped=خطاهای بسیاری وجود دارد. عملیات متوقف شد
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=در هنگامی که گزینۀ افزایش/کاهش موجودی در خصوص این کار تنظیم شده است، امکان تائید اعتبار انبوه وجود ندارد (شما باید یکی یکی تائید کنید تا انباری که از آن کم می‌شود/به آن زیاد می‌شود را انتخاب کنید).
+ErrorObjectMustHaveStatusDraftToBeValidated=شیء %s باید برای تائید شدن در وضعیت 'پیش نویس' باشد.
+ErrorObjectMustHaveLinesToBeValidated=شیء %s باید برای تائید شدن دارای سطر باشد.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=تنها صورت‌حساب‌های تائید شده می‌توانند با استفاده از گزینۀ "ارسال توسط رایانامه" ارسال انبوه شوند.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=شما باید تعیین کنید این مورد، یک محصول از پیش تعریف شده است یا نه
+ErrorDiscountLargerThanRemainToPaySplitItBefore=تخفیفی که می‌دهید بزرگتر از مقدار قابل پرداخت است. قبل از این کار تخفیف را به 2 تخفیف کوچکتر تقسیم کنید.
+ErrorFileNotFoundWithSharedLink=فایل پیدا نشد. ممکن است کلید به‌اشتراک‌گذاری ویرایش شده یا فایل حذف شده باشد
+ErrorProductBarCodeAlreadyExists=بارکد محصول %s در یک ارجاع محصول دیگر قبلا وجود داشته است
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=همچنین توجه داشته باشید در هنگامی که حداقل یک زیرمحصول (یا زیرمحصولی از زیرمحصول) به یک شمارۀ سری‌ساخت/شماره سریال احتیاج داشته باشد، استفاده از محصول مجازی برای افزایش/کاهش خودکار زیرمحصولات ممکن نیست.
+ErrorDescRequiredForFreeProductLines=برای سطوری که محصول مجانی دارند، توضیحات الزامی است
+ErrorAPageWithThisNameOrAliasAlreadyExists=صفحه/دربردارندۀ <strong>%s</strong> نام مشابه یا نام‌مستعار جایگزین مشابه ورودی مورد استفادۀ شما دارد
+ErrorDuringChartLoad=خطا در هنگام بارگذاری نمودار حساب‌ها. در صورتی برخی حساب‌ها بارگذاری نشوند، همچنان می‌توانید به طور دستی آن‌ها را وارد کنید
+ErrorBadSyntaxForParamKeyForContent=برای مؤلفۀ keyforcontent نگارش بدی وارد شده است. باید مقداری داشته باشد که با %s یا %s آغاز شود.
+ErrorVariableKeyForContentMustBeSet=خطا، مقدارثابت با نام %s (با محتوای متنی قابل نمایش) یا %s (با نشانی بیرونی قابل نمایش) باید تنظیم شده باشد.
+ErrorURLMustStartWithHttp=نشانی اینترنتی %s باید با http://  یا  https:// آغاز گرد
+ErrorNewRefIsAlreadyUsed=خطا، ارجاع جدید قبلا استفاده شده است
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 # Warnings
-WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
-WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
-WarningSafeModeOnCheckExecDir=هشدار، <b>safe_mode</b> گزینه PHP در تا دستور باید در داخل یک دایرکتوری اعلام شده توسط پی اچ پی <b>safe_mode_exec_dir</b> پارامتر های ذخیره شده است.
-WarningBookmarkAlreadyExists=چوب الف با این عنوان و یا این هدف (URL) وجود دارد.
-WarningPassIsEmpty=هشدار، رمز عبور پایگاه داده خالی است. این یک حفره امنیتی است. شما باید یک رمز عبور را به پایگاه داده خود اضافه کنید و تغییر فایل conf.php خود را به منعکس کننده این.
-WarningConfFileMustBeReadOnly=اخطار، فایل پیکربندی خود را <b>(htdocs / کنفرانس / conf.php)</b> می تواند توسط وب سرور رونویسی. این یک حفره امنیتی جدی است. تغییر مجوز فایل را در حالت فقط خواندنی است برای کاربر سیستم عامل های استفاده شده توسط وب سرور. در صورت استفاده از ویندوز و FAT فرمت برای هارد دیسک شما، شما باید بدانید که این فایل سیستم اجازه نمی دهد برای اضافه کردن مجوز در فایل، بنابراین نمی تواند به طور کامل امن است.
-WarningsOnXLines=اخطار <b>در٪ s را</b> ثبت منبع (ها)
-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).
-WarningCloseAlways=هشدار، بسته شدن انجام می شود حتی اگر مقدار بین منبع و مقصد عناصر متفاوت است. فعال کردن این ویژگی با احتیاط.
-WarningUsingThisBoxSlowDown=اخطار، با استفاده از این جعبه کاهش سرعت به طور جدی تمام صفحات نشان دادن جعبه.
-WarningClickToDialUserSetupNotComplete=راه اندازی از اطلاعات ClickToDial برای کاربر شما کامل نیست (ClickToDial زبانه دیدن بر روی کارت کاربر خود را).
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=قابلیت غیر فعال زمانی که راه اندازی صفحه نمایش برای فرد نابینا یا از مرورگرهای متن بهینه شده است.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
-WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
-WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
-WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
-WarningProjectClosed=Project is closed. You must re-open it first.
+WarningPasswordSetWithNoAccount=یک گذرواژه برای این عضو تنظیم شده است. با این‌حال هیچ حساب کاربری‌ای ساخته نشده است. بنابراین این گذرواژه برای ورود به Dolibarr قابل استفاده نیست. ممکن است برای یک رابط/واحد بیرونی قابل استفاده باشد، اما اگر شما نخواهید هیچ نام کاربری ورود و گذرواژه‌ای برای یک عضو استفاده کنید، شما می‌توانید گزینۀ "ایجاد یک نام‌ورد برای هر عضو" را از برپاسازی واحد اعضاء غیرفعال کنید. در صورتی که نیاز دارید که نام‌ورود داشته باشید اما گذرواژه نداشته باشید، می‌توانید این بخش را خالی گذاشته تا از این هشدار بر حذر باشید. نکته: همچنین نشانی رایانامه می‌تواند در صورتی که عضو به یک‌کاربر متصل باشد، می‌‌تواند مورد استفاده قرار گیرد
+WarningMandatorySetupNotComplete=این گزینه را برای برپاسازی مؤلفه‌های الزامی کلیک کنید
+WarningEnableYourModulesApplications=این گزینه را برای فعال کردن واحدها و برنامه‌های مختلف کلیک کنید
+WarningSafeModeOnCheckExecDir=هشدار، قابلیت <b>safe_mode</b> در PHP روشن است، بنابراین این دستور باید درون یک پوشه که با استفاده از مؤلفۀ PHP با عنوان <b>safe_mode_exec_dir</b> تعریف شده است، قرار گیرد.
+WarningBookmarkAlreadyExists=یک نشانه با این عنوان یا مقصد نشانی اینترنتی (URL) قبلا وجود داشته است.
+WarningPassIsEmpty=هشدار، گذرواژۀ پایگاه‌داده خالی است. این یک حفرۀ امنیتی است. شما باید یک گذرواژه برای پایگاه‌دادۀ خود تعریف کرده و فایل conf.php خود را برای انعکاس آن ویرایش کنید
+WarningConfFileMustBeReadOnly=هشدار، فایل پیکربندی شما (<b>htdocs/conf/conf.php</b>) قابل بازنویسی توسط سرور وب است. این یک حفرۀ امنیتی اساسی است. مجوزهای این فایل را طوری تغییر دهید که تنها قابل خواندن توسط کاربر وب سرور مورد استفاده در سیستم عامل باشد. در صورتی که شما روی ویندوز و شکل حافظۀ FAT هستد، شما باید بدانید این نوع سامانۀ فایل امکان تعیین مجوز روی فایل ندارد، و این امنیت کامل را تامین نمی‌کند.
+WarningsOnXLines=خطا(هائی) بر روی <b>%s</b> ردیف مبدأ
+WarningNoDocumentModelActivated=نمونه‌ای برای تولید سند فعال نشده است. تا هنگامی که برپاسازی واحد مربوطه را بررسی کنید، یک نمونه به طور پیش‌فرض انتخاب می‌شود.
+WarningLockFileDoesNotExists=هشدار، هنگامی که عملیات نصب تمام شد، شما باید ابزارهای نصب/مهاجرت را با افزودن فایل <b>install.lock</b> در پوشۀ <b>%s</b> غیرفعال کنید. صرف‌نظر کردن از ساخت این فایل، یک خطر امنیتی شدید برای شما حاصل می‌کند.
+WarningUntilDirRemoved=همۀ هشدارهای امنتی (که تنها توسط کاربران مدیر قابل مشاهده است) تا زمان وجود آسیب‌پذیری فعال خواهند بود ( مگر این‌که مقدارثابت MAIN_REMOVE_INSTALL_WARNING  در برپاسازی-> سایر برپاسازی‌ها اضافه شود)
+WarningCloseAlways=هشدار، بسته‌شدن حتی در صورتی‌که مقدار بین عناصر مبدأ و مقصد متفاوت باشند، انجام می‌شود. این گزینه را با دقت و آگاهی فعال کنید
+WarningUsingThisBoxSlowDown=هشدار، استفاده از این بخش باعث کندی جدی همۀ صفحاتی که کادر مربوطه نمایش می‌دهند خواهد شد.
+WarningClickToDialUserSetupNotComplete=برپاسازی اطلاعات ClickToDial برای کاربر شما کامل نیست (زبانۀ ClickToDial را در کارت کاربر مشاهده کنید).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=این گزینه در هنگامی که تنظیمات برپاسازی نمایش برای کاربران روشندل یا مرورگرهای متنی ثبت شده، فعال نیست. 
+WarningPaymentDateLowerThanInvoiceDate=تاریخ پرداخت (%s) زودتر از تاریخ صورت‌حساب (%s) در صورت‌حساب %s است.
+WarningTooManyDataPleaseUseMoreFilters=اطلاعات بسیار زیاد  (بیشتر از %s  سطر). لطفا صافی‌های بیشتری تعیین کنید یا مقدارثابت %s را بیشتر کنید.
+WarningSomeLinesWithNullHourlyRate=برخی زمان‌ها توسط برخی کاربران تعریف شده که مبلغ ساعتی آنان تعریف نشده است. مقدار 0 %s در ساعت استفاده شده است اما این ممکن است باعث مقداردهی غلط زمان صرف شده شود.
+WarningYourLoginWasModifiedPleaseLogin=نام‌ورود شما تغییر پیدا کرده. برای حفظ امنیت شما باید قبل از عمل بعدی با نام‌ورود جدید وارد شوید.
+WarningAnEntryAlreadyExistForTransKey=یک ورودی برای این کلید ترجمه برای این زبان قبلا وجود داشته است
+WarningNumberOfRecipientIsRestrictedInMassAction=هشدار، در هنگام انجام عملیات انبوده روی فهرست‌ها، تعداد دریافت‌کنندگان مختلف به <b>%s</b> محدود است.
+WarningDateOfLineMustBeInExpenseReportRange=هشدار، تاریخ مربوط به سطر در بازۀ گزارش هزینه‌ها نیست
+WarningProjectClosed=طرح بسته است. ابتدا باید آن را باز کنید
diff --git a/htdocs/langs/fa_IR/exports.lang b/htdocs/langs/fa_IR/exports.lang
index bcf0951bd25..b99943ee140 100644
--- a/htdocs/langs/fa_IR/exports.lang
+++ b/htdocs/langs/fa_IR/exports.lang
@@ -1,133 +1,133 @@
 # Dolibarr language file - Source file is en_US - exports
 ExportsArea=صادرات
-ImportArea=Import
-NewExport=New Export
-NewImport=New Import
-ExportableDatas=مجموعه داده های صادراتی
-ImportableDatas=مجموعه داده های واردات
-SelectExportDataSet=انتخاب مجموعه داده های شما می خواهید به صادرات ...
-SelectImportDataSet=انتخاب مجموعه داده های شما می خواهید به واردات ...
-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=زمینه های از فایل منبع وارد نشده
-SaveExportModel=Save your selections as an export profile/template (for reuse).
-SaveImportModel=Save this import profile (for reuse) ...
-ExportModelName=پروفایل صادرات
-ExportModelSaved=Export profile saved as <b>%s</b>.
-ExportableFields=زمینه های صادراتی
-ExportedFields=زمینه های صادراتی
-ImportModelName=پروفایل واردات
-ImportModelSaved=Import profile saved as <b>%s</b>.
-DatasetToExport=مجموعه داده برای صادرات
-DatasetToImport=واردات فایل را به مجموعه داده
-ChooseFieldsOrdersAndTitle=رشته های سفارش ...
-FieldsTitle=عنوان زمینه
-FieldTitle=عنوان درست
-NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
-AvailableFormats=Available Formats
+ImportArea=واردات
+NewExport=صادرات جدید
+NewImport=واردات جدید
+ExportableDatas=مجموعۀ داده‌های قابل صادرات
+ImportableDatas=مجموعۀ داده‌های قابل واردا
+SelectExportDataSet=داده‌هائی را که می‌خواهید صادر کنید انتخاب کنید...
+SelectImportDataSet=داده‌هائی را که می‌خواهید وارد کنید انتخاب کنید...
+SelectExportFields=بخش‌هائی که باید صادر کنید را انتخاب کنید، یا این‌که یک نمایۀ از پیش تعریف شده برای صادرات انتخاب کنید
+SelectImportFields=بخش‌های فایل منبع را که باید وارد شوند انتخاب کرده و مقصد آن در پایگاه داده را برگزینید این کار با بالا و پائین بردن لنگرَک %s انجام می‌شود. همچنین می‌توانید یک نمایۀ از پیش تعریف شدۀ واردات برگزینید:
+NotImportedFields=بخش‌های فایل منبعی که وارد نمی‌شوند
+SaveExportModel=انتخاب خود را (برای استفادۀ مجدد) به‌عنوان یک نمایه/قالب صادرات ذخیره کنید.
+SaveImportModel=این واردات را به‌عنوان نمایه ذخیر کنید (برای استفادۀ مجدد) ..
+ExportModelName=نام نمایۀ صادارت
+ExportModelSaved=نمایۀ صادارت به نام <b>%s</b> ذخیره شد.
+ExportableFields=بخش‌های قابل صادرات
+ExportedFields=بخش‌های صادر شده
+ImportModelName=نام نمایۀ واردات
+ImportModelSaved=فایل واردات به شکل <b>%s</b> ذخیره شد.
+DatasetToExport=مجموعۀ داده برای صادرات
+DatasetToImport=وارد کردن فایل به مجموعۀ‌داده
+ChooseFieldsOrdersAndTitle=انتخاب ترتیب بخش‌ها...
+FieldsTitle=عنوان بخش‌ها
+FieldTitle=عنوان بخش
+NowClickToGenerateToBuildExportFile=حالا نوع فایل را در کادرترکیبی وارد کرده و کلید "تولید" را برای ساخت فایل صادرات کلیک کنید..
+AvailableFormats=انواع‌فایل ممکن
 LibraryShort=کتابخانه
 Step=گام
-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.
+FormatedImport=دستیار واردات
+FormatedImportDesc1=این واحد به شما امکان می‌دهد با استفاده از فایل و بدون دانش فنی، با استفاده از یک دستیار داده‌های موجود را روزآمد کرده یا اشیاء جدید به پایگاه‌داده اضافه کنید.
+FormatedImportDesc2=گام اول برای انتخاب نوع داده‌هائی است که برای وارد کردن در نظر دارید، سپس نوع فایل منبع را انتخاب کرده و سپس بخش‌هائی که باید وارد شوند را انتخاب می‌کنید.
+FormatedExport=دستیار صادرات
+FormatedExportDesc1=این ابزار به شما امکان عمل بدون دانش فنی و صادر کردن داده‌های مورد نظر را با استفاده از یک دستیار می‌دهد.
+FormatedExportDesc2=اولین گام انتخاب یک مجموعۀ دادۀ از پیش تعریفق شده است، سپس انتخاب بخش‌هائی که صادر می‌کنید و سپس ترتیب آن است.
+FormatedExportDesc3=هنگامی که داده‌های صادرات انتخاب شد، شما می‌توانید نوع فایل خروجی را انتخاب کنید.
 Sheet=ورق
-NoImportableData=بدون اطلاعات واردات (بدون ماژول با تعاریف به اجازه واردات داده ها)
-FileSuccessfullyBuilt=File generated
-SQLUsedForExport=درخواست SQL مورد استفاده برای ایجاد فایل صادرات
-LineId=کد خط
-LineLabel=Label of line
-LineDescription=شرح خط
-LineUnitPrice=قیمت واحد خط
-LineVATRate=نرخ مالیات بر ارزش افزوده از خط
-LineQty=تعداد خط
-LineTotalHT=Amount excl. tax for line
-LineTotalTTC=مبلغ با مالیات برای خط
-LineTotalVAT=میزان مالیات بر ارزش افزوده برای خط
-TypeOfLineServiceOrProduct=نوع خط (0 = محصول، 1 = خدمات)
-FileWithDataToImport=فایل با داده ها به واردات
-FileToImport=منبع فایل را به واردات
-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=فرمت فایل منبع
-FieldsInSourceFile=زمینه در فایل منبع
-FieldsInTargetDatabase=رشته های مورد نظر در پایگاه داده Dolibarr (با حروف درشت = اجباری)
-Field=رشته
-NoFields=بدون زمینه
-MoveField=درست است حرکت شماره ستون از٪ s
-ExampleOfImportFile=مثالی از فایل ورودی
-SaveImportProfile=ذخیره سازی این مشخصات واردات
-ErrorImportDuplicateProfil=برای صرفه جویی در این پروفایل واردات با این نام انجام نشد. مشخصات موجود در حال حاضر با این نام وجود دارد.
-TablesTarget=جداول هدفمند
-FieldsTarget=رشته های هدفمند
-FieldTarget=درست هدفمند
-FieldSource=درست است منبع
-NbOfSourceLines=تعداد خطوط در فایل منبع
-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=در این زمینه نیاز به داده ها از فایل منبع
-SomeMandatoryFieldHaveNoSource=برخی از موارد الزامی هیچ منبع از فایل داده
-InformationOnSourceFile=اطلاعات در فایل منبع
-InformationOnTargetTables=اطلاعات در زمینه های مورد نظر
-SelectAtLeastOneField=تغییر حداقل یکی از فیلد منبع در ستون از زمینه های به صادرات
-SelectFormat=را انتخاب کنید این فرمت فایل واردات
-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=خط خالی (دور ریخته خواهد شد)
-CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
-FileWasImported=فایل را با <b>تعداد٪ s را</b> وارد شد.
-YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
-NbOfLinesOK=تعداد خطوط بدون خطا و بدون <b>اخطار:٪ است.</b>
-NbOfLinesImported=شماره خطوط با موفقیت وارد <b>کنید:٪ s.</b>
-DataComeFromNoWhere=ارزش برای وارد می آید از هیچ جا در فایل منبع.
-DataComeFromFileFieldNb=ارزش برای وارد می آید از میدان <b>تعداد٪ s را</b> در فایل منبع.
-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=داده که از فایل منبع خواهد شد را به زمینه های زیر قرار داده شده:
-DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=شناسه (شماره) خط پدر و مادر پیدا از کد، خواهد شد را در قسمت زیر قرار داده شده:
-SourceRequired=ارزش داده ها اجباری است
-SourceExample=نمونه ای از ارزش اطلاعات ممکن
-ExampleAnyRefFoundIntoElement=هر کد عکس برای <b>عنصر٪ یافت</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=هر گونه کد (یا شناسه) یافت به فرهنگ لغت <b>از٪ s</b>
-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>تب</b> فایل <b>مقادیر جدا شده</b> (. TSV) <br> این فرمت یک فایل متنی که در آن زمینه توسط یک جدول نویس [تب] از هم جدا شده است.
-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 format options
-Separator=Field Separator
-Enclosure=String Delimiter
+NoImportableData=داده‌ای برای وارد کردن وجود ندارد (واحدی که تعریف مناسبت برای واردات داده داشته باشد وجود ندارد)
+FileSuccessfullyBuilt=فایل، تولید شد
+SQLUsedForExport=درخواست SQL استفاده شده برای ساخت فایل صادرات
+LineId=شناسۀ سطر
+LineLabel=برچسب سطر
+LineDescription=توضیح سطر
+LineUnitPrice=قیمت واحد سطر
+LineVATRate=نرخ م.ب.ا.ا. سطر
+LineQty=تعداد سطر
+LineTotalHT=مبلغ بدون مالیات برای سطر
+LineTotalTTC=مبلغ با مالیات برای سطر
+LineTotalVAT=مبلغ م.ب.ا.ا. مربوط به سطر
+TypeOfLineServiceOrProduct=نوع سطر (0 = محصول، 1 = خدمات)
+FileWithDataToImport=فایل حاوی داده برای وارد کردن
+FileToImport=فایل منبع برای واردکردن
+FileMustHaveOneOfFollowingFormat=فایلی که وارد می‌شود باید یکی از انواع زیر باشد
+DownloadEmptyExample=دریافت فایل قالب با اطلاعات محتوای بخش‌ها ( * بخش‌های الزامی است)
+ChooseFormatOfFileToImport=انتخاب نوع فایل برای استفاده به‌عنوان فایل واردات با کلیک بر روی نمادک %s برای انتخاب آن ...
+ChooseFileToImport=فایل را بالاگذاری کرده و سپس روی نشانک %s کلیک کرده تا به‌عنوان فایل منبع واردات استفاده شود.
+SourceFileFormat=نوع فایل منبع
+FieldsInSourceFile=بخش‌های فایل منبع
+FieldsInTargetDatabase=بخش‌های مقصد در پایگاه‌دادۀ Dolibarr (پررنگ=الزامی)
+Field=بخش
+NoFields=بخشی وجود ندارد
+MoveField=جابجائی شماره ستون بخش %s 
+ExampleOfImportFile=Example_of_import_file
+SaveImportProfile=ذخیرۀ این نمایۀ واردات
+ErrorImportDuplicateProfil=ذخیرۀ این فایل واردات با این نام ناموفق بود. یک نمایه با همین نام قبلا وجود داشته است.
+TablesTarget=جداول مقصد
+FieldsTarget=بخش‌های مقصد
+FieldTarget=بخش مقصد
+FieldSource=بخش مبدأ
+NbOfSourceLines=تعداد سطور فایل منبع
+NowClickToTestTheImport=بررسی کنید شرایط موجود در شکل‌دهی فایل شما (جداکننده‌های بخش‌ها و عبارات) با گزینه‌های نمایش داده شده همخوان باشد و شما سطر عناوین را نادیده گرفته باشید، در غیر این‌صورت در این شبیه‌سازی با خطا مواجه خواهید شد. <br> برای اجرای یک بررسی در ساختارفایل/محتوای‌آن و شبیه‌سازی واردات روی کلید "<b>%s</b>" کلیک نمائید. <br><b>در پایگاه‌دادۀ شما با این‌کار چیزی تغییر نخواهد کرد</b>.
+RunSimulateImportFile=اجرای شبیه‌سازی واردات
+FieldNeedSource=این بخش نیازمند داده از فایل منبع است
+SomeMandatoryFieldHaveNoSource=برخی از بخش‌های الزامی در فایل داده، دارای مبدأ و منبع نیستند
+InformationOnSourceFile=اطلاعات فایل منبع
+InformationOnTargetTables=اطلاعات بخش‌های مقصد
+SelectAtLeastOneField=حداقل یک بخش مبدأ را به ستون بخش‌های قابل صادرکردن بفرستید
+SelectFormat=این نوع فایل را برای وارد کردن انتخاب کنید
+RunImportFile=واردکردن داده‌ها
+NowClickToRunTheImport=نتیجۀ شبیه‌سازی واردات داده‌ها را بررسی کنید. خطاها را اصلاح کرده و مجددا آزمایش کنید. <br> هنگامی که گزارش‌های شبیه‌سازی هیچ خطائی را گزارش نمی‌کند شما می‌توانید برای وارد کردن داده‌ها به پایگاه‌داده اقدام کنید.
+DataLoadedWithId=داده‌های وارد شده یک بخش اضافی در هر جدول پایگاه‌داده‌ با این شناسۀ واردات دارند: <b>%s</b>، تا امکان قابل جستجو بودن در رابطه با پیگیری مشکلات مربوط به این واردات را داشته باشد.
+ErrorMissingMandatoryValue=داده‌های الزامی برای بخش <b>%s</b> در فایل مبدأ خالی هستند.
+TooMuchErrors=هنوز <b>%s</b> سطور مبدأ دیگر خطا دارند اما خروجی محدود بوده است.
+TooMuchWarnings=هنوز <b>%s</b> سطور مبدأ دیگر خطا دارند اما خروجی محدود بوده است.
+EmptyLine=سطر خالی ( نادیده گرفته خواهد شد)
+CorrectErrorBeforeRunningImport=شما <b>باید</b> همۀ خطاها را <b>قبل از</b> اجرای واردات واقعی تصحیح کنید.
+FileWasImported=فایل با شمارۀ <b>%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> از فایل مبدأ آمده است برای یافتن شناسۀ شیء مادر برای استفاده می‌شود. (بنابراین شیء <b>%s</b> که دارای ارجاعی به فایل مبدأ است باید در پایگاه‌داده وجود داشته باشد).
+DataComeFromIdFoundFromCodeId=کدی که از بخش شمارۀ <b>%s</b> از فایل مبدأ وارد می‌شود برای یافتن شناسۀ شیء مادر مورد استفاده قرار می‌گیرد (بنابراین کد فایل مبدأ باید در واژه نامۀ <b>%s</b> وجود داشته باشد). توجه داشته باشید در صورتی که شما این شناسه را بدانید، شما همچنین می‌توانید آن را به جای کد، در فایل مبدأ نیز استفاده کنید. واردات باید در هر دو صورت کار کند.
+DataIsInsertedInto=داده‌ای که از فایل مبدأ می‌آید باید در بخش زیر درج شود:
+DataIDSourceIsInsertedInto=شناسۀ شیء مادر با استفاده از داده‌های فایل مبدأ پیدا شد و در بخش زیر درج خواهد شد:
+DataCodeIDSourceIsInsertedInto=شناسۀ سطر والد از کد پیدا شد و در بخش زیر درج خواهد شد:
+SourceRequired=مقدار داده الزامی است
+SourceExample=نمونه‌ای از مقدار قابل درج
+ExampleAnyRefFoundIntoElement=هر ارجاعی که برای عنصر <b>%s</b> قابل یافتن است
+ExampleAnyCodeOrIdFoundIntoDictionary=هر کد (یا شناسه‌ای) که در واژه‌نامه <b>%s</b> پیدا شده است
+CSVFormatDesc=شکل فایل <b>مقدار جداشده با ویرگول</b> یعنی (.csv). <br> این یک فایل به شکل متنی است که بخش‌های آن با استفاده از یک جداکننده [ %s ] جدا می‌شوند. در صورتی که جدا کننده در داخل محتوای یک بخش یافت بشود، آن بخش توسط یک نویسۀ  [ %s ] احاطه می‌شود. نویسۀ گریز برای گریز از احاطه [ %s ] است.
+Excel95FormatDesc=شکل فایل <b>اکسل</b> با پسوند (.xls)<br> این شکل فایل Excel 95 بومی است  (BIFF5).
+Excel2007FormatDesc=شکل فایل <b>اکسل</b> با پسوند (.xlsx)<br> این شکل فایل Excel 2007 بومی است (SpreadsheetML).
+TsvFormatDesc=فایل به شکل <b>مقادیر جدا شده با پرش-Tab</b> با پسوند (.tsv) <br> این یک فایل به شکل متن است که بخش‌های مختلف با استفاده از پرش‌گر [tab] از هم جدا می‌شوند.
+ExportFieldAutomaticallyAdded=بخش <b>%s</b> به طور خودکار اضافه شد. این باعث اجتناب از برخورد سطور مشابه به عنوان ردیف تکراری می‌شود (با افزودن این بخش، همۀ سطور شناسۀ خود را خواهند داشت و متفاوت خواهند بود).
+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=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
+ExportStringFilter=%% امکان جایگزینی یک یا چند نویسه در نوشته را می‌دهد
+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=برای مثال برای نادیده گرفتن 2 سطر اول، عدد 3 را وارد کنید. <br> در صورتی که سطور عنوان، نادیده گرفته نـــشوند ، این باعث خطاهای مختلف در شبیه‌سازی واردات می‌شود
+KeepEmptyToGoToEndOfFile=این بخش را خالی نگاه دارید تا همۀ سطور تا انتهای فایل پردازش شود.
+SelectPrimaryColumnsForUpdateAttempt=ستون‌های قابل استفاده برای کلیداصلی-Primary Key برای یک واردات به‌روزرسان را وارد کنید. ()
+UpdateNotYetSupportedForThisImport=برای این نوع از واردات، به‌روزرسانی فعال نیست (فقط درج)
+NoUpdateAttempt=هیچ اقدامی برای به‌روزرسانی انجام نشد، فقط درج
+ImportDataset_user_1=کاربران (کارمند و غیره) و مشخصات
 ComputedField=بخش محاسبه شده
 ## filters
-SelectFilterFields=اگر می خواهید برای فیلتر کردن در برخی از ارزش ها، فقط مقادیر ورودی در اینجا.
-FilteredFields=رشته های فیلتر شده
-FilteredFieldsValues=ارزش فیلتر
-FormatControlRule=Format control rule
+SelectFilterFields=در صورتی که می‌خواهید برخی مقادیر را صافی کنید، این مقادیر را این‌جا وارد کنید.
+FilteredFields=بخش‌های صافی‌شده
+FilteredFieldsValues=مقدار برای صافی
+FormatControlRule=قاعدۀ کنترل شکل-فرمت
 ## imports updates
-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
+KeysToUseForUpdates=کلید (ستون) برای استفاده در <b>به‌روزرسانی</b> داده‌های موجود
+NbInsert=تعدا سطور درج شده: %s
+NbUpdate=تعداد سطور روزآمد شده: %s
+MultipleRecordFoundWithTheseFilters=ردیف‌های متعددی با این صافی پیدا شد: %s
diff --git a/htdocs/langs/fa_IR/externalsite.lang b/htdocs/langs/fa_IR/externalsite.lang
index cf0df700d6e..4f8e8888c6b 100644
--- a/htdocs/langs/fa_IR/externalsite.lang
+++ b/htdocs/langs/fa_IR/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=راه اندازی لينک به وب سايت های خارجی
-ExternalSiteURL=URL سايت خارجی
-ExternalSiteModuleNotComplete=ماژول سايت خارجی به درستی پيکربندی نشده است.
-ExampleMyMenuEntry=My menu entry
+ExternalSiteSetup=تنظیم پیوند به وبگاه بیرونی
+ExternalSiteURL=نشانی‌اینترنتی وبگاه بیرونی
+ExternalSiteModuleNotComplete=واحد ExternalSite  به درستی پیکربندی نشده است
+ExampleMyMenuEntry=عنوان فهرست من
diff --git a/htdocs/langs/fa_IR/ftp.lang b/htdocs/langs/fa_IR/ftp.lang
index 82863a353d0..83a59f293b6 100644
--- a/htdocs/langs/fa_IR/ftp.lang
+++ b/htdocs/langs/fa_IR/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=راه اندازی ماژول FTP کارفرما
-NewFTPClient=جدید راه اندازی اتصال به FTP
-FTPArea=منطقه FTP
-FTPAreaDesc=این صفحه نمایش نشان می دهد محتوای شما را از مشخصات سرور FTP
-SetupOfFTPClientModuleNotComplete=راه اندازی ماژول سرویس گیرنده FTP به نظر می رسد کامل نیست
-FTPFeatureNotSupportedByYourPHP=PHP شما توابع FTP پشتیبانی نمی کند
-FailedToConnectToFTPServer=برای اتصال به سرور FTP با شکست مواجه شد (٪ s سرور، پورت٪ بازدید کنندگان)
-FailedToConnectToFTPServerWithCredentials=برای ورود به سایت به سرور FTP با ورود به سیستم / رمز عبور تعریف شده شکست خورده
-FTPFailedToRemoveFile=حذف <b>فایل٪ s</b> شکست خورد.
-FTPFailedToRemoveDir=برای حذف <b>دایرکتوری٪ s</b> شکست خورد (مجوز ورود و پوشه خالی است).
-FTPPassiveMode=حالت منفعل
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
+FTPClientSetup=برپاسازی واحد متقاضی FTP
+NewFTPClient=برپاسازی اتصال جدید FTP
+FTPArea=بخش FTP
+FTPAreaDesc=این صفحه نمائی از سرور FTP را نمایش می‌دهد.
+SetupOfFTPClientModuleNotComplete=ظاهرا برپاسازی واحد متقاضی FTP ناقص است
+FTPFeatureNotSupportedByYourPHP=PHP شما از توابع FTP پشتیبانی نمی‌کن
+FailedToConnectToFTPServer=امکان اتصال به سرور FTP نبود (سرور %s، درگاه %s)
+FailedToConnectToFTPServerWithCredentials=امکان ورود به سرور FTP با نام‌ورود/گذرواژه تعریف شده نبود
+FTPFailedToRemoveFile=حذف فایل <b>%s</b> مقدور نبود
+FTPFailedToRemoveDir=حذف پوشۀ <b>%s</b> مقدور نبود: مجوزها را بررسی کرده و مطمئن شوید پوشه خالی است.
+FTPPassiveMode=حالت انفعالی
+ChooseAFTPEntryIntoMenu=یک سایت FTP از فهرست انتخاب کنید...
+FailedToGetFile=عدم امکان دریافت فایل‌های %s
diff --git a/htdocs/langs/fa_IR/help.lang b/htdocs/langs/fa_IR/help.lang
index 73fa11ad0b1..f0311143452 100644
--- a/htdocs/langs/fa_IR/help.lang
+++ b/htdocs/langs/fa_IR/help.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=انجمن / پشتیبانی از ویکی
-EMailSupport=پشتیبانی ایمیل
-RemoteControlSupport=زمان واقعی آنلاین / پشتیبانی از راه دور
-OtherSupport=پشتیبانی دیگر
-ToSeeListOfAvailableRessources=برای تماس / نگاه کنید به منابع در دسترس:
-HelpCenter=مرکز راهنما
-DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=Type of support
-TypeSupportCommunauty=ارتباطات (رایگان)
+CommunitySupport=پشتیبانی انجمن/ویکی
+EMailSupport=پشتیبانی از طریق رایانامه
+RemoteControlSupport=پشتیبانی برخط آنی/از راه دور
+OtherSupport=سایر انواع پشتیبانی
+ToSeeListOfAvailableRessources=برای تماس/نمایش منابع فعال
+HelpCenter=مرکز کمک
+DolibarrHelpCenter=مرکز کمک و پشتیبانی Dolibarr
+ToGoBackToDolibarr=در غیر این‌صورت <a href="%s">برای ادامۀ استفاده از Dolibarr اینجا کلیک کنید</a>.
+TypeOfSupport=نوع پشتیبانی
+TypeSupportCommunauty=جامعۀ‌مجازی (رایگان)
 TypeSupportCommercial=تجاری
 TypeOfHelp=نوع
-NeedHelpCenter=Need help or support?
-Efficiency=بهره وری
-TypeHelpOnly=راهنما تنها
-TypeHelpDev=راهنما + توسعه
-TypeHelpDevForm=Help+Development+Training
-BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
-PossibleLanguages=زبانهای پشتیبانی شده
-SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=برای حمایت Dolibarr رسمی در زبان شما: <br> <a href="%s" target="_blank"><b>از٪ s</b></a>
+NeedHelpCenter=به کمک و پشتیبانی احتیاج دارید؟
+Efficiency=تاثیرگذاری
+TypeHelpOnly=فقط راهنمائی
+TypeHelpDev=راهنمائی + توسعه
+TypeHelpDevForm=راهنمائی+توسعه+آموزش
+BackToHelpCenter=در غیر این‌صورت، <a href="%s"> به صفحۀ اصلی مرکز کمک بازگردید </a>.
+LinkToGoldMember=شما می‌توانید با کلیک بر بخش مربوطه یکی از آموزش‌دهندگان از پیش انتخاب شدۀ Dolibarr برای زبان خودتان باشید (%s)، (وضعیت و قیمت حداکثر به طور خودکار به‌هنگام می‌شود):
+PossibleLanguages=زبان‌های پشتیبانی شده
+SubscribeToFoundation=پروژه Dolibarr را یاری کنید، و در مؤسسۀ آن عضو شوید
+SeeOfficalSupport=برای حمایت رسمی Dolibarr به زبان شما: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/fa_IR/holiday.lang b/htdocs/langs/fa_IR/holiday.lang
index e32cf2f933d..b3f43a7cf99 100644
--- a/htdocs/langs/fa_IR/holiday.lang
+++ b/htdocs/langs/fa_IR/holiday.lang
@@ -1,129 +1,130 @@
 # Dolibarr language file - Source file is en_US - holiday
-HRM=HRM
-Holidays=ترک
-CPTitreMenu=ترک
-MenuReportMonth=بیانیه ماهانه
-MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leave to view this page.
-AddCP=Make a leave request
+HRM=مدیریت منابع انسانی
+Holidays=مرخصی
+CPTitreMenu=مرخصی
+MenuReportMonth=گزارش ماهان
+MenuAddCP=درخواست مرخصی جدید 
+NotActiveModCP=شما باید واحد مرخصی را فعال کنید تا این صفحه را ببینید.
+AddCP=ایجاد یک درخواست مرخصی
 DateDebCP=تاریخ شروع
 DateFinCP=تاریخ پایان
 DateCreateCP=تاریخ ایجاد
-DraftCP=پیش نویس
+DraftCP=پیش‌نویس
 ToReviewCP=در انتظار تایید
 ApprovedCP=تایید شده
 CancelCP=لغو شد
-RefuseCP=رد
-ValidatorCP=Approbator
-ListeCP=List of leave
-LeaveId=Leave ID
-ReviewedByCP=Will be approved by
-UserForApprovalID=User for approval ID
-UserForApprovalFirstname=First name of approval user
-UserForApprovalLastname=Last name of approval user
-UserForApprovalLogin=Login of approval user
-DescCP=توصیف
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
-ErrorEndDateCP=شما باید تاریخ پایان بیشتر از تاریخ شروع انتخاب کنید.
-ErrorSQLCreateCP=خطای SQL در ایجاد رخ داده است:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
-ReturnCP=بازگشت به صفحه قبل
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosWorkflowCP=گردش کار اطلاعات
-RequestByCP=درخواست شده توسط
-TitreRequestCP=Leave request
-TypeOfLeaveId=Type of leave ID
-TypeOfLeaveCode=Type of leave code
-TypeOfLeaveLabel=Type of leave label
-NbUseDaysCP=Number of days of vacation consumed
-NbUseDaysCPShort=Days consumed
-NbUseDaysCPShortInMonth=Days consumed in month
-DateStartInMonth=Start date in month
-DateEndInMonth=End date in month
+RefuseCP=رد شده
+ValidatorCP=متقاضی
+ListeCP=فهرست مرخصی
+LeaveId=شناسۀ مرخصی
+ReviewedByCP=اجازه توسط
+UserForApprovalID=شناسۀ کاربر تائید کننده
+UserForApprovalFirstname=نام کاربر تائید کننده
+UserForApprovalLastname=نام‌خانوادگی کاربر تائید کننده
+UserForApprovalLogin=شناسۀ‌ورود کاربر تائیدکننده
+DescCP=توضیحا
+SendRequestCP=ایجاد درخواست مرخصی
+DelayToRequestCP=درخواست مرخصی حداقل باید <b>%sروز()</b> قبل از تاریخ ترک ایجاد شود.
+MenuConfCP=تعادل مرخصی
+SoldeCPUser=تعادل مرخصی برابر با <b>%s</b> روز است
+ErrorEndDateCP=شما باید تاریخ پایانی، بیشتر از تاریخ شروع انتخاب کنید
+ErrorSQLCreateCP=یک خطای SQL در هنگام ساخت رخ داده:
+ErrorIDFicheCP=ک خطا رخ داد، درخواست مرخصی وجود ندارد
+ReturnCP=بازگشت به صفحۀ قبل
+ErrorUserViewCP=شما مجاز به خواندن این درخواست مرخصی نیستید
+InfosWorkflowCP=اطلاعات گردش‌کار 
+RequestByCP=درخواست‌شده توسط
+TitreRequestCP=درخواست مرخصی
+TypeOfLeaveId=شناسۀ نوع درخواست مرخصی
+TypeOfLeaveCode=کد نوع درخواست مرخصی
+TypeOfLeaveLabel=برچسب نوع درخواست مرخصی
+NbUseDaysCP=تعداد روزهای مصرف شدۀ مرخصی
+NbUseDaysCPShort=جمع روزهای مصرف‌شده
+NbUseDaysCPShortInMonth=جمع‌روزهای مصرف شده در ماه
+DateStartInMonth=تاریخ شروع در ماه
+DateEndInMonth=تاریخ پایان در ماه
 EditCP=ویرایش
 DeleteCP=حذف کردن
 ActionRefuseCP=رد کردن
 ActionCancelCP=لغو کردن
 StatutCP=وضعیت
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
+TitleDeleteCP=حذف درخواست مرخصی
+ConfirmDeleteCP=حذف این درخواست مرخصی را تائید می‌کنید؟
+ErrorCantDeleteCP=خطا، شما حق حذف این درخواست مرخصی را ندارید.
+CantCreateCP=شما امکان ایجاد درخواست مرخصی را ندارید.
+InvalidValidatorCP=شما باید یک متقاضی برای درخواست مرخصی تعیین کنید
 NoDateDebut=شما باید یک تاریخ شروع انتخاب کنید.
 NoDateFin=شما باید تاریخ پایان را انتخاب کنید.
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
-DateValidCP=تاریخ تصویب
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=شما باید دلیلی برای امتناع از درخواست را انتخاب کنید.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
-DetailRefusCP=دلیل امتناع
-DateRefusCP=تاریخ امتناع
-DateCancelCP=عضویت لغو
-DefineEventUserCP=اختصاص مرخصی استثنایی برای کاربر
+ErrorDureeCP=درخواست مرخصی شما هیچ روزکاری در خود ندارد.
+TitleValidCP=تائید درخواست مرخصی
+ConfirmValidCP=آیا مطمئن هستید می‌خواهید این درخواست مرخصی را تائید کنید؟
+DateValidCP=تاریخ تائید
+TitleToValidCP=ارسال درخواست مرخصی
+ConfirmToValidCP=آیا مطمئن هستید می‌خواهید درخواست مرخصی را بفرستید؟
+TitleRefuseCP=رد درخواست مرخصی
+ConfirmRefuseCP=آیا مطمئن هستید می‌خواهید درخواست مرخصی را رد کنید؟
+NoMotifRefuseCP=شما باید دلیلی برای رد درخواست تعیین کنید.
+TitleCancelCP=لغو درخواست مرخصی
+ConfirmCancelCP=آیا مطمئن هستید می‌خواهید درخواست مرخصی را لغو کنید؟
+DetailRefusCP=دلیل رد درخواست مرخصی
+DateRefusCP=تاریخ رد درخواست
+DateCancelCP=تاریخ لغو درخواست
+DefineEventUserCP=اختصاص مرخصی استثنائی به یک کاربر
 addEventToUserCP=اختصاص مرخصی
-NotTheAssignedApprover=You are not the assigned approver
+NotTheAssignedApprover=شما تجویز‌کنندۀ انتسابی نیستید
 MotifCP=دلیل
 UserCP=کاربر
-ErrorAddEventToUserCP=در حالی که با اضافه کردن مرخصی استثنایی خطایی رخ داد.
-AddEventToUserOkCP=علاوه بر این از مرخصی استثنایی کامل شده است.
-MenuLogCP=View change logs
-LogCP=Log of updates of available vacation days
+ErrorAddEventToUserCP=یک خطا در هنگام افزودن یک درخواست استثنائی رخ داد.
+AddEventToUserOkCP=افزودن مرخصی استثنائی کاملا انجام شد.
+MenuLogCP=نمایش گزارش تغییرات
+LogCP=گزارش روزآمدسازی‌های روزهای مرخصی موجود
 ActionByCP=انجام شده توسط
 UserUpdateCP=برای کاربر
-PrevSoldeCP=موجودی قبلی
-NewSoldeCP=موجودی جدید
-alreadyCPexist=A leave request has already been done on this period.
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
-HolidaysMonthlyUpdate=به روز رسانی ماهانه
-ManualUpdate=دستی به روز رسانی
-HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee last name
-EmployeeFirstname=Employee first name
-TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
-LastHolidays=Latest %s leave requests
-AllHolidays=All leave requests
-HalfDay=Half day
-NotTheAssignedApprover=You are not the assigned approver
-LEAVE_PAID=Paid vacation
-LEAVE_SICK=Sick leave
-LEAVE_OTHER=Other leave
-LEAVE_PAID_FR=Paid vacation
+PrevSoldeCP=تعادل قبلی
+NewSoldeCP=تعادل جدید
+alreadyCPexist=یک درخواست مرخصی قبلا در همین بازه انجام شده است
+FirstDayOfHoliday=روز اول مرخصی
+LastDayOfHoliday=روز آخر مرخصی
+BoxTitleLastLeaveRequests=آخرین %s درخواست مرخصی تغییریافته
+HolidaysMonthlyUpdate=به‌روز‌رسانی ماهانه
+ManualUpdate=به‌روزرسانی دستی
+HolidaysCancelation=لغو درخواست مرخصی
+EmployeeLastname=نام‌خانوادگی کارمند
+EmployeeFirstname=نام کارمند
+TypeWasDisabledOrRemoved=نوع مرخصی (شناسۀ %s) غیرفعال است یا حذف شده است.
+LastHolidays=آخرین %s درخواست مرخصی
+AllHolidays=همۀ درخواست‌های مرخصی
+HalfDay=نیم‌روز-ساعتی
+NotTheAssignedApprover=شما تجویز‌کنندۀ انتسابی نیستید
+LEAVE_PAID=مرخصی باحقوق
+LEAVE_SICK=مرخصی استعلاجی
+LEAVE_OTHER=سایر انواع مرخصی
+LEAVE_PAID_FR=مرخصی باحقوق
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
-UpdateConfCPOK=به روز رسانی با موفقیت.
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-ErrorMailNotSend=در حالی که ارسال ایمیل یک خطا رخ داده است:
+LastUpdateCP=آخرین روزآمدسازی خودکار اختصاص مرخصی
+MonthOfLastMonthlyUpdate=ماه آخرین روزآمدسازی خودکار  اختصاص مرخصی
+UpdateConfCPOK=باموفقیت به‌روزرسانی شد
+Module27130Name= مدیریت درخواست‌های مرخصی
+Module27130Desc= مدیریت درخواست‌های مرخصی
+ErrorMailNotSend=یک خطا در هنگام ارسال رایانامه رخ داد:
 NoticePeriod=بازۀ یادآوری
 #Messages
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
-NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Holiday
-HolidaysNumberingModules=Leave requests numbering models
-TemplatePDFHolidays=Template for leave requests PDF
-FreeLegalTextOnHolidays=Free text on PDF
-WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToValidate=تائید درخواست مرخصی
+HolidaysToValidateBody=در زیر یک درخواست مرخصی در انتظار تائید است
+HolidaysToValidateDelay=درخواست مرخصی در بازه‌ای از کمتر از %s روز صورت خواهد گرفت.
+HolidaysToValidateAlertSolde=کاربری که این درخواست مرخصی را انجام داده از روزهای مرخصی کافی برخوردار نیست.
+HolidaysValidated=تائید درخواست‌های مرخصی
+HolidaysValidatedBody=درخواست مرخصی شما برای %s تا %s تائید شد.
+HolidaysRefused=درخواست رد شد
+HolidaysRefusedBody=درخواست مرخصی شما برای %s تا %s به دلیل زیر رد شد:
+HolidaysCanceled=درخواست مرخصی رد شده
+HolidaysCanceledBody=درخواست مرخصی شما برای %s تا %s لغو شد.
+FollowedByACounter=1: این نوع درخواست مرخصی لازم است توسط یک شمارنده دنبال شود. شمارنده به صورت دستی یا خودکار افزایش خواهد یافت، و در صورتی که درخواست مرخصی تائید شد، کاهش خواهد یدفت. <br> 0: با یک شمارنده دنبال نمی‌شود.
+NoLeaveWithCounterDefined=از انواع مرخصی تعریف شده هیچکدام دنبال‌شدن با شمارنده را لازم نمی‌بینند.
+GoIntoDictionaryHolidayTypes=به بخش <strong>خانه - برپاسازی - واژه‌نامه‌ها - انواع مرخصی </strong> رفته تا انواع مختلف مرخصی را تعیین کنید. 
+HolidaySetup=برپاسازی واحد تعطیلات
+HolidaysNumberingModules=روش‌های شماره‌دهی درخواست مرخصی
+TemplatePDFHolidays=قالب PDF درخواست‌های مرخصی
+FreeLegalTextOnHolidays=متن دلخواه روی PDF
+WatermarkOnDraftHolidayCards=نوشتۀ کمرنگ روی درخواست مرخصی پیش‌نویس
+HolidaysToApprove=روزهای‌تعطیل مجاز
diff --git a/htdocs/langs/fa_IR/hrm.lang b/htdocs/langs/fa_IR/hrm.lang
index 66141f2808a..6eb77f1b30c 100644
--- a/htdocs/langs/fa_IR/hrm.lang
+++ b/htdocs/langs/fa_IR/hrm.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - en_US - hrm
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
-Establishments=موسسات
-Establishment=موسسه
-NewEstablishment=موسسه جدید
-DeleteEstablishment=حذف موسسه
-ConfirmDeleteEstablishment=آیا مطمئنید که میخواهید این موسسه را حذف کنید؟
-OpenEtablishment=باز کردن موسسه
-CloseEtablishment=بستن موسسه
+HRM_EMAIL_EXTERNAL_SERVICE=رایانامۀ ممانعت کننده از خدمات خارجی مدیریت منابع انسانی
+Establishments=بنگاه‌ها
+Establishment=بنگاه
+NewEstablishment=بنگاه جدید
+DeleteEstablishment=حذف بنگاه
+ConfirmDeleteEstablishment=آیا شما مطمئن هستید که می‌خواهید این بنگاه را حذف کنید؟
+OpenEtablishment=باز‌کردن بنگاه
+CloseEtablishment=بستن بنگاه
 # Dictionary
-DictionaryDepartment=HRM - Department list
-DictionaryFunction=HRM - Function list
+DictionaryDepartment=مدیریت منابع انسانی - فهرست بخش‌ها
+DictionaryFunction=مدیریت منابع انسانی - فهرست عملکردها
 # Module
 Employees=کارمندان
 Employee=کارمند
diff --git a/htdocs/langs/fa_IR/interventions.lang b/htdocs/langs/fa_IR/interventions.lang
index 7d9b0b41e26..78e3fc1feca 100644
--- a/htdocs/langs/fa_IR/interventions.lang
+++ b/htdocs/langs/fa_IR/interventions.lang
@@ -1,66 +1,66 @@
 # Dolibarr language file - Source file is en_US - interventions
-Intervention=مداخله
-Interventions=مداخلات
-InterventionCard=کارت مداخله
-NewIntervention=مداخله های جدید
-AddIntervention=Create intervention
-ChangeIntoRepeatableIntervention=Change to repeatable intervention
-ListOfInterventions=فهرست مداخلات
-ActionsOnFicheInter=عملیات مداخله
-LastInterventions=Latest %s interventions
-AllInterventions=تمام مداخلات
-CreateDraftIntervention=ایجاد پیش نویس
-InterventionContact=تماس با مداخله
-DeleteIntervention=حذف مداخله
-ValidateIntervention=اعتبارسنجی مداخله
-ModifyIntervention=اصلاح مداخله
-DeleteInterventionLine=حذف خط مداخله
-ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
-ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
-ConfirmModifyIntervention=Are you sure you want to modify this intervention?
-ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
-ConfirmCloneIntervention=Are you sure you want to clone this intervention?
-NameAndSignatureOfInternalContact=Name and signature of intervening:
-NameAndSignatureOfExternalContact=Name and signature of customer:
-DocumentModelStandard=مدل استاندارد سند برای مداخلات
-InterventionCardsAndInterventionLines=مداخلات و خطوط مداخلات
-InterventionClassifyBilled=طبقه بندی "صورتحساب"
-InterventionClassifyUnBilled=Classify "Unbilled"
-InterventionClassifyDone=Classify "Done"
-StatusInterInvoiced=ثبت شده در صورتحساب یا لیست
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=مداخله٪ بازدید کنندگان اعتبار
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=واسطه‌گری %s توسط رایانامه ارسال شد
-InterventionDeletedInDolibarr=Intervention %s deleted
-InterventionsArea=Interventions area
-DraftFichinter=Draft interventions
-LastModifiedInterventions=آخرین %s واسطه‌گری تغییریافته
-FichinterToProcess=Interventions to process
+Intervention=پادرمیانی
+Interventions=پادرمیانی‌ها
+InterventionCard=کارت پادرمیانی
+NewIntervention=پادرمیانی جدید
+AddIntervention=ساخت پادرمیانی
+ChangeIntoRepeatableIntervention=تبدیل به مداخلۀ تکرارشدنی
+ListOfInterventions=فهرست پادرمیانی‌ها
+ActionsOnFicheInter=کارهای مربوط به پادرمیانی
+LastInterventions=آخرین %s پادرمیانی
+AllInterventions=همۀ پادرمیانی‌ها
+CreateDraftIntervention=ساخت پیش‌نویس
+InterventionContact=طرف‌تماس پادرمیانی
+DeleteIntervention=حذف پادرمیانی
+ValidateIntervention=تائیداعتبار پادرمیانی
+ModifyIntervention=ویرایش پادرمیانی
+DeleteInterventionLine=حذف سطر پادرمیانی
+ConfirmDeleteIntervention=آیا مطمئن هستید می‌خواهید این مورد پادرمیانی را حذف کنید؟
+ConfirmValidateIntervention=آیا مطمئن هستید می‌خواهید این مورد پادرمیانی را تحت نام <b>%s</b> تائیداعتبار کنید؟
+ConfirmModifyIntervention=آیا مطمئن هستید می‌خواهید این پادرمیانی را ویرایش کنید؟
+ConfirmDeleteInterventionLine=آیا مطمئن هستید می‌خواهید این خط پادرمیانی را حذف کنید؟
+ConfirmCloneIntervention=آیا مطمئن هستید می‌خواهید از این پادرمیانی نسخه‌برداری کنید؟
+NameAndSignatureOfInternalContact=نام و امضای عامل پادرمیانی:
+NameAndSignatureOfExternalContact=نام و امضای مشتری:
+DocumentModelStandard=سند نمونۀ استاندارد برای پادرمیانی‌ها
+InterventionCardsAndInterventionLines=پادرمیانی‌ها و خطوط پادرمیانی
+InterventionClassifyBilled=طبقه‌بندی به صورت "صورت‌حساب صادر شده"
+InterventionClassifyUnBilled=طبقه‌بندی به صورت "صورت‌حساب صادر نشده"
+InterventionClassifyDone=طبقه‌بندی به صورت "انجام شده"
+StatusInterInvoiced=صورت‌حساب شده
+SendInterventionRef=تسلیم پادرمیانی %s
+SendInterventionByMail=ارسال پادرمیانی با رایانامه
+InterventionCreatedInDolibarr=پادرمیانی %s ساخته شده
+InterventionValidatedInDolibarr=پادرمیانی %s تائیداعتبار شد
+InterventionModifiedInDolibarr=پادرمیانی %s ویرایش شد
+InterventionClassifiedBilledInDolibarr=پادرمیانی %s صورت‌حساب‌ صادر شده ثبت شد
+InterventionClassifiedUnbilledInDolibarr=پادرمیانی %s صورت‌حساب صادر نشده ثبت شد
+InterventionSentByEMail=پادرمیانی %s توسط رایانامه ارسال شد
+InterventionDeletedInDolibarr=پادرمیانی %s حذف شد
+InterventionsArea=بخش پادرمیانی
+DraftFichinter=پادرمیانی‌های پیش‌نویس
+LastModifiedInterventions=آخرین %s پادرمیانی ویرایش شده
+FichinterToProcess=پادرمیانی‌های قابل پردازش
 ##### Types de contacts #####
-TypeContact_fichinter_external_CUSTOMER=پس تا مشتری تماس
+TypeContact_fichinter_external_CUSTOMER=طرف‌تماس پیگیر مشتری
 # Modele numérotation
-PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
-PrintProductsOnFichinterDetails=interventions generated from orders
-UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
-UseDurationOnFichinter=Hides the duration field for intervention records
-UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=No. of intervention cards
-NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
-AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
+PrintProductsOnFichinter=همچنین سطور نوع "محصول" (نه فقط خدمات) روی کارت پادرمیانی چاپ شود
+PrintProductsOnFichinterDetails=پادرمیانی‌های تولید شده از سفارش‌ها
+UseServicesDurationOnFichinter=استفاده از طول‌مدت خدمات برای پادرمیانی‌های تولید شده از سفارش‌ها
+UseDurationOnFichinter=بخش طول‌مدت را برای ردیف‌های پادرمیانی پنهان می‌کند
+UseDateWithoutHourOnFichinter=ساعت و دقیقۀ مربوط به بخش تاریه را از ردیف‌های پادرمیانی پنهان می‌کند
+InterventionStatistics=آمار پادرمیانی‌ها
+NbOfinterventions=تعداد کارت‌های پادرمیانی
+NumberOfInterventionsByMonth=تعداد کارت‌های پادرمیانی بر حسب ما (تاریخ تائید اعتبار)
+AmountOfInteventionNotIncludedByDefault=به طور پیش‌فرض مبلغ پادرمیانی در سود محاسبه نمی‌شود (در اکثر موارد، برگه‌های زمان برای محاسبۀ زمان صرف شده استفاده می‌شوند). برای شامل کردن سود آن‌ها گزینۀ PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT را در خانه-برپاسازی-سایر به 1 تغییر دهید.
 ##### Exports #####
-InterId=Intervention id
-InterRef=Intervention ref.
-InterDateCreation=Date creation intervention
-InterDuration=Duration intervention
-InterStatus=Status intervention
-InterNote=Note intervention
-InterLineId=Line id intervention
-InterLineDate=Line date intervention
-InterLineDuration=Line duration intervention
-InterLineDesc=Line description intervention
+InterId=شناسۀ پادرمیانی
+InterRef=ش.ارجاع پادرمیانی
+InterDateCreation=تاریخ ساخت پادرمیانی
+InterDuration=طول‌مدت پادرمیانی
+InterStatus=وضعیت پادرمیانی
+InterNote=یادداشت پادرمیانی
+InterLineId=شناسۀ سطر پادرمیانی
+InterLineDate=تاریخ سطر پادرمیانی
+InterLineDuration=طول‌مدت سطر پادرمیانی
+InterLineDesc=توضیحات سطر پادرمیانی
diff --git a/htdocs/langs/fa_IR/languages.lang b/htdocs/langs/fa_IR/languages.lang
index 1ea52293ee3..0a23193cdf0 100644
--- a/htdocs/langs/fa_IR/languages.lang
+++ b/htdocs/langs/fa_IR/languages.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_ar_AR=عربی
-Language_ar_EG=Arabic (Egypt)
+Language_ar_EG=عربی (مصر)
 Language_ar_SA=عربی
-Language_bn_BD=Bengali
+Language_bn_BD=بنگالی
 Language_bg_BG=بلغاری
 Language_bs_BA=بوسنی
 Language_ca_ES=کاتالانی
@@ -13,9 +13,9 @@ Language_de_DE=آلمانی
 Language_de_AT=آلمانی (اتریش)
 Language_de_CH=آلمانی (سوییس)
 Language_el_GR=یونانی
-Language_el_CY=Greek (Cyprus)
+Language_el_CY=یونانی (قبرس)
 Language_en_AU=انگلیسی(استرالیا)
-Language_en_CA=English (Canada)
+Language_en_CA=انگلیسی (کانادا)
 Language_en_GB=انگلیسی بریتانیا
 Language_en_IN=انگلیسی هند
 Language_en_NZ=انگلیسی نیوزلند
@@ -24,29 +24,29 @@ Language_en_US=انگلیسی آمریکا
 Language_en_ZA=انگلیسی آفریقای جنوبی
 Language_es_ES=اسپانیایی
 Language_es_AR=اسپانیایی آرژانتین
-Language_es_BO=Spanish (Bolivia)
+Language_es_BO=اسپانیائی (بولیوی)
 Language_es_CL=اسپانیایی (شیلی)
-Language_es_CO=Spanish (Colombia)
+Language_es_CO=اسپانیائی (کلمبیا)
 Language_es_DO=اسپانیایی (جمهوری دومینیکن)
-Language_es_EC=Spanish (Ecuador)
+Language_es_EC=اسپانیائی (اکوادور)
 Language_es_HN=اسپانیایی (هندوراس)
 Language_es_MX=اسپانیایی (مکزیک)
-Language_es_PA=Spanish (Panama)
+Language_es_PA=اسپانیائی (پاناما)
 Language_es_PY=اسپانیایی پروگوئه
 Language_es_PE=اسپانیایی پرو
 Language_es_PR=اسپانیایی (پورتوریکو)
-Language_es_UY=Spanish (Uruguay)
-Language_es_VE=Spanish (Venezuela)
+Language_es_UY=اسپانیائی (اروگوئه)
+Language_es_VE=اسپانیائی (ونزوئلا)
 Language_et_EE=زبان استونی
 Language_eu_ES=باسک
 Language_fa_IR=پارسی
-Language_fi_FI=Finnish
+Language_fi_FI=فنلاندی
 Language_fr_BE=فرانسوی بلژیکی
 Language_fr_CA=فرانسوی کانادا
 Language_fr_CH=فرانسوی سوییس
 Language_fr_FR=فرانسوی
 Language_fr_NC=فرانسه (کالدونیای جدید)
-Language_fy_NL=Frisian
+Language_fy_NL=فریسی
 Language_he_IL=عبری
 Language_hr_HR=کرواتی
 Language_hu_HU=مجارستانی
@@ -54,15 +54,15 @@ Language_id_ID=اندونزی
 Language_is_IS=ایسلندی
 Language_it_IT=ایتالیایی
 Language_ja_JP=ژاپنی
-Language_ka_GE=Georgian
-Language_km_KH=Khmer
-Language_kn_IN=Kannada
+Language_ka_GE=گرجی
+Language_km_KH=خمر
+Language_kn_IN=کاندا
 Language_ko_KR=کره ای
 Language_lo_LA=لائوس
 Language_lt_LT=زبان لیتوانی
 Language_lv_LV=لتونی
 Language_mk_MK=مقدونی
-Language_mn_MN=Mongolian
+Language_mn_MN=مغولی
 Language_nb_NO=نروژی
 Language_nl_BE=آلمانی نروژی
 Language_nl_NL=آلمانی (هلند)
@@ -78,11 +78,12 @@ Language_sv_SV=سوئدی
 Language_sv_SE=سوئدی
 Language_sq_AL=آلبانی
 Language_sk_SK=اسلواکی
-Language_sr_RS=Serbian
-Language_sw_SW=Kiswahili
+Language_sr_RS=صربی
+Language_sw_SW=سواحلی
 Language_th_TH=تایلندی
 Language_uk_UA=اوکراین
 Language_uz_UZ=ازبک
 Language_vi_VN=ویتنامی
 Language_zh_CN=چینی
 Language_zh_TW=چینی (سنتی)
+Language_bh_MY=مالائی
diff --git a/htdocs/langs/fa_IR/ldap.lang b/htdocs/langs/fa_IR/ldap.lang
index f19f47d011b..804e1d0e23a 100644
--- a/htdocs/langs/fa_IR/ldap.lang
+++ b/htdocs/langs/fa_IR/ldap.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=رمز عبور برای <b> کاربر از٪ s </ B> در دامنه <b> از٪ s </ b> باید تغییر کند.
-UserMustChangePassNextLogon=کاربر باید رمز عبور بر روی دامنه را تغییر دهد %s
-LDAPInformationsForThisContact=اطلاعات در پایگاه داده LDAP برای این مخاطب
-LDAPInformationsForThisUser=اطلاعات در پایگاه داده LDAP برای این کاربر
+YouMustChangePassNextLogon=گذرواژۀ برای کاربر <b>%s</b> بر روی دامنۀ <b>%s</b> باید تغییر کند.
+UserMustChangePassNextLogon=کاربر باید گذرواژۀ خود را روی دامنۀ %s تغییر ده
+LDAPInformationsForThisContact=اطلاعات در پایگاه داده LDAP برای این طرف‌تماس
+LDAPInformationsForThisUser=اطلاعات در پایگاه داده LDAP برای این طرف‌تماس
 LDAPInformationsForThisGroup=اطلاعات در پایگاه داده LDAP برای این گروه
 LDAPInformationsForThisMember=اطلاعات در پایگاه داده LDAP برای این عضو
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
-LDAPAttributes=ویژگی های LDAP
+LDAPInformationsForThisMemberType=اطلاعات در پایگاه داده LDAP برای این نوع‌کاربری
+LDAPAttributes=ویژگی‌های LDAP
 LDAPCard=کارت LDAP
-LDAPRecordNotFound=رکورد در پایگاه داده LDAP یافت نشد
-LDAPUsers=کاربران در پایگاه داده LDAP
+LDAPRecordNotFound=ردیف مورد نظر در پایگاه داده LDAP یافت نشد
+LDAPUsers=کاربران پایگاه داده LDAP
 LDAPFieldStatus=وضعیت
 LDAPFieldFirstSubscriptionDate=تاریخ اولین عضویت
-LDAPFieldFirstSubscriptionAmount=اولین مبلغ آبونمان
-LDAPFieldLastSubscriptionDate=Latest subscription date
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
-LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example : skypeName
-UserSynchronized=تعریف کاربر
-GroupSynchronized=تعریف گروه
-MemberSynchronized=تعریف کاربران
-MemberTypeSynchronized=Member type synchronized
-ContactSynchronized=تعریف تماس
-ForceSynchronize=هماهنگ سازی نیروی Dolibarr -> LDAP
-ErrorFailedToReadLDAP=برای خواندن پایگاه داده LDAP شکست خورده است. LDAP راه اندازی ماژول و دسترسی به پایگاه داده را بررسی کنید.
-PasswordOfUserInLDAP=Password of user in LDAP
+LDAPFieldFirstSubscriptionAmount=اولین مبلغ عضویت
+LDAPFieldLastSubscriptionDate=آخرین تاریخ عضویت
+LDAPFieldLastSubscriptionAmount=آخرین مبلغ عضویت
+LDAPFieldSkype=شناسۀ Skype
+LDAPFieldSkypeExample=مثال: skeypeName
+UserSynchronized=کاربر همگام‌سازی‌شد
+GroupSynchronized=گروه، همگام‌سازی‌شد
+MemberSynchronized=عضو، همگام‌سازی شد
+MemberTypeSynchronized=نوع‌کاربری همگام‌سازی‌شد
+ContactSynchronized=طرف‌تماس هم‌گام‌سازی‌شد
+ForceSynchronize=اجبار همگام‌سازی Dolibarr -> LDAP
+ErrorFailedToReadLDAP=خوانش پایگاه‌داده LDAP ناموف بود. برپاسازی واحد LDAP و دسترسی به پایگاه‌داده را مورد بررسی قرار دهید.
+PasswordOfUserInLDAP=گذرواژۀ کاربر در LDAP
diff --git a/htdocs/langs/fa_IR/link.lang b/htdocs/langs/fa_IR/link.lang
index 6cedaa448f3..130af3f943a 100644
--- a/htdocs/langs/fa_IR/link.lang
+++ b/htdocs/langs/fa_IR/link.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - languages
-LinkANewFile=لینک فایل جدید / سند
-LinkedFiles=اسناد و فایل های مرتبط
-NoLinkFound=بدون لینک ها
-LinkComplete=فایل با موفقیت ربط داده شده است
-ErrorFileNotLinked=فایل نمی تواند مرتبط شود
-LinkRemoved=لینک٪ s را حذف شده
-ErrorFailedToDeleteLink= برای حذف لینک <b>«٪ s»</b> شکست خورد
-ErrorFailedToUpdateLink= برای به روز رسانی لینک <b>«٪ s»</b> شکست خورد
-URLToLink=URL to link
+LinkANewFile=پیوند یک فایل/سند
+LinkedFiles=اسناد و فایل‌های مرتبط
+NoLinkFound=پیوند ثبت‌شده‌ای وجود ندارد
+LinkComplete=فایل با موفقیت پیوند شد
+ErrorFileNotLinked=امکان پیوند فایل وجود ندارد
+LinkRemoved=پیوند %s برداشته شد
+ErrorFailedToDeleteLink= امکان حذف پیوند '<b>%s</b>' نبود
+ErrorFailedToUpdateLink= امکان روزآمدسازی پیوند '<b>%s</b>' نبود
+URLToLink=نشانی برای پیوند کردن
diff --git a/htdocs/langs/fa_IR/loan.lang b/htdocs/langs/fa_IR/loan.lang
index 76e130c7e6c..52db2645e3b 100644
--- a/htdocs/langs/fa_IR/loan.lang
+++ b/htdocs/langs/fa_IR/loan.lang
@@ -1,31 +1,31 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Loan
+Loan=وام
 Loans=وام‌ها
-NewLoan=New Loan
-ShowLoan=Show Loan
-PaymentLoan=Loan payment
-LoanPayment=Loan payment
-ShowLoanPayment=Show Loan Payment
+NewLoan=وام جدید
+ShowLoan=نمایش وا
+PaymentLoan=پرداخت وا
+LoanPayment=پرداخت وا
+ShowLoanPayment=نمایش پرداخت وام
 LoanCapital=سرمایه
-Insurance=Insurance
-Interest=Interest
-Nbterms=Number of terms
-Term=Term
-LoanAccountancyCapitalCode=Accounting account capital
-LoanAccountancyInsuranceCode=Accounting account insurance
-LoanAccountancyInterestCode=Accounting account interest
-ConfirmDeleteLoan=Confirm deleting this loan
-LoanDeleted=Loan Deleted Successfully
-ConfirmPayLoan=Confirm classify paid this loan
-LoanPaid=Loan Paid
-ListLoanAssociatedProject=List of loan associated with the project
-AddLoan=Create loan
-FinancialCommitment=Financial commitment
-InterestAmount=Interest
-CapitalRemain=Capital remain
+Insurance=بیمه
+Interest=سود
+Nbterms=تعداد شرایط/دوره‌ها
+Term=شرایط
+LoanAccountancyCapitalCode=با توجه به سرمایۀ حساب
+LoanAccountancyInsuranceCode=با توجه به بیمۀ حساب
+LoanAccountancyInterestCode=با توجه به سود حساب
+ConfirmDeleteLoan=تائید حذف این وا
+LoanDeleted=وام با دقت حذف شد
+ConfirmPayLoan=تائید پرداخت این وام
+LoanPaid=وام پرداخت شد
+ListLoanAssociatedProject=فهرست وام‌های مربوط به این طرح
+AddLoan=ساخت وام
+FinancialCommitment=تعهد مالی
+InterestAmount=سود
+CapitalRemain=سرمایۀ مانده
 # Admin
-ConfigLoan=Configuration of the module loan
-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/fa_IR/mailmanspip.lang b/htdocs/langs/fa_IR/mailmanspip.lang
index d85129f20fb..5474d5e829d 100644
--- a/htdocs/langs/fa_IR/mailmanspip.lang
+++ b/htdocs/langs/fa_IR/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=پستچی و SPIP ماژول راه اندازی
-MailmanTitle=پستچی لیست پستی سیستم
-TestSubscribe=برای آزمایش اشتراک به لیست پستچی
-TestUnSubscribe=برای آزمایش لغو اشتراک از لیست پستچی
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
-SynchroMailManEnabled=به روز رسانی پستچی انجام خواهد شد
-SynchroSpipEnabled=به روز رسانی SPIP انجام خواهد شد
-DescADHERENT_MAILMAN_ADMINPW=رمز عبور مدیر پستچی
-DescADHERENT_MAILMAN_URL=URL برای اشتراک پستچی
-DescADHERENT_MAILMAN_UNSUB_URL=URL برای unsubscriptions پستچی
-DescADHERENT_MAILMAN_LISTS=لیست (ها) برای کتیبه خودکار از اعضای جدید (با کاما جدا شوند)
-SPIPTitle=سیستم مدیریت محتوای SPIP
-DescADHERENT_SPIP_SERVEUR=SPIP سرور
-DescADHERENT_SPIP_DB=SPIP نام پایگاه داده
-DescADHERENT_SPIP_USER=SPIP پایگاه داده ورود
-DescADHERENT_SPIP_PASS=رمز عبور پایگاه داده SPIP
-AddIntoSpip=اضافه کردن به SPIP
-AddIntoSpipConfirmation=آیا مطمئن هستید که می خواهید برای اضافه کردن این عضو را SPIP؟
-AddIntoSpipError=برای اضافه کردن کاربر در SPIP ناموفق
+MailmanSpipSetup=برپاسازی واحد Mailman و SPIP
+MailmanTitle=سامانۀ فهرست رایانامۀ Mailman
+TestSubscribe=برای آزمایش فهرست‌های عضویت در Mailman
+TestUnSubscribe=برای آزمایش لغوعضویت فهرست‌های Mailman
+MailmanCreationSuccess=آزمایش عضویت با موفقیت اجرا شد
+MailmanDeletionSuccess=آزمایش لغوعضویت با موفقیت اجرا شد
+SynchroMailManEnabled=یک به‌روزرسانی Mailman انجام خواهد شد
+SynchroSpipEnabled=یک به‌روزرسانی SPIP انجام خواهد شد
+DescADHERENT_MAILMAN_ADMINPW=گذرواژۀ مدیری Mailman
+DescADHERENT_MAILMAN_URL=نشانی عضویت‌های Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=نشانی لغوعضویت‌های Mailman
+DescADHERENT_MAILMAN_LISTS=فهرست‌‌های ثبت خودکار اعضای جدید ((جداشده با ویرگول))
+SPIPTitle=سامانۀ مدیریت محتوای SPIP
+DescADHERENT_SPIP_SERVEUR=سرور SPIP
+DescADHERENT_SPIP_DB=نام پایگاه دادۀ SPIP
+DescADHERENT_SPIP_USER=نام‌ورود پایگاه‌دادۀ SPIP
+DescADHERENT_SPIP_PASS=گذرواژۀ پایگاه‌دادۀ SPIP
+AddIntoSpip=افزودن به SPIP
+AddIntoSpipConfirmation=آیا مطمئن هستید می‌خواهید این عضو را به SPIP بیافزائید؟
+AddIntoSpipError=عدم موفقیت در افزودن کاربر به SPIP
 DeleteIntoSpip=حذف از SPIP
-DeleteIntoSpipConfirmation=آیا مطمئن هستید که می خواهید به حذف این عضو از SPIP؟
-DeleteIntoSpipError=به سرکوب کاربر از SPIP ناموفق
-SPIPConnectionFailed=برای اتصال به SPIP ناموفق
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+DeleteIntoSpipConfirmation=آیا مطمئن هستید می‌خواهید این عضو را از SPIP حذف کنید؟
+DeleteIntoSpipError=عدم موفقیت در توقف کاربر از SPIP
+SPIPConnectionFailed=عدم موفقیت در اتصال به SPIP
+SuccessToAddToMailmanList=%s با موفقیت به فهرست Mailman با عنوان %s یا پایگاه دادۀ SPIP اضافه شد
+SuccessToRemoveToMailmanList=%s با موفقیت به فهرست Mailman با عنوان %s یا پایگاه دادۀ SPIP اضافه شد
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index 26915b482f4..05a6b345a45 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -11,14 +11,16 @@ MailFrom=فرستنده
 MailErrorsTo=خطاها به
 MailReply=پاسخ به
 MailTo=گیرنده (ها)
-MailToUsers=To user(s)
+MailToUsers=به کاربر(ان)
 MailCC=کپی کنید به
-MailToCCUsers=Copy to users(s)
+MailToCCUsers=یک نسخه به کاربر(ان)
 MailCCC=نسخه های کش شده به
-MailTopic=Email topic
+MailTopic=عنوان رایانامه
 MailText=پیام
 MailFile=فایل های پیوست شده
 MailMessage=بدن ایمیل
+SubjectNotIn=در موضوع نیست
+BodyNotIn=در بدنه نیست
 ShowEMailing=نمایش ایمیل
 ListOfEMailings=فهرست ارسال ایمیل ها
 NewMailing=ایمیل جدید
@@ -41,62 +43,62 @@ MailSuccessfulySent=رایانامه (از %s به %s) باموفقیت برای
 MailingSuccessfullyValidated=ایمیل با موفقیت معتبر
 MailUnsubcribe=لغو اشتراک
 MailingStatusNotContact=آیا تماس نمی
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
+MailingStatusReadAndUnsubscribe=خواندن و لغوعضویت
 ErrorMailRecipientIsEmpty=نشانی پست الکترونیکی خالی است
 WarningNoEMailsAdded=آدرس ایمیل جدید برای اضافه کردن به لیست گیرنده.
-ConfirmValidMailing=Are you sure you want to validate this emailing?
-ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
-ConfirmDeleteMailing=Are you sure you want to delete this emailing?
-NbOfUniqueEMails=No. of unique emails
-NbOfEMails=No. of EMails
+ConfirmValidMailing=آیا مطمئن هستید می‌خواهید این ارسال را تائید کنید؟
+ConfirmResetMailing=هشدار! با بازسازی ارسال راینامۀ <b>%s</b>، شما اجازۀ بازارسال این رایانامه را به شکل انبوده خواهید داد. آیا مطمئن به انجام این کار هستید؟
+ConfirmDeleteMailing=آیا مطمئن هستید می‌خواهید این ارسال رایانامه را حذف کنید؟
+NbOfUniqueEMails=تعداد رایانامه‌های منحصر به فرد
+NbOfEMails=تعداد رایانامه‌ها
 TotalNbOfDistinctRecipients=تعداد دریافت کنندگان مشخص
 NoTargetYet=بدون دریافت کنندگان تعریف شده است هنوز (برو روی تب در گیرندگان ')
-NoRecipientEmail=No recipient email for %s
+NoRecipientEmail=رایانامأ دریافت کننده برای %s وجود ندارد
 RemoveRecipient=حذف گیرنده
 YouCanAddYourOwnPredefindedListHere=برای ایجاد ایمیل ماژول انتخاب خود را، htdocs / اصلی / ماژول / پستی / README.
 EMailTestSubstitutionReplacedByGenericValues=هنگام استفاده از حالت تست، متغیرهای تعویض با ارزش کلی میشه
 MailingAddFile=ضمیمه این فایل
 NoAttachedFiles=بدون فایل های پیوست شده
-BadEMail=Bad value for Email
-ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+BadEMail=مقدار نادرست برای رایانامه
+ConfirmCloneEMailing=آیا مطمئن هستید می‌خواهید از این ارسال رایانامه نسخه‌برداری کنید؟
 CloneContent=پیام کلون
 CloneReceivers=دریافت کنندگان Cloner به
-DateLastSend=Date of latest sending
+DateLastSend=آخرین تاریخ ارسال
 DateSending=تاریخ ارسال
 SentTo=ارسال شده <b>به٪ s</b>
 MailingStatusRead=خواندن
-YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
-ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
-EMailSentToNRecipients=Email sent to %s recipients.
-EMailSentForNElements=Email sent for %s elements.
+YourMailUnsubcribeOK=رایانامۀ <b>%s</b> فعلا از ارسال فهرستی رایانامه لغوعضویت کرده است
+ActivateCheckReadKey=کلید مورد استفاده برای حفاظت نشانی استفاده شده در "رسید خوانده شدن" و قابلیت "لغوعضویت"
+EMailSentToNRecipients=رایانامه به %s گیرنده ارسال شد
+EMailSentForNElements=رایانامه به %s عنصر ارسال شد
 XTargetsAdded=<b>٪ s را</b> دریافت کنندگان اضافه به لیست هدف
-OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
-AllRecipientSelected=The recipients of the %s record selected (if their email is known).
-GroupEmails=Group emails
-OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
-WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
-ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
-SentXXXmessages=%s message(s) sent.
-ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
-MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
-MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
-MailingModuleDescContactsByCategory=Contacts by categories
-MailingModuleDescContactsByFunction=Contacts by position
-MailingModuleDescEmailsFromFile=Emails from file
-MailingModuleDescEmailsFromUser=Emails input by user
-MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
-SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+OnlyPDFattachmentSupported=در صورتی که اسناد PDF قبلا برای اشیاء قابل ارسال تولید شده باشند، به رایانامه پیوست خواهند شد. در غیر این‌صورت، رایانامه‌ای ارسال نخواهد شد (همچنین، توجه داشته باشید که تنها سندهای PDF به‌عنوان پیوست‌های ارسال انبوه در این نسخه پشتیبانی می‌شوند).
+AllRecipientSelected=دریافت کنندگان مربوط به %s ردیف انتخاب شدند (در صورتی که رایانامۀ آن‌ها معلوم باشد).
+GroupEmails=گروه‌بندی رایانامه‌ها
+OneEmailPerRecipient=یک رایانامه برای یک گیرنده (به طور پیش‌فرض، یک رایانامه برای هر ردیف انتخاب شده)
+WarningIfYouCheckOneRecipientPerEmail=هشدار، در صورتی که این کادر را تائید کنید، این بدان معناست تنها یک رایانامه به ردیف‌های مختلف انتخاب شده ارسال می‌شود، بنابراین، در صورتی که رایانامۀ شما دربردارندۀ متغیرهای جایگزین‌ساز باشد که به داده‌های یک ردیف اشاره می‌کند، امکان جایگزینی آن‌ها وجود نخواهد داشت.
+ResultOfMailSending=نتیجۀ ارسال انبوه رایانامه
+NbSelected=تعداد انتخاب شده
+NbIgnored=تعداد نادیده‌گرفته‌شده
+NbSent=تعداد ارسال‌شده
+SentXXXmessages=%s پیام ارسال شد ()
+ConfirmUnvalidateEmailing=آیا مطمئنید می‌خواهید وضعیت رایانامۀ <b>%s</b> را به حالت پیش‌نویس تغییر دهید؟
+MailingModuleDescContactsWithThirdpartyFilter=طرف‌تماس با صافی‌های مشتری
+MailingModuleDescContactsByCompanyCategory=طرف‌های تماس با دسته‌بندی شخص‌سوم
+MailingModuleDescContactsByCategory=طرف‌های تماس با دسته‌بندی‌ها
+MailingModuleDescContactsByFunction=طرف‌های تماس با سمت‌ها
+MailingModuleDescEmailsFromFile=رایانامه‌ها از فایل
+MailingModuleDescEmailsFromUser=ورودی رایانامه کاربر
+MailingModuleDescDolibarrUsers=کاربران دارای رایانامه
+MailingModuleDescThirdPartiesByCategories=شخص‌سوم‌ها (بر حسب دسته‌بندی)
+SendingFromWebInterfaceIsNotAllowed=ارسال از رابط وب مجاز نیست.
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=خط٪ در فایل
 RecipientSelectionModules=درخواست تعریف شده برای انتخاب گیرنده
 MailSelectedRecipients=دریافت کنندگان برگزیده
 MailingArea=منطقه ارسال ایمیل ها
-LastMailings=Latest %s emailings
+LastMailings=آخرین %s رایانامۀ ارسال شده
 TargetsStatistics=آمار اهداف
 NbOfCompaniesContacts=تماس با ما منحصر به فرد / آدرس
 MailNoChangePossible=دریافت کنندگان برای ایمیل معتبر نمی تواند تغییر کند
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index e35ee7e62c7..d68b3a85323 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -371,6 +371,7 @@ Percentage=درصد
 Total=جمع‌کل
 SubTotal=جمع جزء
 TotalHTShort=جمع‌کل (بدون م)
+TotalHT100Short=جمع 100 %% (بدون‌مالیات)
 TotalHTShortCurrency=جمع‌کل (بدون مالیات در واحد پولی)
 TotalTTCShort=جمع‌کل (با مالیات)
 TotalHT=جمع‌کل (بدون مالیت)
@@ -402,7 +403,7 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Additionnal cents
+LT1GC=خرده‌های-cent اضافی 
 VATRate=نرخ مالیات
 VATCode=کد نرخ مالیات
 VATNPR=NPR نرخ مالیات
@@ -643,14 +644,13 @@ SendAcknowledgementByMail=ارسال رایانامۀ تائید
 SendMail=ارسال رایانامه
 Email=رایانامه
 NoEMail=بدون رایانامه
-Email=رایانامه
 AlreadyRead=قبلا خوانده شده
 NotRead=خوانده نشده
 NoMobilePhone=بدون تلفن‌همراه
 Owner=مالک
 FollowingConstantsWillBeSubstituted=مثادیر ثابت مقابل با مقدار متناظر جایگزن خواهد شد
 Refresh=تازه‌کردن
-BackToList=بازگشت به فرهست
+BackToList=بازگشت به فهرست
 GoBack=بازگشت
 CanBeModifiedIfOk=در صورت معتبر بودن قابل تغییر است
 CanBeModifiedIfKo=در صورت معتبر بودن قابل تغییر نیست
@@ -671,7 +671,6 @@ Method=روش
 Receive=دریافت
 CompleteOrNoMoreReceptionExpected=کامل‌شده یا در انتظار چیز دیگری نیست
 ExpectedValue=مقدار مورد انتظار
-CurrentValue=مقدار کنونی
 PartialWoman=جزئی
 TotalWoman=کل
 NeverReceived=هرگز دریافت نشده
@@ -834,6 +833,7 @@ RelatedObjects=اشیاء مربوطه
 ClassifyBilled=طبقه‌بندی صورت‌شده‌ها
 ClassifyUnbilled=طبقه‌بندی صورت‌نشده‌ها
 Progress=پیش‌روی
+ProgressShort=پیشرفت
 FrontOffice=بخش‌مشتریان
 BackOffice=بخش‌مدیران
 View=نما
@@ -842,6 +842,11 @@ Exports=صادرات
 ExportFilteredList=فهرست گزینشی صادرا
 ExportList=فهرست صادرات
 ExportOptions=گزینه‌های صادرکردن
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=متفرقه
 Calendar=تقویم
 GroupBy=گروه‌بندی توسط...
@@ -854,7 +859,7 @@ Download=دریافت
 DownloadDocument=دریافت سن
 ActualizeCurrency=به‌روز‌رسانی نرخ واحدپولی
 Fiscalyear=سال مالی
-ModuleBuilder=واحد ساز
+ModuleBuilder=واحدساز و برنامه‌ساز
 SetMultiCurrencyCode=تنظیم واحدپولی
 BulkActions=کنش‌های گروهی
 ClickToShowHelp=برای نمایش راهنما کلیک کنید
@@ -942,7 +947,7 @@ SearchIntoContracts=قراردادها
 SearchIntoCustomerShipments=حمل‌ونقل مشتریان
 SearchIntoExpenseReports=گزارش‌هزینه‌ها
 SearchIntoLeaves=ترک
-SearchIntoTickets=Tickets
+SearchIntoTickets=برگه‌های پشتیبانی
 CommentLink=نظرات
 NbComments=تعداد نظرات
 CommentPage=محل نظرات
@@ -967,6 +972,10 @@ YouAreCurrentlyInSandboxMode=شما فعلا در حالت "شن‌بازی" %s
 Inventory=انبار
 AnalyticCode=کد Analytic
 TMenuMRP=MRP
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
+ShowMoreInfos=نمایش اطلاعات بیشتر
+NoFilesUploadedYet=لطفا ابتدا یک سند بالاگذاری نمائید
+SeePrivateNote=ملاحظۀ یادداشت خصوصی
+PaymentInformation=اطلاعات پرداخت
+ValidFrom=معتبر از
+ValidUntil=معتبر تا
+NoRecordedUsers=No users
diff --git a/htdocs/langs/fa_IR/margins.lang b/htdocs/langs/fa_IR/margins.lang
index 675f7b51a05..ca2b20809a8 100644
--- a/htdocs/langs/fa_IR/margins.lang
+++ b/htdocs/langs/fa_IR/margins.lang
@@ -1,44 +1,44 @@
 # Dolibarr language file - Source file is en_US - marges
 
 Margin=حاشیه
-Margins=حاشیه
-TotalMargin=حاشیه ها
+Margins=حاشیه‌ه
+TotalMargin=حاشیۀ کل
 MarginOnProducts=حاشیه / محصولات
 MarginOnServices=حاشیه / خدمات
-MarginRate=میزان مارجین
-MarkRate=نرخ علامت گذاری
-DisplayMarginRates=نرخ حاشیه نمایش
-DisplayMarkRates=نرخ علامت گذاری به عنوان صفحه نمایش
+MarginRate=نرخ حاشیه
+MarkRate=نرخ نشانه
+DisplayMarginRates=نمایش نرخ‌های حاشیه
+DisplayMarkRates=نمایش نرخ‌های نشانه
 InputPrice=قیمت ورودی
-margin=مدیریت سود
-margesSetup=راه اندازی مدیریت سود
+margin=مدیریت حاشیۀ سود
+margesSetup=برپاسازی مدیریت حاشیۀ سود
 MarginDetails=جزئیات حاشیه
-ProductMargins=حاشیه های محصولات
-CustomerMargins=حاشیه مشتری
-SalesRepresentativeMargins=فروش حاشیه نماینده
-UserMargins=User margins
+ProductMargins=حاشیۀ محصولات
+CustomerMargins=حاشیۀ مشتری
+SalesRepresentativeMargins=حاشیه‌های نمایندۀ فروش
+UserMargins=حاشیه‌های کاربر
 ProductService=محصولات و خدمات
-AllProducts=همه محصولات و خدمات
+AllProducts=همۀ محصولات و خدمات
 ChooseProduct/Service=انتخاب محصول و یا خدمات
-ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
-MARGIN_METHODE_FOR_DISCOUNT=روش مارجین برای تخفیف جهانی
+ForceBuyingPriceIfNull=الزام مبلغ خرید/هزینه به قیمت فروش، در صورتی که تعریف نشده باشد
+ForceBuyingPriceIfNullDetails=در صورتی که مبلغ خرید/هزینه تعریف نشده باشد، و این گزینه "روشن" باشد، حاشیۀ این سطر صفر خواهد بود (مبلغ خرید/هزینه = قیمت فروش)، در غیر این‌صورت اگر ("خاموش") باشد، حاشیه برابر با پیش‌فرض پیشنهادی خواهد بود.
+MARGIN_METHODE_FOR_DISCOUNT=روش حاشیه برای تخفیف‌های سراسری
 UseDiscountAsProduct=به عنوان یک محصول
-UseDiscountAsService=به عنوان یک سرویس
-UseDiscountOnTotal=در ساب توتال
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=معرفی می کند اگر تخفیف های جهانی به عنوان یک محصول، سرویس و یا فقط در ساب توتال برای محاسبه حاشیه درمان می شود.
-MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best vendor price
-MargeType2=Margin on Weighted Average Price (WAP)
-MargeType3=Margin on Cost Price
-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=قیمت تمام شده
-UnitCharges=اتهامات واحد
+UseDiscountAsService=به عنوان خدمات
+UseDiscountOnTotal=روی جمع‌جزء
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=در صورتی تعریف می‌شود که تخفیف عمومی به عنوان یک محصول، خدمات یا تنها مجموع‌جزء به‌عنوان محاسبه حاشیه برخورد شود.
+MARGIN_TYPE=مبلغ خرید/هزینه به‌طور پیش‌فرض توسط محاسبۀ حاشیه پیشنهاد می‌شو
+MargeType1=حاشیه براساس بهترین مبلغ فروشنده
+MargeType2=حاشیه بر اساس قیمت میانگین متوازن (WAP)
+MargeType3=حاشیه بر اساس مبلغ هزینه
+MarginTypeDesc=* حاشیه بر اساس بهترین قیمت خرید = قیمت فروش - بهترین قیمت فروش که بر روی کارت محصول تعیین می‌شود. <br> * حاشیه بر اساس مبلغ میانگین متوازن (WAP) = قیمت فروش - قیمت میانگین متوازن محصول یا بهترین قیمت فروش فروشنده در صورتی که هنوز (WAP) تعریف نشده باشد <br> * حاشیه بر اساس قیمت هزینه = قیمت فروش - قیمت هزینه تعریف شده در روی کارت محصول یا WAP در صورتی که قیمت هزینه تعریف نشده باشد، یا بهترین قیمت فروشنده در صورتی که هنوز WAP تعریف نشده باشد
+CostPrice=قیمت هزینه
+UnitCharges=عوارض واحد
 Charges=عوارض
-AgentContactType=عامل تجاری و نوع تماس
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
-CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any 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).
+AgentContactType=نوع طرف‌تماس نمایندۀ تجاری
+AgentContactTypeDetails=تعیین طرف‌تماس (پیوند شده روی صورت‌حساب‌ها) برای گزارش حاشیۀ بر حسب نمایندۀ فروش 
+rateMustBeNumeric=نرخ باید یک مقدار عددی باشد
+markRateShouldBeLesserThan100=نرخ نشان باید کم‌تر از 100 باشد
+ShowMarginInfos=نمایش اطلاعات حاشیه‌ها
+CheckMargins=جزئیات حاشیه‌ها
+MarginPerSaleRepresentativeWarning=گزارش حاشیه بر حسب کاربر با استفاده از پیوند میان اشخاص سوم و نمایندگان فروش برای محاسبۀ حاشیۀ هر نمایندۀ فروش. چون برخی از اشخاص سوم یک نمایندۀ فروش اختصاصی ندارند و برخی نمایندگان فروش ممکن است چند نمایندۀ فروش داشته باشند، برخی مقادیر در گزارش‌ها نخواهد آمد (در صورتی که هیچ نمایندۀ فروشی نباشد) و برخی مقادیر در چند سطر مختلف خواهند آمد (برای هر نمایندۀ فروشی).
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index bdc2b6a878f..2156485109b 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -170,7 +170,7 @@ MembersByTownDesc=این صفحه آمار در عضو های شهر شما نش
 MembersStatisticsDesc=را انتخاب کنید آمار شما می خواهید به عنوان خوانده شده ...
 MenuMembersStats=ارقام
 LastMemberDate=Latest member date
-LatestSubscriptionDate=Latest subscription date
+LatestSubscriptionDate=آخرین تاریخ عضویت
 Nature=طبیعت
 Public=اطلاعات عمومی
 NewMemberbyWeb=عضو جدید اضافه شده است. در انتظار تایید
@@ -197,3 +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
diff --git a/htdocs/langs/fa_IR/modulebuilder.lang b/htdocs/langs/fa_IR/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/fa_IR/modulebuilder.lang
+++ b/htdocs/langs/fa_IR/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/fa_IR/opensurvey.lang b/htdocs/langs/fa_IR/opensurvey.lang
index 3fcc36089c9..54a61fdbd18 100644
--- a/htdocs/langs/fa_IR/opensurvey.lang
+++ b/htdocs/langs/fa_IR/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=عنوان نظرسنجی
 ToReceiveEMailForEachVote=یک ایمیل دریافت خواهید کرد برای هر رای
 TypeDate=تاریخ نوع
 TypeClassic=نوع استاندارد
-OpenSurveyStep2=تاریخ های خود را در میان روز رایگان (خاکستری) را انتخاب کنید. روز انتخاب شده به رنگ سبز می باشد. شما می توانید یک روز پیش از انتخاب با کلیک دوباره بر روی آن را انتخاب
+OpenSurveyStep2=تاریخ‌های خود را از میان روزهای آزاد انتخاب کنید (خاکستری). تاریخ‌های انتخاب شده، سبز هستند. شما می‌توانید یک روز را که قبلا انتخاب کرده‌اید با کلیک مجدد بر آن از حالت انتخاب در بیاورید
 RemoveAllDays=حذف تمام روز
 CopyHoursOfFirstDay=ساعت کپی از روز اول
 RemoveAllHours=حذف تمام ساعت
@@ -19,9 +19,9 @@ SelectedDays=روز انتخاب شده
 TheBestChoice=بهترین انتخاب در حال حاضر است
 TheBestChoices=بهترین انتخاب در حال حاضر است
 with=با
-OpenSurveyHowTo=اگر شما توافق می کنید به رای دادن در این نظرسنجی رای دهید، شما باید به نام خود، به ارزش های که مناسب برای شما بهتر است را انتخاب کنید و اعتبار با دکمه به علاوه در پایان خط.
+OpenSurveyHowTo=اگر موافقید که در این نظرسنجی رای دهید، باید نام خود را وارد کنید، مقادیری را انتخاب کنید که برای شما مناسب‌تر است و آن را با دکمه پلاس در انتهای سطر تأیید کنید.
 CommentsOfVoters=نظرات رای دهندگان
-ConfirmRemovalOfPoll=آیا مطمئن هستید که می خواهید به حذف این نظرسنجی رای دهید (و همه رای)
+ConfirmRemovalOfPoll=آیا مطمئن هستید که میخواهید این نظرسنجی را حذف کنید (به همراه همۀ آراء)
 RemovePoll=حذف نظر سنجی
 UrlForSurvey=URL برای برقراری ارتباط برای به دست آوردن دسترسی مستقیم به نظرسنجی رای دهید.
 PollOnChoice=شما در حال ایجاد یک نظرسنجی را به یک چند انتخابی نظر سنجی. نخست وارد کنید تمام گزینه های ممکن را برای نظرسنجی شما:
@@ -35,7 +35,7 @@ TitleChoice=برچسب انتخاب
 ExportSpreadsheet=نتیجه صادرات گسترده
 ExpireDate=تاریخ محدود
 NbOfSurveys=مجموع نظرسنجی
-NbOfVoters=Nb و از رای دهندگان
+NbOfVoters=تعداد رای‌دهندگان
 SurveyResults=نتایج
 PollAdminDesc=شما مجاز به تغییر تمام خطوط رای این نظرسنجی با دکمه "ویرایش". شما می توانید، و همچنین، حذف یک ستون یا یک خط با٪ s. شما همچنین می توانید یک ستون جدید با٪ s اضافه کنید.
 5MoreChoices=5 انتخاب های بیشتر
@@ -49,13 +49,13 @@ votes=رای (ها)
 NoCommentYet=هیچ نظری برای این نظرسنجی رای دهید ارسال نشده است
 CanComment=رای دهندگان می توانند در این نظرسنجی نظر
 CanSeeOthersVote=رای دهندگان می توانند رای افراد دیگر را مشاهده کنید
-SelectDayDesc=برای هر روز انتخاب شده، شما می توانید انتخاب کنید، یا نه، جلسه ساعت در فرمت های زیر است: <br> - خالی، <br> - "8H"، "8H" و یا "08:00" به شروع ساعت در جلسه، <br> - "8-11"، "8H-11h"، "8H-11H" و یا "8:00-11:00" به شروع جلسه و در پایان ساعت، <br> - "8h15-11h15"، "8H15-11H15" و یا "8:15-11:15" برای همین قضیه ولی با دقیقه.
+SelectDayDesc=برای هر روز انتخاب شده، شما می‌توانید ساعات ملاقات را با نگارش ذیل انتخاب کنید/نکنید: <br> -empty، <br> - "8h", "8H" or "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.
+SurveyExpiredInfo=نظرسنجی پایان یافته یا تاخیر رای دهی منقضی شده است
 EmailSomeoneVoted=٪ s را تا به یک خط پر شده است. شما می توانید نظر سنجی خود را در لینک پیدا کنید:٪ 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
+ShowSurvey=نمایش نظرسنجی
+UserMustBeSameThanUserUsedToVote=شما باید رای داده باشید و از کاربر مشابه در هنگام رای‌دهی استفاده کنید تا بتوانید نظر بدهید.
diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang
index 137bb4c2e2a..10a85ab8185 100644
--- a/htdocs/langs/fa_IR/orders.lang
+++ b/htdocs/langs/fa_IR/orders.lang
@@ -1,158 +1,158 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=منطقه سفارشات مشتریان
-SuppliersOrdersArea=Purchase orders area
-OrderCard=کارت منظور
-OrderId=سفارش کد سفارش
+OrdersArea=بخش سفارشات مشتری
+SuppliersOrdersArea=بخش سفارشات خرید
+OrderCard=کارت سفارش
+OrderId=شناسۀ سفارش
 Order=سفارش
 PdfOrderTitle=سفارش
-Orders=سفارشات
-OrderLine=خط منظور
+Orders=سفارش‌ها
+OrderLine=سطر سفارش
 OrderDate=تاریخ سفارش
 OrderDateShort=تاریخ سفارش
-OrderToProcess=منظور پردازش
-NewOrder=سفارش
-ToOrder=سفارش
-MakeOrder=سفارش
-SupplierOrder=Purchase order
-SuppliersOrders=سفارشات خرید
-SuppliersOrdersRunning=Current purchase orders
-CustomerOrder=Sales Order
-CustomersOrders=سفارشات فروش
-CustomersOrdersRunning=Current sales orders
-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
-StatusOrderCanceledShort=لغو شد
-StatusOrderDraftShort=پیش نویس
-StatusOrderValidatedShort=اعتبار
-StatusOrderSentShort=در فرآیند
-StatusOrderSent=حمل و نقل در فرایند
-StatusOrderOnProcessShort=سفارش داده شده
-StatusOrderProcessedShort=پردازش
-StatusOrderDelivered=تحویل
-StatusOrderDeliveredShort=تحویل
-StatusOrderToBillShort=تحویل
-StatusOrderApprovedShort=تایید شده
-StatusOrderRefusedShort=رد
-StatusOrderBilledShort=ثبت شده در صورتحساب یا لیست
-StatusOrderToProcessShort=به پردازش
-StatusOrderReceivedPartiallyShort=نیمه دریافت کرد
-StatusOrderReceivedAllShort=Products received
-StatusOrderCanceled=لغو شد
-StatusOrderDraft=پیش نویس (نیاز به تایید می شود)
-StatusOrderValidated=اعتبار
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
-StatusOrderProcessed=پردازش
-StatusOrderToBill=تحویل
-StatusOrderApproved=تایید شده
-StatusOrderRefused=رد
-StatusOrderBilled=ثبت شده در صورتحساب یا لیست
-StatusOrderReceivedPartially=نیمه دریافت کرد
-StatusOrderReceivedAll=All products received
-ShippingExist=حمل و نقل وجود دارد
-QtyOrdered=تعداد سفارش داده شده
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
-MenuOrdersToBill=سفارشات تحویل
-MenuOrdersToBill2=Billable orders
-ShipProduct=محصول کشتی
-CreateOrder=ایجاد نظم
-RefuseOrder=منظور رد
-ApproveOrder=Approve order
-Approve2Order=Approve order (second level)
-ValidateOrder=منظور اعتبارسنجی
-UnvalidateOrder=منظور Unvalidate
-DeleteOrder=به منظور حذف
-CancelOrder=جهت لغو
-OrderReopened= Order %s Reopened
-AddOrder=Create order
-AddToDraftOrders=اضافه کردن به پیش نویس منظور
-ShowOrder=نمایش جهت
-OrdersOpened=Orders to process
-NoDraftOrders=بدون پیش نویس سفارشات
-NoOrder=No order
-NoSupplierOrder=No purchase order
-LastOrders=Latest %s sales orders
-LastCustomerOrders=Latest %s sales orders
-LastSupplierOrders=Latest %s purchase orders
-LastModifiedOrders=Latest %s modified orders
-AllOrders=تمام سفارشات
-NbOfOrders=تعداد سفارشات
-OrdersStatistics=آمار سفارش
-OrdersStatisticsSuppliers=Purchase order statistics
-NumberOfOrdersByMonth=تعداد سفارشات در ماه
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
-ListOfOrders=فهرست سفارشات
-CloseOrder=نزدیک منظور
-ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
-ConfirmDeleteOrder=Are you sure you want to delete this order?
-ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
-ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
-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=تولید صورت حساب
-ClassifyShipped=طبقه بندی تحویل
-DraftOrders=دستور پیش نویس
-DraftSuppliersOrders=Draft purchase orders
-OnProcessOrders=در دستور روند
-RefOrder=کد عکس. سفارش
-RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for vendor
-RefOrderSupplierShort=Ref. order vendor
-SendOrderByMail=ارسال سفارش از طریق پست
-ActionsOnOrder=رویدادهای سفارش
-NoArticleOfTypeProduct=هیچ مقاله از نوع «تولید» بنابراین هیچ مقاله قابل حمل با کشتی برای این منظور
+OrderToProcess=سفارش قابل پردازش
+NewOrder=سفارش جدید
+ToOrder=ایجاد سفارش
+MakeOrder=ساخت سفارش
+SupplierOrder=سفارش خرید
+SuppliersOrders=سفارش‌های خرید
+SuppliersOrdersRunning=سفارش‌های خرید کنونی
+CustomerOrder=سفارش فروش
+CustomersOrders=سفارش‌های فروش
+CustomersOrdersRunning=سفارش‌های فروش کنونی
+CustomersOrdersAndOrdersLines=سفارش‌های فروش و جزئیات سفارش
+OrdersDeliveredToBill=سفارش‌های فروش تحویل شده برای صورت‌حساب
+OrdersToBill=سفارش‌های فروش تحویل شده
+OrdersInProcess=سفارش‌های فروش در حال پردازش
+OrdersToProcess=سفارش‌های فروش قابل پردازش
+SuppliersOrdersToProcess=سفارش‌های خرید قابل پردازش
+StatusOrderCanceledShort=لغو شده
+StatusOrderDraftShort=پیش‌نویس
+StatusOrderValidatedShort=تائیداعتبار شده
+StatusOrderSentShort=در حال پردازش
+StatusOrderSent=در حال پردازش ارسال
+StatusOrderOnProcessShort=سفارش‌داده شده
+StatusOrderProcessedShort=پردازش‌شده
+StatusOrderDelivered=تحویلشده
+StatusOrderDeliveredShort=تحویل‌شده
+StatusOrderToBillShort=تحویل‌شده
+StatusOrderApprovedShort=مجاز شده
+StatusOrderRefusedShort=رد شده
+StatusOrderBilledShort=صورت‌حساب شده
+StatusOrderToProcessShort=برای پردازش
+StatusOrderReceivedPartiallyShort=بخشی دریافت شده
+StatusOrderReceivedAllShort=محصولات دریافت شده
+StatusOrderCanceled=لغو ظده
+StatusOrderDraft=پیش نویس (نیاز به تائیداعتبار)
+StatusOrderValidated=تائیداعتبار شده
+StatusOrderOnProcess=سفارش داده شده - در انتظار دریافت
+StatusOrderOnProcessWithValidation=سفارش داده شده - در انتظار دریافت یا تائید اعتبار
+StatusOrderProcessed=پردازش‌شده
+StatusOrderToBill=تحویل شده
+StatusOrderApproved=تایید شدهمجاز شده
+StatusOrderRefused=رد شده
+StatusOrderBilled=صورت‌حساب شده
+StatusOrderReceivedPartially=بخشی دریافت شده
+StatusOrderReceivedAll=همۀ محصولات دریافت شده
+ShippingExist=یک حمل‌ونقل در جریان است
+QtyOrdered=تعداد سفارش‌داده شده
+ProductQtyInDraft=ارائۀ تعداد محصولات به سفارش‌های پیش‌نویس
+ProductQtyInDraftOrWaitingApproved=ارائۀ تعداد محصولات به به سفارش‌های پیش‌نویس یا تائید‌شده یا هنوز سفارش‌داده نشده
+MenuOrdersToBill=سفارش تحویل‌شد
+MenuOrdersToBill2=سفارش‌های قابل صدور صورت‌حساب
+ShipProduct=ارسال محصول
+CreateOrder=ساخت سفارش
+RefuseOrder=رد سفارش
+ApproveOrder=تائید سفارش
+Approve2Order=تائید سفارش (سطح دوم)
+ValidateOrder=تائیداعتبار سفارش
+UnvalidateOrder=عدم تائید اعتبار سفارش
+DeleteOrder=حذف سفارش
+CancelOrder=لغو سفارش
+OrderReopened= سفارش %s بازگشائی شد
+AddOrder=ساخت سفارش
+AddToDraftOrders=افزودن به سفارش پیش‌نویس
+ShowOrder=نمایش سفارش
+OrdersOpened=سفارش‌های قابل پردازش
+NoDraftOrders=سفارش پیش‌نویس وجود ندارد
+NoOrder=سفارشی وجود ندار
+NoSupplierOrder=سفارش خریدی وجود ندارد
+LastOrders=آخرین %s سفارش فروش
+LastCustomerOrders=آخرین %s سفارش فروش
+LastSupplierOrders=آخرین %s سفارش خرید
+LastModifiedOrders=آخرین %s سفارش ویرایش شده
+AllOrders=همۀ سفارش‌ها
+NbOfOrders=تعداد سفارش‌ها
+OrdersStatistics=آمار سفارش‌ها
+OrdersStatisticsSuppliers=آمار سفارش‌های خرید
+NumberOfOrdersByMonth=تعداد سفارش‌ها در ماه
+AmountOfOrdersByMonthHT=مبلغ سفارش‌ها در ماه (بدون مالیات)
+ListOfOrders=فهرست سفارش‌ها
+CloseOrder=بستن سفارش
+ConfirmCloseOrder=آیا مطمئن هستید می‌خواهید این سفارش تحویل‌شده تلقی شود؟ پس از این‌که سفارش تحویل شد امکان تنظیم آن به صورت صورت‌حساب‌شده وجود خواهد داشت.
+ConfirmDeleteOrder=آیا مطمئنید می‌خواهید این سفارش را حذف کنید؟
+ConfirmValidateOrder=آیا مطمئن هستید می‌خواهید این سفارش را تحت نام <b>%s</b> تائیداعتبار کنید؟
+ConfirmUnvalidateOrder=آیا مطمئن هستید می‌خواهید سفارش <b>%s</b> را به حالت پیش‌نویس بازگردانید؟
+ConfirmCancelOrder=آیا مطمئن هستید می‌خواهید این سفارش را لغو کنید؟
+ConfirmMakeOrder=آیا مطمئن هستید می‌خواهید تائید کنید این سفارش را روی <b>%s</b> ساخته‌اید؟
+GenerateBill=تولید صورت‌حساب
+ClassifyShipped=طبقه‌بندی به صورت «تحویل‌شده»
+DraftOrders=سفارش‌های پیش‌نویس
+DraftSuppliersOrders=سفارش‌های خرید پیش‌نویس
+OnProcessOrders=سفارش‌های در حال پردازش
+RefOrder=ش.ارجاع سفارش
+RefCustomerOrder=ش.ارجاع سفارش برای مشتری
+RefOrderSupplier=ش.ارجاع سفارش برای فروشنده
+RefOrderSupplierShort=ش.ارجاع سفارش فروشنده
+SendOrderByMail=ارسال سفارش از طریق نامه
+ActionsOnOrder=روی‌دادهای مربوط به سفارش
+NoArticleOfTypeProduct=هیچ موضوعی به شکل "محصول" وجود ندارد، بنابراین چیز قابل ارسالی در این سفارش وجود ندارد
 OrderMode=روش سفارش
-AuthorRequest=درخواست نویسنده
-UserWithApproveOrderGrant=کاربران داده با "سفارشات تایید" اجازه.
-PaymentOrderRef=پرداخت منظور از٪ s
-ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
-DispatchSupplierOrder=Receiving purchase order %s
-FirstApprovalAlreadyDone=First approval already done
-SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
-SupplierOrderClassifiedBilled=Purchase Order %s set billed
-OtherOrders=دیگر سفارشات
+AuthorRequest=درخواست سازنده
+UserWithApproveOrderGrant=کاربران از مجوز "تائید سفارش‌ها" برخوردارند.
+PaymentOrderRef=پرداخت سفارش %s
+ConfirmCloneOrder=آیا مطمئن هستید می‌خواهید سفارش <b>%s</b> ببندید؟
+DispatchSupplierOrder=دریافت سفارش خرید %s
+FirstApprovalAlreadyDone=تائید اول قبلا انجام شده
+SecondApprovalAlreadyDone=تائید دوم قبلا انجام شده
+SupplierOrderReceivedInDolibarr=سفارش خرید %s دریافت شد %s
+SupplierOrderSubmitedInDolibarr=سفارش خرید %s درخواست شد
+SupplierOrderClassifiedBilled=سفارش خرید %s صورت‌حساب شد
+OtherOrders=سفارش‌های دیگر
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
-TypeContact_commande_internal_SHIPPING=نماینده زیر را به بالا حمل و نقل
-TypeContact_commande_external_BILLING=تماس با فاکتور به مشتری
-TypeContact_commande_external_SHIPPING=تماس با حمل و نقل با مشتری
-TypeContact_commande_external_CUSTOMER=تماس با مشتری را در پی بالا جهت
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
-TypeContact_order_supplier_internal_SHIPPING=نماینده زیر را به بالا حمل و نقل
+TypeContact_commande_internal_SALESREPFOLL=نمایندۀ پیگیر سفارش فروش
+TypeContact_commande_internal_SHIPPING=نمایندۀ پیگیری ارسال
+TypeContact_commande_external_BILLING=طرف تماس صورت‌حساب مشتری
+TypeContact_commande_external_SHIPPING=طرف‌تماس ارسال مشتری 
+TypeContact_commande_external_CUSTOMER=طرف‌تماس پیگیری سفارش مشتری
+TypeContact_order_supplier_internal_SALESREPFOLL=نمایندۀ پیگیری سفارش خرید
+TypeContact_order_supplier_internal_SHIPPING=نمایندۀ پیگیری ارسال
 TypeContact_order_supplier_external_BILLING=طرف‌تماس صورت‌حساب فروشنده
-TypeContact_order_supplier_external_SHIPPING=طرف‌تماس ارسال به فروشنده
-TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
-Error_COMMANDE_SUPPLIER_ADDON_NotDefined=COMMANDE_SUPPLIER_ADDON ثابت تعریف نشده
-Error_COMMANDE_ADDON_NotDefined=COMMANDE_ADDON ثابت تعریف نشده
-Error_OrderNotChecked=بدون سفارشات به فاکتور انتخاب شده
+TypeContact_order_supplier_external_SHIPPING=طرف‌تماس حمل‌ونقل فروشنده
+TypeContact_order_supplier_external_CUSTOMER=طرف‌تماس پیگیری سفارش فروشنده
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=مقدار ثابت COMMANDE_SUPPLIER_ADDON  تعریف نشده است
+Error_COMMANDE_ADDON_NotDefined=مقدار ثابت COMMANDE_ADDON  تعریف نشده است
+Error_OrderNotChecked=هیچ سفارشی برای صدور صورت‌حساب انتخاب نشده است
 # Order modes (how we receive order). Not the "why" are keys stored into dict.lang
-OrderByMail=پست
-OrderByFax=فکس
-OrderByEMail=پست الکترونیک
-OrderByWWW=آنلاین
+OrderByMail=نامه
+OrderByFax=نمابر
+OrderByEMail=رایانامه
+OrderByWWW=برخط
 OrderByPhone=تلفن
 # Documents models
-PDFEinsteinDescription=مدل نظم کامل (logo. ..)
-PDFEratostheneDescription=مدل نظم کامل (logo. ..)
-PDFEdisonDescription=یک مدل جهت ساده
-PDFProformaDescription=فاکتور را کامل (آرم ...)
-CreateInvoiceForThisCustomer=سفارشات بیل
-NoOrdersToInvoice=بدون سفارشات قابل پرداخت
-CloseProcessedOrdersAutomatically=طبقه بندی "پردازش" سفارشات همه انتخاب شده است.
-OrderCreation=خلقت
-Ordered=سفارش داده شده
-OrderCreated=سفارشات شما ساخته شده است
-OrderFail=خطا در هنگام ایجاد سفارشات شما اتفاق افتاده است
-CreateOrders=ایجاد سفارشات
-ToBillSeveralOrderSelectCustomer=برای ایجاد یک فاکتور برای چند دستور، برای اولین بار بر روی مشتری را کلیک کنید، و سپس "٪ s" را انتخاب کنید.
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
-IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
-SetShippingMode=Set shipping mode
+PDFEinsteinDescription=یک نمونۀ کامل سفارش (نشان...)
+PDFEratostheneDescription=یک نمونۀ کامل سفارش (نشان...)
+PDFEdisonDescription=یک نمونۀ سادۀ سفارش
+PDFProformaDescription=یک نمونۀ کامل پیش‌صورت‌حساب (نشان....)
+CreateInvoiceForThisCustomer=صدور صورت‌حساب سفارش‌ها
+NoOrdersToInvoice=هیچ سفارشی قابل صدور صورت‌حساب نیست
+CloseProcessedOrdersAutomatically=همۀ سفارش‌های انتخاب شده را "پردازش شده" طبقه‌بندی کن.
+OrderCreation=ساخت سفارش
+Ordered=سفارش‌داده‌شد
+OrderCreated=سفارش‌های شما ساخته شد
+OrderFail=یک خطا در هنگام ساخت سفارش مورد نظر شما رخ داد
+CreateOrders=ساخت سفارش
+ToBillSeveralOrderSelectCustomer=برای ساخت یک صورت‌حساب برای چند سفارش، ابتدا روی مشتری کلیک کرده و سپس گزینۀ "%s" را برگزینید
+OptionToSetOrderBilledNotEnabled=از گزینۀ (از واحد گردش کار) برای تائید خودکار سفارش به شکل "صورت‌حساب‌شده" در هنگامی که "صورت‌حساب تائید شده" خاموش است استفاده کنید، بنابراین نیاز دارید که وضعیت سفارش را به شکل دستی به حالت "صورت‌حساب شده" در بیاورید.
+IfValidateInvoiceIsNoOrderStayUnbilled=در صورتی‌که تائیداعتبار صورت‌حساب به "خیر" تنظیم شده باشد، سفارش تا زمان تائیداعتبار صورت‌حساب به حالت "صورت‌حساب نشده" خواهد بود.
+CloseReceivedSupplierOrdersAutomatically=بستن خودکار سفارش به حالت "%s" در صورتی که همۀ محصولات دریافت شدند.
+SetShippingMode=تنظیم حالت حمل‌ونقل
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 6eb39eabb41..d7787db0f50 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=کد امنیتی
+SecurityCode=کد حفاظتی
 NumberingShort=N°
 Tools=ابزار
-TMenuTools=ابزار ها
-ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
-Birthday=جشن تولد
-BirthdayDate=Birthday date
+TMenuTools=ابزارها
+ToolsDesc=همۀ ابزارهائی که در سایر فهرست‌ها نیامده‌اند این‌جا گروه‌بندی شده‌اند. <br> همۀ ابزارها از فهرست سمت راست در دسترس هستند
+Birthday=تولد
+BirthdayDate=تاریخ تولد
 DateToBirth=تاریخ تولد
-BirthdayAlertOn=تولد هشدار فعال
-BirthdayAlertOff=تولد غیر فعال هشدار
-TransKey=Translation of the key TransKey
-MonthOfInvoice=Month (number 1-12) of invoice date
+BirthdayAlertOn=اعلان تولد فعال است
+BirthdayAlertOff=اعلان تولد غیرفعال است
+TransKey=ترجمۀ کلیدواژۀ TransKey
+MonthOfInvoice=ماه (عدد 1-12) تاریخ صورت‌حساب
 TextMonthOfInvoice=Month (text) of invoice date
 PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
@@ -48,7 +48,7 @@ Notify_COMPANY_CREATE=شخص ثالث ایجاد شده
 Notify_COMPANY_SENTBYMAIL=ایمیل های فرستاده شده از کارت شخص ثالث
 Notify_BILL_VALIDATE=صورت حساب به مشتری اعتبار
 Notify_BILL_UNVALIDATE=صورت حساب به مشتری unvalidated
-Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_PAYED=صورت‌حساب مشتری پرداخت شد
 Notify_BILL_CANCEL=صورت حساب به مشتری لغو
 Notify_BILL_SENTBYMAIL=صورت حساب به مشتری با پست
 Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
diff --git a/htdocs/langs/fa_IR/paybox.lang b/htdocs/langs/fa_IR/paybox.lang
index 42010a53e28..46cbd5d9e9b 100644
--- a/htdocs/langs/fa_IR/paybox.lang
+++ b/htdocs/langs/fa_IR/paybox.lang
@@ -10,7 +10,7 @@ ToComplete=برای تکمیل
 YourEMail=ایمیل برای دریافت تاییدیه پرداخت
 Creditor=بستانکار
 PaymentCode=کد های پرداخت
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=آیا پرداخت
 YouWillBeRedirectedOnPayBox=شما می توانید در صفحه خزانه امن برای ورودی هدایت می شوید اطلاعات کارت اعتباری شما
 Continue=بعد
@@ -37,3 +37,4 @@ PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/fa_IR/paypal.lang b/htdocs/langs/fa_IR/paypal.lang
index abac00f493b..e1f0e2ff7f5 100644
--- a/htdocs/langs/fa_IR/paypal.lang
+++ b/htdocs/langs/fa_IR/paypal.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=راه اندازی ماژول پی پال
 PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Credit Card or PayPal)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
 PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=تست حالت / گودال ماسهبازی
 PAYPAL_API_USER=نام کاربری API
@@ -14,7 +14,6 @@ PaypalModeOnlyPaypal=پی پال تنها
 ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=این شناسه از معامله <b>است:٪ s</b>
 PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
-YouAreCurrentlyInSandboxMode=شما فعلا در حالت "شن‌بازی" %s قرار دارید
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
 ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
@@ -33,3 +32,5 @@ PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
 ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 6f05af0bd94..5e83f10881a 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -260,7 +260,7 @@ AddVariable=افزودن متغیر
 AddUpdater=افزودن به‌روز‌رسان
 GlobalVariables=متغیرهای سراسری
 VariableToUpdate=متغیر قابل به‌روز‌رسانی
-GlobalVariableUpdaters=به‌روز‌رسان‌های متغیرهای سراسری
+GlobalVariableUpdaters=به‌روز‌رسان‌های خارجی برای متغیرها
 GlobalVariableUpdaterType0=داده‌های JSON
 GlobalVariableUpdaterHelp0=اطلاعات JSON را از نشانی مشخص شده استخراج می‌کند، VALUE معرّف مکان مقدار مربوطه است.
 GlobalVariableUpdaterHelpFormat0=روش درخواست  {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=ورقۀ محصول
 ServiceSheet=ورقۀ خدما
 PossibleValues=مقادیر ممکن
 GoOnMenuToCreateVairants=برای آماده‌کردن ویژگی‌های چندگانه (مثل رنگ، اندازه و غیره) به فهرست %s - %s بروید 
-UseProductFournDesc=توضیحات فروشندگان برای محصول در سندهای فروشندگان استفاده شو
+UseProductFournDesc=ایجاد یک قابلیت برای تعریف توضیحات مربوط به محصولاتی که توسط فروشندگان در ادامۀ توضیحات ارائه شده به مشتریان
 ProductSupplierDescription=توضیحات فروشنده برای محصول
 #Attributes
 VariantAttributes=انواع ویژگی
@@ -338,4 +338,5 @@ CloneDestinationReference=مقصد ارجاع محصول
 ErrorCopyProductCombinations=یک خطا در هنگام نسخه‌برداری از انواع محصول پیش آمد
 ErrorDestinationProductNotFound=محصول مقصد پیدا نشد
 ErrorProductCombinationNotFound=نوع محصول پیدا نشد
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ActionAvailableOnVariantProductOnly=این کنش تنها بر روی یک نوع از انواع محصول قابل اجراست
+ProductsPricePerCustomer=قیمت محصول وابسته به مشتریان
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 7ded91a8185..a818bc8debc 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -1,245 +1,246 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=کد عکس. پروژه
-ProjectRef=Project ref.
-ProjectId=پروژه کد
-ProjectLabel=Project label
-ProjectsArea=Projects Area
-ProjectStatus=Project status
-SharedProject=هر کسی
-PrivateProject=تماس با ما پروژه
-ProjectsImContactFor=Projects for I am explicitly a contact
-AllAllowedProjects=All project I can read (mine + public)
-AllProjects=همه پروژه ها
-MyProjectsDesc=This view is limited to projects you are a contact for
-ProjectsPublicDesc=این دیدگاه ارائه تمام پروژه ها به شما این اجازه را بخوانید.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
-ProjectsPublicTaskDesc=این دیدگاه ارائه تمام پروژه ها و کارهای شما مجاز به خواندن.
-ProjectsDesc=این دیدگاه ارائه تمام پروژه (مجوز دسترسی خود را به شما عطا اجازه دسترسی به همه چیز).
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
-OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
-ClosedProjectsAreHidden=Closed projects are not visible.
-TasksPublicDesc=این دیدگاه ارائه تمام پروژه ها و کارهای شما مجاز به خواندن.
-TasksDesc=این دیدگاه ارائه تمام پروژه ها و وظایف (مجوز دسترسی خود را به شما عطا اجازه دسترسی به همه چیز).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
-ImportDatasetTasks=Tasks of projects
-ProjectCategories=Project tags/categories
-NewProject=پروژه های جدید
-AddProject=Create project
-DeleteAProject=حذف یک پروژه
-DeleteATask=حذف کار
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
-OpportunitiesStatusForProjects=Leads amount of projects by status
-ShowProject=نمایش پروژه
-ShowTask=نمایش کار
-SetProject=تنظیم پروژه
-NoProject=هیچ پروژه تعریف شده و یا متعلق به
-NbOfProjects=No. of projects
-NbOfTasks=No. of tasks
+RefProject=شماره ارجاع طرح
+ProjectRef=شماره ارجاع طرح
+ProjectId=شناسۀ طرح
+ProjectLabel=برچسب طرح
+ProjectsArea=بخش طرح‌ها
+ProjectStatus=وضعیت طرح
+SharedProject=همگان
+PrivateProject=طرف‌های تماس طرح
+ProjectsImContactFor=طرح‌هائی که من در آن به‌روشنی طرف‌تماس هستم
+AllAllowedProjects=همۀ طرح‌هائی که قابل مطالعۀ من است (مربوط به من + عمومی)
+AllProjects=همۀ طرح‌ها
+MyProjectsDesc=این نما محدود به طرح‌هائی است که شما در آن طرف تماس هستید
+ProjectsPublicDesc=این نما نمایان‌گر همۀ طرح‌هائی است که خواندن آن‌ها برای شما مجاز است
+TasksOnProjectsPublicDesc=این نما نمایان‌گر همۀ وظایفی است که شما مجاز به خواندن آن هستید..
+ProjectsPublicTaskDesc=این نما نمایانگر همۀ طرح‌هائی است که شما مجاز به خواندن آن هستید
+ProjectsDesc=این نما نمایانگر همۀ طرح‌هاست ( مجوزهای کاربری شما به شما امکان می‌دهد شما همۀ طرح‌ها را مشاهده کنید).
+TasksOnProjectsDesc=این نما نمایانگر همۀ وظایف مربوط به همۀ طرح‌ها هست ( مجوزهای کاربری شما امکان نمایش همه چیز را می‌دهد).
+MyTasksDesc=این نما، محدود به طرح‌ها و وظایفی است که شما برای آن طرف‌تماس هستید
+OnlyOpenedProject=تنها طرح‌های باز نمایش داده می‌شوند ( طرح‌هائی که در وضعیت پیش‌نویس یا بسته هستند، مشاهده نمی‌شوند).
+ClosedProjectsAreHidden=طرح‌های بسته شده نمایش داده نمی‌شوند
+TasksPublicDesc=این نما نمایان‌گر همۀ طرح‌ها و وظایفی است که شما مجاز به دیدن آن هستید.
+TasksDesc=این نما نمایانگر همۀ طرح‌ها و وظایف است ( مجوزهای کاربری شما امکان نمایش همه‌چیز را به شما می‌دهد).
+AllTaskVisibleButEditIfYouAreAssigned=همۀ وظایف مربوط برای طرح‌های واجد شرایط نمایش داده می‌شوند، اما شما می‌توانید تنها زمان را برای وظایف نسبت دده شده به کاربر انتخابی وارد کنید. وظیفه را در صورتی انتخاب کنید که نیاز داشته باشید زمان در آن زمان وارد کنید.
+OnlyYourTaskAreVisible=تنها وظایفی که به شما نسبت داده شده‌اند، نمایش داده می‌شوند. وظیفه را فقط هنگامی به خودتان نسبت بدهید که برای شما قابل نمایش نیست و شما نیاز دارید روی آن زمان وارد کنید.
+ImportDatasetTasks=وظایف مربوط به طرح‌ها
+ProjectCategories=برچسب‌ها/دسته‌بندی‌های طرح
+NewProject=طرح جدید
+AddProject=ساخت طرح
+DeleteAProject=حذف طرح
+DeleteATask=حذف وظیفه
+ConfirmDeleteAProject=آیا اطمینان دارید می‌خواهید این طرح را حذف کنید؟
+ConfirmDeleteATask=آیا اطمینان دارید می‌خواهید این وظیفه را حذف کنید؟
+OpenedProjects=طرح‌های باز
+OpenedTasks=وظایف باز
+OpportunitiesStatusForOpenedProjects=مبلغ سرنخ طرح‌های باز برحسب وضعیت
+OpportunitiesStatusForProjects=مبلغ سرنخ طرح‌ها برحسب وضعیت
+ShowProject=نمایش طرح
+ShowTask=نمایش وظیفه
+SetProject=تنظیم طرح
+NoProject=طرحی تعریف یا تصاحب نشده است
+NbOfProjects=تعداد طرح‌ها
+NbOfTasks=تعداد وظایف
 TimeSpent=زمان صرف شده
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=زمان صرف شده توسط شما
+TimeSpentByUser=زمان طرح شده توسط کاربر
 TimesSpent=زمان صرف شده
-RefTask=کد عکس. کار
-LabelTask=کار برچسب
-TaskTimeSpent=مدت زمان صرف شده در کارها
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
+TaskTimeSpent=زمان صرف شده برای وظایف
 TaskTimeUser=کاربر
 TaskTimeNote=یادداشت
 TaskTimeDate=تاریخ
-TasksOnOpenedProject=Tasks on open projects
-WorkloadNotDefined=Workload not defined
+TasksOnOpenedProject=وظایف طرح‌ها باز
+WorkloadNotDefined=حجم‌کار تعریف نشده
 NewTimeSpent=زمان صرف شده
-MyTimeSpent=وقت من صرف
-BillTime=Bill the time spent
-BillTimeShort=Bill time
-TimeToBill=Time not billed
-TimeBilled=Time billed
+MyTimeSpent=زمان صرف شدۀ من
+BillTime=صورت‌حساب زمان صرف شده
+BillTimeShort=زمان صورت‌حساب
+TimeToBill=زمان صورت‌حساب نشده
+TimeBilled=زمان صورت‌حساب شده
 Tasks=وظایف
-Task=کار
-TaskDateStart=تاریخ شروع کار
-TaskDateEnd=تاریخ پایان کار
+Task=وظیفه
+TaskDateStart=زمان شروع وظیفه
+TaskDateEnd=زمان پایان وظیفه
 TaskDescription=شرح وظیفه
-NewTask=کار جدید
-AddTask=Create task
-AddTimeSpent=Create time spent
-AddHereTimeSpentForDay=Add here time spent for this day/task
+NewTask=وظیفۀ جدید 
+AddTask=ساخت وظیفه
+AddTimeSpent=ساخت زمان صرف‌شده
+AddHereTimeSpentForDay=زمان صرف شده برای این روز/وظیفه را اینجا اضافه کنید
 Activity=فعالیت
-Activities=وظایف / فعالیت ها
-MyActivities=کارهای من / فعالیت ها
-MyProjects=پروژه های من
-MyProjectsArea=My projects Area
-DurationEffective=مدت زمان موثر
-ProgressDeclared=پیشرفت اعلام کرد
+Activities=وظایف/فعالیت‌ها
+MyActivities=وظایف/فعالیت‌های من
+MyProjects=طرح‌های من
+MyProjectsArea=بخش طرح‌های مربوط به من
+DurationEffective=مدت‌زمان مفید
+ProgressDeclared=پیشرفت اظهار شده
 ProgressCalculated=پیشرفت محاسبه شده
 Time=زمان
-ListOfTasks=List of tasks
-GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Go to list of tasks
-GoToGanttView=Go to Gantt view
-GanttView=Gantt View
-ListProposalsAssociatedProject=List of the commercial proposals related to the project
-ListOrdersAssociatedProject=List of sales orders related to the project
-ListInvoicesAssociatedProject=List of customer invoices related to the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
-ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
-ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
-ListContractAssociatedProject=List of contracts related to the project
-ListShippingAssociatedProject=List of shippings related to the project
-ListFichinterAssociatedProject=List of interventions related to the project
-ListExpenseReportsAssociatedProject=List of expense reports related to the project
-ListDonationsAssociatedProject=List of donations related to the project
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
-ListSalariesAssociatedProject=List of payments of salaries related to the project
-ListActionsAssociatedProject=List of events related to the project
-ListTaskTimeUserProject=List of time consumed on tasks of project
-ListTaskTimeForTask=List of time consumed on task
-ActivityOnProjectToday=Activity on project today
-ActivityOnProjectYesterday=Activity on project yesterday
-ActivityOnProjectThisWeek=فعالیت در پروژه این هفته
-ActivityOnProjectThisMonth=فعالیت در پروژه این ماه
-ActivityOnProjectThisYear=فعالیت در پروژه سال جاری
-ChildOfProjectTask=کودکان از پروژه / کار
-ChildOfTask=Child of task
-TaskHasChild=Task has child
-NotOwnerOfProject=نه صاحب این پروژه خصوصی
+ListOfTasks=فهرست وظایف
+GoToListOfTimeConsumed=رجوع به فهرست زمان صرف شده
+GoToListOfTasks=رجوع به فهرست وظایف
+GoToGanttView=رجوع به نمای گانت
+GanttView=نمای گانت
+ListProposalsAssociatedProject=فهرست پیشنهادهای تجاری مرتبط با طرح
+ListOrdersAssociatedProject=فهرست سفارش‌های فروش مربوط به طرح
+ListInvoicesAssociatedProject=فهرست صورت‌حساب مشتریان مربوط به طرح
+ListPredefinedInvoicesAssociatedProject=فهرست صورت‌حساب قالبی مشتری مربوط به طرح
+ListSupplierOrdersAssociatedProject=فهرست سفارشات خرید مربوط به طرح
+ListSupplierInvoicesAssociatedProject=فهرست صورت‌حساب‌های فروشندگان مربوط به طرح
+ListContractAssociatedProject=فهرست قرارداد‌های مربوط به طرح
+ListShippingAssociatedProject=فهرست حمل‌ونقل‌های موجود مربوط به طرح
+ListFichinterAssociatedProject=فهرست واسطه‌گری‌های مربوط به طرح
+ListExpenseReportsAssociatedProject=فهرست گزارش هزینه‌های مربوط به طرح
+ListDonationsAssociatedProject=فهرست کمک‌های مالی مربوط به طرح
+ListVariousPaymentsAssociatedProject=فهرست پرداخت‌های متفرقۀ مربوط به طرح
+ListSalariesAssociatedProject=فهرست پرداخت حقوق‌های مربوط به طرح
+ListActionsAssociatedProject=فهرست روی‌دادهای مربوط به طرح
+ListTaskTimeUserProject=فهرست زمان صرف شده در طرح
+ListTaskTimeForTask=فهرست زمان طرح شده برای وظیفه
+ActivityOnProjectToday=فعالیت امروز طرح
+ActivityOnProjectYesterday=فعالیت دیروز طرح
+ActivityOnProjectThisWeek=فعالیت طرح در هفتۀ جاری
+ActivityOnProjectThisMonth=فعالیت طرح در ماه جاری
+ActivityOnProjectThisYear=فعالیت طرح در سال جاری
+ChildOfProjectTask=طرح/وظیفۀ زیرمجموعه/فرزند
+ChildOfTask=فرزند وظیفۀ
+TaskHasChild=وظیفه دارای فرزند است
+NotOwnerOfProject=صاحب این طرح خصوصی نیست
 AffectedTo=اختصاص داده شده به
-CantRemoveProject=این پروژه نمی تواند حذف شود به عنوان آن است که توسط برخی از اشیاء دیگر (فاکتور، سفارشات و یا دیگر) اشاره شده است. تب مراجعه کنید.
-ValidateProject=اعتبارسنجی projet
-ConfirmValidateProject=Are you sure you want to validate this project?
-CloseAProject=بستن پروژه
-ConfirmCloseAProject=Are you sure you want to close this project?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
-ReOpenAProject=پروژه گسترش
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
-ProjectContact=اطلاعات تماس پروژه
-TaskContact=Task contacts
-ActionsOnProject=رویدادها در پروژه
-YouAreNotContactOfProject=شما یک تماس از این پروژه خصوصی نیست
-UserIsNotContactOfProject=User is not a contact of this private project
-DeleteATimeSpent=زمان صرف شده حذف
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Contacts of task
-ProjectsDedicatedToThisThirdParty=پروژه ها اختصاص داده شده به این شخص ثالث
-NoTasks=بدون وظایف برای این پروژه
-LinkedToAnotherCompany=لینک به دیگر شخص ثالث
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
-ErrorTimeSpentIsEmpty=مدت زمان صرف شده خالی است
-ThisWillAlsoRemoveTasks=این کار همچنین تمام کارهای پروژه <b>(وظایف٪ s</b> در حال حاضر) حذف و تمام ورودی ها از زمان صرف شده.
-IfNeedToUseOtherObjectKeepEmpty=اگر برخی از اشیاء (فاکتور، سفارش، ...)، متعلق به شخص ثالث دیگری، باید به این پروژه برای ایجاد، نگه داشتن این خالی به این پروژه که احزاب چند سوم مرتبط است.
-CloneTasks=وظایف کلون
-CloneContacts=تماس با کلون
-CloneNotes=یادداشت کلون
-CloneProjectFiles=پروژه کلون فایل های پیوست
-CloneTaskFiles=کار کلون (بازدید کنندگان) فایل پیوست (در صورت کار (بازدید کنندگان) شبیه سازی شده)
-CloneMoveDate=Update project/tasks dates from now?
-ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task dates according to new project start date
-ErrorShiftTaskDate=غیر ممکن است به تغییر تاریخ کار با توجه به پروژه جدید تاریخ شروع
-ProjectsAndTasksLines=پروژه ها و وظایف
-ProjectCreatedInDolibarr=پروژه٪ s را ایجاد
-ProjectValidatedInDolibarr=Project %s validated
+CantRemoveProject=این طرح قابل حذف نیست چون توسط سایر اشیاء (از قبیل صورت‌حساب، سفارش و غیره) مورد ارجاع قرار گرفته است. به زبانۀ ارجاع‌کننده‌ها مراجعه کنید.
+ValidateProject=تائیداعتبار طرح
+ConfirmValidateProject=آیا مطمئنید می‌خواهید اعتبار این طرح را تائید کنید؟
+CloseAProject=بستن طرح
+ConfirmCloseAProject=آیا مطمئن هستید می‌خواهید این طرح را ببندید؟
+AlsoCloseAProject=همچنین طرح بسته شود ( در صورتی که هنوز نیاز دارید وظایف عملیاتی را پیگیری کنید، طرح را باز نگاه دارید)
+ReOpenAProject=بازکردن طرح
+ConfirmReOpenAProject=آیا مطمئن هستید می‌خواهید این طرح را بازگشائی کنید؟
+ProjectContact=طرف‌های تماس طرح
+TaskContact=طرف‌های تماس وظیفه
+ActionsOnProject=روی‌دادهای این سرح
+YouAreNotContactOfProject=شما برای این طرح‌خصوصی طرف تماس نیستید
+UserIsNotContactOfProject=کاربر برای این طرح‌خصوصی، طرف تماس نیست
+DeleteATimeSpent=حذف زمان صرف شده
+ConfirmDeleteATimeSpent=آیا مطمئن هستید که این زمان صرف‌شده را حذف می‌کنید؟
+DoNotShowMyTasksOnly=نمایش وظایفی که به من محول نشده است
+ShowMyTasksOnly=نمایش محدود به وظایفی که به من محول شده است
+TaskRessourceLinks=طرف‌های تماس وظیفه
+ProjectsDedicatedToThisThirdParty=طرح‌های اختصاص‌داده شده به این شخص‌سوم
+NoTasks=برای این طرح وظیفه‌ای نیست
+LinkedToAnotherCompany=پیوند شده به شخص‌سوم دیگر
+TaskIsNotAssignedToUser=این وظیفه به هیچ کاربری محول نشده. از کلید '<strong>%s</strong>' برای محول کردن به یک کاربر استفاده کنید
+ErrorTimeSpentIsEmpty=زمان صرف شده خالی است
+ThisWillAlsoRemoveTasks=این کنش همچنین باعث حذف همۀ وظایف طرح می‌شود (<b>%s</b> وظیفه در حال حاضر) و همۀ ورودی‌های زمان صرف شده.
+IfNeedToUseOtherObjectKeepEmpty=اگر برخی از اشیاء (فاکتور، سفارش، ...)  که متعلق به شخص‌سوم دیگری است، لازم است به طرح دیگری که باید ساخته شود پیوند شود، این بخش را برای برخورداری از طرحی که چند شخص‌سوم دارد خالی رها کنید.
+CloneTasks=نسخه‌برداری از وظیفه
+CloneContacts=نسخه‌برداری از طرف‌های تماس
+CloneNotes=نسخه‌برداری از یادداشت‌ها
+CloneProjectFiles=نسخه‌برداری‌از فایل‌ها ضمیمه شدۀ طرح
+CloneTaskFiles=نسخه‌برداری از فایل‌ها ضمیمه‌شدۀ وظیفه(ها)، (اگر وظیفه(ها) نسخه‌برداری شوند)
+CloneMoveDate=تعیین تاریخ طرح‌ها/وظایف از حالا؟
+ConfirmCloneProject=آیا مطمئن هستید می‌خواهید این طرح را نسخه‌برداری کنید؟
+ProjectReportDate=تغییر تاریخ وظایف بر حسب تاریخ جدید شروع طرح؟
+ErrorShiftTaskDate=جابجائی تاریخ وظیفه بر حسب تاریخ جدید شروع طرح امکان ندارد
+ProjectsAndTasksLines=طرح‌ها و وظایف
+ProjectCreatedInDolibarr=طرح %s ساخته شد
+ProjectValidatedInDolibarr=ظرح %s تائیداعتبار شد
 ProjectModifiedInDolibarr=طرح %s ویرایش شد
-TaskCreatedInDolibarr=وظیفه٪ s را ایجاد
-TaskModifiedInDolibarr=وظیفه٪ s تغییر
-TaskDeletedInDolibarr=وظیفه٪ s را حذف
-OpportunityStatus=Lead status
-OpportunityStatusShort=Lead status
-OpportunityProbability=Lead probability
-OpportunityProbabilityShort=Lead probab.
-OpportunityAmount=Lead amount
-OpportunityAmountShort=Lead amount
-OpportunityAmountAverageShort=Average lead amount
-OpportunityAmountWeigthedShort=Weighted lead amount
-WonLostExcluded=Won/Lost excluded
+TaskCreatedInDolibarr=وظیفه %s ایجاد شد
+TaskModifiedInDolibarr=وظیفۀ %s ویرایش شد
+TaskDeletedInDolibarr=وظیفۀ %s حذف شد
+OpportunityStatus=وضعیت سرنخ
+OpportunityStatusShort=وضعیت سرنخ
+OpportunityProbability=احتمال سرنخ
+OpportunityProbabilityShort=احتمال سرنخ
+OpportunityAmount=مبلغ سرنخ
+OpportunityAmountShort=مبلغ سرنخ
+OpportunityAmountAverageShort=مبلغ میانگین سرنخ
+OpportunityAmountWeigthedShort=مبلغ متوازن سرنخ
+WonLostExcluded=بدون شامل شدن برد/باخت 
 ##### Types de contacts #####
-TypeContact_project_internal_PROJECTLEADER=رهبر پروژه
-TypeContact_project_external_PROJECTLEADER=رهبر پروژه
-TypeContact_project_internal_PROJECTCONTRIBUTOR=شرکت کننده
-TypeContact_project_external_PROJECTCONTRIBUTOR=شرکت کننده
-TypeContact_project_task_internal_TASKEXECUTIVE=اجرایی کار
-TypeContact_project_task_external_TASKEXECUTIVE=اجرایی کار
-TypeContact_project_task_internal_TASKCONTRIBUTOR=شرکت کننده
-TypeContact_project_task_external_TASKCONTRIBUTOR=شرکت کننده
+TypeContact_project_internal_PROJECTLEADER=مدیر طرح
+TypeContact_project_external_PROJECTLEADER=مدیر طرح
+TypeContact_project_internal_PROJECTCONTRIBUTOR=مشارکت کننده
+TypeContact_project_external_PROJECTCONTRIBUTOR=مشارکت کننده
+TypeContact_project_task_internal_TASKEXECUTIVE=مجری وظیفه
+TypeContact_project_task_external_TASKEXECUTIVE=مجری وظیفه
+TypeContact_project_task_internal_TASKCONTRIBUTOR=مشارکت کننده
+TypeContact_project_task_external_TASKCONTRIBUTOR=مشارکت کننده
 SelectElement=انتخاب عنصر
-AddElement=لینک به عنصر
+AddElement=پیوند به عنصر
 # Documents models
-DocumentModelBeluga=Project document template for linked objects overview
-DocumentModelBaleine=Project document template for tasks
-DocumentModelTimeSpent=Project report template for time spent
-PlannedWorkload=حجم کار برنامه ریزی شده
-PlannedWorkloadShort=Workload
+DocumentModelBeluga=مستند قالبی طرح برای پیش‌نمایش اشیاء پیوند شده
+DocumentModelBaleine=مستند قالبی طرح برای وظایف
+DocumentModelTimeSpent=مستند قالبی طرح برای زمان صرف شده
+PlannedWorkload=حجم‌کار برنامه‌ریزی‌شده
+PlannedWorkloadShort=حجم‌کار
 ProjectReferers=موارد مربوط
-ProjectMustBeValidatedFirst=پروژه ابتدا باید معتبر باشد
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputDetail=Input detail
-TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
-ProjectsWithThisUserAsContact=Projects with this user as contact
-TasksWithThisUserAsContact=Tasks assigned to this user
-ResourceNotAssignedToProject=Not assigned to project
-ResourceNotAssignedToTheTask=Not assigned to the task
-NoUserAssignedToTheProject=No users assigned to this project
-TimeSpentBy=Time spent by
-TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
-AssignTaskToUser=Assign task to %s
-SelectTaskToAssign=Select task to assign...
-AssignTask=Assign
-ProjectOverview=Overview
-ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
-ProjectNbProjectByMonth=No. of created projects by month
-ProjectNbTaskByMonth=No. of created tasks by month
-ProjectOppAmountOfProjectsByMonth=Amount of leads by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
-TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
-IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
-OpenedProjectsByThirdparties=Open projects by third parties
-OnlyOpportunitiesShort=Only leads
-OpenedOpportunitiesShort=Open leads
-NotOpenedOpportunitiesShort=Not an open lead
-NotAnOpportunityShort=Not a lead
-OpportunityTotalAmount=Total amount of leads
-OpportunityPonderatedAmount=Weighted amount of leads
-OpportunityPonderatedAmountDesc=Leads amount weighted with probability
-OppStatusPROSP=Prospection
-OppStatusQUAL=Qualification
+ProjectMustBeValidatedFirst=ابتدا باید طرح تائیداعتبار شود
+FirstAddRessourceToAllocateTime=نسبت دادن منابع کاربر برای اختصاص زمان
+InputPerDay=ورودی در روز
+InputPerWeek=ورودی در هفته
+InputDetail=جزئیات ورودی
+TimeAlreadyRecorded=این زمان صرف شده قبلا برای این وظیفه/روز و کاربر %s ثبت شده است
+ProjectsWithThisUserAsContact=طرح‌های مربوط به این کاربر به‌عنوان طرف تماس
+TasksWithThisUserAsContact=وظایف محول شده به این کاربر
+ResourceNotAssignedToProject=به طرح نسبت داده نشده
+ResourceNotAssignedToTheTask=به این طرح نسبت داده نشده
+NoUserAssignedToTheProject=هیچ کاربری به این طرح نسبت داده نشده است
+TimeSpentBy=زمان نسبت شده توسط
+TasksAssignedTo=وظایف نسبت داده شده به
+AssignTaskToMe=نسبت دادن وظیفه به من
+AssignTaskToUser=نسبت دادن وظیفه به %s
+SelectTaskToAssign=انتخاب وظیفه برای محول کردن
+AssignTask=نسبت‌دادن/محول کردن
+ProjectOverview=نمای‌کلی
+ManageTasks=استفاده از طرح‌ها برای پیگیری وظایف و یا گزارش زمان صرف شده (برگه‌های زمان)
+ManageOpportunitiesStatus=استفاده از طرح‌ها برای پیگیری سرنخ‌ها/فرصت‌ها
+ProjectNbProjectByMonth=تعداد طرح‌های ساخته شده در ماه
+ProjectNbTaskByMonth=تعداد وظایف ساخته شده در ماه
+ProjectOppAmountOfProjectsByMonth=مبلغ سرنخ‌ها در ماه
+ProjectWeightedOppAmountOfProjectsByMonth=مبلغ متوازن سرنخ‌ها در ماه
+ProjectOpenedProjectByOppStatus=بازکردن طرح/سرنخ برحسب وضعیت سرنخ
+ProjectsStatistics=آمار برای طرح‌ها/سرنخ‌ها
+TasksStatistics=آمار برای وظایف طرح‌ها/سرنخ‌ها
+TaskAssignedToEnterTime=وظیفه محول شد. وارد کردن زمان به این وظیفه باید ممکن باشد.
+IdTaskTime=شناسۀ زمان وظیفه
+YouCanCompleteRef=اگر بخواهید عبارت ارجاع را با پس‌وند تکمیل کنید، پیشنهاد می‌شود یک نویسۀ خط‌فاصله - برای جدا کردن آن استفاده کنی،  که شماره‌گذاری خودکار برای طرح‌های بعدی نیز به درستی کار کند. برای مثال %s-پس‌وند من
+OpenedProjectsByThirdparties=طرح‌های باز بر حسب شخص‌سوم
+OnlyOpportunitiesShort=فقط سرنخ‌ها
+OpenedOpportunitiesShort=سرنخ‌های باز
+NotOpenedOpportunitiesShort=یک سرنخ‌باز نیست
+NotAnOpportunityShort=یک سرنخ نیست
+OpportunityTotalAmount=کل مبلغ سرنخ‌خا
+OpportunityPonderatedAmount=مبلغ متوان سرنخ‌ها
+OpportunityPonderatedAmountDesc=مبلغ سرنخ متوازن شده با احتمال
+OppStatusPROSP=چشم‌انداز
+OppStatusQUAL=تائید شرایط
 OppStatusPROPO=پیشنهاد
-OppStatusNEGO=Negociation
+OppStatusNEGO=مذاکره
 OppStatusPENDING=در انتظار
-OppStatusWON=Won
-OppStatusLOST=Lost
-Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
-LatestProjects=Latest %s projects
-LatestModifiedProjects=Latest %s modified projects
-OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+OppStatusWON=برد
+OppStatusLOST=باخت
+Budget=بودجه
+AllowToLinkFromOtherCompany=امکان پیوند کردن طرح از یک شرکت دیگر <br><br><u> مقادیر پیشتیبانی شده:</u><br> - خالی رها کردن: امکان پیوند کردن به هر طرحی از شرکت (پیش‌فرض) <br> - "همه": امکان پیوند به هر طرحی، حتی طرح‌های مربوط به سایر شرکت‌ها <br> - فهرستی از شناسه‌های اشخاص‌سوم که با ویرگول(انگلیسی) از هم جدا شده‌اند:  امکان پیوند کردن همۀ طرح‌های این طرف‌های سوم  (مثال:  123,4795,53)
+LatestProjects=آخرین %s طرح
+LatestModifiedProjects=آخرین %s طرح تغییر یافته
+OtherFilteredTasks=سایر وظایف گُزیده شده
+NoAssignedTasks=هیچ وظیفه‌ای نسبت داده نشده ( طرح/وظیفه را از بالا به کاربر فعلی نسبت دهید تا زمان را روی آن وارد کنید)
+ThirdPartyRequiredToGenerateInvoice=یک طرف سوم باید روی طرح تعریف شود تا امکان صورت‌حساب درست کردن برای آن وجود داشته باشد
 # Comments trans
-AllowCommentOnTask=Allow user comments on tasks
-AllowCommentOnProject=Allow user comments on projects
-DontHavePermissionForCloseProject=You do not have permissions to close the project %s
-DontHaveTheValidateStatus=The project %s must be open to be closed
-RecordsClosed=%s project(s) closed
-SendProjectRef=Information project %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
-NewTaskRefSuggested=Task ref already used, a new task ref is required
-TimeSpentInvoiced=Time spent billed
+AllowCommentOnTask=اجازۀ یادداشت نویسی کاربران روی وظایف
+AllowCommentOnProject=امکان توضیح نویسی بر روی طرح‌ها
+DontHavePermissionForCloseProject=شما اجازۀ بستن این طرح را ندارید %s
+DontHaveTheValidateStatus=طرح %s باید باز باشد تا بسته شود
+RecordsClosed=(%s) طرح بسته شد
+SendProjectRef=اطلاعات طرح %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=واحد 'حقوق‌ها' باید فعال شود تا امکان تعریف نرخ ساعتی کارمند وجود داشته باشد تا ارزش زمان صرف شده قابل تعیت کردن باشد
+NewTaskRefSuggested=ارجاع وظیفه قبلا استفاده شده ات، یک ارجاع جدید وظیفه نیاز است
+TimeSpentInvoiced=زمان صرف شدۀ صورت‌حساب شده
 TimeSpentForInvoice=زمان صرف شده
-OneLinePerUser=One line per user
-ServiceToUseOnLines=Service to use on lines
-InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+OneLinePerUser=هر سطر یک کاربر
+ServiceToUseOnLines=خدمات برای استفاده بر سطور
+InvoiceGeneratedFromTimeSpent=صورت‌حساب %s بر اساس زمان صرف شده روی طرح تولید شد
+ProjectBillTimeDescription=علامت بزنید در صورتی که بخواهید برگۀ زمان را بر روی وظایف طرح‌ها وارد می‌کنید و قصد دارید صورت‌حسابی از این برگۀ زمان ایجاد کنید تا از مشتری طرح مبلغ اخذ کنید. (اگر نمی‌خواهید صورت‌حسابی که مبتنی بر برگۀ زمان است ایجاد کنید، علامت نزنید).
diff --git a/htdocs/langs/fa_IR/propal.lang b/htdocs/langs/fa_IR/propal.lang
index 7a580c5ddb4..350a62579f7 100644
--- a/htdocs/langs/fa_IR/propal.lang
+++ b/htdocs/langs/fa_IR/propal.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=طرح های تجاری
+Proposals=پیشنهادهای تجاری
 Proposal=پیشنهاد تجاری
 ProposalShort=پیشنهاد
-ProposalsDraft=طرح تجاری پیش نویس
-ProposalsOpened=Open commercial proposals
+ProposalsDraft=پیشنهاد تجاری پیش‌نویس
+ProposalsOpened=بازکردن پیشنهادات تجاری
 CommercialProposal=پیشنهاد تجاری
 PdfCommercialProposalTitle=پیشنهاد تجاری
-ProposalCard=کارت های پیشنهادی
-NewProp=طرح تجاری جدید
-NewPropal=پیشنهاد جدید
-Prospect=چشم انداز
-DeleteProp=حذف طرح تجاری
-ValidateProp=اعتبار طرح های تجاری
-AddProp=Create proposal
+ProposalCard=کارت پیشنهاد
+NewProp=ساخت پیشنهاد تجاری
+NewPropal=ساخت پیشنهاد
+Prospect=احتمالی
+DeleteProp=حذف پیشنهاد تجاری
+ValidateProp=تائید پیشنهاد تجاری
+AddProp=ساخت پیشنهاد
 ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
 ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
 LastPropals=Latest %s proposals
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index bb2dfd3e8b9..46740ab3f79 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -1,212 +1,212 @@
 # Dolibarr language file - Source file is en_US - stocks
 WarehouseCard=کارت انبار
-Warehouse=مخزن
-Warehouses=ساختمان و ذخیره سازی
-ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock Location
-WarehouseEdit=اصلاح انبار
+Warehouse=انبار
+Warehouses=انبار
+ParentWarehouse=انبار والد
+NewWarehouse=یک انبار/مخزن جدید
+WarehouseEdit=اصلاح انبارویرایش انبار
 MenuNewWarehouse=انبار جدید
 WarehouseSource=انبار منبع
-WarehouseSourceNotDefined=بدون انبار تعریف شده است،
-AddWarehouse=Create warehouse
-AddOne=اضافه کردن یک
-DefaultWarehouse=Default warehouse
-WarehouseTarget=انبار هدف
-ValidateSending=حذف ارسال
-CancelSending=لغو ارسال
-DeleteSending=حذف ارسال
+WarehouseSourceNotDefined=انباری تعریف نشده است
+AddWarehouse=ایجاد انبار
+AddOne=افزودن یک‌مورد
+DefaultWarehouse=انبار پیش‌فرض
+WarehouseTarget=انبار مقصد
+ValidateSending=حذف جابجائی
+CancelSending=لغو جابجائی
+DeleteSending=حذف جابجائی
 Stock=موجودی
-Stocks=سهام
-StocksByLotSerial=Stocks by lot/serial
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
-Movements=جنبش
-ErrorWarehouseRefRequired=نام انبار مرجع مورد نیاز است
-ListOfWarehouses=لیست انبار
-ListOfStockMovements=فهرست جنبش های سهام
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
-StocksArea=Warehouses area
-AllWarehouses=All warehouses
-IncludeAlsoDraftOrders=Include also draft orders
+Stocks=موجودی
+StocksByLotSerial=موجودی به‌واسطۀ سری‌ساخت/شماره‌سری
+LotSerial=سری‌ساخت/شماره‌سریال
+LotSerialList=فهرست سری‌ساخت/شماره‌سریال
+Movements=جابجائی‌ها
+ErrorWarehouseRefRequired=نام مرجع برای انبار الزامی است
+ListOfWarehouses=فهرست انبار‌ها
+ListOfStockMovements=فهرست جابجائی‌ بین انبارها
+ListOfInventories=فهرست موجودی‌ها
+MovementId=شناسۀ جابجائی
+StockMovementForId=شناسۀ جابجائی %d
+ListMouvementStockProject=فهرست جابجائی‌های مربوط به یک طرح
+StocksArea=ناحیۀ انبارها
+AllWarehouses=همۀ انبارها
+IncludeAlsoDraftOrders=دربرگرفتن سفارش‌های پیش‌نویس
 Location=محل
-LocationSummary=محل نام کوتاه
-NumberOfDifferentProducts=تعداد محصولات مختلف
+LocationSummary=نام‌کوتاه محل
+NumberOfDifferentProducts=تعداد عناوین محصولات
 NumberOfProducts=تعداد کل محصولات
-LastMovement=Latest movement
-LastMovements=Latest movements
+LastMovement=آخرین جابجائی‌ها
+LastMovements=آخرین جابه‌جائی‌ها
 Units=واحد
 Unit=واحد
-StockCorrection=Stock correction
-CorrectStock=سهام صحیح
-StockTransfer=انتقال سهام
-TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
+StockCorrection=تصحیح موجودی
+CorrectStock=درست‌کردن موجودی
+StockTransfer=جابجائی موجودی
+TransferStock=جابه‌جائی موجودی
+MassStockTransferShort=جابجائی انبوه موجودی
+StockMovement=جابجائی موجودی
+StockMovements=جابه‌جائی‌های موجودی
 NumberOfUnit=تعداد واحد
 UnitPurchaseValue=قیمت خرید واحد
-StockTooLow=سهام بیش از حد کم
-StockLowerThanLimit=Stock lower than alert limit (%s)
-EnhancedValue=ارزش
-PMPValue=قیمت به طور متوسط ​​وزنی
-PMPValueShort=WAP
-EnhancedValueOfWarehouses=ارزش ساختمان و ذخیره سازی
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
-IndependantSubProductStock=Product stock and subproduct stock are independent
-QtyDispatched=تعداد اعزام
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
-DeStockOnValidateOrder=Decrease real stocks on validation of sales order
-DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
-ReStockOnValidateOrder=Increase real stocks on purchase order approval
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
-OrderStatusNotReadyToDispatch=منظور هنوز رتبهدهی نشده است و یا بیشتر یک وضعیت است که اجازه می دهد تا اعزام از محصولات در انبارها سهام.
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
-NoPredefinedProductToDispatch=محصولات از پیش تعریف شده برای این شی. بنابراین بدون اعزام در انبار مورد نیاز است.
-DispatchVerb=اعزام
-StockLimitShort=محدود برای هشدار
-StockLimit=محدود سهام برای هشدار
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical Stock
-RealStock=سهام و مستغلات
-RealStockDesc=Physical/real stock is the stock currently in the warehouses.
-RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
-VirtualStock=سهام مجازی
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
-IdWarehouse=انبار شناسه
-DescWareHouse=شرح انبار
-LieuWareHouse=انبار محل
-WarehousesAndProducts=سیستم های ذخیره سازی و محصولات
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=میانگین وزنی قیمت ورودی
-AverageUnitPricePMP=میانگین وزنی قیمت ورودی
-SellPriceMin=فروش قیمت واحد
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
-EstimatedStockValueShort=ارزش سهام ورودی
-EstimatedStockValue=ارزش سهام ورودی
+StockTooLow=موجودی بسیار کم است
+StockLowerThanLimit=موجودی کم‌تر از حد هشدار است (%s)
+EnhancedValue=مقدار
+PMPValue=قیمت میانگین متوازن
+PMPValueShort=قیمت میانگین وزنی
+EnhancedValueOfWarehouses=ارزش انبار
+UserWarehouseAutoCreate=ساخت خودکار انبار کاربر در هنگام ساخت کاربر
+AllowAddLimitStockByWarehouse=مدیریت مقادیر برای «حداقل موجودی» و «موجودی مطلوب» در ازای همآورد‌سازی (محصول-انبار) باضافۀ افزودن « مقدار در ازای محصول»
+IndependantSubProductStock=موجودی محصول و موجودی زیرمحصول از یکدیگر مستقل هستن
+QtyDispatched=تعداد ارسالی
+QtyDispatchedShort=تعداد ارسالی
+QtyToDispatchShort=تعداد قابل ارسال
+OrderDispatch=موارد دریافتی
+RuleForStockManagementDecrease=انتخاب قواعد کسر خودکار از موجودی ( کاهش دستی دلخواه همواره ممکن است، حتی در صورتی که یک قاعدۀ کسر خودکار فعال باشد)
+RuleForStockManagementIncrease=انتخاب قواعد افزایش خودکار موجودی ( افزایش دستی دلخواه همواره ممکن است، حتی در صورتی که یک قادۀ افزایش خودکار فعال باشد)
+DeStockOnBill=کاهش موجودی واقعی در هنگام تائیداعتبار صورت‌حساب‌مشتری/یادداشت اعتباری
+DeStockOnValidateOrder=کاهش موجودی واقعی در هنگام تائیداعتبار سفارش فروش
+DeStockOnShipment=کاهش موجودی واقعی در هنگام تائیداعتبار حمل-ارسال
+DeStockOnShipmentOnClosing=کاهش موجودی واقعی در هنگام بسته‌شدن طبقه‌بندی حمل-ارسال
+ReStockOnBill=افزایش موجودی واقعی در هنگام تائیداعتبار صورت‌حساب فروشنده/یادداشت اعتباری
+ReStockOnValidateOrder=افزایش موجودی واقعی در هنگام تائیداعتبار سفارش خرید
+ReStockOnDispatchOrder=افزایش موجودی واقعی در هنگام ارسال دستی و دلخواه به انبار، پس از رسید سفارش خرید کالاها
+OrderStatusNotReadyToDispatch=سفارش دیگر یا هنوز وضعیتی را دارا نیست که اجازۀ اعزام محصولات به موجودی انبارها را داشته باشد.
+StockDiffPhysicTeoric=توضیحات مربوط به اختلاف میان محصولات مجازی و حقیقی
+NoPredefinedProductToDispatch=محصول از پیش تعریف‌شده‌ای برای این شیء وجود ندارد. بنابراین نیازی به ارسال به موجودی نیست.
+DispatchVerb=اعزام-ارسال
+StockLimitShort=حداقل برای هشدار
+StockLimit=حداقل‌موجودی برای هشدار
+StockLimitDesc=(خالی) به معنای عدم هشدار است. <br> از مقدار 0 برای هشدار در هنگام تمام شدن موجودی استفاده نمائید.
+PhysicalStock=موجودی فیزیکی
+RealStock=موجودی واقعی
+RealStockDesc=موجودی فیزیکی/واقعی موجودی‌هائی هستند که اکنون در انبارها وجود دارند.
+RealStockWillAutomaticallyWhen=موجودی واقعی با توجه به این قاعده ویرایش خواهد شد (طوری که در واحد موجودی تعریف شده است):
+VirtualStock=موجودی مجازی
+VirtualStockDesc=موجودی مجازی، موجودی محاسبه شده‌ای است که در هنگام بسته شدن همۀ کنش‌های باز/درحال‌انجام (که روی موجودی اثر دارند) در دسترس خواهد بود. (یعنی پس از دریافت سفارش‌های خرید، پس از حمل سفارشات فروش و غیره).
+IdWarehouse=شناسۀ انبار
+DescWareHouse=توضیحات مربوط به انبار
+LieuWareHouse=محل انبار
+WarehousesAndProducts=انبارها و محصولا
+WarehousesAndProductsBatchDetail=انبارها و محصولات (با جزئیات مربوط به سری‌ساخت/سریال)
+AverageUnitPricePMPShort=قیمت ورودی متوازن میانگین
+AverageUnitPricePMP=قیمت ورودی متوازن میانگین
+SellPriceMin=قیمت فروش واحد
+EstimatedStockValueSellShort=مقدار برای فروش
+EstimatedStockValueSell=مقدار برای فروش
+EstimatedStockValueShort=مقدار ورودی موجودی
+EstimatedStockValue=مقدار ورودی موجودی
 DeleteAWarehouse=حذف یک انبار
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
-PersonalStock=سهام شخصی از٪ s
-ThisWarehouseIsPersonalStock=این انبار را نشان سهام شخصی از٪ s در٪ s را
-SelectWarehouseForStockDecrease=انتخاب انبار استفاده برای سهام کاهش
-SelectWarehouseForStockIncrease=انتخاب انبار استفاده برای افزایش سهام
-NoStockAction=بدون عمل سهام
-DesiredStock=Desired Stock
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+ConfirmDeleteWarehouse=آیا مطمئن هستید می‌خواهید انبار <b>%s</b> را حذف کنید؟
+PersonalStock=موجودی شخصی %s
+ThisWarehouseIsPersonalStock=این انبار بیان‌گر موجودی شخصی %s%s است
+SelectWarehouseForStockDecrease=یک انبار برای کاهش موجودی انتخاب کنید
+SelectWarehouseForStockIncrease=یک انبار برای افزایش موجودی انتخاب کنید
+NoStockAction=کار مربوط به انبار وجود ندارد
+DesiredStock=موجودی مطلوب
+DesiredStockDesc=این میزان موجودی به‌عنوان معیار در قابلیت پرکردن موجودی استفاده می‌شود.
 StockToBuy=برای سفارش
-Replenishment=دوباره پر کردن
-ReplenishmentOrders=سفارشات دوباره پر کردن
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=استفاده از سهام مجازی به طور پیش فرض، به جای سهام فیزیکی، برای قابلیت دوباره پر کردن
-UseVirtualStock=استفاده از سهام مجازی
-UsePhysicalStock=استفاده از سهام فیزیکی
-CurentSelectionMode=Current selection mode
-CurentlyUsingVirtualStock=سهام مجازی
-CurentlyUsingPhysicalStock=سهام فیزیکی
-RuleForStockReplenishment=حکومت برای سهام دوباره پر کردن
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+Replenishment=دوباره پر کردن موجودی
+ReplenishmentOrders=سفارشات دوباره‌پرکردن موجودی
+VirtualDiffersFromPhysical=با توجه به گزینه‌های افزایش/کاهش موجودی، موجودی فیزیکی و موجودی مجازی (سفارشات فیزیکی/فعلی) ممکن است متفاوت باشد
+UseVirtualStockByDefault=به‌شکل‌پیش‌فرض در خصوص قابلیت دوباره‌پرسازی به‌جای موجودی فیزیکی از موجودی مجازی استفاده شود
+UseVirtualStock=استفاده از موجودی مجازی
+UsePhysicalStock=استفاده از موجودی فیزیکی
+CurentSelectionMode=وضعیت منتخب کنونی
+CurentlyUsingVirtualStock=موجودی مجازی
+CurentlyUsingPhysicalStock=موجودی فیزیکی
+RuleForStockReplenishment=قاعدۀ دوباره‌پر‌سازی موجودی
+SelectProductWithNotNullQty=حداقل یک محصول دارای تعداد و فروشنده انتخاب نمائید
 AlertOnly= فقط هشدارها
-WarehouseForStockDecrease=<b>انبار٪ خواهد</b> شد برای سهام کاهش استفاده
-WarehouseForStockIncrease=<b>انبار٪ خواهد</b> شد برای افزایش سهام استفاده
+WarehouseForStockDecrease=انبار  <b>%s</b> برای کاهش موجودی استفاده خواهد شد
+WarehouseForStockIncrease=انبار  <b>%s</b> برای افزایش موجودی استفاده خواهد شد
 ForThisWarehouse=برای این انبار
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
-Replenishments=پر کردن
-NbOfProductBeforePeriod=تعداد محصول٪ s را در انبار قبل از دوره (<٪) انتخاب
-NbOfProductAfterPeriod=تعداد محصول٪ s را در سهام بعد از دوره زمانی انتخاب شده (>٪ بازدید کنندگان)
-MassMovement=جنبش توده ای
-SelectProductInAndOutWareHouse=انتخاب محصول، مقدار، یک انبار منابع و انبار هدف، و سپس کلیک کنید "٪ s". به محض این که برای همه جنبش های مورد نیاز انجام می شود، بر روی "٪ s" را کلیک کنید.
-RecordMovement=Record transfer
-ReceivingForSameOrder=Receipts for this order
-StockMovementRecorded=جنبش های سهام ثبت شده
-RuleForStockAvailability=قوانین مورد نیاز سهام
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
-MovementLabel=Label of movement
-TypeMovement=Type of movement
-DateMovement=Date of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
-WarehouseAllowNegativeTransfer=Stock can be negative
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+ReplenishmentStatusDesc=این فهرست محصولاتی  است که موجودی آن‌ها کم‌تر از حد مطلوب است (یا اگر بخش فقط‌هشدارها فعال باشد، کم‌تر از مقدار هشدار است). با استفاده از این کادر تائید، شما می‌توانید برای پر کردن اختلاف، سفارشات خرید ایجاد نمائید.
+ReplenishmentOrdersDesc=این فهرستی از همۀ سفارشات خرید باز است که شامل محصولات از پیش‌تعریف شده است. تنها سفارشات باز به‌همراه محصولات از پیش‌تعریف شده و بالطبع سفارشاتی که روی موجودی اثر می‌گذارند در این قسمت نمایش داده می‌شوند.
+Replenishments=دوباره‌پر‌کردن
+NbOfProductBeforePeriod=تعداد موجودی %s پیش از بازۀ انتخابی (< %s)
+NbOfProductAfterPeriod=تعداد موجودی  %s پس از بازۀ انتخابی (> %s)
+MassMovement=جابجائی انبوه
+SelectProductInAndOutWareHouse=یک محصول، مقدار و یک انبار مبدأ و یک انبار مقصد انتخاب کنید، سپس بر روی "%s" کلیک نمائید. پس از انجام این‌کار برای همۀ جابجائی‌هائی مورد نیاز، بر روی "%s" کلیک نمائید.
+RecordMovement=ثبت جابجائی
+ReceivingForSameOrder=رسیدهای این سفارش
+StockMovementRecorded=جابجائی موجودی‌ها ثبت شد
+RuleForStockAvailability=قواعد نیازمندی‌های موجودی
+StockMustBeEnoughForInvoice=میزان موجودی باید به حدی کافی باشد که بتوان یک محصول/خدمت را به صورت‌حساب اضافه کرد ( بررسی در خصوص موجودی واقعی در هنگام افزودن یک سطر به صورت‌حساب و هر قدر قاعدۀ تغییر خودکار تعیین کند رخ می‌هد)
+StockMustBeEnoughForOrder=میزان موجودی باید به حدی کافی باشد که بتوان یک محصول/خدمت را به سفارش اضافه کرد ( بررسی در خصوص موجودی واقعی در هنگام افزودن یک سطر به سفارش و هر قدر قاعدۀ تغییر خودکار تعیین کند رخ می‌هد)
+StockMustBeEnoughForShipment= میزان موجودی باید به حدی کافی باشد که بتوان یک محصول/خدمت را به حمل‌ونقل سپرد  ( بررسی در خصوص موجودی واقعی در هنگام افزودن یک سطر به برگۀ حمل‌ونقل و هر قدر قاعدۀ تغییر خودکار تعیین کند رخ می‌هد)
+MovementLabel=عنوان جابجائی
+TypeMovement=نوع جابجائی
+DateMovement=تاریخ جابجائی
+InventoryCode=کد فهرست یا جابجائی
+IsInPackage=در یک بسته قرار گرفته است
+WarehouseAllowNegativeTransfer=موجودی می‌تواند منفی باشد
+qtyToTranferIsNotEnough=شما در انبار منبع خود موجودی کافی ندارید و تنظیمات شما اجازۀ موجودی منفی نمی‌دهد.
 ShowWarehouse=نمایش انبار
-MovementCorrectStock=Stock correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
-ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAll=Open for all actions
-OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
-ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
-ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
-ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
-AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
-InventoryDate=Inventory date
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-inventoryTitle=انبار
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
+MovementCorrectStock=تصحیح موجودی برای محصول %s
+MovementTransferStock=جابجائی موجودی محصول %s به یک انبار دیگر
+InventoryCodeShort=شمارۀ فهرست/جابجائی
+NoPendingReceptionOnSupplierOrder=با توجه به سفارشات خرید باز، دریافتی در انتظار نیست
+ThisSerialAlreadyExistWithDifferentDate=این شمارۀ سری‌ساخت/ارسال (<strong>%s</strong>) قبلا وجود داشته اما تاریخ مناسب‌برای‌فروش یا مناسب‌برای‌مصرف متفاوتی داشته است ( پیدا شده <strong>%s</strong> اما شما مقدار <strong>%s</strong> وارد کرده‌اید).
+OpenAll=باز برای همۀ کنش‌ها
+OpenInternal=باز منحصر به کنش‌های داخلی
+UseDispatchStatus=یک وضعیت برای اعزام-ارسال برای محصولات موجود در هنگام دریافت سفارش خرید انتخاب کنید (مجاز/غیرمجاز) 
+OptionMULTIPRICESIsOn=گزینۀ "قیمت‌های مختلف بر حسب قطعه" روشن است. این به معنای آن است که محصول قیمت‌های متفاوتی برای فروش داشته و امکان محاسبۀ مقدار فروش وجود ندارد.
+ProductStockWarehouseCreated=محدودیت موجودی برای هشدار و محدودیت مطلوب به دقت ساخته شد
+ProductStockWarehouseUpdated=محدودیت موجودی برای هشدار و محدودیت مطلوب به دقت روز‌آمد شد
+ProductStockWarehouseDeleted=محدودیت موجودی برای هشدار و محدودیت مطلوب به دقت حذف شد
+AddNewProductStockWarehouse=تعیین یک حد جدید موجودی و موجودی مطلوب برای هشدار 
+AddStockLocationLine=تعداد را کاهش داده و سپس برای ایجاد یک انبار جدید برای این محصول کلیک نمائید
+InventoryDate=تاریخ فهرست‌موجودی‌کالا
+NewInventory=فهرست‌موجودی جدید
+inventorySetup = برپاسازی فهرست‌موجودی
+inventoryCreatePermission=ساخت یک فهرست‌موجودی
+inventoryReadPermission=نمایش فهرست‌موجودی
+inventoryWritePermission=روزآمدسازی فهرست‌موجودی‌
+inventoryValidatePermission=تائیداعتبار فهرست‌موجودی
+inventoryTitle=فهرست‌موجودی
+inventoryListTitle=فهرست‌های‌موجودی
+inventoryListEmpty=هیچ فهرست‌بندی‌موجودی در جریان نیست
+inventoryCreateDelete=ساخت/حذف فهرست‌موجودی
+inventoryCreate=جدید
 inventoryEdit=ویرایش
-inventoryValidate=اعتبار
+inventoryValidate=تائید‌اعتبارشد
 inventoryDraft=در حال اجرا
-inventorySelectWarehouse=Warehouse choice
-inventoryConfirmCreate=ایجاد کردن
-inventoryOfWarehouse=Inventory for warehouse: %s
-inventoryErrorQtyAdd=Error: one quantity is less than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
-SelectCategory=فیلتر گروه
-SelectFournisseur=Vendor filter
-inventoryOnDate=انبار
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
-AddProduct=اضافه کردن
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
-inventoryDeleteLine=حذف خط
-RegulateStock=Regulate Stock
+inventorySelectWarehouse=انتخاب انبار
+inventoryConfirmCreate=ایجاد
+inventoryOfWarehouse=فهرست‌موجودی برای انبار: %s
+inventoryErrorQtyAdd=خطا: یک تعداد کمتر از صفر است
+inventoryMvtStock=به‌واسطۀ فهرست‌موجودی
+inventoryWarningProductAlreadyExists=این محصول قبلا در فهرست وجود داشته
+SelectCategory=صافی دسته‌بندی
+SelectFournisseur=صافی فروشنده
+inventoryOnDate=فهرست‌موجودی
+INVENTORY_DISABLE_VIRTUAL=محصول مجازی (بسته-کیت): عدم کاهش موجودی محصولات مولود
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=استفاده مبلغ خرید در صورتی‌کی هیچ مبلغی برای خرید آخر پیدا نشود
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=جابه‌جائی موجودی تاریخ فهرست‌موجودی را دارد
+inventoryChangePMPPermission=اجازۀ تغییر مقدار PMP محصول
+ColumnNewPMP=واحد جدید PMP
+OnlyProdsInStock=عدم افزایش محصولات بدون موجودی
+TheoricalQty=تعداد تئوریک
+TheoricalValue=تعداد تئوریک
+LastPA=آخرین BP
+CurrentPA=BP فعلی
+RealQty=تعدا واقعی
+RealValue=مقدار واقعی
+RegulatedQty=تعداد تنظیم شده
+AddInventoryProduct=افزودن یک محصول به فهرست‌موجودی
+AddProduct=افزودن
+ApplyPMP=انتساب PMP
+FlushInventory=خالی کردن فهرست‌موجودی
+ConfirmFlushInventory=آیا مطمئنید می‌خواهید این کار را انجام دهید؟
+InventoryFlushed=فهرست موجودی خالی شد
+ExitEditMode=خروج از ویرایش
+inventoryDeleteLine=حذف سطر
+RegulateStock=تنظیم موجودی
 ListInventory=فهرست
-StockSupportServices=Stock management supports Services
-StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
-ReceiveProducts=Receive items
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
-StockIncrease=Stock increase
-StockDecrease=Stock decrease
+StockSupportServices=مدیریت موجودی از خدمات پشتیبانی می‌کند
+StockSupportServicesDesc=به شکل پیش‌فرض شما می‌توانید موجودی محصولاتی از جنس "محصول" را ثبت کنید. اما شما علاوه بر این می‌توانید موجودی محصولی از جنس "خدمات" را نیز در صورتی که واحد خدمات و این گزینه فعال باشند نیز محاسبه کنید.
+ReceiveProducts=دریافت موارد
+StockIncreaseAfterCorrectTransfer=افزایش به‌واسطۀ تصحیح/جابجائی
+StockDecreaseAfterCorrectTransfer=کاهش به‌واسطۀ تصحیح/جابجائی
+StockIncrease=افزایش موجودی
+StockDecrease=کاهش موجودی
diff --git a/htdocs/langs/fa_IR/stripe.lang b/htdocs/langs/fa_IR/stripe.lang
index b9660e3e519..767799961bc 100644
--- a/htdocs/langs/fa_IR/stripe.lang
+++ b/htdocs/langs/fa_IR/stripe.lang
@@ -12,7 +12,7 @@ YourEMail=ایمیل برای دریافت تاییدیه پرداخت
 STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=بستانکار
 PaymentCode=کد های پرداخت
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=بعد
 ToOfferALinkForOnlinePayment=URL برای٪ s پرداخت
@@ -40,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +63,5 @@ CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/fa_IR/supplier_proposal.lang b/htdocs/langs/fa_IR/supplier_proposal.lang
index 07998fd36a7..b08fcbecbda 100644
--- a/htdocs/langs/fa_IR/supplier_proposal.lang
+++ b/htdocs/langs/fa_IR/supplier_proposal.lang
@@ -1,54 +1,54 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Vendor commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalNew=New price request
-CommRequest=Price request
+SupplierProposal=پیشنهادهای‌تجاری فروشندگان
+supplier_proposalDESC=هدایت درخواست‌های قیمت به تامین‌کنندگان
+SupplierProposalNew=درخواست قیمت جدید
+CommRequest=درخواست قیمت
 CommRequests=درخواست‌های قیمت
-SearchRequest=Find a request
-DraftRequests=Draft requests
-SupplierProposalsDraft=Draft vendor proposals
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
-SupplierProposalArea=Vendor proposals area
-SupplierProposalShort=Vendor proposal
+SearchRequest=جستجوی یک درخواست
+DraftRequests=درخواست‌های پیش‌نویس
+SupplierProposalsDraft=پیشنهاد‌های پیش‌نویس فروشندگان
+LastModifiedRequests=آخرین %s درخواست قیمت تغییریافته
+RequestsOpened=درخواست‌قیمت‌های باز
+SupplierProposalArea=بخش پیشنهاد‌های فروشندگان
+SupplierProposalShort=پیشنهادهای فروشندگان
 SupplierProposals=پیشنهادهای فروشندگان
 SupplierProposalsShort=پیشنهادهای فروشندگان
-NewAskPrice=New price request
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Vendor ref
+NewAskPrice=درخواست قیمت جدید
+ShowSupplierProposal=نمایش درخواست‌قیمت
+AddSupplierProposal=ایجاد یک درخواست‌قیمت
+SupplierProposalRefFourn=ارجاع فروشنده
 SupplierProposalDate=تاریخ تحویل
-SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
-ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
-DeleteAsk=Delete request
-ValidateAsk=Validate request
-SupplierProposalStatusDraft=پیش نویس (نیاز به تایید می شود)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalRefFournNotice=پیش از بستن به حالت  "قبول‌شده"، به فکر به‌دست آوردن مرجع‌های تامین کنندگان باشید.
+ConfirmValidateAsk=آیا مطمئنید می‌خواهید این درخواست قیمت را تحت نام <b>%s</b> تائیداعتبار کنید؟
+DeleteAsk=حذف درخواست
+ValidateAsk=تائیداعتبار درخواست
+SupplierProposalStatusDraft=پیش نویس (نیاز به تایید دارد)
+SupplierProposalStatusValidated=تائیدشده (درخواست باز است)
 SupplierProposalStatusClosed=بسته
-SupplierProposalStatusSigned=Accepted
-SupplierProposalStatusNotSigned=رد
-SupplierProposalStatusDraftShort=پیش نویس
-SupplierProposalStatusValidatedShort=اعتبار
+SupplierProposalStatusSigned=قبول‌شده
+SupplierProposalStatusNotSigned=ردشده
+SupplierProposalStatusDraftShort=پیش‌نویس
+SupplierProposalStatusValidatedShort=تائیداعتبارشده
 SupplierProposalStatusClosedShort=بسته
-SupplierProposalStatusSignedShort=Accepted
-SupplierProposalStatusNotSignedShort=رد
-CopyAskFrom=Create price request by copying existing a request
-CreateEmptyAsk=Create blank request
-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=Send price request by mail
-SendAskRef=Sending the price request %s
-SupplierProposalCard=Request card
-ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
-ActionsOnSupplierProposal=Events on price request
-DocModelAuroreDescription=A complete request model (logo...)
-CommercialAsk=Price request
-DefaultModelSupplierProposalCreate=ایجاد مدل پیش فرض
-DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
-DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of vendor proposal requests
-ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
-SupplierProposalsToClose=Vendor proposals to close
-SupplierProposalsToProcess=Vendor proposals to process
-LastSupplierProposals=Latest %s price requests
-AllPriceRequests=All requests
+SupplierProposalStatusSignedShort=قبول‌شده
+SupplierProposalStatusNotSignedShort=ردشده
+CopyAskFrom=ایجاد یک درخواست قیمت با نسخه‌برداری از یک درخواست موجود
+CreateEmptyAsk=ایجاد یک درخواست خالی
+ConfirmCloneAsk=آیا اطمینان دارید که می‌خواهید درخواست قیمت <b>%s</b> را نسخه‌برداری کنید؟
+ConfirmReOpenAsk=آیا اطمینان دارید که می‌خواهید درخواست قیمت <b>%s</b> را دوباره باز کنید؟
+SendAskByMail=ارسال درخواست قیمت توسط نامه
+SendAskRef=ارسال درخواست قیمت %s
+SupplierProposalCard=کارت درخواست
+ConfirmDeleteAsk=آیا اطمینان دارید می‌خواهید درخواست قیمت <b>%s</b> را حذف کنید؟
+ActionsOnSupplierProposal=رخدادهای مربوط به درخواست قیمت
+DocModelAuroreDescription=یک نمونۀ کامل درخواست (نماد...)
+CommercialAsk=درخواست قیمت
+DefaultModelSupplierProposalCreate=ایجاد نمونۀ پیش‌فرض
+DefaultModelSupplierProposalToBill=قالب پیش‌فرض در هنگام بستن یک درخواست قیمت (قبول شده)
+DefaultModelSupplierProposalClosed=قالب پیش‌فرض در هنگام بستن یک درخواست قیمت (رد شده)
+ListOfSupplierProposals=فهرست درخواست‌های پیشنهاد‌قیمت فروشندگان
+ListSupplierProposalsAssociatedProject=فهرست پیشنهادهای مرتبط با طرح
+SupplierProposalsToClose=پیشنهادفروش‌های قابل بستن
+SupplierProposalsToProcess=پیشنهادفروش‌های قابل پردازش
+LastSupplierProposals=آخرین %s درخواست قیمت
+AllPriceRequests=همۀ درخواست‌ها
diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang
index a3822f6077c..d7e7773f461 100644
--- a/htdocs/langs/fa_IR/suppliers.lang
+++ b/htdocs/langs/fa_IR/suppliers.lang
@@ -1,47 +1,47 @@
 # Dolibarr language file - Source file is en_US - vendors
-Suppliers=تامین‌کنندگان
+Suppliers=فروشندگان
 SuppliersInvoice=صورت‌حساب فروشنده
-ShowSupplierInvoice=Show Vendor Invoice
-NewSupplier=New vendor
-History=تاریخ
-ListOfSuppliers=List of vendors
-ShowSupplier=Show vendor
+ShowSupplierInvoice=نمایش صورت‌حساب فروشنده
+NewSupplier=فروشندۀ جدید
+History=سابقه
+ListOfSuppliers=فهرست فروشندگان
+ShowSupplier=نمایش فروشنده
 OrderDate=تاریخ سفارش
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=کل subproducts خرید قیمت
-TotalSellingPriceMinShort=Total of subproducts selling prices
-SomeSubProductHaveNoPrices=برخی از زیر محصولات هیچ قیمت تعریف شده
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
+BuyingPriceMin=بهترین قیمت خرید
+BuyingPriceMinShort=بهترین قیمت خرید
+TotalBuyingPriceMinShort=جمع قیمت‌های خرید زیرمحصول‌ها
+TotalSellingPriceMinShort=جمع قیمت‌های فروش زیرمحصول‌ها
+SomeSubProductHaveNoPrices=برخی از زیرمحصول‌ها قیمتشان تعین نشده است
+AddSupplierPrice=افزودن قیمت خرید
+ChangeSupplierPrice=تغییر قیمت خرید
 SupplierPrices=قیمت‌های فروشنده
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
-NoRecordedSuppliers=No vendor recorded
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=این ارجاع فروشنده قبلا با محصول: %s همراه شده است
+NoRecordedSuppliers=هیچ فروشنده‌ای ثبت نشده است
 SupplierPayment=پرداخت فروشنده
-SuppliersArea=Vendor area
-RefSupplierShort=ارجاع فروشنده
-Availability=دسترسی
-ExportDataset_fournisseur_1=Vendor invoices and invoice details
-ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order details
-ApproveThisOrder=تصویب این منظور
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
-DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create Purchase Order
-AddSupplierInvoice=Create vendor invoice
-ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
-SentToSuppliers=Sent to vendors
-ListOfSupplierOrders=List of purchase orders
-MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay (days)
-DescNbDaysToDelivery=The longest delivery delay of the products from this order
-SupplierReputation=Vendor reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Low quality
-ReputationForThisProduct=Reputation
-BuyerName=Buyer name
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of vendor
+SuppliersArea=بخش فروشندگان
+RefSupplierShort=ش.ارجاع فرونشده
+Availability=دردسترس‌بودن
+ExportDataset_fournisseur_1=صورت‌حساب‌های فروشندگان و جزئیات صورت‌حساب
+ExportDataset_fournisseur_2=صورت‌حساب‌های فروشندگان و پرداخت‌ها
+ExportDataset_fournisseur_3=سفارشات خرید و جزئیات سفارش
+ApproveThisOrder=تائید این سفارش
+ConfirmApproveThisOrder=آیا مطمئن هستید می‌خواهید سفارش <b>%s</b> را تائید کنید
+DenyingThisOrder=ردکردن این سفارش
+ConfirmDenyingThisOrder=آیا مطمئن هستید می‌خواهید سفارش <b>%s</b> را رد کنید؟
+ConfirmCancelThisOrder=آیا مطمئن هستید می‌خواهید سفارش <b>%s</b> را لغو کنید؟
+AddSupplierOrder=ساخت سفارش خرید
+AddSupplierInvoice=ساخت صورت‌حساب فروشنده
+ListOfSupplierProductForSupplier=فهرست محصولات و قیمت‌های فروشنده <b>%s</b>
+SentToSuppliers=ارسال شده به فروشندگان
+ListOfSupplierOrders=فهرست سفارش‌های خرید
+MenuOrdersSupplierToBill=سفارش‌های خرید به صورت‌حساب
+NbDaysToDelivery=تاخیر تحویل (روز)
+DescNbDaysToDelivery=حداکثر تاخیر ممکن برای تحویل این محصولات
+SupplierReputation=اعتبار فروشنده
+DoNotOrderThisProductToThisSupplier=عدم انجام سفارش
+NotTheGoodQualitySupplier=کم کیفیت
+ReputationForThisProduct=اعتبار
+BuyerName=نام خریدار
+AllProductServicePrices=همۀ قیمت‌های محصولات/خدمات
+AllProductReferencesOfSupplier=ارجاع همۀ محصولات / خدمات فرونشده
 BuyingPriceNumShort=قیمت‌های فروشنده
diff --git a/htdocs/langs/fa_IR/trips.lang b/htdocs/langs/fa_IR/trips.lang
index 4fbfe799f93..a13c1a49ce5 100644
--- a/htdocs/langs/fa_IR/trips.lang
+++ b/htdocs/langs/fa_IR/trips.lang
@@ -44,7 +44,7 @@ TF_LUNCH=ناهار
 TF_METRO=Metro
 TF_TRAIN=Train
 TF_BUS=Bus
-TF_CAR=Car
+TF_CAR=خودرو
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
 TF_HOTEL=Hotel
@@ -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/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
index cf3505a0c89..909a1ebbb82 100644
--- a/htdocs/langs/fa_IR/users.lang
+++ b/htdocs/langs/fa_IR/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=گذرواژه تغییر کرد به: %s
 SubjectNewPassword=گذرواژه جدید شما برای %s
 GroupRights=مجوزهای گروه
 UserRights=مجوزهای کاربر
-UserGUISetup=تنظیم صفحه نمایش کاربر
+UserGUISetup=برپاسازی طرزنمایش برای‌کاربر
 DisableUser=ناپویا کردن
 DisableAUser=ناپویا کردن یک کاربر
 DeleteUser=پاک کردن
@@ -20,22 +20,22 @@ DeleteAUser=پاک کردن یک کاربر
 EnableAUser=پویا کردن یک کاربر
 DeleteGroup=پاک کردن
 DeleteAGroup=پاک کردن یک گروه
-ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
-ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
-ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
-ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+ConfirmDisableUser=آیا اطمینان دارید می‌خواهید کاربر <b>%s</b> را غیرفعال کنید؟
+ConfirmDeleteUser=آیا مطمئن هستید می‌خواهید کاربر <b>%s</b> را حذف کنید؟
+ConfirmDeleteGroup=آیا مطمئن هستید می‌خواهید گروه <b>%s</b> را حذف کنید؟
+ConfirmEnableUser=آیا مطمئن هستید می‌خواهید کاربر <b>%s</b> را فعال کنید؟
+ConfirmReinitPassword=آیا مطمئن هستید می‌خواهید یک گذرواژۀ جدید برای کاربر <b>%s</b> ایجاد کنید؟
+ConfirmSendNewPassword=یا مطمئن‌هستید می‌خواهید یک گذرواژۀ جدید برای کاربر <b>%s</b> ایجاد کرده و آن را ارسال کنید؟
 NewUser=کاربر تازه
 CreateUser=ساخت کاربر
-LoginNotDefined=ورود به تعریف نیست.
-NameNotDefined=اسم غير محدد.
+LoginNotDefined=ورود تعریف نشده است
+NameNotDefined=نام تعریف نشده است
 ListOfUsers=لیست کاربران
 SuperAdministrator=Super Administrator
 SuperAdministratorDesc=administrator  همگانی
 AdministratorDesc=مدیر
-DefaultRights=Default Permissions
-DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
+DefaultRights=مجوزهای پیش‌فرض
+DefaultRightsDesc=در این قسمت مجوزهای <u>پیش‌فرض</u> را که به طور خودکار به یک کاربر <u>جدید</u> اعطا می‌شود وارد نمائید. (برای ویرایش مجوز برای کاربرهای جدید، به کارت کاربر مربوطه مراجعه نمائید).
 DolibarrUsers=Dolibarr کاربران
 LastName=نام خانوادگی
 FirstName=نام اول
@@ -43,70 +43,70 @@ ListOfGroups=لیست گروهها
 NewGroup=گروه تازه
 CreateGroup=ساخت گروه
 RemoveFromGroup=پاک کردن از گروه
-PasswordChangedAndSentTo=تغییر رمز عبور و ارسال <b>به٪ s.</b>
-PasswordChangeRequest=Request to change password for <b>%s</b>
-PasswordChangeRequestSent=درخواست تغییر رمز عبور <b>برای٪ s ارسال به٪ s.</b>
-ConfirmPasswordReset=Confirm password reset
+PasswordChangedAndSentTo=گذرواژه تغییر یافت و به <b>%s</b> ارسال شد.
+PasswordChangeRequest=درخواست تغییر گذرواژۀ برای <b>%s</b>
+PasswordChangeRequestSent=درخواست تغییر گذرواژه برای <b>%s</b> به <b>%s</b> ارسال شد
+ConfirmPasswordReset=تائید بازنشانی گذرواژه
 MenuUsersAndGroups=کاربران و گروهها
-LastGroupsCreated=Latest %s groups created
-LastUsersCreated=Latest %s users created
+LastGroupsCreated=آخرین %s گروه ساخته شده
+LastUsersCreated=آخرین %s کاربر ساخته شده
 ShowGroup=نمایش گروه
 ShowUser=نمایش کاربر
-NonAffectedUsers=کاربران غیر اختصاص داده
-UserModified=کاربر با موفقیت به اصلاح
+NonAffectedUsers=کاربران غیر اختصاص داده‌شده
+UserModified=کاربر با موفقیت تغییریافت
 PhotoFile=فایل نگاره
-ListOfUsersInGroup=لیست کاربران در این گروه
-ListOfGroupsForUser=لیست گروه های این کاربر
-LinkToCompanyContact=لینک به شخص ثالث / ارتباط با ما
-LinkedToDolibarrMember=لینک به عضو
-LinkedToDolibarrUser=لینک به کاربر Dolibarr
-LinkedToDolibarrThirdParty=لینک به Dolibarr شخص ثالث
+ListOfUsersInGroup=فهرست کاربران این گروه
+ListOfGroupsForUser=فهرست گروه‌های این کاربر
+LinkToCompanyContact=پیوند به شخص‌سوم/طرف‌تماس
+LinkedToDolibarrMember=پیوند به یک عضو
+LinkedToDolibarrUser=پیوند به یک کاربر Dolibarr 
+LinkedToDolibarrThirdParty=پیوند به یک شخص‌سوم Dolibarr 
 CreateDolibarrLogin=ساختن یک کاربر
-CreateDolibarrThirdParty=إيجاد طرف ثالث
-LoginAccountDisableInDolibarr=حساب قطع در Dolibarr.
-UsePersonalValue=استفاده از ارزش های شخصی
+CreateDolibarrThirdParty=ایجاد یک شخص‌سوم
+LoginAccountDisableInDolibarr=حساب در Dolibarr غیرفعال است
+UsePersonalValue=استفاده از مقداردهی شخصی
 InternalUser=کاربر داخلی
-ExportDataset_user_1=Users and their properties
-DomainUser=کاربر دامنه از٪ s
+ExportDataset_user_1=کاربران و مشخصات آنها
+DomainUser=کاربر دامنه %s
 Reactivate=دوباره فعال کردن
-CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
-PermissionInheritedFromAGroup=اجازه چرا که از یک گروه کاربر را به ارث برده.
-Inherited=به ارث برده
-UserWillBeInternalUser=کاربر های ایجاد شده خواهد بود داخلی (چون به شخص ثالث خاصی پیوند ندارد)
-UserWillBeExternalUser=کاربر ایجاد خواهد شد یک کاربر خارجی (چون به شخص ثالث خاص مرتبط است)
-IdPhoneCaller=شناسه تماس گیرنده تلفن
+CreateInternalUserDesc=این برگه به شما امکان ایجاد یک کاربر داخلی در شرکت/مؤسسۀ شما را می‌دهد. برای ساخت یک کاربر خارجی (مشتری، فروشنده، غیره) از گزینۀ "ساخت کاربر Dolibarr" از برگۀ تماس شخص سوم وی اقدام نمائید.
+InternalExternalDesc=یک کاربر <b>داخلی</b> کاربری است که عضوی از شرکت/سازمان است. <br> یک  کاربر <b>خارجی</b> یک مشتری، فروشنده یا از این دست است. <br><br> در هر دو حالت، مجوزها، دسترسی‌های موجود در Dolibarr را تعریف خواهد کرد. همچنین کاربر خارجی می‌تواند مدیریت فهرست متفاوتی از کاربر داخلی داشته باشد (به خانه - برپاسازی - نمایش ) مراجعه نمائید.
+PermissionInheritedFromAGroup=اجازه‌ها اعطا شده زیرا از یک گروه‌کاربری ارث‌گرفته شده است
+Inherited=ارث‌گرفته
+UserWillBeInternalUser=کاربری که ایجاد می‌شود یک کاربر داخلی خواهد بود (زیرا به یک شخص‌سوم معین پیوند نشده است)
+UserWillBeExternalUser=کاربری که ایجاد می‌شود یک کاربر خارجی خواهد بود (زیرا به یک شخص‌سوم معین پیوند شده است)
+IdPhoneCaller=شناسۀ تماس‌گیرنده تلفن
 NewUserCreated=کاربر %s ساخته شد
-NewUserPassword=تغییر رمز عبور برای٪ s
-EventUserModified=کاربر٪ s تغییر
+NewUserPassword=گذرواژه برای %s تغییر یافت
+EventUserModified=کاربر %s تغییر یافت
 UserDisabled=کاربر %s ناپویا شد
 UserEnabled=کاربر %s پویا شد.
 UserDeleted=کاربر %s پاک کشد
 NewGroupCreated=گروه %s ساخته شد
-GroupModified=Group %s modified
-GroupDeleted=گروه٪ s را حذف
-ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
-ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
-ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
-LoginToCreate=ورود برای ایجاد
-NameToCreate=نام و نام خانوادگی شخص ثالث برای ایجاد
+GroupModified=گروه %s تغییر یافت
+GroupDeleted=گروه %s حذف شد
+ConfirmCreateContact=آیا مطمئنید می‌خواهید حساب Dolibarr این طرف‌تماس را حذف کنید؟ 
+ConfirmCreateLogin=آیا مطمئن هستید می‌خواهید یک حساب Dolibarr برای این عضو ایجاد کنید؟
+ConfirmCreateThirdParty=آیا مطمئن هستید می‌خواهید یک «شخص‌سوم» برای این عضو ایجاد کنید؟
+LoginToCreate=شناسۀ‌کاربری برای ایجاد
+NameToCreate=نام شخص‌سوم برای ایجاد
 YourRole=roleهای شما
-YourQuotaOfUsersIsReached=سهمیه شما از کاربران فعال رسیده است!
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
-DontDowngradeSuperAdmin=فقط قسمت مدیریت می توانید یک قسمت مدیریت جمع و جور کردن
-HierarchicalResponsible=Supervisor
-HierarchicView=دیدگاه سلسله مراتبی
-UseTypeFieldToChange=استفاده از نوع رشته به تغییر
+YourQuotaOfUsersIsReached=سهمیه شما از کاربران فعال پر شده است!
+NbOfUsers=تعداد کاربران
+NbOfPermissions=تعداد مجوزها
+DontDowngradeSuperAdmin=فقط یک مدیرکل می‌تواند یک مدیرکل‌دیگر را کاهش‌رتبه بدهد
+HierarchicalResponsible=سرپرست
+HierarchicView=نمای درختی
+UseTypeFieldToChange=استفاده از نوع‌بخش-فیلد برای تغییر
 OpenIDURL=URL OpenID
-LoginUsingOpenID=استفاده از حساب کاربری برای ورود به سایت
-WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
-ColorUser=Color of the user
-DisabledInMonoUserMode=Disabled in maintenance mode
-UserAccountancyCode=User accounting code
-UserLogoff=User logout
-UserLogged=User logged
-DateEmployment=Employment Start Date
-DateEmploymentEnd=Employment End Date
-CantDisableYourself=You can't disable your own user record
+LoginUsingOpenID=استفاده از OpenID برای ورو
+WeeklyHours=ساعت‌کاری (در هفته)
+ExpectedWorkedHours=ساعت‌کاری مورد انتظار در هفته
+ColorUser=رنگ کاربر
+DisabledInMonoUserMode=غیرفعال در حالت نگهداری‌و‌تعمیرا
+UserAccountancyCode=کد حساب‌داری کاربر
+UserLogoff=خروج کاربر
+UserLogged=کاربر وارد شده
+DateEmployment=تاریخ شروع استخدام
+DateEmploymentEnd=تاریخ پایان استخدام
+CantDisableYourself=شما نمی‌توانید ردیف کاربری خود را غیرفعال کنید
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index 40e0514b366..5c1ee1d453c 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index 1dd73e0ea50..2585ec4027a 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Direct debit payment orders area
-SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrdersPayment=Direct debit payment orders
-StandingOrderPayment=سفارش پرداخت مستقیم نقدی
-NewStandingOrder=New direct debit order
-StandingOrderToProcess=به پردازش
-WithdrawalsReceipts=سفارش‌های پرداخت مستقیم
-WithdrawalReceipt=سفارش پرداخت مستقیم
-LastWithdrawalReceipts=Latest %s direct debit files
+CustomersStandingOrdersArea=بخش سفارش‌های برداشت مستقیم وجه
+SuppliersStandingOrdersArea=بخش سفارش‌های واریز مستقیم وجه 
+StandingOrdersPayment=سفارش‌های برداشت مستقیم وجه
+StandingOrderPayment=سفارش برداشت مستقیم وجه
+NewStandingOrder=یک سفارش جدید برداشت مستقیم
+StandingOrderToProcess=برای پردازش
+WithdrawalsReceipts=سفارش‌های برداشت مستقیم
+WithdrawalReceipt=سفارش برداشت مستقیم
+LastWithdrawalReceipts=آخرین %s مستند دریافت مستقیم
 WithdrawalsLines=Direct debit order lines
 RequestStandingOrderToTreat=Request for direct debit payment order to process
 RequestStandingOrderTreated=Request for direct debit payment order processed
@@ -50,7 +50,7 @@ StatusMotif0=نامشخص
 StatusMotif1=منابع مالی ناکافی
 StatusMotif2=درخواست اعتراض
 StatusMotif3=No direct debit payment order
-StatusMotif4=Sales Order
+StatusMotif4=سفارش فروش
 StatusMotif5=RIB غیر قابل استفاده
 StatusMotif6=حساب بدون موجودی
 StatusMotif7=تصمیم گیری قضایی
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index b12ff6a9ac3..08cf9a7df68 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Luo uusi transaktio
 UpdateMvts=Transaktion muuttaminen
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Pääkirjanpito
 AccountBalance=Tilin saldo
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Päiväkirja
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 373dd8cb005..2e51b0b2649 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr merkkien laukaista haku: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Ole käytettävissä, kun Ajax vammaisten
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript pois päältä
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtuaali-palvelimen nimi
 OS=OS
 PhpWebLink=Web-Php linkki
-Browser=Selain
 Server=Server
 Database=Database
 DatabaseServer=Tietokannan isäntä
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Järjestelmän tiedot ovat erinäiset tekniset tiedot saavat luke
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Saatavilla olevat app/moduulit
 ToActivateModule=Aktivoi moduulit, mennä setup-alueella.
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Laskut ja hyvityslaskut numerointiin moduuli
 BillsPDFModules=Laskun asiakirjojen malleja
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Menoilmoitus
-CreditNotes=Hyvityslaskuja
 ForceInvoiceDate=Force laskun päivämäärästä validointiin päivämäärä
 SuggestedPaymentModesIfNotDefinedInInvoice=Ehdotetut maksut tilassa lasku automaattisesti, jos ei ole määritetty lasku
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Postinumero
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang
index 5229439bac6..49816640d56 100644
--- a/htdocs/langs/fi_FI/agenda.lang
+++ b/htdocs/langs/fi_FI/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Tapahtumat, joista Dolibarr luo toimia esityslistan automaattisest
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index 8bd40de387b..c454774b065 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Pankki
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Muut maksut
 MenuNewVariousPayment=Uusi muu maksu
 BankName=Pankin nimi
 FinancialAccount=Tili
 BankAccount=Pankkitili
 BankAccounts=Pankkitilit
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Näytä tili
 AccountRef=Rahoitustase viite
 AccountLabel=Rahoitustase etiketti
@@ -30,7 +30,7 @@ AllTime=Alkaen
 Reconciliation=Yhteensovittaminen
 RIB=Pankkitilin numero
 IBAN=IBAN-numero
-BIC=BIC / SWIFT-koodi
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT hyväksytty
 SwiftVNotalid=BIC/SWIFT virheellinen
 IbanValid=BAN hyväksytty
@@ -42,11 +42,11 @@ AccountStatementShort=Laskelma
 AccountStatements=Tiliotteet
 LastAccountStatements=Viimeisimmät tiliotteet
 IOMonthlyReporting=Kuukausiraportti
-BankAccountDomiciliation=Tilin osoite
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Tilin maa
 BankAccountOwner=Tilinomistajan nimi
 BankAccountOwnerAddress=Tilinomistajan osoite
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Luo tili
 NewBankAccount=Uusi tili
 NewFinancialAccount=New rahoitustili
@@ -98,14 +98,14 @@ BankLineConciliated=Merkintä täsmäytetty
 Reconciled=Täsmäytetty
 NotReconciled=Täsmäyttämätön
 CustomerInvoicePayment=Asiakasmaksu
-SupplierInvoicePayment=Toimittajan maksu
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Tilaus maksu
 WithdrawalPayment=Hyvitysmaksu
 SocialContributionPayment=Social/fiscal veron maksu
 BankTransfer=Pankkisiirto
 BankTransfers=Pankkisiirrot
 MenuBankInternalTransfer=Sisäinen siirto
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Mistä
 TransferTo=mihin
 TransferFromToDone=A <b>siirtää %s %s %s%</b> s on tallennettu.
@@ -136,7 +136,7 @@ BankTransactionLine=Pankkimerkintä
 AllAccounts=All bank and cash accounts
 BackToAccount=Takaisin tiliin
 ShowAllAccounts=Näytä kaikki tilit
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Valitse tämän täsmäytyksen tiliote. Käytä lajiteltavaa numeroarvoa: YYYYMM tai YYYYMMDD
 EventualyAddCategory=Määritä luokka johon tiedot luokitellaan
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Shekki palautunut ja lasku avautunut uudelleen
 BankAccountModelModule=Pankkitilien dokumenttimallit
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=BAN tiedon sisältävä tulostusmalli
-NewVariousPayment=Uudet muut maksut
-VariousPayment=Muut maksut
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Muut maksut
-ShowVariousPayment=Näytä muut maksut
-AddVariousPayment=Lisää muita maksuja
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=SEPA-toimeksiantonne
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index ca9a873eba8..c44f6ba2298 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Takaisin maksu
 DeletePayment=Poista maksu
 ConfirmDeletePayment=Oletko varma, että haluat poistaa tämän suorituksen?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Vastaanotetut maksut
 ReceivedCustomersPayments=Saatujen maksujen asiakkaille
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Maksusumma
-ValidatePayment=Vahvista maksu
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Hyväksy laskut automaattisesti
 GeneratedFromRecurringInvoice=Luotu mallipohjaisesta toistuvasta laskusta %s
 DateIsNotEnough=Päivämäärää ei ole vielä saavutettu
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=Katso saatavilla olevat alennukset
diff --git a/htdocs/langs/fi_FI/cashdesk.lang b/htdocs/langs/fi_FI/cashdesk.lang
index bf096a9fe28..8df3181d8d9 100644
--- a/htdocs/langs/fi_FI/cashdesk.lang
+++ b/htdocs/langs/fi_FI/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Historia
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index 801ec29bc4f..8c819741ae7 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Uusi maksu
-Payments=Maksut
 PaymentCustomerInvoice=Asiakas laskun maksu
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal veron maksu
@@ -205,7 +204,6 @@ SellsJournal=Myynti lehdessä
 PurchasesJournal=Ostot lehdessä
 DescSellsJournal=Myynti lehdessä
 DescPurchasesJournal=Ostot lehdessä
-InvoiceRef=Laskun ref.
 CodeNotDef=Ei määritelty
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 2ea457abc1a..3806c084457 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/fi_FI/holiday.lang b/htdocs/langs/fi_FI/holiday.lang
index 07d67b83096..321bd927c36 100644
--- a/htdocs/langs/fi_FI/holiday.lang
+++ b/htdocs/langs/fi_FI/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 7cc4f322a69..48580ad7667 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -371,6 +371,7 @@ Percentage=Prosenttia
 Total=Yhteensä
 SubTotal=Välisumma
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Yhteensä (sis. alv)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Lähetä vahvistussähköposti
 SendMail=Lähetä sähköpostia
 Email=Sähköposti
 NoEMail=Ei sähköpostia
-Email=Sähköposti
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=Ei matkapuhelinta
@@ -671,7 +671,6 @@ Method=Menetelmä
 Receive=Vastaanota
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Odotettu Arvo
-CurrentValue=Nykyinen arvo
 PartialWoman=Osittainen
 TotalWoman=Yhteensä
 NeverReceived=Ei ole saapunut
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Luokittele laskutetaan
 ClassifyUnbilled=Classify unbilled
 Progress=Edistyminen
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=Katso
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Vie suodatettu luettelo
 ExportList=Vie Luettelo
 ExportOptions=Vienti Valinnat
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Kalenteri
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Lataa
 DownloadDocument=Lataa dokumentti
 ActualizeCurrency=Päivitä valuuttakurssi
 Fiscalyear=Tilivuosi
-ModuleBuilder=Moduuli Rakentaja
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Aseta valuutta
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index 5819dbdee95..3f8ae9044d0 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -6,7 +6,7 @@ Member=Jäsen
 Members=Jäsenet
 ShowMember=Näytä jäsenen kortti
 UserNotLinkedToMember=Käyttäjää ei liity jäseneksi
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Jäsenet Liput
 FundationMembers=Säätiön jäsenet
 ListOfValidatedPublicMembers=Luettelo validoitujen yleisön jäsenet
@@ -67,11 +67,11 @@ Subscriptions=Tilaukset
 SubscriptionLate=Myöhässä
 SubscriptionNotReceived=Tilaus koskaan saanut
 ListOfSubscriptions=Luettelo tilaukset
-SendCardByMail=Lähetä kortti
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=Jäsen tyypit määritelty. Go to setup - Jäsenet tyypit
 NewMemberType=Uusi jäsen tyyppi
-WelcomeEMail=Tervetuloa e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Vaatii tilauksen
 DeleteType=Poistaa
 VoteAllowed=Äänestys sallittua
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd tiedosto
 ValidateMember=Validate jäseneksi
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=Seuraavat linkit ovat avoinna sivua ei ole suojattu millään Dolibarr lupaa. Ne eivät ole formated sivua, jos esimerkkinä osoittaakseen, miten listan jäsenille tietokantaan.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Julkiset jäsenluetteloa
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Sisältö jäsennimesi kortti
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail automaattisen sähköpostit
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Etiketit muodossa
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Muotoile korttien sivu
@@ -156,8 +156,8 @@ DocForAllMembersCards=Luo käyntikortteja kaikkien jäsenten (malli lähtö tode
 DocForOneMemberCards=Luo käyntikortit erityisesti jäsen (malli lähtö todella setup: <b>%s)</b>
 DocForLabels=Luo osoite arkkia (malli lähtö todella setup: <b>%s)</b>
 SubscriptionPayment=Tilaus maksu
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Jäsenten tilastot maittain
 MembersStatisticsByState=Jäsenten tilastot valtio / lääni
 MembersStatisticsByTown=Jäsenten tilastot kaupunki
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/fi_FI/modulebuilder.lang b/htdocs/langs/fi_FI/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/fi_FI/modulebuilder.lang
+++ b/htdocs/langs/fi_FI/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/fi_FI/paybox.lang b/htdocs/langs/fi_FI/paybox.lang
index 061793ca5a8..85354a7e84f 100644
--- a/htdocs/langs/fi_FI/paybox.lang
+++ b/htdocs/langs/fi_FI/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Saattamaan
 YourEMail=Sähköposti maksupyyntö vahvistus
 Creditor=Velkoja
 PaymentCode=Maksu-koodi
-PayBoxDoPayment=Maksa luotto tai debit kortilla (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Ei maksua
 YouWillBeRedirectedOnPayBox=Sinut ohjataan on turvattu Paybox sivu tuloliittimeen voit luottokortin tiedot
 Continue=Seuraava
 ToOfferALinkForOnlinePayment=URL %s maksua
-ToOfferALinkForOnlinePaymentOnOrder=URL tarjota %s online maksu käyttöliittymän tilauksen
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL tarjota %s online maksu käyttöliittymän lasku
 ToOfferALinkForOnlinePaymentOnContractLine=URL tarjota %s online maksu käyttöliittymän sopimuksen linjan
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL tarjota %s online maksu käyttöliittymän vapaa määrä
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL tarjota %s online maksu käyttöliittymän jäsen tilaus
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Voit myös lisätä URL-parametrin <b>& tag= <i>arvo</i></b> mille tahansa niistä URL (vaaditaan ainoastaan ilmaiseksi maksu) lisätään oma maksu kommentoida tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Tämä sivu vahvistaa, että maksu on kirjattu. Kiitos.
@@ -33,7 +33,8 @@ VendorName=Nimi myyjä
 CSSUrlForPaymentForm=CSS-tyylisivu url maksun muodossa
 NewPayboxPaymentReceived=Uusi Paybox maksu vastaanotettu
 NewPayboxPaymentFailed=Uusi Paybox maksu epäonnistui
-PAYBOX_PAYONLINE_SENDEMAIL=Sähköposti kuittaus mksun jälkeen (onnistunut tai epäonnistunut)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=PBX SITE arvo
 PAYBOX_PBX_RANG=PBX Rang arvo
 PAYBOX_PBX_IDENTIFIANT=PBX ID arvo
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/fi_FI/paypal.lang b/htdocs/langs/fi_FI/paypal.lang
index b877e8b9e1c..1d11a3727e8 100644
--- a/htdocs/langs/fi_FI/paypal.lang
+++ b/htdocs/langs/fi_FI/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal moduuli setup
-PaypalDesc=Tämä moduuli tarjoaa sivuja, jotta maksua <a href="http://www.paypal.com" target="_blank">PayPal</a> asiakkaat. Tätä voidaan käyttää ilmaiseksi maksua tai maksun tietystä Dolibarr esine (lasku, tilaus, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Maksa Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Tila testi / hiekkalaatikko
 PAYPAL_API_USER=API käyttäjätunnus
 PAYPAL_API_PASSWORD=API salasana
 PAYPAL_API_SIGNATURE=API allekirjoitus
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Voit maksaa &quot;kiinteä&quot; (luottokortti + Paypal) tai &quot;PayPal&quot; vain
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=Tämä on id liiketoimen: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Lisää URL Paypal-maksujärjestelmää, kun lähetät asiakirjan postitse
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 7e94ce7ef6c..8a1d8416efb 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Tuotekortti
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index e6b386e5ea5..803eff3103b 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Käytetty aika
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Käytetty aika
-RefTask=Ref. tehtävä
-LabelTask=Label tehtävä
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Käyttäjä
 TaskTimeNote=Huomautus
diff --git a/htdocs/langs/fi_FI/stripe.lang b/htdocs/langs/fi_FI/stripe.lang
index 9a1e5e40c56..4418dc1f5e8 100644
--- a/htdocs/langs/fi_FI/stripe.lang
+++ b/htdocs/langs/fi_FI/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Seuraavat URL-osoitteet ovat käytettävissä tarjota sivu asiakas tehdä maksua Dolibarr esineitä
 PaymentForm=Maksu-muodossa
-WelcomeOnPaymentPage=Tervetuloa verkkomaksupalveluumme
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Tässä näytössä voit tehdä online-maksu %s.
 ThisIsInformationOnPayment=Tämä on informations maksua tehdä
 ToComplete=Saattamaan
 YourEMail=Sähköposti maksupyyntö vahvistus
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Velkoja
 PaymentCode=Maksu-koodi
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Seuraava
 ToOfferALinkForOnlinePayment=URL %s maksua
-ToOfferALinkForOnlinePaymentOnOrder=URL tarjota %s online maksu käyttöliittymän tilauksen
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL tarjota %s online maksu käyttöliittymän lasku
 ToOfferALinkForOnlinePaymentOnContractLine=URL tarjota %s online maksu käyttöliittymän sopimuksen linjan
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL tarjota %s online maksu käyttöliittymän vapaa määrä
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL tarjota %s online maksu käyttöliittymän jäsen tilaus
 YouCanAddTagOnUrl=Voit myös lisätä URL-parametrin <b>& tag= <i>arvo</i></b> mille tahansa niistä URL (vaaditaan ainoastaan ilmaiseksi maksu) lisätään oma maksu kommentoida tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=Tämä sivu vahvistaa, että maksu on kirjattu. Kiitos.
-YourPaymentHasNotBeenRecorded=Et maksua ei ole kirjattu, ja kauppa on peruutettu. Kiitos.
 AccountParameter=Tilin parametrit
 UsageParameter=Käyttöparametrien
 InformationToFindParameters=Auta löytää %s tilitiedot
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index 97a5b95f452..d45a243bc55 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
index 1071dd5c68b..008ccdab2d7 100644
--- a/htdocs/langs/fr_BE/accountancy.lang
+++ b/htdocs/langs/fr_BE/accountancy.lang
@@ -4,6 +4,8 @@ Processing=Exécution
 Lineofinvoice=Lignes de facture
 Doctype=Type de document
 ErrorDebitCredit=Débit et crédit ne peuvent pas être non-nuls en même temps
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
 TotalMarge=Marge de ventes totale
 Selectmodelcsv=Sélectionnez un modèle d'export
 Modelcsv_normal=Export classique
+Modelcsv_FEC=Export FEC (Art. L47 A)
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index b7ee87bdbbf..45352a47b83 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -16,7 +16,5 @@ 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
-CreditNote=Note de crédit
-CreditNotes=Notes de crédit
 Target=Objectif
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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/bills.lang b/htdocs/langs/fr_BE/bills.lang
index ccd21c9abe4..30db78cd243 100644
--- a/htdocs/langs/fr_BE/bills.lang
+++ b/htdocs/langs/fr_BE/bills.lang
@@ -14,6 +14,7 @@ UsedByInvoice=Utilisée pour payer la facture %s
 PredefinedInvoices=Factures prédéfinies
 SupplierBills=factures fournisseurs
 Payment=Paiement
+Payments=Paiements
 DeletePayment=Supprimer paiement
 ReceivedPayments=Paiements reçus
 ReceivedCustomersPayments=Paiements reçus de clients
@@ -22,7 +23,6 @@ PaymentsReportsForYear=Rapports de paiements pour %s
 PaymentsReports=Rapports de paiements
 PaymentsAlreadyDone=Paiements déjà effectués
 PaymentAmount=Montant de paiement
-ValidatePayment=Valider paiement
 AddBill=Créer facture ou note de crédit
 EnterPaymentDueToCustomer=Réaliser règlement de crédits dus au client
 ErrorInvoiceAvoirMustBeNegative=Erreur, une facture de type Note de crédit doit avoir un montant négatif
@@ -31,6 +31,8 @@ EscompteOfferedShort=Ristourne
 Discounts=Ristournes
 AddDiscount=Créer ristourne
 ShowDiscount=Visualiser le crédit
+CreditNote=Note de crédit
+CreditNotes=Notes de crédit
 DiscountFromCreditNote=Remise issue de la note de crédit %s
 PaymentTypeLIQ=En espèces
 PaymentTypeShortLIQ=En espèces
diff --git a/htdocs/langs/fr_BE/compta.lang b/htdocs/langs/fr_BE/compta.lang
index 5f766523c57..a4ec8230e86 100644
--- a/htdocs/langs/fr_BE/compta.lang
+++ b/htdocs/langs/fr_BE/compta.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - compta
-Payments=Paiements
 Dispatched=Envoyé
 ToDispatch=Envoyer
diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang
index b23a0e13878..3042af1642f 100644
--- a/htdocs/langs/fr_BE/main.lang
+++ b/htdocs/langs/fr_BE/main.lang
@@ -26,3 +26,4 @@ AmountPayment=Montant de paiement
 Discount=Ristourne
 Unknown=Inconnue
 Check=Chèque
+ValidatePayment=Valider paiement
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index 954d326bd4d..64a7ba02334 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -45,7 +45,6 @@ MenuProductsAccounts=Comptes de produits
 CustomersVentilation=Contrat de facture client
 ExpenseReportsVentilation=Rapport de dépenses liant
 CreateMvts=Créer une nouvelle transaction
-WriteBookKeeping=Journalize les transactions dans Ledger
 AccountBalance=Solde du compte
 TotalExpenseReport=Rapport de dépenses totales
 InvoiceLines=Lignes des factures pour lier
@@ -82,6 +81,7 @@ FeeAccountNotDefined=Compte pour frais non définis
 BankAccountNotDefined=Compte pour banque non défini
 NumMvts=Nombre de transactions
 AddCompteFromBK=Ajouter des comptes comptables au groupe
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
 TotalVente=Chiffre d'affaires total avant taxes
 DescVentilCustomer=Consultez ici la liste des lignes de facture client liées (ou non) à un compte comptable produit
 DescVentilDoneCustomer=Consultez ici la liste des lignes clients des factures et leur compte comptable produit
@@ -100,6 +100,7 @@ AccountingJournals=Revues comptables
 ShowAccoutingJournal=Afficher le journal comptable
 AccountingJournalType9=A-nouveau
 ErrorAccountingJournalIsAlreadyUse=Ce journal est déjà utilisé
+Modelcsv_FEC=Export FEC (Art. L47 A)
 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.
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index b5c3d3067b3..880dc33efe1 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -247,5 +247,5 @@ LandingPage=Page d'atterrissage
 ModuleEnabledAdminMustCheckRights=Le module a été activé. Les autorisations pour les modules activés ont été données uniquement aux utilisateurs administratifs. Vous devrez peut-être accorder des autorisations aux autres utilisateurs ou groupes manuellement si nécessaire.
 BaseCurrency=Monnaie de référence de la société (entrer dans la configuration de l'entreprise pour modifier cela)
 FormatZip=Code postal
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 UseSearchToSelectResource=Utilisez un formulaire de recherche pour choisir une ressource (plutôt qu'une liste déroulante).
diff --git a/htdocs/langs/fr_CA/holiday.lang b/htdocs/langs/fr_CA/holiday.lang
index 8b2bb1c91ec..31904e5c295 100644
--- a/htdocs/langs/fr_CA/holiday.lang
+++ b/htdocs/langs/fr_CA/holiday.lang
@@ -1,10 +1,7 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Gestion des ressources humaines
-Holidays=Feuilles
-CPTitreMenu=Feuilles
 MenuReportMonth=Relevé mensuel
 MenuAddCP=Nouvelle demande de congé
-NotActiveModCP=Vous devez activer le module Déplacer pour afficher cette page.
 AddCP=Demander un congé
 DateDebCP=Date de début
 DateFinCP=Date de fin
@@ -12,11 +9,8 @@ DateCreateCP=Date création
 ApprovedCP=Approuver
 CancelCP=Annulé
 RefuseCP=Refusé
-ListeCP=Liste des feuilles
 SendRequestCP=Créer un congé
 DelayToRequestCP=Les requêtes doivent être effectuées au moins <b> %s jour (s) </ b> devant elles.
-MenuConfCP=Balance des feuilles
-SoldeCPUser=Le solde des feuilles est <b>%s</b> jours.
 ErrorEndDateCP=Vous devez sélectionner une date de fin supérieure à la date de début.
 ErrorSQLCreateCP=Une erreur SQL s'est produite lors de la création:
 ErrorIDFicheCP=Une erreur s'est produite, la demande de congé n'existe pas.
@@ -64,8 +58,6 @@ HolidaysCancelation=Laisser l'annulation de demande
 EmployeeLastname=Nom de famille de l'employé
 EmployeeFirstname=Prénom de l'employé
 TypeWasDisabledOrRemoved=Laisser le type (id %s) a été désactivé ou supprimé
-LastUpdateCP=Dernière mise à jour automatique de l'allocation des feuilles
-MonthOfLastMonthlyUpdate=Mois de la dernière mise à jour automatique de l'allocation des feuilles
 UpdateConfCPOK=Mis à jour avec succés.
 Module27130Name=Gestion des demandes de congé
 Module27130Desc=Gestion des demandes de congé
@@ -73,13 +65,10 @@ ErrorMailNotSend=Une erreur s'est produite lors de l'envoi du courrier électron
 HolidaysToValidate=Valider les demandes de congé
 HolidaysToValidateBody=Voici une demande de congé pour valider
 HolidaysToValidateDelay=Cette demande de congé aura lieu dans un délai inférieur à %s jours.
-HolidaysToValidateAlertSolde=L'utilisateur qui a fait cette demande de demande n'a pas assez de jours disponibles.
 HolidaysValidated=Demandes de congés validés
 HolidaysValidatedBody=Votre demande de congé pour %s à %s a été validée.
 HolidaysRefused=Demande refusée
-HolidaysRefusedBody=Votre demande de congé pour %s à %s a été refusée pour la raison suivante:
 HolidaysCanceled=Demande d'annulation
 HolidaysCanceledBody=Votre demande de congé pour %s à %s a été annulée.
 FollowedByACounter=1: Ce type de congé doit être suivi d'un compteur. Le compteur est incrémenté manuellement ou automatiquement et lorsqu'une demande de congé est validée, le compteur est décrémenté. <br> 0: Non suivi d'un compteur.
 NoLeaveWithCounterDefined=Il n'existe aucun type de congé défini qui doit être suivi d'un compteur
-GoIntoDictionaryHolidayTypes=Entrez dans <strong> Accueil - Configuration - Dictionnaires - Type de feuilles </ strong> pour configurer les différents types de feuilles.
diff --git a/htdocs/langs/fr_CA/members.lang b/htdocs/langs/fr_CA/members.lang
index 59416044d4b..7fad38dcaf6 100644
--- a/htdocs/langs/fr_CA/members.lang
+++ b/htdocs/langs/fr_CA/members.lang
@@ -6,7 +6,6 @@ Member=Membre
 Members=Membres
 ShowMember=Afficher la carte membre
 UserNotLinkedToMember=L'utilisateur n'est pas lié à un membre
-ThirdpartyNotLinkedToMember=Un tiers non lié à un membre
 MembersTickets=Billets des membres
 FundationMembers=Membres de la Fondation
 ListOfValidatedPublicMembers=Liste des membres publics validés
@@ -61,10 +60,8 @@ Subscriptions=Abonnements
 SubscriptionLate=Retard
 SubscriptionNotReceived=L'abonnement n'a jamais été reçu
 ListOfSubscriptions=Liste des abonnements
-SendCardByMail=Envoyer une carte par courrier électronique
 AddMember=Créer un membre
 NoTypeDefinedGoToSetup=Aucun type de membre n'est défini. Aller au menu "Types de membres"
-WelcomeEMail=E-mail de bienvenue
 SubscriptionRequired=Abonnement requis
 MorPhy=Moral / Physique
 Reenable=Reignable
@@ -76,7 +73,6 @@ DeleteSubscription=Supprimer un abonnement
 ConfirmDeleteSubscription=Êtes-vous sûr de vouloir supprimer cette souscription?
 ValidateMember=Valider un membre
 ConfirmValidateMember=Êtes-vous sûr de vouloir valider ce membre?
-FollowingLinksArePublic=Les liens suivants sont des pages ouvertes non protégées par une autorisation de Dolibarr. Ce ne sont pas des pages formées, fournies à titre d'exemple pour montrer comment lister la base de données des membres.
 ForceMemberType=Forcer le type de membre
 ExportDataset_member_1=Membres et abonnements
 ImportDataset_member_1=Membres
@@ -88,9 +84,6 @@ SubscriptionNotRecorded=L'abonnement n'est pas enregistré
 AddSubscription=Créer un abonnement
 ShowSubscription=Afficher l'abonnement
 CardContent=Contenu de votre carte membre
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Objet de l'e-mail reçu en cas d'auto-inscription d'un invité
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail reçu en cas d'auto-inscription d'un invité
-DescADHERENT_MAIL_FROM=Expéditeur EMail pour les courriels automatiques
 DescADHERENT_ETIQUETTE_TYPE=Format de la page des étiquettes
 DescADHERENT_ETIQUETTE_TEXT=Texte imprimé sur les feuilles d'adresses des membres
 DescADHERENT_CARD_TYPE=Format de la page des cartes
@@ -113,8 +106,6 @@ DocForAllMembersCards=Générer des cartes de visite pour tous les membres
 DocForOneMemberCards=Générer des cartes de visite pour un membre particulier
 DocForLabels=Générer des feuilles d'adresses
 SubscriptionPayment=Paiement de souscription
-LastSubscriptionDate=La dernière date d'abonnement
-LastSubscriptionAmount=Dernier montant de souscription
 MembersStatisticsByState=Statistiques des membres par état / province
 NoValidatedMemberYet=Aucun membre validé n'a été trouvé
 MembersByCountryDesc=Cet écran vous montre des statistiques sur les membres par pays. Le graphique dépend toutefois du service graphique Google en ligne et n'est disponible que si une connexion Internet fonctionne.
@@ -137,5 +128,4 @@ MEMBER_NEWFORM_PAYONLINE=Aller sur la page de paiement en ligne intégrée
 MembersByNature=Cet écran vous montre des statistiques sur les membres par nature.
 MembersByRegion=Cet écran vous montre des statistiques sur les membres par région.
 VATToUseForSubscriptions=Taux de TVA à utiliser pour les abonnements
-NoVatOnSubscription=Pas de TVA pour les abonnements
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produit utilisé pour la ligne d'abonnement en facture: %s
diff --git a/htdocs/langs/fr_CA/modulebuilder.lang b/htdocs/langs/fr_CA/modulebuilder.lang
index bb57b86d1e2..2c9957b48a1 100644
--- a/htdocs/langs/fr_CA/modulebuilder.lang
+++ b/htdocs/langs/fr_CA/modulebuilder.lang
@@ -5,5 +5,4 @@ ModuleBuilderDescpermissions=Cet onglet est dédié à définir les nouvelles au
 ModuleBuilderDeschooks=Cet onglet est dédié aux crochets.
 ModuleBuilderDescwidgets=Cet onglet est dédié à la gestion / création de widgets.
 DangerZone=Zone dangereuse
-ModuleIsLive=Ce module a été activé. Toute modification peut briser une caractéristique active actuelle.
 DescriptionLong=Longue description
diff --git a/htdocs/langs/fr_CA/paybox.lang b/htdocs/langs/fr_CA/paybox.lang
index df9b293de2a..b9ea4296a5c 100644
--- a/htdocs/langs/fr_CA/paybox.lang
+++ b/htdocs/langs/fr_CA/paybox.lang
@@ -10,20 +10,16 @@ Creditor=Créancier
 YouWillBeRedirectedOnPayBox=Vous serez redirigé sur la page Paybox sécurisée pour vous inscrire les informations de votre carte de crédit
 Continue=Suivant
 ToOfferALinkForOnlinePayment=URL pour le paiement %s
-ToOfferALinkForOnlinePaymentOnOrder=URL pour proposer une interface utilisateur de paiement en ligne %s pour une commande client
 ToOfferALinkForOnlinePaymentOnInvoice=URL pour proposer une interface utilisateur de paiement en ligne %s pour une facture client
 ToOfferALinkForOnlinePaymentOnContractLine=URL pour proposer une interface utilisateur de paiement en ligne %s pour une ligne de contrat
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL pour offrir une interface utilisateur de paiement en ligne %s pour un montant gratuit
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL pour offrir une interface utilisateur de paiement en ligne %s pour un abonnement de membre
 YouCanAddTagOnUrl=Vous pouvez également ajouter le paramètre url <b> & tag = <i> valeur </ i> </ b> à l'un de ces URL (requis uniquement pour un paiement gratuit) pour ajouter votre propre étiquette de commentaire de paiement.
-SetupPayBoxToHavePaymentCreatedAutomatically=Configurez votre PayBox avec url <b>%s</b> pour que le paiement soit créé automatiquement lorsqu'il est validé par Paybox.
 YourPaymentHasBeenRecorded=Cette page confirme que votre paiement a été enregistré. Je vous remercie.
-YourPaymentHasNotBeenRecorded=Votre paiement n'a pas été enregistré et la transaction a été annulée. Je vous remercie.
 InformationToFindParameters=Aidez-nous à trouver vos informations sur le compte %s
 PAYBOX_CGI_URL_V2=Url de Paybox CGI module de paiement
 CSSUrlForPaymentForm=URL de la feuille de style CSS pour le formulaire de paiement
 NewPayboxPaymentFailed=Le nouveau paiement Paybox a échoué
-PAYBOX_PAYONLINE_SENDEMAIL=EMail pour avertir après un paiement (succès ou échec)
 PAYBOX_PBX_SITE=Valeur pour PBX SITE
 PAYBOX_PBX_RANG=Valeur pour PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Valeur pour ID de PBX
diff --git a/htdocs/langs/fr_CA/paypal.lang b/htdocs/langs/fr_CA/paypal.lang
index 7717c5c1f65..e156d84978a 100644
--- a/htdocs/langs/fr_CA/paypal.lang
+++ b/htdocs/langs/fr_CA/paypal.lang
@@ -1,17 +1,12 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Configuration du module PayPal
-PaypalDesc=Ce module offre des pages pour permettre le paiement sur <a href="http://www.paypal.com" target="_blank"> PayPal </a> par les clients. Cela peut être utilisé pour un paiement gratuit ou pour un paiement sur un objet Dolibarr particulier (facture, commande, ...)
-PaypalDoPayment=Payer avec PayPal
 PAYPAL_API_SANDBOX=Mode test / sandbox
 PAYPAL_API_USER=Nom d'utilisateur de l'API
 PAYPAL_API_PASSWORD=Mot de passe de l'API
 PAYPAL_API_SIGNATURE=Signature de l'API
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offre de paiement "intégral" (carte de crédit + Paypal) ou "Paypal" seulement
 PaypalModeOnlyPaypal=PayPal uniquement
 ThisIsTransactionId=Ceci est un identifiant de transaction: <b> %s</b>
-PAYPAL_ADD_PAYMENT_URL=Ajoutez l'URL du paiement Paypal lorsque vous envoyez un document par mail
 NewOnlinePaymentFailed=Nouveau paiement en ligne essayé mais échoué
-ONLINE_PAYMENT_SENDEMAIL=EMail à avertir après un paiement (succès ou non)
 ReturnURLAfterPayment=Retourner l'URL après le paiement
 ValidationOfOnlinePaymentFailed=La validation du paiement en ligne a échoué
 PaymentSystemConfirmPaymentPageWasCalledButFailed=La page de confirmation de paiement a été appelée par système de paiement renvoyé une erreur
@@ -19,4 +14,3 @@ SetExpressCheckoutAPICallFailed=L'appel de l'API SetExpressCheckout a échoué.
 DoExpressCheckoutPaymentAPICallFailed=L'appel de l'API DoExpressCheckoutPayment a échoué.
 ErrorCode=Code d'erreur
 ErrorSeverityCode=Code de gravité des erreurs
-PaypalLiveEnabled=Paypal activé en direct (autrement, mode test / sandbox)
diff --git a/htdocs/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang
index 8b7e90c6cb6..26d7401d5a6 100644
--- a/htdocs/langs/fr_CA/products.lang
+++ b/htdocs/langs/fr_CA/products.lang
@@ -138,7 +138,6 @@ MinSupplierPrice=Prix minimum d'achat
 DynamicPriceConfiguration=Configuration de prix dynamique
 AddVariable=Ajouter une variable
 AddUpdater=Ajouter une mise à jour
-GlobalVariableUpdaters=Mises à jour variables globales
 UpdateInterval=Intervalle de mise à jour (minutes)
 CorrectlyUpdated=Correctement mis à jour
 PropalMergePdfProductActualFile=Les fichiers utilisés pour ajouter au PDF Azur sont / sont
diff --git a/htdocs/langs/fr_CA/projects.lang b/htdocs/langs/fr_CA/projects.lang
index c6a130e4ac1..7b2d5aad08b 100644
--- a/htdocs/langs/fr_CA/projects.lang
+++ b/htdocs/langs/fr_CA/projects.lang
@@ -28,8 +28,6 @@ TimeSpent=Temps passé
 TimeSpentByYou=Temps passé par vous
 TimeSpentByUser=Temps passé par l'utilisateur
 TimesSpent=Temps passé
-RefTask=Réf. tâche
-LabelTask=Tâche d'étiquette
 TaskTimeSpent=Temps consacré aux tâches
 NewTimeSpent=Temps passé
 MyTimeSpent=Mon temps passé
diff --git a/htdocs/langs/fr_CA/stripe.lang b/htdocs/langs/fr_CA/stripe.lang
index ea28480af15..fdb6a136ac6 100644
--- a/htdocs/langs/fr_CA/stripe.lang
+++ b/htdocs/langs/fr_CA/stripe.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configuration du module Stripe
 StripeOrCBDoPayment=Payer avec carte de crédit ou Stripe
-STRIPE_PAYONLINE_SENDEMAIL=EMail à avertir après un paiement (succès ou non)
 YouWillBeRedirectedOnStripe=Vous serez redirigé sur la page Stripe sécurisée pour vous fournir des informations sur votre carte de crédit
 SetupStripeToHavePaymentCreatedAutomatically=Configurez votre Stripe avec url <b> %s</b> pour que le paiement soit créé automatiquement lorsqu'il est validé par Stripe.
 STRIPE_CGI_URL_V2=Url of Stripe CGI module de paiement
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 638afa65361..6692c4773a4 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable pour enregistrer les ad
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés (utilisé si non défini dans la fiche produit)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte comptable par défaut pour les produits vendus (utilisé si non défini dans la fiche produit)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Code comptable par défaut pour les produits vendus dans la CEE (utilisé si non définie dans la fiche produit)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Code comptable par défaut pour les produits vendus exportés hors de la CEE (utilisé si non définie dans la fiche produit)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Code comptable par défaut pour les produits vendus dans la CEE (utilisé si non définie dans la fiche produit)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Code comptable par défaut pour les produits vendus exportés hors de la CEE (utilisé si non définie dans la fiche produit)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (utilisé si non défini dans la fiche service)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (utilisé si non défini dans la fiche service)
 
@@ -289,8 +289,10 @@ Modelcsv_quadratus=Export vers Quadratus QuadraCompta
 Modelcsv_ebp=Export vers EBP
 Modelcsv_cogilog=Export vers Cogilog
 Modelcsv_agiris=Export vers Agiris
+Modelcsv_openconcerto=Export pour OpenConcerto (Test)
 Modelcsv_configurable=Export configurable
-Modelcsv_FEC=Exportation FEC (Art. L47 A) (Test)
+Modelcsv_FEC=Exportation FEC (Test)
+Modelcsv_Sage50_Swiss=Export pour Sage 50 Suisse
 ChartofaccountsId=Id plan comptable
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 7503dc955ff..07ff3d3ae24 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -423,7 +423,7 @@ ExtrafieldLink=Lien vers un objet
 ComputedFormula=Champ calculé
 ComputedFormulaDesc=Vous pouvez entrer ici une formule utilisant les propriétés objet ou tout code PHP pour obtenir des valeurs dynamiques. Vous pouvez utiliser toute formule compatible PHP, incluant l'opérateur conditionnel "?", et les objets globaux : <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATTENTION</strong> : Seulement quelques propriétés de l'objet $object pourraient être disponibles. Si vous avez besoin de propriétés non chargées, créez vous même une instance de l'objet dans votre formule, comme dans le deuxième exemple.<br>Utiliser un champs calculé signifie que vous ne pouvez pas entrer vous même toute valeur à partir de l'interface. Aussi, s'il y a une erreur de syntaxe, la formule pourrait ne rien retourner.<br><br>Exemple de formule:<br> $object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Exemple pour recharger l'objet: <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Un autre exemple de formule pour forcer le rechargement d'un objet et de son objet parent:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Objet parent projet non trouvé'
 ExtrafieldParamHelpPassword=Laissez ce champ vide signifie que la valeur sera stockée sans cryptage (le champ doit juste être caché avec des étoiles sur l'écran).<br> Définissez la valeur 'auto' pour utiliser la règle de cryptage par défaut pour enregistrer le mot de passe dans la base de données (ensuite la valeur utilisée sera le hash uniquement, sans moyen de retrouver la valeur d'origine)
-ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...<br><br>\nPour afficher une liste dépendant d'une autre liste attribut complémentaire: <br>1, valeur1|options_<i>code_liste_parente</i>:clé_parente<br> 2,valeur2|option_<i>Code_liste_parente</i>:clé_parente<br><br>\nPour que la liste soit dépendante d'une autre liste:<br>1,valeur1|<i>code_liste_parent</i>:clef_parent<br>2,valeur2|<i>code_liste_parent</i>:clef_parent
+ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...<br><br>Pour afficher une liste dépendant d'une autre liste attribut complémentaire: <br>1, valeur1|options_<i>code_liste_parente</i>:clé_parente<br> 2,valeur2|option_<i>Code_liste_parente</i>:clé_parente<br><br>Pour que la liste soit dépendante d'une autre liste:<br>1,valeur1|<i>code_liste_parent</i>:clef_parent<br>2,valeur2|<i>code_liste_parent</i>:clef_parent
 ExtrafieldParamHelpcheckbox=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
 ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
 ExtrafieldParamHelpsellist=Les paramètres de la liste viennent d'une table<br>Syntax : table_name:label_field:id_field::filter<br>Exemple : c_typent:libelle:id::filter<br><br>-idfilter est nécessairement une clé primaire int<br>- filter peut être un simple test (e.g. active=1) pour seulement montrer les valeurs actives<br>Vous pouvez aussi utiliser $ID$ dans le filtre qui est le ID actuel de l'objet<br>Pour faire un SELECT dans le filtre, utilisez $SEL$<br>Si vous voulez filtrer sur un extrafield, utilisez la syntaxe extra.fieldcode=... (ou fieldcode est le code de l'extrafield)<br><br>Pour avoir une liste qui dépend d'un autre attribut complémentaire:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>Pour avoir une liste qui dépend d'une autre liste:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
@@ -992,7 +992,6 @@ Port=Port
 VirtualServerName=Nom du serveur virtuel
 OS=OS
 PhpWebLink=Lien Web-Php
-Browser=Navigateur
 Server=Serveur
 Database=Base de données
 DatabaseServer=Hôte de la base de données
@@ -1080,7 +1079,7 @@ SystemInfoDesc=Les informations systèmes sont des informations techniques diver
 SystemAreaForAdminOnly=Cet espace n'est accessible qu'aux utilisateurs de type administrateur. Aucune permission Dolibarr ne permet d'étendre le cercle des utilisateurs autorisés à cet espace.
 CompanyFundationDesc=Éditez sur cette page toutes les informations connues de la société ou de l'association que vous souhaitez gérer. Pour cela, cliquez sur les boutons "%s" ou "%s" en bas de page.
 AccountantDesc=Renseignez sur cette page toutes les informations connues sur votre comptable
-AccountantFileNumber=Numéro de fichier
+AccountantFileNumber=Code comptable
 DisplayDesc=Vous pouvez choisir ici tous les paramètres liés à l'apparence de Dolibarr
 AvailableModules=Modules/applications installés
 ToActivateModule=Pour activer des modules, aller dans l'espace Configuration (Accueil->Configuration->Modules).
@@ -1240,8 +1239,6 @@ BillsNumberingModule=Modèle de numérotation des factures et avoirs
 BillsPDFModules=Modèle de document de factures
 BillsPDFModulesAccordindToInvoiceType=Modèles de documents de facturation en fonction du type de facture
 PaymentsPDFModules=Modèle de document pour les règlements
-CreditNote=Avoir
-CreditNotes=Avoirs
 ForceInvoiceDate=Forcer la date de facturation à la date de validation
 SuggestedPaymentModesIfNotDefinedInInvoice=Mode de paiement suggéré par défaut si non défini au niveau de la facture
 SuggestPaymentByRIBOnAccount=Proposer paiement par virement sur le compte
@@ -1893,3 +1890,4 @@ IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Clé de sécurité pour sécuriser l'URL du po
 IFTTTDesc=Ce module est conçu pour déclencher des événements sur IFTTT et/ou pour exécuter une action sur des déclencheurs IFTTT externes.
 UrlForIFTTT=URL endpoint pour IFTTT
 YouWillFindItOnYourIFTTTAccount=Vous le trouverez sur votre compte IFTTT
+EndPointFor=Endpoint pour %s: %s
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 76ba0956cb6..e187aa037c3 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Événements pour lesquels Dolibarr doit insérer un évènement d
 EventRemindersByEmailNotEnabled=Les rappels d'événement par email n'ont pas été activés dans la configuration du module %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tiers %s créé
+COMPANY_DELETEInDolibarr=Tiers  %s supprimé
 ContractValidatedInDolibarr=Contrat %s validé
 CONTRACT_DELETEInDolibarr=Contrat %s supprimé
 PropalClosedSignedInDolibarr=Proposition %s signée
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Projet %s modifié
 PROJECT_DELETEInDolibarr=Projet %s supprimé
 TICKET_CREATEInDolibarr=Ticket %s créé
 TICKET_MODIFYInDolibarr=Ticket %s modifié
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigné
 TICKET_CLOSEInDolibarr=Ticket %s fermé
 TICKET_DELETEInDolibarr=Ticket %s supprimé
 ##### End agenda events #####
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 93ab0eaf858..d7aaabbc2dc 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banque
 MenuBankCash=Banques | Caisses
-MenuVariousPayment=Opérations diverses
+MenuVariousPayment=Paiements divers
 MenuNewVariousPayment=Nouveau paiement divers
 BankName=Nom de la banque
 FinancialAccount=Compte
 BankAccount=Compte bancaire
 BankAccounts=Comptes bancaires
-BankAccountsAndGateways=Comptes bancaires | Passerelles paiement
+BankAccountsAndGateways=Comptes bancaires | Interfaces paiement
 ShowAccount=Afficher compte
 AccountRef=Ref compte financier
 AccountLabel=Libellé compte financier
@@ -30,7 +30,7 @@ AllTime=Depuis le début
 Reconciliation=Rapprochement
 RIB=Numéro de compte bancaire
 IBAN=Identifiant IBAN
-BIC=Identifiant BIC/SWIFT
+BIC=Code BIC/SWIFT
 SwiftValid=BIC/SWIFT valide
 SwiftVNotalid=BIC/SWIFT non valide
 IbanValid=Numéro de compte valide
@@ -98,7 +98,7 @@ BankLineConciliated=Écriture rapprochée
 Reconciled=Rapproché
 NotReconciled=Non rapproché
 CustomerInvoicePayment=Règlement client
-SupplierInvoicePayment=Règlement fournisseur
+SupplierInvoicePayment=Paiement fournisseur
 SubscriptionPayment=Paiement cotisation
 WithdrawalPayment=Règlement bon de prélèvement
 SocialContributionPayment=Paiement de charge fiscale/sociale
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Chèque rejeté et factures réouvertes
 BankAccountModelModule=Modèles de documents pour les comptes bancaires
 DocumentModelSepaMandate=Modèle de mandat SEPA. Utile pour les pays européens de la CEE seulement.
 DocumentModelBan=Modèle pour imprimer une page avec des informations du compte bancaire.
-NewVariousPayment=Nouvelle opération diverse
-VariousPayment=Opérations diverses
+NewVariousPayment=Nouveau paiement divers
+VariousPayment=Paiement divers
 VariousPayments=Opérations diverses
-ShowVariousPayment=Afficher les opérations diverses
-AddVariousPayment=Créer paiements divers
+ShowVariousPayment=Afficher les paiements divers
+AddVariousPayment=Créer paiement divers
 SEPAMandate=Mandat SEPA
 YourSEPAMandate=Votre mandat SEPA
 FindYourSEPAMandate=Voici votre mandat SEPA pour autoriser notre société à réaliser les prélèvements depuis votre compte bancaire. Merci de retourner ce mandat signé (scan du document signé) ou en l'envoyant par courrier à 
 AutoReportLastAccountStatement=Remplissez automatiquement le champ 'numéro de relevé bancaire' avec le dernier numéro lors du rapprochement
+CashControl=Clôture de caisse
+NewCashFence=Nouvelle clôture de caisse
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index a6d7e4fb41b..02c60a3b603 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=Dans la devise des factures
 PaidBack=Remboursé
 DeletePayment=Supprimer le paiement
 ConfirmDeletePayment=Êtes-vous sûr de vouloir supprimer ce paiement ?
-ConfirmConvertToReduc=Voulez vous convertir ce(cet) %s en remise fixe ?<br>Le montant sera enregistré parmi les autres remises et pourra être utilisé en tant que remise sur une autre facture du client.
-ConfirmConvertToReducSupplier=Voulez vous convertir ce(cet) %s en remise fixe ?<br>Le montant sera enregistré parmi les autres remises et pourra être utilisé en tant que remise sur une autre facture courante ou future de ce fournisseur.
+ConfirmConvertToReduc=Voulez vous convertir ce(cet) %s en remise fixe ?
+ConfirmConvertToReduc2=Le montant sera sauvegardé parmi toutes les remises et pourra être utilisé comme remise pour une facture actuelle ou future pour ce client.
+ConfirmConvertToReducSupplier=Voulez vous convertir ce(cet) %s en remise fixe ?
+ConfirmConvertToReducSupplier2=Le montant sera sauvegardé parmi toutes les remises et pourra être utilisé comme remise pour une facture actuelle ou future de ce fournisseur.
 SupplierPayments=Règlements fournisseurs
 ReceivedPayments=Règlements reçus
 ReceivedCustomersPayments=Règlements reçus du client
@@ -89,7 +91,6 @@ PaymentTerm=Condition de règlement
 PaymentConditions=Conditions de règlement
 PaymentConditionsShort=Conditions de règlement
 PaymentAmount=Montant règlement
-ValidatePayment=Valider ce règlement
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Valider les factures automatiquement
 GeneratedFromRecurringInvoice=Généré depuis la facture modèle récurrente %s
 DateIsNotEnough=Date pas encore atteinte
 InvoiceGeneratedFromTemplate=Facture %s généré depuis la facture modèle récurrente %s
+GeneratedFromTemplate=Généré à partir du modèle de facture %s
 WarningInvoiceDateInFuture=Attention, la date de facturation est antérieur à la date actuelle
 WarningInvoiceDateTooFarInFuture=Attention, la date de facturation est trop éloignée de la date actuelle
 ViewAvailableGlobalDiscounts=Voir les remises disponibles
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index d69afd0f4e2..c3bd8f8ce72 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -67,3 +67,4 @@ ValidateAndClose=Valider et fermer
 Terminal=Terminal
 NumberOfTerminals=Nombre de terminaux
 TerminalSelect=Sélectionnez le terminal que vous souhaitez utiliser:
+POSTicket=Ticket POS
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index c2927ddec8d..f42057eeb53 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - categories
 Rubrique=Tag/Catégorie
-Rubriques=Tags/Catégories
+Rubriques=Tags/catégories
 RubriquesTransactions=Tags/catégories des transactions
 categories=tags/catégories
 NoCategoryYet=Aucun tag/catégorie de ce type n'a été créé
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 0a666b88f2c..a25a7ffba4f 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -258,7 +258,7 @@ ProfId2DZ=Article
 ProfId3DZ=Numéro d'identification du fournisseur 
 ProfId4DZ=Numéro d'identification du client
 VATIntra=Numéro de TVA
-VATIntraShort=Numéro de TVA
+VATIntraShort=Numéro TVA
 VATIntraSyntaxIsValid=Syntaxe valide
 VATReturn=Fréquence TVA
 ProspectCustomer=Prospect / Client
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 1be55f6ef5a..0381183468c 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Créer taxe sociale/fiscale
 ContributionsToPay=Charges fiscales/sociales à payer
 AccountancyTreasuryArea=Espace facturation et paiement
 NewPayment=Nouveau règlement
-Payments=Règlements
 PaymentCustomerInvoice=Règlement facture client
 PaymentSupplierInvoice=Règlement facture fournisseur
 PaymentSocialContribution=Paiement de charges fiscales/sociales
@@ -205,7 +204,6 @@ SellsJournal=Journal des ventes
 PurchasesJournal=Journal des achats
 DescSellsJournal=Journal des ventes
 DescPurchasesJournal=Journal des achats
-InvoiceRef=Réf facture
 CodeNotDef=Non défini
 WarningDepositsNotIncluded=Les factures d'acomptes ne sont pas encore prises en compte dans cette version avec ce module de comptabilité.
 DatePaymentTermCantBeLowerThanObjectDate=La date limite de règlement ne peut être inférieure à la date de l'object
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index 0952bae8f37..9e9b6c0993b 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Supprimer une tâche planifiée
 Permission23104 = Exécuter une tâche planifiée
 # Admin
 CronSetup=Page de configuration du module - Gestion des travaux programmés
-URLToLaunchCronJobs=Ou pour vérifier ou lancer les travaux planifiés qualifiés
+URLToLaunchCronJobs=URL pour vérifier ou lancer les travaux planifiés qualifiés
 OrToLaunchASpecificJob=Ou pour vérifier et lancer un travail programmé spécifique
 KeyForCronAccess=Clé de sécurité pour l'URL de lancement des travaux programmés
 FileToLaunchCronJobs=Ligne de commande pour vérifier et lancer les travaux programmés qualifiés
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index b11a81cb0d6..1cf435379cd 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Mauvaise syntaxe pour le paramètre keyforco
 ErrorVariableKeyForContentMustBeSet=Erreur, la constante nommée %s (avec le contenu de texte à afficher) ou %s (avec l'adresse externe à afficher) doit être fixée.
 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
 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
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index 86d7e91ff05..1dd59973aea 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Modèles de numérotation des demandes de congés
 TemplatePDFHolidays=Modèle de demande de congés PDF
 FreeLegalTextOnHolidays=Texte libre sur PDF
 WatermarkOnDraftHolidayCards=Filigranes sur les demandes de congés brouillons
+HolidaysToApprove=Vacances à approuver
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index dabe27f0368..c0e0a3057e4 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -644,7 +644,6 @@ SendAcknowledgementByMail=Envoi A.R. par email
 SendMail=Envoyer email
 Email=Email
 NoEMail=Pas d'email
-Email=Email
 AlreadyRead=Déjà lu
 NotRead=Non lu
 NoMobilePhone=Pas de téléphone portable
@@ -672,7 +671,6 @@ Method=Méthode
 Receive=Réceptionner
 CompleteOrNoMoreReceptionExpected=Complète ou plus de réception attendue
 ExpectedValue=Valeur attendue
-CurrentValue=Valeur courante
 PartialWoman=Partielle
 TotalWoman=Totale
 NeverReceived=Jamais reçu
@@ -844,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Exporter liste filtrée
 ExportList=Exporter liste
 ExportOptions=Options d'exportation
+IncludeDocsAlreadyExported=Inclure les documents déjà exportés
+ExportOfPiecesAlreadyExportedIsEnable=L'exportation de pièces déjà exportées est activée
+ExportOfPiecesAlreadyExportedIsDisable=L'exportation des pièces déjà exportées est désactivée
+AllExportedMovementsWereRecordedAsExported=Tous les mouvements exportés ont été enregistrés comme exportés
+NotAllExportedMovementsCouldBeRecordedAsExported=Tous les mouvements exportés n'ont pas pu être enregistrés comme exportés
 Miscellaneous=Divers
 Calendar=Calendrier
 GroupBy=Grouper par...
@@ -972,3 +975,7 @@ TMenuMRP=GPAO
 ShowMoreInfos=Afficher plus d'informations
 NoFilesUploadedYet=S'il vous plaît, téléverser un document d'abord
 SeePrivateNote=Voir note privée
+PaymentInformation=Information de paiement
+ValidFrom=Valide à partir de
+ValidUntil=Valide jusqu'au
+NoRecordedUsers=Aucun utilisateur
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 97951474aa0..c2b670d0ca7 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -197,3 +197,4 @@ SendReminderForExpiredSubscriptionTitle=Envoyer une relance par mail pour les co
 SendReminderForExpiredSubscription=Envoyer un rappel par e-mail aux membres lorsque l'adhésion est sur le point d'expirer (le paramètre est le nombre de jours avant la fin de l'adhésion pour envoyer le rappel. Il peut s'agir d'une liste de jours séparé par un point-virgule, par exemple '10;5;0;-5')
 MembershipPaid=Adhésion payée pour la période en cours (jusqu'au %s)
 YouMayFindYourInvoiceInThisEmail=Vous pouvez trouver votre facture jointe à cet email
+XMembersClosed=%s adhérent(s) résilié(s)
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index e88221e1995..8aad310a172 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -25,7 +25,7 @@ EnterNameOfModuleToDeleteDesc=Vous pouvez supprimer votre module. ATTENTION: Tou
 EnterNameOfObjectToDeleteDesc=Vous pouvez effacer un objet. ATTENTION : Tous les fichiers (générés ou créés manuellement) en rapport avec cet objet seront définitivement effacés !
 DangerZone=Zone de danger
 BuildPackage=Construire le package
-BuildPackageDesc=Vous pouvez générer un package zip de votre application afin que vous soyez prêt à le distribuer sur n’importe quel Dolibarr. Vous pouvez également le distribuer ou le vendre sur une place de marché, comme <a href="https://www.dolistore.com">DoliStore.com</a> .
+BuildPackageDesc=Vous pouvez générer un package zip de votre application afin d'être prêt à le distribuer sur n’importe quel Dolibarr. Vous pouvez également le distribuer ou le vendre sur une place de marché, comme <a href="https://www.dolistore.com">DoliStore.com</a> .
 BuildDocumentation=Générez la documentation
 ModuleIsNotActive=Le module n'est pas encore activé. Aller à %s pour l'activer ou cliquer ici :
 ModuleIsLive=Ce module a été activé. Tout changement dessus pourrait casser une fonctionnalité actuellement en ligne.
@@ -68,6 +68,7 @@ PageForLib=Fichier pour la librairie PHP
 PageForObjLib=Fichier pour la librairie PHP dédiée à l'objet
 SqlFileExtraFields=Fichier SQL pour les attributs complémentaires
 SqlFileKey=Fichier SQL pour les clés et index
+SqlFileKeyExtraFields=Fichier SQL pour les clés d'attributs complémentaires
 AnObjectAlreadyExistWithThisNameAndDiffCase=Un objet existe déjà avec ce nom dans une casse différente
 UseAsciiDocFormat=Vous pouvez utiliser le format Markdown, mais il est recommandé d'utiliser le format Asciidoc (Comparaison entre .md et .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Est une mesure
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index a0169705681..6bcdb4e11c4 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -11,3 +11,7 @@ BOMsModelModule=Modèles de documents de BOMs
 FreeLegalTextOnBOMs=Texte libre sur documents BOMs
 WatermarkOnDraftBOMs=Filigrane sur les brouillons de BOMs
 ConfirmCloneBillOfMaterials=Êtes-vous sûr de vouloir cloner cette nomenclature ?
+ManufacturingEfficiency=Efficacité de fabrication
+ValueOfMeansLoss=Une valeur de 0,95 signifie une perte moyenne de 5%% pendant la production
+DeleteBillOfMaterials=Supprimer la nomenclature
+ConfirmDeleteBillOfMaterials=Êtes-vous sûr de vouloir supprimer cette nomenclature?
diff --git a/htdocs/langs/fr_FR/paybox.lang b/htdocs/langs/fr_FR/paybox.lang
index 702494f5203..2f0891171a5 100644
--- a/htdocs/langs/fr_FR/paybox.lang
+++ b/htdocs/langs/fr_FR/paybox.lang
@@ -10,7 +10,7 @@ ToComplete=À compléter
 YourEMail=Email de confirmation du paiement
 Creditor=Bénéficiaire
 PaymentCode=Code de paiement
-PayBoxDoPayment=Payer par carte bancaire (Paybox)
+PayBoxDoPayment=Payer avec PayBox
 ToPay=Saisir règlement
 YouWillBeRedirectedOnPayBox=Vous serez redirigé vers la page sécurisée Paybox de saisie de votre carte bancaire
 Continue=Continuer
@@ -37,3 +37,4 @@ PAYBOX_PAYONLINE_SENDEMAIL=Email à prévenir en cas de paiement (succès ou non
 PAYBOX_PBX_SITE=Site
 PAYBOX_PBX_RANG=Rang
 PAYBOX_PBX_IDENTIFIANT=Identifiant
+PAYBOX_HMAC_KEY=Clé HMAC
diff --git a/htdocs/langs/fr_FR/paypal.lang b/htdocs/langs/fr_FR/paypal.lang
index c0d7a9adadb..25fe220824b 100644
--- a/htdocs/langs/fr_FR/paypal.lang
+++ b/htdocs/langs/fr_FR/paypal.lang
@@ -14,7 +14,6 @@ PaypalModeOnlyPaypal=PayPal seul
 ONLINE_PAYMENT_CSS_URL=URL optionnelle de la feuille de style CSS sur la page de paiement en ligne
 ThisIsTransactionId=Voici l'identifiant de la transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Ajouter l'URL de paiement Paypal lors de l'envoi d'un document par email
-YouAreCurrentlyInSandboxMode=Vous travaillez actuellement dans le mode "bac à sable" de %s
 NewOnlinePaymentReceived=Nouveau paiement en ligne reçu
 NewOnlinePaymentFailed=Nouvelle tentative de paiement en ligne échouée
 ONLINE_PAYMENT_SENDEMAIL=Email à prévenir en cas de paiement (succès ou non)
@@ -34,3 +33,4 @@ PostActionAfterPayment=Actions complémentaires après paiement
 ARollbackWasPerformedOnPostActions=Une annulation a été effectuée sur toutes les actions Post paiement. Vous devez compléter les actions complémentaires manuellement si elles sont nécessaires.
 ValidationOfPaymentFailed=La validation du paiement a échoué
 CardOwner=Titulaire de la carte
+PayPalBalance=Crédit Paypal
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 481710345f6..f8b0aa1d005 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -260,7 +260,7 @@ AddVariable=Ajouter une Variable
 AddUpdater=Ajouter URL de mise à jour
 GlobalVariables=Variables globales
 VariableToUpdate=Variable à mettre à jour
-GlobalVariableUpdaters=Mis à jour variable globale
+GlobalVariableUpdaters=Programmes de mise à jour externes pour les variables
 GlobalVariableUpdaterType0=Données JSON
 GlobalVariableUpdaterHelp0=Analyse les données JSON depuis l'URL spécifiée, VALUE indique l'emplacement de la valeur pertinente,
 GlobalVariableUpdaterHelpFormat0=Le format est {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 3c0fc3dbbf3..5c50b1e2c40 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -45,6 +45,7 @@ TimeSpent=Temps consommé
 TimeSpentByYou=Temps consommé par vous
 TimeSpentByUser=Temps consommé par utilisateur
 TimesSpent=Temps consommés
+TaskId=ID de tâche
 RefTask=Ref. tâche
 LabelTask=Libellé tâche
 TaskTimeSpent=Temps consommé sur les tâches
diff --git a/htdocs/langs/fr_FR/receptions.lang b/htdocs/langs/fr_FR/receptions.lang
index 8e766344d94..d98a057bb86 100644
--- a/htdocs/langs/fr_FR/receptions.lang
+++ b/htdocs/langs/fr_FR/receptions.lang
@@ -1,83 +1,45 @@
 # Dolibarr language file - Source file is en_US - receptions
-RefReception=Réf. réception
+ReceptionsSetup=Configuration de la réception de produits
+RefReception=Réf. Réception
 Reception=Réception
-reception=Réception
-reception_line=Ligne de réception
 Receptions=Réceptions
 AllReceptions=Toutes les réceptions
 Reception=Réception
 Receptions=Réceptions
-ShowReception=Afficher Réceptions
-Receivings=Bons de réceptions
-ReceptionsArea=Espace réceptions
+ShowReception=Afficher les Réceptions
+ReceptionsArea=Espace Réception
 ListOfReceptions=Liste des réceptions
-ReceptionMethod=Mode de transport
+ReceptionMethod=Méthode de réception
 LastReceptions=Les %s dernières réceptions
 StatisticsOfReceptions=Statistiques des réceptions
 NbOfReceptions=Nombre de réceptions
 NumberOfReceptionsByMonth=Nombre de réceptions par mois
-ReceptionCard=Fiche réception
+ReceptionCard=Fiche de réception
 NewReception=Nouvelle réception
-CreateReception=Créer réception
-QtyShipped=Qté. expédiée
-QtyPreparedOrShipped=Quantité préparée ou envoyée
-QtyToReceive=Qté. à recevoir
-QtyReceived=Qté. reçue
-QtyInOtherReceptions=Qté dans les autres réceptions
-KeepToShip=Reste à expédier
+CreateReception=Créer une réception
+QtyInOtherReceptions=Quantité dans les autres réceptions
 OtherReceptionsForSameOrder=Autres réceptions pour cette commande
-ReceptionsAndReceivingForSameOrder=Réceptions et réceptions pour cette commande
+ReceptionsAndReceivingForSameOrder=Réceptions et reçus pour cette commande
 ReceptionsToValidate=Réceptions à valider
-StatusReceptionCanceled=Annulée
+StatusReceptionCanceled=Annulé
 StatusReceptionDraft=Brouillon
-StatusReceptionValidated=Validée
-StatusReceptionProcessed=Traitée
+StatusReceptionValidated=Validée (produits à envoyer ou envoyés)
+StatusReceptionProcessed=Traités
 StatusReceptionDraftShort=Brouillon
-StatusReceptionValidatedShort=Validée
-StatusReceptionProcessedShort=Traitée
-ReceptionSheet=Fiche réception
+StatusReceptionValidatedShort=Validé
+StatusReceptionProcessedShort=Traités
+ReceptionSheet=Bordereau de réception
 ConfirmDeleteReception=Êtes-vous sûr de vouloir supprimer cette réception ?
-ConfirmValidateReception=Êtes-vous sûr de vouloir valider cette réception sous la référence <b>%s</b>?
+ConfirmValidateReception=Êtes-vous sûr de vouloir valider cette réception sous la référence  <b> %s </b> ?
 ConfirmCancelReception=Êtes-vous sûr de vouloir annuler cette réception ?
-DocumentModelMerou=Modèle Merou A5
-WarningNoQtyLeftToSend=Alerte, aucun produit en attente de réception.
-StatsOnReceptionsOnlyValidated=Statistiques effectuées sur les réceptions validées uniquement. La date prise en compte est la date de validation (la date de prévision de livraison n'étant pas toujours renseignée).
-DateDeliveryPlanned=Date prévue de livraison
-RefDeliveryReceipt=Ref bon de réception
-StatusReceipt=Status du bon de réception
-DateReceived=Date de réception réelle
-SendReceptionByEMail=Envoyer bon de réception par email
+StatsOnReceptionsOnlyValidated=Statistiques effectuées sur les réceptionss validées uniquement. La date prise en compte est la date de validation (la date de prévision de livraison n'étant pas toujours renseignée).
+SendReceptionByEMail=Envoyer la réception par email
 SendReceptionRef=Envoi du bordereau de réception %s
-ActionsOnReception=Événements sur l'réception
-LinkToTrackYourPackage=Lien pour le suivi de votre colis
-ReceptionCreationIsDoneFromOrder=Pour le moment, la création d'une nouvelle réception se fait depuis la fiche commande fournisseur.
+ActionsOnReception=Événements sur la réception
+ReceptionCreationIsDoneFromOrder=Pour le moment, la création d'une nouvelle réception se fait depuis la fiche commande.
 ReceptionLine=Ligne de réception
-RefSupplierOrder=Ref. Commande fournisseur
-ProductQtyInCustomersOrdersRunning=Quantité de produit en commandes client ouvertes
-ProductQtyInSuppliersOrdersRunning=Quantité de produit en commandes fournisseur ouvertes
-ProductQtyInReceptionAlreadySent=Quantité de produit en commande client ouverte déjà expédiée
+ProductQtyInReceptionAlreadySent=Quantité de produit en commande ouverte déjà expédiée
 ProductQtyInSuppliersReceptionAlreadyRecevied=Quantité de produit déjà reçu en commandes fournisseur ouvertes
-NoProductToShipFoundIntoStock=Aucun produit à expédier n'a été trouver dans l'entrepôt <b>%s</b>. Corrigez l'inventaire ou retourner choisir un autre entrepôt.
-WeightVolShort=Poids/vol.
-ValidateOrderFirstBeforeReception=Vous devez d'abord valider la commande pour pouvoir créer une réception.
-CreateInvoiceForThisSupplier=Facturer réceptions
-ErrorRefAlreadyExists = La référence fournisseur existe déjà
-
-# Reception methods
-# ModelDocument
-DocumentModelTyphon=Modèle de bon de réception/livraison complet (logo…)
-Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER non définie
-SumOfProductVolumes=Somme des volumes des produits
-SumOfProductWeights=Somme des poids des produits
-
-# warehouse details
-DetailWarehouseNumber= Détail de l'entrepôt
-DetailWarehouseFormat= W:%s (Qté : %d)
-
-Billed=Facturé
-ClassifyUnbilled=Classer non facturé
-
-DateInvoice=Date de facturation
-CreateOneBillByThird=Créer une facture par tiers (sinon une par réception)
-ValidateInvoices=Factures validées
-StatusMustBeValidate=La réception %s doit être au statut 'Validée'
+ValidateOrderFirstBeforeReception=Vous devez d'abord valider la commande avant de pouvoir faire des réceptions.
+ReceptionsNumberingModules=Module de numérotation pour les réceptions
+ReceptionsReceiptModel=Modèles de document pour les réceptions
diff --git a/htdocs/langs/fr_FR/stripe.lang b/htdocs/langs/fr_FR/stripe.lang
index f3b30d50615..a88a2f40c3b 100644
--- a/htdocs/langs/fr_FR/stripe.lang
+++ b/htdocs/langs/fr_FR/stripe.lang
@@ -12,7 +12,7 @@ YourEMail=Email de confirmation du paiement
 STRIPE_PAYONLINE_SENDEMAIL=Email à prévenir en cas de paiement (succès ou non)
 Creditor=Bénéficiaire
 PaymentCode=Code de paiement
-StripeDoPayment=Payer par carte bancaire (Stripe)
+StripeDoPayment=Payer avec Stripe
 YouWillBeRedirectedOnStripe=Vous allez être redirigé vers la page sécurisée de Stripe pour insérer les informations de votre carte de crédit
 Continue=Continuer
 ToOfferALinkForOnlinePayment=URL de paiement %s
@@ -46,7 +46,7 @@ OAUTH_STRIPE_TEST_ID=Stripe Connect ID client (ca _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect ID client (ca _...)
 BankAccountForBankTransfer=Compte bancaire pour les paiements de fonds
 StripeAccount=Compte Stripe
-StripeChargeList=Liste des paiements Stripe
+StripeChargeList=Liste des encaissements par Stripe
 StripeTransactionList=Liste des transactions Stripe
 StripeCustomerId=Identifiant client Stripe
 StripePaymentModes=Modes de paiement Stripe
@@ -62,6 +62,6 @@ CreateCustomerOnStripe=Créer client sur Stripe
 CreateCardOnStripe=Créer carte sur Stripe
 ShowInStripe=Afficher dans Stripe
 StripeUserAccountForActions=Compte d'utilisateur à utiliser pour certains e-mails de notification d'événements Stripe (Stripe payouts)
-StripePayoutList=Liste des paiements Stripe
+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)
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index cdf5e18a9ee..751899dbcd5 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -133,6 +133,7 @@ TicketsIndex=Espace tickets
 TicketList=Liste des tickets
 TicketAssignedToMeInfos=Cette page affiche la liste de tickets créés par ou attribuées à l'utilisateur actuel.
 NoTicketsFound=Aucun ticket trouvé
+NoUnreadTicketsFound=Aucun ticket non lu trouvé
 TicketViewAllTickets=Voir tous les tickets
 TicketViewNonClosedOnly=Voir seulement les tickets ouverts
 TicketStatByStatus=Tickets par statut
@@ -266,7 +267,10 @@ TicketNewEmailBodyAdmin=<p> Le ticket vient d'être créé avec l'ID # %s, voir
 SeeThisTicketIntomanagementInterface=Voir ticket dans l'interface de gestion
 TicketPublicInterfaceForbidden=L'interface publique pour les tickets n'a pas été activée
 ErrorEmailOrTrackingInvalid=Mauvaise valeur pour l'ID de suivi ou l'e-mail
-
+OldUser=Ancien utilisateur
+NewUser=Nouvel utilisateur
+NumberOfTicketsByMonth=Nombre de tickets par mois
+NbOfTickets=Nombre de tickets
 # notifications
 TicketNotificationEmailSubject=Ticket %s mis à jour
 TicketNotificationEmailBody=Ceci est un message automatique pour vous informer que le ticket %s vient d'être mis à jour
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 7b333653e0a..5891408a2a2 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -98,3 +98,6 @@ NoWebSiteCreateOneFirst=Aucun site Web n'a encore été créé. Créez-en un d'a
 GoTo=Aller à
 DynamicPHPCodeContainsAForbiddenInstruction=Vous ajoutez du code PHP dynamique contenant l'instruction PHP '<strong>%s</strong> ' qui est interdite par défaut en tant que contenu dynamique (voir les options masquées WEBSITE_PHP_ALLOW_xxx pour augmenter la liste des commandes autorisées).
 NotAllowedToAddDynamicContent=Vous n'êtes pas autorisé à ajouter ou modifier du contenu dynamique PHP sur des sites Web. Demandez la permission ou conservez simplement le code dans les balises php non modifié.
+ReplaceWebsiteContent=Remplacer un contenu du site
+DeleteAlsoJs=Supprimer également tous les fichiers javascript spécifiques à ce site?
+DeleteAlsoMedias=Supprimer également tous les fichiers médias spécifiques à ce site?
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index ccba0841767..daa5b4ef413 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 4ac1a3571b6..df3604c5d92 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=NBR של תווים כדי להפעיל חיפוש: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=לא זמין כאשר אייאקס נכים
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript מושבת
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=נמל
 VirtualServerName=שרת וירטואלי שם
 OS=מערכת ההפעלה
 PhpWebLink=אינטרנט Php הקישור
-Browser=Browser
 Server=שרת
 Database=מסד נתונים
 DatabaseServer=מסד הנתונים המארח
@@ -1077,7 +1079,7 @@ SystemInfoDesc=מערכת מידע הוא מידע טכני שונות נכנס
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=כדי להפעיל מודולים, ללכת על שטח ההתקנה (ראשי-> התקנה-> Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=חשבוניות ושטרי אשראי המונים מוד
 BillsPDFModules=חשבוניות ומסמכים מודלים
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=כתב זכויות
-CreditNotes=אשראי הערות
 ForceInvoiceDate=להכריח את תאריך החשבונית עד כה אימות
 SuggestedPaymentModesIfNotDefinedInInvoice=תשלומים שהציע מצב בחשבונית כברירת מחדל, אם לא הוגדרו עבור חשבונית
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=רוכסן
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang
index c553d75f753..7b006d08948 100644
--- a/htdocs/langs/he_IL/agenda.lang
+++ b/htdocs/langs/he_IL/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index 5bc061f31f3..cb39150b627 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-BIC=BIC/SWIFT number
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Statement
 AccountStatements=Account statements
 LastAccountStatements=Last account statements
 IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Supplier payment
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 529404e853b..073dfd7d215 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Payment amount
-ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/he_IL/cashdesk.lang b/htdocs/langs/he_IL/cashdesk.lang
index 807a6b37326..7424d8ba1e5 100644
--- a/htdocs/langs/he_IL/cashdesk.lang
+++ b/htdocs/langs/he_IL/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 1298c5ebb97..2c018c55de7 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=New payment
-Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 68db165215d..b5a9d70cb70 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/he_IL/holiday.lang b/htdocs/langs/he_IL/holiday.lang
index 29036c97537..c161a106b08 100644
--- a/htdocs/langs/he_IL/holiday.lang
+++ b/htdocs/langs/he_IL/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index e0015244e80..8fe7834c2d0 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
 Email=Email
 NoEMail=No email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=ייצוא אפשרויות
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=שונות
 Calendar=Calendar
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index 5f06c51746e..5a4f4aa7c05 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=משתמשים
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=Late
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/he_IL/modulebuilder.lang b/htdocs/langs/he_IL/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/he_IL/modulebuilder.lang
+++ b/htdocs/langs/he_IL/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/he_IL/paybox.lang b/htdocs/langs/he_IL/paybox.lang
index 0d35ac440fa..d5e4fd9ba55 100644
--- a/htdocs/langs/he_IL/paybox.lang
+++ b/htdocs/langs/he_IL/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Do payment
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/he_IL/paypal.lang b/htdocs/langs/he_IL/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/he_IL/paypal.lang
+++ b/htdocs/langs/he_IL/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index a7fdf1597f2..7202cfefc43 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 3d23cb754d6..55292d97c46 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
diff --git a/htdocs/langs/he_IL/stripe.lang b/htdocs/langs/he_IL/stripe.lang
index 6fa072b4c9a..7a3389f34b7 100644
--- a/htdocs/langs/he_IL/stripe.lang
+++ b/htdocs/langs/he_IL/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditor
 PaymentCode=Payment code
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index f416ebbc84a..b4d894f55d7 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index b3ce7ca4b19..94a9277408a 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Stanje računa
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Oznaka računa
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Broj komada
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=Opcije
 OptionModeProductSell=Načini prodaje
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Načini nabavke
 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
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 0d0493ef357..5da7ac83e36 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Br. znakova za aktiviranje pretrage: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Nije dostupno kada je Ajax onemogućen
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript onemogućen
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Naziv virtualnog servera
 OS=OS
 PhpWebLink=Web-PHP veza
-Browser=Preglednik
 Server=Server
 Database=Baza podataka
 DatabaseServer=Host baze podataka
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Dostupne aplikacije/moduli
 ToActivateModule=Za aktivaciju modula, idite na podešavanja (Naslovna->Podešavanje->Moduli).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Način označavanja računa i odobrenja
 BillsPDFModules=Model dokumenata računa
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Odobrenje
-CreditNotes=Odobrenja
 ForceInvoiceDate=Forsiraj datum računa kao datum ovjere
 SuggestedPaymentModesIfNotDefinedInInvoice=Predloženi način plačanja na računu kao zadano ako nije definirano za račun
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=PBR
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
index 6e1eadcd3df..6192a20c6aa 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Događaji za koje Dolibarr će kreirat akcije u podsjetnicima auto
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index 72ee683d1ed..e29a7c6fc56 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banka
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Ime banke
 FinancialAccount=Račun
 BankAccount=Bankovni račun
 BankAccounts=Bankovni računi
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Prikaži račun
 AccountRef=Financijski račun ref.
 AccountLabel=Oznaka financijskog računa
@@ -30,7 +30,7 @@ AllTime=Od početka
 Reconciliation=Usklađivanje
 RIB=Broj bankovnog računa
 IBAN=IBAN broj
-BIC=BIC/SWIFT broj
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Izvod
 AccountStatements=Izvodi računa
 LastAccountStatements=Posljednji izvod računa
 IOMonthlyReporting=Mjesećni izvještaj
-BankAccountDomiciliation=Adresa računa
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Država računa
 BankAccountOwner=Naziv vlasnika računa
 BankAccountOwnerAddress=Adresa vlasinka računa
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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
 NewBankAccount=Novi račun
 NewFinancialAccount=Novi financijski račun
@@ -57,7 +57,7 @@ AccountType=Tip računa
 BankType0=Štedni račun
 BankType1=Tekući račun ili kreditna kartica
 BankType2=Gotovinski račun
-AccountsArea=Sučelje računa
+AccountsArea=Računi
 AccountCard=Kartica računa
 DeleteAccount=Brisanje računa
 ConfirmDeleteAccount=Are you sure you want to delete this account?
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Plaćanje kupca
-SupplierInvoicePayment=Plaćanje dobavljaču
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Plaćanje pretplate
 WithdrawalPayment=Isplata
 SocialContributionPayment=Plaćanje društveni/fiskalni porez
 BankTransfer=Bankovni transfer
 BankTransfers=Bankovni transferi
 MenuBankInternalTransfer=Interni prijenos
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od
 TransferTo=Za
 TransferFromToDone=Prijenos sa <b>%s</b> na <b>%s</b> od <b>%s</b> %s je pohranjen.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Povratak na račun
 ShowAllAccounts=Prikaži za sve račune
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Odaberite bankovni izvod povezan s usklađenjem. Koristite numeričke vrijednosti: YYYYMM ili YYYYMMDD radi sortiranja
 EventualyAddCategory=Konačno, odredite kategoriju u koju želite svrstati podatke
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Ček je vračen i računi su ponovo otvoreni
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 151891af9a4..16543aeb9fb 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=u valuti računa
 PaidBack=Uplaćeno natrag
 DeletePayment=Izbriši plaćanje
 ConfirmDeletePayment=Sigurno želite izbrisati ovo plaćanje?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Primljene uplate od kupaca
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Iznos plaćanja
-ValidatePayment=Ovjeri plaćanje
 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.
@@ -211,12 +212,12 @@ ShowBill=Prikaži račun
 ShowInvoice=Prikaži račun
 ShowInvoiceReplace=Prikaži zamjenski računa
 ShowInvoiceAvoir=Prikaži bonifikaciju
-ShowInvoiceDeposit=Show down payment invoice
+ShowInvoiceDeposit=Prikaži račun za predujam
 ShowInvoiceSituation=Prikaži račun etape
 ShowPayment=Prikaži plaćanje
 AlreadyPaid=Plaćeno do sada
 AlreadyPaidBack=Povrati do sada
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+AlreadyPaidNoCreditNotesNoDeposits=Uplaćeni iznos (bez knjižnih odobrenja i predujmova)
 Abandoned=Napušteno
 RemainderToPay=Preostalo za platiti
 RemainderToTake=Preostali iznos za primiti
@@ -285,10 +286,10 @@ GlobalDiscount=Opći popust
 CreditNote=Bonifikacija
 CreditNotes=Bonifikacija
 CreditNotesOrExcessReceived=Storno računa/knjižno odobrenje
-Deposit=Down payment
-Deposits=Down payments
+Deposit=Predujam
+Deposits=Predujam
 DiscountFromCreditNote=Popust iz bonifikacije %s
-DiscountFromDeposit=Down payments from invoice %s
+DiscountFromDeposit=Predujmovi iz računa %s
 DiscountFromExcessReceived=Payments in excess of invoice %s
 DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Ovaj kredit se može koristit na računu prije ovjere
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Automatska ovjera računa
 GeneratedFromRecurringInvoice=Pretplatnički račun generiran iz predloška %s
 DateIsNotEnough=Datum nije još dosegnut
 InvoiceGeneratedFromTemplate=Račun %s generiran iz predloška pretplatničkog računa %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
@@ -479,7 +481,7 @@ CantRemovePaymentWithOneInvoicePaid=Plaćanje se ne može izbrisati obzirom da p
 ExpectedToPay=Očekivano plaćanje
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Plaćeno s ovom uplatom
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down-payment or replacement invoices paid entirely.
+ClosePaidInvoicesAutomatically=Označi sve račune koji su podmireni u potpunosti kao "plaćeno".
 ClosePaidCreditNotesAutomatically=Klasificiraj "plaćene" bonifikacije kao plaćene u cjelosti.
 ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
index 35490f3033a..b1d91dfb8b5 100644
--- a/htdocs/langs/hr_HR/cashdesk.lang
+++ b/htdocs/langs/hr_HR/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Povijest
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index aec51e6a652..b3076decbe1 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Društvni/fiskalni porez za platiti
 AccountancyTreasuryArea=Računi i plaćanja
 NewPayment=Novo plaćanje
-Payments=Plaćanja
 PaymentCustomerInvoice=Uplata računa kupca
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Plaćanje društveni/fiskalni porez
@@ -205,7 +204,6 @@ SellsJournal=Izvještaj prodaje
 PurchasesJournal=Izvještaj kupovine
 DescSellsJournal=Izvještaj prodaje
 DescPurchasesJournal=Izvještaj kupovine
-InvoiceRef=Broj računa
 CodeNotDef=Nije definirano
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Datum valute plaćanja ne može biti manji od datuma objekta.
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index fe7f692e0a1..6dddf9bb0ce 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/hr_HR/holiday.lang b/htdocs/langs/hr_HR/holiday.lang
index 9eb3e2f84f4..b7b72669126 100644
--- a/htdocs/langs/hr_HR/holiday.lang
+++ b/htdocs/langs/hr_HR/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Ovjereni zahtjevi
 HolidaysValidatedBody=Vaš zahtjev za %s do %s je ovjeren.
 HolidaysRefused=Zahtjev odbijen
-HolidaysRefusedBody=Vaš zahtjev od %s do %s je odbijen zbog:
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Otkazani zahtjev
 HolidaysCanceledBody=Vaš zahtjev za %s do %s je otkazan.
 FollowedByACounter=1: Ovaj tip odsustva mora biti pračen brojačem. Brojač se povečava ručno ili automatski, a kada je zahtjev ovjeren, brojač se smanjuje.<br> 0: Nije pračeno brojačem.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 16beb150adb..8571f615495 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -371,6 +371,7 @@ Percentage=Postotak
 Total=Ukupno
 SubTotal=Sveukupno
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Ukupno s PDV-om
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Pošalji e-poštu s potvrdom primitka
 SendMail=Pošalji e-poštu
 Email=E-pošta
 NoEMail=Nema e-pošte
-Email=E-pošta
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=Nema mobilnog telefona
@@ -671,7 +671,6 @@ Method=Način
 Receive=Primi
 CompleteOrNoMoreReceptionExpected=Završeno ili bez drugih očekivanja
 ExpectedValue=Očekivana vrijednost
-CurrentValue=Trenutna vrijednost
 PartialWoman=Djelomično
 TotalWoman=Ukupno
 NeverReceived=Nikad primljeno
@@ -834,6 +833,7 @@ RelatedObjects=Povezani predmeti
 ClassifyBilled=Označi kao zaračunato
 ClassifyUnbilled=Označi kao nezaračunato
 Progress=Napredak
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=Vidi
@@ -842,6 +842,11 @@ Exports=Izvozi podataka
 ExportFilteredList=Izvoz pročišćenog popisa
 ExportList=Spis izvoza
 ExportOptions=Opcije izvoza
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Ostalo
 Calendar=Kalendar
 GroupBy=Grupiraj prema...
@@ -854,7 +859,7 @@ Download=Preuzimanje
 DownloadDocument=Preuzimanje dokumenta
 ActualizeCurrency=Upiši novi tečaj
 Fiscalyear=Fiskalna godina
-ModuleBuilder=Graditelj sučelja
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Odredi valutu
 BulkActions=Opsežne radnje
 ClickToShowHelp=Klikni za prikaz pomoći
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 78801a482f4..ed6754593f7 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -6,7 +6,7 @@ Member=Član
 Members=Članovi
 ShowMember=Prikaži karticu člana
 UserNotLinkedToMember=Korisnik nije povezan s članom
-ThirdpartyNotLinkedToMember=Komitent nije povezan sa članom
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Članske ulaznice
 FundationMembers=Članovi zaklade
 ListOfValidatedPublicMembers=Popis ovjerenih javnih članova
@@ -67,11 +67,11 @@ Subscriptions=Pretplate
 SubscriptionLate=Kasni
 SubscriptionNotReceived=Pretplata nikad zaprimljena
 ListOfSubscriptions=Popis pretplata
-SendCardByMail=Pošalji karticu e-poštom
+SendCardByMail=Send card by email
 AddMember=Kreiraj člana
 NoTypeDefinedGoToSetup=Nema definiranih tipova člana. Idite na izbornik "Tipovi članova"
 NewMemberType=Novi tip člana
-WelcomeEMail=E-pošta dobrodošlice
+WelcomeEMail=Welcome email
 SubscriptionRequired=Potrebna pretplata
 DeleteType=Obriši
 VoteAllowed=Glasanje dozvoljeno
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd datoteka
 ValidateMember=Ovjeri člana
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Javni popis članova
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Sadržaj vaše članske kartice
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=E-pošta pošiljatelja za automatske poruke e-poštom
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format stranice naljepnica
 DescADHERENT_ETIQUETTE_TEXT=Tekst za ispis na adresnim listovima člana
 DescADHERENT_CARD_TYPE=Fromat stranice iskaznica
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generiraj vizit karte za sve članove
 DocForOneMemberCards=Generiraj vizit kartu za određenog člana
 DocForLabels=Generiraj listu adresa
 SubscriptionPayment=Plaćanje pretplate
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Statistika članova po zemlji
 MembersStatisticsByState=Statistika članova po regiji/provinciji
 MembersStatisticsByTown=Statistika članova po gradu
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Ovaj ekran prikazuje statistiku članova po vrsti.
 MembersByRegion=Ovaj ekran prikazuje statistiku članova po regiji.
 VATToUseForSubscriptions=PDV stopa za pretplate
-NoVatOnSubscription=Nema PDV-a za pretplate
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod koji se koristi za stavku pretplate na računu: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/hr_HR/modulebuilder.lang b/htdocs/langs/hr_HR/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/hr_HR/modulebuilder.lang
+++ b/htdocs/langs/hr_HR/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/hr_HR/paybox.lang b/htdocs/langs/hr_HR/paybox.lang
index 9a3694339f3..de435100a68 100644
--- a/htdocs/langs/hr_HR/paybox.lang
+++ b/htdocs/langs/hr_HR/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Za završiti
 YourEMail=E-pošta za prijem potvrde uplate
 Creditor=Kreditor
 PaymentCode=Kod plaćanja
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Izvrši plaćanje
 YouWillBeRedirectedOnPayBox=Biti ćete preusmjereni na sigurnu stranicu PayBox servisa gdje možete unijeti podatke o svojoj kreditnoj kartici
 Continue=Sljedeće
 ToOfferALinkForOnlinePayment=URL za %s plaćanje
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Ova stranica potvrđuje da je vaše plaćanje pohranjeno. Hvala Vam.
@@ -33,7 +33,8 @@ VendorName=Naziv pružatelja
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=Primljena nova PayBox uplata
 NewPayboxPaymentFailed=PayBox uplata probana ali s greškom
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/hr_HR/paypal.lang b/htdocs/langs/hr_HR/paypal.lang
index 66a4bd21e08..6c9f1ef45ab 100644
--- a/htdocs/langs/hr_HR/paypal.lang
+++ b/htdocs/langs/hr_HR/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal postavljanje modula
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Plaćanje putem PayPal-a
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Test mod/sandbox
 PAYPAL_API_USER=API korisničko ima
 PAYPAL_API_PASSWORD=API lozinka
 PAYPAL_API_SIGNATURE=API potpis
 PAYPAL_SSLVERSION=Curl SSL Verzija
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Ponuda plaćanja "integralna" (kreditna kartica+PayPal) ili samo PayPal
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integralno
 PaypalModeOnlyPaypal=Samo PayPal
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=Ovo je ID tranksakcije: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Povratni URL nakon uplate
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Kratka poruka greške
 ErrorCode=Kod greške
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 4bf68e3e309..fe064bd6b90 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -260,7 +260,7 @@ AddVariable=Dodaj varijablu
 AddUpdater=Dodaj promjenjivač
 GlobalVariables=Globalne varijable
 VariableToUpdate=Variabla za promjeniti
-GlobalVariableUpdaters=Globalne varijable promjene
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 61703a066a6..c40b0ff3f7b 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Vrijeme utrošeno
 TimeSpentByYou=Vaše utrošeno vrijeme
 TimeSpentByUser=Utrošeno vrijeme korisnika
 TimesSpent=Vrijeme utrošeno
-RefTask=Ref. zadatka
-LabelTask=Oznaka zadatka
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Utrošeno vrijeme zadataka
 TaskTimeUser=Korisnik
 TaskTimeNote=Bilješka
diff --git a/htdocs/langs/hr_HR/stripe.lang b/htdocs/langs/hr_HR/stripe.lang
index 793a7ff86cd..b8d4e4275e8 100644
--- a/htdocs/langs/hr_HR/stripe.lang
+++ b/htdocs/langs/hr_HR/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Obrazac plaćanja
-WelcomeOnPaymentPage=Dobro došli na naš servis online plaćanja
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Ova stranica vam dozvoljava da vršite online plaćanje prema %s
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=Za završiti
 YourEMail=E-pošta za prijem potvrde uplate
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Kreditor
 PaymentCode=Kod plaćanja
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Sljedeće
 ToOfferALinkForOnlinePayment=URL za %s plaćanje
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=Ova stranica potvrđuje da je vaše plaćanje pohranjeno. Hvala Vam.
-YourPaymentHasNotBeenRecorded=Vaša uplata nije pohranjena i transakcija je otkazana. Hvala Vam.
 AccountParameter=Parametri računa
 UsageParameter=Parametri korištenja
 InformationToFindParameters=Pomoć za pronalaženje podataka o računu %s
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index e8779263aa3..9cf9587f97d 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 26f23a5ade8..fe1ebe17679 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 75d0d37870a..e2d3b2c9f99 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Keresést kiváltó karakterek száma: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Nem érhető el, ha az Ajax le van tiltva
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript letiltva
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Kikötő
 VirtualServerName=Virtuális szerver neve
 OS=OS
 PhpWebLink=Web-Php kapcsolat
-Browser=Böngésző
 Server=Szerver
 Database=Adatbázis
 DatabaseServer=Adatbázis-kiszolgáló
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Rendszer információk különféle műszaki információkat kapu
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=Ha aktiválni modulok, menjen a Setup Terület (Home-> Beállítások-> Modulok).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Számlák és jóváírási számozási modul
 BillsPDFModules=Számla dokumentumok modellek
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Jóváírást
-CreditNotes=Jóváírási
 ForceInvoiceDate=Kényszer számla keltétől annak érvényességét
 SuggestedPaymentModesIfNotDefinedInInvoice=Javasolt fizetési mód a számlát az alap, ha nincs meg a számla
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang
index 8740f8fb75a..6670da720f3 100644
--- a/htdocs/langs/hu_HU/agenda.lang
+++ b/htdocs/langs/hu_HU/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=%s szerződés jóváhagyva
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=A %s javaslat alárva
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index 814936a0b75..d3fbbcf468c 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Bank neve
 FinancialAccount=Fiók
 BankAccount=Bankszámla
 BankAccounts=Bankszámlák
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Számla fiók mutatása
 AccountRef=Pénzügyi mérleg ref
 AccountLabel=Pénzügyi mérleg címke
@@ -30,7 +30,7 @@ AllTime=Elejétől
 Reconciliation=Egyeztetés
 RIB=Bankszámla száma
 IBAN=IBAN szám
-BIC=BIC / SWIFT száma
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Nyilatkozat
 AccountStatements=Számlakivonatok
 LastAccountStatements=Utolsó számlakivonatok
 IOMonthlyReporting=Havi jelentés
-BankAccountDomiciliation=Számla-cím
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Számla országa
 BankAccountOwner=Számlatulajdonos neve
 BankAccountOwnerAddress=Számlatulajdonos címe
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Számla létrehozás
 NewBankAccount=Új számla fiók
 NewFinancialAccount=Új pénzügyi számla
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Vásárlói fizetés
-SupplierInvoicePayment=Beszállítói kifizetés
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Előfizetés kiegyenlítése
 WithdrawalPayment=Visszavont fizetés
 SocialContributionPayment=Szociális/költségvetési adó fizetés
 BankTransfer=Banki átutalás
 BankTransfers=Banki átutalások
 MenuBankInternalTransfer=Belső átutalás
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Feladó
 TransferTo=Címzett
 TransferFromToDone=A transzfer <b>%s</b> a <b>%s</b> a <b>%s</b> %s lett felvéve.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Visszalép a számlához
 ShowAllAccounts=Mutasd az összes fióknál
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Határozza meg az egyeztetéssel összefüggő bank kivonatot. Használjon egy rövidíthető szám értéket: ÉÉÉÉHH or ÉÉÉÉHHNN
 EventualyAddCategory=Végezetül, határozzon meg egy kategóriát, melybe beosztályozza a könyvelési belyegyzéseket
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Csekk visszatért és a számla újranyitott
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index b0e78c7810e..fbc72fd179a 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Visszafizetések
 DeletePayment=Fizetés törlése
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Fogadott befizetések
 ReceivedCustomersPayments=Vásárlóktól kapott befizetések
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Fizetés összege
-ValidatePayment=Jóváhagyott fizetés
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index ca2a35b09c0..a078c9fa3e9 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Történet
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index bdee78200db..eaf3b9459f5 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Új fizetési
-Payments=Kifizetések
 PaymentCustomerInvoice=Ügyfél számla fizetési
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Szociális/költségvetési adó fizetés
@@ -205,7 +204,6 @@ SellsJournal=Értékesítési Journal
 PurchasesJournal=Beszerzés lap
 DescSellsJournal=Értékesítési Journal
 DescPurchasesJournal=Vásárlások Journal
-InvoiceRef=Számla ref.
 CodeNotDef=Nem meghatározott
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=A fizetés határideje nem lehet korábbi a tárgy dátumánál
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index c67749b1e77..6819767dad9 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/hu_HU/holiday.lang b/htdocs/langs/hu_HU/holiday.lang
index 912b5fff747..de130afc8d4 100644
--- a/htdocs/langs/hu_HU/holiday.lang
+++ b/htdocs/langs/hu_HU/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 3883125cdb3..0f997f74480 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -371,6 +371,7 @@ Percentage=Százalék
 Total=Végösszeg
 SubTotal=Részösszeg
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Végösszeg (bruttó)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Megerősítő email küldése
 SendMail=E-mail küldése
 Email=E-mail
 NoEMail=Nincs email
-Email=E-mail
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=Nincs mobilszám
@@ -671,7 +671,6 @@ Method=Módszer
 Receive=Kap
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Várt érték
-CurrentValue=Jelenlegi Érték
 PartialWoman=Részleges
 TotalWoman=Összes
 NeverReceived=Soha nem került átvételre
@@ -834,6 +833,7 @@ RelatedObjects=Kapcsolódó objektumok
 ClassifyBilled=Minősítse kiszámlázottként
 ClassifyUnbilled=Classify unbilled
 Progress=Előrehaladás
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Támogató iroda
 View=View
@@ -842,6 +842,11 @@ Exports=Export
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export opciók
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Vegyes
 Calendar=Naptár
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Letöltés
 DownloadDocument=Download document
 ActualizeCurrency=Árfolyam frissítése
 Fiscalyear=Pénzügyi év
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Állítsa be a pénznemet
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index 5b4a25ce28c..eb88a606de1 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -6,7 +6,7 @@ Member=Tag
 Members=Tagok
 ShowMember=Mutasd tagja kártya
 UserNotLinkedToMember=A felhasználó nem kapcsolódik egy tagja
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Tagok Jegyek
 FundationMembers=Alapítvány tagjai
 ListOfValidatedPublicMembers=Hitelesített nyilvános tagok listája
@@ -67,11 +67,11 @@ Subscriptions=Előfizetések
 SubscriptionLate=Késő
 SubscriptionNotReceived=Előfizetés soha nem kapott
 ListOfSubscriptions=Előfizetések listája
-SendCardByMail=Elküldöm e-mailben
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=Nem tagja típust nem definiál. Lépjen be a Setup - Tagok típusok
 NewMemberType=Új tagtípus
-WelcomeEMail=Üdvözöljük az e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Előfizetés szükséges
 DeleteType=Törlés
 VoteAllowed=Szavazz megengedett
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd fájl
 ValidateMember=Érvényesítése tagja
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=A következő linkek vannak nyitva oldalakat nem védi semmilyen Dolibarr engedélyt. Ezek nem formázott oldal, feltéve, példaként megmutatni, hogy miképpen lista tagjai adatbázisban.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Nyilvános lista tagja
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Tartalma a kártya tagja
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Feladó e-mail címet automatikus e-maileket
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Oldal formátuma címkék
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Formátuma kártyák oldal
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generálása névjegykártyák minden tagja számára (a k
 DocForOneMemberCards=Generálása névjegykártyák egy adott tag (kimeneti formátum tulajdonképpen setup: <b>%s)</b>
 DocForLabels=Létrehoz cím lap (a kimeneti formátum tulajdonképpen setup: <b>%s)</b>
 SubscriptionPayment=Előfizetés kiegyenlítése
-LastSubscriptionDate=Utolsó feliratkozási dátum
-LastSubscriptionAmount=Utolsó feliratkozási mennyiség
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Tagok statisztikája ország
 MembersStatisticsByState=Tagok statisztikája állam / tartomány
 MembersStatisticsByTown=Tagok statisztikája város
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/hu_HU/modulebuilder.lang b/htdocs/langs/hu_HU/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/hu_HU/modulebuilder.lang
+++ b/htdocs/langs/hu_HU/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/hu_HU/paybox.lang b/htdocs/langs/hu_HU/paybox.lang
index 47e38007f7b..c2b43aef51b 100644
--- a/htdocs/langs/hu_HU/paybox.lang
+++ b/htdocs/langs/hu_HU/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Befejezni
 YourEMail=Email a fizetés teljesítéséről
 Creditor=Hitelező
 PaymentCode=Fizetési kód
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Esedékes  kiegyenlítés
 YouWillBeRedirectedOnPayBox=Át lesz irányítva egy biztonságos Paybox oldalra ahol megadhatja a bak/hitelkártya információit
 Continue=Következő
 ToOfferALinkForOnlinePayment=URL %s fizetés
-ToOfferALinkForOnlinePaymentOnOrder=URL egy %s online fizetési felhasználói csatolót ajánl egy vevői megrendeléshez
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL egy %s online fizetési felhasználói csatolót ajánl egy vevői számlához
 ToOfferALinkForOnlinePaymentOnContractLine=URL egy %s online fizetési felhasználói csatolót ajánl egy vevői tétel sorhoz
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL egy %s online fizetési felhasználói csatolót ajánl egy ingyenes összeghez
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL egy %s online fizetési felhasználói csatolót ajánl egy tag feliratkozáshoz
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Hozzáadhat URL paramétereket <b>&tag=<i>érték</i></b> bármely ilyen URL (csak az ingyenes fizetéshez szükséges) a saját fizetési megjegyzés címke hozzáadásához.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Ez az oldal megerősíti, hogy a fizetési lett felvéve. Köszönöm.
@@ -33,7 +33,8 @@ VendorName=Neve eladó
 CSSUrlForPaymentForm=CSS stíluslapot url fizetési forma
 NewPayboxPaymentReceived=Új Paybox fizetés érkezett
 NewPayboxPaymentFailed=Új Paybox fizetést próbált, de nem sikerült
-PAYBOX_PAYONLINE_SENDEMAIL=EMail figyelmeztetés a fizetés után (sikerül vagy nem sikerül)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Érték erre: PBX SITE
 PAYBOX_PBX_RANG=Érték erre: PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Érték erre: PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/hu_HU/paypal.lang b/htdocs/langs/hu_HU/paypal.lang
index 9adbf453002..7e4635bbd86 100644
--- a/htdocs/langs/hu_HU/paypal.lang
+++ b/htdocs/langs/hu_HU/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal modul beállítása
-PaypalDesc=Ez a modul ajánlat oldalakat, hogy fizetést <a href="http://www.paypal.com" target="_blank">PayPal</a> ügyfelek. Ezt fel lehet használni a szabad fizetés vagy a fizetés egy adott Dolibarr objektum (számla, megrendelés, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Fizetés Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Üzemmódban végzett vizsgálat / homokozó
 PAYPAL_API_USER=API felhasználónév
 PAYPAL_API_PASSWORD=API jelszó
 PAYPAL_API_SIGNATURE=API aláírás
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Ajánlat fizetés &quot;szerves&quot; (hitelkártya + Paypal) vagy a &quot;Paypal&quot; csak
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=Ez a tranzakció id: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add az url a Paypal fizetési amikor a dokumentumot postán
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 7450b1e5888..6c19140d4a9 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Globális változók
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Globális változók frissítése
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index e52edca3415..48790c31b7f 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Eltöltött idő
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Töltött idő
-RefTask=Feladat ref#
-LabelTask=Feladat cimkéje
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Felhasználó
 TaskTimeNote=Megjegyzés
diff --git a/htdocs/langs/hu_HU/stripe.lang b/htdocs/langs/hu_HU/stripe.lang
index f6ea6fe1f81..224c4a49612 100644
--- a/htdocs/langs/hu_HU/stripe.lang
+++ b/htdocs/langs/hu_HU/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Következő URL-ek elérhetők a vevő részére egy oldal felajánlásához a Dollibar objektumok kifizetéséhez
 PaymentForm=Fizetési ürlap
-WelcomeOnPaymentPage=Üdvözöljük az online fizetési oldalunkon
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Ez az oldal lehetővé teszi az online fizetést %s számára.
 ThisIsInformationOnPayment=Ez az információ a fizetendő tételről
 ToComplete=Befejezni
 YourEMail=Email a fizetés teljesítéséről
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Hitelező
 PaymentCode=Fizetési kód
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Következő
 ToOfferALinkForOnlinePayment=URL %s fizetés
-ToOfferALinkForOnlinePaymentOnOrder=URL egy %s online fizetési felhasználói csatolót ajánl egy vevői megrendeléshez
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL egy %s online fizetési felhasználói csatolót ajánl egy vevői számlához
 ToOfferALinkForOnlinePaymentOnContractLine=URL egy %s online fizetési felhasználói csatolót ajánl egy vevői tétel sorhoz
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL egy %s online fizetési felhasználói csatolót ajánl egy ingyenes összeghez
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL egy %s online fizetési felhasználói csatolót ajánl egy tag feliratkozáshoz
 YouCanAddTagOnUrl=Hozzáadhat URL paramétereket <b>&tag=<i>érték</i></b> bármely ilyen URL (csak az ingyenes fizetéshez szükséges) a saját fizetési megjegyzés címke hozzáadásához.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=Ez az oldal megerősíti, hogy a fizetési lett felvéve. Köszönöm.
-YourPaymentHasNotBeenRecorded=Ön fizetést nem került rögzítésre és az ügylet törlésre került. Köszönöm.
 AccountParameter=Számla paraméterek
 UsageParameter=Használat paraméterek
 InformationToFindParameters=Segíts, hogy megtaláld a %s fiókadatokat
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 590a5757dac..46887e0bb84 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index df59147cf36..eefd889636f 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Saldo akun
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label Akun
 LabelOperation=Label operation
 Sens=Sen
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Jurnal
 JournalLabel=Journal label
 NumPiece=Jumlah potongan
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=Pilihan
 OptionModeProductSell=Mode penjualan
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode pembelian
 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
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 299fd987cb1..01798b5135a 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr karakter untuk memicu pencarian:% s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Tidak tersedia ketika Ajax dinonaktifkan
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript dinonaktifkan
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server name
 OS=Sistem Operasi
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Basis Data
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Catatan kredit
-CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Kode Pos
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang
index fccd62cb180..f4dbbf7a5bd 100644
--- a/htdocs/langs/id_ID/agenda.lang
+++ b/htdocs/langs/id_ID/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Acara yang Dolibarr akan membuat tindakan dalam agenda otomatis
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index 3b81a4074df..1f78da4c52d 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Bank name
 FinancialAccount=Akun
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-BIC=BIC/SWIFT number
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Statement
 AccountStatements=Account statements
 LastAccountStatements=Last account statements
 IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Pembayaran suplier
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Dari
 TransferTo=Kepada
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 70ea67882db..c2123564da9 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Dibayar kembali
 DeletePayment=Hapus pembayaran
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Semua pembayaran yang diterima
 ReceivedCustomersPayments=Semua pembayaran yang diterima dari semua pelanggan
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Jumlah pembayaran
-ValidatePayment=Validasi pembayaran
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/id_ID/cashdesk.lang b/htdocs/langs/id_ID/cashdesk.lang
index 8b99e5e374d..bed57965e41 100644
--- a/htdocs/langs/id_ID/cashdesk.lang
+++ b/htdocs/langs/id_ID/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Riwayat
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 5d59221bd0d..3d90d47b69e 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=New payment
-Payments=Semua pembayaran
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 68db165215d..b5a9d70cb70 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/id_ID/holiday.lang b/htdocs/langs/id_ID/holiday.lang
index febebfc95e0..09ab5060081 100644
--- a/htdocs/langs/id_ID/holiday.lang
+++ b/htdocs/langs/id_ID/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 7571b652f60..9a83f1a851e 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
 Email=Email
 NoEMail=No email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Ekspor
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Opsi Ekspor
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Kalender
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index 725fed92e62..509f7c9bb14 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=Anggota
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=Late
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/id_ID/modulebuilder.lang b/htdocs/langs/id_ID/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/id_ID/modulebuilder.lang
+++ b/htdocs/langs/id_ID/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/id_ID/paybox.lang b/htdocs/langs/id_ID/paybox.lang
index 2b333fd2181..d30a9619fe8 100644
--- a/htdocs/langs/id_ID/paybox.lang
+++ b/htdocs/langs/id_ID/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Lakukan pembayaran
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/id_ID/paypal.lang b/htdocs/langs/id_ID/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/id_ID/paypal.lang
+++ b/htdocs/langs/id_ID/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 6891045b235..74e7fff9faf 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 5dd55342fc7..f9c3cda6dfb 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
diff --git a/htdocs/langs/id_ID/stripe.lang b/htdocs/langs/id_ID/stripe.lang
index 6fa072b4c9a..7a3389f34b7 100644
--- a/htdocs/langs/id_ID/stripe.lang
+++ b/htdocs/langs/id_ID/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditor
 PaymentCode=Payment code
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index f416ebbc84a..b4d894f55d7 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index 17456a0c7a6..328eb1f21e7 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 41672e41896..2d3bc7d8260 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=NBR af stöfum til að kalla fram leit: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Ekki í boði þegar Ajax fatlaðra
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript fatlaðra
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Raunverulegur framreiðslumaður nafn
 OS=OS
 PhpWebLink=Web-Php hlekkur
-Browser=Browser
 Server=Server
 Database=Gagnasafn
 DatabaseServer=Gagnasafn gestgjafi
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Kerfi upplýsingar er ýmis tæknilegar upplýsingar sem þú fæ
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=Til að virkja mát, fara á svæðinu skipulag (Home-> Uppsetning-> mát).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Reikninga og lána athugasemdir tala mát
 BillsPDFModules=Invoice skjöl módel
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Credit athugið
-CreditNotes=Credit athugasemdir
 ForceInvoiceDate=Force dagsetningu reiknings staðfestingu dagsetningu
 SuggestedPaymentModesIfNotDefinedInInvoice=Leiðbeinandi greiðslur háttur á reikning við vanræksla ef ekki er skilgreind fyrir reikning
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang
index b6928b2fa70..e6c88b3fecd 100644
--- a/htdocs/langs/is_IS/agenda.lang
+++ b/htdocs/langs/is_IS/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Viðburðir sem Dolibarr vilja búa til aðgerða á dagskrá sjá
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index b1a53b40503..d89bb9d4f26 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Nafn banka
 FinancialAccount=Reikningur
 BankAccount=Bankanúmer
 BankAccounts=Bankareikningar
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial reikning dómari
 AccountLabel=Financial reikning merki
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Sættir
 RIB=Bankareikningur Fjöldi
 IBAN=IBAN númer
-BIC=BIC / SWIFT númer
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Yfirlýsing
 AccountStatements=Reikningur yfirlýsingar
 LastAccountStatements=Síðasta yfirlýsingar
 IOMonthlyReporting=Mánaðarleg skýrsla
-BankAccountDomiciliation=Reikningur heimilisfang
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Reikningur landi
 BankAccountOwner=Eigandi reiknings Nafn
 BankAccountOwnerAddress=Eigandi reiknings Heimilisfang
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Búa til reikning
 NewBankAccount=Nýr reikningur
 NewFinancialAccount=New fjármagnsjöfnuði
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Viðskiptavinur greiðslu
-SupplierInvoicePayment=Birgir greiðslu
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Áskrift greiðslu
 WithdrawalPayment=Afturköllun greiðslu
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Millifærslu
 BankTransfers=Millifærslur
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Frá
 TransferTo=Til að
 TransferFromToDone=A flytja <b>úr %s  í %s  af %s %</b> s hefur verið skráð.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Til baka á reikning
 ShowAllAccounts=Sýna allra reikninga
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index bc73cf79f49..cb0b6d34674 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Eyða greiðslu
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Móttekin greiðslur
 ReceivedCustomersPayments=Greiðslur sem berast frá viðskiptavinum
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Upphæð greiðslu
-ValidatePayment=Validate payment
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/is_IS/cashdesk.lang b/htdocs/langs/is_IS/cashdesk.lang
index 6f1d7a194ad..88a37f77ca0 100644
--- a/htdocs/langs/is_IS/cashdesk.lang
+++ b/htdocs/langs/is_IS/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Saga
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index 3e2aeac5352..7457360c85e 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Ný greiðsla
-Payments=Greiðslur
 PaymentCustomerInvoice=Viðskiptavinur Reikningar greiðslu
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sala Journal
 PurchasesJournal=Kaup Journal
 DescSellsJournal=Sala Journal
 DescPurchasesJournal=Kaup Journal
-InvoiceRef=Invoice tilv.
 CodeNotDef=Ekki skilgreint
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index f28b6029e7b..0f5966e525c 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/is_IS/holiday.lang b/htdocs/langs/is_IS/holiday.lang
index 2f77fbcbe16..f829aa14ff5 100644
--- a/htdocs/langs/is_IS/holiday.lang
+++ b/htdocs/langs/is_IS/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index f94830f8a90..14b355fae1d 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -371,6 +371,7 @@ Percentage=Prósenta
 Total=Samtals
 SubTotal=Millisamtala
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Samtals (Inc skatt)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Senda tölvupóst
 Email=Email
 NoEMail=No email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Aðferð
 Receive=Fá
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Núverandi gildi
 PartialWoman=Partial
 TotalWoman=Samtals
 NeverReceived=Aldrei fengið
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Flokka billed
 ClassifyUnbilled=Classify unbilled
 Progress=Framfarir
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Til baka skrifstofa
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Ýmislegt
 Calendar=Calendar
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index 34ec456bd69..22b88908648 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -6,7 +6,7 @@ Member=Aðildarríkin
 Members=Meðlimir
 ShowMember=Sýna meðlimur kort
 UserNotLinkedToMember=Notandi tengist ekki meðlimur
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Miðasala
 FundationMembers=Stofnun meðlimir
 ListOfValidatedPublicMembers=Listi yfir viðurkennd opinber meðlimir
@@ -67,11 +67,11 @@ Subscriptions=Áskriftir
 SubscriptionLate=Seint
 SubscriptionNotReceived=Áskrift fékk aldrei
 ListOfSubscriptions=Listi yfir áskriftir
-SendCardByMail=Senda kort
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=Enginn tegundir skilgreindar. Fara til skipulag - Members tegundir
 NewMemberType=Nýr meðlimur tegund
-WelcomeEMail=Velkomin í tölvupósti
+WelcomeEMail=Welcome email
 SubscriptionRequired=Áskrift krafist
 DeleteType=Eyða
 VoteAllowed=Vote leyfðar
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd skrá
 ValidateMember=Staðfesta meðlimur
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=Eftirfarandi tenglar eru opin síður ekki vernda með öllum Dolibarr leyfi. Þau eru ekki snið síður, enda eins og fordæmi til að sýna hvernig á lista meðlimir gagnagrunninum.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Almenn listann yfir meðlimi
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Efni meðlimur kortið
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sendandi Email fyrir sjálfvirka tölvupósti
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Snið af merki síðu
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Snið af kortum síðu
@@ -156,8 +156,8 @@ DocForAllMembersCards=Búa til nafnspjöld fyrir alla meðlimi (Format fyrir fra
 DocForOneMemberCards=Búa til nafnspjöld fyrir tiltekinn aðili (Format fyrir framleiðsla raunverulega skipulag: <b>%s)</b>
 DocForLabels=Mynda lak heimilisfang (Format fyrir framleiðsla raunverulega skipulag: <b>%s)</b>
 SubscriptionPayment=Áskrift greiðslu
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Notendur tölfræði eftir landi
 MembersStatisticsByState=Notendur tölfræði eftir fylki / hérað
 MembersStatisticsByTown=Notendur tölfræði eftir bænum
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/is_IS/modulebuilder.lang b/htdocs/langs/is_IS/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/is_IS/modulebuilder.lang
+++ b/htdocs/langs/is_IS/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/is_IS/paybox.lang b/htdocs/langs/is_IS/paybox.lang
index 564c87257c8..c474ab5fcd4 100644
--- a/htdocs/langs/is_IS/paybox.lang
+++ b/htdocs/langs/is_IS/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Til að ljúka
 YourEMail=Netfang til staðfestingar greiðslu
 Creditor=Lánveitandi
 PaymentCode=Greiðsla kóða
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Ekki greiðslu
 YouWillBeRedirectedOnPayBox=Þú verður vísað á að tryggja Paybox síðu til inntak þú upplýsingar um greiðslukort
 Continue=Næsti
 ToOfferALinkForOnlinePayment=Slóð fyrir %s greiðslu
-ToOfferALinkForOnlinePaymentOnOrder=URL að bjóða upp á %s inni greiðslu notandi tengi fyrir röð
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL að bjóða upp á %s inni greiðslu notandi tengi fyrir reikning
 ToOfferALinkForOnlinePaymentOnContractLine=URL að bjóða upp á %s inni greiðslu notandi tengi fyrir samning línu
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL að bjóða upp á %s inni greiðslu notandi tengi fyrir ókeypis upphæð
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL að bjóða upp á %s inni greiðslu notandi tengi fyrir aðild áskrift
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Þú getur einnig bætt við url stika <b>& tag = <i>gildi</i></b> til allir af þessir URL (einungis fyrir frjáls greiðslu) til að bæta tag þína eigin greiðslu athugasemd.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Þessi síða staðfestir að greiðsla hefur verið skráð. Þakka þér.
@@ -33,7 +33,8 @@ VendorName=Nafn seljanda
 CSSUrlForPaymentForm=CSS stíll lak url fyrir formi greiðslu
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/is_IS/paypal.lang b/htdocs/langs/is_IS/paypal.lang
index c6158fd6c29..5a8ef303160 100644
--- a/htdocs/langs/is_IS/paypal.lang
+++ b/htdocs/langs/is_IS/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal mát skipulag
-PaypalDesc=Þessi eining bjóða síður að leyfa greiðslu á <a href="http://www.paypal.com" target="_blank">PayPal</a> við viðskiptavini. Þetta er hægt að nota fyrir a frjáls greiðslu eða greiðslu á tilteknu Dolibarr hlut (Reikningar, til þess, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Borga með Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Ham próf / sandkassi
 PAYPAL_API_USER=API notandanafn
 PAYPAL_API_PASSWORD=API lykilorð
 PAYPAL_API_SIGNATURE=API undirskrift
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Tilboð greiðslu &quot;órjúfanlegur&quot; (Kreditkort + Paypal) eða &quot;Paypal&quot; aðeins
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=Þetta er id viðskipta: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Bæta við slóð Paypal greiðslu þegar þú sendir skjal með pósti
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index d22e1ccf394..960b9f12451 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 22a7aee62ad..34928a0a0c9 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Tíma sem fer
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Tími
-RefTask=Tilv. verkefni
-LabelTask=Merki verkefni
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Notandi
 TaskTimeNote=Ath
diff --git a/htdocs/langs/is_IS/stripe.lang b/htdocs/langs/is_IS/stripe.lang
index e5cf4d02933..434ccddb77c 100644
--- a/htdocs/langs/is_IS/stripe.lang
+++ b/htdocs/langs/is_IS/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Eftirfarandi vefslóðir eru að bjóða upp síðu til viðskiptavina til að framkvæma greiðslu á Dolibarr mótmæla
 PaymentForm=Greiðsla mynd
-WelcomeOnPaymentPage=Velkomin á netinu greiðsluþjónustu okkar
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Þessi skjár leyfa þér að gera á netinu greiðslu til %s.
 ThisIsInformationOnPayment=Þetta eru upplýsingar um greiðslu að gera
 ToComplete=Til að ljúka
 YourEMail=Netfang til staðfestingar greiðslu
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Lánveitandi
 PaymentCode=Greiðsla kóða
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Næsti
 ToOfferALinkForOnlinePayment=Slóð fyrir %s greiðslu
-ToOfferALinkForOnlinePaymentOnOrder=URL að bjóða upp á %s inni greiðslu notandi tengi fyrir röð
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL að bjóða upp á %s inni greiðslu notandi tengi fyrir reikning
 ToOfferALinkForOnlinePaymentOnContractLine=URL að bjóða upp á %s inni greiðslu notandi tengi fyrir samning línu
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL að bjóða upp á %s inni greiðslu notandi tengi fyrir ókeypis upphæð
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL að bjóða upp á %s inni greiðslu notandi tengi fyrir aðild áskrift
 YouCanAddTagOnUrl=Þú getur einnig bætt við url stika <b>& tag = <i>gildi</i></b> til allir af þessir URL (einungis fyrir frjáls greiðslu) til að bæta tag þína eigin greiðslu athugasemd.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=Þessi síða staðfestir að greiðsla hefur verið skráð. Þakka þér.
-YourPaymentHasNotBeenRecorded=Þú greiðsla hefur ekki verið skráð og viðskipti hefur verið aflýst. Þakka þér.
 AccountParameter=Skráningin breytur
 UsageParameter=Notkun breytur
 InformationToFindParameters=Hjálp til að finna %s upplýsingar reiknings þíns
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index f2788ba6335..0a95039abff 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index afd72acf1b1..58380fbc5a1 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Associa nota spese
 CreateMvts=Crea nuova transazione
 UpdateMvts=Modifica una transazione
 ValidTransaction=Valida transazione
-WriteBookKeeping=Scrivi le transazioni dei giornali nel libro contabile
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Libro contabile
 AccountBalance=Saldo
 ObjectsRef=Sorgente oggetto in riferimento
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account di contabilità predefinito per i prodotti acquistati (se non definito nella scheda prodotto)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Account di contabilità predefinito per i prodotti venduti (se non definito nella scheda prodotto)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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=Account di contabilità predefinito per i servizi acquistati (se non definito nella scheda servizio)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Account di contabilità predefinito per i servizi venduti (se non definito nella scheda servizio)
 
@@ -177,6 +177,7 @@ LabelAccount=Etichetta account
 LabelOperation=Etichetta operazione
 Sens=Verso
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Giornale
 JournalLabel=Journal label
 NumPiece=Numero del pezzo
@@ -268,7 +269,7 @@ AccountingJournalType2=Vendite
 AccountingJournalType3=Acquisti
 AccountingJournalType4=Banca
 AccountingJournalType5=Expenses report
-AccountingJournalType8=Inventory
+AccountingJournalType8=Inventario
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=Questo giornale è già in uso
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Id Piano dei Conti
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=Opzioni
 OptionModeProductSell=Modalità vendita
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Modalità acquisto
 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=Resetta tutti i collegamenti per l'anno corrente
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 7a5b796c256..5d82e047d07 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -27,19 +27,19 @@ AvailableOnlyOnPackagedVersions=Il file locale per la verifica d'integrità è d
 XmlNotFound=File xml di controllo integrità non trovato
 SessionId=ID di sessione
 SessionSaveHandler=Handler per il salvataggio dell sessioni
-SessionSavePath=Session save location
+SessionSavePath=Percorso dove salvare le sessioni
 PurgeSessions=Pulizia delle sessioni
 ConfirmPurgeSessions=Vuoi davvero eliminare tutte le sessioni? Questo causerà la disconnessione di tutti gli utenti (tranne te).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
-LockNewSessions=Bloccare le nuove connessioni
+NoSessionListWithThisHandler=Il gestore delle sessioni configurato nel PHP non consente di elencare tutte le sessioni attive.
+LockNewSessions=Blocca le nuove connessioni
 ConfirmLockNewSessions=Sei sicuro di voler restringere qualsiasi connessione a Dolibarr a te stesso? Solo l'utente <b>%s</b>riuscirà a connettersi successivamente.
-UnlockNewSessions=Rimuovere il blocco di connessione
+UnlockNewSessions=Rimuovi il blocco connessioni
 YourSession=La tua sessione
 Sessions=Sessioni utente
 WebUserGroup=Utente/gruppo del server web (per esempio www-data)
 NoSessionFound=La tua configurazione PHP sembra non permetta di mostrare le sessioni attive. La directory utilizzata per salvare le sessioni (<b>%s</b>) potrebbe non essere protetta (per esempio tramite permessi SO oppure dalla direttiva PHP open_basedir).
 DBStoringCharset=Charset per il salvataggio dei dati nel database
-DBSortingCharset=Charset per l'rodinamento dei dati nel database
+DBSortingCharset=Set di caratteri del database per ordinare i dati
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Il modulo <b> %s </b> deve essere attivato
@@ -71,12 +71,14 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=N ° di caratteri per attivare ricerca: %s
+NumberOfKeyToSearch=Numero di caratteri per attivare la ricerca: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Non disponibile quando Ajax è disabilitato
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disattivato
-UsePreviewTabs=Utilizzare le schede anteprima
-ShowPreview=Visualizza anteprima
+UsePreviewTabs=Utilizza i tabs per l'anteprima
+ShowPreview=Vedi anteprima
 PreviewNotAvailable=Anteprima non disponibile
 ThemeCurrentlyActive=Tema attualmente attivo
 CurrentTimeZone=Fuso orario attuale
@@ -87,14 +89,14 @@ Table=Tabella
 Fields=Campi
 Index=Indice
 Mask=Maschera
-NextValue=Prossimo valore
-NextValueForInvoices=Prossimo valore (fatture)
-NextValueForCreditNotes=Prossimo valore (note di credito)
+NextValue=Valore successivo
+NextValueForInvoices=Valore successivo (fatture)
+NextValueForCreditNotes=Valore successivo (note di credito)
 NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Valore successivo (sostituzioni)
 MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
-NoMaxSizeByPHPLimit=Nota: Non è stato fissato nessun limite massimo nella configurazione del PHP
-MaxSizeForUploadedFiles=Dimensione massima dei file caricati (0 per disabilitare qualsiasi upload)
+NoMaxSizeByPHPLimit=Nota: nessun limite impostato nella configurazione PHP
+MaxSizeForUploadedFiles=Dimensione massima dei file caricati (0 per disabilitare l'upload)
 UseCaptchaCode=Utilizzare verifica captcha nella pagina di login
 AntiVirusCommand= Percorso completo programma antivirus
 AntiVirusCommandExample= Esempio per ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe <br> Esempio per ClamAV: / usr/bin/clamscan
@@ -143,7 +145,7 @@ Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
 System=Sistema
 SystemInfo=Informazioni di sistema
 SystemToolsArea=Sezione strumenti di gestione del sistema
-SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+SystemToolsAreaDesc=Questa area fornisce funzioni di amministrazione. Usa il menu per scegliere la funzione richiesta.
 Purge=Pulizia
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Eliminia il file log, compreso <b>%s</b> definito per il modulo Syslog (nessun rischio di perdita di dati)
@@ -162,7 +164,7 @@ Restore=Ripristino
 RunCommandSummary=Il backup verrà realizzato secondo il seguente comando
 BackupResult=Risultato del backup
 BackupFileSuccessfullyCreated=File di backup generati con successo
-YouCanDownloadBackupFile=The generated file can now be downloaded
+YouCanDownloadBackupFile=Adesso il file generato può essere scaricato
 NoBackupFileAvailable=Nessun file di backup disponibile
 ExportMethod=Metodo di esportazione
 ImportMethod=Metodo di importazione
@@ -249,7 +251,7 @@ SocialNetworks=Social Networks
 ForDocumentationSeeWiki=La documentazione per utenti e sviluppatori e le FAQ sono disponibili sul wiki di Dolibarr: <br/>Dai un'occhiata a <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Per qualsiasi altro problema/domanda, si può utilizzare il forum di Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
-HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
+HelpCenterDesc2=Alcune di queste risorse sono disponibili solo in <b>inglese</b> .
 CurrentMenuHandler=Attuale gestore menu
 MeasuringUnit=Unità di misura
 LeftMargin=Margine sinistro
@@ -264,30 +266,30 @@ NoticePeriod=Periodo di avviso
 NewByMonth=New by month
 Emails=Email
 EMailsSetup=Impostazioni Email
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=Questa pagina consente di sovrascrivere i parametri PHP predefiniti per l'invio delle email. Nella maggior parte dei casi, su sistemi Unix / Linux, l'installazione di PHP è corretta e non è necessario modificare questi parametri.
 EmailSenderProfiles=Profili mittente email
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
-MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
+MAIN_MAIL_SMTP_PORT=Porta SMTP / SMTPS (predefinito in php.ini: <b>%s</b> )
+MAIN_MAIL_SMTP_SERVER=Host SMTP / SMTPS (predefinito in php.ini: <b>%s</b> )
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta SMTP / SMTPS (non definita in PHP su sistemi Unix-like)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Host SMTP / SMTPS (non definito in PHP su sistemi Unix-like)
+MAIN_MAIL_EMAIL_FROM=Indirizzo mittente per le email automatiche (predefinito in php.ini: <b>%s</b> )
+MAIN_MAIL_ERRORS_TO=Indirizzo a cui inviare eventuali errori (campi 'Errors-To' nelle email inviate)
+MAIN_MAIL_AUTOCOPY_TO= Indirizzo a cui inviare in copia Ccn tutte le mail in uscita
+MAIN_DISABLE_ALL_MAILS=Disabilita l'invio delle email (a scopo di test o demo)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employee users with email into allowed recipient list
-MAIN_MAIL_SENDMODE=Email sending method
-MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
-MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
-MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
+MAIN_MAIL_SENDMODE=Metodo di invio email
+MAIN_MAIL_SMTPS_ID=Username SMTP (se il server richiede l'autenticazione)
+MAIN_MAIL_SMTPS_PW=Password SMTP (se il server richiede l'autenticazione)
+MAIN_MAIL_EMAIL_TLS=Usa la cifratura TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
 MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
-MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
+MAIN_DISABLE_ALL_SMS=Disabilita l'invio di SMS (a scopo di test o demo)
 MAIN_SMS_SENDMODE=Metodo da utilizzare per inviare SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
+MAIN_MAIL_SMS_FROM=Numero predefinito del mittente per gli SMS
 MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
 UserEmail=Email utente
 CompanyEmail=Company Email
@@ -312,7 +314,7 @@ ModuleFamilyInterface=Interfacce con sistemi esterni
 MenuHandlers=Gestori menu
 MenuAdmin=Editor menu
 DoNotUseInProduction=Da non usare in produzione
-ThisIsProcessToFollow=Upgrade procedure:
+ThisIsProcessToFollow=Procedura di aggiornamento:
 ThisIsAlternativeProcessToFollow=Questa è una impostazione manuale alternativa:
 StepNb=Passo %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
@@ -468,8 +470,9 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
-EnableOverwriteTranslation=Enable usage of overwritten translation
+EnableOverwriteTranslation=Abilita queste traduzioni personalizzate
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
 WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
 Field=Campo
@@ -495,7 +498,7 @@ Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commerciale
 Module2Desc=Gestione commerciale
 Module10Name=Accounting (simplified)
-Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module10Desc=Resoconti contabili semplici (spese, ricavi) basati sul contenuto del database. Non usa tabelle di contabilità generale.
 Module20Name=Proposte
 Module20Desc=Gestione proposte commerciali
 Module22Name=Mass Emailings
@@ -691,7 +694,7 @@ Permission91=Read social or fiscal taxes and vat
 Permission92=Create/modify social or fiscal taxes and vat
 Permission93=Delete social or fiscal taxes and vat
 Permission94=Export social or fiscal taxes
-Permission95=Vedere report
+Permission95=Vedi resoconti
 Permission101=Vedere invii
 Permission102=Creare/modificare spedizioni
 Permission104=Convalidare spedizioni
@@ -922,7 +925,7 @@ DictionaryAccountancysystem=Modelli per piano dei conti
 DictionaryAccountancyJournal=Libri contabili
 DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Unità
-DictionaryMeasuringUnits=Measuring Units
+DictionaryMeasuringUnits=Unità di misura
 DictionaryProspectStatus=Stato cliente potenziale
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
@@ -989,7 +992,6 @@ Port=Porta
 VirtualServerName=Nome del server virtuale
 OS=SO
 PhpWebLink=Web Php-link
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Database server
@@ -1017,7 +1019,7 @@ MessageLogin=Messaggio per la pagina di login
 LoginPage=Pagina di login
 BackgroundImageLogin=Immagine di sfondo
 PermanentLeftSearchForm=Modulo di ricerca permanente nel menu di sinistra
-DefaultLanguage=Default language
+DefaultLanguage=Lingua predefinita (codice lingua)
 EnableMultilangInterface=Enable multilanguage support
 EnableShowLogo=Abilita la visualizzazione del logo
 CompanyInfo=Società/Organizzazione
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Le informazioni di sistema sono dati tecnici visibili in sola let
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Moduli disponibili
 ToActivateModule=Per attivare i moduli, andare nell'area <b>Impostazioni</b> (Home->Impostazioni->Moduli).
@@ -1165,12 +1167,12 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configurazione della traduzione
 TranslationKeySearch=Cerca una chiave o una stringa di testo
 TranslationOverwriteKey=Sovrascrivi una stringa di testo
-TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
+TranslationDesc=Puoi scegliere la lingua utilizzata dal sistema in 2 modi:<br>- Predefinito per tutto il sito da <b>Home > Impostazioni > Aspetto grafico e lingua</b><br>- Per utente da <b>< nomeutente ></b> (icona in alto a dx) <b>> Impostazioni interfaccia grafica</b>.
 TranslationOverwriteDesc=Puoi anche effettuare l'override delle stringhe di testo utilizzando la tabella seguente. Seleziona la tua lingua nel box "%s", inserisci la chiave della stringa da tradurre nel campo "%s" e la tua traduzione nel campo "%s".
-TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
+TranslationOverwriteDesc2=Puoi usare il tab di ricerca per ottenere la chiave di traduzione da usare
 TranslationString=Stringa di testo
 CurrentTranslationString=Stringa di testo corrente
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+WarningAtLeastKeyOrTranslationRequired=È necessario almeno un criterio di ricerca tra: chiave di traduzione e stringa di testo
 NewTranslationStringToShow=Nuova stringa di testo da utilizzare
 OriginalValueWas=La traduzione originale è stata sovrascritta. Il testo originale era:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Numerazione modulo fatture e note di credito
 BillsPDFModules=Modelli fattura in pdf
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Nota di credito
-CreditNotes=Note di credito
 ForceInvoiceDate=Forza la data della fattura alla data di convalida
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggerire le modalità predefinite di pagamento delle fatture, se non definite già nella fattura
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=CAP
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index 925fd36d199..68244ef0ba7 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Eventi per i quali creare un'azione
 EventRemindersByEmailNotEnabled=I promemoria degli eventi via e-mail non sono stati abilitati nell'impostazione del modulo %s. 
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Soggetto terzo %s creato
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contratto %s convalidato
 CONTRACT_DELETEInDolibarr=Contratto %s cancellato
 PropalClosedSignedInDolibarr=Proposta %s firmata
@@ -70,10 +71,10 @@ OrderBilledInDolibarr=Ordine %s classificato fatturato
 OrderApprovedInDolibarr=Ordine %s approvato
 OrderRefusedInDolibarr=Ordine %s rifiutato
 OrderBackToDraftInDolibarr=Ordine %s riportato allo stato di bozza
-ProposalSentByEMail=Commercial proposal %s sent by email
-ContractSentByEMail=Contract %s sent by email
+ProposalSentByEMail=Proposta commerciale %s inviata via email
+ContractSentByEMail=Contratto %s inviato via email
 OrderSentByEMail=Sales order %s sent by email
-InvoiceSentByEMail=Customer invoice %s sent by email
+InvoiceSentByEMail=Fattura cliente %s inviata via email
 SupplierOrderSentByEMail=Purchase order %s sent by email
 SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
 ShippingSentByEMail=Shipment %s sent by email
@@ -93,10 +94,11 @@ EXPENSE_REPORT_REFUSEDInDolibarr=Nota spese %s rifiutata
 PROJECT_CREATEInDolibarr=Progetto %s creato
 PROJECT_MODIFYInDolibarr=Progetto %s modificato
 PROJECT_DELETEInDolibarr=Progetto %s cancellato
-TICKET_CREATEInDolibarr=Ticket %s created
-TICKET_MODIFYInDolibarr=Ticket %s modified
-TICKET_CLOSEInDolibarr=Ticket %s closed
-TICKET_DELETEInDolibarr=Ticket %s deleted
+TICKET_CREATEInDolibarr=Ticket %s creato
+TICKET_MODIFYInDolibarr=Ticket %s modificato
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
+TICKET_CLOSEInDolibarr=Ticket %s chiuso
+TICKET_DELETEInDolibarr=Ticket %s eliminato
 ##### End agenda events #####
 AgendaModelModule=Modelli di documento per eventi
 DateActionStart=Data di inizio
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 589f7688804..b0e55d658a0 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banca
-MenuBankCash=Banca | Cassa
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Pagamenti vari
 MenuNewVariousPayment=Nuovo pagamento vario
 BankName=Nome della Banca
 FinancialAccount=Conto
 BankAccount=Conto bancario
 BankAccounts=Conti bancari
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Conti bancari | Gateways
 ShowAccount=Mostra conto
 AccountRef=Rif. conto
 AccountLabel=Etichetta conto
@@ -30,7 +30,7 @@ AllTime=Dall'inizio
 Reconciliation=Riconciliazione
 RIB=Coordinate bancarie
 IBAN=Codice IBAN
-BIC=Codice BIC (Swift)
+BIC=BIC/SWIFT code
 SwiftValid=Il codice BIC/SWIFT è valido
 SwiftVNotalid=BIC/SWIFT non valido
 IbanValid=Il codice IBAN è valido
@@ -42,11 +42,11 @@ AccountStatementShort=Est. conto
 AccountStatements=Estratti conto
 LastAccountStatements=Ultimi estratti conto
 IOMonthlyReporting=Report mensile
-BankAccountDomiciliation=Domiciliazione del conto
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Paese del conto
 BankAccountOwner=Nome titolare
 BankAccountOwnerAddress=Indirizzo titolare
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Crea conto
 NewBankAccount=Nuovo conto
 NewFinancialAccount=Nuovo conto finanziario
@@ -105,7 +105,7 @@ SocialContributionPayment=Pagamento delle imposte sociali/fiscali
 BankTransfer=Bonifico bancario
 BankTransfers=Bonifici e giroconti
 MenuBankInternalTransfer=Trasferimento interno
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Da
 TransferTo=A
 TransferFromToDone=È stato registrato un trasferimento da <b> %s </b> a <b> %s </b> di <b> %s </b> %s.
@@ -117,7 +117,7 @@ ConfirmDeleteCheckReceipt=Vuoi davvero eliminare questa ricevuta?
 BankChecks=Assegni bancari
 BankChecksToReceipt=Assegni in attesa di deposito
 ShowCheckReceipt=Mostra ricevuta di versamento assegni
-NumberOfCheques=No. of check
+NumberOfCheques=Numero di assegni
 DeleteTransaction=Elimina transazione
 ConfirmDeleteTransaction=Vuoi davvero eliminare questa transazione?
 ThisWillAlsoDeleteBankRecord=Questa operazione elimina anche le transazioni bancarie generate
@@ -136,8 +136,8 @@ BankTransactionLine=Transazione bancaria
 AllAccounts=Tutte le banche e le casse
 BackToAccount=Torna al conto
 ShowAllAccounts=Mostra per tutti gli account
-FutureTransaction=Transaction in future. No way to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+FutureTransaction=Future transaction. Unable to reconcile.
+SelectChequeTransactionAndGenerate=Seleziona gli assegni dar includere nella ricevuta di versamento e clicca su "Crea".
 InputReceiptNumber=Scegliere l'estratto conto collegato alla conciliazione. Utilizzare un valore numerico ordinabile: AAAAMM o AAAAMMGG
 EventualyAddCategory=Infine, specificare una categoria in cui classificare i record
 ToConciliate=Da conciliare?
@@ -154,14 +154,16 @@ RejectCheckDate=Data di restituzione dell'assegno
 CheckRejected=Assegno restituito
 CheckRejectedAndInvoicesReopened=Assegno restituito e fatture riaperte
 BankAccountModelModule=Modelli di documento per i conti bancari e le casse
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
+DocumentModelSepaMandate=Modello di documento per i mandati SEPA. Da utilizzare solamente per i paese appartenenti alla CEE
 DocumentModelBan=Template per la stampa delle informazioni relative al BAN
-NewVariousPayment=Nuovi pagamenti vari
-VariousPayment=Pagamenti vari
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Pagamenti vari
-ShowVariousPayment=Mostra pagamenti vari
-AddVariousPayment=Aggiungi pagamenti vari
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=Mandato SEPA
 YourSEPAMandate=I tuoi mandati SEPA
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+FindYourSEPAMandate=Questo è il tuo mandato SEPA che autorizza la nostra azienda ad effettuare un ordine di addebito diretto alla tua banca. Da restituire firmata (scansione del documento firmato) o inviato all'indirizzo email 
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 899214818d1..71887c0b194 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -53,9 +53,9 @@ InvoiceLine=Riga fattura
 InvoiceCustomer=Fattura attiva
 CustomerInvoice=Fattura attive
 CustomersInvoices=Fatture attive
-SupplierInvoice=Vendor invoice
+SupplierInvoice=Fattura fornitore
 SuppliersInvoices=Vendors invoices
-SupplierBill=Vendor invoice
+SupplierBill=Fattura fornitore
 SupplierBills=Fatture passive
 Payment=Pagamento
 PaymentBack=Rimborso
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=nella valuta delle fatture
 PaidBack=Rimborsato
 DeletePayment=Elimina pagamento
 ConfirmDeletePayment=Vuoi davvero cancellare questo pagamento?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Pagamenti ricevuti
 ReceivedCustomersPayments=Pagamenti ricevuti dai clienti
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Importo del pagamento
-ValidatePayment=Convalidare questo pagamento?
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Convalida le fatture automaticamente
 GeneratedFromRecurringInvoice=Fattura ricorrente %s generata dal modello
 DateIsNotEnough=Data non ancora raggiunta
 InvoiceGeneratedFromTemplate=Fattura %s generata da modello ricorrente %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Attenzione, la data della fattura è successiva alla data odierna
 WarningInvoiceDateTooFarInFuture=Attenzione, la data della fattura è troppo lontana dalla data odierna
 ViewAvailableGlobalDiscounts=Mostra gli sconti disponibili
@@ -382,9 +384,9 @@ PaymentCondition60D=Pagamento a 60 giorni
 PaymentConditionShort60DENDMONTH=60 giorni fine mese
 PaymentCondition60DENDMONTH=Pagamento a 60 giorni fine mese
 PaymentConditionShortPT_DELIVERY=Consegna
-PaymentConditionPT_DELIVERY=In consegna
+PaymentConditionPT_DELIVERY=Alla consegna
 PaymentConditionShortPT_ORDER=Ordine
-PaymentConditionPT_ORDER=Ordinato
+PaymentConditionPT_ORDER=Al momento dell'ordine
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% all'ordine, 50%% alla consegna*
 PaymentConditionShort10D=10 giorni
diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang
index 599437e7642..77fe9d692c5 100644
--- a/htdocs/langs/it_IT/cashdesk.lang
+++ b/htdocs/langs/it_IT/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Storico
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index 0811ef7bb21..9666ac35dfa 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -28,7 +28,7 @@ AliasNames=Pseudonimo (commerciale, marchio, ...)
 AliasNameShort=Pseudonimo
 Companies=Società
 CountryIsInEEC=Paese appartenente alla Comunità Economica Europea
-PriceFormatInCurrentLanguage=Formato del prezzo nella lingua corrente
+PriceFormatInCurrentLanguage=Price display format in the current language and currency
 ThirdPartyName=Third-party name
 ThirdPartyEmail=Third-party email
 ThirdParty=Third-party
@@ -409,7 +409,7 @@ YouMustCreateContactFirst=Per poter inviare notifiche via email, è necessario d
 ListSuppliersShort=Elenco fornitori
 ListProspectsShort=Elenco dei clienti potenziali
 ListCustomersShort=Elenco dei clienti
-ThirdPartiesArea=Soggetti terzi e contatti
+ThirdPartiesArea=Anagrafiche soggetti terzi e contatti
 LastModifiedThirdParties=Ultimi %s soggetti terzi modificati
 UniqueThirdParties=Totale soggetti terzi
 InActivity=In attività
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index 26fd2005c2e..bd01800c430 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Fatturazione | Pagamento
-TaxModuleSetupToModifyRules=Per modificare il modo in cui viene effettuato il calcolo, vai al <a href="%s">modulo di configurazione delle tasse</a>.
-TaxModuleSetupToModifyRulesLT=Vai a  <a href="%s">Impostazioni Azienda per modificare le regole del calcolo
+MenuFinancial=Contabilità
+TaxModuleSetupToModifyRules=Per modificare le regole di calcolo, vai ad <a href="%s">impostazioni Modulo Imposte</a>
+TaxModuleSetupToModifyRulesLT=Per modificare le regole di calcolo, vai ad <a href="%s">impostazioni Azienda</a>\n
 OptionMode=Opzione per la gestione contabile
 OptionModeTrue=Opzione entrate-uscite
 OptionModeVirtual=Opzione crediti-debiti
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Tasse/contributi da pagare
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Nuovo pagamento
-Payments=Pagamenti
 PaymentCustomerInvoice=Pagamento fattura attiva
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Pagamento delle imposte sociali/fiscali
@@ -179,7 +178,7 @@ VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report per IVA cliente riscossa e pagata
-VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportByQuartersInInputOutputMode=Resoconto imposte di vendita, sia riscosse che pagate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -205,7 +204,6 @@ SellsJournal=Storico vendite
 PurchasesJournal=Storico acquisti
 DescSellsJournal=Storico vendite
 DescPurchasesJournal=Storico acquisti
-InvoiceRef=Rif. fattura
 CodeNotDef=Non definito
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=La data termine di pagamento non può essere anteriore alla data dell'oggetto
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index b6acf54d535..b27e9b572f4 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang
index 846a6d6afe5..e28dfd837ea 100644
--- a/htdocs/langs/it_IT/holiday.lang
+++ b/htdocs/langs/it_IT/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Richieste di assenza approvate
 HolidaysValidatedBody=La tua richiesta di ferie dal %s al %s è stata approvata
 HolidaysRefused=Richiesta negata
-HolidaysRefusedBody=La tua richiesta di ferie dal %s al %s è stata negata per il seguente motivo :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Richiesta di assenza cancellata
 HolidaysCanceledBody=La tua richiesta di ferie dal %s al %s è stata cancellata
 FollowedByACounter=<strong>1</strong>: questo tipo di ferie segue un contatore. Il contatore incrementa automaticamente o manualmente e quando una richiesta di ferie è validata. il contatore decrementa.<br><strong>0</strong>: non segue nessun contatore
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 6602ad2b952..f7995b0ef97 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -27,7 +27,7 @@ DatabaseConnection=Connessione al database
 NoTemplateDefined=Nessun tema disponibile per questo tipo di email
 AvailableVariables=Variabili di sostituzione disponibili
 NoTranslation=Nessuna traduzione
-Translation=Traduzione
+Translation=Traduzioni
 NoRecordFound=Nessun risultato trovato
 NoRecordDeleted=Nessun record eliminato
 NotEnoughDataYet=Dati insufficienti
@@ -64,7 +64,7 @@ ErrorNoVATRateDefinedForSellerCountry=Errore, non sono state definite le aliquot
 ErrorNoSocialContributionForSellerCountry=Errore, non sono stati definiti i tipi di contributi per: '%s'.
 ErrorFailedToSaveFile=Errore, file non salvato.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
-MaxNbOfRecordPerPage=Max. number of records per page
+MaxNbOfRecordPerPage=Max. numero di records per pagina
 NotAuthorized=Non sei autorizzato.
 SetDate=Imposta data
 SelectDate=Seleziona una data
@@ -78,7 +78,7 @@ FileRenamed=Il file è stato rinominato con successo
 FileGenerated=Il file è stato generato con successo
 FileSaved=Il file è stato salvato con successo
 FileUploaded=Il file è stato caricato con successo
-FileTransferComplete=File(s) uploaded successfully
+FileTransferComplete=Files(s) caricati con successo
 FilesDeleted=File cancellati con successo
 FileWasNotUploaded=Il file selezionato per l'upload non è stato ancora caricato. Clicca su <b>Allega file</b> per farlo
 NbOfEntries=No. of entries
@@ -86,7 +86,7 @@ GoToWikiHelpPage=Leggi l'aiuto online (è richiesto un collegamento internet)
 GoToHelpPage=Vai alla pagina di aiuto
 RecordSaved=Record salvato
 RecordDeleted=Record cancellato
-RecordGenerated=Record generated
+RecordGenerated=Record generato
 LevelOfFeature=Livello di funzionalità
 NotDefined=Non definito
 DolibarrInHttpAuthenticationSoPasswordUseless=Modalità di autenticazione <b>%s</b> configurata nel file <b>conf.php</b>.<br/>Ciò significa che la password del database è indipendente dall'applicazione, eventuali cambiamenti non avranno alcun effetto.
@@ -96,8 +96,8 @@ PasswordForgotten=Password dimenticata?
 NoAccount=No account?
 SeeAbove=Vedi sopra
 HomeArea=Home
-LastConnexion=Last login
-PreviousConnexion=Previous login
+LastConnexion=Ultimo login
+PreviousConnexion=Login precedente
 PreviousValue=Valore precedente
 ConnectedOnMultiCompany=Collegato all'ambiente
 ConnectedSince=Collegato da
@@ -202,7 +202,7 @@ Password=Password
 PasswordRetype=Ridigita la password
 NoteSomeFeaturesAreDisabled=Nota bene: In questo demo alcune funzionalità e alcuni moduli sono disabilitati.
 Name=Nome
-NameSlashCompany=Name / Company
+NameSlashCompany=Nome / Società
 Person=Persona
 Parameter=Parametro
 Parameters=Parametri
@@ -371,6 +371,7 @@ Percentage=Percentuale
 Total=Totale
 SubTotal=Totale parziale
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Totale (IVA inc.)
 TotalHT=Total (excl. tax)
@@ -435,7 +436,7 @@ ActionNotApplicable=Non applicabile
 ActionRunningNotStarted=Non avviato
 ActionRunningShort=Avviato
 ActionDoneShort=Fatto
-ActionUncomplete=Incomplete
+ActionUncomplete=Incompleto
 LatestLinkedEvents=Ultimi %s eventi collegati
 CompanyFoundation=Azienda/Organizzazione
 Accountant=Contabile
@@ -636,16 +637,15 @@ FeatureNotYetSupported=Funzionalità non ancora supportata
 CloseWindow=Chiudi finestra
 Response=Risposta
 Priority=Priorità
-SendByMail=Send by email
+SendByMail=Invia per email
 MailSentBy=Email inviate da
 TextUsedInTheMessageBody=Testo dell'email
 SendAcknowledgementByMail=Invia email di conferma
 SendMail=Invia una email
 Email=Email
 NoEMail=Nessuna email
-Email=Email
-AlreadyRead=Already read
-NotRead=Not read
+AlreadyRead=Già letto
+NotRead=Non letto
 NoMobilePhone=Nessun cellulare
 Owner=Proprietario
 FollowingConstantsWillBeSubstituted=Le seguenti costanti saranno sostitute con i valori corrispondenti
@@ -658,9 +658,9 @@ ValueIsValid=Il valore è valido
 ValueIsNotValid=Il valore non è valido
 RecordCreatedSuccessfully=Record creato con success0
 RecordModifiedSuccessfully=Record modificati con successo
-RecordsModified=%s record(s) modified
-RecordsDeleted=%s record(s) deleted
-RecordsGenerated=%s record(s) generated
+RecordsModified=%s record(s) modificato/i
+RecordsDeleted= %s record(s) eliminato/i
+RecordsGenerated= %s record(s) generato/i
 AutomaticCode=Codice automatico
 FeatureDisabled=Funzionalità disabilitata
 MoveBox=Sposta widget
@@ -671,7 +671,6 @@ Method=Metodo
 Receive=Ricevi
 CompleteOrNoMoreReceptionExpected=Completa o non attendere altro
 ExpectedValue=Valore atteso
-CurrentValue=Valore attuale
 PartialWoman=Parziale
 TotalWoman=Totale
 NeverReceived=Mai ricevuto
@@ -712,7 +711,7 @@ AddFile=Aggiungi file
 FreeZone=Non è un prodotto/servizio predefinito
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clona oggetto con i suoi principali attributi
-ReGeneratePDF=Re-generate PDF
+ReGeneratePDF=Rigenera PDF
 PDFMerge=Unisci PDF
 Merge=Unisci
 DocumentModelStandardPDF=Tema PDF Standard
@@ -778,7 +777,7 @@ ByDay=Per giorno
 BySalesRepresentative=Per venditore
 LinkedToSpecificUsers=Con collegamento ad un utente specifico
 NoResults=Nessun risultato
-AdminTools= Strumenti di amministrazione
+AdminTools=Strumenti di amministrazione
 SystemTools=Strumenti di sistema
 ModulesSystemTools=Strumenti moduli
 Test=Test
@@ -834,6 +833,7 @@ RelatedObjects=Oggetti correlati
 ClassifyBilled=Classificare  fatturata
 ClassifyUnbilled=Classifica non pagata
 Progress=Avanzamento
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Backoffice
 View=Vista
@@ -842,23 +842,28 @@ Exports=Esportazioni
 ExportFilteredList=Esporta lista filtrata
 ExportList=Esporta lista
 ExportOptions=Opzioni di esportazione
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Varie
 Calendar=Calendario
 GroupBy=Raggruppa per...
 ViewFlatList=Vedi lista semplice
 RemoveString=Rimuovi la stringa '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+SomeTranslationAreUncomplete=Alcune traduzioni potrebbero essere incomplete, o contenere errori. In questi casi, registrandoti su <a href=\\'https://transifex.com/projects/p/dolibarr/\\' target=\\'_blank\\'>transifex.com/projects/p/dolibarr/</a>, avrai la possibilità di proporre modifiche, contribuendo così al miglioramento di Dolibarr.
 DirectDownloadLink=Link diretto per il download (pubblico/esterno)
 DirectDownloadInternalLink=Link per il download diretto (richiede accesso e permessi validi)
 Download=Download
 DownloadDocument=Scarica documento
 ActualizeCurrency=Aggiorna tasso di cambio
 Fiscalyear=Anno fiscale
-ModuleBuilder=Mudulo programmatore
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Imposta valuta
 BulkActions=Azioni in blocco
 ClickToShowHelp=Clicca per mostrare l'aiuto contestuale
-WebSite=Website
+WebSite=Sito web
 WebSites=Siti web
 WebSiteAccounts=Website accounts
 ExpenseReport=Nota spese
@@ -871,7 +876,7 @@ ConfirmSetToDraft=Are you sure you want to go back to Draft status?
 ImportId=ID di importazione
 Events=Eventi
 EMailTemplates=Email templates
-FileNotShared=File not shared to external public
+FileNotShared=File non condiviso con pubblico esterno
 Project=Progetto
 Projects=Progetti
 LeadOrProject=Lead | Project
@@ -879,7 +884,7 @@ LeadsOrProjects=Leads | Projects
 Lead=Lead
 Leads=Leads
 ListOpenLeads=List open leads
-ListOpenProjects=List open projects
+ListOpenProjects=Lista progetti aperti
 NewLeadOrProject=New lead or project
 Rights=Autorizzazioni
 LineNb=Linea n°
@@ -964,9 +969,13 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File condiviso con un link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
-Inventory=Inventory
+Inventory=Inventario
 AnalyticCode=Analytic code
 TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
+SeePrivateNote=Vedi nota privata
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index c8a43734164..27e76b53393 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=Nessun soggetto terzo associato a questo membro
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Biglietti membri
 FundationMembers=Membri della fondazione
 ListOfValidatedPublicMembers=Elenco membri pubblici convalidati
@@ -67,11 +67,11 @@ Subscriptions=Adesioni
 SubscriptionLate=Ritardi
 SubscriptionNotReceived=Sottoscrizione mai ricevuta
 ListOfSubscriptions=Elenco adesioni
-SendCardByMail=Invia scheda per email
+SendCardByMail=Send card by email
 AddMember=Crea membro
 NoTypeDefinedGoToSetup=Nessun tipo di membro definito. Vai su impostazioni - Tipi di membro
 NewMemberType=Nuovo tipo di membro
-WelcomeEMail=Email di benvenuto
+WelcomeEMail=Welcome email
 SubscriptionRequired=E' richiesta l'adesione
 DeleteType=Elimina
 VoteAllowed=E' permesso il voto
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=File htpasswd
 ValidateMember=Convalida un membro
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=I link alle seguenti pagine non sono protetti da accessi indesiderati.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Elenco pubblico dei membri
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Contenuto della scheda membro
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Oggetto della email che riceve un ospite quando si auto-iscrive
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Email che riceve un ospite quando si auto-iscrive
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Mittente email
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Formato etichette
 DescADHERENT_ETIQUETTE_TEXT=Testo da stampare nel campo indirizzo di un membro
 DescADHERENT_CARD_TYPE=Tipo di formato della scheda membro
@@ -156,8 +156,8 @@ DocForAllMembersCards=Genera schede per tutti i membri (formato di output impost
 DocForOneMemberCards=Genera scheda per un membro (formato di output impostato: <b>%s</b>)
 DocForLabels=Genera etichette con indirizzi (formato di output impostato: <b>%s</b>)
 SubscriptionPayment=Pagamento adesione
-LastSubscriptionDate=Data della sottoscrizione più recente
-LastSubscriptionAmount=Ultimo importo della sottoscrizione
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Statistiche per paese
 MembersStatisticsByState=Statistiche per stato/provincia
 MembersStatisticsByTown=Statistiche per città
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Questa schermata mostra le statistiche dei membri per natura
 MembersByRegion=Questa schermata mostra le statistiche dei membri per regione
 VATToUseForSubscriptions=Aliquota IVA in uso per le sottoscrizioni
-NoVatOnSubscription=Nessuna IVA per gli abbonamenti
-MEMBER_PAYONLINE_SENDEMAIL=Indirizzo email cui inviare gli avvisi di conferma ricezione del pagamento per adesione (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Prodotto utilizzato per la riga dell'abbonamento in fattura: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/it_IT/modulebuilder.lang b/htdocs/langs/it_IT/modulebuilder.lang
index 05823cf5632..187d17f1146 100644
--- a/htdocs/langs/it_IT/modulebuilder.lang
+++ b/htdocs/langs/it_IT/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Crea pacchetto
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=Questo modulo è stato attivato. Qualsiasi sua modifica può interrompere una funzionalità attiva.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index 1524ad80436..b1c16f67868 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -5,11 +5,11 @@ Tools=Strumenti
 TMenuTools=Strumenti
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Compleanno
-BirthdayDate=Data di nascita
+BirthdayDate=Giorno di nascita
 DateToBirth=Data di nascita
 BirthdayAlertOn=Attiva avviso compleanni
 BirthdayAlertOff=Avviso compleanni inattivo
-TransKey=Translation of the key TransKey
+TransKey=Traduzione della chiave TransKey
 MonthOfInvoice=Month (number 1-12) of invoice date
 TextMonthOfInvoice=Month (text) of invoice date
 PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
diff --git a/htdocs/langs/it_IT/paybox.lang b/htdocs/langs/it_IT/paybox.lang
index 89648b2fe62..d47844bd25c 100644
--- a/htdocs/langs/it_IT/paybox.lang
+++ b/htdocs/langs/it_IT/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Per completare
 YourEMail=Email per la conferma del pagamento
 Creditor=Creditore
 PaymentCode=Codice pagamento
-PayBoxDoPayment=Paga con Carta di Credito o Debito (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Registra pagamento
 YouWillBeRedirectedOnPayBox=Verrai reindirizzato alla pagina sicura di Paybox per inserire le informazioni della carta di credito.
 Continue=Successivo
 ToOfferALinkForOnlinePayment=URL per il pagamento %s
-ToOfferALinkForOnlinePaymentOnOrder=URL per il pagamento %s di un ordine
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL per il pagamento %s di una fattura
 ToOfferALinkForOnlinePaymentOnContractLine=URL per il pagamento %s di una riga di contratto
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL per il pagamento %s di un importo
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL per il pagamento %s dell'adesione di un membro
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Puoi anche aggiungere a qualunque di questi url il parametro <b>&tag=<i>value</i></b> (richiesto solo per il pagamento gratuito) per aggiungere una tag con un tuo commento.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Il pagamento è stato registrato. Grazie.
@@ -33,7 +33,8 @@ VendorName=Nome del venditore
 CSSUrlForPaymentForm=URL del foglio di stile CSS per il modulo di pagamento
 NewPayboxPaymentReceived=Nuovo pagamento Paybox ricevuto
 NewPayboxPaymentFailed=Nuovo tentativo di pagamento Paybox ma fallito
-PAYBOX_PAYONLINE_SENDEMAIL=Email di avviso dopo il pagamento (a buon fine o no)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Valore per PBX SITE
 PAYBOX_PBX_RANG=Valore per PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Valore per PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/it_IT/paypal.lang b/htdocs/langs/it_IT/paypal.lang
index 1f90467d130..3172ee4264c 100644
--- a/htdocs/langs/it_IT/paypal.lang
+++ b/htdocs/langs/it_IT/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Impostazioni Paypal
-PaypalDesc=Questo modulo permette al cliente di pagare tramite <a href="http://www.paypal.com" target="_blank">PayPal</a>. Può essere usato per un pagamento generico o di uno specifico documento (fattura, ordine, ...)
-PaypalOrCBDoPayment=Paga con Paypal (Carta di Credito o Paypal)
-PaypalDoPayment=Paga con Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Modalità di test/sandbox
 PAYPAL_API_USER=Nome utente API
 PAYPAL_API_PASSWORD=Password API
 PAYPAL_API_SIGNATURE=Firma API
 PAYPAL_SSLVERSION=Versione SSL Curl
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offerta di pagamento completo (Carta di credito + Paypal) o solo Paypal
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Completo
 PaypalModeOnlyPaypal=Solo PayPal
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=L'id di transazione è: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Aggiungere l'URL di pagamento Paypal quando si invia un documento per posta
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=Nuovo pagamento online ricevuto
 NewOnlinePaymentFailed=Nuovo tentativo di pagamento online fallito
-ONLINE_PAYMENT_SENDEMAIL=Email di avviso dopo un pagamento (a buon fine o no)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=URL di ritorno dopo il pagamento
 ValidationOfOnlinePaymentFailed=Validazione del pagamento online fallita
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Messaggio di errore breve
 ErrorCode=Codice errore
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Sistema di pagamento online
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 12e8bd75f49..d01d0497973 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -155,7 +155,7 @@ NewRefForClone=Rif. del nuovo prodotto/servizio
 SellingPrices=Prezzi di vendita
 BuyingPrices=Prezzi di acquisto
 CustomerPrices=Prezzi di vendita
-SuppliersPrices=Vendor prices
+SuppliersPrices=Prezzi fornitore
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Paese di origine
@@ -260,7 +260,7 @@ AddVariable=Aggiungi variabile
 AddUpdater=Aggiungi Aggiornamento
 GlobalVariables=Variabili globali
 VariableToUpdate=Variabile da aggiornare
-GlobalVariableUpdaters=Aggiornamento variabili globali
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=Dati JSON
 GlobalVariableUpdaterHelp0=Esegue il parsing dei dati JSON da uno specifico indirizzo URL, VALUE (valore) specifica la posizione di valori rilevanti
 GlobalVariableUpdaterHelpFormat0=Formato per la richiesta {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Scheda prodotto
 ServiceSheet=Scheda di servizio
 PossibleValues=Valori possibili
 GoOnMenuToCreateVairants=Vai sul menu %s - %s per preparare le varianti degli attributi (come colori, dimensioni, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variante attributi
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=Si è verificato un errore durante la copia della v
 ErrorDestinationProductNotFound=Prodotto di destinazione non trovato
 ErrorProductCombinationNotFound=Variante di prodotto non trovata
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 1a8f1c900a5..73615cae9f4 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Tempo lavorato
 TimeSpentByYou=Tempo impiegato da te
 TimeSpentByUser=Tempo impiegato dall'utente
 TimesSpent=Tempo lavorato
-RefTask=Rif. compito
-LabelTask=Etichetta compito
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Tempo speso sulle attività
 TaskTimeUser=Utente
 TaskTimeNote=Nota
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 1eb335a5b00..63b6c80c403 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -3,32 +3,34 @@ WarehouseCard=Scheda Magazzino
 Warehouse=Magazzino
 Warehouses=Magazzini
 ParentWarehouse=Magazzino principale
-NewWarehouse=Nuovo magazzino/deposito
+NewWarehouse=Nuovo magazzino / deposito
 WarehouseEdit=Modifica magazzino
 MenuNewWarehouse=Nuovo Magazzino
 WarehouseSource=Magazzino di origine
 WarehouseSourceNotDefined=Non è stato definito alcun magazzino.
-AddWarehouse=Create warehouse
+AddWarehouse=Crea magazzino
 AddOne=Aggiungi uno
-DefaultWarehouse=Default warehouse
+DefaultWarehouse=Magazzino predefinito
 WarehouseTarget=Magazzino di destinazione
-ValidateSending=Convalida spedizione
+ValidateSending=Elimina spedizione
 CancelSending=Annulla spedizione
 DeleteSending=Elimina spedizione
 Stock=Scorta
 Stocks=Scorte
-StocksByLotSerial=Scorte per lotto/seriale
-LotSerial=Lotti/Numeri di serie
-LotSerialList=Lista dei lotti/numeri di serie
+StocksByLotSerial=Scorte per lotto / seriale
+LotSerial=Lotti / Seriali
+LotSerialList=Elenco lotti / seriali
 Movements=Movimenti
-ErrorWarehouseRefRequired=Riferimento magazzino mancante
+ErrorWarehouseRefRequired=Il nome della referenza di magazzino è obbligatorio
 ListOfWarehouses=Elenco magazzini
 ListOfStockMovements=Elenco movimenti delle scorte
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
+ListOfInventories=Elenco inventari
+MovementId=ID movimento
+StockMovementForId=ID movimento %d
 ListMouvementStockProject=Elenco dei movimenti delle scorte associati al progetto
 StocksArea=Area magazzino e scorte
+AllWarehouses=Tutti i magazzini
+IncludeAlsoDraftOrders=Includi anche bozze di ordini
 Location=Ubicazione
 LocationSummary=Ubicazione abbreviata
 NumberOfDifferentProducts=Numero di differenti prodotti
@@ -37,51 +39,50 @@ LastMovement=Ultimo movimento
 LastMovements=Ultimi movimenti
 Units=Unità
 Unit=Unità
-StockCorrection=Stock correction
-CorrectStock=Variazione manuale scorte
+StockCorrection=Variazioni scorte
+CorrectStock=Variazione scorte
 StockTransfer=Movimento scorte
 TransferStock=Trasferimento scorte
 MassStockTransferShort=Trasferimento di massa magazzino
 StockMovement=Movimento scorte
 StockMovements=Movimenti scorte
-LabelMovement=Etichetta del movimento
 NumberOfUnit=Numero di unità
 UnitPurchaseValue=Prezzo unitario
 StockTooLow=Scorte insufficienti
-StockLowerThanLimit=Stock lower than alert limit (%s)
-EnhancedValue=Incremento valore
-PMPValue=Media ponderata prezzi
+StockLowerThanLimit=Scorta inferiore al limite di avviso (%s)
+EnhancedValue=Valore
+PMPValue=Media ponderata prezzo
 PMPValueShort=MPP
-EnhancedValueOfWarehouses=Incremento valore dei magazzini
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Le scorte del prodotto e del sottoprodotto sono indipendenti
+EnhancedValueOfWarehouses=Valore magazzini
+UserWarehouseAutoCreate=Crea anche un magazzino alla creazione di un utente
+AllowAddLimitStockByWarehouse=Gestisci anche i valori minimo e desiderato della scorta per abbinamento (prodotto - magazzino) oltre ai valori per prodotto
+IndependantSubProductStock=Le scorte di prodotto e di sottoprodotti sono indipendenti
 QtyDispatched=Quantità ricevuta
 QtyDispatchedShort=Q.ta ricevuta
 QtyToDispatchShort=Q.ta da ricevere
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Regola per la gestione delle scorte automatica diminuzione (la diminuzione manuale è sempre possibile, anche se si attiva una regola automatica diminuzione)
-RuleForStockManagementIncrease=Regola per aumento automatico la gestione delle scorte (l'aumento manuale è sempre possibile, anche se si attiva una regola automatica incremento)
-DeStockOnBill=Riduci scorte effettive all'emissione della fattura/nota di credito
-DeStockOnValidateOrder=Riduci scorte effettive alla convalida dell'ordine
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Diminuire stock reali sulla validazione di spedizione
 DeStockOnShipmentOnClosing=Diminuire stock reali alla chiusura della spedizione
-ReStockOnBill=Incrementa scorte effettive alla fattura/nota di credito
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
 OrderStatusNotReadyToDispatch=Lo stato dell'ordine non ne consente la spedizione dei prodotti a magazzino.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Per l'oggetto non ci sono prodotti predefiniti. Quindi non è necessario alterare le scorte.
-DispatchVerb=Spedizione
+DispatchVerb=Ricezione
 StockLimitShort=Limite per segnalazioni
 StockLimit=Limite minimo scorte (per gli avvisi)
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Scorte fisiche
+PhysicalStock=Physical Stock
 RealStock=Scorte reali
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Scorte virtuali
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id magazzino
 DescWareHouse=Descrizione magazzino
 LieuWareHouse=Ubicazione magazzino
@@ -101,7 +102,7 @@ ThisWarehouseIsPersonalStock=Questo magazzino rappresenta la riserva personale d
 SelectWarehouseForStockDecrease=Scegli magazzino da utilizzare per la riduzione delle scorte
 SelectWarehouseForStockIncrease=Scegli magazzino da utilizzare per l'aumento delle scorte
 NoStockAction=Nessuna azione su queste scorte
-DesiredStock=Scorte ottimali desiderate
+DesiredStock=Desired Stock
 DesiredStockDesc=Questa quantità sarà il valore utilizzato per rifornire il magazzino mediante la funzione di rifornimento.
 StockToBuy=Da ordinare
 Replenishment=Rifornimento
@@ -114,13 +115,13 @@ CurentSelectionMode=Modalità di selezione corrente
 CurentlyUsingVirtualStock=Giacenza virtuale
 CurentlyUsingPhysicalStock=Giacenza fisica
 RuleForStockReplenishment=Regola per il rifornimento delle scorte
-SelectProductWithNotNullQty=Selezionare almeno un prodotto disponibile e un fornitore
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Solo avvisi
 WarehouseForStockDecrease=Il magazzino <b>%s</b> sarà usato per la diminuzione delle scorte
 WarehouseForStockIncrease=Il magazzino <b>%s</b> sarà usato per l'aumento delle scorte
 ForThisWarehouse=Per questo magazzino
-ReplenishmentStatusDesc=Questa è una lista di tutti i prodotti con una giacenza inferiore a quella desiderata (o inferiore al valore di allarme se la casella "solo allarme" è selezionata). Utilizzando la casella di controllo, è possibile creare ordini fornitori per colmare la differenza.
-ReplenishmentOrdersDesc=Questa è una lista di tutti gli ordini ai fornitori aperti che includono prodotti predefiniti. Vengono visualizzati solo gli ordini aperti comprendenti prodotti predefiniti, e che possono quindi influire sulle scorte.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Rifornimento
 NbOfProductBeforePeriod=Quantità del prodotto %s in magazzino prima del periodo selezionato (< %s)
 NbOfProductAfterPeriod=Quantità del prodotto %s in magazzino dopo il periodo selezionato (< %s)
@@ -130,10 +131,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Ricevuta per questo ordine
 StockMovementRecorded=Movimentazione di scorte registrata
 RuleForStockAvailability=Regole sulla fornitura delle scorte
-StockMustBeEnoughForInvoice=Il livello delle scorte deve essere sufficiente per aggiungere un prodotto/servizio alla fattura (il controllo viene effettuato sulle scorte reali quando viene aggiunta una riga di fattura, qualsiasi sia la regola di gestione automatica)
-StockMustBeEnoughForOrder=Il livello delle scorte deve essere sufficiente per aggiungere un prodotto/servizio all'ordine cliente (il controllo viene effettuato sulle scorte reali quando viene aggiunta una riga di ordine, qualsiasi sia la regola di gestione automatica)
-StockMustBeEnoughForShipment= Il livello delle scorte deve essere sufficiente per aggiungere un prodotto/servizio alla spedizione (il controllo viene effettuato sulle scorte reali quando viene aggiunta una riga di spedizione, qualsiasi sia la regola di gestione automatica)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Etichetta per lo spostamento di magazzino
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Codice di inventario o di spostamento
 IsInPackage=Contenuto nel pacchetto
@@ -143,11 +145,11 @@ ShowWarehouse=Mostra magazzino
 MovementCorrectStock=Correzione scorte per il prodotto %s
 MovementTransferStock=Trasferisci scorte del prodotto %s in un altro magazzino
 InventoryCodeShort=Codice di inventario o di spostamento
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=Questo lotto/numero seriale (<strong>%s</strong>) esiste già con una differente data di scadenza o di validità (trovata <strong>%s</strong>, inserita <strong>%s</strong> ) 
 OpenAll=Aperto per tutte le azioni
 OpenInternal=Aperto per le azioni interne
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -161,7 +163,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
-inventoryTitle=Inventory
+inventoryTitle=Inventario
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
 inventoryCreateDelete=Create/Delete inventory
@@ -171,16 +173,16 @@ inventoryValidate=Convalidato
 inventoryDraft=In corso
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Crea
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Filtro categoria
-SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+SelectFournisseur=Vendor filter
+inventoryOnDate=Inventario
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +197,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Aggiungi
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Elimina riga
 RegulateStock=Regulate Stock
 ListInventory=Elenco
-StockSupportServices=Stock management support services
-StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/it_IT/stripe.lang b/htdocs/langs/it_IT/stripe.lang
index ea63d3c28eb..6cad9de00dd 100644
--- a/htdocs/langs/it_IT/stripe.lang
+++ b/htdocs/langs/it_IT/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Puoi utilizzare i seguenti indirizzi per permettere ai clienti di effettuare pagamenti su Dolibarr
 PaymentForm=Forma di pagamento
-WelcomeOnPaymentPage=Benvenuti sul nostro servizio di pagamento online
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Questa schermata consente di effettuare un pagamento online su %s.
 ThisIsInformationOnPayment=Informazioni sul pagamento da effettuare
 ToComplete=Per completare
 YourEMail=Email per la conferma del pagamento
-STRIPE_PAYONLINE_SENDEMAIL=Email di avviso dopo un pagamento (a buon fine o no)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditore
 PaymentCode=Codice pagamento
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Successivo
 ToOfferALinkForOnlinePayment=URL per il pagamento %s
-ToOfferALinkForOnlinePaymentOnOrder=URL per il pagamento %s di un ordine
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL per il pagamento %s di una fattura
 ToOfferALinkForOnlinePaymentOnContractLine=URL per il pagamento %s di una riga di contratto
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL per il pagamento %s di un importo
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL per il pagamento %s dell'adesione di un membro
 YouCanAddTagOnUrl=Puoi anche aggiungere a qualunque di questi url il parametro <b>&tag=<i>value</i></b> (richiesto solo per il pagamento gratuito) per aggiungere una tag con un tuo commento.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=Il pagamento è stato registrato. Grazie.
-YourPaymentHasNotBeenRecorded=Il pagamento non è stato registrato e la transazione è stata annullata. Grazie.
 AccountParameter=Dati account
 UsageParameter=Parametri d'uso
 InformationToFindParameters=Aiuto per trovare informazioni sul tuo account %s
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index 424c6f02c23..4f7a8280b1f 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -1,11 +1,11 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Fornitori
-SuppliersInvoice=Vendor invoice
-ShowSupplierInvoice=Show Vendor Invoice
+SuppliersInvoice=Fattura fornitore
+ShowSupplierInvoice=Vedi fattura fornitore
 NewSupplier=Nuovo fornitore
 History=Storico
 ListOfSuppliers=Elenco fornitori
-ShowSupplier=Show vendor
+ShowSupplier=Vedi fornitore
 OrderDate=Data ordine
 BuyingPriceMin=Miglior prezzo di acquisto
 BuyingPriceMinShort=Miglior prezzo di acquisto
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Totale dei prezzi di vendita dei sotto-prodotti
 SomeSubProductHaveNoPrices=Per alcuni sottoprodotti non è stato definito un prezzo
 AddSupplierPrice=Aggiungi prezzo di acquisto
 ChangeSupplierPrice=Cambia prezzo di acquisto
-SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Il fornitore di riferimento è già associato a un prodotto: %s
-NoRecordedSuppliers=No vendor recorded
-SupplierPayment=Vendor payment
-SuppliersArea=Vendor area
-RefSupplierShort=Ref. vendor
+SupplierPrices=Prezzi fornitore
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Questo referenza del fornitore è già associata ad un prodotto: %s
+NoRecordedSuppliers=Nessun fornitore registrato
+SupplierPayment=Pagamento fornitore
+SuppliersArea=Area fornitore
+RefSupplierShort=Rif. fornitura
 Availability=Disponibilità
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
-ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_1=Fatture fornitore e dettagli
+ExportDataset_fournisseur_2=Fatture fornitore e pagamenti
+ExportDataset_fournisseur_3=Ordini di acquisto e dettagli
 ApproveThisOrder=Approva l'ordine
-ConfirmApproveThisOrder=Sei sicuro di voler approvare l'ordine <b>%s</b>?
+ConfirmApproveThisOrder=Intendi veramente approvare l'ordine <b>%s</b>?
 DenyingThisOrder=Nega questo ordine
-ConfirmDenyingThisOrder=Sei sicuro di voler negare l'ordine <b>%s</b>?
-ConfirmCancelThisOrder=Sei sicuro di voler eliminare l'ordine <b>%s</b>?
-AddSupplierOrder=Create Purchase Order
-AddSupplierInvoice=Create vendor invoice
-ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
-SentToSuppliers=Sent to vendors
-ListOfSupplierOrders=List of purchase orders
-MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Tempi di consegna in giorni
-DescNbDaysToDelivery=Il maggior ritardo nella consegna dei prodotti da questo ordine
-SupplierReputation=Vendor reputation
+ConfirmDenyingThisOrder=Intendi veramente negare l'ordine <b>%s</b>?
+ConfirmCancelThisOrder=Intendi veramente eliminare l'ordine <b>%s</b>?
+AddSupplierOrder=Crea ordine d'acquisto
+AddSupplierInvoice=Crea fattura fornitore
+ListOfSupplierProductForSupplier=Elenco prodotti e prezzi del fornitore <b>%s</b>
+SentToSuppliers=Inviato ai fornitori
+ListOfSupplierOrders=Elenco ordini d'acquisto
+MenuOrdersSupplierToBill=Ordini d'acquisto da fatturare
+NbDaysToDelivery=Tempi di consegna (giorni)
+DescNbDaysToDelivery=Il tempo di consegna più lungo dei prodotti di questo ordine
+SupplierReputation=Reputazione fornitore
 DoNotOrderThisProductToThisSupplier=Non ordinare
-NotTheGoodQualitySupplier=Cattiva qualità
+NotTheGoodQualitySupplier=Bassa qualità
 ReputationForThisProduct=Reputazione
 BuyerName=Nome acquirente
-AllProductServicePrices=Tutti i prezzi del prodotto / servizio
-AllProductReferencesOfSupplier=Tutti i riferimenti del prodotto / servizio del fornitore
-BuyingPriceNumShort=Vendor prices
+AllProductServicePrices=Prezzi dei prodotti / servizi
+AllProductReferencesOfSupplier=Referenze dei prodotti / servizi del fornitore
+BuyingPriceNumShort=Prezzi fornitore
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index f8bc08bcfff..e01c49ecf3d 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 0fe8e334d01..dd6193d2333 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index d778c76e167..dd1754ffbfb 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=検索を開始する文字のNBR：%s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Ajaxが無効になったときには使用できません
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScriptが無効になって
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=ポート
 VirtualServerName=仮想サーバー名
 OS=OS
 PhpWebLink=WebベースのPHPのリンク
-Browser=Browser
 Server=サーバーの
 Database=データベース
 DatabaseServer=データベースのホスト
@@ -1077,7 +1079,7 @@ SystemInfoDesc=システム情報では、読み取り専用モードでのみ
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=モジュールを有効にするには、設定エリア（ホーム - &gt;セットアップ - &gt;モジュール）に行く。
@@ -1237,8 +1239,6 @@ BillsNumberingModule=モジュールの番号請求書とクレジットメモ
 BillsPDFModules=請求書ドキュメントモデル
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=クレジットメモ
-CreditNotes=クレジットメモ
 ForceInvoiceDate=検証日に請求書の日付を強制的に
 SuggestedPaymentModesIfNotDefinedInInvoice=請求書のために定義されていない場合、デフォルトでは請求書上で示唆決済モード
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=ZIP
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index 7f28ee68e32..555583067c0 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Dolibarrが自動的に議題でアクションを作成する対
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index 1ec50d96bf1..90e847b4888 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=バンク
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=銀行名
 FinancialAccount=アカウント
 BankAccount=預金
 BankAccounts=銀行口座
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=金融口座のref
 AccountLabel=金融口座のラベル
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=和解
 RIB=銀行の口座番号
 IBAN=IBAN番号
-BIC=BIC / SWIFT番号
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=ステートメント
 AccountStatements=アカウント文
 LastAccountStatements=前回のアカウントステートメント
 IOMonthlyReporting=月次報告
-BankAccountDomiciliation=アカウントのアドレス
+BankAccountDomiciliation=Bank address
 BankAccountCountry=アカウントの国
 BankAccountOwner=アカウントの所有者名
 BankAccountOwnerAddress=アカウントの所有者のアドレス
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=アカウントを作成する
 NewBankAccount=新しいアカウント
 NewFinancialAccount=新しい金融口座
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=顧客の支払い
-SupplierInvoicePayment=サプライヤーの支払い
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=サブスクリプション費用の支払い
 WithdrawalPayment=撤退の支払い
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=銀行の転送
 BankTransfers=銀行振込
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=からの
 TransferTo=への
 TransferFromToDone=<b>%s %s</b> %sからの<b>%s</b>への転送が記録されています。
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=戻るアカウントへ
 ShowAllAccounts=すべてのアカウントに表示
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 588671cd37c..65249f1760e 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=支払いを削除します。
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=受け取った支払い
 ReceivedCustomersPayments=顧客から受け取った支払
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=支払金額
-ValidatePayment=Validate payment
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index 001bee53e76..25fa015b170 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=歴史
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 4e73efe1c0b..a50054fc552 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=新しいお支払い
-Payments=支払い
 PaymentCustomerInvoice=顧客の請求書の支払い
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=セールスジャーナル
 PurchasesJournal=購入ジャーナル
 DescSellsJournal=セールスジャーナル
 DescPurchasesJournal=購入ジャーナル
-InvoiceRef=請求書参照。
 CodeNotDef=定義されていない
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index c0754445e81..2fde390abbd 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/ja_JP/holiday.lang b/htdocs/langs/ja_JP/holiday.lang
index 3b8c0c05fa5..2aeb0e1a90b 100644
--- a/htdocs/langs/ja_JP/holiday.lang
+++ b/htdocs/langs/ja_JP/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 6b7627e923f..370b99a62d2 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -371,6 +371,7 @@ Percentage=割合
 Total=合計
 SubTotal=小計
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=合計（税込）
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=メールを送る
 Email=Email
 NoEMail=まだメールしない
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=方法
 Receive=受け取る
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=電流値
 PartialWoman=部分的な
 TotalWoman=合計
 NeverReceived=受信しませんでした
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=請求分類
 ClassifyUnbilled=Classify unbilled
 Progress=進捗
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=バックオフィス
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=エクスポートオプション
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=その他
 Calendar=カレンダー
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index ff259fe0fd0..1e1cef63c04 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -6,7 +6,7 @@ Member=メンバー
 Members=メンバー
 ShowMember=メンバーカードを提示
 UserNotLinkedToMember=ユーザーがメンバーにリンクされていません
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=メンバーチケット
 FundationMembers=Foundationのメンバー
 ListOfValidatedPublicMembers=検証済みのパブリックメンバのリスト
@@ -67,11 +67,11 @@ Subscriptions=サブスクリプション
 SubscriptionLate=遅い
 SubscriptionNotReceived=サブスクリプションは、受信したことはありません
 ListOfSubscriptions=サブスクリプションのリスト
-SendCardByMail=メールでカードを送る
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=いいえメンバーのタイプが定義されていません。セットアップに行く - メンバーの種類
 NewMemberType=新しいメンバの型
-WelcomeEMail=電子メール歓迎
+WelcomeEMail=Welcome email
 SubscriptionRequired=サブスクリプションが必要
 DeleteType=削除する
 VoteAllowed=許可される投票
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswdファイル
 ValidateMember=メンバーを検証する
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=以下のリンクは、どのDolibarr許可で保護されていない開いているページがあります。彼らはメンバーのデータベースを一覧表示する方法を示す例として提供され、ページがフォーマットされていません。
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=公共のメンバーリスト
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=あなたの会員カードの内容
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=自動電子メールの送信者の電子メール
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=ラベルページのフォーマット
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=カードのページのフォーマット
@@ -156,8 +156,8 @@ DocForAllMembersCards=すべてのメンバー<b>（：%s</b>フォーマット
 DocForOneMemberCards=特定のメンバーの名刺を<b>（：%s</b>出力実際にセットアップするためのフォーマット）を生成
 DocForLabels=アドレスシート<b>（：%s</b>出力の形式は実際のセットアップ）を生成
 SubscriptionPayment=サブスクリプション費用の支払い
-LastSubscriptionDate=最後のサブスクリプションの日付
-LastSubscriptionAmount=最後のサブスクリプションの金額
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=国別メンバー統計
 MembersStatisticsByState=都道府県/州によってメンバーの統計
 MembersStatisticsByTown=町によってメンバーの統計
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/ja_JP/modulebuilder.lang b/htdocs/langs/ja_JP/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/ja_JP/modulebuilder.lang
+++ b/htdocs/langs/ja_JP/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/ja_JP/paybox.lang b/htdocs/langs/ja_JP/paybox.lang
index 3b26a96836e..8852645237b 100644
--- a/htdocs/langs/ja_JP/paybox.lang
+++ b/htdocs/langs/ja_JP/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=完了する
 YourEMail=入金確認を受信する電子メール
 Creditor=債権者
 PaymentCode=支払いコード
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=支払いを行う
 YouWillBeRedirectedOnPayBox=あなたが入力するクレジットカード情報をセキュリティで保護された切符売り場のページにリダイレクトされます。
 Continue=次の
 ToOfferALinkForOnlinePayment=%s支払いのURL
-ToOfferALinkForOnlinePaymentOnOrder=顧客の注文のための%sオンライン決済のユーザインタフェースを提供するためのURL
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=顧客の請求書の%sオンライン決済のユーザインタフェースを提供するためのURL
 ToOfferALinkForOnlinePaymentOnContractLine=契約回線の%sオンライン決済のユーザインタフェースを提供するためのURL
 ToOfferALinkForOnlinePaymentOnFreeAmount=空き容量のため夜中オンライン決済のユーザインタフェースを提供するためのURL
 ToOfferALinkForOnlinePaymentOnMemberSubscription=メンバーのサブスクリプションの%sオンライン決済のユーザインタフェースを提供するためのURL
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=また、独自の支払いコメントタグを追加するには、それらのURL（無料支払のためにのみ必要）のいずれかにurlパラメータ<b>·タグ= <i>値を</i></b>追加<i><b>する</b></i>こと<i><b>が</b></i>できます。
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=このページでは、あなたの支払が記録されていることを確認します。ありがとうございます。
@@ -33,7 +33,8 @@ VendorName=ベンダーの名前
 CSSUrlForPaymentForm=支払いフォームのCSSスタイルシートのURL
 NewPayboxPaymentReceived=新しいPaybox支払を受け取りました
 NewPayboxPaymentFailed=新しいPaybox支払を試みましたが失敗しました
-PAYBOX_PAYONLINE_SENDEMAIL=支払の後に通知のメール (成功または失敗)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=PBX SITEの値
 PAYBOX_PBX_RANG=PBX Rangの値
 PAYBOX_PBX_IDENTIFIANT=PBX IDの値
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/ja_JP/paypal.lang b/htdocs/langs/ja_JP/paypal.lang
index 13729329339..e3b365f3c2d 100644
--- a/htdocs/langs/ja_JP/paypal.lang
+++ b/htdocs/langs/ja_JP/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=ペイパルモジュールのセットアップ
-PaypalDesc=このモジュールの提供は、ページ上で支払いを可能にする<a href="http://www.paypal.com" target="_blank">PayPalの</a>顧客がいます。これは無料の支払いのために、または特定のDolibarrオブジェクトの支払いのために使用することができる（請求書、注文、...）
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=PayPalでの支払い
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=モード試験/サンドボックス
 PAYPAL_API_USER=API名
 PAYPAL_API_PASSWORD=APIパスワード
 PAYPAL_API_SIGNATURE=APIの署名
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=オファー支払い&quot;インテグラル&quot;（クレジットカード+ペイパル）または&quot;ペイパル&quot;のみ
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=<b>%s：</b>これは、トランザクションのIDです。
-PAYPAL_ADD_PAYMENT_URL=郵送で文書を送信するときにPayPalの支払いのURLを追加します。
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 482ee8b4ea2..8ea4e97ec1a 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 49fe0ac5703..81b1208fab4 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=に費や​​された時間は
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=に費や​​された時間は
-RefTask=REF。タスク
-LabelTask=ラベルタスク
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=ユーザー
 TaskTimeNote=注意
diff --git a/htdocs/langs/ja_JP/stripe.lang b/htdocs/langs/ja_JP/stripe.lang
index 77dfb20cfb4..8884b28ea4b 100644
--- a/htdocs/langs/ja_JP/stripe.lang
+++ b/htdocs/langs/ja_JP/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=以下のURLはDolibarrオブジェクト上で支払いをするために顧客にページを提供するために利用可能です
 PaymentForm=支払い形態
-WelcomeOnPaymentPage=ようこそ私たちのオンライン決済サービスについて
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=この画面では、%sにオンライン決済を行うことができます。
 ThisIsInformationOnPayment=これは、実行する支払いに関する情報です。
 ToComplete=完了する
 YourEMail=入金確認を受信する電子メール
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=債権者
 PaymentCode=支払いコード
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=次の
 ToOfferALinkForOnlinePayment=%s支払いのURL
-ToOfferALinkForOnlinePaymentOnOrder=顧客の注文のための%sオンライン決済のユーザインタフェースを提供するためのURL
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=顧客の請求書の%sオンライン決済のユーザインタフェースを提供するためのURL
 ToOfferALinkForOnlinePaymentOnContractLine=契約回線の%sオンライン決済のユーザインタフェースを提供するためのURL
 ToOfferALinkForOnlinePaymentOnFreeAmount=空き容量のため夜中オンライン決済のユーザインタフェースを提供するためのURL
 ToOfferALinkForOnlinePaymentOnMemberSubscription=メンバーのサブスクリプションの%sオンライン決済のユーザインタフェースを提供するためのURL
 YouCanAddTagOnUrl=また、独自の支払いコメントタグを追加するには、それらのURL（無料支払のためにのみ必要）のいずれかにurlパラメータ<b>·タグ= <i>値を</i></b>追加<i><b>する</b></i>こと<i><b>が</b></i>できます。
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=このページでは、あなたの支払が記録されていることを確認します。ありがとうございます。
-YourPaymentHasNotBeenRecorded=あなたの支払は記録されていないトランザクションがキャンセルされました。ありがとうございます。
 AccountParameter=アカウントのパラメータ
 UsageParameter=使用パラメータ
 InformationToFindParameters=あなたの%sアカウント情報を見つけるのを助ける
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 4ba868a8bf3..35d7a2587a9 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index ccba0841767..daa5b4ef413 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index a36d63c7373..e8a5dda7efb 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/ka_GE/agenda.lang b/htdocs/langs/ka_GE/agenda.lang
index b928554b328..30c2a3d4038 100644
--- a/htdocs/langs/ka_GE/agenda.lang
+++ b/htdocs/langs/ka_GE/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index 5bc061f31f3..cb39150b627 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-BIC=BIC/SWIFT number
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Statement
 AccountStatements=Account statements
 LastAccountStatements=Last account statements
 IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Supplier payment
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index 0934b4c1e46..c9d46e4ffff 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Payment amount
-ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/ka_GE/cashdesk.lang b/htdocs/langs/ka_GE/cashdesk.lang
index 5138fe80be3..006097b7e82 100644
--- a/htdocs/langs/ka_GE/cashdesk.lang
+++ b/htdocs/langs/ka_GE/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index 83b931731df..3f175b8b782 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=New payment
-Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 68db165215d..b5a9d70cb70 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/ka_GE/holiday.lang b/htdocs/langs/ka_GE/holiday.lang
index 951af61f273..9aafa73550e 100644
--- a/htdocs/langs/ka_GE/holiday.lang
+++ b/htdocs/langs/ka_GE/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index c739f8d5624..6efbe942032 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
 Email=Email
 NoEMail=No email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/ka_GE/members.lang b/htdocs/langs/ka_GE/members.lang
index b29477e346d..9517568846c 100644
--- a/htdocs/langs/ka_GE/members.lang
+++ b/htdocs/langs/ka_GE/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=Members
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=Late
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/ka_GE/modulebuilder.lang b/htdocs/langs/ka_GE/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/ka_GE/modulebuilder.lang
+++ b/htdocs/langs/ka_GE/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/ka_GE/paybox.lang b/htdocs/langs/ka_GE/paybox.lang
index 0d35ac440fa..d5e4fd9ba55 100644
--- a/htdocs/langs/ka_GE/paybox.lang
+++ b/htdocs/langs/ka_GE/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Do payment
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/ka_GE/paypal.lang b/htdocs/langs/ka_GE/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/ka_GE/paypal.lang
+++ b/htdocs/langs/ka_GE/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 841b4a604d3..402779cb00f 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index b0c1113b0ec..76bd0ce597d 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
diff --git a/htdocs/langs/ka_GE/stripe.lang b/htdocs/langs/ka_GE/stripe.lang
index 6fa072b4c9a..7a3389f34b7 100644
--- a/htdocs/langs/ka_GE/stripe.lang
+++ b/htdocs/langs/ka_GE/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditor
 PaymentCode=Payment code
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index f416ebbc84a..b4d894f55d7 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index 69cf8db1717..545a6c660c9 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
 Email=Email
 NoEMail=No email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index ccba0841767..daa5b4ef413 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 7f965bfe315..67c9bb77a9e 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/kn_IN/agenda.lang b/htdocs/langs/kn_IN/agenda.lang
index b928554b328..30c2a3d4038 100644
--- a/htdocs/langs/kn_IN/agenda.lang
+++ b/htdocs/langs/kn_IN/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
index dc383eba5cb..4421ca5411e 100644
--- a/htdocs/langs/kn_IN/banks.lang
+++ b/htdocs/langs/kn_IN/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-BIC=BIC/SWIFT number
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Statement
 AccountStatements=Account statements
 LastAccountStatements=Last account statements
 IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Supplier payment
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index 95f2215c085..cc78ae53b31 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Payment amount
-ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/kn_IN/cashdesk.lang b/htdocs/langs/kn_IN/cashdesk.lang
index 8babc455a25..cf0908f3739 100644
--- a/htdocs/langs/kn_IN/cashdesk.lang
+++ b/htdocs/langs/kn_IN/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index 83b931731df..3f175b8b782 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=New payment
-Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 68db165215d..b5a9d70cb70 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/kn_IN/holiday.lang b/htdocs/langs/kn_IN/holiday.lang
index 951af61f273..9aafa73550e 100644
--- a/htdocs/langs/kn_IN/holiday.lang
+++ b/htdocs/langs/kn_IN/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 93f647fead9..b9b20772410 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
 Email=Email
 NoEMail=No email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang
index b29477e346d..9517568846c 100644
--- a/htdocs/langs/kn_IN/members.lang
+++ b/htdocs/langs/kn_IN/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=Members
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=Late
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/kn_IN/modulebuilder.lang b/htdocs/langs/kn_IN/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/kn_IN/modulebuilder.lang
+++ b/htdocs/langs/kn_IN/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/kn_IN/paybox.lang b/htdocs/langs/kn_IN/paybox.lang
index 0d35ac440fa..d5e4fd9ba55 100644
--- a/htdocs/langs/kn_IN/paybox.lang
+++ b/htdocs/langs/kn_IN/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Do payment
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/kn_IN/paypal.lang b/htdocs/langs/kn_IN/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/kn_IN/paypal.lang
+++ b/htdocs/langs/kn_IN/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 9aceb237ef5..67ad4ef03c0 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index b0c1113b0ec..76bd0ce597d 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
diff --git a/htdocs/langs/kn_IN/stripe.lang b/htdocs/langs/kn_IN/stripe.lang
index 6fa072b4c9a..7a3389f34b7 100644
--- a/htdocs/langs/kn_IN/stripe.lang
+++ b/htdocs/langs/kn_IN/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditor
 PaymentCode=Payment code
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index f416ebbc84a..b4d894f55d7 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index cb6004f2621..e1805e19592 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=원장에 이동 기록하기
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=원장
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 03df34736de..aebb5974443 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Browser=브라우저
 Server=Server
 Database=Database
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang
index 2d061b1fe6a..a690bfa9eb3 100644
--- a/htdocs/langs/ko_KR/agenda.lang
+++ b/htdocs/langs/ko_KR/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index 7968c2efef8..f75794817ce 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-BIC=BIC/SWIFT number
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Statement
 AccountStatements=Account statements
 LastAccountStatements=Last account statements
 IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=공급업체결제
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=부터
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index 9eabac16764..2d92a5836da 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=결제 금액
-ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/ko_KR/cashdesk.lang b/htdocs/langs/ko_KR/cashdesk.lang
index 698647b2812..995e84db455 100644
--- a/htdocs/langs/ko_KR/cashdesk.lang
+++ b/htdocs/langs/ko_KR/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=기록보기
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index ffbc29e7468..d14e2aa53bb 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=New payment
-Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
 CodeNotDef=지정하지 않음
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 68db165215d..b5a9d70cb70 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/ko_KR/holiday.lang b/htdocs/langs/ko_KR/holiday.lang
index 87da570b5ff..3f280cc265a 100644
--- a/htdocs/langs/ko_KR/holiday.lang
+++ b/htdocs/langs/ko_KR/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 0863eaabab1..43241b1201b 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -371,6 +371,7 @@ Percentage=백분율
 Total=합계
 SubTotal=소계
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=합계 (세금 포함)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=확인 이메일 보내기
 SendMail=Send email
 Email=이메일
 NoEMail=이메일 없음
-Email=이메일
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=휴대 전화 없음
@@ -671,7 +671,6 @@ Method=방법
 Receive=수령
 CompleteOrNoMoreReceptionExpected=완료되었거나 더 이상 기대되지 않음
 ExpectedValue=예상 값
-CurrentValue=현재 값
 PartialWoman=분할
 TotalWoman=합계
 NeverReceived=수령 못함
@@ -834,6 +833,7 @@ RelatedObjects=관련 개체
 ClassifyBilled=청구서 분류
 ClassifyUnbilled=Classify unbilled
 Progress=진행
+ProgressShort=Progr.
 FrontOffice=프론트 오피스
 BackOffice=백 오피스
 View=보기
@@ -842,6 +842,11 @@ Exports=내보내기
 ExportFilteredList=필터링 된 목록 내보내기
 ExportList=목록 내보내기
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=기타등등
 Calendar=달력
 GroupBy=그룹화 ...
@@ -854,7 +859,7 @@ Download=다운로드
 DownloadDocument=Download document
 ActualizeCurrency=환율 업데이트
 Fiscalyear=회계 연도
-ModuleBuilder=모듈 빌더
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=통화 설정
 BulkActions=벌크 작업
 ClickToShowHelp=툴팁 도움말을 보려면 클릭하십시오.
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index bf84a9558b1..7aafa62597d 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=회원
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=늦은
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=지우다
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/ko_KR/modulebuilder.lang b/htdocs/langs/ko_KR/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/ko_KR/modulebuilder.lang
+++ b/htdocs/langs/ko_KR/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/ko_KR/paybox.lang b/htdocs/langs/ko_KR/paybox.lang
index f8db1287738..f64511cb4fc 100644
--- a/htdocs/langs/ko_KR/paybox.lang
+++ b/htdocs/langs/ko_KR/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Do payment
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=다음 것
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/ko_KR/paypal.lang b/htdocs/langs/ko_KR/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/ko_KR/paypal.lang
+++ b/htdocs/langs/ko_KR/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 05c59772381..b68dd7a8657 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index da82bd71a38..ad3e07067cb 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=사용자
 TaskTimeNote=노트
diff --git a/htdocs/langs/ko_KR/stripe.lang b/htdocs/langs/ko_KR/stripe.lang
index b5b394bf785..84c51758320 100644
--- a/htdocs/langs/ko_KR/stripe.lang
+++ b/htdocs/langs/ko_KR/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditor
 PaymentCode=Payment code
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=다음 것
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index b4627da44c5..51cba6a8855 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 88c5ece3ca7..c14cc4de907 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 5822414325d..edcb2f39aaf 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/lo_LA/agenda.lang b/htdocs/langs/lo_LA/agenda.lang
index b928554b328..30c2a3d4038 100644
--- a/htdocs/langs/lo_LA/agenda.lang
+++ b/htdocs/langs/lo_LA/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index a9459fc9326..62b17bbcb9e 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=ທະນາຄານ
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=ຊື່ທະນາຄານ
 FinancialAccount=ບັນຊີ
 BankAccount=ບັນຊີທະນາຄານ
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-BIC=BIC/SWIFT number
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Statement
 AccountStatements=Account statements
 LastAccountStatements=Last account statements
 IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Supplier payment
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index 0934b4c1e46..c9d46e4ffff 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Payment amount
-ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang
index 5138fe80be3..006097b7e82 100644
--- a/htdocs/langs/lo_LA/cashdesk.lang
+++ b/htdocs/langs/lo_LA/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index 5effd4f6eb4..64f22a00eb1 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=New payment
-Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 68db165215d..b5a9d70cb70 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/lo_LA/holiday.lang b/htdocs/langs/lo_LA/holiday.lang
index 8155e8b94d2..56812664b87 100644
--- a/htdocs/langs/lo_LA/holiday.lang
+++ b/htdocs/langs/lo_LA/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index fae7766fe01..33d9661f91a 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
 Email=Email
 NoEMail=No email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index a735663149c..d64ca7bef95 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=Members
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=Late
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=ລຶບ
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/lo_LA/modulebuilder.lang b/htdocs/langs/lo_LA/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/lo_LA/modulebuilder.lang
+++ b/htdocs/langs/lo_LA/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/lo_LA/paybox.lang b/htdocs/langs/lo_LA/paybox.lang
index 0d35ac440fa..d5e4fd9ba55 100644
--- a/htdocs/langs/lo_LA/paybox.lang
+++ b/htdocs/langs/lo_LA/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Do payment
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/lo_LA/paypal.lang b/htdocs/langs/lo_LA/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/lo_LA/paypal.lang
+++ b/htdocs/langs/lo_LA/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 75f27d18f23..4c8de042e5c 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index b852bc6a48d..6a9835d9bae 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
diff --git a/htdocs/langs/lo_LA/stripe.lang b/htdocs/langs/lo_LA/stripe.lang
index 6fa072b4c9a..7a3389f34b7 100644
--- a/htdocs/langs/lo_LA/stripe.lang
+++ b/htdocs/langs/lo_LA/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditor
 PaymentCode=Payment code
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index f416ebbc84a..b4d894f55d7 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index 241d4063c06..ed797f13bcc 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Išlaidų ataskaita apvadas
 CreateMvts=Sukurkite naują sandorį
 UpdateMvts=Sandorio keitimas
 ValidTransaction=Patikrinti sandorį
-WriteBookKeeping=Įveskite sandorius Didžiojoje knygoje
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Didžioji knyga
 AccountBalance=Sąskaitos balansas
 ObjectsRef=Šaltinio objekto nuoroda
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Sąskaitos etiketė
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Žurnalas
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=Options
 OptionModeProductSell=Rėžimas pardavimas
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Rėžimas pirkimai
 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
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 7441f227f65..06bd56d55a5 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Paieškai paleisti reikalingas simbolių skaičius: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Neprieinamas, Ajax esant išjungtam
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript išjungtas
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Prievadas (port)
 VirtualServerName=Virtualaus serverio vardas
 OS=Operacinė sistema OS
 PhpWebLink=Web PHP nuoroda
-Browser=Naršyklė
 Server=Serveris
 Database=Duomenų bazė
 DatabaseServer=Duomenų bazės laikytojas
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Sistemos informacija yra įvairi techninė informacija, kurią ga
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=Norint įjungti modulius, reikia eiti į Nuostatų meniu (Pagrindinis-> Nuostatos-> Moduliai).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Sąskaitų-faktūrų ir kredito avizų numeravimo modulis
 BillsPDFModules=Sąskaitų-faktūrų dokumentų moduliai
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Kreditinė sąskaita-faktūra
-CreditNotes=Kreditinės sąskaitos-faktūros
 ForceInvoiceDate=Sąskaitos-faktūros data įsigalioja patvirtinimo datą
 SuggestedPaymentModesIfNotDefinedInInvoice=Siūlomas mokėjimų režimas sąskaitoje-faktūroje pagal nutylėjimą, jei pačioje sąskaitoje nėra apibrėžta kitaip
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Pašto kodas
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang
index c85df1c6de6..4a1261a563a 100644
--- a/htdocs/langs/lt_LT/agenda.lang
+++ b/htdocs/langs/lt_LT/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Įvykiai, kuriems Dolibarr sukurs veiksmą operacijų sąraše aut
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index a7e11ea50d9..bf7802228a6 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bankas
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Banko pavadinimas
 FinancialAccount=Sąskaita
 BankAccount=Banko sąskaita
 BankAccounts=Banko sąskaitos
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Rodyti sąskaitą
 AccountRef=Finansinės sąskaitos nuoroda
 AccountLabel=Finansinės sąskaitos etiketė
@@ -30,7 +30,7 @@ AllTime=Nuo pradžios
 Reconciliation=Suderinimas
 RIB=Banko sąskaitos numeris
 IBAN=IBAN numeris
-BIC=BIC/SWIFT numeris
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Suvestinė
 AccountStatements=Sąskaitos suvestinės
 LastAccountStatements=Sąskaitos naujausios suvestinės
 IOMonthlyReporting=Mėnesio ataskaitos
-BankAccountDomiciliation=Sąskaitos adresas
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Sąskaitos šalis
 BankAccountOwner=Sąskaitos savininko vardas/pavadinimas
 BankAccountOwnerAddress=Sąskaitos savininko adresas
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Sukurti sąskaitą
 NewBankAccount=Naujas sąskaita
 NewFinancialAccount=Nauja finansinė sąskaita
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Kliento mokėjimas
-SupplierInvoicePayment=Tiekėjo mokėjimas
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Pasirašymo apmokėjimas
 WithdrawalPayment=Išėmimo (withdrawal) mokėjimas
 SocialContributionPayment=Socialinio / fiskalinio mokesčio mokėjimas
 BankTransfer=Banko pervedimas
 BankTransfers=Banko pervedimai
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Iš
 TransferTo=Į
 TransferFromToDone=Pervedimas <b>%s</b> iš <b>%s</b> į <b>%s</b> užregistruotas.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Atgal į sąskaitą
 ShowAllAccounts=Rodyti visas sąskaitas
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Pasirinkti banko ataskaitą, susijusią su taikymu. Naudokite rūšiuojamą skaitmeninę reikšmę: YYYYMM arba YYYYMMDD
 EventualyAddCategory=Nurodyti kategoriją, kurioje klasifikuoti įrašus
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Čekis grąžintas ir sąskaita iš naujo atida
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 81bc7c38e31..c40206e8d2d 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Sumokėta atgal (grąžinta)
 DeletePayment=Ištrinti mokėjimą
 ConfirmDeletePayment=Ar tikrai norite ištrinti šį mokėjimą?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Gauti mokėjimai
 ReceivedCustomersPayments=Iš klientų gauti mokėjimai
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Mokėjimo suma
-ValidatePayment=Mokėjimą pripažinti galiojančiu
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Automatiškai patvirtinti sąskaitas faktūras
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Data dar neįvykdyta
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/lt_LT/cashdesk.lang b/htdocs/langs/lt_LT/cashdesk.lang
index f8fc5a4e2ec..4835c923a97 100644
--- a/htdocs/langs/lt_LT/cashdesk.lang
+++ b/htdocs/langs/lt_LT/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Istorija
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index ccd8d0c99af..8340f42dd6a 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Naujas mokėjimas
-Payments=Mokėjimai
 PaymentCustomerInvoice=Kliento sąskaitos-faktūros mokėjimas
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Socialinio / fiskalinio mokesčio mokėjimas
@@ -205,7 +204,6 @@ SellsJournal=Pardavimų žurnalas
 PurchasesJournal=Pirkimų žurnalas
 DescSellsJournal=Pardavimų žurnalas
 DescPurchasesJournal=Pirkimų žurnalas
-InvoiceRef=Sąskaitos-faktūros nuoroda
 CodeNotDef=Neapibūdinta
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Mokėjimo termino data negali būti mažesnė nei objekto data.
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index e844c04b5db..d7758180fb6 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/lt_LT/holiday.lang b/htdocs/langs/lt_LT/holiday.lang
index 129d0d90a94..f4f7cb5e384 100644
--- a/htdocs/langs/lt_LT/holiday.lang
+++ b/htdocs/langs/lt_LT/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 049186b413d..77fad226e8f 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -371,6 +371,7 @@ Percentage=Procentai
 Total=Visas
 SubTotal=Tarpinė suma
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Iš viso (su PVM)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Siųsti e-laišką
 Email=El. paštas
 NoEMail=E-laiškų nėra
-Email=El. paštas
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=Nėra mobilaus telefono
@@ -671,7 +671,6 @@ Method=Metodas
 Receive=Gauti
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Dabartinė reikšmė
 PartialWoman=Dalinis
 TotalWoman=Visas
 NeverReceived=Niekada negautas
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Klasifikuoti su pateiktomis sąskaitomis-faktūromis
 ClassifyUnbilled=Classify unbilled
 Progress=Pažanga
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Galinis biuras (back office)
 View=View
@@ -842,6 +842,11 @@ Exports=Eksportas
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Eksporto pasirinkimai (options)
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Įvairus
 Calendar=Kalendorius
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiskaliniai metai
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index 580576f3203..ddc3f30fd1b 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -6,7 +6,7 @@ Member=Narys
 Members=Nariai
 ShowMember=Rodyti nario kortelę
 UserNotLinkedToMember=Vartotojas nėra susietas su nariu
-ThirdpartyNotLinkedToMember=Trečioji šalis nesusieta su nariu
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Narių kortelės
 FundationMembers=Organizacijos nariai
 ListOfValidatedPublicMembers=Patvirtintų viešųjų narių sąrašas
@@ -67,11 +67,11 @@ Subscriptions=Pasirašymai
 SubscriptionLate=Vėlai
 SubscriptionNotReceived=Pasirašymas negautas
 ListOfSubscriptions=Pasirašymų sąrašas
-SendCardByMail=Siųsti kortelę E-paštu
+SendCardByMail=Send card by email
 AddMember=Sukurti narį
 NoTypeDefinedGoToSetup=Nė apibrėžtų nario tipų. Eiti į meniu "Narių tipai"
 NewMemberType=Naujas nario tipas
-WelcomeEMail=Sveikinimo e-laiškas
+WelcomeEMail=Welcome email
 SubscriptionRequired=Reikalingas pasirašymas
 DeleteType=Ištrinti
 VoteAllowed=Balsuoti leidžiama
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd failas
 ValidateMember=Patvirtinti narį
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=Sekantys saitai yra atidaryti puslapiai neapsaugoti jokiais Dolibarr leidimais. Jie nėra suformatuoti puslapiai, pateikti kaip pavyzdys, kad parodyti, kaip vartyti narių duomenų bazę.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Viešų narių sąrašas
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Jūsų nario kortelės turinys
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Gauto e-laiško subjektas svečio auto įrašo atveju
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Gautas e-laiškas svečio auto įrašo atveju
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Siuntėjo e-paštas automatiniams e-laiškams
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Etikečių puslapio formatas
 DescADHERENT_ETIQUETTE_TEXT=Spausdinamas tekstas ant nario adreso puslapių
 DescADHERENT_CARD_TYPE=Kortelių puslapio formatas
@@ -156,8 +156,8 @@ DocForAllMembersCards=Sukurti vizitines korteles visiems nariams
 DocForOneMemberCards=Sukurti vizitines korteles tam tikriems nariams
 DocForLabels=Sukurti adresų lapus
 SubscriptionPayment=Pasirašymo apmokėjimas
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Narių statistiniai duomenys pagal šalį
 MembersStatisticsByState=Narių statistiniai duomenys pagal valstybę/regioną
 MembersStatisticsByTown=Narių statistiniai duomenys pagal miestus
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Šis ekranas rodo Jums statistinius duomenis apie narius pagal jų tipą.
 MembersByRegion=Šis ekranas rodo Jums statistinius duomenis apie narius pagal regionus.
 VATToUseForSubscriptions=Pasirašymams naudojamas PVM tarifas
-NoVatOnSubscription=Pasirašymams nėra PVM
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Prekė naudojama abonementinei eilutei sąskaitoje-faktūroje: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/lt_LT/modulebuilder.lang b/htdocs/langs/lt_LT/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/lt_LT/modulebuilder.lang
+++ b/htdocs/langs/lt_LT/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/lt_LT/paybox.lang b/htdocs/langs/lt_LT/paybox.lang
index e1e7a824e39..2a6fd14b813 100644
--- a/htdocs/langs/lt_LT/paybox.lang
+++ b/htdocs/langs/lt_LT/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Užbaigti
 YourEMail=E-paštas mokėjimo patvirtinimo gavimui
 Creditor=Kreditorius
 PaymentCode=Mokėjimo kodas
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Atlikti mokėjimą
 YouWillBeRedirectedOnPayBox=Būsite nukreipti į saugų Paybox puslapį kredito kortelės informacijos įvedimui
 Continue=Kitas
 ToOfferALinkForOnlinePayment=URL %s mokėjimui
-ToOfferALinkForOnlinePaymentOnOrder=URL siūlo %s interneto mokėjimui vartotojo sąsają kliento užsakymui
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL siūlo %s interneto mokėjimui vartotojo sąsają kliento sąskaitai-faktūrai
 ToOfferALinkForOnlinePaymentOnContractLine=URL siūlo %s interneto mokėjimui vartotojo sąsają sutarties eilutei.
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL siūlo %s interneto mokėjimui vartotojo sąsaja nemokamam kiekiui.
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL pasiūlymui %s interneto mokėjimui vartotojo sąsają nario pasirašymui.
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Taip pat galite pridėti URL parametrą <b>&tag=<i>value</i></b> į bet kurį URL (reikalingas tik nemokamam mokėjimui) pridėti nuosavo mokėjimo komentaro žymę.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Šis puslapis patvirtina, kad jūsų mokėjimas buvo užregistruotas. Ačiū.
@@ -33,7 +33,8 @@ VendorName=Paravėjo vardas
 CSSUrlForPaymentForm=CSS stiliaus lapo URL mokėjimo formai
 NewPayboxPaymentReceived=Naujas Paybox gautas mokėjimas
 NewPayboxPaymentFailed=Naujas Paybox mokėjimo bandymas, bet nepavykęs
-PAYBOX_PAYONLINE_SENDEMAIL=E-laiškas įspėjimui po apmokėjimo (sėkmingas ar ne)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/lt_LT/paypal.lang b/htdocs/langs/lt_LT/paypal.lang
index 2337054be53..d5bf7378e5e 100644
--- a/htdocs/langs/lt_LT/paypal.lang
+++ b/htdocs/langs/lt_LT/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal modulio nustatymas
-PaypalDesc=Šis modulis siūlo tinklapius mokėjimui <a href="http://www.paypal.com" target="_blank">per PayPal</a> klientams. Tai gali būti naudojama nemokamam mokėjimui arba tam tikro specifinio Dolibarr objekto mokėjimui (sąskaitos-faktūros, užsakymai, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Mokėkite per PayPal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Režimas testas/smėlio dėžė (Sandbox)
 PAYPAL_API_USER=API vartotojo vardas
 PAYPAL_API_PASSWORD=API slaptažodis
 PAYPAL_API_SIGNATURE=API parašas
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Siūlyti mokėjimą "integruotas" (kredito kortelė+PayPal) arba tik PayPal
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integruotas
 PaypalModeOnlyPaypal=Tik PayPal
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=Tai operacijos ID: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Pridėti PayPal mokėjimo URL, kai siunčiate dokumentą paštu
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=E-paštas įspėjimui po mokėjimo (sėkmingas ar ne)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Grįžti į URL po apmokėjimo
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 2350c784d70..4c2bee49d6a 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index a8479fa65b0..cba1bf3c405 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Praleistas laikas
 TimeSpentByYou=Jūsų sugaištas laikas
 TimeSpentByUser=Vartotojo sugaištas laikas
 TimesSpent=Praleistas laikas
-RefTask=Užduoties nuoroda
-LabelTask=Etiketės užduotis
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Laikas, praleistas vykdant užduotis
 TaskTimeUser=Vartotojas
 TaskTimeNote=Pastaba
diff --git a/htdocs/langs/lt_LT/stripe.lang b/htdocs/langs/lt_LT/stripe.lang
index 1a111c8c366..cbed09acbf1 100644
--- a/htdocs/langs/lt_LT/stripe.lang
+++ b/htdocs/langs/lt_LT/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Sekantys URL siūlo puslapį klientui Dolibarr objektų mokėjimui
 PaymentForm=Mokėjimo forma
-WelcomeOnPaymentPage=Sveiki atvykę į mūsų interneto mokėjimo paslaugą
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Šis ekranas leidžia atlikti internetinį mokėjimą į %s
 ThisIsInformationOnPayment=Tai informacija apie reikalingą atlikti mokėjimą
 ToComplete=Užbaigti
 YourEMail=E-paštas mokėjimo patvirtinimo gavimui
-STRIPE_PAYONLINE_SENDEMAIL=E-paštas įspėjimui po mokėjimo (sėkmingas ar ne)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Kreditorius
 PaymentCode=Mokėjimo kodas
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Kitas
 ToOfferALinkForOnlinePayment=URL %s mokėjimui
-ToOfferALinkForOnlinePaymentOnOrder=URL siūlo %s interneto mokėjimui vartotojo sąsają kliento užsakymui
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL siūlo %s interneto mokėjimui vartotojo sąsają kliento sąskaitai-faktūrai
 ToOfferALinkForOnlinePaymentOnContractLine=URL siūlo %s interneto mokėjimui vartotojo sąsają sutarties eilutei.
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL siūlo %s interneto mokėjimui vartotojo sąsaja nemokamam kiekiui.
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL pasiūlymui %s interneto mokėjimui vartotojo sąsają nario pasirašymui.
 YouCanAddTagOnUrl=Taip pat galite pridėti URL parametrą <b>&tag=<i>value</i></b> į bet kurį URL (reikalingas tik nemokamam mokėjimui) pridėti nuosavo mokėjimo komentaro žymę.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=Šis puslapis patvirtina, kad jūsų mokėjimas buvo užregistruotas. Ačiū.
-YourPaymentHasNotBeenRecorded=Mokėjimas nebuvo įregistruotas ir operacija buvo atšaukta. Ačiū.
 AccountParameter=Sąskaitos parametrai
 UsageParameter=Naudojimo parametrai
 InformationToFindParameters=Padėti rasti savo %s sąskaitos informaciją
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index 0ccaf4dd99c..613196a548e 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 776b5fa0f08..b5f5f0fd29c 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -9,8 +9,8 @@ ACCOUNTING_EXPORT_AMOUNT=Eksporta summa
 ACCOUNTING_EXPORT_DEVISE=Eksportējamā valūta
 Selectformat=Izvēlieties faila formātu
 ACCOUNTING_EXPORT_FORMAT=Izvēlieties faila formātu
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ACCOUNTING_EXPORT_ENDLINE=Izvēlieties vagonu atgriešanas veidu
+ACCOUNTING_EXPORT_PREFIX_SPEC=Norādiet faila nosaukuma prefiksu
 ThisService=Šis pakalpojums
 ThisProduct=Šis produkts
 DefaultForService=Noklusējums pakalpojumam
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Izdevumu pārskats ir saistošs
 CreateMvts=Izveidot jaunu darījumu
 UpdateMvts=Darījuma grozīšana
 ValidTransaction=Apstipriniet darījumu
-WriteBookKeeping=Žurnalizēt darījumus grāmatvedībā
+WriteBookKeeping=Reģistrēt darījumus Ledger
 Bookkeeping=Ledger
 AccountBalance=Konta bilance
 ObjectsRef=Avota objekta ref
@@ -148,7 +148,7 @@ ACCOUNTANCY_COMBO_FOR_AUX=Iespējot kombinēto sarakstu papildu kontam (var būt
 
 ACCOUNTING_SELL_JOURNAL=Pārdošanas žurnāls
 ACCOUNTING_PURCHASE_JOURNAL=Pirkuma žurnāls
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Dažādi žurnāli
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Sociālais žurnāls
 ACCOUNTING_HAS_NEW_JOURNAL=Vai jauns Vēstnesis?
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Grāmatvedības konts, lai reģistrētu
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Grāmatvedības konts pēc noklusējuma par nopirktajiem produktiem (izmanto, ja produkta lapā nav noteikts).
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Grāmatvedības konts pēc noklusējuma pārdotajiem produktiem (izmanto, ja produkta lapā nav noteikts).
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Grāmatvedības konts pēc noklusējuma par pārdotajiem produktiem EEK (lieto, ja tas nav norādīts produkta lapā)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Grāmatvedības konts pēc noklusējuma pārdotajiem produktiem, kas eksportēti no EEK (lieto, ja tie nav norādīti produkta lapā)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Grāmatvedības konts pēc noklusējuma par pārdotajiem produktiem EEK (lieto, ja tas nav norādīts produkta lapā)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Grāmatvedības konts pēc noklusējuma par pārdotajiem produktiem, kas eksportēti no EEK (lieto, ja tas nav norādīts produkta lapā)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Grāmatvedības konts pēc noklusējuma par nopirktajiem pakalpojumiem (lieto, ja tas nav noteikts pakalpojuma lapā)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Grāmatvedības konts pēc noklusējuma pārdotajiem pakalpojumiem (izmanto, ja tas nav noteikts pakalpojuma lapā)
 
@@ -177,6 +177,7 @@ LabelAccount=Konta nosaukums
 LabelOperation=Etiķetes darbība
 Sens=Sens
 LetteringCode=Burtu kods
+Lettering=Burti
 Codejournal=Žurnāls
 JournalLabel=Žurnāla etiķete
 NumPiece=Gabala numurs
@@ -212,7 +213,7 @@ ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Pievienojiet grāmatvedības kontiem grupai
 ReportThirdParty=Uzskaitiet trešās puses kontu
 DescThirdPartyReport=Konsultējieties ar trešo pušu klientu un pārdevēju sarakstu un grāmatvedības kontiem
-ListAccounts=List of the accounting accounts
+ListAccounts=Grāmatvedības kontu saraksts
 UnknownAccountForThirdparty=Nezināmas trešās puses konts. Mēs izmantosim %s
 UnknownAccountForThirdpartyBlocking=Nezināms trešās puses konts. Bloķēšanas kļūda
 ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Trešās puses konts nav definēts vai trešā persona nav zināma. Bloķēšanas kļūda.
@@ -240,7 +241,7 @@ DescVentilExpenseReportMore=Ja jūs izveidojat grāmatvedības kontu uz izdevumu
 DescVentilDoneExpenseReport=Konsultējieties šeit ar izdevumu pārskatu rindu sarakstu un to maksu grāmatvedības kontu
 
 ValidateHistory=Bind automātiski
-AutomaticBindingDone=Automātiska piesaistīšana pabeigta
+AutomaticBindingDone=Automātiskā piesaistīšana pabeigta
 
 ErrorAccountancyCodeIsAlreadyUse=Kļūda, nevarat izdzēst šo grāmatvedības kontu, jo tas tiek izmantots
 MvtNotCorrectlyBalanced=Kustība nav pareizi sabalansēta. Debits = %s | Kredīts = %s
@@ -251,7 +252,7 @@ GeneralLedgerSomeRecordWasNotRecorded=Daži darījumi nevarēja tikt publicēti
 NoNewRecordSaved=Neviens ieraksts žurnālistikai nav
 ListOfProductsWithoutAccountingAccount=Produktu saraksts, uz kuriem nav saistīta kāds grāmatvedības konts
 ChangeBinding=Mainiet saites
-Accounted=Uzskaita virsgrāmatā
+Accounted=Uzskaitīts virsgrāmatā
 NotYetAccounted=Vēl nav uzskaitīti virsgrāmatā
 
 ## Admin
@@ -288,8 +289,10 @@ Modelcsv_quadratus=Eksportēt Quadratus QuadraCompta
 Modelcsv_ebp=Eksportēt uz EBP
 Modelcsv_cogilog=Eksportēt uz Cogilog
 Modelcsv_agiris=Eksports uz Agiris
+Modelcsv_openconcerto=Eksportēt OpenConcerto (tests)
 Modelcsv_configurable=Eksportēt CSV konfigurējamu
-Modelcsv_FEC=Eksporta FEC (L47 A pants) (pārbaude)
+Modelcsv_FEC=Eksporta FEC (L47 A pants)
+Modelcsv_Sage50_Swiss=Eksports uz Sage 50 Šveici
 ChartofaccountsId=Kontu konts. Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=Šo lapu var izmantot, lai iestatītu noklusēto kontu, ko iz
 DefaultClosureDesc=Šo lapu var izmantot, lai iestatītu parametrus, kas jāizmanto bilances pievienošanai.
 Options=Iespējas
 OptionModeProductSell=Mode pārdošana
+OptionModeProductSellIntra=Pārdošanas veids, ko eksportē EEK
+OptionModeProductSellExport=Pārdošanas režīms citās valstīs
 OptionModeProductBuy=Mode pirkumi
 OptionModeProductSellDesc=Parādiet visus produktus ar grāmatvedības kontu pārdošanai.
+OptionModeProductSellIntraDesc=Rādīt visus produktus ar grāmatvedības kontu pārdošanai EEK.
+OptionModeProductSellExportDesc=Rādīt visus produktus ar grāmatvedības kontu citiem ārvalstu pārdošanas darījumiem.
 OptionModeProductBuyDesc=Parādiet visus produktus ar grāmatvedības kontu pirkumiem.
 CleanFixHistory=Noņemiet grāmatvedības kodu no rindām, kas nav konta diagrammās
 CleanHistory=Atiestatīt visas saistītās vērtības izvēlētajam gadam
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 87ff5dc3174..dd232956026 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Arī tad, ja jums ir liels skaits trešo personu
 UseSearchToSelectContactTooltip=Arī tad, ja jums ir liels skaits trešo personu (> 100 000), varat palielināt ātrumu, iestatot konstantu CONTACT_DONOTSEARCH_ANYWHERE uz 1 iestatījumos-> Citi. Pēc tam meklēšana tiks ierobežota līdz virknes sākumam.
 DelaiedFullListToSelectCompany=Pagaidiet, kamēr tiek nospiests taustiņš, pirms ievietojat trešo pušu saraksta saturu. <br> Tas var palielināt veiktspēju, ja jums ir liels skaits trešo personu, taču tas ir mazāk ērti.
 DelaiedFullListToSelectContact=Gaida, līdz tiek nospiests taustiņš, pirms ievietojat kontaktpersonu saraksta saturu. <br> Tas var palielināt veiktspēju, ja jums ir liels kontaktpersonu skaits, bet tas ir mazāk ērti).
-NumberOfKeyToSearch=Rakstzīmju skaits, lai iedarbinātu meklēšanu: %s
+NumberOfKeyToSearch=Rakstzīmju skaits, kas aktivizē meklēšanu: %s
+NumberOfBytes=Bitu skaits
+SearchString=Meklēšanas virkne
 NotAvailableWhenAjaxDisabled=Nav pieejama, kad Ajax ir bloķēts
 AllowToSelectProjectFromOtherCompany=Trešās puses dokumentā var izvēlēties projektu, kas ir saistīts ar citu trešo personu
 JavascriptDisabled=JavaScript bloķēts
@@ -104,7 +106,7 @@ ComptaSetup=Uzskaites moduļa iestatīšana
 UserSetup=Lietotāju pārvaldības iestatīšana
 MultiCurrencySetup=Daudzvalūtu iestatījumi
 MenuLimits=Robežas un precizitāte
-MenuIdParent=Mātes izvēlne ID
+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
 AllMenus=Viss
@@ -194,7 +196,7 @@ AutoDetectLang=Automātiski noteikt (pārlūka valoda)
 FeatureDisabledInDemo=Iespēja bloķēta demo versijā
 FeatureAvailableOnlyOnStable=Funkcija ir pieejama tikai oficiālajā stabilā versijā
 BoxesDesc=Logrīki ir sastāvdaļas, kas parāda informāciju, kuru varat pievienot, lai personalizētu dažas lapas. Varat izvēlēties starp widget parādīšanu, izvēloties mērķa lapu un noklikšķinot uz Aktivizēt, vai noklikšķinot uz atkritnes, lai to atspējotu.
-OnlyActiveElementsAreShown=Tikai elementus no <a href="%s">iespējotu moduļi</a> tiek parādīts.
+OnlyActiveElementsAreShown=Tikai elementi no <a href="%s">iespējotiem moduļiem</a> tiek rādīti.
 ModulesDesc=Moduļi / lietojumprogrammas nosaka, kādas funkcijas ir pieejamas programmatūrā. Daži moduļi pieprasa atļauju lietotājiem pēc moduļa aktivizēšanas. Noklikšķiniet uz ieslēgšanas / izslēgšanas pogas (moduļa beigās), lai iespējotu / atspējotu moduli / programmu.
 ModulesMarketPlaceDesc=Jūs varat atrast vairāk moduļu, lai lejupielādētu ārējās tīmekļa vietnēs internetā ...
 ModulesDeployDesc=Ja atļaujas jūsu failu sistēmā to atļauj, varat izmantot šo rīku, lai izvietotu ārēju moduli. Tad modulis būs redzams cilnē <strong> %s </strong>.
@@ -390,7 +392,7 @@ HideDetailsOnPDF=Slēpt informāciju par produktu līnijām
 PlaceCustomerAddressToIsoLocation=Izmantojiet franču standarta pozīciju (La Poste) klienta adreses pozīcijai
 Library=Bibliotēka
 UrlGenerationParameters=Parametri, lai nodrošinātu drošas saites
-SecurityTokenIsUnique=Izmantojiet unikālu securekey parametrs katram URL
+SecurityTokenIsUnique=Izmantojiet unikālu securekey parametru katram URL
 EnterRefToBuildUrl=Ievadiet atsauci objektam %s
 GetSecuredUrl=Saņemt aprēķināto URL
 ButtonHideUnauthorized=Slēpt pogas ne-admin lietotājiem, lai veiktu nesankcionētas darbības, nevis parādīt pelēkās pogas, kas ir atspējotas
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=Šis ir HTML lauka nosaukums. Lai izlasītu HTML lapa
 PageUrlForDefaultValues=Jums jāievada lapas URL relatīvais ceļš. Ja URL ietverat parametrus, noklusējuma vērtības būs efektīvas, ja visi parametri ir iestatīti vienādā vērtībā.
 PageUrlForDefaultValuesCreate=<br> Piemērs: <br> Lai veidlapa izveidotu jaunu trešo personu, tā ir <strong> %s </strong>. <br> Par ārējā moduļa URL, kas instalēts pielāgotā direktorijā, neietveriet "custom /" , tāpēc izmantojiet ceļu, piemēram, <strong> mymodule / mypage.php </strong>, nevis pielāgotu / mymodule / mypage.php. <br> Ja vēlaties noklusējuma vērtību tikai tad, ja URL ir kāds parametrs, varat izmantot <strong> %s < / spēcīgs>
 PageUrlForDefaultValuesList=<br> Piemērs: <br> Lapai, kurā uzskaitītas trešās personas, tas ir <strong> %s </strong>. <br> Par ārējā moduļa URL, kas instalēts pielāgotā direktorijā, neietveriet 'custom /' ceļš, piemēram, <strong> mymodule / mypagelist.php </strong> un nevis pielāgots / mymodule / mypagelist.php. <br> Ja vēlaties noklusējuma vērtību tikai tad, ja URL ir kāds parametrs, varat izmantot <strong> %s </ strong >
+AlsoDefaultValuesAreEffectiveForActionCreate=Ņemiet vērā arī to, ka veidlapu izveides noklusējuma vērtību pārrakstīšana darbojas tikai tām lapām, kas ir pareizi izstrādātas (tātad ar parametru darbību = izveidot vai prezentēt ...)
 EnableDefaultValues=Iespējot noklusējuma vērtību pielāgošanu
 EnableOverwriteTranslation=Iespējot pārrakstīto tulkojumu izmantošanu
 GoIntoTranslationMenuToChangeThis=Taustiņam ir atrasts tulkojums ar šo kodu. Lai mainītu šo vērtību, jums ir jārediģē no Mājas-Iestatījumi-tulkošana.
@@ -710,7 +713,7 @@ Permission125=Dzēst trešās personas, kas saistītas ar lietotāju
 Permission126=Eksportēt trešās puses
 Permission141=Lasīt visus projektus un uzdevumus (arī privātus projektus, kuriem es neesmu kontaktpersona)
 Permission142=Izveidot / modificēt visus projektus un uzdevumus (arī privātus projektus, kuriem es neesmu kontaktpersona)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission144=Dzēst visus projektus un uzdevumus (arī privātus projektus, ar kuriem neesmu sazinājies)
 Permission146=Lasīt pakalpojumu sniedzējus
 Permission147=Lasīt statistiku
 Permission151=Read direct debit payment orders
@@ -784,7 +787,7 @@ Permission300=Lasīt svītrkodus
 Permission301=Izveidojiet/labojiet svītrkodus
 Permission302=Svītrkoda dzēšana
 Permission311=Lasīt pakalpojumus
-Permission312=Assign service/subscription to contract
+Permission312=Piešķirt pakalpojuma / abonēšanas līgumu
 Permission331=Lasīt grāmatzīmes
 Permission332=Izveidot/mainīt grāmatzīmes
 Permission333=Dzēst grāmatzīmes
@@ -989,7 +992,6 @@ Port=Ports
 VirtualServerName=Virtuālā servera nosaukums
 OS=OS
 PhpWebLink=Web PHP saite
-Browser=Pārlūkprogramma
 Server=Serveris
 Database=Datubāze
 DatabaseServer=Datubāzes serveris
@@ -1054,7 +1056,7 @@ Delays_MAIN_DELAY_MEMBERS=Aizkavēta dalības maksa
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Pārbaudiet depozītu, kas nav izdarīts
 Delays_MAIN_DELAY_EXPENSEREPORTS=Izdevumu pārskats kurš jāapstiprina
 SetupDescription1=Pirms sākat lietot Dolibarr, jānosaka daži sākotnējie parametri un moduļi ir iespējoti / konfigurēti.
-SetupDescription2=Šādas divas sadaļas ir obligātas (divi pirmie ieraksti izvēlnē Iestatīšana):
+SetupDescription2=Šīs divas sadaļas ir obligātas (divi pirmie ieraksti iestatīšanas izvēlnē):
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> Pamata parametri, ko izmanto, lai pielāgotu lietojumprogrammas noklusējuma uzvedību (piem., Valstij raksturīgās funkcijas).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> Šī programmatūra ir daudzu moduļu / programmu komplekts, kas ir vairāk vai mazāk neatkarīgi. Moduļiem, kas atbilst jūsu vajadzībām, jābūt iespējotiem un konfigurētiem. Jaunie vienumi / opcijas tiek pievienotas izvēlnēm, aktivizējot moduli.
 SetupDescription5=Citi iestatījumu izvēlnes ieraksti pārvalda izvēles parametrus.
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Sistēmas informācija ir dažādi tehniskā informācija jums ti
 SystemAreaForAdminOnly=Šī joma ir pieejama tikai administratora lietotājiem. Dolibarr lietotāja atļaujas nevar mainīt šo ierobežojumu.
 CompanyFundationDesc=Rediģējiet uzņēmuma / organizācijas informāciju. Noklikšķiniet uz pogas "%s" vai "%s" lapas apakšdaļā.
 AccountantDesc=Rediģējiet informāciju par savu grāmatvedi / grāmatvedi
-AccountantFileNumber=Faila numurs
+AccountantFileNumber=Grāmatveža kods
 DisplayDesc=Šeit var mainīt parametrus, kas ietekmē Dolibarr izskatu un uzvedību.
 AvailableModules=Pieejamās progrmma / moduļi
 ToActivateModule=Lai aktivizētu moduļus, dodieties uz iestatīšanas apgabalu (Sākums-> Iestatīšana-> Moduļi).
@@ -1107,7 +1109,7 @@ NoEventFoundWithCriteria=Šim meklēšanas kritērijam nav atrasts neviens droš
 SeeLocalSendMailSetup=Skatiet sendmail iestatījumus
 BackupDesc=Lai veiktu Dolibarr instalācijas <b> pilnīgu </b> dublējumu, ir nepieciešami divi soļi.
 BackupDesc2=Dublējiet direktoriju "dokumentu" (<b> %s </b>) saturu, kurā ir visi augšupielādētie un ģenerētie faili. Tas ietvers arī visus 1. posmā radītos izgāztuves failus.
-BackupDesc3=Dublējiet datubāzē jūsu datubāzes struktūru un saturu (<b> %s </b>). Lai to izdarītu, varat izmantot šādu palīgu.
+BackupDesc3=Dublējiet jūsu datubāzes struktūru un saturu (<b> %s </b>). Lai to izdarītu, varat izmantot šo palīgu.
 BackupDescX=Arhivēto direktoriju vajadzētu glabāt drošā vietā.
 BackupDescY=Radītais dump fails jāglabā drošā vietā.
 BackupPHPWarning=Ar šo metodi nevar veikt rezerves kopijas. Ieteicams iepriekšējais.
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Rēķinu un kredītu piezīmes numerācijas modelis
 BillsPDFModules=Rēķina dokumentu modeļi
 BillsPDFModulesAccordindToInvoiceType=Rēķinu dokumentu modeļi atbilstoši rēķina veidam
 PaymentsPDFModules=Maksājumu dokumentu paraugi
-CreditNote=Kredīta piezīme
-CreditNotes=Kredīta piezīmes
 ForceInvoiceDate=Force rēķina datumu apstiprināšanas datuma
 SuggestedPaymentModesIfNotDefinedInInvoice=Ieteicamie maksājumi režīmā rēķinā pēc noklusējuma, ja nav definēts rēķins
 SuggestPaymentByRIBOnAccount=Iesakiet norēķinu ar norēķinu kontu
@@ -1282,7 +1282,7 @@ TemplatePDFInterventions=Intervences karšu dokumenti modeļi
 WatermarkOnDraftInterventionCards=Ūdenszīme intervences karšu dokumentiem (neviena ja tukšs)
 ##### Contracts #####
 ContractsSetup=Līgumu/Subscriptions moduļa iestatīšana
-ContractsNumberingModules=Līgumi numerācijas moduļus
+ContractsNumberingModules=Līgumu numerācijas moduļi
 TemplatePDFContracts=Contracts documents models
 FreeLegalTextOnContracts=Free text on contracts
 WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
@@ -1458,7 +1458,7 @@ ProductSetup=Produktu moduļa uzstādīšana
 ServiceSetup=Pakalpojumu moduļa uzstādīšana
 ProductServiceSetup=Produktu un pakalpojumu moduļu uzstādīšana
 NumberOfProductShowInSelect=Maksimālais produktu skaits, kas jāparāda kombinētajos atlases sarakstos (0 = bez ierobežojuma)
-ViewProductDescInFormAbility=Rādīt produktu aprakstus veidlapās (citādi tiek parādīts rīkjoslas uznirstošajā logā)
+ViewProductDescInFormAbility=Rādīt produktu aprakstus veidlapās (citādi tiek rādīts rīkjoslas uznirstošajā logā)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Attēlot produktu aprakstus trešās puses valodā
 UseSearchToSelectProductTooltip=Arī tad, ja jums ir liels produktu skaits (> 100 000), varat palielināt ātrumu, iestatot iestatījumu -> Cits iestatījumu konstante PRODUCT_DONOTSEARCH_ANYWHERE uz 1. Tad meklēšana būs tikai virknes sākums.
@@ -1819,7 +1819,7 @@ ChartLoaded=Konta diagramma ielādēta
 SocialNetworkSetup=Moduļa Sociālo tīklu iestatīšana
 EnableFeatureFor=Iespējot funkcijas <strong> %s </strong>
 VATIsUsedIsOff=Piezīme. Izvēlnē %s - %s izvēlētā pārdošanas nodokļa vai PVN izmantošana ir iestatīta uz <strong> Izslēgts </strong>, tāpēc pārdošanas nodoklis vai izmantotais PVN vienmēr būs 0 pārdošanai.
-SwapSenderAndRecipientOnPDF=Pārsūtīt sūtītāja un adresāta adresi PDF formātā
+SwapSenderAndRecipientOnPDF=Pārsūtīt sūtītāja un adresāta adreses pozīciju PDF dokumentos
 FeatureSupportedOnTextFieldsOnly=Brīdinājums, funkcija tiek atbalstīta tikai teksta laukos. Jāiestata arī URL parametrs action = Create vai action = rediģēt. VAI lapas nosaukumam jābeidzas ar 'new.php', lai aktivizētu šo funkciju.
 EmailCollector=E-pasta savācējs
 EmailCollectorDescription=Pievienojiet ieplānoto darbu un iestatīšanas lapu, lai regulāri skenētu e-pasta kastes (izmantojot IMAP protokolu) un ierakstītu savā pieteikumā saņemtos e-pasta ziņojumus pareizajā vietā un / vai automātiski izveidotu ierakstus (piemēram, vadus).
@@ -1828,7 +1828,9 @@ EMailHost=E-pasta IMAP serveris
 MailboxSourceDirectory=Pastkastes avota katalogs
 MailboxTargetDirectory=Pastkastes mērķa direktorija
 EmailcollectorOperations=Darbi, ko veic savācējs
+MaxEmailCollectPerCollect=Maksimālais savākto e-pasta ziņojumu skaits
 CollectNow=Savākt tagad
+ConfirmCloneEmailCollector=Vai tiešām vēlaties klonēt e-pasta kolekcionāru %s?
 DateLastCollectResult=Datums, kad saņemts pēdējais savākšanas mēģinājums
 DateLastcollectResultOk=Pēdējais datums savāc veiksmīgi
 LastResult=Jaunākais rezultāts
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr sekošanas ID nav atrasts
 FormatZip=Pasta indekss
 MainMenuCode=Izvēlnes ievades kods (mainmenu)
 ECMAutoTree=Rādīt automātisko ECM koku
-OperationParamDesc=Definējiet vērtības, kas izmantojamas darbībai vai kā iegūt vērtības. Piemēram: <br> objproperty1 = SET: abc <br> objproperty2 = EKSTRAKTS: HEADER: X-Myheaderkey. = EXTRACT: ĶERMEŅA: Mans uzņēmuma nosaukums ir s ([^ s] *) <br> <br> Izmantojiet a; atdalīt, lai iegūtu vai iestatītu vairākas īpašības.
+OperationParamDesc=Definējiet vērtības, kas izmantojamas darbībai vai kā iegūt vērtības. Piemēram: <br> objproperty1 = SET: abc <br> objproperty1 = SET: vērtība, aizvietojot __objproperty1__ <br> objproperty3 = SETIFEMPTY: abc <br> objproperty4 = EXTRACT: HEADER: X-Myheaderkey. * [^ s] + (. *) <br> options_myextrafield = EKSTRAKTS: TEMATI: ([^ s] *) <br> object.objproperty5 = EXTRACT: ĶERMEŅA: Mans uzņēmuma nosaukums ir ([^ s] *) <br><br> Lieto ; atdalīt, lai iegūtu vai iestatītu vairākas īpašības.
 OpeningHours=Darba laiks
 OpeningHoursDesc=Ievadiet šeit sava uzņēmuma pastāvīgo darba laiku.
 ResourceSetup=Resursu moduļa konfigurēšana
@@ -1882,3 +1884,10 @@ SmallerThan=Mazāks nekā
 LargerThan=Lielāks nekā
 IfTrackingIDFoundEventWillBeLinked=Ņemiet vērā, ka, ja ienākošajā e-pastā tiek atrasts izsekošanas ID, notikums tiks automātiski saistīts ar saistītajiem objektiem.
 WithGMailYouCanCreateADedicatedPassword=Izmantojot GMail kontu, ja esat iespējojis 2 soļu validāciju, ieteicams izveidot īpašu lietojumprogrammas otro paroli, nevis izmantot sava konta caurlaides paroli no https://myaccount.google.com/.
+IFTTTSetup=IFTTT moduļa iestatīšana
+IFTTT_SERVICE_KEY=IFTTT servisa atslēga
+IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Drošības atslēga, lai aizsargātu IFTTT izmantoto parametru URL, lai nosūtītu ziņas jūsu Dolibarr.
+IFTTTDesc=Šis modulis ir paredzēts, lai aktivizētu IFTTT notikumus un / vai veiktu kādu darbību, izmantojot ārējos IFTTT trigerus.
+UrlForIFTTT=URL beigu punkts IFTTT
+YouWillFindItOnYourIFTTTAccount=Jūs atradīsiet to savā IFTTT kontā
+EndPointFor=Beigu punkts %s: %s
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index f3bc8353612..e80bc475386 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Pasākumi, par kuriem Dolibarr radīs prasību kārtībā automāt
 EventRemindersByEmailNotEnabled=Pasākumu atgādinājumi pa e-pastu netika iespējoti %s moduļa iestatījumos.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Trešā puse izveidota %s
+COMPANY_DELETEInDolibarr=Izdzēsta trešā persona %s
 ContractValidatedInDolibarr=Līgumi %s apstiprināti
 CONTRACT_DELETEInDolibarr=Līgums %s svītrots
 PropalClosedSignedInDolibarr=Piedāvājumi %s parakstīti
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Projekts %s ir labots
 PROJECT_DELETEInDolibarr=Projekts %s dzēsts
 TICKET_CREATEInDolibarr=Biļete %s izveidota
 TICKET_MODIFYInDolibarr=Biļete %s modificēta
+TICKET_ASSIGNEDInDolibarr=Biļete %s piešķirta
 TICKET_CLOSEInDolibarr=Biļete %s slēgta
 TICKET_DELETEInDolibarr=Pieteikums %s dzēsts
 ##### End agenda events #####
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index f09df469ba7..f40c1bdb7df 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banka
-MenuBankCash=Banka | Skaidra nauda
+MenuBankCash=Bankas | Nauda
 MenuVariousPayment=Dažādi maksājumi
 MenuNewVariousPayment=Jauns Dažāds maksājums
 BankName=Bankas nosaukums
 FinancialAccount=Konts
 BankAccount=Bankas konts
 BankAccounts=Banku konti
-BankAccountsAndGateways=Banka|Vārtejas
+BankAccountsAndGateways=Bankas konti | Vārti
 ShowAccount=Rādīt kontu
 AccountRef=Finanšu konta ref
 AccountLabel=Finanšu konts nosaukums
@@ -30,7 +30,7 @@ AllTime=No sākuma
 Reconciliation=Samierināšanās
 RIB=Bankas konta numurs
 IBAN=IBAN numurs
-BIC=BIC / SWIFT numurs
+BIC=BIC / SWIFT kods
 SwiftValid=BIC / SWIFT derīgs
 SwiftVNotalid=BIC/SWIFT nav derīgs
 IbanValid=Derīgs BAN
@@ -42,11 +42,11 @@ AccountStatementShort=Paziņojums
 AccountStatements=Konta izraksti
 LastAccountStatements=Pēdējie konta izraksti
 IOMonthlyReporting=Mēneša pārskati
-BankAccountDomiciliation=Konta adrese
+BankAccountDomiciliation=Bankas adrese
 BankAccountCountry=Konta valsts
 BankAccountOwner=Konta īpašnieka vārds
 BankAccountOwnerAddress=Konta īpašnieka adrese
-RIBControlError=Vērtību integritātes pārbaude neizdodas. Tas nozīmē, ka informācija par šī konta numuru ir nepilnīga vai nepareiza (pārbaudiet valsti, ciparus un IBAN).
+RIBControlError=Vērtību integritātes pārbaude neizdevās. Tas nozīmē, ka informācija par šī konta numuru nav pilnīga vai ir nepareiza (pārbaudiet valsti, numurus un IBAN).
 CreateAccount=Izveidot kontu
 NewBankAccount=Jauns konts
 NewFinancialAccount=Jauns finanšu konts
@@ -105,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bankas pārskaitījums
 BankTransfers=Bankas pārskaitījumi
 MenuBankInternalTransfer=Iekšējā pārsūtīšana
-TransferDesc=Pārejot no viena konta uz otru, Dolibarr uzraksta divus ierakstus (debeta avota kontā un kredīta mērķa kontā). Šim darījumam tiks izmantota tāda pati summa (izņemot zīmi), etiķeti un datumu)
+TransferDesc=Pārsūtīšana no viena konta uz citu, Dolibarr rakstīs divus ierakstus (debeta avota kontā un kredītu mērķa kontā). Šim darījumam tiks izmantota tāda pati summa (izņemot zīmi), etiķete un datums.
 TransferFrom=No
 TransferTo=Kam
 TransferFromToDone=No <b>%s</b> nodošana <b>%s</b> par <b>%s</b> %s ir ierakstīta.
@@ -136,7 +136,7 @@ BankTransactionLine=Bankas darījums
 AllAccounts=Visi bankas un naudas konti
 BackToAccount=Atpakaļ uz kontu
 ShowAllAccounts=Parādīt visiem kontiem
-FutureTransaction=Darījums nākotnē. Nav iespējams samierināties.
+FutureTransaction=Nākotnes darījums. Nevar saskaņot.
 SelectChequeTransactionAndGenerate=Atlasiet / filtru pārbaudes, lai iekļautu čeku depozīta kvīti, un noklikšķiniet uz "Izveidot".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Galu galā, norādiet kategoriju, kurā klasificēt ierakstus
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Dokumentu veidnes banku kontiem
 DocumentModelSepaMandate=SEPA mandāta veidne. Noderīga Eiropas valstīm tikai EEK.
 DocumentModelBan=Veidne, lai izdrukātu lapu ar BAN informāciju.
-NewVariousPayment=Jauni dažādi maksājumi
+NewVariousPayment=Jauns dažādi maksājumi
 VariousPayment=Dažādi maksājumi
 VariousPayments=Dažādi maksājumi
-ShowVariousPayment=Parādīt dažādus maksājumus
-AddVariousPayment=Pievienot dažādus maksājumus
+ShowVariousPayment=Rādīt dažādus maksājumus
+AddVariousPayment=Pievienot dažādus maksājumu
 SEPAMandate=SEPA mandāts
 YourSEPAMandate=Jūsu SEPA mandāts
 FindYourSEPAMandate=Tas ir jūsu SEPA mandāts, lai pilnvarotu mūsu uzņēmumu veikt tiešā debeta pasūtījumu savai bankai. Atgriezt to parakstu (skenēt parakstīto dokumentu) vai nosūtīt pa pastu uz
-AutoReportLastAccountStatement=Automātiski aizpildiet lauku "Bankas izziņu numurs" ar pēdējo paziņojuma numuru, veicot saskaņošanu
+AutoReportLastAccountStatement=Veicot saskaņošanu, automātiski aizpildiet lauka “bankas izraksta numurs” ar pēdējo izraksta numuru
+CashControl=POS naudas žogs
+NewCashFence=Jauns naudas žogs
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 3c8dae3afe8..47690bc4ba5 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -41,7 +41,7 @@ CorrectionInvoice=Rēķina labošana
 UsedByInvoice=Izmanto, lai samaksātu rēķinu %s
 ConsumedBy=Patērējis
 NotConsumed=Nepatērē
-NoReplacableInvoice=Nav maināmu rēķinu
+NoReplacableInvoice=Nav aizvietojamu rēķinu
 NoInvoiceToCorrect=Nav rēķinu kurus jālabo
 InvoiceHasAvoir=Was source of one or several credit notes
 CardBill=Rēķina kartiņa
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=rēķinu valūtā
 PaidBack=Atmaksāts atpakaļ
 DeletePayment=Izdzēst maksājumu
 ConfirmDeletePayment=Vai tiešām vēlaties dzēst šo maksājumu?
-ConfirmConvertToReduc=Vai jūs vēlaties pārvērst šo %s par absolūtu atlaidi? <br> Summa tiks saglabāta starp visām atlaidēm, un to varēs izmantot kā atlaidi pašreizējam vai turpmākam rēķinam šim klientam.
-ConfirmConvertToReducSupplier=Vai vēlaties konvertēt šo %s par absolūtu atlaidi? <br> Summa tiks saglabāta starp visām atlaidēm un to var izmantot kā atlaidi pašreizējam vai nākamajam rēķinam par šo pārdevēju.
+ConfirmConvertToReduc=Vai vēlaties konvertēt šo %s par absolūto atlaidi?
+ConfirmConvertToReduc2=Summa tiks saglabāta starp visām atlaidēm un to var izmantot kā atlaidi pašreizējam vai nākotnes rēķinam par šo klientu.
+ConfirmConvertToReducSupplier=Vai vēlaties konvertēt šo %s par absolūto atlaidi?
+ConfirmConvertToReducSupplier2=Summa tiks saglabāta starp visām atlaidēm un to var izmantot kā atlaidi pašreizējam vai nākamajam rēķinam par šo pārdevēju.
 SupplierPayments=Pārdevēja maksājumi
 ReceivedPayments=Saņemtie maksājumi
 ReceivedCustomersPayments=Maksājumi, kas saņemti no klientiem
@@ -89,7 +91,6 @@ PaymentTerm=Maksājuma termiņš
 PaymentConditions=Maksājuma nosacījumi
 PaymentConditionsShort=Maksājuma nosacījumi
 PaymentAmount=Maksājuma summa
-ValidatePayment=Apstiprināt maksājumu
 PaymentHigherThanReminderToPay=Maksājumu augstāka nekā atgādinājums par samaksu
 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.
@@ -307,7 +308,7 @@ BillAddress=Rēķina adrese
 HelpEscompte=Šī atlaide ir atlaide, kas piešķirta klientam, jo ​​maksājums tika veikts pirms termiņa.
 HelpAbandonBadCustomer=Šī summa ir atteikta (klients uzskata par sliktu klientu), un tiek uzskatīts par ārkārtas zaudējumiem.
 HelpAbandonOther=Šī summa ir pārtraukta, jo tā bija kļūda (piemēram, nepareizs klients vai rēķins).
-IdSocialContribution=Social/fiscal tax payment id
+IdSocialContribution=Sociālā / fiskālā nodokļa maksājuma id
 PaymentId=Maksājuma id
 PaymentRef=Maksājuma ref.
 InvoiceId=Rēķina id
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Rēķinus automātiski apstiprināt
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Izveidots no veidnes rēķina %s
 WarningInvoiceDateInFuture=Brīdinājums! Rēķina datums ir lielāks par pašreizējo datumu
 WarningInvoiceDateTooFarInFuture=Brīdinājums, rēķina datums ir pārāk tālu no pašreizējā datuma
 ViewAvailableGlobalDiscounts=Skatīt pieejamās atlaides
diff --git a/htdocs/langs/lv_LV/bookmarks.lang b/htdocs/langs/lv_LV/bookmarks.lang
index 04b76439849..1808ab439c9 100644
--- a/htdocs/langs/lv_LV/bookmarks.lang
+++ b/htdocs/langs/lv_LV/bookmarks.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Add current page to bookmarks
+AddThisPageToBookmarks=Pievienot pašreizējo lapu grāmatzīmēm
 Bookmark=Grāmatzīme
 Bookmarks=Grāmatzīmes
-ListOfBookmarks=Saraksts grāmatzīmes
-EditBookmarks=List/edit bookmarks
+ListOfBookmarks=Grāmatzīmju saraksts
+EditBookmarks=Skatīt / rediģēt grāmatzīmes
 NewBookmark=Jauna grāmatzīme
 ShowBookmark=Rādīt grāmatzīmi
-OpenANewWindow=Atvērt jaunu logu
-ReplaceWindow=Aizstāt pašreizējo logu
-BookmarkTargetNewWindowShort=Jauns logs
-BookmarkTargetReplaceWindowShort=Pašreizējais logs
-BookmarkTitle=Grāmatzīme titulu
+OpenANewWindow=Atvērt jaunu cilni
+ReplaceWindow=Nomainiet pašreizējo cilni
+BookmarkTargetNewWindowShort=Jauna cilne
+BookmarkTargetReplaceWindowShort=Pašreizējā cilne
+BookmarkTitle=Grāmatzīmes nosaukums
 UrlOrLink=URL
 BehaviourOnClick=Behaviour when a bookmark URL is selected
 CreateBookmark=Izveidot grāmatzīmi
-SetHereATitleForLink=Uzstādīt grāmatzīmes nosaukumu
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Izmantojiet ārējo http URL vai relatīvo Dolibarr URL
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if linked page must open in new window or not
+SetHereATitleForLink=Iestatiet grāmatzīmes nosaukumu
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Izmantojiet ārēju / absolūtu saiti (https: // URL) vai iekšējo / relatīvo saiti (/ DOLIBARR_ROOT / htdocs / ...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Izvēlieties, vai saistītā lapa jāatver pašreizējā cilnē vai jaunā cilnē
 BookmarksManagement=Grāmatzīmju vadība
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index 36ea3749464..af341d818be 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -31,11 +31,11 @@ BoxTitleLastSupplierBills=Jaunākās %s Vendor rēķini
 BoxTitleLastModifiedProspects=Perspektīvas: pēdējais %s modificēts
 BoxTitleLastModifiedMembers=Jaunākie %s dalībnieki
 BoxTitleLastFicheInter=Jaunākās %s izmaiņas iejaukšanās
-BoxTitleOldestUnpaidCustomerBills=Klientu rēķini: vecākie %s neapmaksāti
+BoxTitleOldestUnpaidCustomerBills=Klientu rēķini: vecākie %s neapmaksātie
 BoxTitleOldestUnpaidSupplierBills=Pārdevēja rēķini: vecākie %s neapmaksātie
 BoxTitleCurrentAccounts=Atvērtie konti: atlikumi
 BoxTitleLastModifiedContacts=Kontakti / adreses: pēdējais %s modificēts
-BoxMyLastBookmarks=Grāmatzīmes: jaunākais %s
+BoxMyLastBookmarks=Grāmatzīmes: jaunākās %s
 BoxOldestExpiredServices=Vecākais aktīvais beidzies pakalpojums
 BoxLastExpiredServices=Jaunākie %s vecākie kontakti ar aktīviem derīguma termiņa beigām
 BoxTitleLastActionsToDo=Jaunākās %s darbības, ko darīt
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index b97f43a1bfa..f292e574ab7 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Grupējiet PVN pēc likmes biļetēs
 AutoPrintTickets=Automātiski drukāt biļetes
 EnableBarOrRestaurantFeatures=Iespējot bāra vai restorāna funkcijas
 ConfirmDeletionOfThisPOSSale=Vai jūsu apstiprinājums ir šīs pašreizējās pārdošanas dzēšana?
+History=Vēsture
+ValidateAndClose=Apstipriniet un aizveriet
+Terminal=Terminal
+NumberOfTerminals=Termināļu skaits
+TerminalSelect=Atlasiet termināli, kuru vēlaties izmantot:
+POSTicket=POS biļete
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index 2ac7ec9ab66..623c8f570c2 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -47,13 +47,13 @@ ContentsVisibleByAllShort=Saturs redzams visiem
 ContentsNotVisibleByAllShort=Saturu visi neredz
 DeleteCategory=Dzēst atzīmi / sadaļu
 ConfirmDeleteCategory=Vai tiešām vēlaties dzēst šo tagu / kategoriju?
-NoCategoriesDefined=No tag/category defined
+NoCategoriesDefined=Nav atzīmēta taga / kategorija
 SuppliersCategoryShort=Pārdevēju atzīme / kategorija
-CustomersCategoryShort=Customers tag/category
+CustomersCategoryShort=Klientu atzīme / kategorija
 ProductsCategoryShort=Produktu tag / sadaļa
-MembersCategoryShort=Members tag/category
+MembersCategoryShort=Dalībnieku atzīme / kategorija
 SuppliersCategoriesShort=Pārdevēju tagi / kategorijas
-CustomersCategoriesShort=Customers tags/categories
+CustomersCategoriesShort=Klientu tagi / kategorijas
 ProspectsCategoriesShort=Izredzes tagi / kategorijas
 CustomersProspectsCategoriesShort=Cust /.Prosp. tagi / kategorijas
 ProductsCategoriesShort=Produktu tagi / sadaļas
@@ -69,17 +69,17 @@ ThisCategoryHasNoMember=Šajā sadaļaā nav neviena dalībnieka.
 ThisCategoryHasNoContact=Šajā kategorijā nav kontaktu.
 ThisCategoryHasNoAccount=Šī sadaļā nav neviena konta.
 ThisCategoryHasNoProject=Šī sadaļa nesatur nevienu projektu.
-CategId=Tag/category id
+CategId=Tag / kategorijas ID
 CatSupList=Piegādātāju tagu / kategoriju saraksts
-CatCusList=List of customer/prospect tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
+CatCusList=Klientu / perspektīvu tagu / kategoriju saraksts
+CatProdList=Produktu tagu / kategoriju saraksts
+CatMemberList=Dalībnieku tagu / kategoriju saraksts
 CatContactList=List of contact tags/categories
 CatSupLinks=Saites starp piegādātājiem un tagiem / sadaļām
-CatCusLinks=Links between customers/prospects and tags/categories
-CatProdLinks=Links between products/services and tags/categories
+CatCusLinks=Saiknes starp klientiem / perspektīvām un tagiem / kategorijām
+CatProdLinks=Saiknes starp produktiem / pakalpojumiem un tagiem / kategorijām
 CatProJectLinks=Saiknes starp projektiem un tagiem / kategorijām
-DeleteFromCat=Remove from tags/category
+DeleteFromCat=Noņemt no tagiem / kategorijas
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
diff --git a/htdocs/langs/lv_LV/commercial.lang b/htdocs/langs/lv_LV/commercial.lang
index 46b2def6972..ad47a11b3a1 100644
--- a/htdocs/langs/lv_LV/commercial.lang
+++ b/htdocs/langs/lv_LV/commercial.lang
@@ -9,7 +9,7 @@ DeleteAction=Dzēst notikumu
 NewAction=Jauns notikums
 AddAction=Izveidot notikumu
 AddAnAction=Izveidot notikumu
-AddActionRendezVous=Create a Rendez-vous event
+AddActionRendezVous=Izveidojiet Rendez-vous notikumu
 ConfirmDeleteAction=Vai tiešām vēlaties dzēst šo notikumu?
 CardAction=Notikumu kartiņa
 ActionOnCompany=Saistīts uzņēmums
@@ -18,7 +18,7 @@ TaskRDVWith=Tikšanās ar %s
 ShowTask=Rādīt uzdevumu
 ShowAction=Rādīt notikumu
 ActionsReport=Notikumu ziņojumi
-ThirdPartiesOfSaleRepresentative=Third parties with sales representative
+ThirdPartiesOfSaleRepresentative=Trešās puses ar tirdzniecības pārstāvi
 SaleRepresentativesOfThirdParty=Trešo personu tirdzniecības pārstāvji
 SalesRepresentative=Pārdošanas pārstāvis
 SalesRepresentatives=Tirdzniecības pārstāvji
@@ -59,7 +59,7 @@ ActionAC_FAC=Nosūti klienta rēķinu pa pastu
 ActionAC_REL=Nosūti klientu rēķinu pa pastu (atgādinājums)
 ActionAC_CLO=Aizvērt
 ActionAC_EMAILING=Sūtīt masveida e-pastu
-ActionAC_COM=Nosūtīt klienta pasūtījumu pa pastu
+ActionAC_COM=Nosūtīt pārdošanas pasūtījumu pa pastu
 ActionAC_SHIP=Nosūtīt piegādi pa pastu
 ActionAC_SUP_ORD=Nosūtiet pirkumu pa pastu
 ActionAC_SUP_INV=Nosūtiet pārdevēju rēķinu pa pastu
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index d697111cb4a..4061ed23e72 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -28,7 +28,7 @@ AliasNames=Alias name (commercial, trademark, ...)
 AliasNameShort=Alias ​​vārds
 Companies=Uzņēmumi
 CountryIsInEEC=Valsts atrodas Eiropas Ekonomikas kopienā
-PriceFormatInCurrentLanguage=Cenu formāts pašreizējā valodā
+PriceFormatInCurrentLanguage=Cenu attēlošanas formāts pašreizējā valodā un valūtā
 ThirdPartyName=Trešās puses nosaukums
 ThirdPartyEmail=Trešās puses e-pasts
 ThirdParty=Trešā puse
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index 27976176989..a5bfc0331a9 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Pievienot sociālo / fiskālo nodokli
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Norēķinu un maksājumu zona
 NewPayment=Jauns maksājums
-Payments=Maksājumi
 PaymentCustomerInvoice=Klienta rēķina apmaksa
 PaymentSupplierInvoice=pārdevēja rēķina apmaksa
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Pārdošanas žurnāls
 PurchasesJournal=Pirkšanas žurnāls
 DescSellsJournal=Pārdošanas žurnāls
 DescPurchasesJournal=Pirkšanas žurnāls
-InvoiceRef=Rēķina ref.
 CodeNotDef=Nav definēts
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Maksājuma termiņš datums nevar būt zemāka par objekta datumu.
diff --git a/htdocs/langs/lv_LV/contracts.lang b/htdocs/langs/lv_LV/contracts.lang
index eaa712a3165..e001fd6e4aa 100644
--- a/htdocs/langs/lv_LV/contracts.lang
+++ b/htdocs/langs/lv_LV/contracts.lang
@@ -64,7 +64,8 @@ DateStartRealShort=Real sākuma datums
 DateEndReal=Real beigu datums
 DateEndRealShort=Real beigu datums
 CloseService=Aizvērt pakalpojumu
-BoardRunningServices=Beigušies darbojošies pakalpojumi
+BoardRunningServices=Pakalpojumi darbojas
+BoardExpiredServices=Pakalpojumi beidzās
 ServiceStatus=Pakalpojuma statuss
 DraftContracts=Projektu līgumi
 CloseRefusedBecauseOneServiceActive=Līgumu nevar slēgt, jo tajā ir vismaz viens atvērts pakalpojums
@@ -72,7 +73,7 @@ ActivateAllContracts=Aktivizējiet visas līguma līnijas
 CloseAllContracts=Aizveriet visus līguma līnijas
 DeleteContractLine=Izdzēst līgumu līniju
 ConfirmDeleteContractLine=Vai tiešām vēlaties dzēst šo līguma līniju?
-MoveToAnotherContract=Pārcelšanās serviss citā līgumu.
+MoveToAnotherContract=Pārvietot servisu citā līgumā.
 ConfirmMoveToAnotherContract=Es choosed jaunu mērķa līgumu, un apstiprinu, ka vēlaties, lai pārvietotu šo pakalpojumu noslēgtu šo līgumu.
 ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service
 PaymentRenewContractId=Atjaunot līgumu pozīcija (numurs %s)
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index b00387d2649..7909986972d 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -26,7 +26,7 @@ CronList=Plānoti darbi
 CronDelete=Dzēst ieplānotos darbus
 CronConfirmDelete=Vai tiešām vēlaties dzēst šos plānotos darbus?
 CronExecute=Uzsākt plānoto darbu
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
+CronConfirmExecute=Vai tiešām vēlaties veikt šos plānotos darbus tagad?
 CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Darbs
 CronNone=Nav
@@ -43,7 +43,7 @@ CronNoJobs=Nav reģistrētu darbu
 CronPriority=Prioritāte
 CronLabel=Nosaukums
 CronNbRun=Palaizšanas skaits
-CronMaxRun=Maksimālais numura izsaukšana
+CronMaxRun=Maksimālais startu skaits
 CronEach=Katru
 JobFinished=Darbs uzsākts un pabeigts
 #Page card
@@ -78,6 +78,6 @@ CronCannotLoadClass=Nevar ielādēt klases failu %s (izmantot klasi %s)
 CronCannotLoadObject=Klases fails %s tika ielādēts, bet objekts %s tajā netika atrasts
 UseMenuModuleToolsToAddCronJobs=Lai skatītu un rediģētu ieplānotās darbavietas, dodieties uz izvēlni "Sākums - Administratora rīki - Plānotās darbavietas".
 JobDisabled=Darbs ir atspējots
-MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDumpShort=Lokālās datu bāzes dublēšana
 MakeLocalDatabaseDump=Izveidojiet vietējo datubāzes dump. Parametri ir: kompresija ("gz" vai "bz" vai "neviens"), dublēšanas veids ("mysql", "pgsql", "auto"), 1, "auto" vai faila nosaukums,
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 5a0a1a40f01..a86ec95eb85 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -3,7 +3,7 @@
 # No errors
 NoErrorCommitIsDone=Nav kļūda, mēs apstiprinam
 # Errors
-ErrorButCommitIsDone=Kļūdas atrast, bet mēs apstiprinātu neskatoties uz to
+ErrorButCommitIsDone=Kļūdas atrasta, bet mēs apstiprinājām neskatoties uz to
 ErrorBadEMail=E-pasts %s ir nepareizs
 ErrorBadUrl=Url %s ir nepareizs
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
@@ -23,7 +23,7 @@ ErrorFailToGenerateFile=Neizdevās ģenerēt failu "<b> %s </b>".
 ErrorThisContactIsAlreadyDefinedAsThisType=Šī kontaktpersona jau ir definēts kā kontaktpersona šāda veida.
 ErrorCashAccountAcceptsOnlyCashMoney=Šis bankas konts ir naudas konts, lai tā pieņem maksājumus no veida tikai skaidrā naudā.
 ErrorFromToAccountsMustDiffers=Avota un mērķa banku kontiem jābūt atšķirīgiem.
-ErrorBadThirdPartyName=Slikta trešās puses nosaukuma vērtība
+ErrorBadThirdPartyName=Nepareiza trešās puses nosaukuma vērtība
 ErrorProdIdIsMandatory=%s ir obligāti
 ErrorBadCustomerCodeSyntax=Nepareiza klienta koda sintakse
 ErrorBadBarCodeSyntax=Slikta svītrkodu sintakse. Iespējams, jūs iestatāt sliktu svītrkodu tipu vai definējāt svītrkoda masku numurēšanai, kas neatbilst skenētajai vērtībai.
@@ -125,7 +125,7 @@ ErrUnzipFails=Neizdevās atarhivēt %s izmantojot ZipArchive
 ErrNoZipEngine=Nav dzinēja, lai zip / unzip %s failu šajā PHP
 ErrorFileMustBeADolibarrPackage=Failam %s jābūt Dolibarr zip
 ErrorModuleFileRequired=Jums ir jāizvēlas Dolibarr moduļa pakotnes fails
-ErrorPhpCurlNotInstalled=PHP CURL nav uzstādīts, tas ir svarīgi runāt ar Paypal
+ErrorPhpCurlNotInstalled=PHP CURL nav uzstādīts, tas ir svarīgi saziņai ar Paypal
 ErrorFailedToAddToMailmanList=Neizdevās pievienot ierakstu %s, lai pastnieks saraksta %s vai SPIP bāze
 ErrorFailedToRemoveToMailmanList=Neizdevās noņemt ierakstu %s, lai pastnieks saraksta %s vai SPIP bāze
 ErrorNewValueCantMatchOldValue=Jaunā vērtība nevar būt vienāds ar veco
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Slikta sintakse param keyforcontent. Jābūt
 ErrorVariableKeyForContentMustBeSet=Kļūda, ir jāiestata konstants ar nosaukumu %s (ar teksta saturu, kas jāparāda) vai %s (ar ārējo URL).
 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
 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
diff --git a/htdocs/langs/lv_LV/help.lang b/htdocs/langs/lv_LV/help.lang
index 573f4ba659d..48124086432 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 / attālinātais 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 8a4177c433b..943bea2de07 100644
--- a/htdocs/langs/lv_LV/holiday.lang
+++ b/htdocs/langs/lv_LV/holiday.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=CRV
-Holidays=Atstājiet
-CPTitreMenu=Atstājiet
+Holidays=Prombūtne
+CPTitreMenu=Prombūtne
 MenuReportMonth=Ikmēneša paziņojums
 MenuAddCP=Jauns atvaļinājuma pieprasījums
 NotActiveModCP=Jums ir jāiespējo modulis Atvaļinājumi, lai apskatītu šo lapu.
@@ -31,7 +31,7 @@ ErrorEndDateCP=Jums ir jāizvēlas beigu datumu lielāks par sākuma datums.
 ErrorSQLCreateCP=SQL kļūda izveides laikā:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Atgriezties uz iepriekšējo lappusi
-ErrorUserViewCP=You are not authorized to read this leave request.
+ErrorUserViewCP=Jums nav tiesību izlasīt šo atvaļinājuma pieprasījumu.
 InfosWorkflowCP=Informācijas plūsma
 RequestByCP=Pieprasījis
 TitreRequestCP=Atstāt pieprasījumu
@@ -49,7 +49,7 @@ ActionRefuseCP=Atteikt
 ActionCancelCP=Atcelt
 StatutCP=Statuss
 TitleDeleteCP=Dzēst atvaļinājuma pieprasījumu
-ConfirmDeleteCP=Confirm the deletion of this leave request?
+ConfirmDeleteCP=Apstiprināt šī atvaļinājuma pieprasījuma dzēšanu?
 ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
 CantCreateCP=Jums nav tiesību veikt atvaļinājumu pieprasījumus.
 InvalidValidatorCP=You must choose an approbator to your leave request.
@@ -104,19 +104,19 @@ LEAVE_PAID_FR=Apmaksāts atvaļinājums
 LastUpdateCP=Jaunākais automātiska atvaļinājuma piešķiršanas atjaunināšana
 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= Management of leave requests
+Module27130Name= Atvaļinājuma pieprasījumu pārvaldība
 Module27130Desc= Atvaļinājumu pieprasījumu vadīšana
 ErrorMailNotSend=Kļūda sūtot e-pastu:
 NoticePeriod=Paziņojuma periods
 #Messages
-HolidaysToValidate=Validate leave requests
+HolidaysToValidate=Apstipriniet atvaļinājuma pieprasījumus
 HolidaysToValidateBody=Zemāk ir atvaļinājuma pieprasījums kuru jāapstiprina
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
+HolidaysToValidateDelay=Šis atvaļinājuma pieprasījums mazāks nekā %s dienas.
 HolidaysToValidateAlertSolde=Lietotājam, kurš ir iesniedzis šo atvaļinājuma pieprasījumu, nav pietiekami daudz pieejamo dienu.
 HolidaysValidated=Apstiprinātie atvaļinājumu pieprasījumi
 HolidaysValidatedBody=Jūsu atvaļinājuma pieprasījums no %s līdz %s ir ticis apstiprināts.
 HolidaysRefused=Pieprasījums noraidīts
-HolidaysRefusedBody=Jūsu atvaļinājuma pieprasījums %s līdz %s tika noraidīts šāda iemesla dēļ:
+HolidaysRefusedBody=Jūsu atvaļinājuma pieprasījums %s līdz %s ir noraidīts šāda iemesla dēļ:
 HolidaysCanceled=Atcelts atvaļinājuma pieprasījums
 HolidaysCanceledBody=Jūsu atvaļinājuma pieprasījums no %s līdz %s ir atcelts.
 FollowedByACounter=1: Šāda veida atvaļinājumam jāievēro skaitītājs. Skaitījtājs tiek palielināts manuāli vai automātiski, un, ja atvaļinājuma pieprasījums ir apstiprināts, skaitītājs tiek samazināts. <br> 0: neseko skaitītājs.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Atvaļinājuma pieprasījumu numerācijas modeļi
 TemplatePDFHolidays=PDF veidne atvaļinājumu pieprasīšanai
 FreeLegalTextOnHolidays=Brīvs teksts PDF
 WatermarkOnDraftHolidayCards=Ūdenszīmes uz atvaļinājuma pieprasījumiem
+HolidaysToApprove=Brīvdienas, kas jāapstiprina
diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
index d85b7ef7a7a..615fb3cce42 100644
--- a/htdocs/langs/lv_LV/install.lang
+++ b/htdocs/langs/lv_LV/install.lang
@@ -51,7 +51,7 @@ ServerAddressDescription=Datu bāzes servera nosaukums vai ip adrese. Parasti "l
 ServerPortDescription=Datu bāzes servera ports. Atstājiet tukšu, ja nav zināms.
 DatabaseServer=Datubāzes serveris
 DatabaseName=Datubāzes nosaukums
-DatabasePrefix=Datubāzes galda prefikss
+DatabasePrefix=Datubāzes tabulu prefikss
 DatabasePrefixDescription=Datubāzes galda prefikss. Ja tukšs, noklusējums ir llx_.
 AdminLogin=Dolibarr datu bāzes īpašnieka lietotāja konts.
 PasswordAgain=Atkārtot paroles ievadīšanu
@@ -77,7 +77,7 @@ AdminAccountCreation=Administratora pieteikšanās izveide
 PleaseTypePassword=Lūdzu, ierakstiet paroli, tukšas paroles nav atļautas!
 PleaseTypeALogin=Lūdzu, ierakstiet pieteikšanos!
 PasswordsMismatch=Paroles atšķiras, lūdzu, mēģiniet vēlreiz!
-SetupEnd=Beigas iestatīšanas
+SetupEnd=Iiestatīšanas beigas
 SystemIsInstalled=Instalācija ir pabeigta.
 SystemIsUpgraded=Dolibarr ir atjaunota veiksmīgi.
 YouNeedToPersonalizeSetup=Jums ir jākonfigurēt Dolibarr, lai atbilstu Jūsu vajadzībām (izskats, funkcijas, ...). Lai to izdarītu, lūdzu, sekojiet saitei zemāk:
@@ -178,7 +178,7 @@ MigrationContractsInvalidDatesNothingToUpdate=Nē dienu ar sliktu vērtību, lai
 MigrationContractsIncoherentCreationDateUpdate=Bad vērtība līguma izveides datums korekcija
 MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
 MigrationContractsIncoherentCreationDateNothingToUpdate=Nav slikti vērtība līguma izveidošanas datumu, lai labotu
-MigrationReopeningContracts=Atvērt līgums slēgts ar kļūda
+MigrationReopeningContracts=Atvērt līgumu, kas slēgts ar kļūdu
 MigrationReopenThisContract=Atjaunot līgumu %s
 MigrationReopenedContractsNumber=%s līgumi laboti
 MigrationReopeningContractsNothingToUpdate=Nav slēgts līgums, lai atvērtu
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index e2469546938..1432b057e85 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -19,6 +19,8 @@ MailTopic=E-pasta tēma
 MailText=Ziņa
 MailFile=Pievienotie faili
 MailMessage=E-pasta ķermenis
+SubjectNotIn=Nav priekšmetā
+BodyNotIn=Nav ķermenī
 ShowEMailing=Rādīt e-pastus
 ListOfEMailings=E-pastu saraksts
 NewMailing=Jauna e-pasta vēstuļu sūtīšana
@@ -44,7 +46,7 @@ MailingStatusNotContact=Nesazināties
 MailingStatusReadAndUnsubscribe=Lasīt un atrakstīties
 ErrorMailRecipientIsEmpty=E-pasta adresāts ir tukšs
 WarningNoEMailsAdded=Nav jaunu e-pastu, lai pievienotu adresātu sarakstā.
-ConfirmValidMailing=Are you sure you want to validate this emailing?
+ConfirmValidMailing=Vai tiešām vēlaties apstiprināt šo e-pasta ziņojumu?
 ConfirmResetMailing=Brīdinājums, atkārtoti inicializējot e-pastu <b> %s </b>, jūs ļausit atkārtoti nosūtīt šo e-pastu lielapjoma pastā. Vai tiešām vēlaties to darīt?
 ConfirmDeleteMailing=Vai tiešām vēlaties dzēst šo e-pasta ziņojumu?
 NbOfUniqueEMails=Unikālo e-pasta ziņojumu skaits
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index d2d3952561f..96717fe3a56 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -227,7 +227,7 @@ DescriptionOfLine=Līnijas apraksts
 DateOfLine=Līnijas datums
 DurationOfLine=Līnijas ilgums
 Model=Doc veidne
-DefaultModel=Default doc template
+DefaultModel=Noklusējuma doc veidne
 Action=Notikums
 About=Par
 Number=Numurs
@@ -371,6 +371,7 @@ Percentage=Procentuālā attiecība
 Total=Kopsumma
 SubTotal=Starpsumma
 TotalHTShort=Kopā (izņemot)
+TotalHT100Short=Kopā 100%% (izņemot)
 TotalHTShortCurrency=Kopā (izņemot valūtā)
 TotalTTCShort=Pavisam (ar PVN)
 TotalHT=Kopā (bez nodokļiem)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Sūtīt apstiprinājuma e-pastu
 SendMail=Sūtīt e-pastu
 Email=E-pasts
 NoEMail=Nav e-pasta
-Email=E-pasts
 AlreadyRead=Jau izlasīts
 NotRead=Nav lasīts
 NoMobilePhone=Nav mob. tel.
@@ -671,7 +671,6 @@ Method=Metode
 Receive=Saņemt
 CompleteOrNoMoreReceptionExpected=Pabeigts vai nekas vairāk nav gaidīts
 ExpectedValue=Paredzamā vērtība
-CurrentValue=Pašreizējā vērtība
 PartialWoman=Daļējs
 TotalWoman=Kopsumma
 NeverReceived=Nekad nav saņemts
@@ -834,6 +833,7 @@ RelatedObjects=Saistītie objekti
 ClassifyBilled=Klasificēt apmaksāts
 ClassifyUnbilled=Klasificēt neapmaksāts
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=birojs
 BackOffice=Birojs
 View=Izskats
@@ -842,6 +842,11 @@ Exports=Eksports
 ExportFilteredList=Eksportēt atlasīto sarakstu
 ExportList=Eksporta saraksts
 ExportOptions=Eksportēšanas iespējas
+IncludeDocsAlreadyExported=Iekļaut jau eksportētos dokumentus
+ExportOfPiecesAlreadyExportedIsEnable=Eksportēt jau eksportētos gabalus
+ExportOfPiecesAlreadyExportedIsDisable=Eksportēto gabalu eksports ir atspējots
+AllExportedMovementsWereRecordedAsExported=Visas eksportētās kustības tika reģistrētas kā eksportētas
+NotAllExportedMovementsCouldBeRecordedAsExported=Ne visas eksportētās kustības var ierakstīt kā eksportētas
 Miscellaneous=Dažādi
 Calendar=Kalendārs
 GroupBy=Kārtot pēc...
@@ -854,7 +859,7 @@ Download=Lejupielādēt
 DownloadDocument=Lejupielādēt dokumentu
 ActualizeCurrency=Atjaunināt valūtas kursu
 Fiscalyear=Fiskālais gads
-ModuleBuilder=Moduļu veidotājs
+ModuleBuilder=Modulis un lietojumprogrammu veidotājs
 SetMultiCurrencyCode=Iestatīt valūtu
 BulkActions=Lielapjoma darbības
 ClickToShowHelp=Noklikšķiniet, lai parādītu rīka padomju palīdzību
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Rādīt vairāk informācijas
 NoFilesUploadedYet=Lūdzu, vispirms augšupielādējiet dokumentu
 SeePrivateNote=Skatīt privāto piezīmi
+PaymentInformation=Informācija par maksājumu
+ValidFrom=Derīgs no
+ValidUntil=Derīgs līdz
+NoRecordedUsers=Nav lietotāju
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index 773d4a6bf6a..54fd8adefa8 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -197,3 +197,4 @@ SendReminderForExpiredSubscriptionTitle=Nosūtiet atgādinājumu pa e-pastu, kad
 SendReminderForExpiredSubscription=Sūtīt atgādinājumu pa e-pastu dalībniekiem, kad abonements beigsies (parametrs ir dienu skaits pirms abonementa beigām, lai nosūtītu atgādinājumu. Tas var būt dienu saraksts, kas atdalīti ar semikolu, piemēram, '10; 5; 0; -5 ")
 MembershipPaid=Dalība, kas samaksāta par kārtējo periodu (līdz %s)
 YouMayFindYourInvoiceInThisEmail=Jūsu rēķinu varat atrast šī e-pasta pielikumā
+XMembersClosed=%s dalībnieks (-i) slēgts
diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang
index 82a954889ab..c0e9e22698c 100644
--- a/htdocs/langs/lv_LV/modulebuilder.lang
+++ b/htdocs/langs/lv_LV/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Šo rīku izmanto tikai pieredzējuši lietotāji vai izstrādātāji. Tas nodrošina komunālo pakalpojumu, lai izveidotu vai rediģētu savu moduli. <br> Dokumentācija alternatīvai <a href="%s" target="_blank"> manuālai izstrādei šeit ir </a>.
+ModuleBuilderDesc=Šo rīku izmanto tikai pieredzējuši lietotāji vai izstrādātāji. Tas nodrošina komunālo pakalpojumu, lai izveidotu vai rediģētu savu moduli. Šeit ir dokumentācija alternatīvai <a href="%s" target="_blank">manuālai izstrādei</a> .
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Ceļš, kurā tiek ģenerēti / rediģēti moduļi (pirmais ārējo moduļu katalogs, kas definēts %s): <strong> %s </strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=Tas ir moduļa sniegto aktivitāšu skatījums. Lai ie
 ModuleBuilderDeschooks=Šī cilne ir paredzēta āķiem.
 ModuleBuilderDescwidgets=Šī cilne ir paredzēta, lai pārvaldītu/veidotu logrīkus.
 ModuleBuilderDescbuildpackage=Jūs varat ģenerēt šeit moduļa "gatavs izplatīšanai" pakotnes failu (standartizētu .zip failu) un dokumentācijas failu "gatavs izplatīšanai". Vienkārši noklikšķiniet uz pogas, lai izveidotu paketi vai dokumentācijas failu.
-EnterNameOfModuleToDeleteDesc=Varat izdzēst savu moduli. BRĪDINĀJUMS: visi moduļa un strukturēto datu un dokumentācijas faili tiks dzēsti!
-EnterNameOfObjectToDeleteDesc=Jūs varat izdzēst objektu. BRĪDINĀJUMS: visi ar objektu saistītie faili tiks dzēsti!
+EnterNameOfModuleToDeleteDesc=Jūs varat izdzēst savu moduli. BRĪDINĀJUMS! Visi moduļa kodēšanas faili (ģenerēti vai izveidoti manuāli) UN strukturētie dati un dokumentācija tiks izdzēsti!
+EnterNameOfObjectToDeleteDesc=Objektu var izdzēst. BRĪDINĀJUMS: Visi ar objektu saistītie kodēšanas faili (ģenerēti vai izveidoti manuāli) tiks izdzēsti!
 DangerZone=Bīstamā zona
 BuildPackage=Izveidot paketi
+BuildPackageDesc=Jūs varat izveidot zip pakotni no jūsu pieteikuma, lai jūs būtu gatavi to izplatīt jebkurā Dolibarr. Jūs varat arī to izplatīt vai pārdot tirgū kā <a href="https://www.dolistore.com">DoliStore.com</a> .
 BuildDocumentation=Izveidot dokumentāciju
 ModuleIsNotActive=Šis modulis vēl nav aktivizēts. Lai to veiktu, spiediet uz %s vai noklikšķiniet šeit:
-ModuleIsLive=Šis modulis ir aktivizēts. Jebkuras izmaiņas tajā var pārtraukt pašreizējo aktīvo funkciju.
+ModuleIsLive=Šis modulis ir aktivizēts. Jebkuras izmaiņas var pārtraukt pašreizējo tiešraides funkciju.
 DescriptionLong=Apraksts
 EditorName=Redaktora vārds
 EditorUrl=Rediģētāja URL
@@ -43,10 +44,11 @@ PathToModulePackage=Ceļš uz moduļa / pieteikuma pakotnes rāvienu
 PathToModuleDocumentation=Ceļš uz moduļa / lietojumprogrammas dokumentācijas failu (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces vai speciālās rakstzīmes nav atļautas.
 FileNotYetGenerated=Fails vēl nav izveidots
-RegenerateClassAndSql=Dzēst un atjaunot klases un sql failus
+RegenerateClassAndSql=Force .class un .sql failu atjaunināšana
 RegenerateMissingFiles=Izveidot trūkstošos failus
 SpecificationFile=Dokumentācijas fails
 LanguageFile=Valoda
+ObjectProperties=Objekta rekvizīti
 ConfirmDeleteProperty=Vai tiešām vēlaties dzēst īpašumu <strong> %s </strong>? Tas mainīs kodu PHP klasē, un no tabulas definīcijas kolonnas noņems arī objektu.
 NotNull=Nav NULL
 NotNullDesc=1 = Iestatiet datubāzi NOT NULL. -1 = Atļaut nulles vērtības un spēka vērtību NULL, ja tukšs ('' vai 0).
@@ -62,9 +64,11 @@ ReadmeFile=Izlasi mani fails
 ChangeLog=Izmaiņu fails
 TestClassFile=PHP Unit Test klases fails
 SqlFile=Sql fails
-PageForLib=PHP bibliotēku fails
+PageForLib=Failu PHP bibliotēkai
+PageForObjLib=Failu PHP bibliotēkai, kas paredzēta objektam
 SqlFileExtraFields=Sql fails papildu atribūtiem
 SqlFileKey=Sql failu atslēgas
+SqlFileKeyExtraFields=SQL fails papildu atribūtu atslēgām
 AnObjectAlreadyExistWithThisNameAndDiffCase=Priekšmets jau pastāv ar šo vārdu un citu lietu
 UseAsciiDocFormat=Jūs varat izmantot Markdown formātu, taču ieteicams izmantot Asciidoc formātu (salīdzinājums starp .md un .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
 IsAMeasure=Vai pasākums
@@ -81,8 +85,10 @@ IsAMeasureDesc=Vai lauka vērtību var uzkrāties, lai kopsumma tiktu iekļauta
 SearchAllDesc=Vai laukums tiek izmantots, lai veiktu meklēšanu no ātrās meklēšanas rīka? (Piemēri: 1 vai 0)
 SpecDefDesc=Ievadiet šeit visu dokumentāciju, ko vēlaties iesniegt ar savu moduli, kuru vēl nav definējušas citas cilnes. Jūs varat izmantot .md vai labāku, bagātīgo .asciidoc sintaksi.
 LanguageDefDesc=Ievadiet šos failus, visu valodas faila atslēgu un tulkojumu.
-MenusDefDesc=Šeit definējiet izvēlnes, ko nodrošina jūsu modulis (pēc definīcijas tie ir redzami izvēlnes redaktorā %s)
-PermissionsDefDesc=Šeit definējiet jaunās atļaujas, kuras nodrošina jūsu modulis (pēc definīcijas tie ir redzami noklusējuma atļaujas iestatījumam %s)
+MenusDefDesc=Šeit norādiet savas moduļa nodrošinātās izvēlnes
+PermissionsDefDesc=Šeit definējiet jaunās atļaujas, ko sniedz jūsu modulis
+MenusDefDescTooltip=Jūsu moduļa / lietojumprogrammas piedāvātās izvēlnes ir definētas masīva <strong>$ this-&gt; izvēlnēs</strong> moduļa deskriptora failā. Šo failu var rediģēt manuāli vai izmantot iegulto redaktoru. <br><br> Piezīme. Kad definēts (un modulis atkārtoti aktivizēts), izvēlnes ir redzamas arī izvēlnes redaktorā, kas pieejams administratora lietotājiem %s.
+PermissionsDefDescTooltip=Jūsu moduļa / lietojumprogrammas piešķirtās atļaujas ir definētas masīva <strong>$ this-&gt; tiesību elementos</strong> moduļa deskriptora failā. Šo failu var rediģēt manuāli vai izmantot iegulto redaktoru. <br><br> Piezīme. Pēc definīcijas (un moduļa atkārtotas aktivizēšanas) atļaujas ir redzamas noklusējuma atļauju iestatījumā %s.
 HooksDefDesc=Modu deskriptorā <b> module_parts ['āķi'] </b>definējiet āķu kontekstu, kuru vēlaties pārvaldīt (konteksta sarakstu var atrast, veicot meklēšanu ar <b> initHooks (</b>'galvenajā kodā). <br> Rediģējiet āķa failu, lai pievienotu savu āķa funkciju kodu (kontaktu funkcijas var atrast, veicot meklēšanu ar kodu <b> executeHooks </b> ').
 TriggerDefDesc=Sprūda failā definējiet kodu, kuru vēlaties izpildīt katram notikušajam notikumam.
 SeeIDsInUse=Skatiet jūsu instalācijā izmantotos ID
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Izmantojiet konkrētu redaktora URL
 UseSpecificFamily = Izmantojiet noteiktu ģimeni
 UseSpecificAuthor = Izmantojiet noteiktu autoru
 UseSpecificVersion = Izmantojiet konkrētu sākotnējo versiju
+ModuleMustBeEnabled=Vispirms jāaktivizē modulis / programma
diff --git a/htdocs/langs/lv_LV/multicurrency.lang b/htdocs/langs/lv_LV/multicurrency.lang
index b205cfcb83b..db7d0aaacdb 100644
--- a/htdocs/langs/lv_LV/multicurrency.lang
+++ b/htdocs/langs/lv_LV/multicurrency.lang
@@ -7,10 +7,10 @@ multicurrency_syncronize_error=Sinhronizācijas kļūda: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Izmantojiet dokumenta datumu, lai atrastu valūtas kursu, nevis izmantojiet jaunāko zināmo kursu
 multicurrency_useOriginTx=Ja objekts tiek izveidots no cita, saglabājiet sākotnējo likmi no avota objekta (citādi izmantojiet jaunāko zināmo likmi)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=Lai izmantotu šo funkciju, jums ir jāizveido konts savā tīmekļa vietnē. <br> Saņemiet <b> API atslēgu </ b>. <br> Ja izmantojat bezmaksas kontu, nevarat mainīt <b> valūtas avotu </ b> b> (pēc noklusējuma USD). <br> Ja jūsu galvenā valūta nav ASV dolārs, varat izmantot <b> alternatīvo valūtas avotu </ b>, lai piespiestu jūsu galveno valūtu. <br> <br> Jums ir ierobežota līdz 1000 sinhronizācijām mēnesī.
+CurrencyLayerAccount_help_to_synchronize=Lai izmantotu šo funkciju, vietnē %s ir jāizveido konts. <br> Iegūstiet savu <b>API atslēgu</b> . <br> Ja izmantojat bezmaksas kontu, nevar mainīt <b>avota valūtu</b> (pēc noklusējuma USD). <br> Ja jūsu galvenā valūta nav USD, programma automātiski pārrēķinās to. <br><br> Jūs esat ierobežots līdz 1000 sinhronizācijām mēnesī.
 multicurrency_appId=API atslēga
-multicurrency_appCurrencySource=Valūtas avots
-multicurrency_alternateCurrencySource=Alternatīvs valūtas avots
+multicurrency_appCurrencySource=Avota valūta
+multicurrency_alternateCurrencySource=Alternatīva avota valūta
 CurrenciesUsed=Izmantotās valūtas
 CurrenciesUsed_help_to_add=Pievienojiet dažādas valūtas un likmes, kas jāizmanto <b> priekšlikumiem</b>, <b> pasūtījumiem</b> utt.
 rate=likme
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 1a17a96f207..78f4e29d191 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -104,7 +104,7 @@ DemoFundation=Pārvaldīt locekļus nodibinājumam
 DemoFundation2=Pārvaldīt dalībniekus un bankas kontu nodibinājumam
 DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Pārvaldīt veikals ar kasē
-DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyProductAndStocks=Uzņēmums, kas pārdod produktus veikalā
 DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Izveidoja %s
 ModifiedBy=Laboja %s
diff --git a/htdocs/langs/lv_LV/paybox.lang b/htdocs/langs/lv_LV/paybox.lang
index 7ef6863cbc0..39c15801b4b 100644
--- a/htdocs/langs/lv_LV/paybox.lang
+++ b/htdocs/langs/lv_LV/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Lai pabeigtu
 YourEMail=Nosūtīt saņemt maksājuma apstiprinājumu
 Creditor=Kreditors
 PaymentCode=Maksājuma kods
-PayBoxDoPayment=Maksāt ar kredītkarti vai debetkarti (Paybox)
+PayBoxDoPayment=Maksājiet ar Paybox
 ToPay=Apmaksāt
 YouWillBeRedirectedOnPayBox=Jums tiks novirzīts uz drošu Paybox lapā, lai ievadi kredītkartes informāciju
 Continue=Nākamais
 ToOfferALinkForOnlinePayment=URL %s maksājumu
-ToOfferALinkForOnlinePaymentOnOrder=URL piedāvāt %s tiešsaistes maksājumu lietotāja interfeisu klienta pasūtījuma
+ToOfferALinkForOnlinePaymentOnOrder=URL, lai piedāvātu tiešsaistes maksājuma lietotāja interfeisu %s pārdošanas pasūtījumam
 ToOfferALinkForOnlinePaymentOnInvoice=URL piedāvāt %s tiešsaistes maksājumu lietotāja interfeisu klientu rēķina
 ToOfferALinkForOnlinePaymentOnContractLine=URL piedāvāt %s tiešsaistes maksājumu lietotāja interfeisu līguma līnijas
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL piedāvāt %s tiešsaistes maksājumu lietotāja saskarni par brīvu summu
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL piedāvāt %s tiešsaistes maksājumu lietotāja interfeisu locekli abonementu
-ToOfferALinkForOnlinePaymentOnDonation=URL, kas piedāvā %s tiešsaistes maksājumu lietotāja interfeisu ziedojuma apmaksai
+ToOfferALinkForOnlinePaymentOnDonation=URL, lai piedāvātu tiešsaistes maksājumu %s, lietotāja interfeisu ziedojuma apmaksai
 YouCanAddTagOnUrl=Jūs varat arī pievienot url parametrs <b>&amp; Tag = <i>vērtība,</i></b> kādu no šiem URL (nepieciešams tikai bezmaksas samaksu), lai pievienotu savu maksājumu komentāru tagu.
 SetupPayBoxToHavePaymentCreatedAutomatically=Izveidojiet savu Paybox ar URL <b> %s </b>, lai maksājums tiktu izveidots automātiski, ja to apstiprina Paybox.
 YourPaymentHasBeenRecorded=Šajā lapā apliecina, ka jūsu maksājums ir reģistrēts. Paldies.
@@ -33,7 +33,8 @@ VendorName=Pārdevēja nosaukums
 CSSUrlForPaymentForm=CSS stila lapas url maksājuma formu
 NewPayboxPaymentReceived=Jauns Paybox maksājums saņemts
 NewPayboxPaymentFailed=Jauns Paybox maksājums mēģināju, bet neizdevās
-PAYBOX_PAYONLINE_SENDEMAIL=E-pastu, lai brīdinātu pēc maksājuma (veiksme vai nav)
+PAYBOX_PAYONLINE_SENDEMAIL=E-pasta paziņojums pēc maksājuma mēģinājuma (veiksmes vai neveiksmes)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC taustiņš
diff --git a/htdocs/langs/lv_LV/paypal.lang b/htdocs/langs/lv_LV/paypal.lang
index 3f90ad287e1..3b8beeb6533 100644
--- a/htdocs/langs/lv_LV/paypal.lang
+++ b/htdocs/langs/lv_LV/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal moduļa iestatīšana
-PaypalDesc=Šis modulis piedāvā lapas, lai ļautu maksājumu ar <a href="http://www.paypal.com" target="_blank">PayPal</a> klienti. To var izmantot par brīvu maksājumu vai maksājumu par konkrētu Dolibarr objektu (rēķins, rīkojums, ...)
-PaypalOrCBDoPayment=Maksāt ar Paypal (kredītkarti vai PayPal)
-PaypalDoPayment=Maksāt ar Paypal
+PaypalDesc=Šis modulis ļauj klientiem veikt maksājumus, izmantojot <a href="http://www.paypal.com" target="_blank"> PayPal </a>. To var izmantot īpašam maksājumam vai maksājumam, kas saistīts ar Dolibarr objektu (rēķins, pasūtījums, ...)
+PaypalOrCBDoPayment=Maksājiet ar PayPal (karti vai PayPal)
+PaypalDoPayment=Maksāt ar PayPal
 PAYPAL_API_SANDBOX=Mode tests / sandbox
 PAYPAL_API_USER=API lietotājvārds
 PAYPAL_API_PASSWORD=API parole
 PAYPAL_API_SIGNATURE=API paraksts
 PAYPAL_SSLVERSION=Curl SSL versija
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Akcija maksājums &quot;neatņemama sastāvdaļa&quot; (Kredītkaršu + Paypal), vai &quot;Paypal&quot; tikai
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Piedāvāt tikai "integrālo" maksājumu (kredītkarti + PayPal) vai "PayPal"
 PaypalModeIntegral=Integrālis
 PaypalModeOnlyPaypal=PayPal tikai
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=CSS stilu lapas izvēles URL, izmantojot tiešsaistes maksājuma lapu
 ThisIsTransactionId=Tas ir id darījuma: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Pievieno url Paypal maksājumu, kad jūs sūtīt dokumentu pa pastu
-YouAreCurrentlyInSandboxMode=Pašlaik esat %s "smilškastes" režīmā
+PAYPAL_ADD_PAYMENT_URL=Iesniedzot dokumentu pa e-pastu, iekļaujiet PayPal maksājumu URL
 NewOnlinePaymentReceived=Saņemts jauns tiešsaistes maksājums
 NewOnlinePaymentFailed=Jauns tiešsaistes maksājums tika izmēģināts, bet neizdevās
-ONLINE_PAYMENT_SENDEMAIL=E-pastu, lai brīdinātu pēc maksājuma (veiksme vai ne)
+ONLINE_PAYMENT_SENDEMAIL=E-pasta adrese paziņojumiem pēc katra maksājuma mēģinājuma (lai gūtu panākumus un neizdotos)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Neveiksmīgs tiešsaistes maksājumu apstiprinājums
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Maksājuma apstiprinājuma lapa tika izsaukta ar maksājumu sistēmu, atgriezās kļūda
@@ -28,7 +27,10 @@ ShortErrorMessage=Īss kļūdas ziņojums
 ErrorCode=Kļūdas kods
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Tiešsaistes maksājumu sistēma
-PaypalLiveEnabled=Ieslēgts Paypal tiešraidē (citādi tests / smilškastes režīms)
-PaypalImportPayment=Importēt Paypal maksājumus
+PaypalLiveEnabled=Iespējots PayPal "tiešraides" režīms (citādi testēšanas / smilškastes režīms)
+PaypalImportPayment=Importēt PayPal maksājumus
 PostActionAfterPayment=Ievietot darbības pēc maksājumiem
 ARollbackWasPerformedOnPostActions=Atkārtojums tika veikts visos Post darbībās. Ja nepieciešams, jums ir jāaizpilda pasta darbības manuāli.
+ValidationOfPaymentFailed=Maksājuma apstiprināšana nav izdevies
+CardOwner=Kartes turētājs
+PayPalBalance=Paypal kredīts
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index e64dc09dba0..d0bb475cd24 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -199,7 +199,7 @@ ServiceCodeModel=Pakalpojuma art. paraugs
 CurrentProductPrice=Pašreizējā cena
 AlwaysUseNewPrice=Vienmēr izmantot pašreizējo cenu produktam / pakalpojumam
 AlwaysUseFixedPrice=Izmantot fiksētu cenu
-PriceByQuantity=Different prices by quantity
+PriceByQuantity=Dažādas cenas apjomam
 DisablePriceByQty=Atspējot cenas pēc daudzuma
 PriceByQuantityRange=Daudzuma diapazons
 MultipriceRules=Cenu segmenta noteikumi
@@ -260,7 +260,7 @@ AddVariable=Pievienot mainīgo
 AddUpdater=Pievienot Atjaunotāju
 GlobalVariables=Global variables
 VariableToUpdate=Mainīgais kas jāatjauno
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=Mainīgo lielumu ārējie atjauninājumi
 GlobalVariableUpdaterType0=JSON dati
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Pieprasījuma formāts ("URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue")
@@ -294,7 +294,7 @@ ProductSheet=Produkta lapa
 ServiceSheet=Servisa lapa
 PossibleValues=Iespējamās vērtības
 GoOnMenuToCreateVairants=Iet uz izvēlni %s - %s, lai sagatavotu atribūtu variantus (piemēram, krāsas, izmērs, ...)
-UseProductFournDesc=Izmantot pārdevēja aprakstus piegādātāju dokumentos
+UseProductFournDesc=Pievienojiet funkciju, lai definētu pārdevēju definētos produktu aprakstus papildus aprakstiem klientiem
 ProductSupplierDescription=Produkta pārdevēja apraksts
 #Attributes
 VariantAttributes=Variantu atribūti
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=Atsiuninot produkta variantus, radās kļūda
 ErrorDestinationProductNotFound=Galamērķa produkts nav atrasts
 ErrorProductCombinationNotFound=Produkta variants nav atrasts
 ActionAvailableOnVariantProductOnly=Darbība pieejama tikai produkta variantam
+ProductsPricePerCustomer=Produktu cenas uz vienu klientu
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 1f09dbbd143..15c9f678b62 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -10,7 +10,7 @@ PrivateProject=Projekta kontakti
 ProjectsImContactFor=Mani projekti ir tieši kontaktpersona
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Visi projekti
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=Šis skats attiecas tikai uz projektiem, ar kuriem jūs sazināties
 ProjectsPublicDesc=Šo viedokli iepazīstina visus projektus jums ir atļauts lasīt.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
@@ -45,8 +45,9 @@ TimeSpent=Laiks, kas pavadīts
 TimeSpentByYou=Jūsu patērētais laiks
 TimeSpentByUser=Lietotāja patērētais laiks
 TimesSpent=Laiks, kas patērēts
-RefTask=Ref. uzdevums
-LabelTask=Uzlīmes uzdevums
+TaskId=Uzdevuma ID
+RefTask=Uzdevums Nr.
+LabelTask=Uzdevuma nosaukums
 TaskTimeSpent=Pavadītais laiks veicot uzdevumus
 TaskTimeUser=Lietotājs
 TaskTimeNote=Piezīme
diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
index b237cbd833f..41f8fb653e1 100644
--- a/htdocs/langs/lv_LV/sendings.lang
+++ b/htdocs/langs/lv_LV/sendings.lang
@@ -45,20 +45,20 @@ StatsOnShipmentsOnlyValidated=Statistika veikti uz sūtījumiem tikai apstiprin
 DateDeliveryPlanned=Plānotais piegādes datums
 RefDeliveryReceipt=Ref piegādes kvīts
 StatusReceipt=Piegādes kvīts statuss
-DateReceived=Datums piegāde saņemti
-SendShippingByEMail=Nosūtīt sūtījumu pa e-pastu
-SendShippingRef=Submission of shipment %s
+DateReceived=Piegādes saņemšanas datums
+SendShippingByEMail=Sūtīt sūtījumu pa e-pastu
+SendShippingRef=Sūtījuma iesniegšana %s
 ActionsOnShipping=Notikumi sūtījumu
 LinkToTrackYourPackage=Saite uz izsekot savu paketi
 ShipmentCreationIsDoneFromOrder=Izveidot jaunu sūtījumu var no pasūtījuma kartiņas.
 ShipmentLine=Sūtījumu līnija
-ProductQtyInCustomersOrdersRunning=Produkta daudzums atvērtā klienta pasūtījumā
+ProductQtyInCustomersOrdersRunning=Produkta daudzums atvērtos pārdošanas pasūtījumos
 ProductQtyInSuppliersOrdersRunning=Produktu daudzums atvērtajos pirkuma pasūtījumos
-ProductQtyInShipmentAlreadySent=Produkta daudzums, kuri sakārtoti pēc piegādātāja pasūtīšanas
-ProductQtyInSuppliersShipmentAlreadyRecevied=Produkta daudzums jau ir saņemts no atvērta piegādātāja pasūtījuma
+ProductQtyInShipmentAlreadySent=Produkta daudzums no jau nosūtīta pasūtījuma
+ProductQtyInSuppliersShipmentAlreadyRecevied=Produkta daudzums no jau saņemtajiem pasūtījumiem
 NoProductToShipFoundIntoStock=Noliktavā nav atrasts neviens produkts, kas paredzēts piegādei <b> %s </ b>. Pareizu krājumu vai doties atpakaļ, lai izvēlētos citu noliktavu.
 WeightVolShort=Svars / tilp.
-ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+ValidateOrderFirstBeforeShipment=Vispirms jums ir jāapstiprina pasūtījums, lai varētu veikt sūtījumus.
 
 # Sending methods
 # ModelDocument
@@ -69,4 +69,4 @@ SumOfProductWeights=Summēt produkta svaru
 
 # warehouse details
 DetailWarehouseNumber= Noliktavas detaļas
-DetailWarehouseFormat= W:%s (Daudz. : %d)
+DetailWarehouseFormat= W: %s (Daudzums: %d)
diff --git a/htdocs/langs/lv_LV/stripe.lang b/htdocs/langs/lv_LV/stripe.lang
index 057df9d4b6b..32c2bb4722f 100644
--- a/htdocs/langs/lv_LV/stripe.lang
+++ b/htdocs/langs/lv_LV/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Joslas moduļa iestatīšana
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Piedāvājiet klientiem Stripe tiešsaistes maksājumu lapu maksājumiem ar kredītkartēm / kredītkartēm, izmantojot <a href="http://www.stripe.com" target="_blank"> Stripe </a>. To var izmantot, lai ļautu saviem klientiem veikt ad-hoc maksājumus vai maksājumus, kas saistīti ar konkrētu Dolibarr objektu (rēķins, pasūtījums, ...)
 StripeOrCBDoPayment=Maksājiet ar kredītkarti vai Stripe
 FollowingUrlAreAvailableToMakePayments=Pēc URL ir pieejami, lai piedāvātu lapu, lai klients varētu veikt maksājumu par Dolibarr objektiem
 PaymentForm=Maksājuma forma
@@ -9,14 +9,14 @@ ThisScreenAllowsYouToPay=Šis logs ļauj jums veikt tiešsaistes maksājumu %s.
 ThisIsInformationOnPayment=Šī ir informācija par maksājumu, kas darīt
 ToComplete=Lai pabeigtu
 YourEMail=Nosūtīt saņemt maksājuma apstiprinājumu
-STRIPE_PAYONLINE_SENDEMAIL=E-pastu, lai brīdinātu pēc maksājuma (veiksme vai ne)
+STRIPE_PAYONLINE_SENDEMAIL=E-pasta paziņojums pēc maksājuma mēģinājuma (veiksmes vai neveiksmes)
 Creditor=Kreditoru
 PaymentCode=Maksājuma kods
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Maksājiet ar svītru
 YouWillBeRedirectedOnStripe=Jūs tiksiet novirzīts uz drošo lapu, lai ievadītu kredītkartes informāciju
 Continue=Nākamais
 ToOfferALinkForOnlinePayment=maksājumu %s URL
-ToOfferALinkForOnlinePaymentOnOrder=URL piedāvāt %s tiešsaistes maksājumu lietotāja interfeisu klienta pasūtījuma
+ToOfferALinkForOnlinePaymentOnOrder=URL, lai piedāvātu tiešsaistes maksājuma lietotāja interfeisu %s pārdošanas pasūtījumam
 ToOfferALinkForOnlinePaymentOnInvoice=URL piedāvāt %s tiešsaistes maksājumu lietotāja interfeisu klientu rēķina
 ToOfferALinkForOnlinePaymentOnContractLine=URL piedāvāt %s tiešsaistes maksājumu lietotāja interfeisu līguma līnijas
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL piedāvāt %s tiešsaistes maksājumu lietotāja saskarni par brīvu summu
@@ -40,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhokas tiešraides atslēga
 ONLINE_PAYMENT_WAREHOUSE=Krājums, ko izmanto, lai krājumu samazinātu, kad tiek veikts tiešsaistes maksājums <br> (TODO Kad iespēja samazināt akciju tiek veikta, veicot darbību rēķinā, un tiešsaistes maksājums pats par sevi sagatavo rēķinu?)
 StripeLiveEnabled=Ieslēgta josla dzīvot (citādi tests / smilškastē režīms)
 StripeImportPayment=Importēšanas joslas maksājumi
-ExampleOfTestCreditCard=Testa kredītkartes piemērs: %s (derīgs), %s (kļūda CVC), %s (beidzies derīguma termiņš), %s (maksa neizdodas)
+ExampleOfTestCreditCard=Kredītkartes paraugs testam: %s =&gt; derīgs, %s =&gt; kļūda CVC, %s =&gt; beidzies, %s =&gt; maksa neizdodas
 StripeGateways=Joslas vārti
 OAUTH_STRIPE_TEST_ID=Stripe Connect klienta ID (ca _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect klienta ID (ca _...)
@@ -61,4 +61,7 @@ ConfirmDeleteCard=Vai tiešām vēlaties izdzēst šo kredītkarti vai debetkart
 CreateCustomerOnStripe=Izveidojiet klientu joslā
 CreateCardOnStripe=Izveidojiet karti joslā
 ShowInStripe=Rādīt joslā
-StripeUserAccountForActions=Lietotāja konts, lai izmantotu dažu e-pasta paziņojumu par joslu notikumiem (Stripe payouts)
+StripeUserAccountForActions=Lietotāja konts, lai izmantotu e-pasta paziņojumu par dažiem Stripe notikumiem (Stripe izmaksas)
+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)
diff --git a/htdocs/langs/lv_LV/ticket.lang b/htdocs/langs/lv_LV/ticket.lang
index a868044eb32..1b549ae0871 100644
--- a/htdocs/langs/lv_LV/ticket.lang
+++ b/htdocs/langs/lv_LV/ticket.lang
@@ -58,9 +58,10 @@ Notify_TICKET_SENTBYMAIL=Sūtīt biļeti pa e-pastu
 # Status
 NotRead=Nav lasāms
 Read=Lasīt
-Answered=Atbildēts
 Assigned=Piešķirts
 InProgress=Procesā
+NeedMoreInformation=Gaida informāciju
+Answered=Atbildēts
 Waiting=Gaida
 Closed=Slēgts
 Deleted=Dzēsts
@@ -132,6 +133,7 @@ TicketsIndex=Pieteikumi - mājās
 TicketList=Pieteikumu saraksts
 TicketAssignedToMeInfos=Šī lapa parāda pieteikumu sarakstu, kas izveidots vai piešķirts pašreizējam lietotājam
 NoTicketsFound=Nav atrasts neviens pieteikums
+NoUnreadTicketsFound=Nav atrastas nelasītas biļetes
 TicketViewAllTickets=Skatīt visus pieteikumus
 TicketViewNonClosedOnly=Skatīt tikai atvērtos pieteikumus
 TicketStatByStatus=Pieteikumi pēc statusa
@@ -265,7 +267,10 @@ TicketNewEmailBodyAdmin=<p> Biļete tikko ir izveidota ar ID # %s, skatiet infor
 SeeThisTicketIntomanagementInterface=Skatiet biļeti vadības saskarnē
 TicketPublicInterfaceForbidden=Pieteikumu publiskā saskarne nav iespējota
 ErrorEmailOrTrackingInvalid=Slikta vērtība izsekošanas ID vai e-pasta ziņojumam
-
+OldUser=Vecais lietotājs
+NewUser=Jauns lietotājs
+NumberOfTicketsByMonth=Biļešu skaits mēnesī
+NbOfTickets=Biļešu skaits
 # notifications
 TicketNotificationEmailSubject=Pieteikums %s ir atjaunots
 TicketNotificationEmailBody=Šī ir automātiska ziņa, kas informē jūs, ka biļete %s tikko atjaunināta
diff --git a/htdocs/langs/lv_LV/trips.lang b/htdocs/langs/lv_LV/trips.lang
index e6dc7af4199..39090aec17a 100644
--- a/htdocs/langs/lv_LV/trips.lang
+++ b/htdocs/langs/lv_LV/trips.lang
@@ -148,4 +148,4 @@ nolimitbyEX_EXP=pēc rindas (bez ierobežojuma)
 CarCategory=Automašīnu sadaļa
 ExpenseRangeOffset=Kompensācijas summa: %s
 RangeIk=Nobraukums
-AttachTheNewLineToTheDocument=Pievienojiet jaunu līniju esošam dokumentam
+AttachTheNewLineToTheDocument=Pievienojiet rindu augšupielādētajam dokumentam
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 9d042d810ca..a4f63733b86 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=Šī lapa / konteiners ir tulkojums
 ThisPageHasTranslationPages=Šajā lapā / konteinerā ir tulkojums
 NoWebSiteCreateOneFirst=Vēl nav izveidota neviena vietne. Vispirms izveidojiet vienu.
 GoTo=Iet uz
+DynamicPHPCodeContainsAForbiddenInstruction=Jūs pievienojat dinamisku PHP kodu, kas satur PHP norādījumu &#39; <strong>%s</strong> &#39;, kas pēc noklusējuma ir aizliegta kā dinamisks saturs (skatiet slēptās opcijas WEBSITE_PHP_ALLOW_xxx, lai palielinātu atļauto komandu sarakstu).
+NotAllowedToAddDynamicContent=Jums nav atļaujas pievienot vai rediģēt PHP dinamisko saturu tīmekļa vietnēs. Uzdodiet atļauju vai vienkārši saglabājiet kodu php tagos nemainītā veidā.
+ReplaceWebsiteContent=Nomainiet vietnes saturu
+DeleteAlsoJs=Vai arī dzēst visus šajā tīmekļa vietnē raksturīgos javascript failus?
+DeleteAlsoMedias=Vai arī dzēst visus šajā tīmekļa vietnē esošos mediju failus?
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index ccba0841767..daa5b4ef413 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index e2ae7a754d5..f9e88f2c7a7 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang
index c7cd179aa53..3f8041b8dad 100644
--- a/htdocs/langs/mk_MK/agenda.lang
+++ b/htdocs/langs/mk_MK/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index 5bc061f31f3..cb39150b627 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-BIC=BIC/SWIFT number
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Statement
 AccountStatements=Account statements
 LastAccountStatements=Last account statements
 IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Supplier payment
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index 1fb2809cb87..a5db0421635 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Payment amount
-ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/mk_MK/cashdesk.lang b/htdocs/langs/mk_MK/cashdesk.lang
index 5138fe80be3..006097b7e82 100644
--- a/htdocs/langs/mk_MK/cashdesk.lang
+++ b/htdocs/langs/mk_MK/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 83b931731df..3f175b8b782 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=New payment
-Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 68db165215d..b5a9d70cb70 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/mk_MK/holiday.lang b/htdocs/langs/mk_MK/holiday.lang
index 951af61f273..9aafa73550e 100644
--- a/htdocs/langs/mk_MK/holiday.lang
+++ b/htdocs/langs/mk_MK/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 584a1233557..7fee58b853b 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
 Email=Email
 NoEMail=No email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index b29477e346d..9517568846c 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=Members
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=Late
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/mk_MK/modulebuilder.lang b/htdocs/langs/mk_MK/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/mk_MK/modulebuilder.lang
+++ b/htdocs/langs/mk_MK/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/mk_MK/paybox.lang b/htdocs/langs/mk_MK/paybox.lang
index 0d35ac440fa..d5e4fd9ba55 100644
--- a/htdocs/langs/mk_MK/paybox.lang
+++ b/htdocs/langs/mk_MK/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Do payment
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/mk_MK/paypal.lang b/htdocs/langs/mk_MK/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/mk_MK/paypal.lang
+++ b/htdocs/langs/mk_MK/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 841b4a604d3..402779cb00f 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index b0c1113b0ec..76bd0ce597d 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
diff --git a/htdocs/langs/mk_MK/stripe.lang b/htdocs/langs/mk_MK/stripe.lang
index 6fa072b4c9a..7a3389f34b7 100644
--- a/htdocs/langs/mk_MK/stripe.lang
+++ b/htdocs/langs/mk_MK/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditor
 PaymentCode=Payment code
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index f416ebbc84a..b4d894f55d7 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index ccba0841767..daa5b4ef413 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index a36d63c7373..e8a5dda7efb 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/mn_MN/agenda.lang b/htdocs/langs/mn_MN/agenda.lang
index b928554b328..30c2a3d4038 100644
--- a/htdocs/langs/mn_MN/agenda.lang
+++ b/htdocs/langs/mn_MN/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang
index 5bc061f31f3..cb39150b627 100644
--- a/htdocs/langs/mn_MN/banks.lang
+++ b/htdocs/langs/mn_MN/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-BIC=BIC/SWIFT number
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Statement
 AccountStatements=Account statements
 LastAccountStatements=Last account statements
 IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Supplier payment
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang
index 0934b4c1e46..c9d46e4ffff 100644
--- a/htdocs/langs/mn_MN/bills.lang
+++ b/htdocs/langs/mn_MN/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Payment amount
-ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/mn_MN/cashdesk.lang b/htdocs/langs/mn_MN/cashdesk.lang
index 5138fe80be3..006097b7e82 100644
--- a/htdocs/langs/mn_MN/cashdesk.lang
+++ b/htdocs/langs/mn_MN/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
index 83b931731df..3f175b8b782 100644
--- a/htdocs/langs/mn_MN/compta.lang
+++ b/htdocs/langs/mn_MN/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=New payment
-Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index 68db165215d..b5a9d70cb70 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/mn_MN/holiday.lang b/htdocs/langs/mn_MN/holiday.lang
index 951af61f273..9aafa73550e 100644
--- a/htdocs/langs/mn_MN/holiday.lang
+++ b/htdocs/langs/mn_MN/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index 28096755ddc..cd5066560a2 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
 Email=Email
 NoEMail=No email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/mn_MN/members.lang b/htdocs/langs/mn_MN/members.lang
index b29477e346d..9517568846c 100644
--- a/htdocs/langs/mn_MN/members.lang
+++ b/htdocs/langs/mn_MN/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=Members
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=Late
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/mn_MN/modulebuilder.lang b/htdocs/langs/mn_MN/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/mn_MN/modulebuilder.lang
+++ b/htdocs/langs/mn_MN/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/mn_MN/paybox.lang b/htdocs/langs/mn_MN/paybox.lang
index 0d35ac440fa..d5e4fd9ba55 100644
--- a/htdocs/langs/mn_MN/paybox.lang
+++ b/htdocs/langs/mn_MN/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Do payment
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/mn_MN/paypal.lang b/htdocs/langs/mn_MN/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/mn_MN/paypal.lang
+++ b/htdocs/langs/mn_MN/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index 841b4a604d3..402779cb00f 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index b0c1113b0ec..76bd0ce597d 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
diff --git a/htdocs/langs/mn_MN/stripe.lang b/htdocs/langs/mn_MN/stripe.lang
index 6fa072b4c9a..7a3389f34b7 100644
--- a/htdocs/langs/mn_MN/stripe.lang
+++ b/htdocs/langs/mn_MN/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditor
 PaymentCode=Payment code
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index f416ebbc84a..b4d894f55d7 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 6307cae5ba5..c9f0fb87382 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Utgiftsrapport-binding
 CreateMvts=Opprett ny transaksjon
 UpdateMvts=Endre en transaksjon
 ValidTransaction=Valider transaksjonen
-WriteBookKeeping=Før transaksjoner inn i hovedboken
+WriteBookKeeping=Registrer transaksjoner i Hovedboken
 Bookkeeping=Hovedbok
 AccountBalance=Kontobalanse
 ObjectsRef=Kildeobjekt ref
@@ -155,9 +155,9 @@ ACCOUNTING_HAS_NEW_JOURNAL=Har ny journal
 
 ACCOUNTING_RESULT_PROFIT=Resultatregnskapskonto (fortjeneste)
 ACCOUNTING_RESULT_LOSS=Resultatregnskapskonto (tap)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Avslutningsjournal
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Regnskapkonto for overgangsbasert overføring
 
 ACCOUNTING_ACCOUNT_SUSPENSE=Regnskapskonto for vent
 DONATION_ACCOUNTINGACCOUNT=Regnskapskonto for registrering av donasjoner
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Regnskapskonto for å registrere abonnem
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard regnskapskonto for kjøpte varer (brukt hvis ikke definert på varekortet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard regnskapskonto for solgte varer (brukt hvis ikke definert på varekortet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Standard regnskapskonto for solgte varer i EU (brukt hvis ikke definert på varekortet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Standard regnskapskonto for solgte varer eksportert ut av EU (brukt hvis ikke definert på varekortet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Standard regnskapskonto for solgte varer i EU (brukt hvis ikke definert på varekortet)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Standard regnskapskonto for solgte varer eksportert ut av EU (brukt hvis ikke definert på varekortet)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard regnskapskonto for kjøpte tjenester (brukt hvis ikke definert på tjenestekortet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard regnskapskonto for solgte tjenester (brukt hvis ikke definert på tjenestekortet)
 
@@ -176,7 +176,8 @@ Docref=Referanse
 LabelAccount=Kontoetikett
 LabelOperation=Etikettoperasjon
 Sens=som betyr
-LetteringCode=Brevkode
+LetteringCode=Korrespondansekode
+Lettering=Korrespondanse
 Codejournal=Journal
 JournalLabel=Journaletikett
 NumPiece=Del nummer
@@ -288,8 +289,10 @@ Modelcsv_quadratus=Eksport til Quadratus QuadraCompta
 Modelcsv_ebp=Eksport tilEBP
 Modelcsv_cogilog=Eksport til Cogilog
 Modelcsv_agiris=Eksport til Agiris
+Modelcsv_openconcerto=Eksport for OpenConcerto (Test)
 Modelcsv_configurable=Eksport CSV Konfigurerbar
-Modelcsv_FEC=Eksport FEC (Art. L47 A) (Test)
+Modelcsv_FEC=Eksport FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Eksport for Sage 50 Switzerland
 ChartofaccountsId=Kontoplan ID
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=Denne siden kan brukes til å sette en standardkonto til bruk
 DefaultClosureDesc=Denne siden kan brukes til å angi parametere som skal brukes til å legge inn en balanse.
 Options=Innstillinger
 OptionModeProductSell=Salgsmodus
+OptionModeProductSellIntra=Modussalg eksportert i EU
+OptionModeProductSellExport=Modussalg eksportert i andre land
 OptionModeProductBuy=Innkjøpsmodus
 OptionModeProductSellDesc=Vis alle varer for salg, med regnskapskonto
+OptionModeProductSellIntraDesc=Vis alle varer med regnskapskonto for salg innen EU
+OptionModeProductSellExportDesc=Vis alle varer med regnskapskonto for andre internasjonale salg.
 OptionModeProductBuyDesc=Vis alle varer for kjøp, med regnskapskonto
 CleanFixHistory=Fjern regnskapskode fra linjer som ikke finnes i kontooversikt
 CleanHistory=Nullstill alle bindinger for valgt år
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 90fea338bd2..158946d636d 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -66,12 +66,14 @@ Dictionary=Ordlister
 ErrorReservedTypeSystemSystemAuto=Verdiene 'system' og 'systemauto' for type er reservert. Du kan bruke 'user' som verdi for å legge til din egen oppføring
 ErrorCodeCantContainZero=Koden kan ikke inneholde verdien 0
 DisableJavascript=Slå av funksjoner som bruker JavaScript og Ajax
-DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=Merk: For test eller feilsøking. For optimalisering for blinde personer eller tekstbrowsere, kan du velge å bruke oppsettet på brukerens profil
 UseSearchToSelectCompanyTooltip=Hvis du har et stort antall tredjeparter (> 100 000), kan du øke hastigheten ved å sette konstant COMPANY_DONOTSEARCH_ANYWHERE til 1 i Oppsett-> Annet. Søket vil da være begrenset til starten av strengen.
 UseSearchToSelectContactTooltip=Hvis du har et stort antall tredjeparter (> 100 000), kan du øke hastigheten ved å sette konstant CONTACT_DONOTSEARCH_ANYWHERE til 1 i Oppsett-> Annet. Søket vil da være begrenset til starten av strengen.
 DelaiedFullListToSelectCompany=Vent med å trykke på en tast før innholdet av tredjepart-kombinasjonslisten er lastet.<br>Dette kan øke ytelsen hvis du har mange tredjeparter
 DelaiedFullListToSelectContact=Vent med å trykke på en tast før innholdet av kontakt-kombinasjonslisten er lastet.<br>Dette kan øke ytelsen hvis du har mange kontakter
 NumberOfKeyToSearch=Antall tegn for å starte søk: %s
+NumberOfBytes=Antall bytes
+SearchString=Søkestreng
 NotAvailableWhenAjaxDisabled=Ikke tilgjengelig når Ajax er slått av
 AllowToSelectProjectFromOtherCompany=På elementer av en tredjepart, kan du velge et prosjekt knyttet til en annen tredjepart
 JavascriptDisabled=JavaScript er deaktivert
@@ -128,7 +130,7 @@ DaylingSavingTime=Sommertid
 CurrentHour=PHP tid (server)
 CurrentSessionTimeOut=Gjeldende økt-timeout
 YouCanEditPHPTZ=For å angi en annen PHP tidssone (ikke nødvendig), kan du prøve å legge til en .htaccess fil med en linje som denne "SetEnv TZ Europe/Oslo"
-HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
+HoursOnThisPageAreOnServerTZ=Advarsel, i motsetning til andre skjermer, er klokken på denne siden ikke i din lokale tidssone, men i tidssonen til serveren.
 Box=Widget
 Boxes=Widgeter
 MaxNbOfLinesForBoxes=Maks. antall linjer for widgeter
@@ -197,11 +199,11 @@ BoxesDesc=Widgets er komponenter som viser litt informasjon du kan legge til for
 OnlyActiveElementsAreShown=Bare elementer fra <a href="%s">aktiverte moduler</a> vises.
 ModulesDesc=Modulene/programmene bestemmer hvilke funksjoner som er tilgjengelige i programvaren. Noen moduler krever at brukere får tillatelser etter at modulen er aktivert. Klikk på på/av-knappen (på slutten av modullinjen) for å aktivere/deaktivere en modul/applikasjon.
 ModulesMarketPlaceDesc=Du kan finne flere moduler for nedlasting på eksterne nettsteder.
-ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
+ModulesDeployDesc=Hvis tillatelser for filsystemet tillater det, kan du bruke dette verktøyet til å distribuere en ekstern modul. Modulen vil da være synlig under fanen <strong>%s</strong>.
 ModulesMarketPlaces=Finn eksterne apper/moduler
 ModulesDevelopYourModule=Utvikle dine egen apper/moduler
-ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
-DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
+ModulesDevelopDesc=Du kan også utvikle din egen modul eller finne en partner til å utvikle en for deg.
+DOLISTOREdescriptionLong=I stedet for å slå på <a href="https://www.dolistore.com"> www.dolistore.com </a> nettstedet for å finne en ekstern modul, kan du bruke dette innebygde verktøyet til å utføre søkingen på eksternt marked for deg (kan være tregt, trenger Internett-tilgang) ...
 NewModule=Ny
 FreeModule=Gratis
 CompatibleUpTo=Kompatibel med versjon %s
@@ -211,9 +213,9 @@ SeeInMarkerPlace=Se på Markedsplass
 Updated=Oppdatert
 Nouveauté=Nyhet
 AchatTelechargement=Kjøp/Last ned
-GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
+GoModuleSetupArea=For å distribuere/installere en ny modul, gå til området for Moduloppsett på <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, den offisielle markedsplassen for eksterne moduler til Dolibarr ERP/CRM 
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module.
+DoliPartnersDesc=Liste over selskaper som tilbyr spesialutviklede moduler eller funksjoner. <br> Merk: siden Dolibarr er en åpen kildekode applikasjon, <i> kan alle </i> erfarne i PHP programmering utvikle en modul.
 WebSiteDesc=Eksterne nettsteder for flere tilleggs- (ikke-kjerne) moduler ...
 DevelopYourModuleDesc=Noen løsninger for å utvikle din egen modul...
 URL=Lenke
@@ -244,7 +246,7 @@ OfficialMarketPlace=Offisiell markedsplass for eksterne moduler/tillegg
 OfficialWebHostingService=Referert webhosting service (Cloud hosting)
 ReferencedPreferredPartners=Foretrukne Partnere
 OtherResources=Andre ressurser
-ExternalResources=External Resources
+ExternalResources=Eksterne ressurser
 SocialNetworks=Sosiale nettverk
 ForDocumentationSeeWiki=For bruker- eller utviklerdokumentasjon (Doc, FAQs ...), <br> ta en titt på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=For andre spørsmål/hjelp, kan du bruke Dolibarr forumet: <br> <a href="%s" target="_blank"><b>%s</b></a>
@@ -275,22 +277,22 @@ MAIN_MAIL_ERRORS_TO=E-post brukes til å returnere epostmeldinger (felt 'Feil-ti
 MAIN_MAIL_AUTOCOPY_TO= Kopier alle sendte e-post til
 MAIN_DISABLE_ALL_MAILS=Deaktiver all epost sending (for testformål eller demoer)
 MAIN_MAIL_FORCE_SENDTO=Send alle e-post til (i stedet for ekte mottakere, til testformål)
-MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employee users with email into allowed recipient list
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Legg til ansatte brukere med epost i tillatt mottaker-liste
 MAIN_MAIL_SENDMODE=Epost sendingsmetode
 MAIN_MAIL_SMTPS_ID=SMTP-ID (hvis sending av server krever godkjenning)
 MAIN_MAIL_SMTPS_PW=SMTP-passord (hvis sending av server krever godkjenning)
 MAIN_MAIL_EMAIL_TLS=Bruk TLS (SSL) kryptering
-MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
-MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
-MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
-MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
-MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
+MAIN_MAIL_EMAIL_STARTTLS=Bruk TLS (STARTTL) kryptering
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Bruk DKIM til å generere epostsignatur
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for bruk med DKIM
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Navn på DKIM-velger
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Privat nøkkel for DKIM signering
 MAIN_DISABLE_ALL_SMS=Deaktiver all SMS-sending (for testformål eller demoer)
 MAIN_SMS_SENDMODE=Metode for å sende SMS
 MAIN_MAIL_SMS_FROM=Standard avsender telefonnummer for SMS sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
+MAIN_MAIL_DEFAULT_FROMTYPE=Standard avsender-epost for manuell sending (Bruker-epost eller firma-epost)
 UserEmail=Bruker-epost
-CompanyEmail=Company Email
+CompanyEmail=Firma epost
 FeatureNotAvailableOnLinux=Funksjonen er ikke tilgjengelig på Unix/Linux. Test sendmail lokalt.
 SubmitTranslation=Hvis oversettelsen for dette språket ikke er fullført, eller du finner feil, kan du rette opp dette ved å redigere filer i katalogen <b>langs/%s</b> og sende inn endringen til www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Hvis oversettelse for dette språket ikke er fullstendig eller du finner feil, kan du korrigere dette ved å redigere filer i katalogen <b>langs/%s</b> og sende endrede filer på dolibarr.org/forum eller for utviklere på github.com/Dolibarr/dolibarr.
@@ -307,7 +309,7 @@ ModuleFamilyTechnic=Multimodulverktøy
 ModuleFamilyExperimental=Eksperimentelle moduler
 ModuleFamilyFinancial=Finansielle moduler (Regnskap/Likviditet)
 ModuleFamilyECM=Håndtering av elektronisk innhold (ECM)
-ModuleFamilyPortal=Websites and other frontal application
+ModuleFamilyPortal=Nettsteder og andre frontapplikasjoner
 ModuleFamilyInterface=Grensesnitt mot eksterne systemer
 MenuHandlers=Menyhåndtering
 MenuAdmin=Menyredigering
@@ -318,7 +320,7 @@ StepNb=Trinn %s
 FindPackageFromWebSite=Finn en pakke som gir funksjonene du trenger (for eksempel på den offisielle nettsiden %s).
 DownloadPackageFromWebSite=Last ned pakke (for eksempel fra den offisielle nettsiden %s).
 UnpackPackageInDolibarrRoot=Pakk ut filene til serverkatalogen til Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+UnpackPackageInModulesRoot=For å distribuere/installere en ekstern modul, pakk ut de pakkede filene i serverkatalogen dedikert til eksterne moduler: <br> <b> %s </b>
 SetupIsReadyForUse=Moduldistribusjon er ferdig. Du må imidlertid aktivere og sette opp modulen i programmet ved å gå til siden: <a href="%s">%s</a>.
 NotExistsDirect=Alternativ rotkatalog er ikke definert til en eksisterende katalog.<br>
 InfDirAlt=Fra versjon 3 er det mulig å definere en alternativ rotkatalog. Dette gjør det mulig å lagre plug-ins og egendefinerte maler.<br>Opprett en katalog i roten til Dolibarr (f.eks min katalog).<br>
@@ -383,7 +385,7 @@ PDFAddressForging=Regler for adressebokser
 HideAnyVATInformationOnPDF=Skjul all informasjon relatert til skatt/MVA på generert PDF
 PDFRulesForSalesTax=Regler for salgsskatt/mva
 PDFLocaltax=Regler for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Skjul %s rate i kolonne MVA Salg
 HideDescOnPDF=Skjul varebeskrivelse
 HideRefOnPDF=Skjul varereferanse
 HideDetailsOnPDF=Skjul linjer med varedetaljer
@@ -419,14 +421,14 @@ ExtrafieldCheckBox=Sjekkbokser
 ExtrafieldCheckBoxFromList=Avkrysningsbokser fra tabell
 ExtrafieldLink=Lenke til et objekt
 ComputedFormula=Beregnet felt
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
-ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
+ComputedFormulaDesc=Her kan du skrive inn en formel ved hjelp av andre objektegenskaper eller PHP-koding for å få en dynamisk beregningnet verdi. Du kan bruke PHP-kompatible formler, inkludert "?" operator og følgende globale objekt: <strong> $db, $conf, $langs, $mysoc, $user, $objekt </strong>. <br><br><Strong> ADVARSEL </strong>: Kanskje bare noen egenskaper på $objekt er tilgjengelig. Hvis du trenger egenskaper som ikke er lastet, kan du bare hente objektet i formelen din som i det andre eksempelet. <br> Ved å bruke et beregnet felt betyr det at du ikke selv kan angi noen verdi fra grensesnittet. Også, hvis det er en syntaksfeil, kan det hende formelen ikke returnerer noe. <br> <br> Eksempel på formel: <br> $objekt->id<10? round ($object->id / 2, 2) : ($object-> id + 2 *$user->id) * (int) substr($mysoc->zip, 1, 2) <br> <br> Eksempel på å ny innlasting av objekt <br> (($reloadedobj = new Societe ($db)) && ($reloadedobj->fetch($obj-> id? $ obj-> id: ($obj-> rowid? $obj-> rowid: $object-> id))> 0))? $reloadedobj-> array_options ['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' <br> <br> Annet eksempel på formel for å tvinge lasting av objekt og dets overordnede objekt: <br> (($reloadedobj = Ny oppgave ($db)) && ($reloadedobj->fetch($objekt->id)> 0) && ($secondloadedobj = nytt prosjekt ($db)) && ($secondloadedobj->fetch($reloadedobj-> fk_project )> 0))? $secondloadedobj-> ref: 'Foreldreprosjekt ikke funnet'
+ExtrafieldParamHelpPassword=Hvis dette feltet er tomt, vil denne verdien bli lagret uten kryptering (feltet må bare skjules med stjerne på skjermen). <br> Angi 'auto' for å bruke standard krypteringsregel for å lagre passordet i databasen (da vil verdiavlesning være bare hash, uten noen måte å hente opprinnelig verdi på)
 ExtrafieldParamHelpselect=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1<br>2,verdi2<br>kode3,verdi3<br>...<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>1,verdi1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>: parent_key<br><br>For å få listen avhengig av en annen liste:<br>1,verdi1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1 <br>2,verdi2<br>3,verdi3<br> ...
 ExtrafieldParamHelpradio=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1 <br>2,verdi2<br>3,verdi3<br> ...
 ExtrafieldParamHelpsellist=Liste over verdier kommer fra en tabell<br>Syntaks: tabellnavn: label_field: id_field::filter<br> Eksempel: c_typent: libelle:id::filter<br><br>- idfilter er nødvendigvis en primær int nøkkel<br>- filteret kan være en enkel test (f.eks. aktiv = 1) for å vise bare aktiv verdi <br> Du kan også bruke $ID$ i filtre, som er gjeldende ID for nåværende objekt <br> For å utføre en SELECT i filtre, bruk $SEL$<br> Hvis du vil filtrere på ekstrafelt, bruk syntaks extra.fieldcode=... (der feltkoden er koden til ekstrafelt)<br><br>For å få listen avhengig av en annen komplementær attributtliste: <br>c_typent:libelle:id:options_<i>parent_list_code</i> | parent_column:filter <br><br>For å få listen avhengig av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code </i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelpchkbxlst=Liste over verdier kommer fra en tabell <br> Syntaks: table_name:label_field:id_field::filter <br> Eksempel: c_typent:libelle:id::filter<br><br> filter kan være en enkel test (f.eks. Aktiv=1 ) for å vise bare aktiv verdi<br>Du kan også bruke $ID$ i filter, som er gjeldende ID for nåværende objekt<br>For å utføre en SELECT i filter, bruk $SEL$<br>Hvis du vil filtrere på ekstrafeltbruk bruk syntaks extra.fieldcode=... (der feltkoden er koden til ekstrafelt)<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>c_typent:libelle:id:options_<i>parent_list_code </i> |parent_column:filter<br><br>For å få listen avhengig av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code</i> |parent_column:filter
+ExtrafieldParamHelplink=Parametere må være ObjectName: Classpath <br> Syntax: ObjectName: Classpath <br> Eksempler: <br> Societe: societe / class / societe.class.php <br> Kontakt: kontakt / class / contact.class.php
 LibraryToBuildPDF=Bibliotek brukt for PDF-generering
 LocalTaxDesc=For noen land gjelder to eller tre skatter på hver fakturalinje. Dersom dette er tilfelle, velg type for andre og tredje skatt, samt sats. Mulig type: <br> 1: lokalavgift gjelder på varer og tjenester uten mva (lokal avgift er beregnet beløp uten mva) <br> 2: lokalavgift gjelder på varer og tjenester, inkludert merverdiavgift (lokalavgift beregnes på beløpet + hovedavgift) <br> 3: lokalavgift gjelder på varer uten mva (lokalavgift er beregnet beløp uten mva) <br> 4: lokalagift gjelder på varer inkludert mva (lokalavgift beregnes på beløpet + hovedavgift) <br> 5: lokal skatt gjelder tjenester uten mva (lokalavgift er beregnet beløp uten mva) <br> 6: lokalavgift gjelder på tjenester inkludert mva (lokalavgift beregnes på beløpet + mva)
 SMS=SMS
@@ -438,39 +440,40 @@ DefaultLink=Standard kobling
 SetAsDefault=Sett som standard
 ValueOverwrittenByUserSetup=Advarsel, denne verdien kan bli overskrevet av brukerspesifikke oppsett (hver bruker kan sette sitt eget clicktodial url)
 ExternalModule=Ekstern modul - Installert i katalog %s
-BarcodeInitForthird-parties=Mass barcode init for third-parties
+BarcodeInitForthird-parties=Masseinitiering av strekkoder for tredjeparter
 BarcodeInitForProductsOrServices=Masseinitiering eller sletting av strekkoder for varer og tjenester
 CurrentlyNWithoutBarCode=For øyeblikket har du <strong>%s</strong> poster på <strong>%s</strong> %s uten strekkode.
 InitEmptyBarCode=Startverdi for neste %s tomme post
 EraseAllCurrentBarCode=Slett alle gjeldende strekkode-verdier
 ConfirmEraseAllCurrentBarCode=Er du sikker på at du vil slette alle nåværende strekkodeverdier?
 AllBarcodeReset=Alle strekkode-verdier er blitt slettet
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
+NoBarcodeNumberingTemplateDefined=Ingen mal for strekkodenummerering er aktivert i strekkodemodulen
 EnableFileCache=Aktiver fil-cache
-ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
-NoDetails=No additional details in footer
+ShowDetailsInPDFPageFoot=Legg til flere detaljer i bunntekst, for eksempel bedriftsadresse eller ledernavn (i tillegg til profesjonell ID, selskapskapital og MVA-nummer).
+NoDetails=Ingen ytterligere detaljer i bunnteksten
 DisplayCompanyInfo=Vis firmaadresse
 DisplayCompanyManagers=Vis ledernavn
 DisplayCompanyInfoAndManagers=Vis firmaadresser og ledernavn
-EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
-ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
-ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
+EnableAndSetupModuleCron=Hvis du ønsker at gjentakende fakturaer skal genereres automatisk, må modulen *%s* være aktivert og riktig konfigurert. Ellers må generering av fakturaer gjøres manuelt fra denne malen med knapp *Lag*. Merk at selv om du har aktivert automatisk generering, kan du likevel trygt starte manuell generasjon. Generering av duplikater for samme periode er ikke mulig.
+ModuleCompanyCodeCustomerAquarium=%s etterfulgt av kundekode for en kunde-regnskapskode
+ModuleCompanyCodeSupplierAquarium=%s etterfulgt av leverandørkode for en leverandør-regnskapskode
 ModuleCompanyCodePanicum=Returner en tom regnskapskode.
-ModuleCompanyCodeDigitaria=Accounting code depends on third-party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third-party code.
+ModuleCompanyCodeDigitaria=Regnskapskode avhenger av tredjepartskode. Koden består av tegnet "C" i den første posisjonen etterfulgt av de første 5 tegnene til tredjepartskoden.
 Use3StepsApproval=Som standard må innkjøpsordrer opprettes og godkjennes av 2 forskjellige brukere (ett trinn/bruker for å opprette og ett trinn/bruker for å godkjenne. Merk at hvis brukeren har både tillatelse til å opprette og godkjenne, vil ett trinn/ bruker vil være nok). Du kan bruke dette alternativet for å innføre et tredje trinn/bruker godkjenning, hvis beløpet er høyere enn en spesifisert verdi (så vil 3 trinn være nødvendig: 1=validering, 2=første godkjenning og 3=andre godkjenning dersom beløpet er høyt nok). <br> Sett denne tom en godkjenning (2 trinn) er nok, sett den til en svært lav verdi (0,1) hvis det alltid kreves en andre godkjenning (3 trinn).
 UseDoubleApproval=Bruk 3-trinns godkjennelse når beløpet (eks. MVA) er høyere enn...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=ADVARSEL: Det er ofte bedre å sette utgående eposter til å bruke epostserveren til leverandøren din i stedet for standardoppsettet. Noen epostleverandører (som Yahoo) tillater ikke at du sender en epost fra en annen server enn deres egen server. Ditt nåværende oppsett bruker serveren i programmet til å sende epost og ikke serveren til epostleverandøren din, så noen mottakere (den som er kompatibel med den restriktive DMARC-protokollen), vil spørre epostleverandøren din om de kan godta eposten din og noen epostleverandører (som Yahoo) kan svare "nei" fordi serveren ikke er en deres servere, så få av dine sendte e-poster kan ikke aksepteres (vær også oppmerksom på epostleverandørens sendekvote). <br> Hvis din epostleverandør (som Yahoo) har denne begrensningen, må du endre epostoppsett til å velge den andre metoden "SMTP-server" og angi SMTP-serveren og legitimasjonene som tilbys av epostleverandøren din .
 WarningPHPMail2=Hvis din epost-SMTP-leverandør må begrense epostklienten til noen IP-adresser (svært sjelden), er dette IP-adressen til epost-brukeragenten (MUA) for ERP CRM-programmet: <strong> %s </strong>.
 ClickToShowDescription=Klikk for å vise beskrivelse
-DependsOn=This module needs the module(s)
+DependsOn=Denne modulen trenger modulen(ene)
 RequiredBy=Denne modulen er påkrevd av modul(ene)
-TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
-PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-EnableDefaultValues=Enable customization of default values
-EnableOverwriteTranslation=Enable usage of overwritten translation
-GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
+TheKeyIsTheNameOfHtmlField=Dette er navnet på HTML-feltet. Teknisk kunnskap er nødvendig for å lese innholdet på HTML-siden for å få nøkkelnavnet til et felt.
+PageUrlForDefaultValues=Du må skrive inn den relative banen til sidens nettadresse. Hvis du inkluderer parametere i URL, vil standardverdiene være effektive hvis alle parametere er satt til samme verdi.
+PageUrlForDefaultValuesCreate= <br> Eksempel: <br> For skjemaet for å opprette en ny tredjepart, er det <strong> %s </strong>. <br> For URL til eksterne moduler installert i tilpasset mappe, ikke inkluder "Custom/", bruk banen som <strong> mymodule/mypage.php </strong> og ikke custom/mymodule/mypage.php. <br> Hvis du bare vil ha standard verdi hvis url har noen parametre, kan du bruke <strong> %s </strong>
+PageUrlForDefaultValuesList= <br> Eksempel: <br> For siden som viser tredjeparter, er den <strong> %s </strong>. <br> For URL til eksterne moduler installert i tilpasset mappe, ikke inkluder "Custom /" , men bruk en bane som <strong> mymodule/mypagelist.php </strong> og ikke custom/mymodule/mypagelist.php. <br> Hvis du bare vil ha standard verdi hvis url har noen parametre, kan du bruke <strong> %s </strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Vær også oppmerksom på at overskriving av standardverdier for skjemaoppretting bare fungerer for sider som er riktig utformet (så med parameter handling = opprett eller legg til ...)
+EnableDefaultValues=Aktiver tilpasning av standardverdier
+EnableOverwriteTranslation=Aktiver bruk av overskrivende oversettelse
+GoIntoTranslationMenuToChangeThis=En oversettelse har blitt funnet for nøkkelen med denne koden. For å endre denne verdien må du redigere den fra Hjem-Oppsett-Oversettelse.
 WarningSettingSortOrder=Advarsel, å angi en standard sorteringsrekkefølge kan føre til en teknisk feil når du går på listesiden dersom feltet er et ukjent felt. Hvis du opplever en slik feil, kan du komme tilbake til denne siden for å fjerne standard sorteringsrekkefølge og gjenopprette standardoppførsel.
 Field=Felt
 ProductDocumentTemplates=Dokumentmaler for å generere produktdokument
@@ -479,14 +482,14 @@ WatermarkOnDraftExpenseReports=Vannmerke på utgiftsrapport-maler
 AttachMainDocByDefault=Sett dette til 1 hvis du vil legge ved hoveddokumentet til e-post som standard (hvis aktuelt)
 FilesAttachedToEmail=Legg ved fil
 SendEmailsReminders=Send agendapåminnelser via e-post
-davDescription=Setup a WebDAV server
+davDescription=Sett opp en WebDAV-server
 DAVSetup=Oppsett av DAV-modulen
-DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
-DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
-DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
-DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
-DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
-DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+DAV_ALLOW_PRIVATE_DIR=Aktiver generisk privatkatalog (WebDAV dedikert mappe kalt "privat" - innlogging kreves)
+DAV_ALLOW_PRIVATE_DIRTooltip=Den generiske private katalogen er en WebDAV-katalog som noen kan få tilgang til med sin applikasjons-login/passord.
+DAV_ALLOW_PUBLIC_DIR=Aktiver generisk offentlig katalog (WebDAV dedikert mappe kalt "offentlig" - ingen innlogging kreves)
+DAV_ALLOW_PUBLIC_DIRTooltip=Den generiske offentlige katalogen er en WebDAV-mappe som noen kan få tilgang til (i lese- og skrivemodus), uten at autorisasjon kreves (innlogging/passord-konto).
+DAV_ALLOW_ECM_DIR=Aktiver DMS/ECM privat mappe (rotmappen til DMS/ECM-modulen - innlogging kreves)
+DAV_ALLOW_ECM_DIRTooltip=Rotkatalogen der alle filene lastes opp manuelt når du bruker DMS/ECM-modulen. På samme måte som tilgang fra webgrensesnittet, trenger du et gyldig brukernavn/passord med adekvate tillatelser for å få tilgang til det.
 # Modules
 Module0Name=Brukere og grupper
 Module0Desc=Håndtering av Brukere/Ansatte og Grupper
@@ -494,40 +497,40 @@ Module1Name=Tredjeparter
 Module1Desc=Behandling av bedrifter og kontaktpersoner
 Module2Name=Handel
 Module2Desc=Behandling av handelsfunksjoner
-Module10Name=Accounting (simplified)
+Module10Name=Regnskap (forenklet)
 Module10Desc=Enkle regnskapsrapporter (tidsskrifter, omsetning) basert på databaseinnhold. Bruker ikke en hovedbok.
 Module20Name=Tilbud
 Module20Desc=Behandling av tilbud
 Module22Name=Masseutsendelser
-Module22Desc=Manage bulk emailing
+Module22Desc=Behandle masse-epost
 Module23Name=Energi
 Module23Desc=Overvåking av energiforbruk
 Module25Name=Salgsordre
-Module25Desc=Sales order management
+Module25Desc=Behandling av salgsordre
 Module30Name=Fakturaer
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module30Desc=Håndtering av fakturaer og kreditnotaer for kunder. Håndtering av fakturaer og kreditnotaer for leverandører
 Module40Name=Leverandører
-Module40Desc=Vendors and purchase management (purchase orders and billing)
+Module40Desc=Leverandører og innkjøpshåndtering (innkjøpsordre og fakturering)
 Module42Name=Feilsøkingslogger
 Module42Desc=Loggfunksjoner (fil, syslog, ...). Slike logger er for tekniske/feilsøkingsformål.
 Module49Name=Redigeringsprogram
 Module49Desc=Behandling av redigeringsprogram
 Module50Name=Varer
-Module50Desc=Management of Products
+Module50Desc=Håndtering av varer
 Module51Name=Masseutsendelser
 Module51Desc=Håndtering av masse-papirpost-utsendelse
 Module52Name=Lagerbeholdning
-Module52Desc=Stock management (for products only)
+Module52Desc=Lagerstyring (kun for varer)
 Module53Name=Tjenester
 Module53Desc=Administrasjon av tjenester
 Module54Name=Kontrakter/abonnement
-Module54Desc=Management of contracts (services or recurring subscriptions)
+Module54Desc=Forvaltning av kontrakter (tjenester eller tilbakevendende abonnementer)
 Module55Name=Strekkoder
 Module55Desc=Behandling av strekkoder
 Module56Name=Telefoni
 Module56Desc=Telefoniintegrasjon
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module57Name=Bank Direkte Debitbetalinger
+Module57Desc=Håndtering av direktedebet betalingsordre. Inkluderer generering av SEPA-fil for europeiske land
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integrasjon
 Module59Name=Bookmark4u
@@ -537,11 +540,11 @@ Module70Desc=Behandling av intervensjoner
 Module75Name=Reisekostnader og notater
 Module75Desc=Behandling av reisekostnader og notater
 Module80Name=Forsendelser
-Module80Desc=Shipments and delivery note management
+Module80Desc=Behandlinger av forsendelser og leveringsordre
 Module85Name=Banker og kontanter
 Module85Desc=Behandling av bank- og kassekonti
 Module100Name=Eksternt nettsted
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module100Desc=Legg til en lenke til en ekstern nettside som et hovedmenyikon. Nettstedet vises i en ramme under toppmenyen.
 Module105Name=Mailman og SPIP
 Module105Desc=Mailman- eller SPIP-grensesnitt for medlemsmodulen
 Module200Name=LDAP
@@ -558,41 +561,41 @@ Module320Name=RSS nyhetsstrøm
 Module320Desc=Legg til en RSS-feed til Dolibarr-sider
 Module330Name=Bokmerker og snarveier
 Module330Desc=Lag snarveier, alltid tilgjengelige, til de interne eller eksterne sidene som du ofte bruker
-Module400Name=Projects or Leads
-Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module400Name=Prosjekter eller Leads
+Module400Desc=Håndtering av prosjekter, muligheter og/eller oppgaver. Du kan også tildele et element (faktura, rekkefølge, forslag, intervensjon, ...) til et prosjekt og få en tverrgående visning fra prosjektvisningen.
 Module410Name=Webkalender
 Module410Desc=Integrasjon med webkalender
-Module500Name=Taxes & Special Expenses
+Module500Name=Skatter og spesielle utgifter
 Module500Desc=Håndtering av andre utgifter (salgsskatt, sosiale eller skattemessige skatter, utbytte, ...)
 Module510Name=Lønn
-Module510Desc=Record and track employee payments
+Module510Desc=Registrer og følg opp ansattebetalinger
 Module520Name=Lån
 Module520Desc=Administrering av lån
 Module600Name=Varsler
-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.
+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
-Module610Desc=Creation of product variants (color, size etc.)
+Module610Desc=Opprettelse av produktvarianter (farge, størrelse etc.)
 Module700Name=Donasjoner
 Module700Desc=Behandling av donasjoner
-Module770Name=Expense Reports
-Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
+Module770Name=Utgiftsrapporter
+Module770Desc=Håndtering av utgiftsrapporter (reise, diett, mm)
+Module1120Name=Leverandørtilbud
 Module1120Desc=Be om leverandørtilbud og priser
 Module1200Name=Mantis
 Module1200Desc=Mantisintegrasjon
 Module1520Name=Dokumentgenerering
-Module1520Desc=Mass email document generation
+Module1520Desc=Masse-epost dokumentgenerering
 Module1780Name=Merker/kategorier
 Module1780Desc=Opprett merker/categorier (varer, kunder, leverandører, kontakter eller medlemmer)
 Module2000Name=WYSIWYG Editor
-Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2000Desc=Tillat at tekstfelter redigeres/formateres ved hjelp av CKEditor (html)
 Module2200Name=Dynamiske priser
-Module2200Desc=Use maths expressions for auto-generation of prices
+Module2200Desc=Bruk matematiske uttrykk for automatisk generering av priser
 Module2300Name=Planlagte jobber
 Module2300Desc=Planlagt jobbadministrasjon (alias cron- eller chronotabell)
 Module2400Name=Hendelser/Agenda
-Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2400Desc=Spor hendelser. Logg automatisk hendelser for sporingsformål eller registrer manuelle hendelser eller møter. Dette er hovedmodulen for håndtering av gode kunde- eller leverandørforhold.
 Module2500Name=DMS / ECM
 Module2500Desc=Dokumenthåndteringssystem / Elektronisk innholdshåndtering. Automatisk organisering av dine genererte eller lagrede dokumenter. Del dem når du trenger det.
 Module2600Name=API/Web tjenseter(SOAP server)
@@ -600,14 +603,14 @@ Module2600Desc=Aktiver Dolibarrs SOAP-server for å kunne bruke API-tjenester
 Module2610Name=API/Web tjenester (REST server)
 Module2610Desc=Aktiver Dolibarrs REST-server for å kunne bruke API-tjenester
 Module2660Name=Kall webtjenester (SOAP klient)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2660Desc=Aktiver Dolibarr webtjenesteklient (Kan brukes til å sende data/forespørsler til eksterne servere. Bare innkjøpsordre støttes for øyeblikket)
 Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2700Desc=Bruk elektronisk Gravatar-tjeneste (www.gravatar.com) for å vise bilde av brukere/medlemmer (funnet med e-post). Du trenger internett-tilgang
 Module2800Desc=FTP-klient
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverteringsegenskaper
 Module3200Name=Uforanderlige arkiver
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3200Desc=Aktiver en uforanderlig logg over forretningshendelser. Hendelser arkiveres i sanntid. Loggen er en skrivebeskyttet tabell med kjedede hendelser som kan eksporteres. Denne modulen kan være obligatorisk for enkelte land.
 Module4000Name=HRM
 Module4000Desc=HRM (håndtering av avdeling, arbeidskontrakter og personell)
 Module5000Name=Multi-selskap
@@ -615,47 +618,47 @@ Module5000Desc=Lar deg administrere flere selskaper
 Module6000Name=Arbeidsflyt
 Module6000Desc=Arbeidsflytbehandling (automatisk opprettelse av objekt og/eller automatisk statusendring)
 Module10000Name=Websider
-Module10000Desc=Create websites (public) with a WYSIWYG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
-Module20000Name=Leave Request Management
-Module20000Desc=Define and track employee leave requests
-Module39000Name=Product Lots
-Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
-Module40000Name=Multicurrency
-Module40000Desc=Use alternative currencies in prices and documents
+Module10000Desc=Opprett nettsteder (offentlige) med en WYSIWYG-editor. Sett opp webserveren din (Apache, Nginx, ...) for å peke på den dedikerte Dolibarr-katalogen for å få den online på internett med ditt eget domenenavn.
+Module20000Name=Håndtering av permisjonsforespørsler
+Module20000Desc=Definer og spor ansattes permisjonsforespørsler
+Module39000Name=Varelotter
+Module39000Desc=Mange, serienumre, best-før/selges-før-håndtering for varer
+Module40000Name=Multivaluta
+Module40000Desc=Bruk alternative valutaer i priser og dokumenter
 Module50000Name=PayBox
-Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50000Desc=Gi kundene en PayBox online betalingsside (kreditt/debetkort). Dette kan brukes til å la kundene dine foreta ad-hoc-betalinger eller betalinger knyttet til et bestemt Dolibarr-objekt (faktura, bestilling osv.)
 Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50100Desc=Point of Sale-modulen SimplePOS (enkel POS).
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS).
+Module50150Desc=Point of sale TakePOS (berøringsskjerm POS).
 Module50200Name=Paypal
-Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50200Desc=Gi kunderne en PayPal-betalingssideside (PayPal-konto eller kredittkort/debetkort). Dette kan brukes til å la kundene dine foreta ad-hoc-betalinger eller betalinger knyttet til et bestemt Dolibarr-objekt (faktura, bestilling osv.)
 Module50300Name=Stripe
-Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
-Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50300Desc=Tilbyr kunder en Stripe online betalingsside (kreditt/debetkort). Dette kan brukes til å la kundene dine foreta ad-hoc-betalinger eller betalinger knyttet til et bestemt Dolibarr-objekt (faktura, bestilling osv.)
+Module50400Name=Regnskap (dobbeltoppføring)
+Module50400Desc=Regnskapsadministrasjon (dobbeltoppføringer, generell støtte og ekstra regnskapsbøker). Eksporter hovedboken til flere formater.
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module54000Desc=Direkteutskrift (uten å åpne dokumentet)ved hjelp av CUPS IPP inteface (Skriveren må være synlig for serveren, og CUPS må være installert på serveren)
 Module55000Name=Meningsmåling, undersøkelse eller avstemming
-Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module55000Desc=Opprett online undersøkelser eller avstemminger (som Doodle, Studs, RDVz etc ...)
 Module59000Name=Marginer
 Module59000Desc=Modul for å administrere marginer
 Module60000Name=Provisjoner
 Module60000Desc=Modul for å administrere provisjoner
 Module62000Name=Incotermer
-Module62000Desc=Add features to manage Incoterms
+Module62000Desc=Legg til egenskaper for å administrere Incoterm
 Module63000Name=Ressurser
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Module63000Desc=Administrer ressurser (skrivere, biler, rom, ...) for tildeling til arrangementer
 Permission11=Vis kundefakturaer
 Permission12=Opprett/endre kundefakturaer
-Permission13=Ikke validerte kundefakturaer
-Permission14=Godkjenn kundefakturaer
+Permission13=Fjern validering på kundefakturaer
+Permission14=Valider kundefakturaer
 Permission15=Send fakturaer pr e-post
 Permission16=Opprett betalinger for fakturaer
 Permission19=Slett fakturaer
 Permission21=Vis tilbud
 Permission22=Opprett/endre tilbud
-Permission24=Godkjenn tilbud
+Permission24=Valider tilbud
 Permission25=Send tilbud
 Permission26=Lukk tilbud
 Permission27=Slett tilbud
@@ -665,9 +668,9 @@ Permission32=Opprett/endre varer
 Permission34=Slett varer
 Permission36=Se/administrer skjulte varer
 Permission38=Eksporter varer
-Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
-Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects I'm contact for)
+Permission41=Les prosjekter og oppgaver (delt prosjekt og prosjekter jeg er kontakt for). Kan også skrive inn tidsforbruk for meg eller mitt hierarki, på tildelte oppgaver (Tidsskjema)
+Permission42=Opprett/endre prosjekter (delte prosjekter og de jeg er kontakt for). Kan også opprette oppgaver og tildele prosjekter og oppgaver til brukere.
+Permission44=Slett prosjekter (delte og mine egne)
 Permission45=Eksporter prosjekter
 Permission61=Vis intervensjoner
 Permission62=Opprett/endre intervensjoner
@@ -682,7 +685,7 @@ Permission78=Vis abonnementer
 Permission79=Opprett/endre abonnementer
 Permission81=Les kundeordre
 Permission82=Opprett/endre kundeordre
-Permission84=Godkjenn kundeordre
+Permission84=Valider kundeordre
 Permission86=Send kundeordre
 Permission87=Lukk kundeordre
 Permission88=Avbryt kundeordre
@@ -694,29 +697,29 @@ Permission94=Eksporter sosial-/finansavgifter og MVA
 Permission95=Les rapporter
 Permission101=Vis forsendelser
 Permission102=Opprett/endre forsendelser
-Permission104=Godjenn forsendelser
+Permission104=Valider forsendelser
 Permission106=Eksporter forsendelser
 Permission109=Slett forsendelser
 Permission111=Vis kontoutdrag
 Permission112=Opprett/endre/slett og sammenligne transaksjoner
 Permission113=Oppsett av finanskontoer (Opprett, håndter kategorier)
-Permission114=Reconcile transactions
+Permission114=Avstem transaksjoner
 Permission115=Eksportere transaksjoner og kontoutdrag
 Permission116=Overføringer mellom konti
-Permission117=Manage checks dispatching
+Permission117=Håndtere sjekkutsteding
 Permission121=Les tredjeparter lenket til bruker
 Permission122=Opprett/endre tredjeparter lenket til bruker
 Permission125=Slett tredjeparter lenket til bruker
 Permission126=Eksportere tredjeparter
-Permission141=Read all projects and tasks (also private projects for which I am not a contact)
-Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
+Permission141=Les alle prosjekter og oppgaver (også prosjekter jeg ikke er kontakt for)
+Permission142=Opprett/endre alle prosjekter og oppgaver (også prosjekter jeg ikke er kontakt for)
 Permission144=Slett alle prosjekter og oppgaver (også prosjekter jeg ikke er kontakt for)
 Permission146=Les tilbydere
 Permission147=Les statistikk
 Permission151=Les direktedebet betalingsordre
 Permission152=Opprett/endre direktedebet betalingsordre
 Permission153=Send/overfør direktedebet betalingsordre
-Permission154=Record Credits/Rejections of direct debit payment orders
+Permission154=Registrer kredit/avvisninger av direktedebet betalingsordre
 Permission161=Les kontrakter/abonnementer
 Permission162=Opprett/endre kontrakter/abonnementer
 Permission163=Aktiver en tjeneste/abonnement i en kontrakt
@@ -729,17 +732,17 @@ Permission173=Slett reiser og utgifter
 Permission174=Les alle reiser og utgifter
 Permission178=Eksporter reiser og utgifter
 Permission180=Vis leverandører
-Permission181=Read purchase orders
-Permission182=Create/modify purchase orders
-Permission183=Validate purchase orders
-Permission184=Approve purchase orders
-Permission185=Order or cancel purchase orders
-Permission186=Receive purchase orders
-Permission187=Close purchase orders
-Permission188=Cancel purchase orders
+Permission181=Les innkjøpsordre
+Permission182=Opprett/modifiser innkjøpsordre
+Permission183=Valider innkjøpsordre
+Permission184=Godkjenn innkjøpsordre
+Permission185=Utfør eller kanseller innkjøpsordre
+Permission186=Motta innkjøpsordre
+Permission187=Lukk innkjøpsordre
+Permission188=Avbryt innkjøpsordre
 Permission192=Lag linjer
 Permission193=Avbryt linjer
-Permission194=Read the bandwidth lines
+Permission194=Les båndbreddelinjene
 Permission202=Oppret  ADSL-tilkoblinger
 Permission203=Bestill tilkoblinger
 Permission204=Bestill tilkoblinger
@@ -764,12 +767,12 @@ Permission244=Se innholdet i skjulte kategorier
 Permission251=Vis andre brukere og grupper
 PermissionAdvanced251=Vis andre brukere
 Permission252=Lage/endre andre brukere, grupper og deres rettigheter
-Permission253=Create/modify other users, groups and permissions
+Permission253=Opprett/endre andre brukere, grupper og tillatelser
 PermissionAdvanced253=Opprett/endre interne/eksterne brukere og tillatelser
 Permission254=Slette eller deaktivere andre brukere
 Permission255=Opprett/endre egen brukerinformasjon
 Permission256=Slett eller deaktiver andre brukere
-Permission262=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).
+Permission262=Utvid tilgangen til alle tredjeparter (ikke bare tredjeparter der brukeren er en salgsrepresentant).<br>Virker ikke på eksterne brukere (alltid begrenset til egne tilbud, ordre, fakturaer, kontrakter mm).<br>Virker ikke på prosjekter (kun regler for prosjekttillatelser, synlighet og tildeling gjelder).
 Permission271=Vis CA
 Permission272=Vis fakturaer
 Permission273=Opprett fakturaer
@@ -779,10 +782,10 @@ Permission283=Slett kontaktpersoner
 Permission286=Eksportere kontakter
 Permission291=Vis tariffer
 Permission292=Angi tillatelser på tariffer
-Permission293=Modify customer's tariffs
-Permission300=Read barcodes
-Permission301=Create/modify barcodes
-Permission302=Delete barcodes
+Permission293=Endre kundens rater
+Permission300=Les strekkoder
+Permission301=Opprett/endre strekkoder
+Permission302=Slett strekkoder
 Permission311=Vis tjenester
 Permission312=Knytt tjeneste/abonnement til kontrakt
 Permission331=Les bokmerker
@@ -801,9 +804,9 @@ Permission401=Vis rabatter
 Permission402=Opprett/endre rabatter
 Permission403=Valider rabatter
 Permission404=Slett rabatter
-Permission511=Read payments of salaries
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
+Permission511=Les lønnsutbetalinger
+Permission512=Opprett/endre betaling av lønn
+Permission514=Slett utbetalinger av lønn
 Permission517=Eksporter lønn
 Permission520=Les lån
 Permission522=Opprett/endre lån
@@ -835,29 +838,29 @@ Permission1102=Opprett/endre pakksedler
 Permission1104=Valider pakksedler
 Permission1109=Slett pakksedler
 Permission1181=Vis leverandører
-Permission1182=Read purchase orders
-Permission1183=Create/modify purchase orders
-Permission1184=Validate purchase orders
-Permission1185=Approve purchase orders
-Permission1186=Order purchase orders
-Permission1187=Acknowledge receipt of purchase orders
-Permission1188=Delete purchase orders
-Permission1190=Approve (second approval) purchase orders
+Permission1182=Les innkjøpsordre
+Permission1183=Opprett/modifiser innkjøpsordre
+Permission1184=Bekreft innkjøpsordre
+Permission1185=Godkjen innkjøpsordre
+Permission1186=Utfør innkjøpsordre
+Permission1187=Bekreft mottak av innkjøpsordre
+Permission1188=Slett innkjøpsordre
+Permission1190=Godkjenn (andre godkjenning) innkjøpsordre
 Permission1201=Resultat av en eksport
 Permission1202=Opprett/endre eksport
-Permission1231=Read vendor invoices
-Permission1232=Create/modify vendor invoices
-Permission1233=Validate vendor invoices
-Permission1234=Delete vendor invoices
-Permission1235=Send vendor invoices by email
-Permission1236=Export vendor invoices, attributes and payments
-Permission1237=Export purchase orders and their details
+Permission1231=Les leverandørfakturaer
+Permission1232=Opprett/endre leverandørfakturaer
+Permission1233=Valider leverandørfakturaer
+Permission1234=Slett leverandørfakturaer
+Permission1235=Send leverandørfakturaer via e-post
+Permission1236=Eksporter leverandørfakturaer, attributter og betalinger
+Permission1237=Eksporter innkjøpsordre og detaljer
 Permission1251=Kjør masseimport av eksterne data til database (datalast)
 Permission1321=Eksportere kundefakturaer, attributter og betalinger
 Permission1322=Gjenåpne en betalt regning
-Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission1421=Eksporter salgsordre og attributter
+Permission20001=Les permitteringsforespørsler (dine og dine underordnedes)
+Permission20002=Opprett/endre permisjonene dine (dine og dine underordnedes)
 Permission20003=Slett ferieforespørsler
 Permission20004=Les alle permisjonsforespørsler (selv om bruker ikke er underordnet)
 Permission20005=Opprett/endre permisjonsforespørsler for alle (selv om bruker ikke er underordnet)
@@ -879,7 +882,7 @@ Permission2503=Send eller slett dokumenter
 Permission2515=Oppsett av  dokumentmapper
 Permission2801=Bruk FTP-klient i lesemodus (bla gjennom og laste ned)
 Permission2802=Bruk FTP-klient i skrivemodus (slette eller laste opp filer)
-Permission50101=Use Point of Sale
+Permission50101=Bruk utsalgssted
 Permission50201=Les transaksjoner
 Permission50202=Importer transaksjoner
 Permission54001=Skriv ut
@@ -892,76 +895,76 @@ Permission63001=Les ressurser
 Permission63002=Opprett/endre ressurser
 Permission63003=Slett ressurser
 Permission63004=Koble ressurser til agendahendelser
-DictionaryCompanyType=Third-party types
-DictionaryCompanyJuridicalType=Third-party legal entities
+DictionaryCompanyType=Tredjepartstyper
+DictionaryCompanyJuridicalType=Tredjeparts juridiske enheter
 DictionaryProspectLevel=Prospektpotensiale
-DictionaryCanton=States/Provinces
+DictionaryCanton=Stater/provinser
 DictionaryRegion=Region
 DictionaryCountry=Land
 DictionaryCurrency=Valutaer
-DictionaryCivility=Title of civility
+DictionaryCivility=Tittel
 DictionaryActions=Typer agendahendelser
-DictionarySocialContributions=Types of social or fiscal taxes
+DictionarySocialContributions=Typer av sosiale avgifter og skatter
 DictionaryVAT=MVA satser
 DictionaryRevenueStamp=Beløp for skattestempel
-DictionaryPaymentConditions=Payment Terms
-DictionaryPaymentModes=Payment Modes
+DictionaryPaymentConditions=Betalingsbetingelser
+DictionaryPaymentModes=Betalingsmåter
 DictionaryTypeContact=Kontakt/adressetyper
-DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryTypeOfContainer=Nettsted - Type nettsider/containere
 DictionaryEcotaxe=Miljøgebyr (WEEE)
 DictionaryPaperFormat=Papirformater
-DictionaryFormatCards=Card formats
+DictionaryFormatCards=Kortformater
 DictionaryFees=Utgiftsrapport - Typer av utgiftsrapport-linjer
 DictionarySendingMethods=Leveringsmetoder
-DictionaryStaff=Number of Employees
+DictionaryStaff=Antall ansatte
 DictionaryAvailability=Leveringsforsinkelse
 DictionaryOrderMethods=Ordremetoder
 DictionarySource=Tilbud/ordre-opprinnelse
 DictionaryAccountancyCategory=Personlige grupper for rapporter
 DictionaryAccountancysystem=Diagram-modeller for kontoer
 DictionaryAccountancyJournal=Regnskapsjournaler
-DictionaryEMailTemplates=Email Templates
+DictionaryEMailTemplates=E-postmaler
 DictionaryUnits=Enheter
-DictionaryMeasuringUnits=Measuring Units
+DictionaryMeasuringUnits=Måleenheter
 DictionaryProspectStatus=Prospektstatus
-DictionaryHolidayTypes=Types of leave
-DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryHolidayTypes=Typer permisjon
+DictionaryOpportunityStatus=Lead status for prosjekt/lead
 DictionaryExpenseTaxCat=Utgiftsrapport - Transportkategorier
 DictionaryExpenseTaxRange=Utgiftsrapport - Rangert etter transportkategori
 SetupSaved=Innstillinger lagret
 SetupNotSaved=Oppsettet er ikke lagret
-BackToModuleList=Back to Module list
-BackToDictionaryList=Back to Dictionaries list
+BackToModuleList=Tilbake til modullisten
+BackToDictionaryList=Tilbake til Ordboklisten
 TypeOfRevenueStamp=Type skattestempel
-VATManagement=Sales Tax Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
-VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
-VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
+VATManagement=MVA-håndtering
+VATIsUsedDesc=Som standard når du oppretter prospekter, fakturaer, bestillinger etc., følger MVA-satsen en aktiv standardregel: <br> Hvis selgeren ikke er underlagt MVA, settes MVA til 0.  <br> Hvis (selgerens land = kjøpers land), så er salgsavgiften som standard lik salgsomsetningen for produktet i selgerens land. <br> Hvis selger og kjøper er begge i Det europeiske fellesskap og varer er transportrelaterte (frakt, flyfrakt), er standardverdien 0. Denne regelen er avhengig av selgerens land - vennligst kontakt din regnskapsfører. MVA skal betales av kjøperen til tollkontoret i landet og ikke til selgeren.<br> Hvis selger og kjøper begge er i Det europeiske fellesskap, og kjøperen ikke er et selskap (med et registrert internt mva-nummer), er MVA bestemt av selgerens land. <br> Hvis selger og kjøper er begge i Det europeiske fellesskap og kjøperen er et selskap (med et registrert internt momsnummer), så er MVA 0 som standard. <br> I alle andre tilfeller er foreslått standard MVA = 0.
+VATIsNotUsedDesc=Foreslått MVA er som standard 0. Den kan brukes mot foreninger, enkeltpersoner eller nystardede bedrifter.
+VATIsUsedExampleFR=I Frankrike betyr det at bedrifter eller organisasjoner har et reelt finanssystem (forenklet reell eller normal reell). Et system hvor MVA er erklært.
 VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Rate
 LocalTax1IsNotUsed=Ikke bruk andre skatter
-LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1IsUsedDesc=Bruk en annen type skatt (annet enn den første)
+LocalTax1IsNotUsedDesc=Ikke bruk annen type skatt (annet enn første)
 LocalTax1Management=Andre type skatt
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=Ikke bruk tredje skatt
-LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2IsUsedDesc=Bruk en tredje type skatt (annet enn den første)
+LocalTax2IsNotUsedDesc=Ikke bruk annen type skatt (annet enn første)
 LocalTax2Management=Tredje type skatt
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=RE Håndtering
-LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
+LocalTax1IsUsedDescES=Standard RE-rate når du oppretter prospekter, fakturaer, ordre etc følger den aktive standardregelen: <br> Hvis kjøperen ikke utsettes for RE, er RE-standard = 0. Slutt på regelen. <br> Hvis kjøperen blir utsatt for RE deretter RE som standard. Slutt på regelen. <br>
 LocalTax1IsNotUsedDescES=Som standard er den foreslåtte RE er 0. Slutt på regelen.
 LocalTax1IsUsedExampleES=I Spania er de profesjonelle underlagt noen spesifikke deler av den spanske IAE.
 LocalTax1IsNotUsedExampleES=I Spania er de profesjonelle og samfunn, og på visse deler av den spanske IAE.
 LocalTax2ManagementES=IRPF oppsett
-LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2IsUsedDescES=Standard RE-sats når du oppretter prospekter, fakturaer, ordre etc følger den aktive standardregelen: <br> Dersom selgeren ikke utsettes for IRPF, så er IRPF som standard = 0. Slutt på regelen. <br> Hvis selgeren er utsatt for IRPF, så er IRPF som standard. Slutt på regelen. <br>
 LocalTax2IsNotUsedDescES=Som standard er den foreslåtte IRPF er 0. Slutt på regelen.
 LocalTax2IsUsedExampleES=I Spania, for frilansere og selvstendige som leverer tjenester, og bedrifter som har valgt moduler for skattesystem.
-LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
+LocalTax2IsNotUsedExampleES=I Spania er de bedrifter som ikke er ikke skattepliktige
 CalcLocaltax=Rapport over lokale avgifter 
 CalcLocaltax1=Salg - Innkjøp
 CalcLocaltax1Desc=Lokale skatter-rapporter kalkuleres med forskjellen mellom kjøp og salg
@@ -971,9 +974,9 @@ CalcLocaltax3=Salg
 CalcLocaltax3Desc=Lokale skatter-rapportene viser totalt salg
 LabelUsedByDefault=Etiketten som brukes som standard hvis ingen oversettelse kan bli funnet for kode
 LabelOnDocuments=Etiketten på dokumenter
-LabelOrTranslationKey=Label or translation key
-ValueOfConstantKey=Value of constant
-NbOfDays=No. of days
+LabelOrTranslationKey=Etikett eller oversettelsessnøkkel
+ValueOfConstantKey=Verdi på konstant
+NbOfDays=Antall dager
 AtEndOfMonth=Ved månedsslutt
 CurrentNext=Nåværende/Neste
 Offset=Forskyvning
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtuelt servernavn
 OS=OS
 PhpWebLink=Web-Php lenke
-Browser=Nettleser
 Server=Server
 Database=Database
 DatabaseServer=Database vert
@@ -999,7 +1001,7 @@ DatabaseUser=Database bruker
 DatabasePassword=Database passord
 Tables=Tabeller
 TableName=Tabellnavn
-NbOfRecord=No. of records
+NbOfRecord=Antall poster
 Host=Server
 DriverType=Driver type
 SummarySystem=Systeminformasjon - oppsummering
@@ -1011,17 +1013,17 @@ Skin=Tema
 DefaultSkin=Standard tema
 MaxSizeList=Makslengde på lister
 DefaultMaxSizeList=Standard maks.lengde for lister
-DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+DefaultMaxSizeShortList=Standard maks lengde for korte lister (dvs. i kundekort)
 MessageOfDay=Dagens melding
 MessageLogin=Meldingstekst på innloggingsbildet
 LoginPage=Innloggingsside
 BackgroundImageLogin=Bakgrunnsbilde
 PermanentLeftSearchForm=Permanent søkeskjema i venstre meny
-DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+DefaultLanguage=Standardspråk
+EnableMultilangInterface=Aktiver flerspråklig støtte
 EnableShowLogo=Vis logo i venstre meny
 CompanyInfo=Firma/organisasjon
-CompanyIds=Company/Organization identities
+CompanyIds=Firma-/organisasjonsidentiteter
 CompanyName=Navn
 CompanyAddress=Adresse
 CompanyZip=Postnummer
@@ -1036,28 +1038,28 @@ OwnerOfBankAccount=Eier av bankkonto  %s
 BankModuleNotActive=Bankkontomodul ikke slått på
 ShowBugTrackLink=Vis lenken "<strong>%s</strong>"
 Alerts=Varsler
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
-DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
-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.
-SetupDescription5=Other Setup menu entries manage optional parameters.
+DelaysOfToleranceBeforeWarning=Forsinkelse før du viser en advarsel for:
+DelaysOfToleranceDesc=Angi forsinkelsen før et advarselsikon %s vises på skjermen for det forsinkede elementet.
+Delays_MAIN_DELAY_ACTIONS_TODO=Planlagte hendelser (agendahendelser) ikke fullført
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Prosjektet er ikke lukket i tide
+Delays_MAIN_DELAY_TASKS_TODO=Planlagt oppgave (prosjektoppgaver) ikke fullført
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Ordre er ikke behandlet
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Innkjøpsordre ikke behandlet
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tilbudet er ikke lukket
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Tilbud ikke fakturert
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tjeneste som skal aktiveres
+Delays_MAIN_DELAY_RUNNING_SERVICES=Utløpte tjenester
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Ubetalte leverandørfakturaer
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Ubetalte kundefakturaer
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Ventende bankavstemming
+Delays_MAIN_DELAY_MEMBERS=Forsinket medlemsavgift
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Sjekkinnskudd ikke utført
+Delays_MAIN_DELAY_EXPENSEREPORTS=Utgiftsrapporter for godkjenning
+SetupDescription1=Før du begynner å bruke Dolibarr, må noen innledende parametere defineres og moduler aktiveres/konfigureres.
+SetupDescription2=Følgende to seksjoner er obligatoriske (de to første oppføringene i oppsettmenyen):
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> Grunnparametere som brukes til å tilpasse standardoppførelsen til applikasjonen din (for eksempel landrelaterte funksjoner).
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> Denne programvaren er en serie av mange moduler/applikasjoner, alle mer eller mindre uavhengige. Modulene som er relevante for dine behov, må aktiveres og konfigureres. Nye elementer/alternativer legges til menyer ved aktivering av en modul.
+SetupDescription5=Annet oppsett menyoppføringer styrer valgfrie parametere.
 LogEvents=Hendelser relatert til sikkerhet
 Audit=Revisjon
 InfoDolibarr=Om Dolibarr
@@ -1071,83 +1073,83 @@ BrowserName=Navn på nettleser
 BrowserOS=Nettleserens operativsystem
 ListOfSecurityEvents=Oversikt over sikkerhetshendelser i Dolibarr
 SecurityEventsPurged=Sikkerhetshendelser renset
-LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
+LogEventDesc=Aktiver logging av bestemte sikkerhetshendelser. Administratorer når loggen via menyen <b> %s - %s </b>. Advarsel, denne funksjonen kan generere store mengder data i databasen.
 AreaForAdminOnly=Oppsettparametere kan bare angis av <b> administratorbrukere </b>.
 SystemInfoDesc=Systeminformasjon er diverse teknisk informasjon som kun vises i skrivebeskyttet modus, og som kun er synlig for administratorer.
-SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=Filnummer
-DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+SystemAreaForAdminOnly=Dette området er kun tilgjengelig for administratorbrukere. Dolibarr brukerrettigheter kan ikke endre denne begrensningen.
+CompanyFundationDesc=Rediger informasjonen til firmaet/enheten. Klikk på "%s" eller "%s" knappen nederst på siden.
+AccountantDesc=Rediger detaljene til din regnskapsfører/bokholder
+AccountantFileNumber=Regnskapsførerkode
+DisplayDesc=Parametre som påvirker utseende og oppførsel av Dolibarr kan endres her.
 AvailableModules=Tilgjengelige apper/moduler
 ToActivateModule=Gå til innstillinger for å aktivere moduler.
 SessionTimeOut=Tidsgrense for økter
-SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
+SessionExplanation=Dette tallet garanterer at økten aldri utløper før denne forsinkelsen, hvis økten kjøres med intern PHP-session cleaner (og ingenting annet). Intern PHP session cleaner garanterer ikke at økten utløper like etter denne forsinkelsen. Det utløper etter denne forsinkelsen, og når session cleaner er ferdig,  hver <b>%s/%s</b> tilgang, men bare under tilgang fra andre økter <br>. Merk: på noen servere med en ekstern session cleaner(cron under debian, ubuntu ...), kan øktene bli ødelagt etter en periode definert av et eksternt oppsett, uansett verdien som er angitt her.
 TriggersAvailable=Tilgjengelige utløsere
-TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
+TriggersDesc=Utløsere (triggers) er filer som vil påvirke Dolibarrs virkemåte og arbeidsflyt når de kopieres inn i mappen <b>htdocs/core/triggers</b>. De aktiverer nye handlinger, aktivert av Dolibarrhendelser (ny tredjepart, opprette faktura ...).
 TriggerDisabledByName=Utløserne i denne filen er slått av med endelsen <b>-NORUN</b> i navnet.
 TriggerDisabledAsModuleDisabled=Utløserne i denne filen er slått av ettersom modulen <b>%s</b> er slått av.
 TriggerAlwaysActive=Utløserne i denne filen er alltid slått på, uansett hvilke moduler som er slått på.
 TriggerActiveAsModuleActive=Utløserne i denne filen er slått på ettersom modulen <b>%s</b> er slått på.
-GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+GeneratedPasswordDesc=Velg metoden som skal brukes til automatisk genererte passord.
 DictionaryDesc=Sett alle referansedata. Du kan legge til dine verdier som standard.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting. For a full list of the parameters available <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">see here</a>.
+ConstDesc=Denne siden lar deg redigere (overstyre) parametere som ikke er tilgjengelige på andre sider. Disse er for det meste reserverte parametre for utviklere/avansert feilsøking. For en fullstendig liste overtilgjengelige parametrene <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank"> se her </a>.
 MiscellaneousDesc=Alle andre sikkerhetsrelaterte parametre er definert her.
 LimitsSetup=Grenser/presisjon
-LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+LimitsDesc=Her angir du grenser og presisjon som skal brukes i programmet
+MAIN_MAX_DECIMALS_UNIT=Desimaler i enhetspriser
+MAIN_MAX_DECIMALS_TOT=Maks. desimaler i totale priser
+MAIN_MAX_DECIMALS_SHOWN=Maks. desimaler for priser <b> vist på skjermbildet </b>. Legg til en ellipsis <b> ... </b> etter denne parameteren (for eksempel "2 ...") hvis du vil se "<b> ... </b>" suffiks til den avkortede prisen.
+MAIN_ROUNDING_RULE_TOT=Avrundingstrinn (for land der avrunding er gjort annerledes enn basis 10. For eksempel sett 0,05 hvis avrunding gjøres i trinn på 0,05)
 UnitPriceOfProduct=Netto enhetspris på en vare
-TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+TotalPriceAfterRounding=Total pris (ekskl/moms/inkl. moms) etter avrunding
 ParameterActiveForNextInputOnly=Innstillingene gjelder først fra neste inntasting
-NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
-NoEventFoundWithCriteria=No security event has been found for this search criteria.
+NoEventOrNoAuditSetup=Ingen sikkerhetshendelse har blitt logget. Dette er normalt hvis Revisjon ikke er aktivert på siden "Oppsett - Sikkerhet - Hendelser".
+NoEventFoundWithCriteria=Ingen sikkerhetshendelse har blitt funnet for disse søkekriteriene.
 SeeLocalSendMailSetup=Se lokalt sendmail-oppsett
-BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1.
-BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
-BackupDescX=The archived directory should be stored in a secure place.
+BackupDesc=En <b> komplett </b> backup av en Dolibarr-installasjon krever to trinn.
+BackupDesc2=Sikkerhetskopier innholdet i "dokumenter"-katalogen (<b> %s </b>) som inneholder alle opplastede og genererte filer. Dette vil også inkludere alle dumpfiler generert i Trinn 1.
+BackupDesc3=Sikkerhetskopier strukturen og innholdet i databasen din (<b> %s </b>) til en dumpfil. Til dette kan du bruke følgende assistent.
+BackupDescX=Arkiverte mapper bør oppbevares på et trygt sted.
 BackupDescY=Den genererte dumpfilen bør oppbevares på et trygt sted.
-BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
-RestoreDesc=To restore a Dolibarr backup, two steps are required.
-RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
-RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
+BackupPHPWarning=Backup kan ikke garanteres med denne metoden. Foretrekker forrige
+RestoreDesc=For å gjenopprette en Dolibarr-sikkerhetskopiering, er det nødvendig med to trinn.
+RestoreDesc2=Gjenopprett sikkerhetskopifilen (f.eks. Zip-fil) i mappen "dokumenter" til en ny Dolibarr-installasjon eller til gjeldende dokumentmappe (<b> %s </b>).
+RestoreDesc3=Gjenopprett databasestrukturen og dataene fra en sikkerhetskopierings-dumpfil i databasen til den nye Dolibarr-installasjonen eller i databasen til nåværende installasjonen (<b> %s </b>). Advarsel, når gjenopprettingen er fullført, må du bruke et login/passord, som eksisterte fra backup tid/installasjon for å koble til igjen. <br> For å gjenopprette en sikkerhetskopiert database til gjeldende installasjon, kan du følge denne assistenten.
 RestoreMySQL=MySQL import
 ForcedToByAModule= Denne regelen er tvunget til å <b>%s</b> av en aktivert modul
-PreviousDumpFiles=Existing backup files
-WeekStartOnDay=First day of the week
-RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+PreviousDumpFiles=Eksisterende sikkerhetskopier
+WeekStartOnDay=Første dag i uken
+RunningUpdateProcessMayBeRequired=Kjøring av oppgraderingen ser ut til å være nødvendig (Programversjon %s er forskjellig fra databaseversjon %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Du må kjøre denne kommandoen fra kommandolinjen etter innlogging til et skall med brukeren <b>%s.</b>
 YourPHPDoesNotHaveSSLSupport=SSL funksjoner ikke tilgjengelige i din PHP
 DownloadMoreSkins=Flere skins å laste ned
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+SimpleNumRefModelDesc=Returner referansenummeret med format %syymm-nnnn der åå er år, er mm måned og nnnn er en sekvens uten hull og uten tilbakestilling
+ShowProfIdInAddress=Vis Profesjonell ID med adresser
+ShowVATIntaInAddress=Skjul intra-Community MVA-numre med adresse
 TranslationUncomplete=Delvis oversettelse
-MAIN_DISABLE_METEO=Disable meteorological view
+MAIN_DISABLE_METEO=Deaktiver meteorologisk visning
 MeteoStdMod=Standardmodus
 MeteoStdModEnabled=Standard modus aktivert
 MeteoPercentageMod=Prosentmodus
 MeteoPercentageModEnabled=Prosentmodus aktivert
 MeteoUseMod=Klikk for å bruke %s
 TestLoginToAPI=Test-innlogging til API
-ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
-ExternalAccess=External/Internet Access
-MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
-MAIN_PROXY_HOST=Proxy server: Name/Address
-MAIN_PROXY_PORT=Proxy server: Port
-MAIN_PROXY_USER=Proxy server: Login/User
-MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+ProxyDesc=Noen funksjoner i Dolibarr krever internettilgang. Her definerer du parametrene for nettverksforbindelse, for eksempel tilgang via en proxy-server om nødvendig.
+ExternalAccess=Ekstern/Internett-tilgang
+MAIN_PROXY_USE=Bruk en proxy-server (ellers direkte tilgang til internett)
+MAIN_PROXY_HOST=Proxy-server: Navn/adresse
+MAIN_PROXY_PORT=Proxy-server: Port
+MAIN_PROXY_USER=Proxy-server: Log-in/bruker
+MAIN_PROXY_PASS=Proxy-server: Passord
+DefineHereComplementaryAttributes=Her kan du definere noen ekstra/egendefinerte attributter som du vil inkludere for: %s
 ExtraFields=Komplementære attributter
 ExtraFieldsLines=Utfyllende attributter (linjer)
 ExtraFieldsLinesRec=Komplementære attributter (fakturalinjermaler )
 ExtraFieldsSupplierOrdersLines=Komplementære attributter (ordrelinjer)
 ExtraFieldsSupplierInvoicesLines=Komplementære attributter (fakturalinjer)
-ExtraFieldsThirdParties=Complementary attributes (third party)
-ExtraFieldsContacts=Complementary attributes (contacts/address)
+ExtraFieldsThirdParties=Komplementære attributter (tredjepart)
+ExtraFieldsContacts=Komplementære attributter (kontakter/adresser)
 ExtraFieldsMember=Komplementære attributter (medlem)
 ExtraFieldsMemberType=Komplementære attributter (medlem type)
 ExtraFieldsCustomerInvoices=Tilleggsattributter (faktura)
@@ -1161,98 +1163,96 @@ AlphaNumOnlyLowerCharsAndNoSpace=kun alfanumeriske tegn og små bokstaver uten m
 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).
 PathToDocuments=Bane til dokumenter
 PathDirectory=Mappe
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
+SendmailOptionMayHurtBuggedMTA=Funksjonen for å sende e-post ved hjelp av metoden "PHP mail direct" vil generere en melding som kanskje ikke blir oversatt riktig av enkelte e-postservere. Resultatet er at enkelte e-poster ikke kan leses av personer som mottar e-post gjennom disse serverene (f.eks Orange i Frankrike). Dette er ikke et Dolibarr-problem i, heller ikke PHP, men på mottakende e-postserver. Du kan imidlertid legge til alternativet MAIN_FIX_FOR_BUGGED_MTA til 1 i oppsettet, heller enn å endre Dolibarr for å unngå dette. Du kan oppleve problemer med andre servere som følger SMTP-standarden nøyaktig. Den andre løsningen (anbefales) er å bruke metoden "SMTP socket library" som ikke har noen ulemper.
 TranslationSetup=Oppsett av oversettelse
 TranslationKeySearch=Søk etter oversettelsesnøkkel eller -streng
 TranslationOverwriteKey=Overskriv oversettelse
-TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
+TranslationDesc=Slik stiller du inn visningsspråket: <br> * Standard/Systemwide: meny <strong> Hjem -> Oppsett -> Skjerm </strong> <br> * Pr. bruker: Klikk på brukernavnet øverst på skjermen og modifiser <strong> Brukerdisplayoppsett </strong>-fanen på brukeren kort.
 TranslationOverwriteDesc=Du kan også overstyre strenger ved å fylle ut tabellen nedenfor. Velg språk fra "%s" nedtrekkslisten, sett inn oversettelsesstrengen i "%s" og din nye oversettelse i "%s"
-TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
+TranslationOverwriteDesc2=Du kan bruke den andre fanen for å finne rett oversettelsesnøkkel
 TranslationString=Oversettelsesstreng
 CurrentTranslationString=Gjeldende oversettelsesstreng
 WarningAtLeastKeyOrTranslationRequired=Et søkekriterie er nødvendig for nøkkel eller oversettelsesstreng
 NewTranslationStringToShow=Ny oversettelsesstreng som skal vises
 OriginalValueWas=Den originale oversettelsen er overskrevet. Original verdi var:<br><br>%s
-TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
+TransKeyWithoutOriginalValue=Du tvang en ny oversettelse for oversettelsesnøkkelen '<strong> %s</strong>' som ikke finnes i noen språkfiler
 TotalNumberOfActivatedModules=Aktiverte applikasjoner/moduler: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Du må minst aktivere en modul
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+ClassNotFoundIntoPathWarning=Klasse %s ikke funnet i PHP banen
 YesInSummer=Ja i sommer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
+OnlyFollowingModulesAreOpenedToExternalUsers=Merk at bare de følgende modulene er tilgjengelige for eksterne brukere (uavhengig av tillatelsene til slike brukere) og bare hvis tillatelser er gitt: <br>
 SuhosinSessionEncrypt=Session lagring kryptert av Suhosin
 ConditionIsCurrently=Tilstand er for øyeblikket %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.
+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
 SearchOptim=Forbedre søket
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
-BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
+YouHaveXProductUseSearchOptim=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.
+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
-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.
+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
 FieldEdition=Endre felt %s
 FillThisOnlyIfRequired=Eksempel: +2 (brukes kun hvis du opplever problemer med tidssone offset)
 GetBarCode=Hent strekkode
 ##### Module password generation
 PasswordGenerationStandard=Gir et automatisk laget passord med 8 tegn (bokstaver og tall) i små bokstaver.
-PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
+PasswordGenerationNone=Ikke foreslå å generere passord. Passord må legges inn manuelt.
 PasswordGenerationPerso=Returner et passord i følge din personlige konfigurasjon
 SetupPerso=I følge din konfigurasjon
 PasswordPatternDesc=Beskrivelse av passordmønster
 ##### Users setup #####
-RuleForGeneratedPasswords=Rules to generate and validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+RuleForGeneratedPasswords=Regler for å generere og validere passord
+DisableForgetPasswordLinkOnLogonPage=Ikke vis koblingen "Glemt passord" på innloggingssiden
 UsersSetup=Oppsett av brukermodulen
-UserMailRequired=Email required to create a new user
+UserMailRequired=E-postadresse kreves for å opprette en ny bruker
 ##### HRM setup #####
 HRMSetup=Oppsett av HRM-modul
 ##### Company setup #####
 CompanySetup=Firmamodul
-CompanyCodeChecker=Options for automatic generation of customer/vendor codes
-AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
-NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
-NotificationsDescUser=* per user, one user at a time.
-NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
-NotificationsDescGlobal=* or by setting global email addresses in this setup page.
-ModelModules=Document Templates
-DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+CompanyCodeChecker=Alternativer for automatisk generering av kunde/leverandørkoder
+AccountCodeManager=Alternativer for automatisk generering av kunders/leverandørers regnskapskoder
+NotificationsDesc=E-postvarsler kan sendes automatisk for noen Dolibarr-hendelser. <br> Mottakere av meldinger kan defineres:
+NotificationsDescUser=* pr. bruker, en bruker om gangen
+NotificationsDescContact=* per tredjeparts kontakter (kunder eller leverandører), en kontakt om gangen.
+NotificationsDescGlobal=* eller ved å sette globale e-postadresser på denne siden.
+ModelModules=Dokumentmaler
+DocumentModelOdt=Generer dokumenter fra OpenDocument-maler (.ODT / .ODS-filer fra LibreOffice, OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Vannmerke på utkast
 JSOnPaimentBill=Aktiver egenskap for å autoutfylle betalingslinjer i betalingsskjema
-CompanyIdProfChecker=Rules for Professional IDs
+CompanyIdProfChecker=Regler for profesjonelle ID-er
 MustBeUnique=Må være unik?
-MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
+MustBeMandatory=Obligatorisk for å opprette tredjeparter (hvis MVA-nummer eller type selskap er definert)?
 MustBeInvoiceMandatory=Obligatorisk å validere fakturaer?
 TechnicalServicesProvided=Tekniske tjenester som tilbys
 #####DAV #####
-WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
-WebDavServer=Root URL of %s server: %s
+WebDAVSetupDesc=Dette er lenken for å få tilgang til WebDAV-katalogen. Den inneholder en "offentlig" mappe, åpen for enhver bruker som kjenner nettadressen (hvis tilgang til offentlig mappe er tillatt) og en "privat" mappe som trenger en eksisterende login/passord for tilgang.
+WebDavServer=Root-URL til %s server: %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=En eksportlenke til <b>%s</b> formatet er tilgjengelig på følgende lenke: %s
 ##### Invoices #####
 BillsSetup=Innstillinger for fakturamodul
 BillsNumberingModule=Nummereringsmodul for fakturaer og kreditnotaer
 BillsPDFModules=Fakturamaler
-BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
+BillsPDFModulesAccordindToInvoiceType=Faktura-dokumentmodeller etter fakturatype
 PaymentsPDFModules=Betalingsdokumentmodeller
-CreditNote=Kreditnota
-CreditNotes=Kreditnotaer
 ForceInvoiceDate=Tving fakturadato til godkjenningsdato
 SuggestedPaymentModesIfNotDefinedInInvoice=Foreslått betalingsmåte på fakturaer når annet ikke er angitt
-SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
-SuggestPaymentByChequeToAddress=Suggest payment by check to
+SuggestPaymentByRIBOnAccount=Foreslå betaling trukket fra konto
+SuggestPaymentByChequeToAddress=Foreslå betaling med sjekk til
 FreeLegalTextOnInvoices=Fritekst på fakturaer
 WatermarkOnDraftInvoices=Vannmerke på fakturakladder (ingen hvis tom)
 PaymentsNumberingModule=Modell for betalingsnummerering
-SuppliersPayment=Vendor payments
-SupplierPaymentSetup=Vendor payments setup
+SuppliersPayment=Leverandørbetalinger
+SupplierPaymentSetup=Oppsett av leverandørbetaling 
 ##### Proposals #####
 PropalSetup=Oppsett av modulen Tilbud
 ProposalsNumberingModules=Nummereringsmodul for tilbud
 ProposalsPDFModules=Tilbudsmaler
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Foreslått standard betalingsmodus på tilbud, hvis valg ikke er gjort
 FreeLegalTextOnProposal=Fritekst på tilbud
 WatermarkOnDraftProposal=Vannmerke på tilbudskladder (ingen hvis tom)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bankkonto for tilbudet
@@ -1267,7 +1267,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Spør om Lagerkilde for ordre
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Be om bankkonto destinasjon for innkjøpsordre
 ##### Orders #####
-OrdersSetup=Sales Orders management setup
+OrdersSetup=Salgsordreoppsett
 OrdersNumberingModules=Nummereringsmodul for ordre
 OrdersModelModule=Ordremaler
 FreeLegalTextOnOrders=Fritekst på ordre
@@ -1290,10 +1290,10 @@ WatermarkOnDraftContractCards=Vannmerke på kontraktkladder (ingen hvis tom)
 MembersSetup=Oppsett av medlemsmodul
 MemberMainOptions=Hovedinnstillinger
 AdherentLoginRequired= Opprett innlogging for hvert medlem
-AdherentMailRequired=Email required to create a new member
+AdherentMailRequired=E-post kreves for å lage et nytt medlem
 MemberSendInformationByMailByDefault=Valg for å sende e-postbekreftelse til medlemmer (validering eller nytt abonnement) er krysset av som standard
-VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
-MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+VisitorCanChooseItsPaymentMode=Besøkende kan velge blant tilgjengelige betalingsmåter
+MEMBER_REMINDER_EMAIL=Aktiver automatisk påminnelse <b> via e-post </b> av utløpte abonnementer. Merk: Modul <strong> %s </strong> må være aktivert og riktig oppsatt for å sende påminnelser.
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Globale parametre
@@ -1315,7 +1315,7 @@ LDAPSynchronizeMembersTypes=Organisering av bedriftens medlemstyper i LDAP
 LDAPPrimaryServer=Primærserver
 LDAPSecondaryServer=Secondary server
 LDAPServerPort=Server port
-LDAPServerPortExample=Default port: 389
+LDAPServerPortExample=Standard port : 389
 LDAPServerProtocolVersion=Protokollversjon
 LDAPServerUseTLS=Bruk TLS
 LDAPServerUseTLSExample=LDAP-serveren din bruker TLS
@@ -1362,43 +1362,43 @@ LDAPTestSynchroMemberType=Test synkronisering av medlemstype
 LDAPTestSearch= Test et LDAP søk
 LDAPSynchroOK=Vellykket synkroniseringstest
 LDAPSynchroKO=Sykroniseringstesten feilet
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPSynchroKOMayBePermissions=Synkroniseringstest feilet. Sjekk at tilkobling til server er riktig konfigurert og tillater LDAP oppdateringer
 LDAPTCPConnectOK=TCP tilkobling til LDAP server vellykket (Server=%s, Port=%s)
 LDAPTCPConnectKO=TCP tilkobling til LDAP server feilet (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=Tilkobling/Autentisering til LDAP server var vellykket (Server=%s, Port=%s, Admin=%s, Passord=%s)
+LDAPBindKO=Tilkobling/Autentisering til LDAP server feilet (Server=%s, Port=%s, Admin=%s, Passord=%s)
 LDAPSetupForVersion3=LDAP server konfigurert for versjon 3
 LDAPSetupForVersion2=LDAP server konfigurert for versjon 2
 LDAPDolibarrMapping=Dolibarr Mapping
 LDAPLdapMapping=LDAP Mapping
 LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example: uid
+LDAPFieldLoginExample=Eksempel: uid
 LDAPFilterConnection=Søkefilter
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFilterConnectionExample=Eksempel : &(objectClass=inetOrgPerson)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldLoginSambaExample=Eksempel : samaccountname
 LDAPFieldFullname=Fullt navn
-LDAPFieldFullnameExample=Example: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
+LDAPFieldFullnameExample=Eksempel : cn
+LDAPFieldPasswordNotCrypted=Passord ikke kryptert
+LDAPFieldPasswordCrypted=Passord kryptert
+LDAPFieldPasswordExample=Eksempel: brukerPassord
+LDAPFieldCommonNameExample=Eksempel : cn
 LDAPFieldName=Navn
-LDAPFieldNameExample=Example: sn
+LDAPFieldNameExample=Eksempel: sn
 LDAPFieldFirstName=Fornavn
-LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldFirstNameExample=Eksempel: forNavn
 LDAPFieldMail=E-postadresse
-LDAPFieldMailExample=Example: mail
+LDAPFieldMailExample=Eksempel: epost
 LDAPFieldPhone=Telefon arbeid
-LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldPhoneExample=Eksempel:telefonArbeid
 LDAPFieldHomePhone=Telefon hjem
-LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldHomePhoneExample=Eksempel: telefonHjem
 LDAPFieldMobile=Mobiltelefon
-LDAPFieldMobileExample=Example: mobile
+LDAPFieldMobileExample=Eksempel: mobil
 LDAPFieldFax=Faksnummer
-LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldFaxExample=Eksempel: faksnummer
 LDAPFieldAddress=Gate/vei
-LDAPFieldAddressExample=Example: street
+LDAPFieldAddressExample=Eksempel: gatevei
 LDAPFieldZip=Postnummer
 LDAPFieldZipExample=Eksempel: postnummer
 LDAPFieldTown=Poststed
@@ -1407,7 +1407,7 @@ LDAPFieldCountry=Land
 LDAPFieldDescription=Beskrivelse
 LDAPFieldDescriptionExample=Eksempel: beskrivelse
 LDAPFieldNotePublic=Offentlig notat
-LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldNotePublicExample=Eksempel:offentlignotat
 LDAPFieldGroupMembers= Gruppemedlemmer
 LDAPFieldGroupMembersExample= Eksempel: uniqueMember
 LDAPFieldBirthdate=Fødselsdag
@@ -1428,31 +1428,31 @@ LDAPDescMembersTypes=Denne siden lar deg definere LDAP attributtnavn i LDAP-tre
 LDAPDescValues=Eksempelverdier er designet for <b>OpenLDAP</b> med følgende lastede skjemaer: <b> core.schema, cosine.schema, inetorgperson.schema</b>). Hvis du bruker disse verdiene og OpenLDAP, endre LDAP configfilen <b> slapd.conf </b> for å ha alle disse skjemaene lastet.
 ForANonAnonymousAccess=For autentisert tilgang (f.eks skrivetilgang)
 PerfDolibarr=Ytelse oppsett/optimaliseringsrapport
-YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+YouMayFindPerfAdviceHere=Denne siden gir noen kontroller eller råd relatert til ytelse.
+NotInstalled=Ikke installert, så serveren taper ikke ytelse pga. denne.
 ApplicativeCache=Applikasjons-cache
 MemcachedNotAvailable=Ingen applikativ cache funnet. Du kan forbedre ytelsen ved å installere en cache-server Memcached og en modul som kan bruke denne cache-serveren. <br> Mer informasjon her <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Merk: Mange webhosting-leverandører har ikke en slik cache-server.
 MemcachedModuleAvailableButNotSetup=Modulen memcache er funnet, men oppsett er ikke komplett
 MemcachedAvailableAndSetup=Modulen memcache er aktivert
 OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+NoOPCodeCacheFound=Ingen OPCode cache funnet. Det kan være du bruker en annen OPCode-cache enn XCache eller eAccelerator (bra). Det kan også være at du ikke har OPCode-cache (svært dårlig).
 HTTPCacheStaticResources=HTTP cache for statiske ressurser (css, img, javascript)
 FilesOfTypeCached=Filtypene %s er cachet av HTTP-server
 FilesOfTypeNotCached=Filtypene %s er ikke cachet av HTTP-server
 FilesOfTypeCompressed=Filtypene %s er undertrykket av HTTP-server
 FilesOfTypeNotCompressed=Filtypene %s er ikke undertrykket av HTTP-server
 CacheByServer=Server-cache
-CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByServerDesc=For eksempel ved å bruk Apache-direktivet "ExpiresByType image/gif A2592000"
 CacheByClient=Nettleser-cache
 CompressionOfResources=Undertrykkelse av HTTP-respons
-CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+CompressionOfResourcesDesc=For eksempel ved bruk av Apache-direktivet "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=En slik automatisk deteksjon er ikke mulig med nåværende nettlesere
-DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
-DefaultCreateForm=Default values (to use on forms)
+DefaultValuesDesc=Her kan du definere standardverdien du vil bruke når du oppretter en ny post, og/eller standardfiltre eller sorteringsrekkefølgen når du lister oppføringer.
+DefaultCreateForm=Standardverdier (for bruk på skjemaer)
 DefaultSearchFilters=Standard søkefiltre
 DefaultSortOrder=Standard sorteringsorden
 DefaultFocus=Standard fokusfelt
-DefaultMandatory=Mandatory form fields
+DefaultMandatory=Obligatoriske skjemafelt
 ##### Products #####
 ProductSetup=Innstillinger for varemodul
 ServiceSetup=Oppsett av tjenester-modulen
@@ -1461,7 +1461,7 @@ NumberOfProductShowInSelect=Maksimalt antall varer som skal vises i kombinasjons
 ViewProductDescInFormAbility=Vis produktbeskrivelser i skjemaer (ellers vist i en verktøytips-popup)
 MergePropalProductCard=I "Vedlagte filer"-fanen i "Varer og tjenester" kan du aktivere en opsjon for å flette PDF-varedokument til tilbud PDF-azur hvis varen/tjenesten er i tilbudet
 ViewProductDescInThirdpartyLanguageAbility=Vis produktbeskrivelser på språket til tredjepart
-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.
+UseSearchToSelectProductTooltip=Hvis du har mange varer (>100 000), kan du øke hastigeten ved å sette konstanten PRODUCT_DONOTSEARCH_ANYWHERE til 1 i Oppsett->Annet. Søket vil da begrenses til starten av søkestrengen
 UseSearchToSelectProduct=Vent til du trykker på en tast før du laster inn innholdet i produkt-kombinationslisten (dette kan øke ytelsen hvis du har et stort antall produkter, men det er mindre praktisk)
 SetDefaultBarcodeTypeProducts=Standard strekkodetype for varer
 SetDefaultBarcodeTypeThirdParties=Standard strekkodetype for tredjeparter
@@ -1512,18 +1512,18 @@ RSSUrlExample=En interessant RSS-feed
 ##### Mailing #####
 MailingSetup=Oppsett av e-postmodulen
 MailingEMailFrom=Avsender-epost (fra) for epostmeldinger sendt via epostmodul
-MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingEMailError=Returadresse for e-poster med feil (feil til)
 MailingDelay=Sekunder å vente før utsendelse av neste melding
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+NotificationSetup=Oppset av e-postvarsling-modulen
+NotificationEMailFrom=Avsender-e-post (Fra) for e-postmeldinger sendt av varslingsmodulen
 FixedEmailTarget=Mottager
 ##### Sendings #####
-SendingsSetup=Shipping module setup
+SendingsSetup=Oppsett av forsendelser-modulen
 SendingsReceiptModel=Modell for forsendelseskvitteringer
 SendingsNumberingModules=Nummereringsmodell for for sendelser
 SendingsAbility=Støtt forsendelsesskjemaer for kundeleveranser
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=I de fleste tilfeller er forsendelsesskjemaer bruket både som skjema for kundeleveranser (liste over varer som skal sendes) og skjema som er mottatt og signert av kunden. Så produktleveranse-kvitteringer er en duplisert funksjon og er sjelden aktivert.
 FreeLegalTextOnShippings=Fritekst på leveringer
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Nummereringsmodul for vareleveringskvitteringer
@@ -1535,13 +1535,13 @@ AdvancedEditor=Avansert editor
 ActivateFCKeditor=Aktiver avansert editor for:
 FCKeditorForCompany=WYSIWIG opprettelse/endring av elementbeskrivelse og notater (untatt varer og tjenester)
 FCKeditorForProduct=WYSIWIG opprettelse/endring av vare-/tjenestebeskrivelse og notater
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG opprettelse/endring av varedetaljer for alle enheter (tilbud, ordre, fakturaer, osv ...). <font class="warning"> Advarsel! Bruk av dette alternativet er i dette tilfellet ikke anbefalt, da det kan skape problemer med spesialkarakterer og sideformatering ved opprettelse av PDF-filer.</font>
 FCKeditorForMailing= WYSIWIG opprettelse/endring av masse-e-postutsendelser (Verktøy->E-post)
 FCKeditorForUserSignature=WYSIWIG-opprettelse av signatur
 FCKeditorForMail=WYSIWIG opprettelse/redigering for all post (unntatt Verktøy ->eMailing)
 ##### Stock #####
 StockSetup=Oppsett av lagermodul
-IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+IfYouUsePointOfSaleCheckModule=Hvis du bruker Point-of-Sale (POS) som tilbys som standard eller en ekstern modul, kan dette oppsettet ignoreres av din POS-modul. De fleste POS-moduler er som standard designet for å opprette en faktura umiddelbart og redusere lager uavhengig av alternativene her. Så hvis du trenger eller ikke skal ha et lagerreduksjon når du registrerer et salg fra ditt POS, kan du også sjekke innstillingen av POS-modulen.
 ##### Menu #####
 MenuDeleted=Menyen er slettet
 Menus=Menyer
@@ -1563,7 +1563,7 @@ DetailRight=Tilstand for å vise uautoriserte grå menyer
 DetailLangs=Språkfil-navn for etikettkode-oversettelse
 DetailUser=Intern/Ekstern/Alle
 Target=Mål
-DetailTarget=Target for links (_blank top opens a new window)
+DetailTarget=Mål for lenker (blank topp åpner et nytt vindu)
 DetailLevel=Nivå (-1:toppmeny, 0:headermeny, >0 meny og undermeny)
 ModifMenu=Menyendring
 DeleteMenu=Slett menyoppføring
@@ -1574,11 +1574,11 @@ TaxSetup=Modul for skatter,avgifter og utbytte
 OptionVatMode=MVA skal beregnes
 OptionVATDefault=Standard basis
 OptionVATDebitOption=Periodisering
-OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
+OptionVatDefaultDesc=MVA forfaller: <br> - ved levering av varer (basert på faktura dato) <br> - ved betalinger for tjenester
+OptionVatDebitOptionDesc=MVA forfaller: <br> - ved levering av varer (basert på fakturadato) <br> - på faktura (debet) for tjenester
 OptionPaymentForProductAndServices=Kontantgrunnlag for varer og tjenester
 OptionPaymentForProductAndServicesDesc=MVA forfaller: <br> - ved betaling for varer <br> - på betalinger for tjenester
-SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+SummaryOfVatExigibilityUsedByDefault=Tidspunkt for MVA-innbetaling som standard i henhold til valgt alternativ:
 OnDelivery=Ved levering
 OnPayment=Vedbetaling
 OnInvoice=Ved faktura
@@ -1595,36 +1595,36 @@ AccountancyCodeBuy=Kontokode for innkjøp
 AgendaSetup=Innstillinger for modulen hendelser og agenda
 PasswordTogetVCalExport=Nøkkel for å autorisere eksportlenke
 PastDelayVCalExport=Ikke eksporter hendelser eldre enn
-AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
-AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
+AGENDA_USE_EVENT_TYPE=Bruk hendelsestyper (administrert i menyoppsett -> Ordbøker -> Type agendahendelser)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Angi denne standardverdien automatisk for type hendelse i skjema for hendelsesoppretting
+AGENDA_DEFAULT_FILTER_TYPE=Still inn denne typen hendelse automatisk i søkefilter i agendavisning
+AGENDA_DEFAULT_FILTER_STATUS=Angi denne status automatisk for hendelser i søkefilter i agendavisning
 AGENDA_DEFAULT_VIEW=Hvilken fane vil åpne som standard når du velger Agenda-menyen?
 AGENDA_REMINDER_EMAIL=Aktiver hendelsespåminnelse <b> via e-post </b> (påminnelsesalternativ/forsinkelse kan defineres for hver hendelse). Merk: Modul <strong> %s</strong> må være aktivert og riktig satt opp for å få påminnelse sendt med riktig frekvens.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Aktiver hendelsespåminnelse <b> i brukerens nettleser </b> (når hendelsesdatoen er nådd, kan hver bruker nekte dette fra spørsmålet om nettleserbekreftelse)
 AGENDA_REMINDER_BROWSER_SOUND=Aktiver lydvarsler
 AGENDA_SHOW_LINKED_OBJECT=Vis koblet objekt i agendavisning
 ##### Clicktodial #####
 ClickToDialSetup='Click To Dial' modul
 ClickToDialUrlDesc=Url som kalles når man klikker på telefonpiktogrammet. I URL kan du bruke koder <br> <b> __ PHONETO __ </b> som blir erstattet med telefonnummeret til personen som skal ringes <br> <b> __ PHONEFROM __ </b> som blir erstattet med telefonnummeret til den som ringer(din) <br> <b> __ LOGIN __ </b> som vil bli erstattet med clicktodial login (definert på brukerkort) <br> <b> __ PASS __ </b> som vil bli erstattet med clicktodial passord (definert på brukerkort).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=Denne modulen gjør telefonnumre til klikkbare koblinger. Et klikk på ikonet vil få telefonen til å ringe nummeret. Dette kan brukes til å ringe et call-center-system fra Dolibarr som kan ringe telefonnummeret på et SIP-system.
 ClickToDialUseTelLink=Bruk kun en lenke "tlf:" for telefonnumre
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Bruk denne metoden hvis brukerne har en softphone eller et programvaregrensesnitt installert på samme datamaskin som nettleseren, og kalles når du klikker på en link i nettleseren din som starter med "tel:". Hvis du trenger en full server-løsning (uten behov for lokal installasjon av programvare), må du sette denne på "Nei" og fylle neste felt.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Utsalgssted
 CashDeskSetup=Oppsett av modulen Salgssted
-CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDeskThirdPartyForSell=Standard generisk tredjepart for salg
 CashDeskBankAccountForSell=Kassekonto som skal brukes til kontantsalg
-CashDeskBankAccountForCheque= Default account to use to receive payments by check
+CashDeskBankAccountForCheque= Konto som skal brukes til å motta utbetalinger via sjekk
 CashDeskBankAccountForCB= Konto som skal brukes til å motta kontant betaling med kredittkort
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskDoNotDecreaseStock=Deaktiver lagerreduksjon når et salg er gjort fra Point of Sale (hvis "nei", er lagerreduksjon gjort for hvert salg utført fra POS, uavhengig av alternativet som er satt i modulen Stock).
 CashDeskIdWareHouse=Tving/begrens lager til å bruke varereduksjon ved salg
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
+StockDecreaseForPointOfSaleDisabled=Lagerreduksjon fra Point-of-sale er deaktivert
+StockDecreaseForPointOfSaleDisabledbyBatch=Lagernedgang i POS er ikke kompatibel med modul Serie/Lot-administrasjon (for tiden aktiv), slik at lagerreduksjon er deaktivert.
+CashDeskYouDidNotDisableStockDecease=Lagerreduksjon ble ikke utført ved salg fra Point-of-Sale. Velg et lager
 ##### Bookmark #####
 BookmarkSetup=Oppsett av bokmerkemodulen
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
+BookmarkDesc=Med denne modulen kan du administrere bokmerker. Du kan også legge til snarveier til noen Dolibarr-sider eller eksterne nettsteder i venstre meny.
 NbOfBoomarkToShow=Maksimalt antall bokmerker som skal vises i venstre meny
 ##### WebServices #####
 WebServicesSetup=Oppsett av webservices-modul
@@ -1641,20 +1641,20 @@ ApiKey=API-nøkkel
 WarningAPIExplorerDisabled=API utforsker er deaktivert. API utforsker er ikke nødvendig for bruke API tjenester. Det er et verktøy for utviklere å finne/teste REST API-er. Hvis du trenger dette verktøyet, kan du gå inn i oppsett av modulen API REST og aktivere den.
 ##### Bank #####
 BankSetupModule=Oppsett av Bankmodulen
-FreeLegalTextOnChequeReceipts=Free text on check receipts
+FreeLegalTextOnChequeReceipts=Fritekst på å sjekkvitteringer
 BankOrderShow=Visningsrekkefølge av bankkonti for land som bruker "detaljert bank nummer"
 BankOrderGlobal=Generelt
 BankOrderGlobalDesc=Generell visningsrekkefølge
 BankOrderES=Spansk
 BankOrderESDesc=Spansk visningsrekkefølge
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+ChequeReceiptsNumberingModule=Nummereringsmodul for sjekk-kvitteringer
 ##### Multicompany #####
 MultiCompanySetup=Oppsett av multi-selskap-modulen
 ##### Suppliers #####
-SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of purchase order (logo...)
+SuppliersSetup=Oppsett av leverandørmodul
+SuppliersCommandModel=Komplett mal for innkjøpsordre (logo ...)
 SuppliersInvoiceModel=Komplett mal for leverandørfaktura (logo ...)
-SuppliersInvoiceNumberingModel=Vendor invoices numbering models
+SuppliersInvoiceNumberingModel=Leverandørfaktura nummereringsmodeller
 IfSetToYesDontForgetPermission=Hvis ja, ikke glem å gi tillatelser til grupper eller brukere tillatt for 2. godkjenning
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul-oppsett
@@ -1669,7 +1669,7 @@ ProjectsSetup=Oppsett av  Prosjektmodulen
 ProjectsModelModule=Dokumentmodell for prosjektrapporter
 TasksNumberingModules=Modul for oppgavenummerering
 TaskModelModule=Dokumentmal for oppgaverapporter
-UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+UseSearchToSelectProject=Vent til en tast er trykket før du laster inn innholdet i Prosjekt kombinasjonslisten. <br> Dette kan forbedre ytelsen hvis du har et stort antall prosjekter, men det er mindre praktisk.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
 AccountingPeriods=Regnskapsperioder
@@ -1690,7 +1690,7 @@ NoAmbiCaracAutoGeneration=Ikke bruk tvetydige tegn ("1","l","i","|","0","O") for
 SalariesSetup=Oppsett av lønnsmodulen
 SortOrder=Sorteringsrekkefølge
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0: Kunde betalingstype, 1: Leverandør betalingstype, 2: Både kunder og leverandører betalingstype
 IncludePath=Inkluder bane (definert i variael %s)
 ExpenseReportsSetup=Oppsett av utgiftsrapport-modulen
 TemplatePDFExpenseReports=Dokumentmaler for å generere utgiftsrapporter
@@ -1698,21 +1698,21 @@ ExpenseReportsIkSetup=Oppsett av modul Utgiftsrapporter - Kilometerindeks
 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=You may find options for email notifications by enabling and configuring the module "Notification".
+YouMayFindNotificationsFeaturesIntoModuleNotification=Du kan finne alternativer for e-postmeldinger ved å aktivere og konfigurere modulen "Varslingen".
 ListOfNotificationsPerUser=Liste over varslinger pr. bruker*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
-GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
+ListOfNotificationsPerUserOrContact=Liste over varsler (hendelser) tilgjengelig pr. bruker * eller pr. kontakt **
+ListOfFixedNotifications=Liste over faste varsler
+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
-BackupDumpWizard=Wizard to build the backup file
+BackupDumpWizard=Veiviser for å bygge backupfilen
 SomethingMakeInstallFromWebNotPossible=Installasjon av ekstern modul er ikke mulig fra webgrensesnittet på grunn av:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+SomethingMakeInstallFromWebNotPossible2=Av denne grunn er prosessen for å oppgradere beskrevet her, en manuell prosess som bare en privilegert bruker kan utføre.
 InstallModuleFromWebHasBeenDisabledByFile=Administrator har deaktivert muligheten for å installere eksterne moduler. Administrator må fjerne filen <strong>%s</strong> for å tillate dette.
 ConfFileMustContainCustom=Ved installering eller bygging av en ekstern modul fra programmet må modulfilene lagres i katalogen <strong> %s</strong>. Hvis du vil ha denne katalogen behandlet av Dolibarr, må du sette opp <strong> conf/conf.php</strong> for å legge til 2 direktivlinjer: <br><strong> $dolibarr_main_url_root_alt = '/custom'; </strong><br><strong> $dolibarr_main_document_root_alt = '%s/custom'; </strong>
 HighlightLinesOnMouseHover=Fremhev tabellinjer når musen flyttes over
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+HighlightLinesColor=Fremhev fargen på linjen når musen går over (bruk 'ffffff' for ingen fremheving)
+HighlightLinesChecked=Fremhev farge på linjen når den er merket (bruk 'ffffff' for ikke noen fremheving)
 TextTitleColor=Tekstfarge på sidetittel
 LinkColor=Farge på lenker
 PressF5AfterChangingThis=Trykk CTRL+F5 på tastaturet eller tøm nettlesercache når du har endret denne verdien for å få den til å fungere effektivt
@@ -1728,16 +1728,16 @@ BackgroundTableLineEvenColor=Bakgrunnsfarge for partalls-tabellinjer
 MinimumNoticePeriod=Frist for beskjed (Feriesøknaden må sendes inn før denne fristen)
 NbAddedAutomatically=Antall dager pr. måned som blir lagt til av brukerenes tellere(automatisk)
 EnterAnyCode=Dette feltet inneholder en referanse til identifikasjon av linje. Bruk kun verdier uten spesialkarakterer
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+UnicodeCurrency=Her legger du inn en liste med Ascii-verdier, som representerer et valutasymbol. For eksempel: $ = [36], Brasilsk real R$ = [82,36], € = [8364]
 ColorFormat=RGB-fargen er i HEX-format, for eksempel: FF0000
 PositionIntoComboList=Plassering av linje i kombinasjonslister
 SellTaxRate=Salgs-skattesats
 RecuperableOnly=Ja for MVA"Ikke oppfattet, men gjenopprettelig" dedikert til noen steder i Frankrike. Hold verdien til "Nei" i alle andre tilfeller.
-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).
+UrlTrackingDesc=Hvis leverandøren eller transporttjenesten tilbyr en side eller et nettsted for å sjekke status på din forsendelse, kan du skrive det her. Du kan bruke tasten {TrackID} for å sette inn sporingnummer på webstedet.
+OpportunityPercent=Når du oppretter et lead, må du definere et estimert beløp forprosjekt/lead. I henhold til lead-status kan dette beløpet bli multiplisert med denne faktoren for å vurdere et samlet beløp som alle dine potensielle kunder kan generere. Verdi er en prosentandel (mellom 0 og 100).
 TemplateForElement=Mal dedikert til element
 TypeOfTemplate=Mal-type
-TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+TemplateIsVisibleByOwnerOnly=Mal er kun synlig for eier
 VisibleEverywhere=Synlig overalt
 VisibleNowhere=Ikke synlig noen steder
 FixTZ=Tidssone offset
@@ -1746,7 +1746,7 @@ ExpectedChecksum=Forventet sjekksum
 CurrentChecksum=Gjeldende sjekksum
 ForcedConstants=Obligatoriske konstante verdier
 MailToSendProposal=Kundetilbud
-MailToSendOrder=Sales orders
+MailToSendOrder=Salgsordrer
 MailToSendInvoice=Kundefakturaer
 MailToSendShipment=Leveringer
 MailToSendIntervention=Intervensjoner
@@ -1763,10 +1763,10 @@ YouUseLastStableVersion=Du bruker siste stabile versjon
 TitleExampleForMajorRelease=Eksempel på melding du kan bruke for å annonsere større oppdateringer (du kan bruke denne på dine websider)
 TitleExampleForMaintenanceRelease=Eksempel på beskjed du kan bruke for å annonsere denne vedlikeholdsversjonen (du kan bruke den på dine websider)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versjon %s er en stor utgivelse med en rekke nye funksjoner for både brukere og utviklere. Du kan laste ned fra nedlastingsområdet https://www.dolibarr.org portal (underkatalog Stabile versjoner). Du kan lese <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">Endringslogg</a> for en komplett liste over endringer.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versjon %s er en vedlikeholdsversjon, så den inneholder bare feilrettinger. Vi anbefaler alle brukere å oppgradere til denne versjonen. En vedlikeholdsløsning introduserer ikke nye funksjoner eller endringer i databasen. Du kan laste den ned fra nedlastingsområdet på https://www.dolibarr.org portal (underkatalog Stable versions). Du kan lese <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> for fullstendig liste over endringer.
+MultiPriceRuleDesc=Når alternativet "Flere prisnivået pr. vare/tjeneste" er på, kan du definere forskjellige priser (ett pr prisnivå) for hvert produkt. For å spare tid, kan du lage en regel som gir pris for hvert nivå autokalkulert i forhold til prisen på første nivå, slik at du bare legger inn en pris for hvert produkt. Denne siden er laget for å spare tid og kan være nyttig hvis prisene for hvert nivå står i forhold til første nivå. Du kan ignorere denne siden i de fleste tilfeller.
 ModelModulesProduct=Maler for produkt-dokumenter
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
+ToGenerateCodeDefineAutomaticRuleFirst=For å kunne generere koder automatisk, må du først definere et program for å automatisk definere strekkodenummeret.
 SeeSubstitutionVars=Relaterte gjentakende fakturaer
 SeeChangeLog=Se Endringslogg-fil (kun på engelsk)
 AllPublishers=Alle utgivere
@@ -1787,98 +1787,107 @@ AddOtherPagesOrServices=Legg til andre sider eller tjenester
 AddModels=Legg til dokument eller nummereringsmaler
 AddSubstitutions=Legg til tast-erstatninger
 DetectionNotPossible=Detektering ikke mulig
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+UrlToGetKeyToUseAPIs=Url til API-nøkkel (når nøkkel er mottatt blir den lagret på databasebruker-tabell og må brukes for hvert API-kall)
 ListOfAvailableAPIs=Liste over tilgjengelige API'er
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+activateModuleDependNotSatisfied=Modul "%s" avhenger av modulen "%s", som mangler, slik at modulen "%1$s" kanskje ikke virker korrekt. Installer modulen "%2$s" eller deaktiver modulen "%1$s" hvis du vil unngå ubehagelige overraskelser
+CommandIsNotInsideAllowedCommands=Kommandoen du prøver å kjøre er ikke i listen over tillatte kommandoer definert i parameter <strong>$dolibarr_main_restrict_os_commands</strong> i <strong>conf.php</strong> filen.
 LandingPage=Landingsside
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
+SamePriceAlsoForSharedCompanies=Hvis du bruker en multiselskapsmodul, og har valgt "En pris", vil prisen være den samme for alle selskaper om varene er delt mellom miljøer
 ModuleEnabledAdminMustCheckRights=Modulen er aktivert. Tillatelser for aktiverte module(r) ble kun gitt til admin-brukere. Du må kanskje gi tillatelser til andre brukere eller grupper manuelt om nødvendig.
-UserHasNoPermissions=This user has no permissions defined
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
+UserHasNoPermissions=Denne brukeren har ingen tillatelser
+TypeCdr=Bruk "Ingen" hvis dato for betalingsfrist er fakturadato pluss en delta i dager (delta er feltet "%s")<br>Bruk "På slutten av måneden", dersom, etter delta, dato må økes for å komme til slutten av måneden (+ en valgfri "%s" i dager) <br>Bruk "Nåværende/Neste" for å ha betalingsfristen som den første Nt-e av måneden etter deltaet (delta er feltet "%s", N er lagret i feltet "%s")
 BaseCurrency=Referansevaluta for selskapet (gå inn i oppsett av firma for å endre dette)
-WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
-WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+WarningNoteModuleInvoiceForFrenchLaw=Denne modulen %s er i samsvar med franske lover (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Denne modulen %s er i samsvar med franske lover (Loi Finance 2016) fordi modulen Ikke reversible logger er automatisk aktivert.
+WarningInstallationMayBecomeNotCompliantWithLaw=Du prøver å installere modul %s som er en ekstern modul. Aktivering av en ekstern modul betyr at du stoler på utgiveren av den modulen, og at du er sikker på at denne modulen ikke har negativ innvirkning på oppførselen til din applikasjon, og er i samsvar med landets lover (%s). Hvis modulen introduserer en ulovlig funksjon, blir du ansvarlig for bruken av ulovlig programvare.
 MAIN_PDF_MARGIN_LEFT=Venstremarg på PDF
 MAIN_PDF_MARGIN_RIGHT=Høyremarg på PDF
 MAIN_PDF_MARGIN_TOP=Toppmarg på PDF
 MAIN_PDF_MARGIN_BOTTOM=Bunnmarg på PDF
-NothingToSetup=There is no specific setup required for this module.
+NothingToSetup=Det er ikke noe spesifikt oppsett som kreves for denne modulen.
 SetToYesIfGroupIsComputationOfOtherGroups=Sett til ja hvis denne gruppen er en beregning av andre grupper
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Angi kalkuleringsregel hvis tidligere felt ble satt til Ja (for eksempel 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Flere språkvarianter funnet
 COMPANY_AQUARIUM_REMOVE_SPECIAL=Fjern spesialtegn
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter til ren verdi (COMPANY_AQUARIUM_CLEAN_REGEX)
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
-GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
-HelpOnTooltip=Help text to show on tooltip
-HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
-YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
-ChartLoaded=Chart of account loaded
-SocialNetworkSetup=Setup of module Social Networks
-EnableFeatureFor=Enable features for <strong>%s</strong>
-VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
-EmailCollector=Email collector
-EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
-NewEmailCollector=New Email Collector
-EMailHost=Host of email IMAP server
-MailboxSourceDirectory=Mailbox source directory
-MailboxTargetDirectory=Mailbox target directory
-EmailcollectorOperations=Operations to do by collector
-CollectNow=Collect now
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
-LastResult=Latest result
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
-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)
+GDPRContact=Databeskyttelsesansvarlig (DPO, Data Privacy eller GDPR kontakt)
+GDPRContactDesc=Hvis du lagrer data om europeiske firmaer/borgere, kan du lagre den kontakten som er ansvarlig for GDPR - General Data Protection Regulation
+HelpOnTooltip=Hjelpetekst til å vise på verktøytips
+HelpOnTooltipDesc=Sett tekst eller en oversettelsesnøkkel her for at teksten skal vises i et verktøytips når dette feltet vises i et skjema
+YouCanDeleteFileOnServerWith=Du kan slette denne filen på serveren med kommandolinje: <br> %s
+ChartLoaded=Kontoplan lastet
+SocialNetworkSetup=Oppsett av modul Sosiale nettverk
+EnableFeatureFor=Aktiver funksjoner for <strong> %s </strong>
+VATIsUsedIsOff=Merk: Muligheten til å bruke MVA er satt til <strong> Av </strong> i menyen %s - %s, så MVA vil alltid være 0 for salg.
+SwapSenderAndRecipientOnPDF=Bytt posisjoner for avsender- og mottakeradresse på PDF
+FeatureSupportedOnTextFieldsOnly=Advarsel, funksjonen støttes kun i tekstfelt. Også en URL-parameter action=create eller action=edit må settes ELLER sidenavnet må avsluttes med 'new.php' for å starte denne funksjonen.
+EmailCollector=E-post samler
+EmailCollectorDescription=Legg til en planlagt jobb og en oppsettside for å jevnlig skanne etter e-post (ved hjelp av IMAP-protokollen) og registrere e-postmeldinger mottatt i applikasjonen, på riktig sted og/eller opprett poster automatisk (som kundeemner).
+NewEmailCollector=Ny e-postsamler
+EMailHost=Vert for e-post IMAP-server
+MailboxSourceDirectory=Postkasse kildemappe
+MailboxTargetDirectory=Postkasse målmappe
+EmailcollectorOperations=Operasjoner som skal utføres av samler
+MaxEmailCollectPerCollect=Maks antall e-postmeldinger pr. innsamling
+CollectNow=Samle nå
+ConfirmCloneEmailCollector=Er du sikker på at du vil klone e-postsamleren %s?
+DateLastCollectResult=Dato for sist forsøk på samling
+DateLastcollectResultOk=Dato for siste vellykkede samling
+LastResult=Siste resultat
+EmailCollectorConfirmCollectTitle=E-post-samling bekreftelse
+EmailCollectorConfirmCollect=Vil du kjøre samlingen for denne samleren nå?
+NoNewEmailToProcess=Ingen ny e-post (matchende filtre) å behandle
+NothingProcessed=Ingenting gjort
+XEmailsDoneYActionsDone=%s e-postmeldinger kvalifiserte, %s e-postmeldinger som er vellykket behandlet (for %s-post/handlinger utført)
+RecordEvent=Registrer e-posthendelse
+CreateLeadAndThirdParty=Opprett lead (og tredjepart om nødvendig)
+CreateTicketAndThirdParty=Opprett billett (og tredjepart om nødvendig)
 CodeLastResult=Siste resultatkode
-NbOfEmailsInInbox=Number of emails in source directory
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Tracking ID found
-WithoutDolTrackingID=Dolibarr Tracking ID not found
+NbOfEmailsInInbox=Antall e-poster i kildemappen
+LoadThirdPartyFromName=Legg inn tredjepartsøk på %s (bare innlasting)
+LoadThirdPartyFromNameOrCreate=Legg inn tredjepartsøk på %s (opprett hvis ikke funnet)
+WithDolTrackingID=Dolibarr Sporings-ID funnet
+WithoutDolTrackingID=Dolibarr Sporings-ID ikke funnet
 FormatZip=Postnummer
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-OpeningHours=Opening hours
-OpeningHoursDesc=Enter here the regular opening hours of your company.
-ResourceSetup=Configuration of Resource module
+MainMenuCode=Meny-oppføringskode (hovedmeny)
+ECMAutoTree=Vis ECM-tre automatisk 
+OperationParamDesc=Definer verdier som skal brukes til handlinger, eller hvordan du trekker ut verdier. For eksempel: <br> objproperty1=SET:abc <br> objproperty1=SET: en verdi med erstatning for __objproperty1__ <br> objproperty3=SETIFEMPTY:abc <br> objproperty4=EXTRACT:HEADER:.X-Myheaderkey.*[^\\s]+(*). <br> options_myextrafield=EXTRACT:SUBJECT:([^\\s]*) <br> object.objproperty5=EXTRACT:BODY:Mitt firmanavn er\\s([^\\s]*) <br><br> Bruk semikolon som separator for å trekke ut eller sette flere egenskaper.
+OpeningHours=Åpningstider
+OpeningHoursDesc=Skriv inn de vanlige åpningstidene for bedriften din.
+ResourceSetup=Konfigurasjon av ressursmodulen
 UseSearchToSelectResource=Bruk et søkeskjema for å velge en ressurs (i stedet for en nedtrekksliste).
 DisabledResourceLinkUser=Deaktiver funksjonen for å koble en ressurs til brukere
 DisabledResourceLinkContact=Deaktiver funksjonen for å koble en ressurs til kontakter
 ConfirmUnactivation=Bekreft nullstilling av modul
-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.
-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.
-RootCategoryForProductsToSell=Root category of products to sell
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
+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.
+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.
+RootCategoryForProductsToSell=Rot-kategori av vare for salg
+RootCategoryForProductsToSellDesc=Hvis det er definert, vil kun produkter i denne kategorien eller underkategorien være tilgjengelige i Point of Sale
 DebugBar=Debug Bar
-DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
+DebugBarDesc=Verktøylinjen som følger med mange verktøy for å forenkle feilsøking
 DebugBarSetup=DebugBar Setup
-GeneralOptions=General Options
-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
-EXPORTS_SHARE_MODELS=Export models are share with everybody
-ExportSetup=Setup of module Export
-InstanceUniqueID=Unique ID of the instance
-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/.
+GeneralOptions=Generelle alternativer
+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
+EXPORTS_SHARE_MODELS=Eksportmodellene er delt med alle
+ExportSetup=Oppsett av modul Eksport
+InstanceUniqueID=Unik ID for forekomsten
+SmallerThan=Mindre enn
+LargerThan=Større enn
+IfTrackingIDFoundEventWillBeLinked=Merk at hvis en sporings-ID er funnet i innkommende e-post, blir hendelsen automatisk koblet til relaterte objekter.
+WithGMailYouCanCreateADedicatedPassword=Med en Gmail-konto, hvis du aktiverte 2-trinns validering, anbefales det å opprette et dedikert annet passord for applikasjonen, i stedet for å bruke ditt eget kontopassord fra https://myaccount.google.com/.
+IFTTTSetup=IFTTT-moduloppsett
+IFTTT_SERVICE_KEY=IFTTT tjenestenøkkel
+IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Sikkerhetsnøkkel for å sikre sluttpunktsadressen som brukes av IFTTT for å sende meldinger til Dolibarr.
+IFTTTDesc=Denne modulen er utformet for å utløse hendelser på IFTTT og/eller for å utføre en handling på eksterne IFTTT utløsere.
+UrlForIFTTT=URL-endepunkt for IFTTT
+YouWillFindItOnYourIFTTTAccount=Du finner den på din IFTTT-konto
+EndPointFor=Sluttpunkt for %s: %s
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index 91ac61409cb..ce0d58f2310 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Handlinger som Dolibarr automatisk registrerer i agendaen
 EventRemindersByEmailNotEnabled=Hendelsespåminnelser via e-post ble ikke aktivert i %s moduloppsett.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tredjepart %s opprettet
+COMPANY_DELETEInDolibarr=Tredjepart %s slettet
 ContractValidatedInDolibarr=Kontrakt %s validert
 CONTRACT_DELETEInDolibarr=Kontrakt %s slettet
 PropalClosedSignedInDolibarr=Tilbud %s signert
@@ -45,7 +46,7 @@ PropalClosedRefusedInDolibarr=Tilbud %s avvist
 PropalValidatedInDolibarr=Tilbud godkjent
 PropalClassifiedBilledInDolibarr=Tilbud %s klassifisert betalt
 InvoiceValidatedInDolibarr=Faktura %s validert
-InvoiceValidatedInDolibarrFromPos=Faktura %s godkjent fra POS
+InvoiceValidatedInDolibarrFromPos=Faktura %s validert fra POS
 InvoiceBackToDraftInDolibarr=Sett  faktura %s tilbake til utkaststatus
 InvoiceDeleteDolibarr=Faktura %s slettet
 InvoicePaidInDolibarr=Faktura %s endret til betalt
@@ -77,7 +78,7 @@ InvoiceSentByEMail=Kundefaktura %s sendt via e-post
 SupplierOrderSentByEMail=Innkjøpsordre %s sendt via epost
 SupplierInvoiceSentByEMail=Leverandørfaktura %s sendt via epost
 ShippingSentByEMail=Forsendelse %s sendt via epost
-ShippingValidated= Forsendelse %s godkjent
+ShippingValidated= Forsendelse %s validert
 InterventionSentByEMail=Intervensjon %s sendt via epost
 ProposalDeleted=Tilbud slettet
 OrderDeleted=Ordre slettet
@@ -95,7 +96,8 @@ PROJECT_MODIFYInDolibarr=Prosjekt %s er endret
 PROJECT_DELETEInDolibarr=Prosjekt %s slettet
 TICKET_CREATEInDolibarr=Billett %s opprettet
 TICKET_MODIFYInDolibarr=Billett %s endret
-TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_ASSIGNEDInDolibarr=Billett %s tildelt
+TICKET_CLOSEInDolibarr=Billett %s lukket
 TICKET_DELETEInDolibarr=Billett %s slettet
 ##### End agenda events #####
 AgendaModelModule=Dokumentmaler for hendelse
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index c4cd4dc4727..e0f39184532 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Kontanter
+MenuBankCash=Banker | Kontanter
 MenuVariousPayment=Diverse utbetalinger
 MenuNewVariousPayment=Ny Diverse betalinger
 BankName=Banknavn
 FinancialAccount=Konto
 BankAccount=Bankkonto
 BankAccounts=Bankkonti
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bankkontoer | Gateways
 ShowAccount=Vis konto
 AccountRef=Kontonummer hovedbokskonto
 AccountLabel=Kontonavn hovedbokskonto
@@ -30,7 +30,7 @@ AllTime=Fra start
 Reconciliation=Bankavstemming
 RIB=Bankkontonummer
 IBAN=IBAN-nummer
-BIC=BIC/SWIFT-nummer
+BIC=BIC/SWIFT-kode
 SwiftValid=BIC/SWIFT gyldig
 SwiftVNotalid=BIC/SWIFT ikke gyldig
 IbanValid=BAN gyldig
@@ -42,11 +42,11 @@ AccountStatementShort=Utskrift
 AccountStatements=Kontoutskrifter
 LastAccountStatements=Liste over kontoutskrifter
 IOMonthlyReporting=Månedlig rapportering
-BankAccountDomiciliation=Kontoadresse
+BankAccountDomiciliation=Bankadresse
 BankAccountCountry=Konto land
 BankAccountOwner=Kontoeier
 BankAccountOwnerAddress=Kontoeiers adresse
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+RIBControlError=Integritetskontroll av verdier mislyktes. Dette betyr at informasjonen for dette kontonummeret ikke er fullført eller er feil (sjekk land, tall og IBAN).
 CreateAccount=Opprett konto
 NewBankAccount=Ny konto
 NewFinancialAccount=Ny hovedbokskonto
@@ -76,7 +76,7 @@ TransactionsToConciliate=Oppføringer til avstemming
 Conciliable=Kan avstemmes
 Conciliate=Avstem
 Conciliation=Avstemming
-SaveStatementOnly=Save statement only
+SaveStatementOnly=Lagre kun oppgave
 ReconciliationLate=Avstemming forsinket
 IncludeClosedAccount=Ta med lukkede konti
 OnlyOpenedAccount=Kun åpne konti
@@ -105,7 +105,7 @@ SocialContributionPayment=Betaling av skatter og avgifter
 BankTransfer=Bankoverføring
 BankTransfers=Bankoverføringer
 MenuBankInternalTransfer=Intern overførsel
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Overføring fra en konto til en annen, vil Dolibarr skrive to poster (en debet i kildekonto og en kreditt i målkontoen). Det samme beløpet (unntatt tegn), etikett og dato vil bli brukt til denne transaksjonen)
 TransferFrom=Fra
 TransferTo=Til
 TransferFromToDone=En overføring fra <b>%s</b> til <b>%s</b> på <b>%s</b> %s er registrert.
@@ -136,8 +136,8 @@ BankTransactionLine=Bankoppføring
 AllAccounts=Alle bank- og kontantkontoer
 BackToAccount=Tilbake til kontoen
 ShowAllAccounts=Vis for alle kontoer
-FutureTransaction=Transaction in future. No way to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+FutureTransaction=Fremtidig transaksjon. Kan ikke avstemme.
+SelectChequeTransactionAndGenerate=Velg/filter sjekker for å inkludere sjekk-innskuddskvitteringen og klikk på "Opprett"
 InputReceiptNumber=Velg kontoutskriften som hører til avstemmingen. Bruke en sorterbar numerisk verdi: YYYYMM eller YYYYMMDD
 EventualyAddCategory=Til slutt, velg en kategori for å klassifisere postene
 ToConciliate=Slå sammen?
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Returnert sjekk og faktura gjenåpnet
 BankAccountModelModule=Dokumentmaler for bankkontoer
 DocumentModelSepaMandate=Mal av SEPA mandat. Bare nyttig for europeiske land i EEC .
 DocumentModelBan=Mal for å skrive ut en side med BAN-informasjon
-NewVariousPayment=Nye diverse betaling
-VariousPayment=Diverse utbetalinger
+NewVariousPayment=Ny diverse betaling
+VariousPayment=Diverse betaling
 VariousPayments=Diverse utbetalinger
-ShowVariousPayment=Vis diverse betalinger
-AddVariousPayment=Legg til Diverse betalinger
+ShowVariousPayment=Vis diverse betaling
+AddVariousPayment=Legg til diverse betaling
 SEPAMandate=SEPA mandat
 YourSEPAMandate=Ditt SEPA-mandat
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+FindYourSEPAMandate=Dette er ditt SEPA-mandat for å autorisere vårt firma til å utføre direktedebitering til din bank. Send det i retur signert (skanning av det signerte dokumentet) eller send det via post til
+AutoReportLastAccountStatement=Fyll feltet 'Antall bankoppgaver' automatisk med siste setningsnummer når du avstemmer
+CashControl=POS cash fence
+NewCashFence=Ny cash fence
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 1a7a381bc70..876dadb97be 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -6,11 +6,11 @@ BillsCustomer=Kundefaktura
 BillsSuppliers=Leverandørfakturaer
 BillsCustomersUnpaid=Ubetalte kundefakturaer
 BillsCustomersUnpaidForCompany=Ubetalte kundefakturaer for %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsSuppliersUnpaid=Ubetalte leverandørfakturaer
+BillsSuppliersUnpaidForCompany=Ubetalte leverandørfakturaer for %s
 BillsLate=Forfalte betalinger
 BillsStatistics=Kunde fakturastatistikker
-BillsStatisticsSuppliers=Vendors invoices statistics
+BillsStatisticsSuppliers=Leverandørfakturaer statistikk
 DisabledBecauseDispatchedInBookkeeping=Deaktivert fordi fakturaen ble sendt inn til bokføring
 DisabledBecauseNotLastInvoice=Deaktivert fordi fakturaen ikke kan slettes. Noen fakturaer ble registrert etter denne, og det vil skape hull i telleren.
 DisabledBecauseNotErasable=Deaktivert fordi den ikke kan slettes
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma faktura
 InvoiceProFormaDesc=<b>Proforma faktura</b> er et bilde av en ekte faktura, men har ingen verdi i regnskapsføring.
 InvoiceReplacement=Erstatningsfaktura
 InvoiceReplacementAsk=Erstatningsfaktura for faktura
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Erstatningsfaktura</b> brukes til å avbryte og erstatte en faktura uten at betaling allerede er mottatt. <br><br> Merk: Bare faktura uten innbetaling kan erstattes. Hvis ikke faktura er lukket, vil den bli automatisk satt til 'forlatt'.
 InvoiceAvoir=Kreditnota
 InvoiceAvoirAsk=Kreditnota for å korrigere faktura
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+InvoiceAvoirDesc=En <b>kreditnota</b> er en negativ faktura som brukes for å løse situasjoner hvor en faktura har et annet beløp enn det som virkelig er betalt (fordi kunden har betalt for lite ved en feil, eller for eksempel ikke ønsker å betale alt fordi han har returnert noen varer).
 invoiceAvoirWithLines=Opprett kreditnota med opprinnelige fakturalinjer
 invoiceAvoirWithPaymentRestAmount=Lag kreditnota pålydende restbeløp fra faktura
 invoiceAvoirLineWithPaymentRestAmount=Kreditnota for restbeløp
@@ -41,7 +41,7 @@ CorrectionInvoice=Korrigeringsfaktura
 UsedByInvoice=Brukes til å betale faktura %s
 ConsumedBy=Konsumert av
 NotConsumed=Ikke forbrukt
-NoReplacableInvoice=No replaceable invoices
+NoReplacableInvoice=Ingen erstatningsbare fakturaer
 NoInvoiceToCorrect=Ingen faktura å korrigere
 InvoiceHasAvoir=Var kilde til en eller flere kreditnotaer
 CardBill=Fakturakort
@@ -54,7 +54,7 @@ InvoiceCustomer=Kundefaktura
 CustomerInvoice=Kundefaktura
 CustomersInvoices=Kundefakturaer
 SupplierInvoice=Leverandørfaktura
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Leverandørfakturaer
 SupplierBill=Leverandørfaktura
 SupplierBills=Leverandørfakturaer
 Payment=Betaling
@@ -66,33 +66,34 @@ paymentInInvoiceCurrency=i faktura-valuta
 PaidBack=Tilbakebetalt
 DeletePayment=Slett betaling
 ConfirmDeletePayment=Er du sikker på at du vil slette denne betalingen?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
-SupplierPayments=Vendor payments
+ConfirmConvertToReduc=Vil du konvertere denne %s til en absolutt rabatt?
+ConfirmConvertToReduc2=Beløpet vil bli lagret blant alle rabatter og kan brukes som en rabatt for en nåværende eller fremtidig faktura for denne kunden.
+ConfirmConvertToReducSupplier=Vil du konvertere denne %s til en absolutt rabatt?
+ConfirmConvertToReducSupplier2=Beløpet vil bli lagret blant alle rabatter og kan brukes som en rabatt for en nåværende eller en fremtidig faktura for denne leverandøren.
+SupplierPayments=Leverandørbetalinger
 ReceivedPayments=Mottatte betalinger
 ReceivedCustomersPayments=Betalinger mottatt fra kunder
-PayedSuppliersPayments=Payments paid to vendors
-ReceivedCustomersPaymentsToValid=Mottatte kundebetalinger som trenger godkjenning
+PayedSuppliersPayments=Betalinger betalt til leverandører
+ReceivedCustomersPaymentsToValid=Mottatte kundebetalinger som trenger validering
 PaymentsReportsForYear=Betalingsrapport for %s
 PaymentsReports=Betalingsrapporter
 PaymentsAlreadyDone=Betalinger allerede utført
 PaymentsBackAlreadyDone=Tilbakebetalinger allerede utført
 PaymentRule=Betalingsregel
-PaymentMode=Payment Type
+PaymentMode=Betalingstype
 PaymentTypeDC=Debet/kredit-kort
 PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
-PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
+IdPaymentMode=Betalingstype (ID)
+CodePaymentMode=Betalingstype (kode)
+LabelPaymentMode=Betalingstype (etikett)
+PaymentModeShort=Betalingstype
+PaymentTerm=Betalingsbetingelser
+PaymentConditions=Betalingsbetingelser
+PaymentConditionsShort=Betalingsbetingelser
 PaymentAmount=Beløp til betaling
-ValidatePayment=Godkjenn betaling
 PaymentHigherThanReminderToPay=Betalingen er høyere enn restbeløp
-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.
+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'
 ClassifyPaidPartially=Merk 'Delbetalt'
 ClassifyCanceled=Merk 'Tapsført'
@@ -104,7 +105,7 @@ AddBill=Legg til faktura eller kreditnota
 AddToDraftInvoices=Legg til i fakturamal
 DeleteBill=Slett faktura
 SearchACustomerInvoice=Finn kundefaktura
-SearchASupplierInvoice=Search for a vendor invoice
+SearchASupplierInvoice=Søk etter en leverandørfaktura
 CancelBill=Kanseller en faktura
 SendRemindByMail=Send påminnelse med e-post
 DoPayment=Legg inn betaling
@@ -131,8 +132,8 @@ BillStatusClosedUnpaid=Lukket (ubetalt)
 BillStatusClosedPaidPartially=Delbetalt
 BillShortStatusDraft=Kladd
 BillShortStatusPaid=Betalt
-BillShortStatusPaidBackOrConverted=Refunded or converted
-Refunded=Refunded
+BillShortStatusPaidBackOrConverted=Refundert eller konvertert
+Refunded=Refundert
 BillShortStatusConverted=Betalt
 BillShortStatusCanceled=Tapsført
 BillShortStatusValidated=Validert
@@ -142,16 +143,16 @@ BillShortStatusNotRefunded=Ikke refundert
 BillShortStatusClosedUnpaid=Lukket
 BillShortStatusClosedPaidPartially=Delbetalt
 PaymentStatusToValidShort=Til validering
-ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
-ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorVATIntraNotConfigured=Intra-Community MVA-nummer er ikke definert
+ErrorNoPaiementModeConfigured=Det er ingen forhåndsinnstilt betalingsmåte. Gå til Fakturamodul for å rette dette.
+ErrorCreateBankAccount=Opprett en bankkonto, deretter går du til Oppsett i Fakturamodul for å angi betalingsmetoder
 ErrorBillNotFound=Faktura %s eksisterer ikke
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Feil, du prøvde å validere en faktura for å erstatte faktura %s. Men denne er allerede erstattet av faktura %s.
 ErrorDiscountAlreadyUsed=Feil! Rabatten er allerde blitt benyttet
 ErrorInvoiceAvoirMustBeNegative=Feil! Korrigeringsfaktura må ha negativt beløp
 ErrorInvoiceOfThisTypeMustBePositive=Feil! Denne fakturatypen må ha postitivt beløp
 ErrorCantCancelIfReplacementInvoiceNotValidated=Feil: Kan ikke kansellere en faktura som er erstattet av en annen faktura som fortsatt er i kladdemodus
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Denne delen eller en annen er allerede brukt, så rabattserien kan ikke fjernes.
 BillFrom=Fra
 BillTo=Til
 ActionsOnBill=Handlinger på faktura
@@ -165,13 +166,13 @@ LatestTemplateInvoices=Siste %s fakturamaler
 LatestCustomerTemplateInvoices=Siste %s kundefaktura-maler
 LatestSupplierTemplateInvoices=Siste %s leverandørfaktura-maler
 LastCustomersBills=Siste %s kundefakturaer
-LastSuppliersBills=Latest %s vendor invoices
+LastSuppliersBills=Siste %s leverandørfakturaer
 AllBills=Alle fakturaer
 AllCustomerTemplateInvoices=Alle fakturamaler
 OtherBills=Andre fakturaer
 DraftBills=Fakturakladder
 CustomersDraftInvoices=Kunde fakturamal
-SuppliersDraftInvoices=Vendor draft invoices
+SuppliersDraftInvoices=Leverandør fakturakladder
 Unpaid=Ubetalt
 ConfirmDeleteBill=Er du sikker på at du vil slette denne fakturaen?
 ConfirmValidateBill=Er du sikker på at du vil validere denne fakturaen med referanse <b>%s</b>?
@@ -180,20 +181,20 @@ ConfirmClassifyPaidBill=Er du sikker på at du vil endre fakturaen <b>%s</b> til
 ConfirmCancelBill=Er du sikker på at du vil kansellere faktura <b>%s</b>?
 ConfirmCancelBillQuestion=Hvorfor vil du klassifisere denne fakturaen til "forlatt"?
 ConfirmClassifyPaidPartially=Er du sikker på at du vil endre fakturaen <b>%s</b> til status "betalt"?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=Denne fakturaen er ikke fullt ut betalt. Hvorfor lukker du denne fakturaen?
+ConfirmClassifyPaidPartiallyReasonAvoir=Restbeløpet <b>(%s %s)</b> er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg ønsker å rette opp MVA med en kreditnota.
 ConfirmClassifyPaidPartiallyReasonDiscount=Resterende ubetalt <b>(%s%s) </b> er en rabatt gitt fordi betaling ble gjort før forfall.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restbeløpet <b>(%s %s)</b> er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg aksepterer å miste MVA på denne rabatten.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Restebløpet <b>(%s %s)</b> er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg skriver av MVA på denne rabatten uten kreditnota.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Dårlig kunde
 ConfirmClassifyPaidPartiallyReasonProductReturned=Varer delvis returnert
 ConfirmClassifyPaidPartiallyReasonOther=Beløpet tapsføres av en annen årsak
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Dette valget er kun mulig hvis fakturaen har en spesiell påskrift. (For eksemple: «Kun MVA-andelen av prisen som faktisk betales gir rett til MVA-fradrag»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=I noen land er dette valget kun mulig hvis fakturaen inneholder en spesiell påskrift.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Bruk dette valget hvis ingen av de andre passer
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=En <b>dårlig kunde</b> er en kunde som nekter å betale.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Dette valget brukes når betalingen ikke er komplett fordi noen varer er returnert
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Bruk dette valget hvis ingen av de andre passer, for eksempel i følgende situasjon:<br>- betaling ikke komplett fordi noen varer er sendt tilbake<br>- ikke betalt fullt ut fordi rabatt er uteglemt<br>I alle tilfelle må beløpet rettes i regnskapssystemet ved å lage en kreditnota.
 ConfirmClassifyAbandonReasonOther=Annen
 ConfirmClassifyAbandonReasonOtherDesc=Dette valget brukes i alle andre tilfeller. For eksempel fordi du vil lage en erstatningsfaktura.
 ConfirmCustomerPayment=Bekrefter du denne betalingen for <b>%s</b> %s?
@@ -201,10 +202,10 @@ ConfirmSupplierPayment=Bekrefter du denne betalingen for <b>%s</b> %s?
 ConfirmValidatePayment=Er du sikker på at du vil validere denne betalingen? Ingen endringer kan utføres etterpå.
 ValidateBill=Valider faktura
 UnvalidateBill=Fjern validering på faktura
-NumberOfBills=No. of invoices
-NumberOfBillsByMonth=No. of invoices per month
+NumberOfBills=Antall fakturaer
+NumberOfBillsByMonth=Antall fakturaer pr. måned
 AmountOfBills=Totalbeløp fakturaer
-AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsHT=Sum fakturaer pr. mnd (eks. MVA)
 AmountOfBillsByMonthHT=Sum fakturaer pr. mnd (eks. MVA)
 ShowSocialContribution=Vis skatter og avgifter
 ShowBill=Vis faktura
@@ -247,11 +248,11 @@ DateInvoice=Fakturadato
 DatePointOfTax=Skattepunkt
 NoInvoice=Ingen faktura
 ClassifyBill=Klassifiser faktura
-SupplierBillsToPay=Unpaid vendor invoices
+SupplierBillsToPay=Ubetalte leverandørfakturaer
 CustomerBillsUnpaid=Ubetalte kundefakturaer
 NonPercuRecuperable=Kan ikke dekkes inn
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
+SetConditions=Angi betalingsbetingelser
+SetMode=Angi betalingsmåte
 SetRevenuStamp=Sett stempelmerke
 Billed=Fakturert
 RecurringInvoices=Gjentagende fakturaer
@@ -262,15 +263,15 @@ Repeatables=Maler
 ChangeIntoRepeatableInvoice=Gjør om til fakturamal
 CreateRepeatableInvoice=Opprett fakturamal
 CreateFromRepeatableInvoice=Opprett fra fakturamal
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndInvoiceLines=Kundefakturaer og fakturadetaljer
 CustomersInvoicesAndPayments=Kundefakturaer og betalinger
-ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_1=Kundefakturaer og fakturadetaljer
 ExportDataset_invoice_2=Kundefakturaer og betalinger
 ProformaBill=Proforma faktura
 Reduction=Reduksjon
-ReductionShort=Disc.
+ReductionShort=Rab.
 Reductions=Reduksjoner
-ReductionsShort=Disc.
+ReductionsShort=Rab.
 Discounts=Rabatter
 AddDiscount=Legg til rabatt
 AddRelativeDiscount=Lag relativ rabatt
@@ -292,7 +293,7 @@ DiscountFromDeposit=Nedbetalinger fra faktura %s
 DiscountFromExcessReceived=For mye innbetalt på faktura %s
 DiscountFromExcessPaid=For mye innbetalt på faktura %s
 AbsoluteDiscountUse=Denne typen kreditt kan brukes på faktura før den godkjennes
-CreditNoteDepositUse=Fakturaen m valideres for å kunne bruke denne typen kredit
+CreditNoteDepositUse=Fakturaen må valideres for å kunne bruke denne typen kreditt
 NewGlobalDiscount=Ny absolutt rabatt
 NewRelativeDiscount=Ny relativ rabatt
 DiscountType=Rabatttype
@@ -304,9 +305,9 @@ DiscountAlreadyCounted=Rabatter eller kreditter som allerede er brukt
 CustomerDiscounts=Kunderabatter
 SupplierDiscounts=Leverandørrabatter
 BillAddress=Fakturaadresse
-HelpEscompte=This discount is a discount granted to customer because payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
+HelpEscompte=Denne rabatten er gitt fordi kunden betalte før forfall.
+HelpAbandonBadCustomer=Dette beløpet er tapsført (dårlig kunde) og betraktes som tap.
+HelpAbandonOther=Dette beløpet er tapsført på grunn av feil. (For eksempel feil kunde eller faktura er erstattet av en annen)
 IdSocialContribution=Skatter og avgifter ID
 PaymentId=Betalings-ID
 PaymentRef=Betalings-ref.
@@ -316,30 +317,30 @@ InvoiceDateCreation=Fakturadato
 InvoiceStatus=Fakturastatus
 InvoiceNote=Falturanotat
 InvoicePaid=Faktura betalt
-OrderBilled=Order billed
-DonationPaid=Donation paid
+OrderBilled=Ordre fakturert
+DonationPaid=Donasjon betalt
 PaymentNumber=Betalingsnummer
 RemoveDiscount=Fjern rabatt
 WatermarkOnDraftBill=Vannmerke på fakturakladder (ingenting hvis tomt)
 InvoiceNotChecked=Ingen faktura er valgt
 ConfirmCloneInvoice=Er du sikker på at du vil klone fakturaen <b>%s</b>?
 DisabledBecauseReplacedInvoice=Handling slått av fordi fakturaen er blitt erstattet
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
-NbOfPayments=No. of payments
+DescTaxAndDividendsArea=Dette området viser summen av alle betalinger til spesielle utgifter. Kun poster fra dette regnskapsåret er tatt med her.
+NbOfPayments=Antall betalinger
 SplitDiscount=Del rabatt i to
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
+ConfirmSplitDiscount=Er du sikker på at du vil dele rabatten på<b>%s</b>? %s i to mindre rabatter?
+TypeAmountOfEachNewDiscount=Sett inn beløp for hver av de to delene:
+TotalOfTwoDiscountMustEqualsOriginal=Totalen for de to nye rabattene må være lik det originale rabattbeløpet.
 ConfirmRemoveDiscount=Er du sikker på at du vil 
 RelatedBill=Relatert faktura
 RelatedBills=Relaterte fakturaer
 RelatedCustomerInvoices=Relaterte kundefakturaer
-RelatedSupplierInvoices=Related vendor invoices
+RelatedSupplierInvoices=Relaterte leverandørfakturaer
 LatestRelatedBill=Siste tilknyttede faktura
-WarningBillExist=Warning, one or more invoices already exist
+WarningBillExist=Advarsel: en eller flere fakturaer finnes allerede
 MergingPDFTool=Verktøy for fletting av PDF 
 AmountPaymentDistributedOnInvoice=Beløp fordelt på faktura
-PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
+PaymentOnDifferentThirdBills=Tillat betaling av fakturaer for ulike tredjeparter under samme foreldre-firma
 PaymentNote=Betalingsnotat
 ListOfPreviousSituationInvoices=Liste over tidligere delfakturaer
 ListOfNextSituationInvoices=Liste over kommende delfakturaer
@@ -358,7 +359,7 @@ NextDateToExecution=Dato for neste fakturagenerering
 NextDateToExecutionShort=Dato neste generering
 DateLastGeneration=Dato for siste generering
 DateLastGenerationShort=Dato siste generering
-MaxPeriodNumber=Max. number of invoice generation
+MaxPeriodNumber=Maks antall fakturagenereringer
 NbOfGenerationDone=Antall fakturagenereringer allerede gjort
 NbOfGenerationDoneShort=Antall genereringer gjort
 MaxGenerationReached=Maks antall genereringer nådd
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Valider fakturaer automatisk
 GeneratedFromRecurringInvoice=Generert fra gjentagende-fakturamal %s
 DateIsNotEnough=Dato ikke nådd enda
 InvoiceGeneratedFromTemplate=Faktura %s generert fra gjentagende-fakturamal %s
+GeneratedFromTemplate=Generert fra fakturamal %s
 WarningInvoiceDateInFuture=Advarsel, fakturadato er høyere enn dagens dato
 WarningInvoiceDateTooFarInFuture=Advarsel, er fakturadato for langt fra dagens dato
 ViewAvailableGlobalDiscounts=Vis tilgjengelige rabatter
@@ -395,7 +397,7 @@ PaymentConditionShort14D=14 dager
 PaymentCondition14D=14 dager
 PaymentConditionShort14DENDMONTH=14 dager etter månedens slutt
 PaymentCondition14DENDMONTH=Innen 14 dager etter slutten av måneden
-FixAmount=Fixed amount
+FixAmount=Fast beløp
 VarAmount=Variabelt beløp
 VarAmountOneLine=Variabel mengde (%% tot.) - 1 linje med etikett '%s'
 # PaymentType
@@ -411,22 +413,22 @@ PaymentTypeCHQ=Sjekk
 PaymentTypeShortCHQ=Sjekk
 PaymentTypeTIP=TIP (Dokumenter mot betaling)
 PaymentTypeShortTIP=TIP Betaling
-PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Online payment
+PaymentTypeVAD=Online betaling
+PaymentTypeShortVAD=Online betaling
 PaymentTypeTRA=Bankremisse
 PaymentTypeShortTRA=Kladd
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
 BankDetails=Bankopplysninger
 BankCode=Bank code (ikke i Norge)
-DeskCode=Branch code
+DeskCode=Bransjekode
 BankAccountNumber=Kontonummer
-BankAccountNumberKey=Checksum
+BankAccountNumberKey=Sjekksum
 Residence=Adresse
-IBANNumber=IBAN account number
+IBANNumber=IBAN kontonummer
 IBAN=IBAN
 BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT code
+BICNumber=BIC/SWIFT-kode
 ExtraInfos=Ekstra informasjon
 RegulatedOn=Regulert den
 ChequeNumber=Sjekk nummer
@@ -440,33 +442,33 @@ PhoneNumber=Tlf
 FullPhoneNumber=Telefon
 TeleFax=Fax
 PrettyLittleSentence=Aksepter forfalte beløp godkjent av regnskapsfører.
-IntracommunityVATNumber=Intra-Community VAT ID
-PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
-PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+IntracommunityVATNumber=Intracommunity number of VAT (ikke i Norge)
+PaymentByChequeOrderedTo=Sjekkbetaling (inkl. MVA) til %s send til
+PaymentByChequeOrderedToShort=Sjekkbetaling (inkl. MVA) til
 SendTo=sendt til
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+PaymentByTransferOnThisBankAccount=Betaling ved overføring til følgende bankkonto
 VATIsNotUsedForInvoice=* Avgiftsfritt
 LawApplicationPart1=Alle varer forblir vår eiendom
 LawApplicationPart2=til de er fullt ut betalt.
-LawApplicationPart3=the seller until full payment of
+LawApplicationPart3=selgeren til full betaling av
 LawApplicationPart4=i leverte varer til de er betalt i sin helhet.
 LimitedLiabilityCompanyCapital=AS med organisajonsnummer
 UseLine=Legg til
 UseDiscount=Bruk rabatt
 UseCredit=Bruk kreditt
 UseCreditNoteInInvoicePayment=Reduser betaling med denne kreditnotaen
-MenuChequeDeposits=Check Deposits
+MenuChequeDeposits=Sjekk innskudd
 MenuCheques=Sjekker
-MenuChequesReceipts=Check receipts
+MenuChequesReceipts=Sjekk kvitteringer
 NewChequeDeposit=Nytt innskudd
-ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
+ChequesReceipts=Sjekk kvitteringer
+ChequesArea=Sjekkinnskuddsområde
+ChequeDeposits=Sjekkinnskudd
 Cheques=Sjekker
 DepositId=Innskudds-ID
 NbCheque=Antall sjekker
 CreditNoteConvertedIntoDiscount=Denne%s er blitt konvertert til %s
-UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Bruk kontakt/adresse med typen 'faktureringskontakt' i stedet for tredjepartsadresse som mottaker for fakturaer
 ShowUnpaidAll=Vis alle ubetalte fakturaer
 ShowUnpaidLateOnly=Vis kun forfalte fakturaer
 PaymentInvoiceRef=Betaling av faktura %s
@@ -477,22 +479,22 @@ Reported=Forsinket
 DisabledBecausePayments=Ikke mulig siden det er noen betalinger
 CantRemovePaymentWithOneInvoicePaid=Kan ikke fjerne betalingen siden det er minst en faktura som er klassifisert som betalt
 ExpectedToPay=Forventet innbetaling
-CantRemoveConciliatedPayment=Can't remove reconciled payment
+CantRemoveConciliatedPayment=Kan ikke fjerne avtalt beløp
 PayedByThisPayment=Betales av denne innbetalingen
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down-payment or replacement invoices paid entirely.
+ClosePaidInvoicesAutomatically=Klassifiser "Betalt" alle standard-, forskuddsbetalings- eller erstatningsfakturaer som er fullstendig betalt.
 ClosePaidCreditNotesAutomatically=Klassifiser alle fakturaer som betalt
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
-AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+ClosePaidContributionsAutomatically=Klassifiser alle fullt betalte sosial- og regnskapsbidrag som "betalt"
+AllCompletelyPayedInvoiceWillBeClosed=Alle fakturaer uten gjenværende å betale vil automatisk bli stengt med status "Betalt".
 ToMakePayment=Betal
 ToMakePaymentBack=Tilbakebetal
 ListOfYourUnpaidInvoices=Liste over ubetalte fakturaer
 NoteListOfYourUnpaidInvoices=Denne listen inneholder kun fakturaer for tredjeparter du er koblet til som salgsrepresentant.
 RevenueStamp=Stempelmerke
-YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
+YouMustCreateInvoiceFromThird=Dette alternativet er bare tilgjengelig når du oppretter faktura fra kategorien "kunde" under tredjepart
+YouMustCreateInvoiceFromSupplierThird=Dette alternativet er bare tilgjengelig når du oppretter faktura fra kategorien "leverandør" under tredjepart
 YouMustCreateStandardInvoiceFirstDesc=Du må først lage en standardfaktura og så konvertere den til "mal" for å lage en ny fakturamal
 PDFCrabeDescription=Fakturamal Crabe. En komplett mal (Støtter MVA, rabatter, betalingsbetingelser, logo, osv...)
-PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
+PDFSpongeDescription=PDF Fakturamal Sponge. En komplett fakturamal
 PDFCrevetteDescription=PDF fakturamal Crevette. En komplett mal for delfaktura
 TerreNumRefModelDesc1=Returnerer nummer med format %syymm-nnnn for standardfaktura og %syymm-nnnn for kreditnota, der yy er året, mm måned og nnnn er et løpenummer som starter på 0+1.
 MarsNumRefModelDesc1=Returnerer et nummer med format %syymm-nnnn for standardfakturaer, %syymm-nnnn for erstatningsfakturaer, %syymm-nnnn for nedbetalingsfakturaer og %syymm-nnnn for kreditnotater hvor yy er år, mm er måned og nnnn er en sekvens uten pause og ingen retur til 0
@@ -503,10 +505,10 @@ TypeContact_facture_internal_SALESREPFOLL=Representant for oppfølging av kundef
 TypeContact_facture_external_BILLING=Kundekontakt faktura
 TypeContact_facture_external_SHIPPING=Kundekontakt leveranser
 TypeContact_facture_external_SERVICE=Kundekontakt service
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representant for oppfølging av leverandørfaktura
 TypeContact_invoice_supplier_external_BILLING=Leverandør fakturakontakt
 TypeContact_invoice_supplier_external_SHIPPING=Leverandørkontakt forsendelser
-TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+TypeContact_invoice_supplier_external_SERVICE=Leverandørens servicekontakt
 # Situation invoices
 InvoiceFirstSituationAsk=Første delfaktura
 InvoiceFirstSituationDesc=<b>Delfakturaer</b> er bundet til en situasjon og følger dennes progresjon, for eksempel byggingen av en konstruksjo. Hver delfaktura er bundet til en faktura.
@@ -531,13 +533,13 @@ InvoiceSituationLast=Siste delfaktura
 PDFCrevetteSituationNumber=Del N°%s
 PDFCrevetteSituationInvoiceLineDecompte=Delfaktura - TELLER
 PDFCrevetteSituationInvoiceTitle=Delfaktura
-PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
+PDFCrevetteSituationInvoiceLine=Del N°%s : Fakt. N°%s på %s
 TotalSituationInvoice=Totalt deler
 invoiceLineProgressError=Fakturalinje-progresjon kan ikke være lik eller høyere enn neste fakturalinje
-updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
+updatePriceNextInvoiceErrorUpdateline=Feil: oppdater pris på fakturalinje: %s
 ToCreateARecurringInvoice=For å opprette en gjentakende faktura for denne kontrakten må du først opprette en fakturakladd, og så gjøre den om til en fakturamal, for så å bestemme hvor ofte nye fakturaer skal opprettes
 ToCreateARecurringInvoiceGene=For å opprette fremtidige periodiske fakturaer manuelt, gå til meny <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=Hvis du vil opprette slike fakturaer automatisk, ta kontakt med administrator for å aktivere og sette opp modulen <strong>%s</strong>. Husk at begge metoder (manuell og automatisk) kan bruke om hverandre uten fare for duplisering.
 DeleteRepeatableInvoice=Slett fakturamal
 ConfirmDeleteRepeatableInvoice=Er du sikker på at du vil 
 CreateOneBillByThird=Opprett en faktura pr. tredjepart (ellers en faktura pr. ordre)
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index 0b5d173990d..89f1d3e7e89 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -50,15 +50,21 @@ TheoricalAmount=Teoretisk beløp
 RealAmount=Virkelig beløp
 CashFenceDone=Kontantoppgjør ferdig for perioden
 NbOfInvoices=Ant. fakturaer
-Paymentnumpad=Type of Pad to enter payment
-Numberspad=Numbers Pad
-BillsCoinsPad=Coins and banknotes Pad
-DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
-CashDeskBankAccountFor=Default account to use for payments in
-NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
-TicketVatGrouped=Group VAT by rate in tickets
-AutoPrintTickets=Automatically print tickets
-EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
-ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+Paymentnumpad=Tastaturtype for å legge inn betaling
+Numberspad=Nummertastatur
+BillsCoinsPad=Mynter og pengesedler Pad
+DolistorePosCategory=TakePOS-moduler og andre POS-løsninger for Dolibarr
+TakeposNeedsCategories=TakePOS trenger varekategorier for å fungere
+OrderNotes=Ordrenotater
+CashDeskBankAccountFor=Standardkonto for bruk for betalinger i
+NoPaimementModesDefined=Ingen betalingsmodus definert i TakePOS-konfigurasjonen
+TicketVatGrouped=Grupper MVA etter sats i kvitteringer
+AutoPrintTickets=Skriv ut kvitteringer automatisk
+EnableBarOrRestaurantFeatures=Aktiver funksjoner for Bar eller Restaurant
+ConfirmDeletionOfThisPOSSale=Bekrefter du slettingen av pågående salg?
+History=Historikk
+ValidateAndClose=Valider og lukk
+Terminal=Terminal
+NumberOfTerminals=Antall terminaler
+TerminalSelect=Velg terminalen du vil bruke:
+POSTicket=POS Billett
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index 49677b9726c..9fc215894a4 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -5,13 +5,13 @@ SelectThirdParty=Velg en tredjepart
 ConfirmDeleteCompany=Er du sikker på at du vil slette dette firmaet og all tilhørende informasjon?
 DeleteContact=Slett kontaktperson
 ConfirmDeleteContact=Er du sikker på at du vil slette denne kontakten og all tilhørende informasjon?
-MenuNewThirdParty=New Third Party
-MenuNewCustomer=New Customer
-MenuNewProspect=New Prospect
-MenuNewSupplier=New Vendor
+MenuNewThirdParty=Ny tredje part
+MenuNewCustomer=Ny kunde
+MenuNewProspect=Nytt prospekt
+MenuNewSupplier=Ny leverandør
 MenuNewPrivateIndividual=Ny privatperson
 NewCompany=Nytt selskap (prospekt, kunde, leverandør)
-NewThirdParty=New Third Party (prospect, customer, vendor)
+NewThirdParty=Ny tredjepart (prospekt, kunde, leverandør)
 CreateDolibarrThirdPartySupplier=Opprett en tredjepart (leverandør)
 CreateThirdPartyOnly=Opprett tredjepart
 CreateThirdPartyAndContact=Opprett en tredjepart med underkontakt
@@ -20,28 +20,28 @@ IdThirdParty=Tredjepart-ID
 IdCompany=Firma-ID
 IdContact=Kontaktperson-ID
 Contacts=Kontakter
-ThirdPartyContacts=Third-party contacts
-ThirdPartyContact=Third-party contact/address
+ThirdPartyContacts=Tredjeparts kontakter
+ThirdPartyContact=Tredjeparts kontakt/adresse
 Company=Bedrift
 CompanyName=Firmanavn
 AliasNames=Alias (kommersielt, trademark,...)
 AliasNameShort=Alias ​​Navn
 Companies=Bedrifter
-CountryIsInEEC=Country is inside the European Economic Community
-PriceFormatInCurrentLanguage=Price format in current language
-ThirdPartyName=Third-party name
-ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
+CountryIsInEEC=Landet er innenfor Det europeiske økonomiske fellesskap
+PriceFormatInCurrentLanguage=Prisvisningsformat i gjeldende språk og valuta
+ThirdPartyName=Tredjepartsnavn
+ThirdPartyEmail=Tredjeparts e-post
+ThirdParty=Tredjepart
+ThirdParties=Tredjeparter
 ThirdPartyProspects=Prospekter
 ThirdPartyProspectsStats=Prospekter
 ThirdPartyCustomers=Kunder
 ThirdPartyCustomersStats=Kunder
 ThirdPartyCustomersWithIdProf12=Kunder med %s eller %s
 ThirdPartySuppliers=Leverandører
-ThirdPartyType=Third-party type
+ThirdPartyType=Tredjepartstype
 Individual=Privatperson
-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.
+ToCreateContactWithSameName=Vil automatisk opprette en kontakt/adresse med samme informasjon som tredjeparten, under tredjeparten. I de fleste tilfeller, selv om tredjeparten er en privatperson, vil det være nok å opprette en tredjepart
 ParentCompany=Morselskap
 Subsidiaries=Datterselskaper
 ReportByMonth=Rapporter etter måned
@@ -70,19 +70,19 @@ Chat=Chat
 PhonePro=Tlf. arbeid
 PhonePerso=Tlf. privat
 PhoneMobile=Tlf. mobil
-No_Email=Refuse bulk emailings
+No_Email=Avvis masse-e-post
 Fax=Faks
 Zip=Postnummer
 Town=Poststed
 Web=Web
 Poste= Posisjon
-DefaultLang=Language default
-VATIsUsed=Sales tax used
-VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
+DefaultLang=Standardspråk
+VATIsUsed=MVA brukt
+VATIsUsedWhenSelling=Dette definerer om denne tredjepart inkluderer MVA eller ikke når de fakturerer sine egne kunder
 VATIsNotUsed=Salgsavgift er ikke brukt
-CopyAddressFromSoc=Copy address from third-party details
-ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
+CopyAddressFromSoc=Kopier adresse fra tredjepartsdetaljer
+ThirdpartyNotCustomerNotSupplierSoNoRef=Tredjepart verken kunde eller leverandør, ingen tilgjengelige henvisende objekter
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Tredjeparts verken kunde eller leverandør, rabatter er ikke tilgjengelige
 PaymentBankAccount=Bankkonto betaling
 OverAllProposals=Tilbud
 OverAllOrders=Ordre
@@ -257,8 +257,8 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT ID
-VATIntraShort=VAT ID
+VATIntra=MVA-ID
+VATIntraShort=MVA-ID
 VATIntraSyntaxIsValid=Gyldig syntaks
 VATReturn=MVA-retur
 ProspectCustomer=Prospekt/Kunde
@@ -271,22 +271,22 @@ CustomerRelativeDiscountShort=Relativ rabatt
 CustomerAbsoluteDiscountShort=Absolutt rabatt
 CompanyHasRelativeDiscount=Denne kunden har en rabatt på <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Denne kunden har ingen relative rabatter angitt
-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
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+HasRelativeDiscountFromSupplier=Du har en standardrabatt på <b> %s%% </b> fra denne leverandøren
+HasNoRelativeDiscountFromSupplier=Du har ingen standard relativ rabatt fra denne leverandøren
+CompanyHasAbsoluteDiscount=Denne kunden har rabatter tilgjengelig (kreditnotaer eller nedbetalinger) for <b> %s </b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Denne kunden har rabatt tilgjengelig (tilbud, nedbetalinger) for <b>%s</b>%s
 CompanyHasCreditNote=Denne kunden har fortsatt kreditnotaer for <b>%s %s</b>
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
-HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
-HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
+HasNoAbsoluteDiscountFromSupplier=Du har ingen rabatt tilgjengelig fra denne leverandøren
+HasAbsoluteDiscountFromSupplier=Du har rabatter tilgjengelig (kreditnotaer eller nedbetalinger) for <b> %s </b> %s fra denne leverandøren
+HasDownPaymentOrCommercialDiscountFromSupplier=Du har rabatter tilgjengelig (kommersielle, nedbetalinger) for <b> %s </b> %s fra denne leverandøren
+HasCreditNoteFromSupplier=Du har kreditnotater for <b> %s </b> %s fra denne leverandøren
 CompanyHasNoAbsoluteDiscount=Denne kunden har ingen rabatt tilgjengelig
 CustomerAbsoluteDiscountAllUsers=Absolutte kunderabatter (gitt av alle brukere)
 CustomerAbsoluteDiscountMy=Absolutte kunderabatter (gitt av deg selv)
 SupplierAbsoluteDiscountAllUsers=Absolutte leverandørrabatter (oppgitt av alle brukere)
 SupplierAbsoluteDiscountMy=Absolutt leverandørrabatter (oppgitt av deg selv)
 DiscountNone=Ingen
-Vendor=Vendor
+Vendor=Leverandør
 AddContact=Opprett kontakt
 AddContactAddress=Opprett kontakt/adresse
 EditContact=Endre kontakt
@@ -302,22 +302,22 @@ AddThirdParty=Opprett tredjepart
 DeleteACompany=Slett et firma
 PersonalInformations=Personlig informasjon
 AccountancyCode=Regnskapskonto
-CustomerCode=Customer Code
-SupplierCode=Vendor Code
-CustomerCodeShort=Customer Code
-SupplierCodeShort=Vendor Code
-CustomerCodeDesc=Customer Code, unique for all customers
-SupplierCodeDesc=Vendor Code, unique for all vendors
+CustomerCode=Kundekode
+SupplierCode=Leverandørkode
+CustomerCodeShort=Kundenummer
+SupplierCodeShort=Leverandørkode
+CustomerCodeDesc=Kundekode, unikt for alle kunder
+SupplierCodeDesc=Leverandørkode, unikt for alle leverandører
 RequiredIfCustomer=Påkrevet hvis tredjeparten er kunde eller prospekt
 RequiredIfSupplier=Påkrevd hvis tredjepart er en leverandør
-ValidityControledByModule=Validity controlled by module
-ThisIsModuleRules=Rules for this module
+ValidityControledByModule=Gyldighet kontrollert av modulen
+ThisIsModuleRules=Regler for denne modulen
 ProspectToContact=Prospekt til kontakt
 CompanyDeleted=Firma "%s" er slettet fra databasen.
 ListOfContacts=Oversikt over kontaktpersoner
 ListOfContactsAddresses=Oversikt over kontaktpersoner
-ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
+ListOfThirdParties=Liste over tredjeparter
+ShowCompany=Vis tredjepart
 ShowContact=Vis kontaktperson
 ContactsAllShort=Alle (ingen filter)
 ContactType=Kontaktperson type
@@ -332,20 +332,20 @@ NoContactForAnyProposal=Kontaktpersonen er ikke tilknyttet noen tilbud
 NoContactForAnyContract=Kontaktpersonen er ikke tilknyttet noen kontrakt
 NoContactForAnyInvoice=Kontaktpersonen er ikke tilknyttet noen faktura
 NewContact=Ny kontaktperson
-NewContactAddress=New Contact/Address
+NewContactAddress=Ny kontakt/adresse
 MyContacts=Mine kontaktpersoner
 Capital=Aksjekapital
 CapitalOf=Aksjekapital på %s
 EditCompany=Rediger firma
 ThisUserIsNot=Denne brukeren er ikke et prospekt, kunde eller leverandør
 VATIntraCheck=Sjekk
-VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+VATIntraCheckDesc=MVA-ID-en må inneholde landets prefiks. Koblingen <b> %s </b> bruker den europeiske MVA-kontrolltjenesten (VIES) som krever internettilgang fra Dolibarr-serveren.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraCheckableOnEUSite=Sjekk internasjonal MVA-ID på EU-kommisjonens nettsted
+VATIntraManualCheck=Du kan også sjekke manuelt på den Europeiske kommisjonens nettside <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Sjekk er ikke tilgjengelig. Tjenesten er ikke tilgjengelig for landet (%s).
-NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+NorProspectNorCustomer=Ikke prospekt, eller kunde
+JuridicalStatus=Juridisk enhetstype
 Staff=Ansatte
 ProspectLevelShort=Potensiell
 ProspectLevel=Prospektpotensiale
@@ -367,7 +367,7 @@ TE_MEDIUM=Middels firma
 TE_ADMIN=Offentlig
 TE_SMALL=Lite firma
 TE_RETAIL=Detaljist
-TE_WHOLE=Wholesaler
+TE_WHOLE=Grossist
 TE_PRIVATE=Privatperson
 TE_OTHER=Annet
 StatusProspect-1=Kontaktes ikke
@@ -386,14 +386,14 @@ ExportCardToFormat=Eksporter kort til format
 ContactNotLinkedToCompany=Kontaktpersonen er ikke lenket til noen tredjepart
 DolibarrLogin=Dolibarr innlogging
 NoDolibarrAccess=Ingen tilgang til Dolibarr
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
-ImportDataset_company_1=Third-parties and their properties
-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)
-PriceLevel=Price Level
-PriceLevelLabels=Price Level Labels
+ExportDataset_company_1=Tredjeparter (Selskaper/organisasjoner/fysiske personer) og deres egenskaper
+ExportDataset_company_2=Kontakter og deres egenskaper
+ImportDataset_company_1=Tredjeparter og deres egenskaper
+ImportDataset_company_2=Tredjeparts tilleggs-kontakter/adresser og attributter
+ImportDataset_company_3=Tredjeparts bankkontoer
+ImportDataset_company_4=Tredjeparts salgsrepresentanter (tilordne salgsrepresentanter/brukere til bedrifter)
+PriceLevel=Prisnivå
+PriceLevelLabels=Prisnivåetiketter
 DeliveryAddress=Leveringsadresse
 AddAddress=Legg til adresse
 SupplierCategory=Leverandør kategori
@@ -404,7 +404,7 @@ AllocateCommercial=Tildelt salgsrepresentant
 Organization=Organisasjon
 FiscalYearInformation=Regnskapsår
 FiscalMonthStart=Første måned i regnskapsåret
-YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
+YouMustAssignUserMailFirst=Du må opprette en epost for denne brukeren før du kan legge til et e-postvarsel.
 YouMustCreateContactFirst=For å kunne legge til e-postvarsler, må du først definere kontakter med gyldige e-postadresser hos tredjepart
 ListSuppliersShort=Liste over leverandører
 ListProspectsShort=Liste over prospekter
@@ -420,22 +420,22 @@ CurrentOutstandingBill=Gjeldende utestående regning
 OutstandingBill=Max. utestående beløp
 OutstandingBillReached=Maksimun utestående beløp nådd
 OrderMinAmount=Minimumsbeløp for bestilling
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Returner nummer med format %syymm-nnnn for kundekode og %syymm-nnnn for leverandørkode hvor yy er år, mm er måned og nnnn er en sekvens uten pause og ingen retur til 0.
 LeopardNumRefModelDesc=Fri kode. Denne koden kan endres når som helst.
 ManagingDirectors=(E) navn (CEO, direktør, president ...)
 MergeOriginThirdparty=Dupliser tredjepart (tredjepart du vil slette)
 MergeThirdparties=Flett tredjeparter
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Er du sikker på at du vil slå sammen denne tredjeparten med den nåværende? Alle koblede objekter (fakturaer, ordre, ...) blir flyttet til nåværende tredjepart, og tredjeparten blir slettet.
 ThirdpartiesMergeSuccess=Tredjeparter har blitt flettet
 SaleRepresentativeLogin=Innlogging for salgsrepresentant
 SaleRepresentativeFirstname=Selgers fornavn
 SaleRepresentativeLastname=Selgers etternavn
 ErrorThirdpartiesMerge=Det oppsto en feil ved sletting av tredjepart. Vennligst sjekk loggen. Endringer er blitt tilbakestilt.
-NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
+NewCustomerSupplierCodeProposed=Kunde eller leverandørkode er allerede brukt, en ny kode blir foreslått
 #Imports
-PaymentTypeCustomer=Payment Type - Customer
-PaymentTermsCustomer=Payment Terms - Customer
-PaymentTypeSupplier=Payment Type - Vendor
-PaymentTermsSupplier=Payment Term - Vendor
-MulticurrencyUsed=Use Multicurrency
+PaymentTypeCustomer=Betalingstype - Kunde
+PaymentTermsCustomer=Betalingsbetingelser - Kunde
+PaymentTypeSupplier=Betalingstype - Leverandør
+PaymentTermsSupplier=Betalingsbetingelser - Leverandør
+MulticurrencyUsed=Bruk flere valutaer
 MulticurrencyCurrency=Valuta
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 8b7495419e7..fe4a7d1165e 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -11,7 +11,7 @@ FeatureIsSupportedInInOutModeOnly=Funksjonen er bare tilgjengelig i KREDIT-DEBET
 VATReportBuildWithOptionDefinedInModule=Beløp som vises her er beregnet ved hjelp av regler definert av Skattmodul-oppsett.
 LTReportBuildWithOptionDefinedInModule=Beløpene vist her er kalkulert ved hjelp av reglene som er definert i Firmaoppsett
 Param=Oppsett
-RemainingAmountPayment=Amount payment remaining:
+RemainingAmountPayment=Resterende beløp:
 Account=Konto
 Accountparent=Foreldrekonto
 Accountsparent=Foreldrekontoer
@@ -80,9 +80,8 @@ AddSocialContribution=Legg til sosiale utgifter eller skatter
 ContributionsToPay=Skatter og avgifter som skal betales
 AccountancyTreasuryArea=Fakturerings- og betalingsområde
 NewPayment=Ny betaling
-Payments=Betalinger
 PaymentCustomerInvoice=Kundefaktura-betaling
-PaymentSupplierInvoice=vendor invoice payment
+PaymentSupplierInvoice=betaling av leverandørfaktura 
 PaymentSocialContribution=Skatter- og avgiftsbetaling
 PaymentVat=MVA betaling
 ListPayment=Liste over betalinger
@@ -113,7 +112,7 @@ ShowVatPayment=Vis MVA betaling
 TotalToPay=Sum å betale
 BalanceVisibilityDependsOnSortAndFilters=Balanse er synlig i denne listen bare hvis tabellen er sortert stigende etter %s og filtrert for en bankkonto
 CustomerAccountancyCode=Kunde-regnskapskode
-SupplierAccountancyCode=vendor accounting code
+SupplierAccountancyCode=leverandørens regnskapskode
 CustomerAccountancyCodeShort=Kundens regnskapskode
 SupplierAccountancyCodeShort=Leverandørens regnskapskode
 AccountNumber=Kontonummer
@@ -132,7 +131,7 @@ NewCheckDeposit=Nytt sjekkinnskudd
 NewCheckDepositOn=Lag kvittering for innskudd på konto: %s
 NoWaitingChecks=Ingen sjekker venter på å bli satt inn.
 DateChequeReceived=Dato for sjekkmottak
-NbOfCheques=No. of checks
+NbOfCheques=Antall sjekker
 PaySocialContribution=Betal skatt/avgift
 ConfirmPaySocialContribution=Er du sikker på at du vil klassifisere denne skatten/avgiften som betalt?
 DeleteSocialContribution=Slett en skatt eller avgift
@@ -160,8 +159,8 @@ SeeReportInBookkeepingMode=Se <b> %sRegnskapsrapport%s </b> for en beregning på
 RulesAmountWithTaxIncluded=- Viste beløp er inkludert alle avgifter
 RulesResultDue=- Inkluderer utestående fakturaer, utgifter, MVA og donasjoner, enten de er betalt eller ikke. Inkluderer også utbetalt lønn.<br> - Basert på valideringsdato for fakturaer og MVA og på forfallsdato for utgifter. For lønn definert med Lønn-modulen, benyttes utbetalingstidspunktet.
 RulesResultInOut=- Inkluderer betalinger gjort mot fakturaer, utgifter, MVA og lønn. <br> Basert på betalingsdato. Donasjonsdato for donasjoner
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
-RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
+RulesCADue=- Inkluderer kundens forfalte fakturaer, enten de er betalt eller ikke.<br> Basert på valideringsdatoen til disse fakturaene.<br>
+RulesCAIn=- Inkluderer alle betalinger av fakturaer mottatt fra klienter. <br> - Er basert på betalingsdatoen for disse fakturaene <br>
 RulesCATotalSaleJournal=Den inkluderer alle kredittlinjer fra salgsjournalen.
 RulesAmountOnInOutBookkeepingRecord=Inkluderer poster i hovedboken med regnskapskontoer som har gruppen "UTGIFTER" eller "INNTEKT"
 RulesResultBookkeepingPredefined=Inkluderer poster i hovedboken med regnskapskontoer som har gruppen "UTGIFTER" eller "INNTEKT"
@@ -205,7 +204,6 @@ SellsJournal=Salgsjournal
 PurchasesJournal=Kjøpsjournal
 DescSellsJournal=Salgsjournal
 DescPurchasesJournal=Kjøpsjournal
-InvoiceRef=Faktura ref.
 CodeNotDef=Ikke definert
 WarningDepositsNotIncluded=Nedbetalingsfakturaer er ikke inkludert i denne versjonen med denne regnskapsmodulen.
 DatePaymentTermCantBeLowerThanObjectDate=Betalingsdato kan ikke være før objektdato
@@ -220,7 +218,7 @@ LinkedOrder=Lenke til ordre
 Mode1=Metode 1
 Mode2=Metode 2
 CalculationRuleDesc=For å beregne total MVA, er det to metoder:<br>Metode 1 er avrunding på hver linje, og deretter summere dem.<br>Metode 2 er å summere alle på hver linje, og deretter avrunde resultatet.<br>Endelig resultat kan variere noen få kroner. Standardmodusen er modusen <b>%s</b>.
-CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
+CalculationRuleDescSupplier=Velg utregningsmetode som gir leverandør forventet resultat
 TurnoverPerProductInCommitmentAccountingNotRelevant=Rapporten om omsetning samlet per produkt er ikke tilgjengelig. Denne rapporten er kun tilgjengelig for omsetning fakturert.
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Rapporten om omsetning samlet per MVA-sats er ikke tilgjengelig. Denne rapporten er kun tilgjengelig for omsetning fakturert.
 CalculationMode=Kalkuleringsmodus
@@ -229,10 +227,10 @@ ACCOUNTING_VAT_SOLD_ACCOUNT=Regnskapskonto som standard for MVA ved salg (brukt
 ACCOUNTING_VAT_BUY_ACCOUNT=Regnskapskonto som standard for MVA ved kjøp (brukt hvis ikke definert i MVA-ordbokoppsett)
 ACCOUNTING_VAT_PAY_ACCOUNT=Standard regnskapskonto for MVA.betaling
 ACCOUNTING_ACCOUNT_CUSTOMER=Regnskapskonto brukt til kunde-tredjepart
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Den dedikerte regnskapskontoen som er definert på tredjepartskort, vil kun bli brukt til subledger. Denne vil bli brukt til hovedboken og som standardverdi av Subledger-regnskap hvis dedikert kundekonto på tredjepart ikke er definert.
 ACCOUNTING_ACCOUNT_SUPPLIER=Regnskapskonto brukt til leverandør-tredjepart
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
-ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Den dedikerte regnskapskonto som er definert på tredjepartskort, vil kun bli brukt til subledger. Denne vil bli brukt til hovedboken og som standardverdi for Subledger-regnskap hvis dedikert leverandørkonto på tredjepart ikke er definert.
+ConfirmCloneTax=Bekreft kloning av skatt/avgiftsbetaling
 CloneTaxForNextMonth=Klon for neste måned
 SimpleReport=Enkel rapport
 AddExtraReport=Ekstrarapporter (legg til internasjonale og nasjonale kunderapporter)
@@ -247,7 +245,7 @@ ErrorBankAccountNotFound=Feil: Bankkonto ikke funnet
 FiscalPeriod=Regnskapsperiode
 ListSocialContributionAssociatedProject=Liste over sosiale bidrag knyttet til prosjektet
 DeleteFromCat=Fjern fra regnskapsgruppe
-AccountingAffectation=Accounting assignment
+AccountingAffectation=Regnskapsoppgave
 LastDayTaxIsRelatedTo=Siste dag i perioden MVA er knyttet til
 VATDue=MVA innkrevd
 ClaimedForThisPeriod=Innkrevd for perioden
diff --git a/htdocs/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang
index 64373d223b4..fef5cf9f5ad 100644
--- a/htdocs/langs/nb_NO/contracts.lang
+++ b/htdocs/langs/nb_NO/contracts.lang
@@ -38,7 +38,7 @@ ConfirmValidateContract=Er du sikker på at du vil validere denne kontrakten med
 ConfirmActivateAllOnContract=Dette åpner alle tjenester (ikke aktiv ennå). Er du sikker på at du vil åpne alle tjenestene?
 ConfirmCloseContract=Dette vil lukke alle tjenester (aktive eller ikke). Er du sikker på at du vil lukke denne kontrakten?
 ConfirmCloseService=Er du sikker på at du vil lukke denne tjenesten med dato <b>%s</b>?
-ValidateAContract=Godkjenn en kontrakt
+ValidateAContract=Valider en kontrakt
 ActivateService=Aktiver tjeneste
 ConfirmActivateService=Er du sikker på at du vil aktivere denne tjenesten med dato <b>%s</b>?
 RefContract=Kontraktsreferanse
@@ -49,8 +49,8 @@ ListOfInactiveServices=Liste over ikke aktive tjenester
 ListOfExpiredServices=Liste over utløpte, aktive tjenester
 ListOfClosedServices=Liste over lukkede tjenester
 ListOfRunningServices=Overikt over løpende tjenster
-NotActivatedServices=Ikke aktive tjenester (blant godkjente kontrakter)
-BoardNotActivatedServices=Tjenester til aktivering blant godkjente kontrakter
+NotActivatedServices=Ikke aktive tjenester (blant validerte kontrakter)
+BoardNotActivatedServices=Tjenester til aktivering blant validerte kontrakter
 LastContracts=Siste %s kontrakter
 LastModifiedServices=Siste %s endrede tjenester
 ContractStartDate=Startdato
@@ -64,7 +64,8 @@ DateStartRealShort=Virkelig startdato
 DateEndReal=Virkelig sluttdato
 DateEndRealShort=Virkelig sluttdato
 CloseService=Lukk tjeneste
-BoardRunningServices=Utgåtte, løpende tjenester
+BoardRunningServices=Tjenester som kjører
+BoardExpiredServices=Tjenester utløpt
 ServiceStatus=Tjenestestatus
 DraftContracts=Kontraktskladder
 CloseRefusedBecauseOneServiceActive=Kontrakten kan ikke lukkes fordi det er minst en åpen tjeneste på den
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index b208d4164af..3b286905bdd 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -4,7 +4,7 @@
 NoErrorCommitIsDone=Ingen feil
 # Errors
 ErrorButCommitIsDone=Valider selv om feil ble funnet
-ErrorBadEMail=Email %s is wrong
+ErrorBadEMail=E-post %s er feil
 ErrorBadUrl=Url %s er feil
 ErrorBadValueForParamNotAString=Feil parameterverdi. Dette skjer vanligvis når en oversettelse mangler.
 ErrorLoginAlreadyExists=brukernavnet %s eksisterer allerede.
@@ -23,14 +23,14 @@ ErrorFailToGenerateFile=Kunne ikke generere filen '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Denne kontaktperson er allerede definert for denne typen.
 ErrorCashAccountAcceptsOnlyCashMoney=Dette er en kassekonto, så det er kun mulig med kontantinnskudd på den.
 ErrorFromToAccountsMustDiffers=Kilde- og målkonto må være forskjellig.
-ErrorBadThirdPartyName=Bad value for third-party name
+ErrorBadThirdPartyName=Feil verdi for tredjepartsnavn
 ErrorProdIdIsMandatory=%s er obligatorisk
 ErrorBadCustomerCodeSyntax=Ugyldig syntaks for kundekode
-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.
+ErrorBadBarCodeSyntax=Feil syntaks for strekkode. Du kan ha satt en feil strekkodetype eller du kan ha definert en strekkode-maske som ikke passer verdien du har skannet
 ErrorCustomerCodeRequired=Kundekode påkrevet
-ErrorBarCodeRequired=Barcode required
+ErrorBarCodeRequired=Strekkode kreves
 ErrorCustomerCodeAlreadyUsed=Kundekoden er allerede benyttet
-ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorBarCodeAlreadyUsed=Strekkode er allerede brukt
 ErrorPrefixRequired=Prefiks påkrevet
 ErrorBadSupplierCodeSyntax=Feil syntaks for leverandørkode
 ErrorSupplierCodeRequired=Leverandørkode kreves
@@ -42,7 +42,7 @@ ErrorBadDateFormat=Verdien '%s' har feil datoformat
 ErrorWrongDate=Dato er feil!
 ErrorFailedToWriteInDir=Kan ikke skrive til mappen %s
 ErrorFoundBadEmailInFile=Feil e-postsyntaks for %s linjer i filen (for eksempel linje %s med e-post=%s)
-ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
+ErrorUserCannotBeDelete=Brukeren kan ikke slettes. Kanskje det er knyttet til Dolibarr-enheter.
 ErrorFieldsRequired=Noen påkrevde felt er ikke fylt ut.
 ErrorSubjectIsRequired=Epost-emnet er påkrevd
 ErrorFailedToCreateDir=Kunne ikke opprette mappen. Kontroller at webserverbrukeren har skriverettigheter i dokumentmappen i Dolibarr. Hvis <b>safe_mode</b> er akivert i PHP, sjekk at webserveren eier eller er med i gruppen(eller bruker) for Dolibarr php-filer.
@@ -65,39 +65,39 @@ ErrorNoValueForSelectType=Sett inn verdi for å velge liste
 ErrorNoValueForCheckBoxType=Sett inn verdi for å velge avkrysningsboks-liste
 ErrorNoValueForRadioType=Sett i verdi for radioknapp-liste
 ErrorBadFormatValueList=Listeverdien kan ikke ha mer enn ett komma: <u>%s</u>, men må ha minst ett: nøkkel,verdi
-ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
-ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorFieldCanNotContainSpecialCharacters=Feltet <b> %s </b> må ikke inneholde spesialtegn.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Feltet <b> %s </b> må ikke inneholde spesialtegn eller store bokstaver, og kan ikke inneholde bare tall.
+ErrorFieldMustHaveXChar=Feltet <b> %s </b> må ha minst %s tegn.
 ErrorNoAccountancyModuleLoaded=Ingen regnskapsmodul aktivert
 ErrorExportDuplicateProfil=Profilnavnet til dette eksport-oppsettet finnes allerede
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP oppsett er ikke komplett.
 ErrorLDAPMakeManualTest=En .ldif fil er opprettet i mappen %s. Prøv å lese den manuelt for å se mer informasjon om feil.
-ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
+ErrorCantSaveADoneUserWithZeroPercentage=Kan ikke lagre en handling med "status ikke startet" hvis feltet "ferdig innen" også er fylt ut.
 ErrorRefAlreadyExists=Ref bruket til oppretting finnes allerede.
 ErrorPleaseTypeBankTransactionReportName=Vennligst skriv inn kontoutskriftsnavnet der oppføringen skal rapporteres (Format YYYYMM eller YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some child records.
+ErrorRecordHasChildren=Kunne ikke slette posten fordi den har noen under-oppføringer.
 ErrorRecordHasAtLeastOneChildOfType=Objektet har minst under-objekt av typen %s
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
+ErrorRecordIsUsedCantDelete=Kan ikke slette posten. Den er allerede brukt eller inkludert i et annet objekt.
 ErrorModuleRequireJavascript=Javascript må være aktivert for å kunne bruke denne funksjonen. For å aktivere/deaktivere Javascript, gå til menyen Hjem-> Oppsett-> Visning.
 ErrorPasswordsMustMatch=Passordene må samsvare med hverandre
-ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
-ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
-ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
-ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
-ErrorsOnXLines=%s errors found
+ErrorContactEMail=En teknisk feil oppsto. Vennligst kontakt administrator på e-post <b>%s</b> og oppgi feilkoden <b>%s</b> i meldingen, eller legg til en skjermdump av denne siden.
+ErrorWrongValueForField=Felt <b> %s </b>: '<b> %s </b>' stemmer ikke overens med regexregel <b> %s </b>
+ErrorFieldValueNotIn=Felt <b> %s </b>: '<b> %s </b>' er ikke en verdi funnet i felt <b> %s </b> av <b> %s </b>
+ErrorFieldRefNotIn=Felt <b> %s </b>: '<b> %s </b>' er ikke en <b> %s </b> eksisterende ref
+ErrorsOnXLines=%s feil funnet
 ErrorFileIsInfectedWithAVirus=Antivirus-programmet var ikke i stand til å validere filen (filen kan være infisert av et virus)
 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=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
+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.
 ErrorBadMask=Feil på maske
 ErrorBadMaskFailedToLocatePosOfSequence=Feil! Maske uten sekvensnummer
 ErrorBadMaskBadRazMonth=Feil, ikke korrekt tilbakestillingsverdi
-ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
+ErrorMaxNumberReachForThisMask=Maksimum antall oppnådd for denne masken
 ErrorCounterMustHaveMoreThan3Digits=Teller må ha mer enn 3 siffer
 ErrorSelectAtLeastOne=Feil! Velg minst én oppføring.
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorDeleteNotPossibleLineIsConsolidated=Sletting ikke mulig fordi posten er knyttet til en banktransaksjon som er avstemt
 ErrorProdIdAlreadyExist=%s er tilordnet en annen tredjepart
 ErrorFailedToSendPassword=Klarte ikke å sende passord
 ErrorFailedToLoadRSSFile=Klarer ikke hente RSS-feed. Prøv å legge konstant MAIN_SIMPLEXMLLOAD_DEBUG hvis feilmeldinger ikke gir nok informasjon.
@@ -117,7 +117,7 @@ ErrorLoginDoesNotExists=Bruker med loginn <b>%s</b> kunne ikke bli funnet.
 ErrorLoginHasNoEmail=Denne brukeren har ingen e-postadresse. Prosess avbrutt.
 ErrorBadValueForCode=Feil verdi for sikkerhetskode. Prøv igjen med ny verdi ...
 ErrorBothFieldCantBeNegative=Feltene %s og %s kan ikke begge være negative
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Felt <strong> %s </strong> kan ikke være negativt på denne typen faktura. Hvis du vil legge til en rabattlinje, opprett rabatten først med link %s på skjermen og bruk den på fakturaen. Du kan også be admin om å angi alternativet FACTURE_ENABLE_NEGATIVE_LINES til 1 for å tillate gammel oppførsel.
 ErrorQtyForCustomerInvoiceCantBeNegative=Kvantum på linjer i kundefakturaer kan ikke være negativ
 ErrorWebServerUserHasNotPermission=Brukerkonto <b>%s</b> som brukes til å kjøre web-server har ikke tillatelse til det
 ErrorNoActivatedBarcode=Ingen strekkodetype aktivert
@@ -141,7 +141,7 @@ ErrorBadFormat=Feil format!
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Feil, dette medlemmet er ennå ikke knyttet til noen tredjepart. Koble medlemmet til en eksisterende tredjepart eller opprett en ny tredjepart før du oppretter abonnement med faktura.
 ErrorThereIsSomeDeliveries=Feil! Det er noen leveringer knyttet til denne forsendelsen. Sletting nektet
 ErrorCantDeletePaymentReconciliated=Kan ikke slette en betaling etter at det er blitt generert en bankoppføring som er blitt avstemt
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
+ErrorCantDeletePaymentSharedWithPayedInvoice=Kan ikke slette en betaling delt med minst en faktura med status Betalt
 ErrorPriceExpression1=Kan ikke tildele til konstant '%s'
 ErrorPriceExpression2=Kan ikke omdefinere innebygd funksjon '%s'
 ErrorPriceExpression3=Udefinert variabel '%s' i funksjon
@@ -150,7 +150,7 @@ ErrorPriceExpression5=Uventet '%s'
 ErrorPriceExpression6=Feil antall argumenter (%s er gitt, %s er forventet)
 ErrorPriceExpression8=Uventet operator '%s'
 ErrorPriceExpression9=En uventet feil oppsto
-ErrorPriceExpression10=Operator '%s' lacks operand
+ErrorPriceExpression10=Operator '%s' mangler operand
 ErrorPriceExpression11=Forventet '%s'
 ErrorPriceExpression14=Delt på null
 ErrorPriceExpression17=Udefinert variabel '%s'
@@ -174,10 +174,10 @@ ErrorGlobalVariableUpdater4=SOAP klienten feilet med meldingen '%s'
 ErrorGlobalVariableUpdater5=Ingen global variabel valgt
 ErrorFieldMustBeANumeric=Feltet <b>%s</b> må være en numerisk verdi
 ErrorMandatoryParametersNotProvided=Obligatorisk(e) parametre ikke angitt
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
+ErrorOppStatusRequiredIfAmount=Sett inn et estimert beløp for denne muligheten. Status må også settes
 ErrorFailedToLoadModuleDescriptorForXXX=Kunne ikke laste moduldeskriptorklassen for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
-ErrorSavingChanges=An error has occurred when saving the changes
+ErrorSavingChanges=En feil oppsto under lagring av endringer
 ErrorWarehouseRequiredIntoShipmentLine=Lager er obligatorisk for å kunne levere
 ErrorFileMustHaveFormat=Filen må ha formatet %s
 ErrorSupplierCountryIsNotDefined=Land for denne leverandøren er ikke definert. Rett dette først.
@@ -204,31 +204,32 @@ ErrorTooManyErrorsProcessStopped=For mange feil. Prosessen ble stoppet.
 ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Massvalidering er ikke mulig når alternativet for å øke/redusere lager er satt til denne handlingen (du må validere en etter en slik at du kan definere varehuset for å øke/redusere)
 ErrorObjectMustHaveStatusDraftToBeValidated=Objekt %s må ha status 'Kladd' for å kunne valideres.
 ErrorObjectMustHaveLinesToBeValidated=Objekt %s må ha linjer for å kunne valideres.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Kun godkjente fakturaer kan sendes ved hjelp av massehendelsen "Send via e-post".
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Kun validerte fakturaer kan sendes ved hjelp av massehendelsen "Send via e-post".
 ErrorChooseBetweenFreeEntryOrPredefinedProduct=Du må velge om artikkelen er et forhåndsdefinert produkt eller ikke
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Rabatten du prøver å legge til er større enn restbeløp. Del rabatten i 2 mindre rabatter.
 ErrorFileNotFoundWithSharedLink=Filen ble ikke funnet. Kanskje delingsnøkkelen ble endret eller filen ble fjernet nylig.
 ErrorProductBarCodeAlreadyExists=Vare-strekkoden %s finnes allerede i en annen produktreferanse.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Vær også oppmerksom på at bruk av virtuelle varer som har automatisk økning/reduksjon av undervarer, ikke er mulig når minst en undervare (eller undervare av undervarer) trenger et serienummer/lotnummer.
 ErrorDescRequiredForFreeProductLines=Beskrivelse er obligatorisk for linjer med gratis vare
-ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
-ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
-ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
-ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorAPageWithThisNameOrAliasAlreadyExists=Siden/containeren <strong> %s </strong> har samme navn eller alternativt alias som den du prøver å bruke
+ErrorDuringChartLoad=Feil ved lasting av kart over kontoer. Hvis noen kontoer ikke ble lastet, kan du fremdeles angi dem manuelt.
+ErrorBadSyntaxForParamKeyForContent=Feil syntaks for parameter keyforcontent. Må ha en verdi som starter med %s eller %s
+ErrorVariableKeyForContentMustBeSet=Feil, konstanten med navn %s (med tekstinnhold som skal vises) eller %s (med ekstern url til visning) må settes.
+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
 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=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningMandatorySetupNotComplete=Klikk her for å sette opp obligatoriske parametere
+WarningEnableYourModulesApplications=Klikk her for å aktivere modulene og applikasjonene dine
 WarningSafeModeOnCheckExecDir=Advarsel, PHP alternativet <b>safe_mode</b> er på så kommandere må lagres i en mappe erklært av php parameter <b>safe_mode_exec_dir.</b>
 WarningBookmarkAlreadyExists=Et bokmerke med denne tittelen eller denne URL'en eksisterer fra før.
 WarningPassIsEmpty=Advarsel: databasepassordet er tomt. Dette er en sikkerhetsrisiko. Du bør passordbeskytte databasen og endre filen conf.php
 WarningConfFileMustBeReadOnly=Advarsel, config-filen din <b>(htdocs / conf / conf.php)</b> kan overskrives av webserveren. Dette er et alvorlig sikkerhetshull. Endre tillatelser på filen til skrivebeskyttet modus for operativsystem-brukeren brukt av web-server. Hvis du bruker Windows og FAT format for disken din, må du vite at dette filsystemet ikke tillater å legge til tillatelser på filen, så du kan ikke være helt sikker.
 WarningsOnXLines=Advarsler på <b>%s</b> kildelinje(r)
-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).
+WarningNoDocumentModelActivated=Ingen modell for dokumentgenerering har blitt aktivert. En modell vil bli valgt som standard til du sjekker moduloppsettet.
+WarningLockFileDoesNotExists=Advarsel, når installasjonen er ferdig, må du deaktivere installasjons- / overføringsverktøyene ved å legge til en fil <b> install.lock </b> i katalogen <b> %s </b>. Mangel  av denne filen er en alvorlig sikkerhetsrisiko.
+WarningUntilDirRemoved=Alle sikkerhetsadvarsler (bare synlige for adminbrukere) forblir aktive så lenge sårbarheten er til stede (eller den konstante MAIN_REMOVE_INSTALL_WARNING er lagt til i Oppsett-> Annet oppsett).
 WarningCloseAlways=Advarsel! Avsluttes selv om beløpet er forskjellig mellom kilde- og målelementer. Aktiver denne funksjonen med forsiktighet.
 WarningUsingThisBoxSlowDown=Advarsel! Ved å bruke denne boksen vil du gjøre alle sider som bruker den, tregere.
 WarningClickToDialUserSetupNotComplete=Oppsett av KlikkForÅRinge informasjon for din bruker er ikke komplett (Se fanen KlikkForÅRinge på ditt bruker-kort)
@@ -238,6 +239,6 @@ WarningTooManyDataPleaseUseMoreFilters=For mange data (mer enn %s linjer). Bruk
 WarningSomeLinesWithNullHourlyRate=Noen tider ble registrert av noen brukere mens deres timepris ikke var definert. En verdi på 0 %s pr. time ble brukt, men dette kan føre til feil verdivurdering av tidsbruk.
 WarningYourLoginWasModifiedPleaseLogin=Din innlogging er blitt endret. Av sikkerhetsgrunner må du logge inn på nytt før du kan gjøre noe.
 WarningAnEntryAlreadyExistForTransKey=En oppføring eksisterer allerede for oversettelsesnøkkel for dette språket
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
+WarningNumberOfRecipientIsRestrictedInMassAction=Advarsel, antall forskjellige mottakere er begrenset til <b> %s </b> ved bruk av massehandlinger på lister
 WarningDateOfLineMustBeInExpenseReportRange=Advarsel, datoen for linjen ligger utenfor tiden til utgiftsrapporten
-WarningProjectClosed=Project is closed. You must re-open it first.
+WarningProjectClosed=Prosjektet er stengt. Du må gjenåpne det først.
diff --git a/htdocs/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang
index 100940fadc4..302e8431c99 100644
--- a/htdocs/langs/nb_NO/holiday.lang
+++ b/htdocs/langs/nb_NO/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leave
-CPTitreMenu=Leave
+Holidays=Permisjon
+CPTitreMenu=Permisjon
 MenuReportMonth=Månedlig uttalelse
 MenuAddCP=Ny feriesøknad
-NotActiveModCP=You must enable the module Leave to view this page.
+NotActiveModCP=Du må aktivere modulen Permisjon for å vise denne siden.
 AddCP=Opprett feriesøknad
 DateDebCP=Startdato
 DateFinCP=Sluttdato
@@ -15,18 +15,18 @@ ApprovedCP=Godkjent
 CancelCP=Kansellert
 RefuseCP=Nektet
 ValidatorCP=Godkjenner
-ListeCP=List of leave
+ListeCP=Liste over permisjoner
 LeaveId=Ferie-ID
 ReviewedByCP=Vil bli godkjent av
 UserForApprovalID=ID til godkjenningsbruker
-UserForApprovalFirstname=First name of approval user
-UserForApprovalLastname=Last name of approval user
+UserForApprovalFirstname=Fornavn på godkjenningsbruker
+UserForApprovalLastname=Etternavn av godkjenningsbruker
 UserForApprovalLogin=Innlogging av godkjenningsbruker
 DescCP=Beskrivelse
 SendRequestCP=Opprett feriesøknad
 DelayToRequestCP=Søknader må opprettes minst <b>%s dag(er)</b> før ferien skal starte
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+MenuConfCP=Permisjonsbalanse
+SoldeCPUser=Permisjonssaldo er <b> %s </b> dager.
 ErrorEndDateCP=Sluttdato må være senere en startdato
 ErrorSQLCreateCP=En SQL feil oppsto under opprettelse:
 ErrorIDFicheCP=En feil oppsto. Feriesøknaden finnes ikke
@@ -101,8 +101,8 @@ LEAVE_SICK=Sykefravær
 LEAVE_OTHER=Annen ferie
 LEAVE_PAID_FR=Betalt ferie
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+LastUpdateCP=Siste automatisk oppdatering av permisjon
+MonthOfLastMonthlyUpdate=Måned for siste automatiske oppdatering av permisjon
 UpdateConfCPOK=Vellykket oppdatering.
 Module27130Name= Håndtering av feriesøknader
 Module27130Desc= Håndtering av feriesøknader
@@ -112,18 +112,19 @@ NoticePeriod=Oppsigelsestid
 HolidaysToValidate=Valider feriesøknader
 HolidaysToValidateBody=Under er en feriesøknad for validering
 HolidaysToValidateDelay=Denne ferien avvikles innen %s dager
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysToValidateAlertSolde=Brukeren som gjorde denne permisjonsforespørselen, har ikke nok tilgjengelige dager.
 HolidaysValidated=Validerte feriesøknader
 HolidaysValidatedBody=Feriesøknaden din for perioden %s til %s er blitt validert
 HolidaysRefused=Søknad avvist
-HolidaysRefusedBody=Feriesøknaden din for perioden %s til %s er blitt avvist med følgende årsak:
+HolidaysRefusedBody=Permisjonsforespørselen din for %s til %s har blitt avvist av følgende grunn:
 HolidaysCanceled=Kansellert feriesøknad
 HolidaysCanceledBody=Feriesøknaden din for perioden %s til %s er blitt kansellert.
 FollowedByACounter=1: Denne typen ferie må være etterfulgt av en teller. Telleren økes automatisk eller manuelt, og når ferieforespørselen blir validert, blir den redusert. <br>0: Ikke etterfulgt av en teller
 NoLeaveWithCounterDefined=Det er ikke definert noen ferietyper som trenger en teller
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Holiday
-HolidaysNumberingModules=Leave requests numbering models
-TemplatePDFHolidays=Template for leave requests PDF
-FreeLegalTextOnHolidays=Free text on PDF
-WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+GoIntoDictionaryHolidayTypes=Gå til <strong> Hjem - Oppsett - Ordbøker - Type permisjon </strong> for å sette opp forskjellige permisjonstyper.
+HolidaySetup=Oppsett av modulen Ferie
+HolidaysNumberingModules=Nummereringsmodeller for permisjonsforespørsler
+TemplatePDFHolidays=PDF-mal for permisjonsforespørsler 
+FreeLegalTextOnHolidays=Fritekst på PDF
+WatermarkOnDraftHolidayCards=Vannmerke på permisjonsutkast 
+HolidaysToApprove=Ferier til godkjenning
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index 09448a28617..e0ab0167659 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -15,10 +15,12 @@ MailToUsers=Til bruker(e)
 MailCC=Kopi til
 MailToCCUsers=Kopier til brukere(e)
 MailCCC=Cached kopi til
-MailTopic=Email topic
+MailTopic=E-post tema
 MailText=Meldingstekst
 MailFile=Filvedlegg
 MailMessage=E-mail meldingstekst
+SubjectNotIn=Ikke i emne
+BodyNotIn=Ikke i body
 ShowEMailing=Vis utsendelse
 ListOfEMailings=Oversikt over utsendelser
 NewMailing=Ny utsendelse
@@ -45,7 +47,7 @@ MailingStatusReadAndUnsubscribe=Les og meld ut
 ErrorMailRecipientIsEmpty=E-postmottager er ikke oppgitt
 WarningNoEMailsAdded=Ingen ny e-postadresse å legge til mottagerlisten.
 ConfirmValidMailing=Er du sikker på at du vil validere denne epostutsendelsen?
-ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
+ConfirmResetMailing=Advarsel, ved å re-initialisere e-postutsendelsen <b>%s</b>, vil du kunne sende denne e-posten på nytt i en masseepost. Er du sikker på at du vil gjøre dette?
 ConfirmDeleteMailing=Er du sikker på at du vil slette denne e-postutsendelsen?
 NbOfUniqueEMails=Antall unike e-postadresser
 NbOfEMails=Antall e-postadresser
@@ -57,7 +59,7 @@ YouCanAddYourOwnPredefindedListHere=Les mer om hvordan du lager din egen utvalgs
 EMailTestSubstitutionReplacedByGenericValues=Når du er i testmodus blir flettefelt erstattet med generiske verdier
 MailingAddFile=Legg ved denne filen
 NoAttachedFiles=Ingen vedlagte filer
-BadEMail=Bad value for Email
+BadEMail=Feil verdi for e-post
 ConfirmCloneEMailing=Er du sikker på at du vil klone denne epostutsendelsen?
 CloneContent=Klon melding
 CloneReceivers=Klon mottakere
@@ -67,22 +69,22 @@ SentTo=Sendt til <b>%s</b>
 MailingStatusRead=Les
 YourMailUnsubcribeOK=E-postadressen <b>%s</b> er korrekt avmeldt fra adresselisten
 ActivateCheckReadKey=Nøkkel brukt til å kryptere nettadressen som brukes til "Les kvittering" og "Avmeld"-funksjonen
-EMailSentToNRecipients=Email sent to %s recipients.
-EMailSentForNElements=Email sent for %s elements.
+EMailSentToNRecipients=E-post sendt til %s mottakere.
+EMailSentForNElements=E-post sendt for %s elementer.
 XTargetsAdded=<b>%s</b> mottakere lagt til i målliste
 OnlyPDFattachmentSupported=Hvis PDF-dokumentene allerede var generert for objektene som skal sendes, blir de vedlagt e-post. Hvis ikke, vil ingen e-post sendes (merk også at bare pdf-dokumenter støttes som vedlegg i masseutsendelse i denne versjonen).
 AllRecipientSelected=Mottakerne av %s-posten valgt (hvis e-posten er kjent).
 GroupEmails=Gruppe e-postmeldinger
 OneEmailPerRecipient=Én e-post per mottaker (som standard, en e-post per post valgt)
 WarningIfYouCheckOneRecipientPerEmail=Advarsel, hvis du merker av denne boksen, betyr det at bare en e-post vil bli sendt for flere forskjellige valgte poster, så hvis meldingen inneholder erstatningsvariabler som refererer til data i en post, blir det ikke mulig å erstatte dem.
-ResultOfMailSending=Result of mass Email sending
+ResultOfMailSending=Resultat av massesending av e-post
 NbSelected=Antall valgt
 NbIgnored=Antall ignorert
 NbSent=Antall sendt
 SentXXXmessages=%s melding(er) sendt.
 ConfirmUnvalidateEmailing=Er du sikker på at du vil endre status på epost <b>%s</b> til kladd?
 MailingModuleDescContactsWithThirdpartyFilter=Kontakt med kundefilter
-MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
+MailingModuleDescContactsByCompanyCategory=Kontakter etter tredjepartskategori
 MailingModuleDescContactsByCategory=Kontakter etter kategorier
 MailingModuleDescContactsByFunction=Kontakter etter stilling
 MailingModuleDescEmailsFromFile=E-poster fra fil
@@ -99,7 +101,7 @@ MailingArea=Område for e-postutsendelser
 LastMailings=Siste %s epostutsendelser
 TargetsStatistics=Statistikk over målgruppe
 NbOfCompaniesContacts=Unike kontakter/adresser
-MailNoChangePossible=Du kan ikke endre mottagere når utsendelsen er godkjent
+MailNoChangePossible=Du kan ikke endre mottagere når utsendelsen er validert
 SearchAMailing=Finn utsendelse
 SendMailing=Send utesendelse
 SentBy=Sendt av
@@ -118,8 +120,8 @@ YouCanUseCommaSeparatorForSeveralRecipients=Du kan bruke <b>komma</b> som skille
 TagCheckMail=Spor post åpning
 TagUnsubscribe=Avmeldingslink
 TagSignature=Signatur for sender
-EMailRecipient=Recipient Email
-TagMailtoEmail=Recipient Email (including html "mailto:" link)
+EMailRecipient=Mottaker e-post
+TagMailtoEmail=Mottakerepost (inkludert html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Ingen e-post sendt. Feil på avsender eller mottaker. Verifiser brukerprofil
 # Module Notifications
 Notifications=Varsler
@@ -145,7 +147,7 @@ AdvTgtMaxVal=Maksimumsverdi
 AdvTgtSearchDtHelp=Bruk intervall for å velge datoverdi
 AdvTgtStartDt=Startdato
 AdvTgtEndDt=Sluttdato
-AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
+AdvTgtTypeOfIncudeHelp=Mål-epost til tredjepart og epost for kontakt fra tredjepart, eller bare tredjeparts epost eller bare kontakt epost
 AdvTgtTypeOfIncude=Type målrettet e-post
 AdvTgtContactHelp=Brukes bare hvis du sender kontakt til "Type målrettet e-post"
 AddAll=Legg til alle
@@ -165,4 +167,4 @@ InGoingEmailSetup=Oppsett for innkommende epost
 OutGoingEmailSetupForEmailing=Oppsett av utgående e-post (for masse-e-post)
 DefaultOutgoingEmailSetup=Standard utgående e-postoppsett
 Information=Informasjon
-ContactsWithThirdpartyFilter=Contacts with third-party filter
+ContactsWithThirdpartyFilter=Kontakter med tredjepartsfilter
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index a965444317f..2eb11b9a9d1 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -50,21 +50,21 @@ ErrorFailedToSendMail=Klarte ikke å sende epost (avsender=%s, mottager=%s)
 ErrorFileNotUploaded=Filen ble ikke lastet oppp. Sjekk at den ikke er større en maksimumsgrensen, at det er plass igjen på disken og at det ikke ligger en fil med samme navn i katalogen.
 ErrorInternalErrorDetected=Feil oppdaget 
 ErrorWrongHostParameter=Feil vertsparameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
+ErrorYourCountryIsNotDefined=Ditt land er ikke definert. Gå til Hjem-Oppsett-Rediger og legg inn skjemaet på nytt.
+ErrorRecordIsUsedByChild=Kunne ikke slette denne posten. Denne posten brukes av minst en under-post.
 ErrorWrongValue=Feil verdi
 ErrorWrongValueForParameterX=Feil verdi for parameter %s
 ErrorNoRequestInError=Ingen forepørsel i feil
-ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
+ErrorServiceUnavailableTryLater=Tjenesten er ikke tilgjengelig for øyeblikket. Prøv igjen senere.
 ErrorDuplicateField=Duplikate verdier i unik felttype
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
+ErrorSomeErrorWereFoundRollbackIsDone=Noen feil ble funnet. Endringer har blitt rullet tilbake.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> er ikke definert i konfigurasjonsfilen <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Fant ikke brukeren <b>%s</b> i databasen.
 ErrorNoVATRateDefinedForSellerCountry=Feil: Det er ikke definert noen MVA-satser for landet '%s'.
 ErrorNoSocialContributionForSellerCountry=Feil! Ingen skatter og avgifter definert for landet '%s'
 ErrorFailedToSaveFile=Feil: Klarte ikke å lagre filen.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
-MaxNbOfRecordPerPage=Max. number of records per page
+ErrorCannotAddThisParentWarehouse=Du prøver å legge til et forelder-lagerhus som allerede er under et eksisterende lager
+MaxNbOfRecordPerPage=Maks antall poster per side
 NotAuthorized=Du er ikke autorisert for å gjøre dette.
 SetDate=Still dato
 SelectDate=Velg en dato
@@ -78,15 +78,15 @@ FileRenamed=Filen har fått nytt navn
 FileGenerated=Filen ble opprettet
 FileSaved=Filen ble lagret
 FileUploaded=Opplastningen var vellykket
-FileTransferComplete=File(s) uploaded successfully
+FileTransferComplete=Fil(er) ble lastet opp
 FilesDeleted=Fil(er) slettet
 FileWasNotUploaded=En fil er valgt som vedlegg, men er ennå ikke lastet opp. Klikk på "Legg ved fil" for dette.
-NbOfEntries=No. of entries
+NbOfEntries=Antall oppføringer
 GoToWikiHelpPage=Les online-hjelp (Du må være tilknyttet internett)
 GoToHelpPage=Les hjelp
 RecordSaved=Posten er lagret
 RecordDeleted=Oppføring slettet
-RecordGenerated=Record generated
+RecordGenerated=Post generert
 LevelOfFeature=Funksjonsnivå
 NotDefined=Ikke angitt
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarrs godkjenningsmodus er satt til <b>%s</b> i konfigurasjonsfilen <b>conf.php</b>. <br> Dette betyr at passorddatabasen er ekstern, så å endre dette feltet har kanskje ikke noen effekt.
@@ -96,8 +96,8 @@ PasswordForgotten=Glemt passordet?
 NoAccount=Ingen konto?
 SeeAbove=Se ovenfor
 HomeArea=Hjem
-LastConnexion=Last login
-PreviousConnexion=Previous login
+LastConnexion=Siste innlogging
+PreviousConnexion=Forrige innlogging
 PreviousValue=Forrige verdi
 ConnectedOnMultiCompany=Tilkoblet miljø
 ConnectedSince=Innlogget siden
@@ -119,7 +119,7 @@ PrecisionUnitIsLimitedToXDecimals=Dolibarr er satt opp til å bruke priser med <
 DoTest=Test
 ToFilter=Filter
 NoFilter=Ingen filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+WarningYouHaveAtLeastOneTaskLate=Advarsel, du har minst ett element som har overskredet toleransetiden.
 yes=ja
 Yes=Ja
 no=nei
@@ -155,7 +155,7 @@ Update=Oppdater
 Close=Lukk
 CloseBox=Fjern widget fra kontrollpanelet
 Confirm=Bekreft
-ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
+ConfirmSendCardByMail=Vil du virkelig sende innholdet av dette kortet med epost til <b>%s</b>?
 Delete=Slett
 Remove=Fjern
 Resiliate=Terminer
@@ -164,13 +164,13 @@ Modify=Endre
 Edit=Rediger
 Validate=Valider
 ValidateAndApprove=Valider og godkjenn
-ToValidate=Å validere
+ToValidate=Til validering
 NotValidated=Ikke validert
 Save=Lagre
 SaveAs=Lagre som
 TestConnection=Test tilkobling
 ToClone=Klon
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Velg hvilke data du vil klone:
 NoCloneOptionsSpecified=Det er ikke valgt noen data å klone.
 Of=av
 Go=Gå
@@ -185,7 +185,7 @@ Valid=Gyldig
 Approve=Godkjenn
 Disapprove=Underkjenn
 ReOpen=Gjenåpne
-Upload=Upload
+Upload=Last opp
 ToLink=Lenke
 Select=Velg
 Choose=Velg
@@ -202,7 +202,7 @@ Password=Passord
 PasswordRetype=Gjenta passord
 NoteSomeFeaturesAreDisabled=Mange av egenskapene/modulene er deaktivert i denne demonstrasjonen.
 Name=Navn
-NameSlashCompany=Name / Company
+NameSlashCompany=Navn/Firma
 Person=Person
 Parameter=Parameter
 Parameters=Parametre
@@ -224,8 +224,8 @@ Family=Familie
 Description=Beskrivelse
 Designation=Beskrivelse
 DescriptionOfLine=Beskrivelse av linje
-DateOfLine=Date of line
-DurationOfLine=Duration of line
+DateOfLine=Dato for linje
+DurationOfLine=Varighet for linjen
 Model=Dokumentmal
 DefaultModel=Standard dokumentmal
 Action=Handling
@@ -333,12 +333,12 @@ Copy=Kopier
 Paste=Lim inn
 Default=Standard
 DefaultValue=Standardverdi
-DefaultValues=Default values/filters/sorting
+DefaultValues=Standardverdier/filtre/sortering
 Price=Pris
 PriceCurrency=Pris (valuta)
 UnitPrice=Enhetspris
-UnitPriceHT=Unit price (excl.)
-UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceHT=Enhetspris (ekskl.)
+UnitPriceHTCurrency=Enhetspris (ekskl.) (Valuta)
 UnitPriceTTC=Enhetspris
 PriceU=Pris
 PriceUHT=Pris (netto)
@@ -348,15 +348,15 @@ Amount=Beløp
 AmountInvoice=Fakturabeløp
 AmountInvoiced=Beløp fakturert
 AmountPayment=Betalingsbeløp
-AmountHTShort=Amount (excl.)
+AmountHTShort=Beløp (ekskl.)
 AmountTTCShort=Beløp (inkl. MVA)
-AmountHT=Amount (excl. tax)
+AmountHT=Beløp (ekskl. MVA)
 AmountTTC=Beløp (inkl. MVA)
 AmountVAT=MVA beløp
-MulticurrencyAlreadyPaid=Already paid, original currency
+MulticurrencyAlreadyPaid=Allerede betalt, opprinnelig valuta
 MulticurrencyRemainderToPay=Gjenstår å betale, original valuta
 MulticurrencyPaymentAmount=Beløp, original valuta
-MulticurrencyAmountHT=Amount (excl. tax), original currency
+MulticurrencyAmountHT=Beløp (ekskl. MVA), opprinnelig valuta
 MulticurrencyAmountTTC=Beløp (ink. MVA), original valuta
 MulticurrencyAmountVAT=MVA-beløp, original valuta
 AmountLT1=Beløp MVA 2
@@ -365,16 +365,17 @@ AmountLT1ES=Beløp RE
 AmountLT2ES=Beløp IRPF
 AmountTotal=Totaltbeløp
 AmountAverage=Gjennomsnittsbeløp
-PriceQtyMinHT=Price quantity min. (excl. tax)
-PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PriceQtyMinHT=Pris min mengde.  (ekskl. MVA)
+PriceQtyMinHTCurrency=Pris min mengde. (ekskl. MVA) (valuta)
 Percentage=Prosent
 Total=Totalt
 SubTotal=Subtotal
-TotalHTShort=Total (excl.)
-TotalHTShortCurrency=Total (excl. in currency)
+TotalHTShort=Total (ekskl.)
+TotalHT100Short=Total 100%% (eksl.)
+TotalHTShortCurrency=Totalt (ekskl. I valuta)
 TotalTTCShort=Totalt (inkl. MVA)
-TotalHT=Total (excl. tax)
-TotalHTforthispage=Total (excl. tax) for this page
+TotalHT=Totalt (ekskl. MVA)
+TotalHTforthispage=Totalt (ekskl. MVA) for denne siden
 Totalforthispage=Totalt for denne siden
 TotalTTC=Totalt (inkl. MVA)
 TotalTTCToYourCredit=Totalt (inkl. MVA) godskrevet deg
@@ -386,7 +387,7 @@ TotalLT1ES=Total RE
 TotalLT2ES=Total IRPF
 TotalLT1IN=Total CGST
 TotalLT2IN=Total SGST
-HT=Excl. tax
+HT=Ekskl. MVA
 TTC=Inkl. MVA
 INCVATONLY=Inkl. MVA
 INCT=Inkl. alle avgifter
@@ -402,7 +403,7 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Additionnal cents
+LT1GC=Ekstra cents
 VATRate=MVA-sats
 VATCode=Avgiftsats-kode
 VATNPR=Avgiftsats NPR
@@ -435,15 +436,15 @@ ActionNotApplicable=Ikke aktuelt
 ActionRunningNotStarted=Ikke startet
 ActionRunningShort=Pågår
 ActionDoneShort=Fullført
-ActionUncomplete=Incomplete
+ActionUncomplete=Ufullstendig
 LatestLinkedEvents=Siste %s koblede hendelser
 CompanyFoundation=Firma/organisasjon
 Accountant=Regnskapsfører
 ContactsForCompany=Kontakter for denne tredjeparten
 ContactsAddressesForCompany=Kontakter/adresser for denne tredjepart
 AddressesForCompany=Adresser for tredjepart
-ActionsOnCompany=Events for this third party
-ActionsOnContact=Events for this contact/address
+ActionsOnCompany=Hendelser for denne tredjeparten
+ActionsOnContact=Hendelser for denne kontakten/adressen
 ActionsOnMember=Hendelser om dette medlemmet
 ActionsOnProduct=Hendelser om denne varen
 NActionsLate=%s forsinket
@@ -461,8 +462,8 @@ Generate=Generer
 Duration=Varighet
 TotalDuration=Total varighet
 Summary=Oppsummering
-DolibarrStateBoard=Database Statistics
-DolibarrWorkBoard=Open Items
+DolibarrStateBoard=Databasestatistikk
+DolibarrWorkBoard=Åpne elementer
 NoOpenedElementToProcess=Ingen åpne elementer å behandle
 Available=Tilgjengelig
 NotYetAvailable=Ikke tilgjengelig ennå
@@ -490,11 +491,11 @@ Reporting=Rapportering
 Reportings=Rapportering
 Draft=Kladd
 Drafts=Kladder
-StatusInterInvoiced=Invoiced
+StatusInterInvoiced=Fakturert
 Validated=Validert
 Opened=Åpent
-OpenAll=Open (All)
-ClosedAll=Closed (All)
+OpenAll=Åpne (Alle)
+ClosedAll=Lukket (Alle)
 New=Ny
 Discount=Rabatt
 Unknown=Ukjent
@@ -516,7 +517,7 @@ None=Ingen
 NoneF=Ingen
 NoneOrSeveral=Ingen eller flere
 Late=Forsinket
-LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
+LateDesc=Et element er definert som Forsinket i henhold til systemkonfigurasjonen i menyen Hjem - Oppsett - Varsler.
 NoItemLate=Ingen forsinket enhet
 Photo=Bilde
 Photos=Bilder
@@ -636,15 +637,14 @@ FeatureNotYetSupported=Funksjon støttes ikke ennå
 CloseWindow=Lukk vindu
 Response=Svar
 Priority=Prioritet
-SendByMail=Send by email
+SendByMail=Send via epost
 MailSentBy=E-post sendt av
 TextUsedInTheMessageBody=E-mail meldingstekst
 SendAcknowledgementByMail=Send bekrftelse på epost
 SendMail=Send e-post
 Email=E-post
 NoEMail=Ingen e-post
-Email=E-post
-AlreadyRead=Already read
+AlreadyRead=Allerede lest
 NotRead=Ikke lest
 NoMobilePhone=Ingen mobiltelefon
 Owner=Eier
@@ -658,9 +658,9 @@ ValueIsValid=Verdien er gyldig
 ValueIsNotValid=Verdien er ikke gyldig
 RecordCreatedSuccessfully=Post opprettet
 RecordModifiedSuccessfully=Posten er endret!
-RecordsModified=%s record(s) modified
-RecordsDeleted=%s record(s) deleted
-RecordsGenerated=%s record(s) generated
+RecordsModified=%s post(er) endret
+RecordsDeleted=%s post(er) slettet
+RecordsGenerated=%spost(er) generert
 AutomaticCode=Automatisk kode
 FeatureDisabled=Funksjonen er slått av
 MoveBox=Flytt widget
@@ -671,14 +671,13 @@ Method=Metode
 Receive=Motta
 CompleteOrNoMoreReceptionExpected=Komplett eller ingenting mer forventet
 ExpectedValue=Forventet verdi
-CurrentValue=Gjeldende verdi
 PartialWoman=Delvis
 TotalWoman=Total
 NeverReceived=Aldri mottatt
 Canceled=Kansellert
 YouCanChangeValuesForThisListFromDictionarySetup=Du kan endre verdier for denne listen fra menyen Oppsett - Ordbøker
 YouCanChangeValuesForThisListFrom=Du kan endre verdier for denne listen fra menyen %s
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
+YouCanSetDefaultValueInModuleSetup=Du kan angi standardverdien som brukes når du oppretter en ny post i moduloppsettet
 Color=Farge
 Documents=Tilknyttede filer
 Documents2=Dokumenter
@@ -710,23 +709,23 @@ Notes=Merknader
 AddNewLine=Legg til ny linje
 AddFile=Legg til fil
 FreeZone=Ikke et forhåndsdefinert vare/tjeneste
-FreeLineOfType=Free-text item, type:
+FreeLineOfType=Fritekst element, type:
 CloneMainAttributes=Klon objektet med de viktigste attributtene
-ReGeneratePDF=Re-generate PDF
+ReGeneratePDF=Regenerere PDF
 PDFMerge=PDF Flett
 Merge=Flett
 DocumentModelStandardPDF=Standard PDF-mal
 PrintContentArea=Vis nettstedet for å skrive ut innholdet på hovedområdet
 MenuManager=Menymanager
-WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
+WarningYouAreInMaintenanceMode=Advarsel, du er i vedlikeholdsmodus: bare brukeren <b> %s </b> har lov til å bruke programmet i denne modusen.
 CoreErrorTitle=Systemfeil
 CoreErrorMessage=Beklager, en feil oppsto. Kontakt din systemadministrator for å sjekke loggene eller deaktiver $dolibarr_main_prod=1 for mer informasjon
 CreditCard=Kredittkort
-ValidatePayment=Godkjenn betaling
+ValidatePayment=Valider betaling
 CreditOrDebitCard=Kreditt- eller debetkort
 FieldsWithAreMandatory=Felt med <b>%s</b> er obligatoriske
-FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
-AccordingToGeoIPDatabase=(according to GeoIP conversion)
+FieldsWithIsForPublic=Felt med <b> %s </b> er vist i den offentlige listen over medlemmer. Hvis du ikke vil ha dette, fjerner du merket i "offentlig" -boksen.
+AccordingToGeoIPDatabase=(i henhold til GeoIP-konvertering)
 Line=Linje
 NotSupported=Støttes ikke
 RequiredField=Obligatorisk felt
@@ -734,8 +733,8 @@ Result=Resultater
 ToTest=Test
 ValidateBefore=Kortet må valideres før du bruker denne funksjonen
 Visibility=Synlighet
-Totalizable=Totalizable
-TotalizableDesc=This field is totalizable in list
+Totalizable=Totaliserbar
+TotalizableDesc=Dette feltet er totaliserbart i liste
 Private=Privat
 Hidden=Skjult
 Resources=Ressurser
@@ -754,16 +753,16 @@ LinkTo=Lenke til
 LinkToProposal=Lenke til tilbud
 LinkToOrder=Lenke til ordre
 LinkToInvoice=Lenke til faktura
-LinkToTemplateInvoice=Link to template invoice
-LinkToSupplierOrder=Link to purchase order
-LinkToSupplierProposal=Link to vendor proposal
-LinkToSupplierInvoice=Link to vendor invoice
+LinkToTemplateInvoice=Link til fakturamal
+LinkToSupplierOrder=Link til innkjøpsordre
+LinkToSupplierProposal=Link til leverandørtilbud
+LinkToSupplierInvoice=Link til leverandørfaktura
 LinkToContract=Lenke til kontakt
 LinkToIntervention=Lenke til intervensjon
 CreateDraft=Lag utkast
 SetToDraft=Tilbake til kladd
 ClickToEdit=Klikk for å redigere
-ClickToRefresh=Click to refresh
+ClickToRefresh=Klikk for å oppdatere
 EditWithEditor=Rediger med CKEditor
 EditWithTextEditor=Rediger med tekstbehandler
 EditHTMLSource=Rediger HTML-kilde
@@ -778,14 +777,14 @@ ByDay=Etter dag
 BySalesRepresentative=Etter salgsrepresentant
 LinkedToSpecificUsers=Knyttet til en bestemt brukerkontakt
 NoResults=Ingen resultater
-AdminTools=Admin Tools
+AdminTools=Adminverktøy
 SystemTools=Systemverktøy
 ModulesSystemTools=Modulverktøy
 Test=Test
 Element=Element
 NoPhotoYet=Ingen bilder tilgjengelig ennå
 Dashboard=Kontrollpanel
-MyDashboard=My Dashboard
+MyDashboard=Mitt instrumentpanel
 Deductible=Egenandel
 from=fra
 toward=mot
@@ -808,7 +807,7 @@ PrintFile=Skriv fil %s
 ShowTransaction=Vis oppføring på bankkonto
 ShowIntervention=Vis intervensjon
 ShowContract=Vis kontrakt
-GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
+GoIntoSetupToChangeLogo=Gå til Hjem - Oppsett - Firma for å endre logo eller til Hjem - Oppsett - Skjerm for å skjule.
 Deny=Avvis
 Denied=Avvist
 ListOf=Liste over %s
@@ -828,12 +827,13 @@ TooManyRecordForMassAction=For mange poster valgt for masseutførelse. Maksimum
 NoRecordSelected=Ingen poster valgt
 MassFilesArea= Filområde bygget av massehandlinger
 ShowTempMassFilesArea=Vis filområde bygget av massehandlinger
-ConfirmMassDeletion=Bulk Delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+ConfirmMassDeletion=Bekreft massesletting
+ConfirmMassDeletionQuestion=Er du sikker på at du vil slette de %s valgte postene?
 RelatedObjects=Relaterte objekter
 ClassifyBilled=Klassifisert fakturert
 ClassifyUnbilled=Klassifiser ufakturert
 Progress=Fremdrift
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=Vis
@@ -842,23 +842,28 @@ Exports=Eksporter
 ExportFilteredList=Eksporter filtrert liste
 ExportList=Eksportliste
 ExportOptions=Eksportinnstillinger
+IncludeDocsAlreadyExported=Inkluder dokumenter som allerede er eksportert
+ExportOfPiecesAlreadyExportedIsEnable=Eksport av deler som allerede er eksportert, er aktivert
+ExportOfPiecesAlreadyExportedIsDisable=Eksport av deler som allerede er eksportert, er deaktivert
+AllExportedMovementsWereRecordedAsExported=Alle eksporterte bevegelser ble registrert som eksportert
+NotAllExportedMovementsCouldBeRecordedAsExported=Ikke alle eksporterte bevegelser kunne registreres som eksportert
 Miscellaneous=Diverse
 Calendar=Kalender
 GroupBy=Grupper etter...
 ViewFlatList=Vis liste
 RemoveString=Fjern strengen '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+SomeTranslationAreUncomplete=Noen av språkene som tilbys kan bare oversettes delvis eller kan inneholde feil. Vennligst hjelp å korrigere språket ditt ved å registrere deg på <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> for å legge til forbedringene dine.
 DirectDownloadLink=Direkte nedlastingslink (offentlig/ekstern)
 DirectDownloadInternalLink=Direkte nedlastingslink (må være logget på og trenger tillatelser)
 Download=Last ned
 DownloadDocument=Last ned dokument
 ActualizeCurrency=Oppdater valutakurs
 Fiscalyear=Regnskapsår
-ModuleBuilder=Modulbygger
+ModuleBuilder=Modul- og applikasjonsbygger
 SetMultiCurrencyCode=Angi valuta
 BulkActions=Massehandlinger
 ClickToShowHelp=Klikk for å vise verktøytipshjelp
-WebSite=Website
+WebSite=Nettsted
 WebSites=Websider
 WebSiteAccounts=Nettstedskontoer
 ExpenseReport=Reiseregning
@@ -867,25 +872,25 @@ HR=HR
 HRAndBank=HR og Bank
 AutomaticallyCalculated=Automatisk beregnet
 TitleSetToDraft=Gå tilbake til utkast
-ConfirmSetToDraft=Are you sure you want to go back to Draft status?
+ConfirmSetToDraft=Er du sikker på at du vil gå tilbake til utkaststatus?
 ImportId=Import ID
 Events=Hendelser
-EMailTemplates=Email templates
+EMailTemplates=E-postmaler
 FileNotShared=Filen er ikke delt eksternt
 Project=Prosjekt
 Projects=Prosjekter
-LeadOrProject=Lead | Project
-LeadsOrProjects=Leads | Projects
+LeadOrProject=Lead | Prosjekt
+LeadsOrProjects=Leads | Prosjekter
 Lead=Lead
 Leads=Leads
-ListOpenLeads=List open leads
-ListOpenProjects=List open projects
-NewLeadOrProject=New lead or project
+ListOpenLeads=List åpne leads
+ListOpenProjects=List åpne prosjekter
+NewLeadOrProject=Nytt lead eller prosjekt
 Rights=Rettigheter
 LineNb=Linje nr.
 IncotermLabel=Incotermer
-TabLetteringCustomer=Customer lettering
-TabLetteringSupplier=Vendor lettering
+TabLetteringCustomer=Kundekorrespondanse
+TabLetteringSupplier=Leverandørkorrespondanse
 Monday=Mandag
 Tuesday=Tirsdag
 Wednesday=Onsdag
@@ -933,7 +938,7 @@ SearchIntoProjects=Prosjekter
 SearchIntoTasks=Oppgaver
 SearchIntoCustomerInvoices=Kundefakturaer
 SearchIntoSupplierInvoices=Leverandørfakturaer
-SearchIntoCustomerOrders=Sales orders
+SearchIntoCustomerOrders=Salgsordrer
 SearchIntoSupplierOrders=Innkjøpsordrer
 SearchIntoCustomerProposals=Kundetilbud
 SearchIntoSupplierProposals=Leverandørtilbud
@@ -941,7 +946,7 @@ SearchIntoInterventions=Intervensjoner
 SearchIntoContracts=Kontrakter
 SearchIntoCustomerShipments=Kundeforsendelser
 SearchIntoExpenseReports=Utgiftsrapporter
-SearchIntoLeaves=Leave
+SearchIntoLeaves=Permisjon
 SearchIntoTickets=Supportsedler
 CommentLink=Kommentarer
 NbComments=Antall kommentarer
@@ -950,7 +955,7 @@ CommentAdded=Kommentar lagt til
 CommentDeleted=Kommentar slettet
 Everybody=Alle
 PayedBy=Betalt av
-PayedTo=Paid to
+PayedTo=Betalt til
 Monthly=Månedlig
 Quarterly=Kvartalsvis
 Annual=Årlig
@@ -960,13 +965,17 @@ LocalAndRemote=Lokal og ekstern
 KeyboardShortcut=Tastatursnarvei
 AssignedTo=Tildelt
 Deletedraft=Slett utkast
-ConfirmMassDraftDeletion=Draft mass delete confirmation
+ConfirmMassDraftDeletion=Bekreftelse av massesletting av kladder
 FileSharedViaALink=Fil delt via en lenke
-SelectAThirdPartyFirst=Select a third party first...
+SelectAThirdPartyFirst=Velg en tredjepart først ...
 YouAreCurrentlyInSandboxMode=Du er for øyeblikket i %s "sandbox" -modus
 Inventory=Varetelling
-AnalyticCode=Analytic code
+AnalyticCode=Analytisk kode
 TMenuMRP=MRP
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
+ShowMoreInfos=Vis mer info
+NoFilesUploadedYet=Vennligst last opp et dokument først
+SeePrivateNote=Se privat notat
+PaymentInformation=Betalingsinformasjon
+ValidFrom=Gyldig fra
+ValidUntil=Gyldig til
+NoRecordedUsers=Ingen brukere
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index e09ff83ae17..616e02fc920 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -9,7 +9,7 @@ UserNotLinkedToMember=Brukeren er ikke knyttet til noe medlem
 ThirdpartyNotLinkedToMember=Tredjepart ikke knyttet til et medlem
 MembersTickets=Medlemsbilletter
 FundationMembers=Organisasjons-medlemmer
-ListOfValidatedPublicMembers=Liste over godkjente offentlige medlemmer
+ListOfValidatedPublicMembers=Liste over validerte offentlige medlemmer
 ErrorThisMemberIsNotPublic=Dette medlemet er ikke offentlig
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Et annet medlem (navn: <b>%s</b>, innlogging: <b>%s</b>) er allerede koblet til en tredje part <b>%s</b>. Fjern denne lenken først fordi en tredjepart ikke kan knyttes til bare ett medlem (og vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Av sikkerhetsgrunner må du ha tilgang til å redigere alle brukere for å kunne knytte et medlem til en bruker som ikke er ditt.
@@ -197,3 +197,4 @@ SendReminderForExpiredSubscriptionTitle=Send påminnelse via e-post for utløpt
 SendReminderForExpiredSubscription=Send påminnelse via e-post til medlemmer når abonnementet holder på å utløpe (parameter er antall dager før slutt på abonnementet for å sende påminnelsen. Det kan være en liste over dager atskilt med et semikolon, for eksempel '10; 5; 0; -5 ')
 MembershipPaid=Medlemskap betalt for gjeldende periode (til %s)
 YouMayFindYourInvoiceInThisEmail=Du kan finne fakturaen din vedlagt denne e-posten
+XMembersClosed=%s medlem(mer) lukket
diff --git a/htdocs/langs/nb_NO/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
index 5b9fb93f036..a0250277e21 100644
--- a/htdocs/langs/nb_NO/modulebuilder.lang
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=Dette verktøyet må bare brukes av erfarne brukere eller utviklere. Det gir muligheter til å bygge eller redigere din egen modul. Dokumentasjon for alternativ <a href="%s" target="_blank">manuell utvikling er her</a> .
 EnterNameOfModuleDesc=Skriv inn navnet på modulen/applikasjonen du  vil opprette, uten mellomrom. Bruk stor bokstav til å skille ord (For eksempel: MyModule, EcommerceForShop, SyncWithMySystem ...)
 EnterNameOfObjectDesc=Skriv inn navnet på objektet som skal opprettes, uten mellomrom. Bruk stor bokstav til å skille ord (For eksempel: MyObject, Student, Lærer ...). CRUD-klassefilen, men også API-filen, sider for å liste/legge til/redigere/slette objekt og SQL-filer blir generert .
-ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc2=Sti hvor moduler genereres/redigeres (første katalog for eksterne moduler definert i %s): <strong> %s </strong>
 ModuleBuilderDesc3=Genererte/redigerbare moduler funnet: <strong> %s</strong>
 ModuleBuilderDesc4=En modul detekteres som "redigerbar" når filen<strong>%s</strong> eksisterer i roten av modulkatalogen
 NewModule=Ny modul
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=Dette er visningen av utløsere som tilbys av modulen
 ModuleBuilderDeschooks=Denne fanen er til kroker.
 ModuleBuilderDescwidgets=Denne fanen er for å administrere/bygge widgeter.
 ModuleBuilderDescbuildpackage=Her kan du generere en "klar til å distribuere" pakkefil (en normalisert .zip-fil) av modulen din og en "klar til å distribuere" dokumentasjonsfil. Klikk på knappen for å bygge pakken eller dokumentasjonsfilen.
-EnterNameOfModuleToDeleteDesc=Du kan slette modulen din. ADVARSEL: Alle filer i modulen, men også strukturerte data og dokumentasjon, vil definitivt gå tapt!
-EnterNameOfObjectToDeleteDesc=Du kan slette et objekt. ADVARSEL: Alle filer relatert til objekt går tapt!
+EnterNameOfModuleToDeleteDesc=Du kan slette modulen din. ADVARSEL: Alle kodefiler tilhørende modulen (generert eller opprettet manuelt) OG strukturert data og dokumentasjon vil bli slettet!
+EnterNameOfObjectToDeleteDesc=Du kan slette et objekt. ADVARSEL: Alle kodingsfiler (generert eller opprettet manuelt) relatert til objekt blir slettet!
 DangerZone=Faresone
 BuildPackage=Bygg pakke
+BuildPackageDesc=Du kan generere en zip-pakke med applikasjonen din, slik at du er klar til å distribuere den på en hvilken som helst Dolibarr. Du kan også distribuere den eller selge den på enmarkedsplass som <a href="https://www.dolistore.com">DoliStore.com</a> .
 BuildDocumentation=Bygg dokumentasjon
 ModuleIsNotActive=Denne modulen er ikke aktivert enda. Gå inn på %s for å aktivere eller klikk her:
-ModuleIsLive=Denne modulen er blitt aktivert. Enhver endring på den kan ødelegge en gjeldende aktiv funksjon.
+ModuleIsLive=Denne modulen har blitt aktivert. Enhver endring kan ødelegge en gjeldende kjørende funksjon.
 DescriptionLong=Lang beskrivelse
 EditorName=Navn på editor
 EditorUrl=URL til editor
@@ -40,13 +41,14 @@ PageForAgendaTab=PHP-side for hendelsesfanen
 PageForDocumentTab=PHP-side for dokumentfan
 PageForNoteTab=PHP-side for notatfane
 PathToModulePackage=Sti til zip-fil av modul/applikasjonspakke
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
+PathToModuleDocumentation=Sti til fil med modul/applikasjonsdokumentasjon (%s)
 SpaceOrSpecialCharAreNotAllowed=Mellomrom eller spesialtegn er ikke tillatt.
 FileNotYetGenerated=Filen er ikke generert ennå
-RegenerateClassAndSql=Slett og regenerer klasse- og sql-filer
+RegenerateClassAndSql=Tvangsoppdatering av .class og .sql filer
 RegenerateMissingFiles=Generer manglende filer
-SpecificationFile=File of documentation
+SpecificationFile=Dokumentasjon
 LanguageFile=Språkfil
+ObjectProperties=Objektegenskaper
 ConfirmDeleteProperty=Er du sikker på at du vil slette egenskapen<strong> %s</strong>? Dette vil endre kode i PHP klassen, og fjerne kolonne fra tabelldefinisjon av objekt.
 NotNull=Ikke NULL
 NotNullDesc=1=Angi database til IKKE NULL. -1=Tillat nullverdier og tving verdien til NULL hvis tom ('' eller 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme-fil
 ChangeLog=ChangeLog-fil
 TestClassFile=Fil for PHP Unit Testklasse
 SqlFile=Sql-fil
-PageForLib=Fil for PHP-biblioteker
+PageForLib=Fil for PHP bibliotek
+PageForObjLib=Fil for PHP bibliotek dedikert til objekt
 SqlFileExtraFields=Sql-fil for komplementære attributter
 SqlFileKey=Sql-fil for nøkler
+SqlFileKeyExtraFields=Sql-fil for nøkler til komplementære attributter
 AnObjectAlreadyExistWithThisNameAndDiffCase=Et objekt eksisterer allerede med dette navnet
 UseAsciiDocFormat=Du kan bruke Markdown-format, men det anbefales at du bruker Asciidoc-formatet (Sammenligning mellom .md og .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Er en måling
@@ -76,13 +80,15 @@ ListOfMenusEntries=Liste over menyoppføringer
 ListOfPermissionsDefined=Liste over definerte tillatelser
 SeeExamples=Se eksempler her
 EnabledDesc=Betingelse for å ha dette feltet aktivt (Eksempler: 1 eller $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example: preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
+VisibleDesc=Er feltet synlig? (Eksempler: 0=Aldri synlig, 1=Synlig på liste og opprett/oppdater/vis skjemaer, 2=Bare synlig på listen, 3=Synlig på opprett/oppdater/vis kun skjema (ikke liste), 4=Synlig på liste og oppdater/vis kun skjema (ikke opprett). Bruk av negativ verdi betyr at feltet ikke vises som standard på listen, men kan velges for visning). Det kan være et uttrykk, for eksempel: preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1
 IsAMeasureDesc=Kan verdien av feltet bli kumulert for å få en total i listen? (Eksempler: 1 eller 0)
 SearchAllDesc=Er feltet brukt til å søke fra hurtigsøkingsverktøyet? (Eksempler: 1 eller 0)
 SpecDefDesc=Skriv inn all dokumentasjon du vil gi med modulen din, som ikke allerede er definert av andre faner. Du kan bruke .md eller bedre,  .asciidoc-syntaksen.
 LanguageDefDesc=I disse filene skriver du inn alle nøklene og oversettelsene for hver språkfil.
-MenusDefDesc=Her defineres  menyene som tilbys av modulen din (når de er definert, er de synlige i menyeditoren %s)
-PermissionsDefDesc=Definer her de nye tillatelsene som tilbys av modulen din (med en gang de er definert, er de synlige i standardrettighetsoppsettet %s)
+MenusDefDesc=Her definerer du menyene som tilbys av modulen din
+PermissionsDefDesc=Her definerer du de nye tillatelsene som tilbys av modulen din
+MenusDefDescTooltip=Menyene som tilbys av modulen/applikasjonen, er definert i array <strong>$this-&gt;menus</strong> i modulbeskrivelsesfilen. Du kan redigere denne filen manuelt eller bruke den innebygde editoren. <br><br> Merk: Når en gang er definert (og modul gjenaktivert), er menyer også synlige i menyeditoren som er tilgjengelig for administratorbrukere på %s.
+PermissionsDefDescTooltip=Tillatelsene som er gitt av modulen/applikasjonen, er definert i array <strong>$this-&gt;righs</strong> i filen for modulbeskrivelsen. Du kan redigere denne filen manuelt eller bruke den innebygde editoren. <br><br> Merk: Når definert (og modul reaktivert), er tillatelser synlige i standardrettighetsoppsettet %s.
 HooksDefDesc=Definer egenskapen <b> module_parts ['hooks'] </b> i modulbeskrivelsen, konteksten av hooks du vil administrere (liste over sammenhenger kan bli funnet ved et søk på '<b> initHooks(</b>'i kjernekode). <br> Rediger hooks-filen for å legge til kode for dine tilkoblede funksjoner (hookable funksjoner kan bli funnet ved et søk på '<b> executeHooks </b>' i kjernekode).
 TriggerDefDesc=Definer koden som skal utføres for hver forretningshendelse utført, i triggerfilen.
 SeeIDsInUse=Se IDer som brukes i installasjonen din
@@ -101,12 +107,13 @@ UseDocFolder=Deaktiver dokumentasjonsmappen
 UseSpecificReadme=Bruk en bestemt Les-meg
 RealPathOfModule=Virkelig bane til modulen
 ContentCantBeEmpty=Innholdet i filen kan ikke være tomt
-WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
-CLIDesc=You can generate here some command line scripts you want to provide with your module.
-CLIFile=CLI File
-NoCLIFile=No CLI files
-UseSpecificEditorName = Use a specific editor name
-UseSpecificEditorURL = Use a specific editor URL
-UseSpecificFamily = Use a specific family
-UseSpecificAuthor = Use a specific author
-UseSpecificVersion = Use a specific initial version
+WidgetDesc=Her kan du generere og redigere widgets som vil bli integrert med modulen din.
+CLIDesc=Her kan du generere noen kommandolinjeskript du vil bruke med modulen din.
+CLIFile=CLI-fil
+NoCLIFile=Ingen CLI-filer
+UseSpecificEditorName = Bruk et bestemt editornavn
+UseSpecificEditorURL = Bruk en bestemt editor-URL
+UseSpecificFamily = Bruk en bestemt familie
+UseSpecificAuthor = Bruk en bestemt forfatter
+UseSpecificVersion = Bruk en bestemt innledende versjon
+ModuleMustBeEnabled=Modulen/applikasjonen må først aktiveres
diff --git a/htdocs/langs/nb_NO/multicurrency.lang b/htdocs/langs/nb_NO/multicurrency.lang
index ede19920207..1363f65f8b7 100644
--- a/htdocs/langs/nb_NO/multicurrency.lang
+++ b/htdocs/langs/nb_NO/multicurrency.lang
@@ -4,17 +4,17 @@ ErrorAddRateFail=Feil i ny rate
 ErrorAddCurrencyFail=Feil i ny valuta
 ErrorDeleteCurrencyFail=Feil, sletting mislykkes
 multicurrency_syncronize_error=Synkroniseringsfeil: %s
-MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Bruk dokumentdato for å finne valutakurs, i stedet for å bruke sist kjente kurs
-multicurrency_useOriginTx=Når et objekt opprettes fra et annet, behold den opprinnelige kursen til kildeobjektet (ellers bruk den siste kjente kursen)
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Bruk datoen for dokumentet til å finne valutakursen, i stedet for å bruke den siste kjente satsen
+multicurrency_useOriginTx=Når et objekt opprettes fra et annet, behold originalsatsen fra kildeobjektet (ellers bruk den sist kjente satsen)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=Du må opprette en konto på deres nettsted for å bruke denne funksjonaliteten <br> Få din <b> API-nøkkel </b> <br /> Hvis du bruker en gratis konto, kan du ikke endre <b> valutakilden </b> (USD som standard) <br /> Men hvis hovedverdien din ikke er USD, kan du bruke <b> alternativ valutakilde </b> for å tvinge hovedvaluta <br /> <br /> Du er begrenset til 1000 synkroniseringer per måned
+CurrencyLayerAccount_help_to_synchronize=Du må opprette en konto på nettstedet %s for å bruke denne funksjonaliteten. <br> Få <b>API-nøkkelen din</b> . <br> Hvis du bruker en gratis konto, kan du ikke endre <b>kildevalutaen</b> (USD som standard). <br> Hvis hovedvalutaen din ikke er USD, omberegner applikasjonen automatisk. <br><br> Du er begrenset til 1000 synkroniseringer per måned.
 multicurrency_appId=API-nøkkel
-multicurrency_appCurrencySource=Valutakilde
-multicurrency_alternateCurrencySource=Alternativ valuta kilde
+multicurrency_appCurrencySource=Kildevaluta
+multicurrency_alternateCurrencySource=Alterner valutakilde
 CurrenciesUsed=Valutaer brukt
-CurrenciesUsed_help_to_add=Legg til de forskjellige valutaer og priser du må bruke i dine <b> tilbud </b>, <b> bestillinger </b>, osv.
+CurrenciesUsed_help_to_add=Legg til de forskjellige valutaene og prisene du vil bruke på <b> tilbud</b>, <b> ordre</b> etc.
 rate=rate
 MulticurrencyReceived=Mottatt, originalvaluta
-MulticurrencyRemainderToTake=Restbeløp, opprinnelig valuta
+MulticurrencyRemainderToTake=Resterende beløp, opprinnelig valuta
 MulticurrencyPaymentAmount=Beløp, original valuta
 AmountToOthercurrency=Beløp til (i valuta for mottakskonto)
diff --git a/htdocs/langs/nb_NO/paybox.lang b/htdocs/langs/nb_NO/paybox.lang
index 6504b8a2749..c8639aedcab 100644
--- a/htdocs/langs/nb_NO/paybox.lang
+++ b/htdocs/langs/nb_NO/paybox.lang
@@ -10,7 +10,7 @@ ToComplete=For å fullføre
 YourEMail=E-post for betalingsbekreftelsen
 Creditor=Kreditor
 PaymentCode=Betalingskode
-PayBoxDoPayment=Betal med kredit- eller debet-kort (Paybox)
+PayBoxDoPayment=Betal med Paybox
 ToPay=Utfør betaling
 YouWillBeRedirectedOnPayBox=Du vil bli omdirigert til den sikrede Paybox siden for innlegging av kredittkortinformasjon
 Continue=Neste
@@ -20,11 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL for å tilby et %s brukergrensesnitt f
 ToOfferALinkForOnlinePaymentOnContractLine=URL for å tilby et %s brukergrensesnitt for online betaling av en kontraktlinje
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL for å tilby et %s brukergrensesnitt for online betaling av et fribeløp beløp
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL for å tilby et %s brukergrensesnitt for online betaling av medlemsabonnement
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL for å tilby en %s online betaling, brukergrensesnitt for betaling av donasjon
 YouCanAddTagOnUrl=Du kan også legge til URL-parameter <b>&tag=<i>verdier</i></b> til noen av disse URLene (kreves kun ved betaling av fribeløp) for å legge til dine egne merknader til betalingen kommentar.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Oppsett din Paybox med url <b> %s </b> for å få betaling opprettet automatisk når den er validert av Paybox.
 YourPaymentHasBeenRecorded=Denne siden bekrefter at din betaling er registrert. Takk.
-YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Betalingen din er IKKE registrert, og transaksjonen er kansellert. Takk skal du ha.
 AccountParameter=Kontoparametre
 UsageParameter=Parametre for bruk
 InformationToFindParameters=Hjelp til å finne din %s kontoinformasjon
@@ -33,7 +33,8 @@ VendorName=Navn på leverandøren
 CSSUrlForPaymentForm=URL til CSS-stilark for betalingsskjema
 NewPayboxPaymentReceived=Ny Paybox-betaling mottatt
 NewPayboxPaymentFailed=Ny Paybox-betaling forsøkt, men feilet
-PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
+PAYBOX_PAYONLINE_SENDEMAIL=E-postvarsling etter betalingsforsøk (vellykket eller feilet)
 PAYBOX_PBX_SITE=Verdi for PBX SITE
 PAYBOX_PBX_RANG=Verdi for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Verdi for PBX ID
+PAYBOX_HMAC_KEY=HMAC-nøkkel
diff --git a/htdocs/langs/nb_NO/paypal.lang b/htdocs/langs/nb_NO/paypal.lang
index f5747f57dd3..292390e227b 100644
--- a/htdocs/langs/nb_NO/paypal.lang
+++ b/htdocs/langs/nb_NO/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal moduloppsett
-PaypalDesc=Denne modulen tilbyr sider for å tillate betaling på <a href="http://www.paypal.com" target="_blank">PayPal</a> av kunder. Dette kan brukes til en gratis betaling eller for et bestemt Dolibarr objekt (faktura, ordre, ...)
-PaypalOrCBDoPayment=Betal med Paypal (Kredittkort eller Paypal)
-PaypalDoPayment=Betal med Paypal
+PaypalDesc=Denne modulen tillater betaling av kunder via <a href="http://www.paypal.com" target="_blank"> PayPal </a>. Dette kan brukes til en ad-hoc-betaling eller for en betaling knyttet til et Dolibarr-objekt (faktura, ordre, ...)
+PaypalOrCBDoPayment=Betal med PayPal (kort eller PayPal)
+PaypalDoPayment=Betal med PayPal
 PAYPAL_API_SANDBOX=Test-/sandkasse-modus
 PAYPAL_API_USER=API brukernavn
 PAYPAL_API_PASSWORD=API passord
 PAYPAL_API_SIGNATURE=API signatur
 PAYPAL_SSLVERSION=Curl SSL-versjon
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Tilby &quot;integrert&quot betaling; (Kredittkort + Paypal) eller bare &quot;Paypal&quot; 
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Tilbyr "integrert" betaling (Kredittkort + PayPal) eller bare "PayPal" 
 PaypalModeIntegral=Integrert
 PaypalModeOnlyPaypal=Kun PayPal
-ONLINE_PAYMENT_CSS_URL=Valgfri URL til CSS-stilark på online betalingsside
+ONLINE_PAYMENT_CSS_URL=Valgfri URL til CSS stilark på nettbasert betalingsside
 ThisIsTransactionId=Transaksjons-ID: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Legg til url av Paypal-betaling når du sender et dokument i posten
-YouAreCurrentlyInSandboxMode=Du er for øyeblikket i %s "sandbox" -modus
+PAYPAL_ADD_PAYMENT_URL=Inkluder PayPal-betalingsadressen når du sender et dokument via e-post
 NewOnlinePaymentReceived=Ny online betaling mottatt
 NewOnlinePaymentFailed=Ny online betaling forsøkt, men mislyktes
-ONLINE_PAYMENT_SENDEMAIL=E-post-varsel etter en betaling (vellykket eller ikke)
+ONLINE_PAYMENT_SENDEMAIL=E-postadresse for varsler etter hvert betalingsforsøk (vellykket og mislykket)
 ReturnURLAfterPayment=Retur-URL etter betaling
 ValidationOfOnlinePaymentFailed=Validering av online betaling mislyktes
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Bekreftelsesside for betaling ble kalt etter at betalingssystemet returnerte en feil
@@ -28,7 +27,10 @@ ShortErrorMessage=Kort feilmelding
 ErrorCode=Feilkode
 ErrorSeverityCode=Feilkode alvorlighetsgrad
 OnlinePaymentSystem=Nettbasert betalingssystem
-PaypalLiveEnabled=Paypal Live aktivert (ellers test/sandbox modus)
-PaypalImportPayment=Importer Paypal-betalinger
+PaypalLiveEnabled=PayPal "live" modus aktivert (ellers test/sandbox modus)
+PaypalImportPayment=Importer PayPal-betalinger
 PostActionAfterPayment=Legg inn handlinger etter utbetalinger
 ARollbackWasPerformedOnPostActions=En tilbakerulling ble utført på alle posthandlinger. Du må fylle ut posthandlinger manuelt hvis de er nødvendige.
+ValidationOfPaymentFailed=Validering av betaling har feilet
+CardOwner=Kortholder
+PayPalBalance=Paypal kreditt
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index fed8a651d56..88c571ad537 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -16,13 +16,13 @@ Create=Opprett
 Reference=Referanse
 NewProduct=Ny vare
 NewService=Ny tjeneste
-ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+ProductVatMassChange=Global MVA-oppdatering
+ProductVatMassChangeDesc=Dette verktøyet oppdaterer MVA-verdien som er definert på <b> <u> ALLE </u> </b> varer og tjenester!
 MassBarcodeInit=Masse strekkode-endring
 MassBarcodeInitDesc=Denne siden kan brukes til å lage strekkoder for objekter som ikke har dette. Kontroller at oppsett av modulen Strekkoder er fullført.
 ProductAccountancyBuyCode=Regnskapskode (kjøp)
 ProductAccountancySellCode=Regnskapskode (salg)
-ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
+ProductAccountancySellIntraCode=Regnskapskode (salg intra-community)
 ProductAccountancySellExportCode=Regnskapskode (salgseksport)
 ProductOrService=Vare eller tjeneste
 ProductsAndServices=Varer og tjenester
@@ -43,10 +43,10 @@ CardProduct0=Vare
 CardProduct1=Tjenester
 Stock=Beholdning
 MenuStocks=Lagerbeholdning
-Stocks=Stocks and location (warehouse) of products
+Stocks=Lager og plassering (lager) av produkter
 Movements=Bevegelser
 Sell=Selg
-Buy=Purchase
+Buy=Kjøp
 OnSell=For salg
 OnBuy=For kjøp
 NotOnSell=Ikke i salg
@@ -61,17 +61,17 @@ ProductStatusNotOnBuyShort=Ikke for kjøp
 UpdateVAT=Oppdater MVA
 UpdateDefaultPrice=Oppdater standardpris
 UpdateLevelPrices=Oppdater priser for hvert nivå
-AppliedPricesFrom=Applied from
+AppliedPricesFrom=Anvendt fra
 SellingPrice=Salgspris
-SellingPriceHT=Selling price (excl. tax)
+SellingPriceHT=Utsalgspris (ekskl. MVA)
 SellingPriceTTC=Salgspris (inkl. MVA)
-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.
+SellingMinPriceTTC=Minimum utsalgspris (inkl. MVA)
+CostPriceDescription=Denne prisen (eks. MVA) kan brukes til å lagre det gjennomsnittlige beløpet dette produktet koster din bedrift. Det kan være en hvilken som helst pris du beregner selv, for eksempel fra gjennomsnittlig kjøpskurs pluss gjennomsnittlig produksjon og distribusjonkostnader.
 CostPriceUsage=Denne verdien kan brukes for kalkulering av marginer
 SoldAmount=Mengde solgt
 PurchasedAmount=Mengde kjøpt
 NewPrice=Ny pris
-MinPrice=Min. sell price
+MinPrice=Min. salgspris
 EditSellingPriceLabel=Rediger salgsprisetikett
 CantBeLessThanMinPrice=Salgsprisen kan ikke være lavere enn minste tillatte for denne varen (%s uten avgifter)
 ContractStatusClosed=Lukket
@@ -80,7 +80,7 @@ ErrorProductBadRefOrLabel=Ugyldig verdi for referanse eller etikett.
 ErrorProductClone=Det oppsto et problem ved forsøk på å klone varen eller tjenesten.
 ErrorPriceCantBeLowerThanMinPrice=Feil! Pris kan ikke være lavere enn minstepris
 Suppliers=Leverandører
-SupplierRef=Vendor SKU
+SupplierRef=Leverandør SKU
 ShowProduct=Vis vare
 ShowService=Vis tjeneste
 ProductsAndServicesArea=Område for varer/tjenester
@@ -89,7 +89,7 @@ ServicesArea=Tjenesteområde
 ListOfStockMovements=Vis lagerbevegelser
 BuyingPrice=Innkjøpspris
 PriceForEachProduct=Varer med spesifikke priser
-SupplierCard=Vendor card
+SupplierCard=Leverandørkort
 PriceRemoved=Pris fjernet
 BarCode=Strekkode
 BarcodeType=Strekkodetype
@@ -97,10 +97,10 @@ SetDefaultBarcodeType=Angi strekkodetype
 BarcodeValue=Strekkodeverdi
 NoteNotVisibleOnBill=Notat (vises ikke på fakturaer, tilbud...)
 ServiceLimitedDuration=Hvis varen er en tjeneste med begrenset varighet:
-MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+MultiPricesAbility=Flere prissegmenter for hver vare/tjeneste (hver kunde er i et segment)
 MultiPricesNumPrices=Pris antall
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
+AssociatedProductsAbility=Aktiver virtuelle varer (sett)
+AssociatedProducts=Virtuelle varer
 AssociatedProductsNumber=Antall tilknyttede varer
 ParentProductsNumber=Antall foreldre-komponentvarer
 ParentProducts=Foreldreprodukter
@@ -111,7 +111,7 @@ CategoryFilter=Kategorifilter
 ProductToAddSearch=Finn vare å legge til
 NoMatchFound=Ingen treff
 ListOfProductsServices=Liste over varer/tjenester
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductAssociationList=Liste over varer/tjenester som er komponent(er) av dette virtuelle varen/settet
 ProductParentList=Liste over produkter / tjenester med dette produktet som en komponent
 ErrorAssociationIsFatherOfThis=En av de valgte varene er foreldre til gjeldende vare
 DeleteProduct=Slett vare/tjeneste
@@ -124,19 +124,19 @@ ImportDataset_service_1=Tjenester
 DeleteProductLine=Slett varelinje
 ConfirmDeleteProductLine=Er du sikker på at du vil slette denne varelinjen?
 ProductSpecial=Spesial
-QtyMin=Min. purchase quantity
-PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
-VATRateForSupplierProduct=VAT Rate (for this vendor/product)
-DiscountQtyMin=Discount for this qty.
-NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
-NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
-PredefinedProductsToSell=Predefined Product
-PredefinedServicesToSell=Predefined Service
+QtyMin=Min. Innkjøpsmengde
+PriceQtyMin=Kvantumsrabatt min.
+PriceQtyMinCurrency=Pris (valuta) for denne kvantiteten. (ingen rabatt)
+VATRateForSupplierProduct=MVA (for denne leverandøren/varen)
+DiscountQtyMin=Rabatt for denne kvantiteten.
+NoPriceDefinedForThisSupplier=Ingen pris/antall definert for denne leverandøren/varen
+NoSupplierPriceDefinedForThisProduct=Ingen leverandørpris/antall definert for denne varen
+PredefinedProductsToSell=Forhåndsdefinert vare
+PredefinedServicesToSell=Forhåndsdefinert tjeneste
 PredefinedProductsAndServicesToSell=Salg av forhåndsdefinerte varer/tjenester
 PredefinedProductsToPurchase=Kjøp av forhåndsdefinert vare
 PredefinedServicesToPurchase=Kjøp av forhåndsdefinerte tjenester
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
+PredefinedProductsAndServicesToPurchase=Forhåndsdefinerte varer/tjenester til innkjøp
 NotPredefinedProducts=Ikke forhåndsdefinerte varer/tjenester
 GenerateThumb=Lag miniatyrbilde
 ServiceNb=Tjeneste #%s
@@ -146,9 +146,9 @@ ListServiceByPopularity=Liste av tjenester etter popularitet
 Finished=Ferdigvare
 RowMaterial=Råvare
 ConfirmCloneProduct=Er du sikker på at du vil klone vare eller tjeneste <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Klon all hovedinformasjon av vare/tjeneste
 ClonePricesProduct=Klon priser
-CloneCompositionProduct=Clone virtual product/service
+CloneCompositionProduct=Klon virtuelt vare/tjeneste
 CloneCombinationsProduct=Klon produktvarianter
 ProductIsUsed=Denne varen brukes
 NewRefForClone=Ref. av nye vare/tjeneste
@@ -156,10 +156,10 @@ SellingPrices=Utsalgspris
 BuyingPrices=Innkjøpspris
 CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
-SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
+SuppliersPricesOfProductsOrServices=Leverandørpriser (av varer eller tjenester)
 CustomCode=Toll / vare / HS-kode
 CountryOrigin=Opprinnelsesland
-Nature=Product Type (material/finished)
+Nature=Varetype (materiale/finish)
 ShortLabel=Kort etikett
 Unit=Enhet
 p= stk
@@ -203,7 +203,7 @@ PriceByQuantity=Prisen varierer med mengde
 DisablePriceByQty=Deaktiver mengderabatt
 PriceByQuantityRange=Kvantumssatser
 MultipriceRules=Prissegment-regler
-UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+UseMultipriceRules=Bruk prissegmentregler (definert i varemoduloppsett) for å automatisk beregne priser på alle andre segmenter i henhold til første segment
 PercentVariationOver=%% variasjon over %s
 PercentDiscountOver=%% rabatt på %s
 KeepEmptyForAutoCalculation=Hold tom for å få dette beregnet automatisk fra vekt eller volum av produkter
@@ -220,47 +220,47 @@ Quarter2=2. kvartal
 Quarter3=3. kvartal
 Quarter4=4. kvartal
 BarCodePrintsheet=Skriv strekkode
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+PageToGenerateBarCodeSheets=Med dette verktøyet kan du skrive ut ark med strekkode-klistremerker. Velg format på din klistremerkeside, type strekkode og verdi på strekkode, og klikk deretter på knappen <b> %s </b>.
 NumberOfStickers=Antall klistremerker som skal skrives ut på siden
 PrintsheetForOneBarCode=Skriv ut flere klistremerker for hver strekkode
 BuildPageToPrint=Generer side for utskrift
 FillBarCodeTypeAndValueManually=Fyll inn strekkode type og verdi manuelt
 FillBarCodeTypeAndValueFromProduct=Fyll inn strekkode type og verdi fra strekkoden på en vare.
 FillBarCodeTypeAndValueFromThirdParty=Fyll inn strekkodetype og verdi fra strekkoden til en tredjepart
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
-BarCodeDataForProduct=Barcode information of product %s:
-BarCodeDataForThirdparty=Barcode information of third party %s:
+DefinitionOfBarCodeForProductNotComplete=Definisjon av type eller verdi på strekkode er ikke komplett for produkt %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definisjon av type eller verdi på strekkode ikke komplett for tredjepart %s.
+BarCodeDataForProduct=Strekkodeinformasjon om vare %s:
+BarCodeDataForThirdparty=Strekkodeinformasjon om tredjepart %s:
 ResetBarcodeForAllRecords=Definer strekkode for alle poster (dette vil tilbakestille alle strekkoder som allerede er opprettet)
 PriceByCustomer=Ulike priser for hver kunde
 PriceCatalogue=En enkelt salgspris for hver vare/tjeneste
-PricingRule=Rules for selling prices
+PricingRule=Regler for utsalgspriser
 AddCustomerPrice=Legg til pris for kunde
 ForceUpdateChildPriceSoc=Sett samme pris for kundens datterselskaper
 PriceByCustomerLog=Logg over tidligere kundepriser
 MinimumPriceLimit=Minstepris kan ikke være lavere enn %s
-MinimumRecommendedPrice=Minimum recommended price is: %s
+MinimumRecommendedPrice=Minimum anbefalt pris er: %s
 PriceExpressionEditor=Pris-formel editor
 PriceExpressionSelected=Valgt formel for pris
 PriceExpressionEditorHelp1="pris = 2 + 2" eller "2 + 2" for å sette prisen. Bruk semikolon for å skille uttrykk
 PriceExpressionEditorHelp2=Du kan bruke EkstraFelt med variabler som <b>#ekstrafelt_mittekstrafeltnøkkel#</b> og globale variabler med <b>#global_minkode#</b>
-PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp3=I både varer/tjenester og leverandørpriser er disse variablene tilgjengelige:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=Kun i vare/tjeneste-pris:<b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
 PriceExpressionEditorHelp5=Tilgjengelige globale verdier:
 PriceMode=Prismodus
 PriceNumeric=Nummer
 DefaultPrice=Standardpris
 ComposedProductIncDecStock=Øk/minsk beholdning ved overordnet endring
-ComposedProduct=Child products
+ComposedProduct=Sub-varer
 MinSupplierPrice=Laveste innkjøpspris
 MinCustomerPrice=Minste salgspris
 DynamicPriceConfiguration=Dynamisk pris-konfigurering
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+DynamicPriceDesc=Du kan definere matematiske formler for å beregne kunde- eller leverandørpriser. Slike formler kan bruke alle matematiske operatører, noen konstanter og variabler. Du kan definere variablene du vil bruke. Hvis variabelen trenger en automatisk oppdatering, kan du definere den eksterne nettadressen for å tillate Dolibarr å oppdatere verdien automatisk.
 AddVariable=Legg til variabel
 AddUpdater=Velg oppdaterer
 GlobalVariables=Globale variabler
 VariableToUpdate=Variabel å oppdatere
-GlobalVariableUpdaters=Oppdatering av globale variabler
+GlobalVariableUpdaters=Eksterne oppdaterere for variabler
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parser JSON data fra angitt URL, VALUE spesifiserer lokasjonen til relevant verdi.
 GlobalVariableUpdaterHelpFormat0=Format for forespørsel {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -278,7 +278,7 @@ WarningSelectOneDocument=Velg minst ett dokument
 DefaultUnitToShow=Enhet
 NbOfQtyInProposals=Antall i tilbud
 ClinkOnALinkOfColumn=Klikk på en link i kolonnen %s for detaljert visning...
-ProductsOrServicesTranslations=Products/Services translations
+ProductsOrServicesTranslations=Oversettelser for Varer/Tjenester 
 TranslatedLabel=Oversatt etikett
 TranslatedDescription=Oversatt beskrivelse
 TranslatedNote=Oversatte notater
@@ -294,8 +294,8 @@ ProductSheet=Produktark
 ServiceSheet=Serviceark
 PossibleValues=Mulige verdier
 GoOnMenuToCreateVairants=Gå tilmenyen %s - %s for å forberede attributtvarianter (som farger, størrelse, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
-ProductSupplierDescription=Vendor description for the product
+UseProductFournDesc=Legg til en funksjon for å definere beskrivelser av varer som er definert av leverandørene, i tillegg til beskrivelser for kunder
+ProductSupplierDescription=Leverandørs beskrivelse av produktet
 #Attributes
 VariantAttributes=Variantattributter
 ProductAttributes=Variantattributter for varer
@@ -327,15 +327,16 @@ DoNotRemovePreviousCombinations=Ikke fjern tidligere varevarianter
 UsePercentageVariations=Brok prosentvise variasjoner
 PercentageVariation=Variasjonsprosent
 ErrorDeletingGeneratedProducts=Det oppsto en feil under sletting av eksisterende varevarianter
-NbOfDifferentValues=No. of different values
-NbProducts=No. of products
+NbOfDifferentValues=Antall forskjellige verdier
+NbProducts=Antall varer
 ParentProduct=Komponent-vare
 HideChildProducts=Skjul variantprodukter
-ShowChildProducts=Show variant products
-NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+ShowChildProducts=Vis varevarianter
+NoEditVariants=Gå til foreldre-varekort og rediger varianters prispåvirkning i varianter-fanen
 ConfirmCloneProductCombinations=Vil du kopiere alle produktvarianter til det andre overordnede produktet med den oppgitte referansen?
 CloneDestinationReference=Varereferanse-destinasjon
 ErrorCopyProductCombinations=Det oppstod en feil under kopiering av produktvarianter
 ErrorDestinationProductNotFound=Varereferanse-destinasjon ikke funnet
 ErrorProductCombinationNotFound=Varevariant ikke funnet
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ActionAvailableOnVariantProductOnly=Handling kun tilgjengelig på varianter av varen
+ProductsPricePerCustomer=Varepriser per kunde
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index ddc3e06a802..0ce0327f3e7 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -7,7 +7,7 @@ ProjectsArea=Prosjektområde
 ProjectStatus=Prosjektstatus
 SharedProject=Alle
 PrivateProject=Prosjektkontakter
-ProjectsImContactFor=Projects for I am explicitly a contact
+ProjectsImContactFor=Prosjekter der kun jeg er kontaktperson
 AllAllowedProjects=Alt prosjekter jeg kan lese (min + offentlig)
 AllProjects=Alle prosjekter
 MyProjectsDesc=Denne visningen er begrenset til prosjekter du er en kontakt for
@@ -33,19 +33,20 @@ ConfirmDeleteAProject=Er du sikker på at du vil slette dette prosjektet?
 ConfirmDeleteATask=Er du sikker på at du vil slette denne oppgaven?
 OpenedProjects=Åpne prosjekter
 OpenedTasks=Åpne oppgaver
-OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
-OpportunitiesStatusForProjects=Leads amount of projects by status
+OpportunitiesStatusForOpenedProjects=Leads-beløp i  åpne prosjekter, etter status
+OpportunitiesStatusForProjects=Leads-beløp i prosjekter, etter status
 ShowProject=Vis prosjekt
 ShowTask=Vis oppgave
 SetProject=Sett prosjekt
 NoProject=Ingen prosjekter definert
-NbOfProjects=No. of projects
-NbOfTasks=No. of tasks
+NbOfProjects=Antall prosjekter
+NbOfTasks=Antall oppgaver
 TimeSpent=Tid brukt
 TimeSpentByYou=Tid bruk av deg
 TimeSpentByUser=Tid brukt av bruker
 TimesSpent=Tid brukt
-RefTask=Ref. oppgave
+TaskId=Oppgave ID
+RefTask=Oppgave ref.
 LabelTask=Oppgaveetikett
 TaskTimeSpent=Tid brukt på oppgaver
 TaskTimeUser=Bruker
@@ -56,9 +57,9 @@ WorkloadNotDefined=Arbeidsmengde ikke definert
 NewTimeSpent=Tid brukt
 MyTimeSpent=Mitt tidsforbruk
 BillTime=Fakturer brukt tid 
-BillTimeShort=Bill time
-TimeToBill=Time not billed
-TimeBilled=Time billed
+BillTimeShort=Fakturer tid
+TimeToBill=Tid ikke fakturert
+TimeBilled=Tid fakturert
 Tasks=Oppgaver
 Task=Oppgave
 TaskDateStart=Oppgave startdato
@@ -82,20 +83,20 @@ GoToListOfTimeConsumed=Gå til liste for tidsbruk
 GoToListOfTasks=Gå til oppgaveliste
 GoToGanttView=Gå til Gantt-visning
 GanttView=Gantt visning
-ListProposalsAssociatedProject=List of the commercial proposals related to the project
-ListOrdersAssociatedProject=List of sales orders related to the project
-ListInvoicesAssociatedProject=List of customer invoices related to the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
-ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
-ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
-ListContractAssociatedProject=List of contracts related to the project
-ListShippingAssociatedProject=List of shippings related to the project
-ListFichinterAssociatedProject=List of interventions related to the project
-ListExpenseReportsAssociatedProject=List of expense reports related to the project
-ListDonationsAssociatedProject=List of donations related to the project
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
-ListSalariesAssociatedProject=List of payments of salaries related to the project
-ListActionsAssociatedProject=List of events related to the project
+ListProposalsAssociatedProject=Liste over tilbud knyttet til prosjektet
+ListOrdersAssociatedProject=Liste over salgsordre knyttet til prosjektet
+ListInvoicesAssociatedProject=Liste over kundefakturaer knyttet til prosjektet
+ListPredefinedInvoicesAssociatedProject=Liste over kunde-fakturamaler knyttet til prosjektet
+ListSupplierOrdersAssociatedProject=Liste over innkjøpsordre knyttet til prosjektet
+ListSupplierInvoicesAssociatedProject=Liste over leverandørfakturaer knyttet til prosjektet
+ListContractAssociatedProject=Liste over kontrakter knyttet til prosjektet
+ListShippingAssociatedProject=Liste over forsendelser som er knyttet til prosjektet
+ListFichinterAssociatedProject=Liste over intervensjoner knyttet til prosjektet
+ListExpenseReportsAssociatedProject=Liste over kostnadsrapporter relatert til prosjektet
+ListDonationsAssociatedProject=Liste over donasjoner knyttet til prosjektet
+ListVariousPaymentsAssociatedProject=Liste over diverse betalinger knyttet til prosjektet
+ListSalariesAssociatedProject=Liste over lønnsutbetalinger knyttet til prosjektet
+ListActionsAssociatedProject=Liste over hendelser knyttet til prosjektet
 ListTaskTimeUserProject=Liste over tidsbruk på oppgaver i prosjektet
 ListTaskTimeForTask=Liste over tid forbruket på oppgaven
 ActivityOnProjectToday=Prosjektaktivitet i dag
@@ -125,7 +126,7 @@ DeleteATimeSpent=Slett tidsbruk
 ConfirmDeleteATimeSpent=Er du sikker på at du vil slette dette tidsforbruket?
 DoNotShowMyTasksOnly=Se oppgaver som tilhører andre, også
 ShowMyTasksOnly=Vis kun oppgaver som tilhører meg
-TaskRessourceLinks=Contacts of task
+TaskRessourceLinks=Oppgavekontakter
 ProjectsDedicatedToThisThirdParty=Prosjekter dedikert til denne tredjepart
 NoTasks=Ingen oppgaver for dette prosjektet
 LinkedToAnotherCompany=Knyttet opp til annen tredjepart
@@ -151,12 +152,12 @@ TaskModifiedInDolibarr=Oppgave %s endret
 TaskDeletedInDolibarr=Oppgave %s slettet
 OpportunityStatus=Lead status
 OpportunityStatusShort=Lead status
-OpportunityProbability=Lead probability
-OpportunityProbabilityShort=Lead probab.
-OpportunityAmount=Lead amount
-OpportunityAmountShort=Lead amount
-OpportunityAmountAverageShort=Average lead amount
-OpportunityAmountWeigthedShort=Weighted lead amount
+OpportunityProbability=Lead sannsynlighet
+OpportunityProbabilityShort=Lead sansyn.
+OpportunityAmount=Lead beløp
+OpportunityAmountShort=Lead beløp
+OpportunityAmountAverageShort=Gjennomsnittlig lead beløp
+OpportunityAmountWeigthedShort=Vektet lead beløp
 WonLostExcluded=Vunnet/tapt ekskludert
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Prosjektleder
@@ -170,9 +171,9 @@ TypeContact_project_task_external_TASKCONTRIBUTOR=Bidragsyter
 SelectElement=Velg element
 AddElement=Lenke til element
 # Documents models
-DocumentModelBeluga=Project document template for linked objects overview
-DocumentModelBaleine=Project document template for tasks
-DocumentModelTimeSpent=Project report template for time spent
+DocumentModelBeluga=Prosjekt-dokumentmal for oversikt over koblede objekter
+DocumentModelBaleine=Prosjektdokumentmal for oppgaver
+DocumentModelTimeSpent=Prosjektrapportmal for tidsbruk
 PlannedWorkload=Planlagt arbeidsmengde
 PlannedWorkloadShort=Arbeidsmengde
 ProjectReferers=Relaterte elementer
@@ -186,7 +187,7 @@ ProjectsWithThisUserAsContact=Prosjekter med denne brukeren som kontakt
 TasksWithThisUserAsContact=Oppgaver tildelt denne brukeren
 ResourceNotAssignedToProject=Ikke tildelt til prosjekt
 ResourceNotAssignedToTheTask=Ikke tildelt oppgaven
-NoUserAssignedToTheProject=No users assigned to this project
+NoUserAssignedToTheProject=Ingen brukere tilordnet dette prosjektet
 TimeSpentBy=Tid brukt av
 TasksAssignedTo=Oppgaver tildelt
 AssignTaskToMe=Tildel oppgaven til meg
@@ -194,26 +195,26 @@ AssignTaskToUser=Tildel oppgave til %s
 SelectTaskToAssign=Velg oppgave å tildele...
 AssignTask=Tildel
 ProjectOverview=Oversikt
-ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
+ManageTasks=Bruk prosjekter for å følge oppgaver og/eller rapportere tid brukt (timelister)
 ManageOpportunitiesStatus=Bruk prosjekter for å følge muligheter
-ProjectNbProjectByMonth=No. of created projects by month
-ProjectNbTaskByMonth=No. of created tasks by month
-ProjectOppAmountOfProjectsByMonth=Amount of leads by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
+ProjectNbProjectByMonth=Antall opprettede prosjekter etter måned
+ProjectNbTaskByMonth=Antall opprettede oppgaver etter måned
+ProjectOppAmountOfProjectsByMonth=Beløp i leads pr. måned
+ProjectWeightedOppAmountOfProjectsByMonth=Vektet beløp i leads pr. måned
+ProjectOpenedProjectByOppStatus=Åpne prosjekt/lead etter lead-status
 ProjectsStatistics=Statistikk over muligheter
 TasksStatistics=Statistikk over prosjekter/hovedoppgaver
 TaskAssignedToEnterTime=Oppgave tildelt. Tidsbruk kan legges til
 IdTaskTime=Oppgave-tid ID
-YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
+YouCanCompleteRef=Hvis du vil fullføre referansen med en suffiks, anbefales det å legge til et tegn for å skille det, slik at den automatiske nummereringen fortsatt fungerer riktig for neste prosjekt. For eksempel %s-MYSUFFIX
 OpenedProjectsByThirdparties=Åpne prosjekter etter tredjeparter
-OnlyOpportunitiesShort=Only leads
-OpenedOpportunitiesShort=Open leads
-NotOpenedOpportunitiesShort=Not an open lead
-NotAnOpportunityShort=Not a lead
-OpportunityTotalAmount=Total amount of leads
-OpportunityPonderatedAmount=Weighted amount of leads
-OpportunityPonderatedAmountDesc=Leads amount weighted with probability
+OnlyOpportunitiesShort=Bare leads
+OpenedOpportunitiesShort=Åpne leads
+NotOpenedOpportunitiesShort=Ikke en åpen lead
+NotAnOpportunityShort=Ikke en lead
+OpportunityTotalAmount=Totalt beløp på leads
+OpportunityPonderatedAmount=Vektet beløp på leads
+OpportunityPonderatedAmountDesc=Leads-beløp vektet mot sannsynlighet
 OppStatusPROSP=Utforskning
 OppStatusQUAL=Kvalifikasjon
 OppStatusPROPO=Tilbud
@@ -222,12 +223,12 @@ OppStatusPENDING=Venter
 OppStatusWON=Vunnet
 OppStatusLOST=Tapt
 Budget=Budsjett
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
+AllowToLinkFromOtherCompany=Tillat å koble prosjekt fra annet firma <br> <br> <u> Støttede verdier: </u> <br> - Hold tom: Kan lenke eventuelle prosjekt fra selskapet (standard) <br> - "alle": Kan lenke eventuelle prosjekter, selv prosjekt fra andre selskaper <br> - En liste over tredjeparts ID, separert med kommaer: Kan lenke alle definerte prosjekter fra disse tredjepartene (Eksempel: 123,4795,53) <br>
 LatestProjects=Siste %s prosjekter
 LatestModifiedProjects=Siste %s endrede prosjekter
 OtherFilteredTasks=Andre filtrerte oppgaver
-NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+NoAssignedTasks=Ingen tildelte oppgaver funnet (tilordne prosjekt/oppgaver til den nåværende brukeren fra den øverste valgboksen for å legge inn tid på den)
+ThirdPartyRequiredToGenerateInvoice=En tredjepart må defineres på prosjektet for å kunne fakturere det.
 # Comments trans
 AllowCommentOnTask=Tillat brukerkommentarer på oppgaver
 AllowCommentOnProject=Tillat brukerkommentarer på prosjekter
@@ -235,11 +236,11 @@ DontHavePermissionForCloseProject=Du har ikke tillatelse til å lukke prosjektet
 DontHaveTheValidateStatus=Prosjektet %s må være åpent for å kunne lukkes
 RecordsClosed=%s prosjekt(er) lukket
 SendProjectRef=Informasjon prosjekt %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
-NewTaskRefSuggested=Task ref already used, a new task ref is required
-TimeSpentInvoiced=Time spent billed
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Modul 'Lønn' må være aktivert for å definere ansattes timepris for å få tidsbruk verdsatt
+NewTaskRefSuggested=Oppgavereferanse allerede brukt, en ny oppgavereferanse er nødvendig
+TimeSpentInvoiced=Tidsbruk fakturert
 TimeSpentForInvoice=Tid brukt
-OneLinePerUser=One line per user
-ServiceToUseOnLines=Service to use on lines
-InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+OneLinePerUser=Én linje per bruker
+ServiceToUseOnLines=Tjeneste for bruk på linjer
+InvoiceGeneratedFromTimeSpent=Faktura %s er generert fra tid brukt på prosjekt
+ProjectBillTimeDescription=Sjekk om du oppgir timeiiste på prosjektoppgaver OG du planlegger å generere faktura(er) fra timelisten for å fakturere kunden til prosjektet (ikke sjekk om du planlegger å opprette en faktura som ikke er basert på innlagte timelister).
diff --git a/htdocs/langs/nb_NO/propal.lang b/htdocs/langs/nb_NO/propal.lang
index 7b00fe6ccea..2d019d163a3 100644
--- a/htdocs/langs/nb_NO/propal.lang
+++ b/htdocs/langs/nb_NO/propal.lang
@@ -22,7 +22,7 @@ SearchAProposal=Søk i tilbud
 NoProposal=Ingen tilbud
 ProposalsStatistics=Tilbudsstatistikk
 NumberOfProposalsByMonth=Antall tilbud pr måned
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+AmountOfProposalsByMonthHT=Beløp per måned (ekskl. MVA)
 NbOfProposals=Antall tilbud
 ShowPropal=Vis tilbud
 PropalsDraft=Kladder
@@ -33,7 +33,7 @@ PropalStatusSigned=Akseptert(kan faktureres)
 PropalStatusNotSigned=Ikke akseptert(lukket)
 PropalStatusBilled=Fakturert
 PropalStatusDraftShort=Kladd
-PropalStatusValidatedShort=Validated (open)
+PropalStatusValidatedShort=Validert (åpen)
 PropalStatusClosedShort=Lukket
 PropalStatusSignedShort=Signert
 PropalStatusNotSignedShort=Ikke signert
@@ -55,13 +55,13 @@ NoDraftProposals=Ingen tilbudsutkast
 CopyPropalFrom=Opprett nytt tilbud ved å kopiere et eksisterende
 CreateEmptyPropal=Opprett et tomt tilbud eller fra listen over varer/tjenester
 DefaultProposalDurationValidity=Standard gyldighetstid for tilbud (dager)
-UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Bruk kontakt/adresse med typen 'Kontakt tilbudsoppfølging' hvis det er definert, i stedet for tredjepartsadresse som mottakeradresse av tilbud
 ConfirmClonePropal=Er du sikker på at du vil klone tilbudet <b>%s</b>?
 ConfirmReOpenProp=Er du sikker på at du vil gjenåpne tilbudet <b>%s</b>?
 ProposalsAndProposalsLines=Tilbud og linjer
 ProposalLine=Tilbudslinje
-AvailabilityPeriod=Tilgjengelighet forsinkelse
-SetAvailability=Sett tilgjengelighet forsinkelse
+AvailabilityPeriod=Tilgjengelig forsinkelse
+SetAvailability=Sett tilgjengelig forsinkelse
 AfterOrder=etter bestilling
 OtherProposals=Andre tilbud
 ##### Availability #####
@@ -82,4 +82,4 @@ DefaultModelPropalCreate=Standard modellbygging
 DefaultModelPropalToBill=Standardmal når du lukker et tilbud (som skal faktureres)
 DefaultModelPropalClosed=Standardmal når du lukker et tilbud (ufakturert)
 ProposalCustomerSignature=Skriftlig aksept, firmastempel, dato og signatur
-ProposalsStatisticsSuppliers=Vendor proposals statistics
+ProposalsStatisticsSuppliers=Leverandørs tilbudsstatistikk
diff --git a/htdocs/langs/nb_NO/stripe.lang b/htdocs/langs/nb_NO/stripe.lang
index 6cc525823e3..431c64269fc 100644
--- a/htdocs/langs/nb_NO/stripe.lang
+++ b/htdocs/langs/nb_NO/stripe.lang
@@ -12,7 +12,7 @@ YourEMail=E-post for betalingsbekreftelsen
 STRIPE_PAYONLINE_SENDEMAIL=Epostvarsling etter betalingsforsøk (vellykket eller feilet)
 Creditor=Kreditor
 PaymentCode=Betalingskode
-StripeDoPayment=Betal med kredit- eller debet-kort (Stripe)
+StripeDoPayment=Betal med stripe
 YouWillBeRedirectedOnStripe=Du blir omdirigert til en sikret Stripeside for å legge inn kredittkortinformasjon
 Continue=Neste
 ToOfferALinkForOnlinePayment=URL for %s betaling
@@ -40,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook-nøkkel
 ONLINE_PAYMENT_WAREHOUSE=Lager som skal brukes for lagernedskrivning når nettbasert betaling er utført<br> (TODO Når alternativet for å redusere lagerbeholdningen gjøres på en faktura handling, og online betaling genererer fakturaen?)
 StripeLiveEnabled=Stripe live aktivert (ellers test/sandbox modus)
 StripeImportPayment=Importer Stripe-betalinger
-ExampleOfTestCreditCard=Eksempel på kredittkort for test: %s (gyldig), %s (feil CVC), %s (utløpt), %s (belastning mislykkes)
+ExampleOfTestCreditCard=Eksempel på kredittkort for test: %s => gyldig, %s => feil CVC, %s => utløpt, %s => belastning mislykket
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca. _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca. _...)
@@ -63,3 +63,5 @@ CreateCardOnStripe=Lag kort på Stripe
 ShowInStripe=Vis i Stripe
 StripeUserAccountForActions=Brukerkonto til bruk for e-postvarsling av noen Stripe-hendelser (Stripe-utbetalinger)
 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)
diff --git a/htdocs/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang
index d2ce975131b..aa790649667 100644
--- a/htdocs/langs/nb_NO/trips.lang
+++ b/htdocs/langs/nb_NO/trips.lang
@@ -23,7 +23,7 @@ ClassifyRefunded=Klassifisert 'refundert'
 ExpenseReportWaitingForApproval=En ny reiseregning er sendt inn for godkjenning
 ExpenseReportWaitingForApprovalMessage=En ny kostnadsrapport er sendt og venter på godkjenning. <br> - Bruker: %s <br> - Periode: %s <br> Klikk her for å validere: %s
 ExpenseReportWaitingForReApproval=En utgiftsrapport er blitt sendt inn for ny godkjenning
-ExpenseReportWaitingForReApprovalMessage=En kostnadsrapport er sendt og venter på godkjenning. <br> %s, du nektet å godkjenne kostnadsrapporten av denne årsak: %s.<br> En ny versjon har blitt foreslått og venter på godkjenning.<br> - Bruker: %s <br> - Periode: %s<br> Klikk her for å validere: %s
+ExpenseReportWaitingForReApprovalMessage=En kostnadsrapport er sendt og venter på re-godkjenning. <br> %s, du nektet å godkjenne kostnadsrapporten av denne årsak: %s.<br> En ny versjon har blitt foreslått og venter på godkjenning.<br> - Bruker: %s <br> - Periode: %s<br> Klikk her for å validere: %s
 ExpenseReportApproved=En utgiftsrapport ble godkjent
 ExpenseReportApprovedMessage=Utgiftsrapporten %s ble godkjent. <br> - Bruker: %s <br> - Godkjent av: %s <br> Klikk her for å vise utgiftsrapporten: %s
 ExpenseReportRefused=En utgiftsrapport ble avvist
@@ -73,7 +73,7 @@ EX_PAR_VP=Parkering PV
 EX_CAM_VP=PV vedlikehold og reparasjon
 DefaultCategoryCar=Standard transportmetode
 DefaultRangeNumber=Standard område nummer
-UploadANewFileNow=Upload a new document now
+UploadANewFileNow=Last opp et nytt dokument nå
 Error_EXPENSEREPORT_ADDON_NotDefined=Feil, regelen for utgiftsrapport-nummerering ref ble ikke definert i oppsett av modulen 'Utgiftsrapport'
 ErrorDoubleDeclaration=Du har opprettet en annen reiseregning i overlappende tidsperiode
 AucuneLigne=Ingen reiseregning er opprettet enda
@@ -103,7 +103,7 @@ ConfirmPaidTrip=Er du sikker på at du vil endre status på denne utgiftsrapport
 ConfirmCancelTrip=Er du sikker på at du vil kansellere denne utgiftsrapporten?
 BrouillonnerTrip=Endre reiseregning til "kladd"
 ConfirmBrouillonnerTrip=Er du sikker på at du vil endre status på denne utgiftsrapporten til "utkast"?
-SaveTrip=Godkjenn reiseregning
+SaveTrip=Valider reiseregning
 ConfirmSaveTrip=Er du sikker på at du vil validere denne utgiftsrapporten?
 NoTripsToExportCSV=Ingen reiseregning å eksportere for denne perioden
 ExpenseReportPayment=Betaling av utgiftsrapport
@@ -148,4 +148,4 @@ nolimitbyEX_EXP=etter linje (ingen begrensning)
 CarCategory=Bilkategori
 ExpenseRangeOffset=Offset-beløp: %s
 RangeIk=Kilometerstand
-AttachTheNewLineToTheDocument=Attach the new line to an existing document
+AttachTheNewLineToTheDocument=Fest linjen til et opplastet dokument
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index 50a8f8fb85c..a75055498dc 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -39,8 +39,8 @@ ViewPageInNewTab=Vis side i ny fane
 SetAsHomePage=Sett som startside
 RealURL=Virkelig URL
 ViewWebsiteInProduction=Vis webside ved hjelp av  hjemme-URL
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
-YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost= <u> Bruk med Apache/NGinx/... </u> <br> Hvis du kan opprette, på webserveren din (Apache, Nginx, ...), en dedikert Virtuell Vert med PHP-aktivert og en Root-katalog på <br> <strong> %s </strong> <br> deretter satt navnet på den virtuelle verten du har opprettet i egenskapene til nettstedet, slik at forhåndsvisningen kan gjøres også ved hjelp av denne dedikerte webservertilgangen i stedet for den interne Dolibarr-serveren.
+YouCanAlsoTestWithPHPS= <u> Bruk med PHP-innebygd server </u> <br> I utviklingsmiljø kan du foretrekke å teste nettstedet med PHP-innebygd webserver (PHP 5.5 nødvendig) ved å kjøre <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
 CheckVirtualHostPerms=Sjekk også at virtuell vert har tillatelse <strong>%s</strong> på filer til <br><strong>%s</strong>
 ReadPerm=Les
 WritePerm=Skriv
@@ -77,9 +77,9 @@ DisableSiteFirst=Deaktiver nettsted først
 MyContainerTitle=Mitt nettsteds tittel
 AnotherContainer=En annen container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Aktiver nettstedkontotabellen
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktiver tabellen for å lagre nettstedkontoer (innlogging/pass) for hvert nettsted/tredjepart
 YouMustDefineTheHomePage=Du må først definere standard startside
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Advarsel: Å opprette en nettside ved å importere en ekstern nettside er for erfarne brukere. Avhengig av kompleksiteten til kildesiden, kan resultatet av importen avvike fra originalen. Også hvis kildesiden bruker vanlige CSS-stiler eller motstridende javascript, kan det ødelegge utseendet eller funksjonene til nettsideeditoren når du arbeider på denne siden. Denne metoden er en raskere måte å opprette en side på, men det anbefales å lage din nye side fra grunnen av eller fra en foreslått sidemal. <br> Vær også oppmerksom på at endringer i HTML-kilden vil være mulig når sideinnholdet er initialisert ved å ta det fra en ekstern side ("Online" editor vil IKKE være tilgjengelig)
 OnlyEditionOfSourceForGrabbedContent=Kun HTML-kilde er mulig når innholdet ble tatt fra et eksternt nettsted
 GrabImagesInto=Hent bilder som er funnet i css og side også.
 ImagesShouldBeSavedInto=Bilder bør lagres i katalogen
@@ -95,4 +95,9 @@ InternalURLOfPage=Intern URL til siden
 ThisPageIsTranslationOf=Denne siden/containeren er en oversettelse av
 ThisPageHasTranslationPages=Denne siden/containeren har oversettelse
 NoWebSiteCreateOneFirst=Ingen nettside er opprettet ennå. Opprett en først.
-GoTo=Go to
+GoTo=Gå til
+DynamicPHPCodeContainsAForbiddenInstruction=Du legger til dynamisk PHP-kode som inneholder PHP-instruksjonen '<strong>%s</strong>' som vanligvis er forbudt som dynamisk innhold (se skjulte alternativer WEBSITE_PHP_ALLOW_xxx for å øke listen over tillatte kommandoer).
+NotAllowedToAddDynamicContent=Du har ikke tillatelse til å legge til eller redigere PHP dynamisk innhold på nettsteder. Be om tillatelse eller behold koden i php-kodene uendret.
+ReplaceWebsiteContent=Erstatt nettsideinnhold
+DeleteAlsoJs=Slett også alle javascript-filer som er spesifikke for denne nettsiden?
+DeleteAlsoMedias=Slett også alle mediefiler som er spesifikke for denne nettsiden?
diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
index 492ae82a5ee..119e3b4882f 100644
--- a/htdocs/langs/nl_BE/accountancy.lang
+++ b/htdocs/langs/nl_BE/accountancy.lang
@@ -17,12 +17,12 @@ AccountAccountingShort=Rekening
 AccountAccountingSuggest=Voorgesteld boekhoudkundige rekening
 CreateMvts=Nieuwe transactie maken
 UpdateMvts=Wijzigen van een transactie
-WriteBookKeeping=Wegschrijven van transacties naar grootboek.
 Processing=Verwerken
 EndProcessing=Verwerking beëindigd
 Lineofinvoice=Factuur lijn
 Docdate=Datum
 Docref=Artikelcode
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
 TotalVente=Totaal omzet voor belastingen
 AccountingJournalType2=Verkoop
 AccountingJournalType3=Inkoop
diff --git a/htdocs/langs/nl_BE/holiday.lang b/htdocs/langs/nl_BE/holiday.lang
index 7f668cff160..0a450898ef5 100644
--- a/htdocs/langs/nl_BE/holiday.lang
+++ b/htdocs/langs/nl_BE/holiday.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - holiday
-MenuConfCP=Balans van de verloven
 FollowedByACounter=1: Dit type van verlof moet worden opgevolgd door een teller. De teller wordt manueel vermeerderd of automatisch wanneer een verlof is goedgekeurd, de teller wordt verminderd .<br>0: Niet opgevolgd door een teller.
 NoLeaveWithCounterDefined=Er zijn geen verlof types gedefinieerd dat moet opgevolgd worden door een teller
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index efafed78efa..f2ca5cf2b82 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -98,7 +98,7 @@ MenuLoanAccounts=Grootboekrekeningen lonen
 MenuProductsAccounts=Grootboekrekeningen producten
 MenuClosureAccounts=Sluitingsaccounts
 ProductsBinding=Grootboekrekeningen producten
-TransferInAccounting=Transfer in accounting
+TransferInAccounting=Boeken in de boekhouding
 RegistrationInAccounting=Registration in accounting
 Binding=Koppelen aan grootboekrekening
 CustomersVentilation=Koppeling verkoopfacturen klant
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Declaraties koppelen aan rekening
 CreateMvts=Nieuwe boeking
 UpdateMvts=Aanpassing boeking
 ValidTransaction=Transacties valideren
-WriteBookKeeping=Doorboeken in boekhouding
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Grootboek
 AccountBalance=Saldo
 ObjectsRef=Ref. bron-object 
@@ -155,7 +155,7 @@ ACCOUNTING_HAS_NEW_JOURNAL=Nieuw Has Journaal
 
 ACCOUNTING_RESULT_PROFIT=Resultaat grootboekrekening (winst)
 ACCOUNTING_RESULT_LOSS=Resultaat grootboekrekening (Verlies)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Afsluiten journaal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
 
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standaard grootboekrekening inkoop producten (indien niet opgegeven bij productgegevens)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standaard grootboekrekening omzet producten (indien niet opgegeven bij productgegevens)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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=Standaard grootboekrekening inkoop diensten (indien niet opgegeven bij dienstgegevens)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standaard grootboekrekening omzet diensten (indien niet opgegeven bij dienstgegevens)
 
@@ -175,10 +175,11 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Werking label
-Sens=Sens
+Sens=D/C
 LetteringCode=Belettering code
+Lettering=Lettering
 Codejournal=Journaal
-JournalLabel=Journal label
+JournalLabel=Journaal label
 NumPiece=Boekingstuk
 TransactionNumShort=Transactienummer
 AccountingCategory=Gepersonaliseerde groepen
@@ -213,9 +214,9 @@ AddCompteFromBK=Grootboekrekeningen aan groep toevoegen
 ReportThirdParty=Geef account van derden weer
 DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
-UnknownAccountForThirdparty=Unknown third-party account. We will use %s
+UnknownAccountForThirdparty=Onbekende relatie-rekening. Gebruikt wordt 1%s
 UnknownAccountForThirdpartyBlocking=Blokkeringsfout. Onbekende relatierekening. 
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Tegenrekening relatie niet gedefinieerd of relatie onbekend. Blokkeringsfout.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Betaling niet gekoppeld aan een product / dienst
 
@@ -233,7 +234,7 @@ DescVentilTodoCustomer=Koppel factuurregels welke nog niet verbonden zijn met ee
 ChangeAccount=Wijzig de product/dienst grootboekrekening voor geselecteerde regels met de volgende grootboekrekening:
 Vide=-
 DescVentilSupplier=Raadpleeg hier de lijst met leveranciersfactuurregels die al dan niet gebonden zijn aan een productaccount
-DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
+DescVentilDoneSupplier=Raadpleeg hier de regels van de leveranciers facturen en hun tegenrekening
 DescVentilTodoExpenseReport=Koppel kosten-boekregels aan grootboekrekeningen welke nog niet zijn vastgelegd
 DescVentilExpenseReport=Hier kunt u de lijst raadplegen van kostenregels om te koppelen aan een grootboekrekening (of niet).
 DescVentilExpenseReportMore=Als u een account instelt op het type onkostendeclaratieregels, kan de toepassing alle bindingen maken tussen uw declaratieregels en de boekhoudrekening van uw rekeningschema, met één klik met de knop <strong> "%s" </ strong>. Als het account niet is ingesteld op het tarievenwoordenboek of als u nog steeds regels hebt die niet aan een account zijn gekoppeld, moet u een manuele binding maken via het menu "<strong> %s </ strong>".
@@ -256,7 +257,7 @@ NotYetAccounted=Nog niet doorgeboekt in boekhouding
 
 ## Admin
 ApplyMassCategories=Categorieën  a-mass toepassen
-AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
+AddAccountFromBookKeepingWithNoCategories=Beschikbare rekening nog niet in de gepersonaliseerde groep
 CategoryDeleted=Categorie van deze grootboekrekening is verwijderd
 AccountingJournals=Dagboeken
 AccountingJournal=Dagboek
@@ -272,7 +273,7 @@ AccountingJournalType8=Voorraad
 AccountingJournalType9=HAS-nieuw
 ErrorAccountingJournalIsAlreadyUse=Dit dagboek is al in gebruik
 AccountingAccountForSalesTaxAreDefinedInto=Opmerking: Grootboekrekeningen voor BTW worden vastgelegd in menukeuze <b>%s</b>-<b>%s</b>
-NumberOfAccountancyEntries=Number of entries
+NumberOfAccountancyEntries=Aantal boekingen
 NumberOfAccountancyMovements=Aantal veranderingen
 
 ## Export
@@ -280,16 +281,18 @@ ExportDraftJournal=Journaal exporteren
 Modelcsv=Export model
 Selectmodelcsv=Selecteer een export model
 Modelcsv_normal=Klassieke 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_CEGID=Exporteren naar CEGID Expert Comptabilité
+Modelcsv_COALA=Exporteren naar Sage Coala
+Modelcsv_bob50=Exporteren naar Sage BOB 50
+Modelcsv_ciel=Exporteren naar Sage Ciel Compta of Compta Evolution
+Modelcsv_quadratus=Exporteren naar Quadratus QuadraCompta
+Modelcsv_ebp=Exporteren naar EBP
+Modelcsv_cogilog=Exporteren naar Cogilog
+Modelcsv_agiris=Exporteren naar Agiris
+Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Configureerbare CSV export
-Modelcsv_FEC=FEC exporteren (artikel L47 A) (test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Rekeningschema Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=Hier kunt u een standaard grootboekrekening koppelen aan sala
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=Opties
 OptionModeProductSell=Instellingen verkopen
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Instellingen inkopen
 OptionModeProductSellDesc=Omzet grootboekrekening bij producten
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Inkoop grootboekrekening bij producten
 CleanFixHistory=Verwijder tegenrekening van regels welke niet voorkomen in het rekeningschema
 CleanHistory=Verwijder alle koppelingen van gekozen boekjaar,
@@ -308,7 +315,7 @@ PredefinedGroups=Voorgedefinieerde groepen
 WithoutValidAccount=Zonder geldig toegewezen grootboekrekening
 WithValidAccount=Met geldig toegewezen grootboekrekening
 ValueNotIntoChartOfAccount=Deze grootboekrekening is niet aanwezig in het rekeningschema
-AccountRemovedFromGroup=Account removed from group
+AccountRemovedFromGroup=Rekening uit groep verwijderd.
 
 ## Dictionary
 Range=Grootboeknummer van/tot
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index d133edb6525..352ac57f724 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Ook als u een groot aantal relaties (> 100 000)
 UseSearchToSelectContactTooltip=Ook als u een groot aantal relaties (> 100 000) heeft, kunt u de snelheid verhogen door constante CONTACT_DONOTSEARCH_ANYWHERE in Setup -> Overig op 1 te zetten. Zoeken wordt dan beperkt tot het begin van de reeks.
 DelaiedFullListToSelectCompany=Wacht tot een toets wordt ingedrukt voordat inhoud van de keuzelijst met relaties wordt geladen.<br>Dit kan de prestaties verbeteren als u een groot aantal relaties hebt, maar dit is minder handig.
 DelaiedFullListToSelectContact=Wacht tot een toets wordt ingedrukt voordat inhoud van Contact combo-lijst wordt geladen. <br> Dit kan de prestaties verbeteren als je een groot aantal contacten hebt, maar het is minder handig)
-NumberOfKeyToSearch=Aantal karakters om een zoekopdracht te initiëren: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Aantal bytes
+SearchString=Zoekstring
 NotAvailableWhenAjaxDisabled=Niet beschikbaar wanneer AJAX functionaliteit uitgeschakeld is
 AllowToSelectProjectFromOtherCompany=Bij een document van een relatiej, kan een project worden gekozen dat is gekoppeld aan een relatie
 JavascriptDisabled=JavaScript uitgeschakeld
@@ -378,15 +380,15 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> moet eerst worden ingeschakeld als je
 SecurityToken=Sleutel tot URL beveiligen
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Globale opties voor het genereren van een PDF
+PDFAddressForging=Regels voor adresbox
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Regels voor omzet-belasting/btw
 PDFLocaltax=Regels voor %s
 HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
-HideDescOnPDF=Hide products description
-HideRefOnPDF=Hide products ref.
-HideDetailsOnPDF=Hide product lines details
+HideDescOnPDF=Verberg productomschrijving
+HideRefOnPDF=Verberg productreferentie
+HideDetailsOnPDF=Verberg productdetails
 PlaceCustomerAddressToIsoLocation=Gebruik de Franse standaardpositie (La Poste) als positie van het klant-adres
 Library=Bibliotheek
 UrlGenerationParameters=Parameters om URL beveiligen
@@ -397,7 +399,7 @@ ButtonHideUnauthorized=Verberg de knoppen voor niet-beheerders bij ongeoorloofde
 OldVATRates=Oud BTW tarief
 NewVATRates=Nieuw BTW tarief
 PriceBaseTypeToChange=Wijzig op prijzen waarop een base reference waarde gedefiniëerd is
-MassConvert=Launch bulk conversion
+MassConvert=Start conversie
 String=String
 TextLong=Lange tekst
 HtmlText=HTML-tekst
@@ -448,7 +450,7 @@ AllBarcodeReset=Alle barcode waarden zijn verwijderd
 NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
 EnableFileCache=Gebruik cache voor bestanden
 ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
-NoDetails=No additional details in footer
+NoDetails=Geen extra details in footer
 DisplayCompanyInfo=Geen adresgegevens bedrijf weer
 DisplayCompanyManagers=Toon namen managers
 DisplayCompanyInfoAndManagers=Geef adresgegevens en namen manager weer
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Schakel het gebruik van de overschreven vertaling in
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -494,7 +497,7 @@ Module1Name=Relaties
 Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercieel
 Module2Desc=Commercieel beheer
-Module10Name=Accounting (simplified)
+Module10Name=Boekhouding (vereenvoudigd)
 Module10Desc=Eenvoudige boekhoudrapporten (journaals, omzet) op basis van database-inhoud. Gebruikt geen dubbel boekhouden.
 Module20Name=Zakelijke voorstellen / Offertes
 Module20Desc=Beheer van offertes
@@ -904,7 +907,7 @@ DictionaryActions=Agenda evenementen
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=BTW-tarieven of Verkoop Tax tarieven
 DictionaryRevenueStamp=Amount of tax stamps
-DictionaryPaymentConditions=Payment Terms
+DictionaryPaymentConditions=Betalingsvoorwaarden
 DictionaryPaymentModes=Payment Modes
 DictionaryTypeContact=Contact / Adres soorten
 DictionaryTypeOfContainer=Website - Type of website pages/containers
@@ -989,7 +992,6 @@ Port=Poort
 VirtualServerName=Virtuele servernaam
 OS=OS
 PhpWebLink=PHP Weblink
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Databasehost
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Systeeminformatie is technische informatie welke u in alleen-leze
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Beschikbare app/modules
 ToActivateModule=Om modules te activeren, ga naar Home->Instellingen->Modules.
@@ -1237,16 +1239,14 @@ BillsNumberingModule=Nummeringsmodule voor facturen en creditnota's
 BillsPDFModules=Factuur documentsjablonen
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Modellen betaal documenten
-CreditNote=Creditnota
-CreditNotes=Creditnota's
 ForceInvoiceDate=Forceer factuurdatum naar validatiedatum
 SuggestedPaymentModesIfNotDefinedInInvoice=Voorgestelde betaalwijze standaard op de factuur, indien niet ingesteld voor de betreffende factuur
-SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
+SuggestPaymentByRIBOnAccount=Stel de betaling voor door opname op rekening
 SuggestPaymentByChequeToAddress=Suggest payment by check to
 FreeLegalTextOnInvoices=Vrije tekst op facturen
 WatermarkOnDraftInvoices=Watermerk op ontwerp-facturen (geen indien leeg)
 PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Vendor payments
+SuppliersPayment=Leveranciersbetalingen
 SupplierPaymentSetup=Vendor payments setup
 ##### Proposals #####
 PropalSetup=Offertemoduleinstellingen
@@ -1376,7 +1376,7 @@ LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Zoekfilter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
 LDAPFieldLoginSamba=Gebruikersnaam (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldLoginSambaExample=Voorbeeld: samaccountname
 LDAPFieldFullname=Voornaam Achternaam
 LDAPFieldFullnameExample=Example: cn
 LDAPFieldPasswordNotCrypted=Password not encrypted
@@ -1615,7 +1615,7 @@ CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
 CashDeskThirdPartyForSell=Default generic third party to use for sales
 CashDeskBankAccountForSell=Te gebruiken rekening voor ontvangst van contacte betalingen
-CashDeskBankAccountForCheque= Default account to use to receive payments by check
+CashDeskBankAccountForCheque= Standaardrekening die moet worden gebruikt om betalingen per cheque te boeken
 CashDeskBankAccountForCB= Te gebruiken rekening voor ontvangst van betalingen per CreditCard
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
 CashDeskIdWareHouse=Kies magazijn te gebruiken voor voorraad daling
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index 1e412acc3a0..ec9627f297a 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Gebeurtenissen waarvoor Dolibarr automatisch een item zal maken in
 EventRemindersByEmailNotEnabled=Gebeurtenisherinneringen per e-mail zijn niet ingeschakeld in %s-module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Relatie %s aangemaakt
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s gevalideerd
 CONTRACT_DELETEInDolibarr=Contract %s verwijderd
 PropalClosedSignedInDolibarr=Voorstel %s getekend
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s aangepast
 PROJECT_DELETEInDolibarr=Project %s verwijderd
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index e3dc159e1ad..e0fffb64b86 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Kas
+MenuBankCash=Banken | Kas
 MenuVariousPayment=Diverse betalingen
 MenuNewVariousPayment=Nieuwe diverse betaling
 BankName=Banknaam
 FinancialAccount=Rekening
 BankAccount=Bankrekening
 BankAccounts=Bankrekeningen
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bankrekeningen | gateways
 ShowAccount=Toon rekening
 AccountRef=Financiële rekening referentie
 AccountLabel=Financiële rekening label
@@ -30,7 +30,7 @@ AllTime=Vanaf het begin
 Reconciliation=Overeenstemming
 RIB=Bankrekeningnummer
 IBAN=IBAN-nummer
-BIC=BIC- / SWIFT-nummer
+BIC=BIC/SWIFT-code
 SwiftValid=BIC / SWIFT geldig
 SwiftVNotalid=BIC / SWIFT is niet geldig
 IbanValid=IBAN geldig
@@ -42,11 +42,11 @@ AccountStatementShort=Afschrift
 AccountStatements=Rekeningafschriften
 LastAccountStatements=Laatste rekeningafschriften
 IOMonthlyReporting=Maandelijkse rapportage
-BankAccountDomiciliation=Adres rekeninghouder
+BankAccountDomiciliation=Adres bank
 BankAccountCountry=Land van rekening
 BankAccountOwner=Naam rekeninghouder
 BankAccountOwnerAddress=Adres rekeninghouder
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+RIBControlError=Fout in rekeningnummer. Dit kan betekenen dat de informatie incompleet of fout is (controleer land, nummers en IBAN).
 CreateAccount=Creëer rekening
 NewBankAccount=Nieuwe rekening
 NewFinancialAccount=Nieuwe financiële rekening
@@ -84,7 +84,7 @@ AccountToCredit=Te crediteren rekening
 AccountToDebit=Te debiteren rekening
 DisableConciliation=Afstemming van deze rekening uitschakelen
 ConciliationDisabled=Afstemming voor deze rekening is uitgeschakeld
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
+LinkedToAConciliatedTransaction=Gekoppeld aan een afgestemde mutatie
 StatusAccountOpened=Open
 StatusAccountClosed=Opgeheven
 AccountIdShort=Aantal
@@ -98,14 +98,14 @@ BankLineConciliated=Item afgestemd
 Reconciled=Afgestemd
 NotReconciled=Niet afgestemd
 CustomerInvoicePayment=Afnemersbetaling
-SupplierInvoicePayment=Leveranciersbetaling
+SupplierInvoicePayment=Betaling van de leverancier
 SubscriptionPayment=Betaling van abonnement
 WithdrawalPayment=Intrekking betaling
 SocialContributionPayment=Sociale/fiscale belastingbetaling
 BankTransfer=Bankoverboeking
 BankTransfers=Bankoverboeking
 MenuBankInternalTransfer=Interne overboeking
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Van
 TransferTo=Aan
 TransferFromToDone=Een overboeking van <b>%s</b> naar <b>%s</b> van <b>%s</b> is geregistreerd.
@@ -133,10 +133,10 @@ PaymentDateUpdateSucceeded=Betaaldatum succesvol bijgewerkt
 PaymentDateUpdateFailed=Betaaldatum kon niet worden bijgewerkt
 Transactions=Transacties
 BankTransactionLine=Bankmutatie
-AllAccounts=All bank and cash accounts
+AllAccounts=Alle kas- en bankrekeningen
 BackToAccount=Terug naar rekening
 ShowAllAccounts=Toon alle rekeningen
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Toekomstige transactie. Nog niet mogelijk af te stemmen
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Kies het bankafschrift in verband met de bemiddeling. Gebruik een sorteerbaar numerieke waarde: YYYYMM of YYYYMMDD
 EventualyAddCategory=Tenslotte een categorie opgeven waarin de gegevens bewaard kunnen worden
@@ -153,15 +153,17 @@ ConfirmRejectCheck=Weet u zeker dat u deze controle wilt markeren als afgewezen?
 RejectCheckDate=Teruggave datum cheque
 CheckRejected=Teruggekeerde cheque
 CheckRejectedAndInvoicesReopened=Cheque teruggekeerd en facturen heropend
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=Nieuwe diverse betalingen
-VariousPayment=Diverse betalingen
+BankAccountModelModule=Documentsjablonen voor bankrekeningen
+DocumentModelSepaMandate=Sjabloon van SEPA-mandaat. Alleen bruikbaar voor Europese landen in de Europese Unie.
+DocumentModelBan=Sjabloon om een pagina met BAN-informatie af te drukken.
+NewVariousPayment=Nieuwe overige betaling
+VariousPayment=Overige betaling
 VariousPayments=Diverse betalingen
-ShowVariousPayment=Toon diverse betalingen
-AddVariousPayment=Voeg verschillende betalingen toe
+ShowVariousPayment=Laat overige betaling zien
+AddVariousPayment=Overige betaling toevoegen
 SEPAMandate=SEPA-mandaat
 YourSEPAMandate=Uw SEPA-mandaat
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+FindYourSEPAMandate=Met deze SEPA-machtiging geeft u ons bedrijf toestemming een opdracht ter incasso te sturen naar uw bank. Retourneer het ondertekend (scan van het ondertekende document) of stuur het per e-mail naar
+AutoReportLastAccountStatement=Vul bij het automatisch afstemmen het veld 'aantal bankafschriften' in met het laatste afschriftnummer.
+CashControl=POS kasopmaak
+NewCashFence=Kasopmaak
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 5ad4115a290..925a56c4613 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -6,8 +6,8 @@ BillsCustomer=Afnemersfactuur
 BillsSuppliers=Facturen van leveranciers
 BillsCustomersUnpaid=Onbetaalde klant facturen
 BillsCustomersUnpaidForCompany=Onbetaalde klant facturen voor %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsSuppliersUnpaid=Onbetaalde leveranciersfacturen
+BillsSuppliersUnpaidForCompany=Onbetaalde leveranciersfacturen voor %s
 BillsLate=Betalingsachterstand
 BillsStatistics=Statistieken afnemersfacturen
 BillsStatisticsSuppliers=Vendors invoices statistics
@@ -19,7 +19,7 @@ InvoiceStandardAsk=Standaardfactuur
 InvoiceStandardDesc=Kies deze optie voor een traditionele factuur
 InvoiceDeposit=Voorschotnota
 InvoiceDepositAsk=Voorschotnota
-InvoiceDepositDesc=Dit soort factuur wordt opgemaakt wanneer een aanbetaling gedaan wordt (en er nog geed definitieve factuur kan worden opgesteld).
+InvoiceDepositDesc=Dit soort factuur wordt opgemaakt wanneer een aanbetaling gedaan wordt (en er nog geen definitieve factuur kan worden opgesteld).
 InvoiceProForma=Proforma factuur
 InvoiceProFormaAsk=Proforma factuur
 InvoiceProFormaDesc=Een proforma factuur is een voorlopige factuur en een orderbevestiging. Het is geen officiële factuur, maar bedoeld voor afnemers in het buitenland om bijvoorbeeld een vergunning aan te vragen of de inklaring voor te bereiden. Ze worden ook gebruikt voor het aanvragen van een Letter of Credit (L/C).
@@ -54,7 +54,7 @@ InvoiceCustomer=Afnemersfactuur
 CustomerInvoice=Afnemersfactuur
 CustomersInvoices=Afnemersfacturen
 SupplierInvoice=Factuur leverancier
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Facturen leveranciers
 SupplierBill=Factuur leverancier
 SupplierBills=leveranciersfacturen
 Payment=Betaling
@@ -66,33 +66,34 @@ paymentInInvoiceCurrency=Factuur valuta
 PaidBack=Terugbetaald
 DeletePayment=Betaling verwijderen
 ConfirmDeletePayment=Weet u zeker dat u deze betaling wilt verwijderen?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
-SupplierPayments=Vendor payments
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+SupplierPayments=Leveranciersbetalingen
 ReceivedPayments=Ontvangen betalingen
 ReceivedCustomersPayments=Ontvangen betalingen van afnemers
-PayedSuppliersPayments=Payments paid to vendors
+PayedSuppliersPayments=Betalingen aan leveranciers
 ReceivedCustomersPaymentsToValid=Te valideren ontvangen afnemersbetalingen
 PaymentsReportsForYear=Betalingsverslagen voor %s
 PaymentsReports=Betalingsverslagen
 PaymentsAlreadyDone=Betalingen gedaan
 PaymentsBackAlreadyDone=Terugbetaling al gedaan
 PaymentRule=Betalingsvoorwaarde
-PaymentMode=Payment Type
+PaymentMode=Betaalwijze
 PaymentTypeDC=Debet / Kredietkaart
 PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
-PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
+IdPaymentMode=Betaalwijze (id)
+CodePaymentMode=Betaalwijze (code)
+LabelPaymentMode=Betaalwijze (label)
+PaymentModeShort=Betaalwijze
+PaymentTerm=Betaalvoorwaarde
+PaymentConditions=Betalingsvoorwaarden
+PaymentConditionsShort=Betalingsvoorwaarden
 PaymentAmount=Betalingsbedrag
-ValidatePayment=Valideer deze betaling
 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=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.
+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'
 ClassifyPaidPartially=Classificeer 'gedeeltelijk betaald'
 ClassifyCanceled=Classificeer 'verlaten'
@@ -110,8 +111,8 @@ SendRemindByMail=Stuur herinnering per e-mail
 DoPayment=Geef betaling in
 DoPaymentBack=Geef terugstorting in
 ConvertToReduc=Markeren als tegoed beschikbaar
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
+ConvertExcessReceivedToReduc=Zet teveel ontvangen om in korting
+ConvertExcessPaidToReduc=Omzetten teveel betaald in beschikbare korting
 EnterPaymentReceivedFromCustomer=Voer een ontvangen betaling van afnemer in
 EnterPaymentDueToCustomer=Voer een betaling te doen aan afnemer in
 DisabledBecauseRemainderToPayIsZero=Uitgeschakeld omdat restant te betalen gelijk is aan nul
@@ -131,7 +132,7 @@ BillStatusClosedUnpaid=Gesloten (onbetaald)
 BillStatusClosedPaidPartially=Betaald (gedeeltelijk)
 BillShortStatusDraft=Concept
 BillShortStatusPaid=Betaald
-BillShortStatusPaidBackOrConverted=Refunded or converted
+BillShortStatusPaidBackOrConverted=Gerestitueerd of omgezet
 Refunded=Refunded
 BillShortStatusConverted=Betaald
 BillShortStatusCanceled=Verlaten
@@ -144,7 +145,7 @@ BillShortStatusClosedPaidPartially=Betaald (gedeeltelijk)
 PaymentStatusToValidShort=Te valideren
 ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorCreateBankAccount=Maak een bankrekening aan en ga vervolgens naar de instellingen van de factuur-module om de betalingswijzen te definiëren
 ErrorBillNotFound=Factuur %s bestaat niet
 ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Fout, korting al gebruikt
@@ -247,7 +248,7 @@ DateInvoice=Factuurdatum
 DatePointOfTax=Point of tax
 NoInvoice=Geen factuur
 ClassifyBill=Classifiseer factuur
-SupplierBillsToPay=Unpaid vendor invoices
+SupplierBillsToPay=Onbetaalde leveranciersfacturen
 CustomerBillsUnpaid=Onbetaalde klant facturen
 NonPercuRecuperable=Niet-terugvorderbare
 SetConditions=Set Payment Terms
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Valideer facturen automatisch
 GeneratedFromRecurringInvoice=Gegenereerd op basis van template herhaal-factuur %s
 DateIsNotEnough=Datum nog niet bereikt
 InvoiceGeneratedFromTemplate=Factuur %s aangemaakt met herhaal-factuur template %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Waarschuwing, de factuurdatum ligt hoger dan de huidige datum
 WarningInvoiceDateTooFarInFuture=Waarschuwing, de factuurdatum ligt te ver van de huidige datum
 ViewAvailableGlobalDiscounts=Bekijk beschikbare kortingen
@@ -423,10 +425,10 @@ DeskCode=Branch code
 BankAccountNumber=Rekeningnummer
 BankAccountNumberKey=Checksum
 Residence=Adres
-IBANNumber=IBAN account number
+IBANNumber=IBAN-rekeningnummer
 IBAN=IBAN
 BIC=BIC / SWIFT
-BICNumber=BIC/SWIFT code
+BICNumber=BIC/SWIFT-code
 ExtraInfos=Extra info
 RegulatedOn=Geregeld op
 ChequeNumber=Chequenummer
@@ -444,7 +446,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=Verzonden naar
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+PaymentByTransferOnThisBankAccount=Betaling via overschrijving op de volgende bankrekening
 VATIsNotUsedForInvoice=* BTW niet van toepassing
 LawApplicationPart1=Door toepassing van burgerwetboek
 LawApplicationPart2=blijven de goederen eigendom van
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index ec32a850e8e..db419112109 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Geschiedenis
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index 7ed84ae938a..d5711ccbe11 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -28,7 +28,7 @@ AliasNames=Alias naam (commercieel, handelsmerk, ...)
 AliasNameShort=Alias naam
 Companies=Bedrijven
 CountryIsInEEC=Land is lid van de EEC
-PriceFormatInCurrentLanguage=Price format in current language
+PriceFormatInCurrentLanguage=Price display format in the current language and currency
 ThirdPartyName=Third-party name
 ThirdPartyEmail=Third-party email
 ThirdParty=Third-party
@@ -390,7 +390,7 @@ ExportDataset_company_1=Third-parties (companies/foundations/physical people) an
 ExportDataset_company_2=Contacts and their properties
 ImportDataset_company_1=Third-parties and their properties
 ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_3=Bankrekeningen van relaties
 ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
 PriceLevel=Price Level
 PriceLevelLabels=Price Level Labels
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 646d98d2dd5..aafdeedb7ee 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -80,9 +80,8 @@ AddSocialContribution=Voeg sociale/fiscale belasting toe
 ContributionsToPay=Sociale- en fiscale lasten om te betalen
 AccountancyTreasuryArea=Factuur- en betalingsgebied
 NewPayment=Nieuwe betaling
-Payments=Betalingen
 PaymentCustomerInvoice=Afnemersfactuur betaling
-PaymentSupplierInvoice=vendor invoice payment
+PaymentSupplierInvoice=Betaling leverancier
 PaymentSocialContribution=Sociale/fiscale belastingbetaling
 PaymentVat=BTW betaling
 ListPayment=Betalingenlijst
@@ -92,10 +91,10 @@ DateStartPeriod=Startdatum periode
 DateEndPeriod=Einddatum periode
 newLT1Payment=New tax 2 payment
 newLT2Payment=New tax 3 payment
-LT1Payment=Tax 2 payment
-LT1Payments=Tax 2 payments
-LT2Payment=Tax 3 payment
-LT2Payments=Tax 3 payments
+LT1Payment=Betaling belasting 2
+LT1Payments=Belasting 2 betalingen
+LT2Payment=Betaling belasting 3
+LT2Payments=Belasting 3 betalingen
 newLT1PaymentES=Nieuwe RE betaling
 newLT2PaymentES=Nieuwe IRPF betaling
 LT1PaymentES=RE Betaling
@@ -205,7 +204,6 @@ SellsJournal=Verkoopdagboek
 PurchasesJournal=Inkoopboek
 DescSellsJournal=Verkoopdagboek
 DescPurchasesJournal=Inkoopboek
-InvoiceRef=Factuur ref.
 CodeNotDef=Niet gedefinieerd
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Betalingstermijn mag niet lager zijn dan de datum object.
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 017870ecfff..661c92660c9 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Vendor code vereist
 ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Verkeerde parameters
 ErrorBadValueForParameter=Verkeerde waarde '%s' voor parameter '%s'
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadImageFormat=Afbeeldingsbestand heeft geen ondersteunde indeling (uw PHP ondersteunt geen functies om afbeeldingen van dit formaat te converteren)
 ErrorBadDateFormat=Waarde %s heeft verkeerde datum formaat
 ErrorWrongDate=Datum is niet correct!
 ErrorFailedToWriteInDir=Schrijven in de map %s mislukt
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/nl_NL/holiday.lang b/htdocs/langs/nl_NL/holiday.lang
index 863a1357368..8c6a9cd1239 100644
--- a/htdocs/langs/nl_NL/holiday.lang
+++ b/htdocs/langs/nl_NL/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Goedkeuren verlofverzoeken
 HolidaysValidatedBody=Uw verlofverzoek van %s tot %s is goedgekeurd.
 HolidaysRefused=Verlofverzoeken geweigerd
-HolidaysRefusedBody=Uw verlofverzoek van %s tot %s is om de volgende reden geweigerd:
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Annuleren verlofverzoek
 HolidaysCanceledBody=Uw verlofverzoek van%s tot %s is geannuleerd.
 FollowedByACounter=1: Dit soort verlof moet worden vervolgd met een teller. Deze zal handmatig of automatisch worden opgehoogd en wanneer verlofverzoek is goedgekeurd, zal deze automatisch aftellen. <br>0: Niet worden vervolgd met teller
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index a93f141ad51..82620f9ab84 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Totaal
 SubTotal=Subtotaal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Totaal incl. BTW
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Stuur e-mail ter bevestiging
 SendMail=Verzend e-mail
 Email=Email
 NoEMail=Geen e-mail
-Email=Email
 AlreadyRead=Already read
 NotRead=Niet gelezen
 NoMobilePhone=Geen mobiele telefoon
@@ -671,7 +671,6 @@ Method=Methode
 Receive=Ontvangen
 CompleteOrNoMoreReceptionExpected=Voltooid of niets meer verwacht
 ExpectedValue=Verwachte waarde
-CurrentValue=Huidige waarde
 PartialWoman=Gedeeltelijke
 TotalWoman=Totaal
 NeverReceived=Nooit ontvangen
@@ -834,6 +833,7 @@ RelatedObjects=Gerelateerde objecten
 ClassifyBilled=Classificeer als gefactureerd
 ClassifyUnbilled=Classificeer ongevuld
 Progress=Voortgang
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=Bekijk
@@ -842,6 +842,11 @@ Exports=Export
 ExportFilteredList=Exporteren gefilterde lijst
 ExportList=Exporteer lijst
 ExportOptions=Exporteeropties
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Diversen
 Calendar=Kalender
 GroupBy=Sorteer op
@@ -854,7 +859,7 @@ Download=Downloaden
 DownloadDocument=Download document
 ActualizeCurrency=Bijwerken valutakoers
 Fiscalyear=Boekjaar
-ModuleBuilder=Module ontwerper
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Kies valuta
 BulkActions=Bulkacties
 ClickToShowHelp=Klik om tooltip-help weer te geven
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index 4e7e3a42375..ae758029d4f 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -6,7 +6,7 @@ Member=Lid
 Members=Leden
 ShowMember=Toon lidmaatschapskaart
 UserNotLinkedToMember=Gebruiker niet gekoppeld aan een lid
-ThirdpartyNotLinkedToMember=Derde, niet verbonden aan een lid
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Leden tickets
 FundationMembers=Stichtingsleden / -donateurs
 ListOfValidatedPublicMembers=Lijst van gevalideerde openbare leden
@@ -67,11 +67,11 @@ Subscriptions=Abonnementen
 SubscriptionLate=Laat
 SubscriptionNotReceived=Abonnement nooit ontvangen
 ListOfSubscriptions=Abonnementenlijst
-SendCardByMail=Stuur kaart per e-mail
+SendCardByMail=Send card by email
 AddMember=Creeer lid
 NoTypeDefinedGoToSetup=Geen lidtypes ingesteld. Ga naar Home->Setup->Ledentypes
 NewMemberType=Nieuw lidtype
-WelcomeEMail=Welkomst e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Abonnement vereist
 DeleteType=Verwijderen
 VoteAllowed=Stemming toegestaan
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd bestand
 ValidateMember=Valideer een lid
 ConfirmValidateMember=Weet u zeker dat u dit lid wilt valideren?
-FollowingLinksArePublic=De volgende links zijn publieke pagina's die niet beschermd worden door Dolibarr. Het zijn niet opgemaakte voorbeeldpagina's om te tonen hoe de ledenlijst database eruit ziet.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Publieke ledenlijst
 BlankSubscriptionForm=Abonnement aanmeldformulier (openbaar)
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Inhoud van uw lidmaatschapskaart
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Onderwerp van de e-mail ontvangen door automatische inschrijving van een gast
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail ontvangen door automatische inschrijving van een gast
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=E-mailafzender voor automatische e-mails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Etikettenformaat
 DescADHERENT_ETIQUETTE_TEXT=Tekst op leden adres-blad
 DescADHERENT_CARD_TYPE=Formaat van kaarten pagina
@@ -156,8 +156,8 @@ DocForAllMembersCards=Genereer visitekaartjes voor alle leden (Formaat voor de u
 DocForOneMemberCards=Genereer visitekaartjes voor een bepaald lid (Format voor de uitvoer zoals ingesteld: <b>%s</b>)
 DocForLabels=Genereer adresvellen (formaat voor de uitvoer zoals ingesteld: <b>%s</b>)
 SubscriptionPayment=Betaling van abonnement
-LastSubscriptionDate=Laatste abonnementsdatum
-LastSubscriptionAmount=Laatste abonnementsaantal
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Leden statistieken per land
 MembersStatisticsByState=Leden statistieken per staat / provincie
 MembersStatisticsByTown=Leden van de statistieken per gemeente
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Dit scherm toont statistieken over de leden per aard.
 MembersByRegion=Dit scherm tonen statistieken over de leden per streek.
 VATToUseForSubscriptions=BTW tarief voor inschrijvingen
-NoVatOnSubscription=Geen BTW bij inschrijving
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product gebruikt voor abbonement regel in factuur: %s
 NameOrCompany=Naam of Bedrijf
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=Geen e-mail verzonden naar lid
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index 5fc1bb89f3b..19427d3fa11 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Voer de naam in van de module / toepassing die u wilt maken zonder spaties. Gebruik hoofdletters om woorden te scheiden (bijvoorbeeld: MyModule, EcommerceForShop, SyncWithMySystem ...)
 EnterNameOfObjectDesc=Voer de naam in van het object dat u wilt maken zonder spaties. Gebruik hoofdletters om woorden te scheiden (bijvoorbeeld: MyObject, Student, Teacher ...). Het CRUD-classfile, maar ook het API-bestand, pagina's voor het weergeven/toevoegen/bewerken/verwijderen van objecten en SQL-bestanden worden gegenereerd.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=Dit tabblad is gewijd aan haken.
 ModuleBuilderDescwidgets=Dit tabblad is bedoeld voor het beheren/bouwen van widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Gevarenzone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Opmaken documentatie
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Lange omschrijving
 EditorName=Naam van de redacteur
 EditorUrl=URL van editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=Bestand nog niet aangemaakt
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Niet NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Leesmij-bestand
 ChangeLog=ChangeLog-bestand
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql-bestand
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql-bestand voor keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/nl_NL/paybox.lang b/htdocs/langs/nl_NL/paybox.lang
index 0eb9a3ba58c..c05751895e5 100644
--- a/htdocs/langs/nl_NL/paybox.lang
+++ b/htdocs/langs/nl_NL/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Nog te doen
 YourEMail=E-mail om betalingsbevestiging te ontvangen
 Creditor=Crediteur
 PaymentCode=Betalingscode
-PayBoxDoPayment=Betalen met prepaid creditcard (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Doe een betaling
 YouWillBeRedirectedOnPayBox=U wordt doorverwezen naar een beveiligde Paybox pagina om uw credit card informatie in te voeren
 Continue=Volgende
 ToOfferALinkForOnlinePayment=URL voor %s betaling
-ToOfferALinkForOnlinePaymentOnOrder=URL om een %s online betalingsgebruikersinterface aan te bieden voor een order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL om een %s online betalingsgebruikersinterface aan te bieden voor een factuur
 ToOfferALinkForOnlinePaymentOnContractLine=URL om een %s online betalingsgebruikersinterface aan te bieden voor een contractregel
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL om een %s online betalingsgebruikersinterface aan te bieden voor een donatie
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL om een %s online betalingsgebruikersinterface aan te bieden voor een ledenabonnement
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=U kunt ook een URL (GET) parameter <b>&tag=<i>waarde</i></b> toevoegen aan elk van deze URL's (enkel nodig voor een donatie) om deze van uw eigen betalingscommentaar te voorzien
 SetupPayBoxToHavePaymentCreatedAutomatically=Stel uw Paybox in met url <b> %s </b> om de betaling automatisch te laten aanmaken na validatie door Paybox.
 YourPaymentHasBeenRecorded=Deze pagina bevestigd dat uw betaling succesvol in geregistreerd. Dank u.
@@ -33,7 +33,8 @@ VendorName=Verkopersnaam
 CSSUrlForPaymentForm=URL van het CSS-stijlbestand voor het betalingsformulier
 NewPayboxPaymentReceived=Betaling met Paybox ontvangen
 NewPayboxPaymentFailed=Poging te betalen met Paybox mislukt
-PAYBOX_PAYONLINE_SENDEMAIL=E-mail na betaling (geslaagd of mislukt)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Waarde PBX SITE
 PAYBOX_PBX_RANG=Waarde PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Waarde PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/nl_NL/paypal.lang b/htdocs/langs/nl_NL/paypal.lang
index 7708cce0dbc..327946d97f9 100644
--- a/htdocs/langs/nl_NL/paypal.lang
+++ b/htdocs/langs/nl_NL/paypal.lang
@@ -1,34 +1,36 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=Deze module biedt om betaling op laten <a href="http://www.paypal.com" target="_blank">PayPal</a> door de klanten. Dit kan gebruikt worden voor een gratis betaling of voor een betaling op een bepaald Dolibarr object (factuur, bestelling, ...)
-PaypalOrCBDoPayment=Betaal met Paypal (creditcard of Paypal)
-PaypalDoPayment=Betalen met Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test / zandbak
 PAYPAL_API_USER=API gebruikersnaam
 PAYPAL_API_PASSWORD=API wachtwoord
 PAYPAL_API_SIGNATURE=API handtekening
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Aanbod betaling "integraal" (Credit card + Paypal) of "Paypal" alleen
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+PAYPAL_SSLVERSION=Curl SSL-versie
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PaypalModeIntegral=Integraal
+PaypalModeOnlyPaypal=Alleen PayPal
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=Dit is id van de transactie: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Voeg de url van Paypal betaling wanneer u een document verzendt via e-mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
-NewOnlinePaymentReceived=New online payment received
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
+NewOnlinePaymentReceived=Nieuwe online betaling ontvangen
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
-ReturnURLAfterPayment=Return URL after payment
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
+ReturnURLAfterPayment=Retourneer URL na betaling
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
 SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
 DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
+DetailedErrorMessage=Gedetailleerd foutbericht
+ShortErrorMessage=Kort foutbericht
+ErrorCode=Foutcode
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 5d8226e0789..3e893a46ddf 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -260,7 +260,7 @@ AddVariable=Variabele toevoegen
 AddUpdater=Voeg Updater toe
 GlobalVariables=Globale variabelen
 VariableToUpdate=Variabele bijwerken
-GlobalVariableUpdaters=Globale variabele aanpassers
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Ontleedt JSON gegevens van opgegeven URL, VALUE bepaalt de locatie van de relevante waarde,
 GlobalVariableUpdaterHelpFormat0=Indeling voor aanvraag {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, doelwaarde"}
@@ -294,7 +294,7 @@ ProductSheet=Productblad
 ServiceSheet=Service blad
 PossibleValues=Mogelijke waarden
 GoOnMenuToCreateVairants=Ga naar menu %s-%s om attributenvarianten voor te bereiden (zoals kleuren, grootte, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variatie attributen
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=Er is een fout opgetreden tijdens het kopiëren van
 ErrorDestinationProductNotFound=Bestemmingsproduct niet gevonden
 ErrorProductCombinationNotFound=Productvariant niet gevonden
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 2642be40553..94fcd53fc77 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Bestede tijd
 TimeSpentByYou=Uw tijdsbesteding
 TimeSpentByUser=Gebruikers tijdsbesteding
 TimesSpent=Bestede tijd
-RefTask=Ref. taak
-LabelTask=Label taak
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Tijd besteed aan taken
 TaskTimeUser=Gebruiker
 TaskTimeNote=Notitie
diff --git a/htdocs/langs/nl_NL/stripe.lang b/htdocs/langs/nl_NL/stripe.lang
index faa46c90ac3..b3f50b98772 100644
--- a/htdocs/langs/nl_NL/stripe.lang
+++ b/htdocs/langs/nl_NL/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe-module instellen
-StripeDesc=Module om een ​​online betalingspagina aan te bieden die betalingen met een creditcard / betaalpas accepteert via <a href="http://www.stripe.com" target="_blank">Stripe</a>. Hiermee kunnen uw klanten gratis betalen of betalen voor een bepaald Dolibarr-object (factuur, bestelling, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Betaal met creditcard of Stripe
 FollowingUrlAreAvailableToMakePayments=De volgende URL's zijn beschikbaar om een pagina te bieden aan afnemers voor het doen van een betaling van Dolibarr objecten
 PaymentForm=Betalingsformulier
@@ -9,14 +9,14 @@ ThisScreenAllowsYouToPay=Dit scherm staat u toe om een online betaling te doen a
 ThisIsInformationOnPayment=Informatie over de nog uit te voeren betalingen
 ToComplete=Nog te doen
 YourEMail=E-mail om betalingsbevestiging te ontvangen
-STRIPE_PAYONLINE_SENDEMAIL=E-mail om te waarschuwen na een betaling (gelukt of niet)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Crediteur
 PaymentCode=Betalingscode
-StripeDoPayment=Betaal met creditcard of betaalkaart (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Volgende
 ToOfferALinkForOnlinePayment=URL voor %s betaling
-ToOfferALinkForOnlinePaymentOnOrder=URL om een %s online betalingsgebruikersinterface aan te bieden voor een order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL om een %s online betalingsgebruikersinterface aan te bieden voor een factuur
 ToOfferALinkForOnlinePaymentOnContractLine=URL om een %s online betalingsgebruikersinterface aan te bieden voor een contractregel
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL om een %s online betalingsgebruikersinterface aan te bieden voor een donatie
@@ -40,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -61,4 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
-StripeUserAccountForActions=User account to use for some emails notification of Stripe events (Stripe payouts)
+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)
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index 7b7c70463f0..a085bf5af1c 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 9f7b9d24d1b..37a094a476e 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Utwórz nową transakcję
 UpdateMvts=Modyfikacja transakcji
 ValidTransaction=Potwierdź transakcję
-WriteBookKeeping=Zaksięguj transakcje
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Księga główna
 AccountBalance=Bilans konta
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Konto księgowe używane domyślnie dla kupionych produktów (używane jeżeli nie zdefiniowano konta w arkuszu produktu)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Konto księgowe używane domyślnie dla sprzedanych produktów (używane jeżeli nie zdefiniowano konta w arkuszu produktu)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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=Konto księgowe używane domyślnie dla kupionych usług (używane jeżeli nie zdefiniowano konta w arkuszu produktu)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Konto księgowe używane domyślnie dla sprzedanych usług (używane jeżeli nie zdefiniowano konta w arkuszu produktu)
 
@@ -177,6 +177,7 @@ LabelAccount=Etykieta konta
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Dziennik
 JournalLabel=Journal label
 NumPiece=ilość sztuk
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=Opcje
 OptionModeProductSell=Tryb sprzedaży
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Tryb zakupów
 OptionModeProductSellDesc=Pokaż wszystkie produkty z kontem księgowym dla sprzedaży
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Pokaż wszystkie produkty z kontem księgowym dla zakupów
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Resetuj wszystkie dowiązania dla wybranego roku
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 5148f43bcfe..a55aa59b303 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Także jeśli masz dużą liczbę osób trzecich
 UseSearchToSelectContactTooltip=Także jeśli masz dużą liczbę osób trzecich (> 100 000), można zwiększyć prędkość przez ustawienie stałej CONTACT_DONOTSEARCH_ANYWHERE do 1 w Setup-> Inne. Szukaj zostaną ograniczone do początku łańcucha.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Liczba znaków do wyszukiwania: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Niedostępne kiedy Ajax nie działa
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript wyłączony
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Nazwa wirtualnego serwera
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Przeglądarka
 Server=Serwer
 Database=Baza danych
 DatabaseServer=Host bazy danych
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System informacji jest różne informacje techniczne można uzysk
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Dostępne aplikacje / moduły
 ToActivateModule=Aby uaktywnić modules, przejdź na konfigurację Powierzchnia.
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Faktur i not kredytowych numeracji modułu
 BillsPDFModules=Faktura dokumentów modele
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Nota kredytowa
-CreditNotes=Not kredytowych
 ForceInvoiceDate=Siły daty wystawienia faktury do walidacji daty
 SuggestedPaymentModesIfNotDefinedInInvoice=Sugerowane tryb płatności na fakturze domyślnie jeśli nie jest zdefiniowane w fakturze
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Kod pocztowy
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang
index 8cc07186656..e4797d2eba7 100644
--- a/htdocs/langs/pl_PL/agenda.lang
+++ b/htdocs/langs/pl_PL/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Zdarzenia, dla których Dolibarr stworzy automatycznie zadania w a
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Kontrahent %s utworzony
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Umowa  %s potwierdzona
 CONTRACT_DELETEInDolibarr=Kontrakt %s usunięty
 PropalClosedSignedInDolibarr=Propozycja %s podpisana
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Projekt %s zmodyfikowany
 PROJECT_DELETEInDolibarr=Projekt %s usunięty
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index 981a0585f05..8aeec84d4c7 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Różne płatności
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Nazwa banku
 FinancialAccount=Konto
 BankAccount=Konto bankowe
 BankAccounts=Konta bankowe
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Konta bankowe / Bramki
 ShowAccount=Pokaż konto
 AccountRef=Numer referencyjny rachunku bankowego
 AccountLabel=Etykieta rachunku finansowego
@@ -30,7 +30,7 @@ AllTime=Od początku
 Reconciliation=Rekoncyliacja - uzgadanie stanów kont bankowych
 RIB=Numer konta bankowego
 IBAN=Numer IBAN
-BIC=Numer BIC / SWIFT
+BIC=BIC/SWIFT code
 SwiftValid=Ważny BIC/SWIFT
 SwiftVNotalid=Nie ważny BIC/SWIFT
 IbanValid=Ważny BAN
@@ -42,11 +42,11 @@ AccountStatementShort=Wyciąg
 AccountStatements=Wyciągi z konta
 LastAccountStatements=Ostatnie wyciągi z konta
 IOMonthlyReporting=Miesiąc sprawozdawczy
-BankAccountDomiciliation=Konto adres
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Konto kraju
 BankAccountOwner=Nazwa właściciela konta
 BankAccountOwnerAddress=Adres właściciela konta
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Załóż konto
 NewBankAccount=Nowe konto
 NewFinancialAccount=Nowy rachunek finansowy
@@ -105,7 +105,7 @@ SocialContributionPayment=Płatność za ZUS/podatek
 BankTransfer=Przelew bankowy
 BankTransfers=Przelewy bankowe
 MenuBankInternalTransfer=Przelew wewnętrzny
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od
 TransferTo=Do
 TransferFromToDone=Transfer z <b>%s</b> do <b>%s</b> <b>%s</b> %s został zapisany.
@@ -136,7 +136,7 @@ BankTransactionLine=Wpis bankowy
 AllAccounts=All bank and cash accounts
 BackToAccount=Powrót do konta
 ShowAllAccounts=Pokaż wszystkie konta
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Wybierz wyciąg bankowy związany z postępowania pojednawczego. Użyj schematu: RRRRMM lub RRRRMMDD
 EventualyAddCategory=Ostatecznie, określić kategorię, w której sklasyfikować rekordy
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Czek zwrócony i faktura ponownie otwarta
 BankAccountModelModule=Szablony dokumentu dla kont bankowych
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=Nowe różne płatności
-VariousPayment=Różne płatności
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Różne płatności
-ShowVariousPayment=Pokaż różne płatności
-AddVariousPayment=Dodaj inne płatności
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index c94d17e4db4..405d0077d50 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Spłacona
 DeletePayment=Usuń płatności
 ConfirmDeletePayment=Czy jesteś pewien, że chcesz usunąć tą płatność?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Otrzymane płatności
 ReceivedCustomersPayments=Zaliczki otrzymane od klientów
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Kwota płatności
-ValidatePayment=Weryfikacja płatności
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=Pokaż dostępne zniżki
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index a61b1dbae21..fa2df7ee0ed 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Historia
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 3b07bb320df..c32699a8a16 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Dodaj podatek fiskalny/ZUS
 ContributionsToPay=Opłata ZUS/podatek do zapłacenia
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Nowa płatność
-Payments=Płatności
 PaymentCustomerInvoice=Klient płatności faktury
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Płatność za ZUS/podatek
@@ -205,7 +204,6 @@ SellsJournal=Dziennik sprzedaży
 PurchasesJournal=Dziennik zakupów
 DescSellsJournal=Dziennik sprzedaży
 DescPurchasesJournal=Dziennik zakupów
-InvoiceRef=Numer referencyjny faktury
 CodeNotDef=Nie zdefiniowany
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Termin płatności określony nie może być niższa niż data obiektu.
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 63c87184546..520c90cde06 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
index aa2096d8ca7..a91e2463960 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Zatwierdzone wnioski urlopowe
 HolidaysValidatedBody=Twój wniosek urlopowy od %s do %s został zatwierdzony.
 HolidaysRefused=Zapytanie zaprzeczył
-HolidaysRefusedBody=Twoje zapytanie urlopu dla% s do% s została odrzucona z następującego powodu:
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Anulowane wniosku urlopowego
 HolidaysCanceledBody=Twój wniosek urlopowy od %s do %s został anulowany.
 FollowedByACounter=1: Ten typ urlopu musi być prześledzony przez licznik. Licznik jest  zwiększany ręcznie lub automatycznie, a po zwolnieniu żądania urlopu, licznik jest zmniejszany. <br> 0: Nie śłedzone przez licznik.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index a891051e55f..09a0383d899 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -371,6 +371,7 @@ Percentage=Procentowo
 Total=Razem
 SubTotal=Po podliczeniu
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Ogółem (z VAT)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Wyślij email potwierdzający
 SendMail=Wyślij wiadomość email
 Email=Adres e-mail
 NoEMail=Brak e-mail
-Email=Adres e-mail
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=Brak telefonu komórkowego
@@ -671,7 +671,6 @@ Method=Metoda
 Receive=Odbiór
 CompleteOrNoMoreReceptionExpected=Pełna lub niczego więcej nie oczekiwano
 ExpectedValue=Oczekiwana wartość
-CurrentValue=Aktualna wartość
 PartialWoman=Część
 TotalWoman=Razem
 NeverReceived=Nigdy nie otrzymała
@@ -834,6 +833,7 @@ RelatedObjects=Powiązane obiekty
 ClassifyBilled=Oznacz jako zafakturowana
 ClassifyUnbilled=Classify unbilled
 Progress=Postęp
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Powrót do biura
 View=Widok
@@ -842,6 +842,11 @@ Exports=Eksporty
 ExportFilteredList=Eksportuj przefiltrowaną listę
 ExportList=Eksportuj listę
 ExportOptions=Opcje eksportu
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Różne
 Calendar=Kalendarz
 GroupBy=Grupuj według
@@ -854,7 +859,7 @@ Download=Pobierz
 DownloadDocument=Pobierz dokument
 ActualizeCurrency=Aktualizuj kurs walut
 Fiscalyear=Rok podatkowy
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Ustaw walutę
 BulkActions=Masowe działania
 ClickToShowHelp=Kliknij, aby wyświetlić pomoc etykiety
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index 34003027198..d8ae37f489e 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -6,7 +6,7 @@ Member=Członek
 Members=Członkowie
 ShowMember=Pokaż kartę członka
 UserNotLinkedToMember=Użytkownik nie wiąże się z członkiem
-ThirdpartyNotLinkedToMember=Innej firmy nie związane z członkiem
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Członkowie Bilety
 FundationMembers=Członkowie fundacji
 ListOfValidatedPublicMembers=Wykaz zatwierdzonych publicznej użytkowników
@@ -67,11 +67,11 @@ Subscriptions=Subskrypcje
 SubscriptionLate=Późno
 SubscriptionNotReceived=Subskrypcja nigdy nieotrzymana
 ListOfSubscriptions=Lista subskrypcji
-SendCardByMail=Wyślij kartę przez email
+SendCardByMail=Send card by email
 AddMember=Utwórz członka
 NoTypeDefinedGoToSetup=Żaden członek typów zdefiniowanych. Przejdź do konfiguracji - Członkowie typy
 NewMemberType=Nowy typ członka
-WelcomeEMail=Email powitalny
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subskrypcja wymagana
 DeleteType=Usuń
 VoteAllowed=Głosowanie dozwolone
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Czy jesteś pewien, że chcesz usunąć tą subskrypcj
 Filehtpasswd=htpasswd plik
 ValidateMember=Validate członkiem
 ConfirmValidateMember=Czy jesteś pewien, że chcesz zatwierdzić tego członka?
-FollowingLinksArePublic=Poniższe linki są otwarte strony nie są chronione przez jakiekolwiek Dolibarr zgody. Nie są one sformtowany strony, pod warunkiem, jako przykład pokazuje jak lista użytkowników bazy danych.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Publicznego liście członków
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Treść Twojej karty członka
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Temat wiadomości e-mail otrzymane w przypadku automatycznego napisem gość
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail otrzymane w przypadku automatycznego napisem gość
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Nadawca wiadomości e-mail do automatycznych wiadomości e-mail
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Etykiety formacie
 DescADHERENT_ETIQUETTE_TEXT=Tekst drukowany na arkuszach adresowych członkiem
 DescADHERENT_CARD_TYPE=Format karty stronę
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generowanie wizytówek dla wszystkich członków (Format w
 DocForOneMemberCards=Generowanie wizytówki dla danego użytkownika (Format wyjściowy rzeczywiście setup: <b>%s)</b>
 DocForLabels=Generowanie arkuszy adres (Format wyjściowy rzeczywiście setup: <b>%s)</b>
 SubscriptionPayment=Zaplanowana płatność
-LastSubscriptionDate=Data ostatniej subskrypcji
-LastSubscriptionAmount=Ostatnia ilość subskrypcji
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Użytkownicy statystyki według kraju
 MembersStatisticsByState=Użytkownicy statystyki na State / Province
 MembersStatisticsByTown=Użytkownicy statystyki na miasto
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Ten ekran wyświetli statystyki dotyczące członków przez naturę.
 MembersByRegion=Ten ekran wyświetli statystyki dotyczące członków w regionie.
 VATToUseForSubscriptions=Stawka VAT użyć do subskrypcji
-NoVatOnSubscription=Nie TVA subskrypcji
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt stosowany do linii subskrypcji do faktury:% s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/pl_PL/modulebuilder.lang b/htdocs/langs/pl_PL/modulebuilder.lang
index d71f9938adf..a121877cf90 100644
--- a/htdocs/langs/pl_PL/modulebuilder.lang
+++ b/htdocs/langs/pl_PL/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Strefa niebezpieczna
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Długi opis
 EditorName=Name of editor
 EditorUrl=Link do edytora
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Plik SQL
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/pl_PL/paybox.lang b/htdocs/langs/pl_PL/paybox.lang
index a7706113fa9..536f59e6650 100644
--- a/htdocs/langs/pl_PL/paybox.lang
+++ b/htdocs/langs/pl_PL/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Aby zakończyć
 YourEMail=E-mail by otrzymać potwierdzenie zapłaty
 Creditor=Wierzyciel
 PaymentCode=Kod płatności
-PayBoxDoPayment=Zapłać kartą kredytową lub debetową (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Wykonaj płatność
 YouWillBeRedirectedOnPayBox=Zostaniesz przekierowany na zabezpieczoną stronę Paybox bys mógł podać informację z karty kredytowej.
 Continue=Dalej
 ToOfferALinkForOnlinePayment=URL %s płatności
-ToOfferALinkForOnlinePaymentOnOrder=URL zaoferowania %s płatności online interfejsu użytkownika za zamówienie
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL zaoferowania %s płatności online interfejsu użytkownika za fakture
 ToOfferALinkForOnlinePaymentOnContractLine=URL zaoferowania płatności online %s interfejsu użytkownika do umowy
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL zaoferowania płatności online %s interfejsu użytkownika w celu utworzenia dowolnej kwoty.
 ToOfferALinkForOnlinePaymentOnMemberSubscription=Adres URL do zaoferowania płatności online %s interfejs użytkownika jest członkiem subskrypcji
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Możesz również dodać parametr <b>&</b> url <b>= <i>wartość</i> tagu</b> do żadnej z tych adresów URL (wymagany tylko dla bezpłatnych), aby dodać swój komentarz płatności tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Ustaw swój Paybox z linkiem <b>%s</b> żeby utworzyć płatność automatycznie gdy zatwierdzone przez Paybox 
 YourPaymentHasBeenRecorded=Ta strona potwierdza, że ​​płatność została wprowadzona. Dziękuję.
@@ -33,7 +33,8 @@ VendorName=Nazwa dostawcy
 CSSUrlForPaymentForm=Styl CSS arkuszy dla form płatności
 NewPayboxPaymentReceived=Nowa płatnośc Paybox otrzymana
 NewPayboxPaymentFailed=Nowa płatnośc Paybox - próba nie udana.
-PAYBOX_PAYONLINE_SENDEMAIL=Mail ostrzegający po płatności (sukces lub porażka)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Wartośc dla strony PBX
 PAYBOX_PBX_RANG=Wartość dla zasięgu PBX
 PAYBOX_PBX_IDENTIFIANT=Wartośc dla PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/pl_PL/paypal.lang b/htdocs/langs/pl_PL/paypal.lang
index f5da3b56bc5..63c2dd530ee 100644
--- a/htdocs/langs/pl_PL/paypal.lang
+++ b/htdocs/langs/pl_PL/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal konfiguracji modułu
-PaypalDesc=Ten moduł oferuję stronę pozwalającą na płatności w systemie <a href="http://www.paypal.com" target="_blank">PayPal</a> przez klientów. Moduł może być wykorzystany do bezpłatnych płatności lub do płatności za określone obiekty Dolibarr (faktury, zamówienie itp.)
-PaypalOrCBDoPayment=Płać z PayPal (karta kredytowa lub PayPal)
-PaypalDoPayment=Zapłać z PayPal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Tryb testu / sandbox
 PAYPAL_API_USER=API użytkownika
 PAYPAL_API_PASSWORD=API hasło
 PAYPAL_API_SIGNATURE=Podpis API
 PAYPAL_SSLVERSION=Wersja Curl SSL
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferta płatności "integralnej" (Karta kredytowa+Paypal) lub tylko "Paypal"
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integralny
 PaypalModeOnlyPaypal=Tylko PayPal
-ONLINE_PAYMENT_CSS_URL=Opcjonalny link do arkusza stylów CSS dla strony płatności online
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=Jest to id transakcji: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Dodaj link do płatności PayPal podczas wysyłania dokumentów za pośrednictwem email
-YouAreCurrentlyInSandboxMode=Aktualnie korzystasz z trybu "sandbox" %s
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=Otrzymano nową płatność online
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Napisz e-mail, aby poinformować po płatności (sukces lub nie)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Zwróć adres URL po dokonaniu płatności
 ValidationOfOnlinePaymentFailed=Niepowodzenie potwierdzenia płatności online
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Krotka informacja o błędzie
 ErrorCode=Kod błędu
 ErrorSeverityCode=Kod ważności błędu
 OnlinePaymentSystem=System płatności online
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Importuj płatności PayPal
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 71a4e601309..a2c026e4fe4 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Zmienne globalne
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Globalne zmienne updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=Dane JSON
 GlobalVariableUpdaterHelp0=Analizuje dane JSON z określonego adresu URL, wartość określa położenie odpowiedniej wartości,
 GlobalVariableUpdaterHelpFormat0=Format żądania {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Arkusz produktu
 ServiceSheet=Arkusz usługi
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Atrybuty wariantu
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Wariant produktu nie znaleziony
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 6903994123e..d2c5109c977 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Czas spędzony
 TimeSpentByYou=Czas spędzony przez Ciebie
 TimeSpentByUser=Czas spędzony przez użytkownika
 TimesSpent=Czas spędzony
-RefTask=Nr ref. zadania
-LabelTask=Etykieta zadania
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Czas spędzony na zadaniach
 TaskTimeUser=Użytkownik
 TaskTimeNote=Uwaga
diff --git a/htdocs/langs/pl_PL/stripe.lang b/htdocs/langs/pl_PL/stripe.lang
index 006e378f965..2a6f68fef72 100644
--- a/htdocs/langs/pl_PL/stripe.lang
+++ b/htdocs/langs/pl_PL/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Konfiguracja modułu Stripe
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Zapłać przy użyciu karty lub Stripe 
 FollowingUrlAreAvailableToMakePayments=Nastepujące adresy są dostępne dla klienta, by mógł dokonać płatności za faktury zamówienia
 PaymentForm=Formularz płatności
-WelcomeOnPaymentPage=Witamy w naszej usłudze płatności online
+WelcomeOnPaymentPage=Witaj w naszym serwisie płatności online
 ThisScreenAllowsYouToPay=Ten ekran pozwala na dokonanie płatności on-line do %s.
 ThisIsInformationOnPayment=To jest informacja o płatności do zrobienia
 ToComplete=Aby zakończyć
 YourEMail=Adres email do wysłania potwierdzenia płatności
-STRIPE_PAYONLINE_SENDEMAIL=Adres email do wysłania informacji o płatności (powodzenie lub nie)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Wierzyciel
 PaymentCode=Kod płatności
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=Zostaniesz przekierowany na bezpieczoną stronę Stripe aby podać dane karty kredytowej.
 Continue=Dalej
 ToOfferALinkForOnlinePayment=URL %s płatności
-ToOfferALinkForOnlinePaymentOnOrder=URL zaoferowania %s płatności online interfejsu użytkownika za zamówienie
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL zaoferowania %s płatności online interfejsu użytkownika za fakture
 ToOfferALinkForOnlinePaymentOnContractLine=URL zaoferowania płatności online %s interfejsu użytkownika do umowy
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL zaoferowania płatności online %s interfejsu użytkownika w celu utworzenia dowolnej kwoty.
 ToOfferALinkForOnlinePaymentOnMemberSubscription=Adres URL do zaoferowania płatności online %s interfejs użytkownika jest członkiem subskrypcji
 YouCanAddTagOnUrl=Możesz również dodać parametr <b>&</b> url <b>= <i>wartość</i> tagu</b> do żadnej z tych adresów URL (wymagany tylko dla bezpłatnych), aby dodać swój komentarz płatności tag.
 SetupStripeToHavePaymentCreatedAutomatically=Skonfiguruj swój Stripe z linkiem <b>z %s</b> do opłat stworzonych automatycznie, gdy są zatwierdzone przez Stripe.
-YourPaymentHasBeenRecorded=Ta strona potwierdza, że ​​płatność została wprowadzona. Dziękuję.
-YourPaymentHasNotBeenRecorded=Twoja płatność nie została wprowadzona i transakcja została anulowana. Dziękuję.
 AccountParameter=Parametry konta
 UsageParameter=Parametry użytkownika
 InformationToFindParameters=Pomóż znaleźć %s informacje o koncie
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index 222e258d487..5dd5a3ef2e3 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index 9f3fab3a5d6..9804fdb4c55 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -20,13 +20,16 @@ InvoiceLabel=Rótulo da fatura
 OverviewOfAmountOfLinesNotBound=Visão geral do montante das linhas não vinculadas a uma conta contábil
 OverviewOfAmountOfLinesBound=Visão geral do montante das linhas já vinculadas a uma conta contábil
 DeleteCptCategory=Remover conta contábil do grupo
+ConfirmDeleteCptCategory=Tem certeza de que deseja remover essa conta contábil do grupo de contas contábeis?
 JournalizationInLedgerStatus=Situação do registro do diário
 AlreadyInGeneralLedger=Já foram Livros de registro em livros contabilísticos
 NotYetInGeneralLedger=Ainda não publicado em livros contábeis
 GroupIsEmptyCheckSetup=O grupo está vazio, verifique a configuração do grupo de contabilidade personalizado
+AccountantFiles=Exportar documentos contábeis
 MainAccountForCustomersNotDefined=Conta contábil principal para clientes não definidos na configuração
 MainAccountForUsersNotDefined=Conta contábil principal para usuários não definidos na configuração
 MainAccountForVatPaymentNotDefined=Conta contábil principal para o pagamento do IVA não definido na configuração
+MainAccountForSubscriptionPaymentNotDefined=Conta contábil principal  para pagamento de assinatura não definida na configuração
 AccountancyAreaDescIntro=O uso do módulo Contabilidade é feito em diversas etapas:
 AccountancyAreaDescActionOnce=As ações a seguir são normalmente realizadas apenas uma vez, ou uma vez por ano...
 AccountancyAreaDescActionOnceBis=Os próximos passos devem ser feitos para economizar tempo no futuro, sugerindo-lhe a conta de contabilidade padrão correta ao fazer a reviravolta (gravação de registros em Livros de Registros e contabilidade geral)
@@ -38,6 +41,7 @@ AccountancyAreaDescVat=PASSO %s: defina contas contábeis para cada taxa de IVA.
 AccountancyAreaDescExpenseReport=PASSO %s: Defina contas contábeis padrão para cada tipo de relatório de despesas. Para isso, use a entrada de menu %s.
 AccountancyAreaDescSal=PASSO %s: Defina contas contábeis padrão para pagamento de salários. Para isso, use a entrada de menu %s.
 AccountancyAreaDescDonation=PASSO %s: Defina contas contábeis padrão para doação. Para isso, use a entrada de menu %s.
+AccountancyAreaDescSubscription=Etapa %s: defina contas contábeis padrão para assinatura de membros. Para isso, use a entrada de menu %s.
 AccountancyAreaDescMisc=PASSO %s: Defina a conta padrão obrigatória e contas contábeis padrão para transações diversas. Para isso, use a entrada de menu %s.
 AccountancyAreaDescLoan=PASSO %s: Defina contas contábeis padrão para empréstimos. Para isso, use a entrada de menu %s.
 AccountancyAreaDescBank=PASSO %s:Defina contabilidade e código de diário para cada banco e contas contábil. Para isso, use o menu de entradas %s.
@@ -51,6 +55,8 @@ Selectchartofaccounts=Selecione gráfico ativo de contas
 ChangeAndLoad=Alterar e carregar
 Addanaccount=Adicionar uma conta contábil
 AccountAccounting=Conta contábil
+SubledgerAccount=Conta Subledger
+SubledgerAccountLabel=Rótulo da conta de subconta
 ShowAccountingAccount=Mostrar conta contábil
 ShowAccountingJournal=Mostrar contabilidade
 AccountAccountingSuggest=Sugerir Conta de Contabilidade
@@ -58,13 +64,16 @@ MenuBankAccounts=Contas bancárias
 MenuVatAccounts=Contas de Impostos sobre valor agregado
 MenuLoanAccounts=Contas de empréstimos
 MenuProductsAccounts=Contas de produto
+MenuClosureAccounts=Contas de encerramento
 ProductsBinding=Contas dos produtos
+TransferInAccounting=Transferência em contabilidade
+RegistrationInAccounting=Registro em contabilidade
 Binding=Vinculando para as contas
 CustomersVentilation=Vinculando as faturas do cliente
 ExpenseReportsVentilation=Relatório de despesas obrigatórias
-WriteBookKeeping=Transações no Livro Razão
 Bookkeeping=Razão
 ObjectsRef=Referência da fonte do objeto
+CAHTF=Total de fornecedores antes de impostos
 TotalExpenseReport=Relatório de despesas totais
 InvoiceLines=Linhas da fatura a vincular
 InvoiceLinesDone=Linhas das faturas vinculadas
@@ -80,24 +89,36 @@ VentilatedinAccount=Vinculado a conta contábil com sucesso
 NotVentilatedinAccount=Não vinculado a conta contábil
 XLineSuccessfullyBinded=%s produtos / serviços vinculados com sucesso a uma conta contábil
 XLineFailedToBeBinded=%s produtos/serviços não estão vinculados a qualquer conta da Contabilidade
+ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a vincular mostrados por página (máximo recomendado: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Iniciar a página "Vinculações a fazer" ordenando pelos elementos mais recentes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Iniciar a página "Vinculações feitas" ordenando pelos elementos mais recentes
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar a descrição de Produtos & Serviços nas listagens, após x caracteres (Melhor = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncar a descrição da conta de Produtos & Serviços nas listagens, após X caracteres (Melhor = 50)
 ACCOUNTING_LENGTH_GACCOUNT=Comprimento das contas de contabilidade geral (se o valor configurado for 6, a conta '706' aparecerá como '706000' na tela)
+ACCOUNTING_LENGTH_AACCOUNT=Comprimento das contas de contabilidade de terceiros (se você definir o valor para 6 aqui, a conta "401" aparecerá como '401000' na tela)
+ACCOUNTING_MANAGE_ZERO=Permitir gerenciar diferentes números de zeros no final de uma conta contábil. Necessário para alguns países (como a Suíça). Se definido como desativado (padrão), você pode definir os dois parâmetros a seguir para solicitar que o aplicativo adicione zeros virtuais.
 BANK_DISABLE_DIRECT_INPUT=Desabilitar o registro direto da transação na conta bancária
+ACCOUNTANCY_COMBO_FOR_AUX=Ativar lista de combinação para conta subsidiária (pode ser lenta se você tiver muitos terceiros)
 ACCOUNTING_SELL_JOURNAL=Diário de Vendas
 ACCOUNTING_PURCHASE_JOURNAL=Diário de Compras
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diário diversos
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diário de relatórios de despesas
+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
 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
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contábil padrão para produtos comprados (usado se não estiver definido na folha de produtos)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta contábil padrão para os produtos vendidos (usado se não estiver definido na folha do produto)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Conta de contabilidade por defeito para os produtos vendidos no EEC (usado se não definido na folha do produto)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Conta contábil por padrão para a exportação de produtos vendidos fora do EEC (usada se não definida na folha do produto)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Conta contábil padrão para os serviços comprados (se não for definido na listagem de serviços)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contábil padrão para os serviços vendidos (se não for definido na listagem de serviços)
 LabelAccount=Conta rótulo
 Sens=Significado
+JournalLabel=Rótulo de jornal
 TransactionNumShort=Nº da transação
 GroupByAccountAccounting=Agrupar pela conta da Contabilidade
 AccountingAccountGroupsDesc=Você pode definir aqui alguns grupos de contabilidade. Eles serão usados ​​para relatórios contábeis personalizados.
@@ -105,6 +126,7 @@ NotMatch=Não Definido
 DeleteMvt=Excluir linha do razão
 DelYear=Ano a ser deletado
 DelJournal=Resumo a ser deletado
+ConfirmDeleteMvt=Isso excluirá todas as linhas do razão por ano e/ou de um periódico específico. Pelo menos um critério é necessário.
 ConfirmDeleteMvtPartial=Isso eliminará a transação do Livro de Registro (todas as linhas relacionadas à mesma transação serão excluídas)
 DescJournalOnlyBindedVisible=Esta é uma visão de registro que é vinculada a uma conta contábil e pode ser gravada no Livro de Registro.
 VATAccountNotDefined=Conta para ICMS não definida
@@ -113,10 +135,17 @@ ProductAccountNotDefined=Conta para produto não definida
 FeeAccountNotDefined=Conta por taxa não definida
 BankAccountNotDefined=Conta para o banco não definida
 CustomerInvoicePayment=Contas Recebidas
+ThirdPartyAccount=Conta de terceiros
 ListeMvts=Lista de movimentações
 ErrorDebitCredit=Débito e Crédito não pode ter valor preenchido ao mesmo tempo
 AddCompteFromBK=Adicionar contas contábeis ao grupo
+ReportThirdParty=Listar conta de terceiros
+DescThirdPartyReport=Consulte aqui a lista de clientes e fornecedores de terceiros e suas contas contábeis
 ListAccounts=Lista das contas contábeis
+UnknownAccountForThirdparty=Conta de terceiros desconhecida. Nós usaremos %s
+UnknownAccountForThirdpartyBlocking=Conta de terceiros desconhecida. Erro de bloqueio
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Conta de terceiros não definida ou desconhecida de terceiros. Erro de bloqueio.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta de terceiros desconhecida e conta em espera não definida. Erro de bloqueio
 Pcgtype=Plano de Contas
 Pcgsubtype=Subgrupo de Contas
 TotalVente=Volume total negociado sem Impostos
@@ -125,6 +154,7 @@ DescVentilCustomer=Consulte aqui a lista linhas de pedidos de clientes vinculada
 DescVentilDoneCustomer=Consulte aqui a lista com as linhas das faturas dos clientes e a conta da Contabilidade dos seus produtos
 DescVentilTodoCustomer=Linhas da fatura ainda não vinculadas à conta da Contabilidade do produto
 ChangeAccount=Mudar a conta da Contabilidade do produto/serviço para as linhas selecionadas com a seguinte conta da Contabilidade
+DescVentilDoneSupplier=Consulte aqui a lista das linhas de faturas de fornecedores e sua conta contábil
 DescVentilTodoExpenseReport=Relatórios de linhas de despesas de ligação já não estão vinculadas com uma conta contábil com taxa
 DescVentilExpenseReport=Consulte aqui a lista de relatório de linhas de despesas vinculadas (ou não) a uma conta contábil com taxa
 DescVentilDoneExpenseReport=Consulte aqui a lista dos relatórios de linha de despesas e sua conta contábil de taxas
@@ -137,6 +167,7 @@ ListOfProductsWithoutAccountingAccount=Lista de produtos não vinculados a qualq
 ChangeBinding=Alterar a vinculação
 Accounted=Contas no livro de contas
 NotYetAccounted=Ainda não contabilizado no Livro de Registro
+AddAccountFromBookKeepingWithNoCategories=Conta disponível porém ainda não no grupo personalizado
 CategoryDeleted=A categoria para a conta contábil foi removida
 AccountingJournals=Relatórios da contabilidade
 AccountingJournal=Livro de Registro de contabilidade
@@ -144,21 +175,37 @@ NewAccountingJournal=Novo Livro de Registro contábil
 ShowAccoutingJournal=Mostrar contabilidade
 AccountingJournalType9=Novo
 ErrorAccountingJournalIsAlreadyUse=Esta Livro de Registro já está sendo usado
+NumberOfAccountancyEntries=Número de entradas
+NumberOfAccountancyMovements=Número de movimentos
 ExportDraftJournal=Livro de Registro de rascunho de exportação
 Selectmodelcsv=Escolha um modelo de exportação
+Modelcsv_CEGID=Exportar para CEGID Expert Comptable
+Modelcsv_COALA=Exportação para Sage Coala
+Modelcsv_bob50=Exportação para Sage BOB 50
+Modelcsv_ciel=Exportação para Sage Ciel Compta ou Compta Evolution
+Modelcsv_quadratus=Exportação para Quadratus QuadraCompta
+Modelcsv_ebp=Exportar para EBP
+Modelcsv_cogilog=Exportar para Cogilog
+Modelcsv_agiris=Exportar para Agiris
 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
 OptionModeProductBuy=Modo compras
 OptionModeProductSellDesc=Exibir todos os produtos sem uma conta da Contabilidade definida para compras.
+OptionModeProductSellIntraDesc=Mostrar todos os produtos com conta contábil para vendas no EEC.
+OptionModeProductSellExportDesc=Mostrar todos os produtos com conta contábil para outras vendas externas.
 OptionModeProductBuyDesc=Exibir todos os produtos sem uma conta da Contabilidade definida para compras.
 CleanFixHistory=Remover o código contábil de linhas que não existem nos gráficos de conta
 CleanHistory=Redefinir todas as vinculações para o ano selecionado
 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
 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)
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 0afb512141a..71d60ba1226 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -6,8 +6,10 @@ VersionExperimental=Versão Experimental
 VersionDevelopment=Versão de Desenvolvimento
 VersionUnknown=Versão Desconhecida
 VersionRecommanded=Versão Recomendada
+FileCheck=Verificações de integridade do conjunto de arquivos
+FileCheckDesc=Esta ferramenta lhe permite verificar a integridade dos arquivos e da configuração do seu aplicativo, comparando cada arquivo com os oficiais. Os valores de algumas constantes da configuração também podem ser verificados. Você pode usar esta ferramenta para identificar se algum arquivo foi modificado (ex.  por um 'hacker').
 FileIntegrityIsStrictlyConformedWithReference=A integridade dos arquivos está estritamente de acordo com a referência.
-FileIntegrityIsOkButFilesWereAdded=A verificação da integridade dos arquivos passou, entretanto alguns novos arquivos foram adicionados.
+FileIntegrityIsOkButFilesWereAdded=Expirou o processo para verificar a integridade dos arquivos, entretanto alguns novos arquivos foram adicionados.
 FileIntegritySomeFilesWereRemovedOrModified=A verificação da integridade dos arquivos falhou. Alguns arquivos foram modificados, removidos ou adicionados.
 GlobalChecksum=Verificação global
 MakeIntegrityAnalysisFrom=Realizar a análise da integridade dos arquivos do aplicativo em
@@ -18,15 +20,19 @@ FilesUpdated=Arquivos atualizados
 FilesModified=Arquivos Modificados
 FilesAdded=Arquivos Adicionados
 FileCheckDolibarr=Verificar a integridade dos arquivos do aplicativo
+AvailableOnlyOnPackagedVersions=O arquivo local para verificação de integridade só está disponível quando a aplicação é instalada a partir de um pacote oficial
 XmlNotFound=Não encontrado o Arquivo Xml da integridade
 SessionId=ID da sessão
 SessionSaveHandler=Manipulador para salvar sessão
+SessionSavePath=Sessão salvar localmente
 PurgeSessions=Purgar Sessão
 ConfirmPurgeSessions=Você tem certeza que quer remover toas as sessões? Isto ira desconectar todos os usuários (exceto você)
 LockNewSessions=Bloquear Novas Sessões
 UnlockNewSessions=Remover Bloqueio de Conexão
 YourSession=Sua Sessão
+Sessions=Sessões do usuário
 WebUserGroup=Servidor Web para usuário/grupo
+NoSessionFound=Sua configuração do PHP parece não permitir listar as sessões ativas. O diretório usado para salvar sessões (<b>%s</ b>) pode estar protegido (por exemplo, pelas permissões do sistema operacional ou pela diretiva PHP "open_basedir").
 DBStoringCharset=Charset base de dados para armazenamento de dados (Database charset to store data)
 DBSortingCharset=Charset base de dados para classificar os dados (Database charset to sort data)
 ClientCharset=Conjunto de clientes
@@ -41,6 +47,8 @@ ExternalUsers=Usuários Externos
 UploadNewTemplate=Carregar novo(s) tema(s)
 FormToTestFileUploadForm=Formulário para teste de upload de arquivo
 IfModuleEnabled=OBS: Sim só é eficaz se o módulo <b>%s</b> estiver ativado
+RemoveLock=Remove/renomeia o arquivo <b> %s </b> se existir, para permitir o uso da ferramenta atualização/instalação.
+RestoreLock=Restaura o arquivo <b>%s</b>, com permissão de leitura, para desabilitar qualquer serviço de atualização/instalação
 SecuritySetup=Conf. de Segurança
 SecurityFilesDesc=Defina aqui as opções relacionadas à segurança sobre o carregamento (upload) de arquivos.
 ErrorModuleRequirePHPVersion=Erro, este módulo requer uma versão %s ou superior de PHP
@@ -50,9 +58,12 @@ DictionarySetup=Configuração Dicionário
 ErrorReservedTypeSystemSystemAuto=A Variável 'system' e 'systemauto' é reservada. Você pode usar 'user' como variável para adicionar sua própria gravação
 ErrorCodeCantContainZero=A variável não pode conter valor "0" (zero)
 DisableJavascript=Desativar as funções Javascript e AJax
+DisableJavascriptNote=Obs.: Para propósitos de teste ou depuração. Para otimização de cegos ou navegadores de texto, é preferível usar a configuração do perfil do usuário
 UseSearchToSelectCompanyTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo COMPANY_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string.
 UseSearchToSelectContactTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo CONTACT_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string.
-NumberOfKeyToSearch='Nbr' dos caracteres para 'trigger search': %s
+NumberOfKeyToSearch=Número de caracteres para acionar a pesquisa: %s
+NumberOfBytes=Número de Bytes
+SearchString=Seqüência de pesquisa
 NotAvailableWhenAjaxDisabled=Indisponível quando o Ajax esta desativado
 AllowToSelectProjectFromOtherCompany=No documento de um terceiro, pode-se escolher um projeto conectado a outro terceiro
 UsePreviewTabs=Usar previsão de digitação na tecla 'tab'
@@ -66,6 +77,7 @@ NextValueForInvoices=Próximo Valor (Faturas)
 NextValueForCreditNotes=Próximo Valor (Notas de Crédito)
 NextValueForDeposit=Próximo valor (pagamento inicial)
 NextValueForReplacements=Próximo Valor (Substituição)
+MustBeLowerThanPHPLimit=OBS: O seu servidor PHP limita o tamanho de envio de arquivos para <b>%s</b> %s , seja qual for o valor desse parâmetro
 NoMaxSizeByPHPLimit=Nenhum limite foi configurado no seu PHP
 MaxSizeForUploadedFiles=Tamanho Máximo para uploads de arquivos ('0' para proibir o carregamento)
 UseCaptchaCode=Usar captcha para login (recomendado se os usuários tiverem acesso ao Dolibarr pela internet)
@@ -94,18 +106,23 @@ OSTZ=Fuso Horário do OS do Servidor
 PHPTZ=Fuso Horário do servidor PHP
 CurrentHour=Horário PHP (servidor)
 CurrentSessionTimeOut=A sessão expirou
+MaxNbOfLinesForBoxes=Número máx. de linhas para widgets
 AllWidgetsWereEnabled=Todos as ferramentas disponíveis estão habilitadas
 PositionByDefault=Posição Padrão(default)
 MenusDesc=O Gerenciador de Menu, define o conteúdo das barras de menu (Horizontal e Vertical).
 MenusEditorDesc=O editor do menu permite que você defina entradas personalizadas. Use-o com cuidado para evitar instabilidade e entradas no menu que não serão encontradas. <br>Alguns módulos adicionam entradas no menu (na maioria das vezes, em menu <b>Tudo</b>). Se remover algumas dessas entradas por engano, você poderá restaurá-las desabilitando e reabilitando o módulo.
 MenuForUsers=Menu para os Usuários
 LangFile=Arquivo .lang
+Language_en_US_es_MX_etc=Linguagem (en_US, pt_BR, ...)
 SystemInfo=Informações de Sistema
 SystemToolsArea=Área de Ferramentas do sistema
+SystemToolsAreaDesc=Essa área dispõem de funções administrativas. Use esse menu para escolher as funções que você está procurando.
 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=Excluir todos os arquivos temporários (sem risco de perca de dados)
 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
 PurgeNothingToDelete=Sem diretório ou arquivos para excluir
 PurgeNDirectoriesDeleted=<b>%s</b> Arquivos o diretórios eliminados
@@ -116,13 +133,16 @@ GenerateBackup=Gerar Backup
 RunCommandSummary=Backup foi iniciado com o seguinte comando
 BackupResult=Resultado de backup
 BackupFileSuccessfullyCreated=Sucesso em gerar o arquivo de backup! =D
+YouCanDownloadBackupFile=O arquivo gerado pode agora ser baixado
 NoBackupFileAvailable=Nenhum backup está disponível
 ExportMethod=Método de Exportação
 ImportMethod=Método de Importação
 ToBuildBackupFileClickHere=Para criar um backup, click <a href="%s">aqui</a>.
+ImportMySqlDesc=Para importar um arquivo de backup do MySQL, você pode usar o phpMyAdmin através de sua hospedagem ou usar o comando mysql a partir da linha de comando. <br> Por exemplo:
 ImportPostgreSqlDesc=Para importar um arquivo de backup, você deve usar pg_restore na linha de comando:
 ImportMySqlCommand=%s %s < meubackup.sql
 ImportPostgreSqlCommand=%s %s meubackup.sql
+FileNameToGenerate=Nome de arquivo para backup:
 Compression=Compactar
 CommandsToDisableForeignKeysForImport=Comando para desativar as chaves estrangeiras(foreign keys) na importação
 CommandsToDisableForeignKeysForImportWarning=Mandatório se você quiser ser capaz de restaurar seu 'sql dump' depois
@@ -148,6 +168,7 @@ FreeModule=Grátis
 NotCompatible=Este módulo não parece ser compatível com o seu Dolibarr %s (Mín %s - Máx %s).
 CompatibleAfterUpdate=Este módulo exige uma atualização do seu Dolibarr %s (Mín %s - Máx %s).
 SeeInMarkerPlace=Ver na Loja Virtual
+GoModuleSetupArea=Para implantar/instalar um novo módulo, vá para a área de configuração do módulo: <a href="%s">%s</a> .
 DoliStoreDesc=DoliStore, o site oficial para baixar módulos externos.
 DevelopYourModuleDesc=Algumas soluções para o desenvolvimento do seu próprio módulo...
 URL=Site
@@ -159,16 +180,22 @@ SourceFile=Arquivo Fonte
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponível somente se Javascript não estiver desativado
 UsedOnlyWithTypeOption=Usado por alguns opção agenda única
 Passwords=Senhas
+DoNotStoreClearPassword=Criptografar senhas armazenadas no banco de dados (NÃO como texto simples). É altamente recomendável ativar esta opção.
+MainDbPasswordFileConfEncrypted=Criptografe a senha do banco de dados armazenada em conf.php. É altamente recomendável ativar esta opção.
 InstrucToEncodePass=Para ter a senha codificada no arquivo <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="..."</b><br>por<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
 InstrucToClearPass=Para ter a senha não codificada(limpa) no arquivo <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>por<br><b>$dolibarr_main_db_pass="%s"</b>
+ProtectAndEncryptPdfFiles=Proteja arquivos PDF gerados. Isso NÃO é recomendado, pois interrompe a geração de PDF em massa.
 ProtectAndEncryptPdfFilesDesc=Proteção de um documento PDF mantém ele disponível para ler e imprimir com qualquer navegador PDF. No entanto, edição e cópia não é possível. Observe que a utilização deste recurso faz com que a construção de um PDF global mesclado não funcione.
 Feature=Destaque
 Developpers=Desenvolvedores/Contribuidores
+OfficialWebSite=Site oficial do Dolibarr
 OfficialWebSiteLocal=Web site local (%s)
+OfficialWiki=Documentação Dolibarr / Wiki
 OfficialDemo=Demo online do Dolibarr
 OfficialMarketPlace=Loja oficial para módulos externos/addons
 OfficialWebHostingService=Serviços de hospedagem web referenciados (hospedagem na Nuvem)
 ReferencedPreferredPartners=Parceiro preferido
+ExternalResources=Fontes externas
 SocialNetworks=Redes Sociais
 ForDocumentationSeeWiki=Documentos para usuários e desenvolvedores (Doc, FAQs...), <br>de uma olhada no Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Para outras questões/ajudas, você pode usar o forum do Dolibar:<br><b><a href="%s" target="_blank">%s</a></b>
@@ -181,25 +208,41 @@ EmailSenderProfiles=Perfis dos e-mails de envio
 MAIN_MAIL_SMTP_PORT=Porta SMTP / SMTPS (valor padrão em php.ini: <b> %s </ b>)
 MAIN_MAIL_SMTP_SERVER=Host SMTP / SMTPS (valor padrão em php.ini: <b> %s </ b>)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Host SMTP / SMTPS (não definido em PHP em sistemas semelhantes a Unix)
+MAIN_MAIL_EMAIL_FROM=E-mail do remetente para e-mails automáticos (valor padrão em php.ini: <b>%s</b> )
+MAIN_MAIL_AUTOCOPY_TO=Copiar (Cco) todos os e-mails enviados para
+MAIN_DISABLE_ALL_MAILS=Desativar todo o envio de e-mail (para fins de teste ou demonstrações)
 MAIN_MAIL_FORCE_SENDTO=Envie todos os e-mails para (em vez de destinatários reais, para fins de teste)
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Use o DKIM para gerar assinatura de e-mail
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domínio de e-mail para uso com o dkim
 MAIN_SMS_SENDMODE=Método usado para enviar SMS
 UserEmail=E-mail do usuário
+CompanyEmail=E-mail da empresa
 FeatureNotAvailableOnLinux=Função não disponível para sistemas tipo Unix. Teste de envio local.
+SubmitTranslation=Se a tradução para este idioma não estiver completa ou você encontrar erros, você pode corrigir isso editando os arquivos no diretório <b>langs / %s</b> e enviar sua alteração para www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Se a tradução para este idioma não está completa ou você encontrar erros, você pode corrigir pela edição dos arquivos no diretório <b>langs/%s</b> e enviar os arquivos modificados para dolibarr.org/forum ou para os desenvolvedores em github.com/Dolibarr/dolibarr.
 ModuleSetup=Conf. do módulo
 ModulesSetup=Configuração de Módulos/Aplicativos
+ModuleFamilyCrm=Gestão de Relacionamento com o Cliente (CRM)
+ModuleFamilySrm=Gestão de Relacionamento com Fornecedores (VRM)
+ModuleFamilyProducts=Gerenciamento de produtos (PM)
 ModuleFamilyHr=Gestão de Recursos Humanos (RH)
 ModuleFamilyProjects=Projetos
 ModuleFamilyTechnic=Ferramentas para Módulos Múltiplos
 ModuleFamilyExperimental=Módulos Experimentais
 ModuleFamilyFinancial=Módulos Financeiros
 ModuleFamilyECM=Gestão de Conteúdos Eletrônicos (ECM)
+ModuleFamilyPortal=Websites e outras aplicações front-end
 MenuHandlers=Gestor de Menus
 MenuAdmin=Editor menus
 DoNotUseInProduction=Não utilizar em produção
+ThisIsProcessToFollow=Procedimento de atualização:
+FindPackageFromWebSite=Encontre um pacote que forneça os recursos que você precisa (por exemplo, no site oficial %s).
+DownloadPackageFromWebSite=Download do pacote (por exemplo, do site oficial %s).
+UnpackPackageInDolibarrRoot=Desempacote/descompacte os arquivos empacotados no diretório do servidor Dolibarr: <b>%s</b>
 NotExistsDirect=O diretório root alternativo não está definido para um diretório existente.<br>
 InfDirAlt=Desde a versão 3, é possível definir um diretório-root alternativo. Isso permite que você armazene, em um diretório dedicado, plug-ins e modelos personalizados. <br> Basta criar um diretório na raiz de Dolibarr (por exemplo:custom).<br>
 InfDirExample=<br>Então declare no arquivo <strong>conf.php</strong><br>$dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br> Se estas linhas estão comentadas com "#", para serem habilitadas, apenas remova o caractere "#".
+CallUpdatePage=Navegue até a página que atualiza a estrutura e os dados do banco de dados: %s.
 LastActivationAuthor=Último autor da ativação
 LastActivationIP=Último IP de ativação
 UpdateServerOffline=Atualização de servidor off-line
@@ -221,6 +264,7 @@ ErrorCantUseRazIfNoYearInMask=Erro, não pode utilizar o @ para resetar o contad
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erro, não pode utilizar a opção @ se a não ouver {yy} ou {yyyy} na mascara.
 UMask=Parâmetros da UMask para novos arquivos nos sistemas de arquivos Unix/Linux/BSD/Mac.
 UMaskExplanation=Esses parâmetros permitem você definir permissões por default nos arquivos criado pelo Dolibarr no servidor (Ex: durante upload).<br>Deve ser em formato octal (Ex: 06666 significa que tem permissão de leitura e escrita para todo mundo).<br> Esse parâmetro é inutil para servidores windows.
+SeeWikiForAllTeam=Dê uma olhada na página do Wiki para obter uma lista de contribuidores e sua organização
 UseACacheDelay=Atraso para exportação de cache em segundos (0 ou vazio para sem cache)
 DisableLinkToHelpCenter=Esconder link "<b>Precisa de ajuda ou suporte</b>" na página de login
 DisableLinkToHelp=Ocultar link para ajuda online "<b>%s</b>"
@@ -231,14 +275,24 @@ ListOfDirectoriesForModelGenODT=A lista de diretórios contém modelos de arquiv
 ExampleOfDirectoriesForModelGen=Exemplo de sintaxe:<br>c:\\meudir<br>/home/meudir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Para saber como criar seus temas de documento em ODT, antes de armazená-los nesses diretórios, leia a documentação wiki:
 FirstnameNamePosition=Posição do Nome/Sobrenome
+DescWeather=As imagens a seguir serão mostradas no painel quando o número de ações atrasadas atingir os seguintes valores:
 KeyForWebServicesAccess=Chave para usar o Serviços Web (parâmetro "dolibarrkey" no serviço web)
 TestSubmitForm=Teste de entrada de formulário
+ThisForceAlsoTheme=Usando este gerenciador de menu também usará seu próprio tema, seja qual for a escolha do usuário. Além disso, este gerenciador de menus especializado para smartphones não funciona em todos os smartphones. Use outro gerenciador de menu se tiver problemas com o seu.
 ThemeDir=Diretório de Layouts
 ResponseTimeout=Tempo de resposta esgotado
 SmsTestMessage=Mensagem Teste de __PHONEFROM__ para __PHONETO__
 ModuleMustBeEnabledFirst=O módulo <b>%s</b> deve estar primeiramente habilitado se você precisa desta funcionalidade.
 SecurityToken=Chave para proteção das URLs
+NoSmsEngine=Nenhum gerenciador de remetente de SMS disponível. Um gerenciador de remetentes SMS não é instalado com a distribuição padrão porque eles dependem de um fornecedor externo, mas você pode encontrar alguns em %s
+PDFDesc=Opções globais para geração de PDF.
+PDFAddressForging=Regras para caixas de endereço
+HideAnyVATInformationOnPDF=Ocultar todas as informações relacionadas a imposto sobre vendas/IVA
 PDFRulesForSalesTax=Regras para ICMS
+HideLocalTaxOnPDF=Ocultar taxa %s na coluna Venda de imposto
+HideDescOnPDF=Ocultar descrição dos produtos
+HideRefOnPDF=Ocultar ref. dos produtos.
+HideDetailsOnPDF=Ocultar detalhes das linhas de produtos
 PlaceCustomerAddressToIsoLocation=Use a posição padrão francesa (La Poste) para a posição do endereço do cliente
 UrlGenerationParameters=Parâmetros para URLs de segurança
 SecurityTokenIsUnique=Usar um único parâmetro na chave de segurança para cada URL
@@ -247,6 +301,7 @@ GetSecuredUrl=Conseguir URL calculada
 OldVATRates=Taxa de ICMS antiga
 NewVATRates=Taxa de ICMS nova
 PriceBaseTypeToChange=Modificar os preços com base no valor de referência defino em
+MassConvert=Iniciar a conversão em massa
 String=Variável
 Int=Inteiro
 Float=Flutuante
@@ -260,7 +315,15 @@ ExtrafieldCheckBox=Caixas de seleção
 ExtrafieldCheckBoxFromList=Caixas de seleção da tabela
 ExtrafieldLink=Link para um objeto
 ComputedFormula=Campo computado
+ComputedFormulaDesc=Você pode inserir aqui uma fórmula usando outras propriedades do objeto ou qualquer código PHP para obter um valor computado dinâmico. Você pode usar qualquer fórmula compatível com PHP, incluindo o "?" operador de condição e objeto global seguinte: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong> . <br> <strong>AVISO</strong> : Apenas algumas propriedades do $object podem estar disponíveis. Se você precisar de propriedades não carregadas, basta buscar o objeto em sua fórmula, como no segundo exemplo. <br> Usar um campo computado significa que você não pode inserir qualquer valor da interface. Além disso, se houver um erro de sintaxe, a fórmula pode retornar nada. <br><br> Exemplo de fórmula: <br> $object-> id < 10? round ($object-> id / 2, 2): ($object-> id + 2 * $user-> id) * (int) substr ($mysoc-> zip, 1, 2) <br><br> Exemplo para recarregar o objeto <br> (($reloadedobj = novo Societe($db)) && ($reloadedobj-> fetch ($obj-> id? $ obj-> id: ($obj-> rowid? $obj-> rowid: $object-> id )) > 0))? $reloadedobj-> array_options ['options_extrafieldkey'] * $reloadedobj-> capital / 5: '-1' <br><br> Outro exemplo de fórmula para forçar a carga do objeto e seu objeto pai: <br> (($reloadedobj = new Task($db)) &&  ($reloadedobj-> fetch ($object-> id) > 0) && ($secondloadedobj = new Project ($db)) && ($secondloadedobj-> fetch($reloadedobj-> fk_project) > 0)) ? $secondloadedobj-> ref: 'Projeto pai não encontrado'
+ExtrafieldParamHelpselect=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> código3, valor3 <br>...<br><br> Para que a lista dependa de outra lista de atributos complementares: <br> 1, valor1 | <i>opções_ pai_list_code</i> : parent_key <br> 2, valor2 | <i>opções_ pai_list_code</i> : parent_key <br><br> Para ter a lista dependendo de outra lista: <br> 1, valor1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
+ExtrafieldParamHelpcheckbox=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpradio=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpsellist=Lista de valores vem de uma tabela <br> Sintaxe: table_name: label_field: id_field :: filter <br> Exemplo: c_typent: libelle: id :: filter <br><br> - idfilter é necessariamente uma chave primária int <br> - filtro pode ser um teste simples (por exemplo, ativo = 1) para exibir apenas o valor ativo <br> Você também pode usar $ID$ no filtro que é o ID atual do objeto atual <br> Para fazer um SELECT no filtro use $SEL$ <br> se você quiser filtrar em extrafields use a sintaxe extra.fieldcode = ... (onde o código de campo é o código do campo extra) <br><br> Para que a lista dependa de outra lista de atributos complementares: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Para ter a lista dependendo de outra lista: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
+ExtrafieldParamHelpchkbxlst=Lista de valores vem de uma tabela <br> Sintaxe: table_name: label_field: id_field :: filter <br> Exemplo: c_typent: libelle: id :: filter <br><br> filtro pode ser um teste simples (por exemplo, ativo = 1) para exibir apenas o valor ativo <br> Você também pode usar $ID$ no filtro que é o ID atual do objeto atual <br> Para fazer um SELECT no filtro use $SEL$ <br> se você quiser filtrar em extrafields use a sintaxe extra.fieldcode = ... (onde o código de campo é o código do campo extra) <br><br> Para que a lista dependa de outra lista de atributos complementares: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Para ter a lista dependendo de outra lista: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
+ExtrafieldParamHelplink=Parâmetros devem ser ObjectName: Classpath <br> Sintaxe: ObjectName: Classpath <br> Exemplos: <br> Societe: societe/class/societe.class.php <br> Contato: contact/class/contact.class.php
 LibraryToBuildPDF=Biblioteca usada para a geração de PDF
+LocalTaxDesc=Alguns países podem aplicar dois ou três impostos em cada linha da fatura. Se este for o caso, escolha o tipo para o segundo e terceiro imposto e sua taxa. Tipo possível são: <br> 1: imposto local aplicável a produtos e serviços sem IVA (a taxa local é calculada sobre o valor sem impostos) <br> 2: imposto local aplicável a produtos e serviços, incluindo IVA (a taxa local  é calculada no montante + imposto principal) <br> 3: imposto local aplicável a produtos sem IVA (a taxa local é calculada sobre o valor sem impostos) <br> 4: imposto local aplicável a produtos, incluindo IVA (a taxa local é calculada sobre o valor + IVA principal) <br> 5: imposto local aplicável a serviços sem IVA (a taxa local é calculado sobre o valor sem impostos) <br> 6: imposto local aplicável a serviços, incluindo IVA (a taxa local  é calculada sobre o valor + imposto)
 LinkToTestClickToDial=Entre com um número telefônico para chamar e mostrar um link que testar a URL CliqueParaDiscar para usuário <strong>%s</strong>
 RefreshPhoneLink=Atualizar link
 LinkToTest=Clique no link gerado pelo usuário <strong>%s</strong> (clique no número telefônico para testar)
@@ -275,38 +338,66 @@ InitEmptyBarCode=Valor Init para o próximo registros vazios
 EraseAllCurrentBarCode=Apague todos os valores de código de barras atuais
 ConfirmEraseAllCurrentBarCode=Você tem certeza que deseja apagar todos os valores atuais do código de barras?
 AllBarcodeReset=Todos os valores de código de barras foram removidas
+NoBarcodeNumberingTemplateDefined=Nenhum modelo de código de barras de numeração ativado na configuração do módulo de código de barras.
 EnableFileCache=Ativar cache de arquivos
+ShowDetailsInPDFPageFoot=Adicione mais detalhes ao rodapé, como nomes de administradores ou de empresas (além de identificações profissionais, capital da empresa e número de IVA).
+NoDetails=Nenhum detalhe adicional no rodapé
 DisplayCompanyInfo=Exibir endereço da empresa
 DisplayCompanyManagers=Exibir nomes dos gerentes
 DisplayCompanyInfoAndManagers=Exibir o endereço da empresa e os nomes dos gerentes
+ModuleCompanyCodeSupplierAquarium=%s seguido pelo código do fornecedor para um código de contabilidade do fornecedor
 ModuleCompanyCodePanicum=Retornar um código contábil vazio
+ModuleCompanyCodeDigitaria=Código contábil depende do código de terceiros. O código é composto por caractere "C" na primeira posição seguido pelos primeiros 5 caracteres do código de terceiros.
 Use3StepsApproval=Por padrão, os Pedidos de Compra necessitam ser criados e aprovados por 2 usuários diferentes (uma etapa para a criação e a outra etapa para a aprovação. Note que se o usuário possui ambas permissões para criar e aprovar, uma única etapa por usuário será suficiente). Você pode pedir, com esta opção, para introduzir uma terceira etapa para aprovação por outro usuário, se o montante for superior a um determinado valor (assim 3 etapas serão necessárias : 1=validação, 2=primeira aprovação e 3=segunda aprovação se o montante for suficiente). <br>Defina como vazio se uma aprovação (2 etapas) é suficiente, defina com um valor muito baixo (0.1) se uma segunda aprovação (3 etapas) é sempre exigida.
 UseDoubleApproval=Usar uma aprovação de 3 etapas quando o valor (sem taxa) é maior do que ...
-WarningPHPMail2=Se o seu provedor SMTP de e-mail precisar restringir o cliente de e-mail a alguns endereços IP (muito raro), este é o endereço IP do agente de usuário de e-mail (MUA) para seu aplicativo ERP CRM: <strong> %s </ strong>.
+WarningPHPMail=AVISO: Muitas vezes, é melhor configurar e-mails enviados para usar o servidor de e-mail do seu provedor, em vez da configuração padrão. Alguns provedores de e-mail (como o Yahoo) não permitem que você envie um e-mail de outro servidor além do seu próprio servidor. Sua configuração atual usa o servidor do aplicativo para enviar e-mail e não o servidor do seu provedor de e-mail, então alguns destinatários (aquele compatível com o protocolo restritivo do DMARC) perguntarão ao seu provedor de e-mail se eles podem aceitar seu e-mail e alguns provedores de e-mail (como o Yahoo) pode responder "não" porque o servidor não é deles, portanto poucos dos seus e-mails enviados podem não ser aceitos (tome cuidado também com a cota de envio do seu provedor de e-mail). <br> Se o seu provedor de e-mail (como o Yahoo) tiver essa restrição, você deve alterar a configuração de e-mail para escolher o outro método "servidor SMTP" e inserir o servidor SMTP e as credenciais fornecidas pelo seu provedor de e-mail.
+WarningPHPMail2=Se o seu provedor SMTP de e-mail precisar restringir o cliente de e-mail a alguns endereços IP (muito raro), esse é o endereço IP do agente de usuário de e-mail (MUA) para seu aplicativo ERP CRM: <strong>%s</strong>.
 ClickToShowDescription=Clique para exibir a descrição
 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>
+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
 WatermarkOnDraftExpenseReports=Marca d'água nos relatórios de despesas
 AttachMainDocByDefault=Defina isto como 1 se você deseja anexar o documento principal por e-mail como padrão (se aplicável)
 FilesAttachedToEmail=Anexar arquivo
+davDescription=Configurar um servidor WebDAV
+DAV_ALLOW_PRIVATE_DIR=Ative o diretório privado genérico (diretório dedicado do WebDAV chamado "private" - login é necessário)
+DAV_ALLOW_PRIVATE_DIRTooltip=O diretório privado genérico é um diretório do WebDAV que qualquer pessoa pode acessar com seu login/senha do aplicativo.
+DAV_ALLOW_PUBLIC_DIR=Ativar o diretório público genérico (diretório dedicado do WebDAV denominado "public" - não é necessário efetuar login)
+DAV_ALLOW_PUBLIC_DIRTooltip=O diretório público genérico é um diretório do WebDAV que qualquer pessoa pode acessar (no modo de leitura e gravação), sem necessidade de autorização (conta de login/senha).
+DAV_ALLOW_ECM_DIR=Ative o diretório privado DMS/ECM (diretório raiz do módulo DMS/ECM - login é necessário)
+DAV_ALLOW_ECM_DIRTooltip=O diretório raiz no qual todos os arquivos são carregados manualmente ao usar o módulo DMS/ECM. Da mesma forma, como acesso a partir da interface da Web, você precisará de um login/senha válido com permissão para acessá-lo.
 Module0Name=Usuários e Grupos
 Module0Desc=Gerenciamento de Usuários / Funcionários e Grupos
+Module1Desc=Gestão de empresas e contatos (clientes, prospectos ...)
 Module2Desc=Gestor Comercial
+Module10Name=Contabilidade (simplificada)
 Module20Desc=Gestor de Orçamentos
+Module22Name=E-mails em massa
+Module22Desc=Gerenciar o envio em massa de e-mails
 Module23Desc=Monitoramento de Consumo de Energia
+Module25Name=Ordens de venda
+Module25Desc=Gerenciamento de pedidos de vendas
 Module40Name=Vendedores
+Module40Desc=Fornecedores e gerenciamento de compras (pedidos e faturamento)
 Module42Name=Notas de depuração
 Module42Desc=Recursos de registro (arquivo, syslog, ...). Tais registros são para propósitos técnicos/debug.
 Module49Desc=Gestor de Editores
+Module50Desc=Gestão de Produtos
 Module51Name=Cartas Massivos
 Module51Desc=Gestão de correspondência do massa
 Module52Name=Estoques
+Module52Desc=Gerenciamento de estoque (somente para produtos)
+Module53Desc=Gestão de Serviços
 Module54Name=Contratos/Assinaturas
 Module55Name=Códigos de Barra
 Module55Desc=Gestor de Códigos de Barra
 Module56Name=Telefonia
 Module56Desc=Integração Telefônica
+Module57Name=Pagamentos por débito direto bancário
 Module58Name=CliqueParaDiscarl
 Module58Desc=Integração do Sistema CliqueParaDiscar (Asterisk, etc.)
 Module59Desc=Adicione uma função para gerar uma conta Bookmark4u de uma conta Dolibarr
@@ -314,42 +405,74 @@ Module70Desc=Gestor de Intervenções
 Module75Name=Despesas e Notas de Viagem
 Module75Desc=Gestor de Despesas e Notas de Viagem. Administração das notas de despesas e deslocamentos
 Module80Name=Fretes
+Module80Desc=Embarques e gerenciamento de nota de entrega
+Module85Name=Bancos e Dinheiro
 Module85Desc=Gestor de Bancos e Caixas
+Module100Desc=Adicione um link para um site externo como um ícone do menu principal. Site é mostrado em um quadro no menu superior.
 Module105Name=Carteiro e SPIP
 Module105Desc=Carteiro ou Interface SPIP para Módulo MembroMailman or SPIP interface for member module
 Module200Desc=Sincronização de diretório LDAP
 Module240Name=Exportações de Dados
 Module240Desc=Ferramenta para exportar dados do Dolibarr (com assistentes)
 Module250Name=Importação de Dados
+Module250Desc=Ferramenta para importar dados para o Dolibarr (com assistentes)
 Module310Desc=Gestor de Associação de Membros
+Module320Desc=Adicionar um feed RSS às páginas do Dolibarr
+Module330Name=Marcadores e atalhos
+Module330Desc=Crie atalhos, sempre acessíveis, para as páginas internas ou externas às quais você acessa com frequência
 Module410Desc=Integração do Webcalendar
+Module500Name=Impostos e Despesas Especiais
 Module520Desc=Gestão dos empréstimos
+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
 Module700Name=Doações
 Module700Desc=Gestor de Doações
+Module770Name=Relatório de despesas
+Module770Desc=Gerenciar reclamações de relatórios de despesas (transporte, refeição, ...)
+Module1120Name=Propostas comerciais de Fornecedores
 Module1120Desc=Solicitar proposta comercial e preços do fornecedor
 Module1200Desc=Integração Mantis
 Module1520Name=Geração de Documentos
+Module1520Desc=Geração de documentos em massa por e-mail
 Module1780Name=Categorias
 Module1780Desc=Gestor de Categorias (produtos, fornecedores e clientes)
+Module2000Desc=Permitir que campos de texto sejam editados/formatados usando o CKEditor (html)
+Module2200Desc=Use expressões matemáticas para geração automática de preços
 Module2300Desc=Gerenciamento dos trabalhos agendados (alias cron ou tabela chrono)
 Module2400Name=Eventos / Agenda
+Module2400Desc=Track events. Registre eventos automáticos para fins de rastreamento ou registre eventos manuais ou reuniões. Este é o módulo principal para um bom gerenciamento de relacionamento com clientes ou fornecedores.
 Module2500Name=SGBD / GCE
 Module2500Desc=Sistema de Gerenciamento de Documentos / Gerenciamento de Conteúdo Eletrônico. Organização automática de seus documentos gerados ou armazenados. Compartilhe-os quando precisar.
 Module2600Name=Serviços API/Web (Servidor SOAP)
 Module2600Desc=Ativa o servidor de serviços web do Dolibarr
 Module2610Desc=Permitir que o servidor prestação de serviços de API REST do Dolibarr
 Module2660Name=Chamar ServiçosWeb (cliente SOAP)
+Module2660Desc=Ativar o cliente de serviços da Web Dolibarr (pode ser usado para enviar dados/solicitações para servidores externos. Apenas pedidos de compra são suportados no momento.)
+Module2700Desc=Use o serviço online Gravatar (www.gravatar.com) para mostrar fotos de usuários/membros (encontrados com seus e-mails). Precisa de acesso à Internet
 Module2900Desc=Capacidade de conversão com o GeoIP Maxmind
 Module4000Name=RH
 Module4000Desc=Gerenciamento de recursos humanos (gerenciamento do departamento, contratos dos funcionários e benefícios)
 Module5000Name=Multi-Empresas
 Module5000Desc=Permite gerenciar várias empresas
 Module6000Name=Fluxo de Trabalho
+Module10000Desc=Crie sites (públicos) com um editor WYSIWYG. Basta configurar o seu servidor web (Apache, Nginx, ...) para apontar para o diretório dedicado Dolibarr para tê-lo online na internet com o seu próprio nome de domínio.
+Module20000Name=Deixar o gerenciamento de solicitações
+Module20000Desc=Definir e rastrear solicitações de saída de funcionários
+Module39000Name=Lotes de Produtos
+Module39000Desc=Lotes, números de série, gerenciamento de data consumir/vender para produtos
+Module50000Desc=Oferecer aos clientes uma página de pagamento online PayBox (cartões de crédito/débito). Isso pode ser usado para permitir que seus clientes façam pagamentos ad-hoc ou pagamentos relacionados a um objeto Dolibarr específico (fatura, pedido, etc.)
+Module50100Desc=Módulo Ponto de Venda SimplePOS (POS simples).
+Module50150Desc=Módulo de Ponto de Venda TakePOS (touchscreen POS).
+Module50200Desc=Oferecer aos clientes uma página de pagamento online do PayPal (conta do PayPal ou cartões de crédito/débito). Isso pode ser usado para permitir que seus clientes façam pagamentos ad-hoc ou pagamentos relacionados a um objeto Dolibarr específico (fatura, pedido, etc.)
+Module50300Desc=Ofereça aos clientes uma página de pagamento on-line do Stripe (cartões de crédito / débito). Isso pode ser usado para permitir que seus clientes façam pagamentos ad-hoc ou pagamentos relacionados a um objeto Dolibarr específico (fatura, pedido, etc.)
+Module50400Name=Contabilidade (entrada dupla)
 Module54000Name=ImprimirIPP
 Module55000Name=Pesquisa Aberta
+Module55000Desc=Criar pesquisas, enquetes ou votos on-line (como Doodle, Studs, RDVz etc ...)
 Module59000Desc=Módulo para gerenciar margens
 Module60000Desc=Módulo para gerenciar comissão
+Module63000Desc=Gerenciar recursos (impressoras, carros, salas, ...) para alocar eventos
 Permission11=Ler Faturas de Clientes
 Permission12=Criar/Modificar Faturas de Clientes
 Permission13=Faturas de Clientes Não-Validadas
@@ -401,10 +524,13 @@ Permission112=Criar/Modificar/Deletar e Comparar Transações
 Permission113=Configurar Contas Financeiras (criar, gerenciar categorias)
 Permission115=Exportar Transações e Extratos Bancários
 Permission116=Transferência entre Contas
+Permission117=Gerenciar cheques despachando
 Permission121=Ler Terceiros Vinculado ao Usuário
 Permission122=Criar/Modificar Terceiros
 Permission125=Deletar Terceiros
 Permission126=Exportar Terceiros
+Permission141=Ler todos os projetos e tarefas (também projetos privados para os quais não sou um contato)
+Permission142=Criar/modificar todos os projetos e tarefas (também projetos privados para os quais não sou um contato)
 Permission144=Deletar Projetos (Projetos Compartilhados e Projetos que eu contratei para)
 Permission146=Ler Provedores
 Permission147=Ler Estatísticas
@@ -422,6 +548,14 @@ Permission173=Deletar Viagens
 Permission174=Leia todas as viagens e despesas
 Permission178=Exportar Viagens
 Permission180=Ler Fornecedores
+Permission181=Ler pedidos de compra
+Permission182=Criar/modificar pedidos
+Permission183=Validar pedidos
+Permission184=Aprovar pedidos
+Permission185=Encomendar ou cancelar pedidos
+Permission186=Receber ordens de compra
+Permission187=Fechar ordens de compra
+Permission188=Cancelar pedidos de compra
 Permission192=Criar Linhas
 Permission193=Cancelar Linhas
 Permission194=Leia as linhas de largura de banda
@@ -454,6 +588,7 @@ PermissionAdvanced253=Criar/Modificar Usuários internos/externos e suas Permiss
 Permission254=Criar/Modificar Usuários Externos
 Permission255=Modificar Senha de Outros Usuários
 Permission256=Deletar ou Desativar Outros Usuários
+Permission262=Estender o acesso a todos os terceiros (não apenas terceiros para os quais esse usuário é um representante de vendas). <br> Não é eficaz para usuários externos (sempre limitados a eles próprios para propostas, pedidos, faturas, contratos, etc.). <br> Não é eficaz para projetos (apenas regras sobre permissões de projeto, visibilidade e atribuição de tarefas).
 Permission271=Ler CA
 Permission272=Ler Faturas
 Permission273=Emitir Fatura
@@ -463,6 +598,10 @@ Permission283=Deletar Contatos
 Permission286=Exportar Contatos
 Permission291=Ler Tarifas
 Permission292=Definir Permissões das Tarifas
+Permission293=Modificar as tarifas do cliente
+Permission300=Ler códigos de barras
+Permission301=Criar/modificar códigos de barras
+Permission302=Excluir códigos de barras
 Permission311=Ler Serviços
 Permission312=Atribuir Serviço no Contrato
 Permission331=Ler Marcadores de Página
@@ -512,11 +651,29 @@ Permission1102=Criar/Modificar Pedidos de Entrega
 Permission1104=Validar Pedidos de Entrega
 Permission1109=Excluir Pedidos de Entrega
 Permission1181=Ler Fornecedores
+Permission1182=Leia pedidos de compra
+Permission1183=Criar/modificar pedidos
+Permission1184=Validar pedidos
+Permission1185=Aprovar pedidos
+Permission1186=Encomenda de pedidos
+Permission1187=Reconhecer o recebimento de pedidos de compra
+Permission1188=Excluir pedidos
+Permission1190=Aprovar pedidos de compra (segunda aprovação)
 Permission1201=Conseguir Resultado de uma Exportação
 Permission1202=Criar/Modificar uma Exportação
+Permission1231=Ler faturas de fornecedores
+Permission1232=Criar/modificar faturas de fornecedores
+Permission1233=Validar faturas de fornecedores
+Permission1234=Excluir faturas de fornecedores
+Permission1235=Enviar faturas de fornecedores por e-mail
+Permission1236=Exportar faturas, atributos e pagamentos do fornecedor
+Permission1237=Exportar ordens de compra e seus detalhes
 Permission1251=Rodar(run) Importações Massivas de Dados Externos para o Banco de Dados (carregamento de dados)
 Permission1321=Exportar Faturas de Clientes, Atributos e Pagamentos
 Permission1322=Reabrir uma nota paga
+Permission1421=Exportar ordens de venda e atributos
+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
 Permission20004=Leia todos os pedidos de licença (mesmo do usuário não subordinados)
 Permission20005=Criar / modificar pedidos de licença para todos (mesmo do usuário não subordinados)
@@ -538,6 +695,7 @@ 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)
+Permission50101=Use o Ponto de Venda
 Permission50201=Ler Transações
 Permission50202=Importar Transações
 Permission55001=Ler Pesquisa
@@ -548,23 +706,42 @@ Permission63001=Ler recursos
 Permission63002=Criar/Modificar recursos
 Permission63003=Excluir recursos
 Permission63004=Conectar os recursos aos eventos da agenda
+DictionaryCompanyType=Tipos de terceiros
+DictionaryCompanyJuridicalType=Entidades jurídicas de terceiros
 DictionaryProspectLevel=Possível cliente
+DictionaryCanton=Estados/Cidades
 DictionaryRegion=Regiões
+DictionaryCivility=Título da civilidade
 DictionaryActions=Tipos de eventos na agenda
+DictionarySocialContributions=Tipos de impostos sociais ou fiscais
 DictionaryVAT=Taxas de VAT ou imposto sobre vendas de moeda
+DictionaryPaymentConditions=Termos de pagamento
+DictionaryPaymentModes=Formas de pagamento
 DictionaryTypeContact=Tipos Contato / Endereço
+DictionaryTypeOfContainer=Website - Tipo de páginas/contêineres do site
 DictionaryEcotaxe=Ecotaxa (REEE)
 DictionaryPaperFormat=Formatos de papel
+DictionaryFormatCards=Formatos de cartão
 DictionaryFees=Relatório de despesas - Tipos de linhas de relatório de despesas
 DictionarySendingMethods=Métodos do transporte
+DictionaryStaff=Número de empregados
 DictionaryOrderMethods=Métodos de compra
 DictionarySource=Origem das propostas / ordens
 DictionaryAccountancyCategory=Grupos personalizados para relatórios
 DictionaryAccountancysystem=Modelos para o plano de contas
 DictionaryAccountancyJournal=Relatórios da contabilidade
+DictionaryEMailTemplates=Templates de e-mail
+DictionaryMeasuringUnits=Unidades de Medição
 DictionaryProspectStatus=Status de prospecto de cliente
 SetupSaved=Configurações Salvas
 SetupNotSaved=Configuração não salva
+BackToModuleList=Voltar à lista do módulo
+BackToDictionaryList=Voltar à lista de dicionários
+VATManagement=Gestão de impostos sobre vendas
+VATIsUsedDesc=Por padrão, ao criar prospectos, faturas, pedidos etc., a taxa do imposto sobre vendas segue a regra padrão ativa: <br> Se o vendedor não estiver sujeito ao imposto sobre vendas, o imposto sobre vendas será padronizado como 0. Fim da regra. <br> Se o (país do vendedor = país do comprador), o imposto sobre vendas, por padrão, é igual ao imposto sobre vendas do produto no país do vendedor. Fim de regra. <br> Se o vendedor e o comprador estiverem na Comunidade Europeia e os bens forem produtos relacionados a transporte (transporte, transporte aéreo, companhia aérea), o IVA padrão é 0. Essa regra depende do país do vendedor - consulte seu contador. O IVA deve ser pago pelo comprador à estância aduaneira do seu país e não ao vendedor. Fim de regra. <br> Se o vendedor e o comprador estiverem ambos na Comunidade Europeia e o comprador não for uma empresa (com um número de IVA intracomunitário registrado), o IVA será padronizado para a taxa de IVA do país do vendedor. Fim de regra. <br> Se o vendedor e o comprador estiverem ambos na Comunidade Europeia e o comprador for uma empresa (com um número de IVA intracomunitário registrado), o IVA será 0 por padrão. Fim de regra. <br> Em qualquer outro caso, o padrão proposto é imposto sobre vendas = 0. Fim de regra.
+VATIsNotUsedDesc=Por padrão, o imposto sobre vendas proposto é 0, que pode ser usado para casos como associações, indivíduos ou pequenas empresas.
+VATIsUsedExampleFR=Na França, significa empresas ou organizações que possuem um sistema fiscal real (real simplificado, real ou normal). Um sistema no qual o IVA é declarado.
+VATIsNotUsedExampleFR=Na França, isso significa associações que não são declaradas em impostos sobre vendas ou empresas, organizações ou profissões liberais que escolheram o sistema fiscal de microempresas (imposto sobre vendas em franquia) e pagaram uma taxa de vendas de franquia sem qualquer declaração de imposto sobre vendas. Essa opção exibirá a referência "Imposto sobre vendas não aplicável - art-293B do CGI" nas faturas.
 LTRate=Rata
 LocalTax1IsNotUsed=Não utilizar segundo imposto
 LocalTax2IsNotUsed=Não utilizar terceiro imposto
@@ -599,7 +776,7 @@ DatabasePort=Porta do Banco de Dados
 DatabaseUser=Usuário do Banco de Dados
 DatabasePassword=Senha do Banco de Dados
 TableName=Nome da Tabela
-NbOfRecord=Nº de registros
+NbOfRecord=Nº. de registros
 DriverType=Tipo de Driver
 SummarySystem=Resumo de informações do sistema
 SummaryConst=Lista de todos os parâmetros de configurações do Dolibarr
@@ -614,6 +791,8 @@ MessageOfDay=Mensagem do dia
 MessageLogin=Mensagem da página de login
 LoginPage=Página de login
 PermanentLeftSearchForm=Formulário permanente de pesquisa no menu esquerdo
+DefaultLanguage=Idioma padrão
+EnableMultilangInterface=Ativar suporte multilíngue
 EnableShowLogo=Exibir logo no menu esquerdo
 CompanyInfo=Empresa / Organização
 CompanyIds=Identidades da empresa / organização
@@ -623,6 +802,27 @@ CompanyTown=Município
 NoActiveBankAccountDefined=Nenhuma conta bancária ativa está definida
 BankModuleNotActive=O módulo de contas bancárias não está habilitado
 ShowBugTrackLink=Mostrar link "<strong>%s</strong>"
+DelaysOfToleranceBeforeWarning=Atraso antes de exibir um alerta de aviso para:
+DelaysOfToleranceDesc=Defina o atraso antes de um ícone de alerta %s ser mostrado na tela para o elemento final.
+Delays_MAIN_DELAY_ACTIONS_TODO=Eventos planejados (eventos da agenda) não concluídos
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projeto não fechado a tempo
+Delays_MAIN_DELAY_TASKS_TODO=Tarefa planejada (tarefas do projeto) não concluídas
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Encomenda não processada
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Pedido de compra não processado
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposta não fechada
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposta não faturada
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Serviço para ativar
+Delays_MAIN_DELAY_RUNNING_SERVICES=Serviço expirado
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Fatura de fornecedor não paga
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Fatura de cliente não paga
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Conciliação bancária pendente
+Delays_MAIN_DELAY_MEMBERS=Taxa de adesão atrasada
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Cheque depósito não feito
+Delays_MAIN_DELAY_EXPENSEREPORTS=Relatório de despesas para aprovar
+SetupDescription2=As duas seções a seguir são obrigatórias (as duas primeiras entradas no menu de configuração):
+SetupDescription3=<a href="%s">%s -> %s</a> <br> Parâmetros básicos usados para personalizar o comportamento padrão do seu aplicativo (por exemplo, para recursos relacionados ao país).
+SetupDescription4=<a href="%s">%s -> %s</a> <br> Este software é um conjunto de muitos módulos/aplicativos, todos mais ou menos independentes. Os módulos relevantes para suas necessidades devem ser ativados e configurados. Novos itens/opções são adicionados aos menus com a ativação de um módulo.
+SetupDescription5=Outras entradas do menu de configuração gerenciam parâmetros opcionais.
 LogEvents=Auditoría de segurança dos eventos
 Audit=Auditoría
 InfoOS=Sobre o SO
@@ -631,8 +831,11 @@ InfoPerf=Sobre Desempenhos
 BrowserOS=Navegador OS
 ListOfSecurityEvents=Lista de eventos de segurança do Dolibarr
 SecurityEventsPurged=Eventos de segurança foram purgados(apagados)
+LogEventDesc=Ative o registro para eventos de segurança específicos. Administradores o log via menu <b>%s - %s</b> . Atenção, esse recurso pode gerar uma grande quantidade de dados no banco de dados.
 AreaForAdminOnly=Os parâmetros de configuração só podem ser definidos pelos <b>usuários administradores</b>.
 SystemInfoDesc=Informações do sistema está faltando informações, técnicas você consegue em modo de leitura e é visivel somente para administradores.
+SystemAreaForAdminOnly=Esta área está disponível apenas para usuários administradores. As permissões de usuário do Dolibarr não podem alterar essa restrição.
+DisplayDesc=Parâmetros afetando a aparência e o comportamento do Dolibarr podem ser modificados aqui.
 AvailableModules=App/Módulos disponíveis
 ToActivateModule=Para ativar os módulos, vá à área de configuração (Home->Configuração->Módulo).
 SessionTimeOut=Expiro tempo de sessão
@@ -641,24 +844,54 @@ TriggerDisabledByName=Triggers neste arquivo estão desativados pelo sufixo <b>-
 TriggerDisabledAsModuleDisabled=Triggers neste arquivo está desabilitado assim como o módulo <b>%s</b> está desabilitado.
 TriggerAlwaysActive=Triggers neste arquivo está sempre ativo, não importando os módulos ativos no Dolibarr.
 TriggerActiveAsModuleActive=Triggers neste arquivo são ativos quando módulo <b>%s</b> está ativado.
+GeneratedPasswordDesc=Escolha o método a ser usado para senhas geradas automaticamente.
 DictionaryDesc=Inserir todos os dados de referência. Você pode adicionar seus valores ao padrão.
+ConstDesc=Esta página permite editar (anular) parâmetros não disponíveis em outras páginas. Estes são principalmente parâmetros reservados para desenvolvedores/solução de problemas avançada. Para uma lista completa dos parâmetros disponíveis, <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="Site Externo - abre em uma nova janela" target="_blank">veja aqui</a>.
 MiscellaneousDesc=Todos os outros parâmetros relacionados com a segurança são definidos aqui.
 LimitsSetup=Configurações de Limites/Precisões
+MAIN_MAX_DECIMALS_UNIT=Max. decimais para preços unitários
+MAIN_MAX_DECIMALS_TOT=Max. decimais para os preços totais
+MAIN_MAX_DECIMALS_SHOWN=Max. decimais para os preços <b>mostrados na tela</b> . Adicione reticências <b>...</b> após este parâmetro (por exemplo, "2 ...") se desejar ver "<b>...</b>" com sufixo no preço truncado.
+MAIN_ROUNDING_RULE_TOT=Etapa do intervalo de arredondamento (para países em que o arredondamento é feito em algo diferente da base 10. Por exemplo, coloque 0,05 se o arredondamento for feito em 0,05 etapas)
 UnitPriceOfProduct=Unidade líquida do preço do produto
+TotalPriceAfterRounding=Preço total (excl/IVA/imposto incluso) após o arredondamento
 ParameterActiveForNextInputOnly=Parâmetro efetivo somente para a próxima entrada
+NoEventOrNoAuditSetup=Nenhum evento de segurança foi registrado. Isso é normal se a Auditoria não tiver sido ativada na página "Configuração - Segurança - Eventos".
 SeeLocalSendMailSetup=Ver sua configuração local de envio de correspondência
+BackupDesc=Um backup <b>completo</b> de uma instalação do Dolibarr requer duas etapas.
+BackupDesc2=Faça backup do conteúdo do diretório "documents" ( <b>%s</b> ) contendo todos os arquivos carregados e gerados. Isso também incluirá todos os arquivos de despejo gerados na Etapa 1.
+BackupDesc3=Faça backup da estrutura e do conteúdo do banco de dados ( <b>%s</b> ) em um arquivo de despejo. Para isso, você pode usar o assistente a seguir.
+BackupDescX=O diretório arquivado deve ser armazenado em um local seguro.
 BackupDescY=O arquivo de despeja gerado deverá ser armazenado em um local seguro.
+RestoreDesc=Para restaurar um backup Dolibarr, duas etapas são necessárias.
+RestoreDesc2=Restaure o arquivo de backup (arquivo zip, por exemplo) do diretório "documents" para uma nova instalação do Dolibarr ou para o diretório atual de documentos ( <b>%s</b> ).
+RestoreDesc3=Restaure a estrutura do banco de dados e os dados de um arquivo de despejo de backup no banco de dados da nova instalação do Dolibarr ou no banco de dados desta instalação atual ( <b>%s</b> ). Atenção, assim que a restauração for concluída, você deverá usar um login / senha, que existiu a partir do momento / instalação do backup para se conectar novamente. <br> Para restaurar um banco de dados de backup nesta instalação atual, você pode seguir este assistente.
 RestoreMySQL=Importar MySQL
 ForcedToByAModule=Essa Regra é forçada para <b>%s</b> by um módulo ativado
+PreviousDumpFiles=Arquivos de backup existentes
+WeekStartOnDay=Primeiro dia da semana
+RunningUpdateProcessMayBeRequired=A execução do processo de atualização parece ser necessária (a versão do programa %s é diferente da versão do banco de dados %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Você deve rodar esse comando na linha de comando (CLI) depois de logar no shell com o usuário <b>%s</b> ou você deve adicionar a opção -W no final da linha de comando para fornecer a senha <b>%s</b>.
 YourPHPDoesNotHaveSSLSupport=Função SSL functions não está disponível no seu PHP
 DownloadMoreSkins=Mais skins para baixar
+SimpleNumRefModelDesc=Retorna o número de referência com o formato %syymm-nnnn onde yy é ano, mm é mês e nnnn é sequencial sem reset
+ShowProfIdInAddress=Mostrar ID profissional com endereços
+ShowVATIntaInAddress=Ocultar o número de IVA intracomunitário com endereços
 MeteoStdModEnabled=Modo padrão habilitado
 MeteoPercentageMod=Modo porcentagem
 MeteoPercentageModEnabled=Modo de porcentagem habilitado
 TestLoginToAPI=Teste de login para API
+ProxyDesc=Algumas características do Dolibarr requerem acesso à Internet. Defina aqui os parâmetros de conexão à Internet, como acesso por meio de um servidor proxy, se necessário.
+ExternalAccess=Acesso Externo/Internet
+MAIN_PROXY_USE=Use um servidor proxy (caso contrário, o acesso é direto à internet)
+MAIN_PROXY_HOST=Servidor proxy: nome/endereço
+MAIN_PROXY_PORT=Servidor proxy: porta
+MAIN_PROXY_USER=Servidor Proxy: Login/Usuário
+MAIN_PROXY_PASS=Servidor proxy: senha
+DefineHereComplementaryAttributes=Defina aqui quaisquer atributos adicionais/personalizados que você deseja incluir: %s
 ExtraFieldsLinesRec=Atributos complementares (linhas dos temas das faturas)
 ExtraFieldsSupplierOrdersLines=Atributos complementares (linhas de encomenda)
+ExtraFieldsThirdParties=Atributos Complementares (Terceiros)
 ExtraFieldsMember=Atributos complementares (membros)
 ExtraFieldsCustomerInvoicesRec=Atributos complementares (temas das faturas)
 ExtraFieldsSupplierOrders=Atributos complementares (pedidos)
@@ -668,32 +901,50 @@ SendmailOptionNotComplete=Aviso, em alguns sistemas Linux, para enviar email par
 PathToDocuments=Caminho para documentos
 TranslationKeySearch=Buscar uma chave ou variável de tradução
 TranslationOverwriteKey=Sobrescrever uma variável de tradução
+TranslationDesc=Como definir o idioma de exibição: <br> * Padrão / Systemwide: menu <strong>Início -> Configurações -> Exibir</strong> <br> * Por usuário: Clique no nome de usuário na parte superior da tela e modifique a guia <strong>Configuração de exibição</strong> do usuário no cartão do usuário.
 TranslationOverwriteDesc=Você também pode sobrescrever as variáveis preenchendo a tabela a seguir. Escolha o seu idioma a partir do "%s" dropdown, insira a variável com a chave da transação em "%s" e a sua nova tradução em "%s"
 TranslationString=Variável de tradução
 CurrentTranslationString=Variável de tradução atual
 WarningAtLeastKeyOrTranslationRequired=Pelo menos um critério de busca é exigido para a chave ou variável de tradução.
 NewTranslationStringToShow=Nova variável de tradução a ser exibida
 OriginalValueWas=A tradução original foi sobrescrita. O valor original era:<br><br>%s
+TransKeyWithoutOriginalValue=Você forçou uma nova tradução para a chave de tradução ' <strong>%s</strong> ' que não existe em nenhum arquivo de idioma
 TotalNumberOfActivatedModules=Aplicação / módulos ativados: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Você pelo menos deve ativar 1 módulo
 YesInSummer=Sim em verão
+OnlyFollowingModulesAreOpenedToExternalUsers=Observe que apenas os módulos a seguir estão disponíveis para usuários externos (independentemente das permissões de tais usuários) e somente se as permissões forem concedidas: <br>
 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)
 PasswordGenerationStandard=Retorna uma senha gerara de acordo com o algorítimo interno do Dolibarr: 8 caracteres contendo números e letras em letras minusculas.
 PasswordGenerationPerso=Retornar uma senha de acordo com a configuração definida para a sua personalidade.
 PasswordPatternDesc=Descrição do padrão de senha
+RuleForGeneratedPasswords=Regras para gerar e validar senhas
+DisableForgetPasswordLinkOnLogonPage=Não mostrar o link "Senha esquecida" na página de login
 UsersSetup=Configurações de módulo de usuários
+UserMailRequired=O e-mail é necessário para criar um novo usuário
 HRMSetup=Configuração do módulo RH
 CompanySetup=Configurações de módulo das empresas
+CompanyCodeChecker=Opções para geração automática de códigos de cliente / fornecedor
+AccountCodeManager=Opções para geração automática de códigos contábeis de clientes / fornecedores
+NotificationsDesc=As notificações por e-mail podem ser enviadas automaticamente para alguns eventos do Dolibarr. <br> Destinatários de notificações podem ser definidos:
+NotificationsDescUser=* por usuário, um usuário por vez.
+NotificationsDescContact=* por contatos de terceiros (clientes ou fornecedores), um por vez.
+NotificationsDescGlobal=*ou definindo endereços de e-mail globais nesta página de configuração.
 ModelModules=Modelos de documento
 WatermarkOnDraft=Marca d'água no documento de rascuno
 JSOnPaimentBill=Ative a função de preenchimento automático de linhas no formulário de pagamento
 CompanyIdProfChecker=Regras para IDs profissionais
+MustBeMandatory=Obrigatório criar terceiros (se o número de IVA ou o tipo de empresa for definido)?
 MustBeInvoiceMandatory=Obrigatória a validação de faturas?
+WebDAVSetupDesc=Este é o link para acessar o diretório WebDAV. Ele contém um diretório "público" aberto a qualquer usuário que conheça a URL (se o acesso ao diretório público for permitido) e um diretório "particular" que precise de uma conta / senha de login existente para acesso.
+WebDavServer=URL raiz do servidor %s: %s
 WebCalUrlForVCalExport=Uma exportação de link para o formato <b>%s</b> está disponível no seguinte link: %s
 BillsSetup=Configurações do módulo de faturas
 BillsNumberingModule=Faturas e notas de crédito no modelo de numeração
@@ -701,12 +952,17 @@ BillsPDFModules=Modelos de documentos da fatura
 PaymentsPDFModules=Modelos dos documentos de pagamento
 ForceInvoiceDate=Forçar data de fatura para data de validação
 SuggestedPaymentModesIfNotDefinedInInvoice=Sugerir formas de pagamentos na fatura por default se não estiver definida na fatura
+SuggestPaymentByRIBOnAccount=Sugerir pagamento por retirada na conta
+SuggestPaymentByChequeToAddress=Sugerir pagamento por cheque para
 FreeLegalTextOnInvoices=Texto livre nas fatura
 WatermarkOnDraftInvoices=Marca d'água sobre o projeto de faturas (nenhum se estiver vazio)
 PaymentsNumberingModule=Modelo de enumeração para pagamentos
+SuppliersPayment=Pagamentos do fornecedor
+SupplierPaymentSetup=Configuração de pagamentos do fornecedor
 PropalSetup=Configurações do módulo de orçamentos
 ProposalsNumberingModules=Modelos de numeração de orçamentos
 ProposalsPDFModules=Modelos de documentos para Orçamentos
+SuggestedPaymentModesIfNotDefinedInProposal=Modo de pagamentos sugeridos na proposta por padrão, se não definido para proposta
 FreeLegalTextOnProposal=Texto livre em orçamentos
 WatermarkOnDraftProposal=Marca d'água no rascunho de orçamentos (nenhum se vazio)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Informar conta bancária de destino da proposta
@@ -718,6 +974,7 @@ WatermarkOnDraftSupplierProposal=Marca d'água em projetos de ordem dos forneced
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Informar conta bancária de destino da proposta
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Solicitar Fonte de Armazenagem para o pedido
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Pedir destino da conta bancária da ordem de compra
+OrdersSetup=Configuração de gerenciamento de pedidos de vendas
 OrdersNumberingModules=modelos de numeração de pedidos
 OrdersModelModule=Modelos de documentos de pedidos
 FreeLegalTextOnOrders=Texto livre em pedidos
@@ -735,7 +992,10 @@ TemplatePDFContracts=Modelos de documentos Contratos
 WatermarkOnDraftContractCards=Marca d'água em projetos de contratos (nenhum se estiver vazio)
 MembersSetup=Configurações de módulo de membros
 AdherentLoginRequired=Gestor de login para cada membro
+AdherentMailRequired=O e-mail necessário para criar um novo membro
 MemberSendInformationByMailByDefault=Marque o checkbox para enviar confirmação de correspondência para membros (validação ou nova contribuição) é ativo por default
+VisitorCanChooseItsPaymentMode=O visitante pode escolher entre os modos de pagamento disponíveis
+MEMBER_REMINDER_EMAIL=Ativar lembrete automático <b>por e-mail</b> de assinaturas expiradas. Nota: O módulo <strong>%s</strong> deve estar ativado e configurado corretamente para enviar lembretes.
 LDAPSetup=Configurações do LDAP
 LDAPUsersSynchro=Usuários
 LDAPContactsSynchro=Contatos
@@ -748,6 +1008,7 @@ LDAPSynchronizeMembers=Organização dos membros da fundação em LDAP
 LDAPSynchronizeMembersTypes=Organização dos tipos de membro da fundação no LDAP
 LDAPPrimaryServer=Servidor primário
 LDAPSecondaryServer=Servidor secundário
+LDAPServerPortExample=Porta padrão: 389
 LDAPServerUseTLS=Usuário TLS
 LDAPServerUseTLSExample=Seu servidor LDAP usa TLS
 LDAPAdminDn=Administrador DN
@@ -789,15 +1050,36 @@ LDAPTCPConnectOK=Conexão TCP para o servidor LDAP foi um sucesso (Servidor=%s,
 LDAPTCPConnectKO=Conexão TCP para o servidor LDAP falhou (Servidor=%s, Porta=%s)
 LDAPSetupForVersion3=Servidor LDAP configurado para versão 3
 LDAPSetupForVersion2=Servidor LDAP configurado para versão 2
+LDAPFieldLoginExample=Exemplo: uid
+LDAPFilterConnectionExample=Exemplo: &(objectClass = inetOrgPerson)
+LDAPFieldLoginSambaExample=Exemplo: samaccountname
+LDAPFieldFullnameExample=Exemplo: cn
+LDAPFieldPasswordExample=Exemplo: userPassword
+LDAPFieldCommonNameExample=Exemplo: cn
+LDAPFieldNameExample=Exemplo: sn
+LDAPFieldFirstNameExample=Exemplo: givenName
 LDAPFieldMail=E-Mail
+LDAPFieldMailExample=Exemplo: mail
 LDAPFieldPhone=Telefone profissional
+LDAPFieldPhoneExample=Exemplo: givenName
 LDAPFieldHomePhone=Telefone pessoal
+LDAPFieldHomePhoneExample=Exemplo: homephone
 LDAPFieldMobile=Celular
+LDAPFieldMobileExample=Exemplo: mobile
 LDAPFieldFax=Fax
+LDAPFieldFaxExample=Exemplo: facsimiletelephonenumber
 LDAPFieldAddress=Endereço
+LDAPFieldAddressExample=Exemplo: street
 LDAPFieldZip=CEP
+LDAPFieldZipExample=Exemplo: postalcode
 LDAPFieldTown=Município
+LDAPFieldTownExample=Exemplo: l
+LDAPFieldDescriptionExample=Exemplo: description
+LDAPFieldNotePublicExample=Exemplo: publicnote
 LDAPFieldGroupMembers=Membros de grupo
+LDAPFieldGroupMembersExample=Exemplo: uniqueMember
+LDAPFieldCompanyExample=Exemplo: o
+LDAPFieldSidExample=Exemplo: objectsid
 LDAPFieldEndLastSubscription=Data do término de inscrição
 LDAPFieldTitleExample=Exemplo: Título
 LDAPSetupNotComplete=Configurações LDAP não está completa (vá nas outras abas)
@@ -821,12 +1103,16 @@ FilesOfTypeCompressed=Arquivos do tipo %s estão comprimidos pelo servidor HTTP
 FilesOfTypeNotCompressed=Arquivos do tipo %s não estão comprimidos pelo servidor HTTP
 CompressionOfResources=Comprimir as respostas HTTP
 TestNotPossibleWithCurrentBrowsers=Não é possível detecção automática
+DefaultValuesDesc=Aqui você pode definir o valor padrão que deseja usar ao criar um novo registro e / ou filtros padrão ou a ordem de classificação ao listar registros.
+DefaultCreateForm=Valores padrão (para usar em formulários)
 DefaultSearchFilters=Filtros de busca padrão
 DefaultSortOrder=Ordem padrão dos pedidos
 DefaultFocus=Campos de foco padrão
 ProductSetup=Configurações do módulo dos produtos
 ServiceSetup=Configurações do módulo de serviços
 ProductServiceSetup=Configurações dos módulos de produtos e serviços
+NumberOfProductShowInSelect=Número máximo de produtos para mostrar em listas de seleção de combinação (0 = sem limite)
+ViewProductDescInFormAbility=Exibir descrições de produtos em formulários (mostrados de outra forma em um pop-up de dicas de ferramentas)
 MergePropalProductCard=Ativar na aba Arquivos Anexos ao produto/serviço uma opção para mesclar o documento PDF do produto à proposta PDF se o produto/serviço estiver na proposta
 SetDefaultBarcodeTypeProducts=Tipo de código de barras default para usar nós produtos
 SetDefaultBarcodeTypeThirdParties=Tipo de código de barras default para usar nós terceiros
@@ -864,8 +1150,13 @@ NewRSS=Novo RSS Feed
 RSSUrl=URL de RSS
 RSSUrlExample=Um interessante RSS feed
 MailingSetup=Configurações do módulo de e-mails
+MailingEMailFrom=E-mail do remetente (De) para e-mails enviados por módulo de e-mail
+MailingEMailError=Retornar e-mail (Erros-para) para e-mails com erros
 MailingDelay=Segundos de espera antes do envio da mensagem seguinte
+NotificationSetup=Configuração do módulo de notificação por e-mail
+NotificationEMailFrom=E-mail do remetente (De) para e-mails enviados pelo módulo de Notificações
 FixedEmailTarget=Destinatário
+SendingsSetup=Configuração do módulo de envio
 SendingsReceiptModel=Modelo de recibo do envio
 SendingsNumberingModules=Módulos de númeração de envios
 SendingsAbility=Suporte para folhas de envios, para entregas de cliente
@@ -877,6 +1168,7 @@ FreeLegalTextOnDeliveryReceipts=Texto livre em recibos de entregas
 ActivateFCKeditor=Editor avançado ativo por:
 FCKeditorForCompany=Criação/edição do WYSIWIG nas descrições de elementos e nota (exceto produtos/serviços)
 FCKeditorForProduct=Criação/edição do WYSIWIG nas descrições de  produtos/serviços e nota
+FCKeditorForProductDetails=WYSIWIG criação / edição de produtos detalha linhas para todas as entidades (propostas, pedidos, faturas, etc ...). <font class="warning">Aviso: O uso desta opção para este caso não é recomendado, pois pode criar problemas com caracteres especiais e formatação de página ao criar arquivos PDF.</font>
 FCKeditorForMailing=Criação/edição do WYSIWIG nos E-Mails massivos (ferramentas->emailing)
 FCKeditorForUserSignature=criação/edição do WYSIWIG nas assinaturas de usuários
 FCKeditorForMail=Criação/Edição WYSIWIG para todos os e-mails (exceto Ferramentas->eMailing)
@@ -903,7 +1195,9 @@ FailedToInitializeMenu=Falha na inicialização do menu
 TaxSetup=Configurações do módulo taxas, contribuição social e dividendos
 OptionVatMode=Imposto ICMS
 OptionVATDebitOption=Base em Acréscimo
-OptionPaymentForProductAndServicesDesc=IVA é devido: <br> - em pagamento de mercadorias - em pagamentos por serviços
+OptionVatDefaultDesc=O IVA é devido: <br> - na entrega de mercadorias (com base na data da fatura) <br> - sobre pagamentos por serviços
+OptionVatDebitOptionDesc=O IVA é devido: <br> - na entrega de mercadorias (com base na data da fatura) <br> - na fatura (débito) para serviços
+OptionPaymentForProductAndServicesDesc=O IVA é devido: <br> - no pagamento de mercadorias <br> - sobre pagamentos por serviços
 SupposedToBePaymentDate=Data usada no pagamento
 SupposedToBeInvoiceDate=Data usada na fatura
 Buy=Compra
@@ -916,15 +1210,20 @@ AgendaSetup=Configurações do módulo de eventos e agenda
 PasswordTogetVCalExport=Chave para autorizar exportação do link
 PastDelayVCalExport=Não exportar eventos antigos de
 AGENDA_DEFAULT_VIEW=Qual aba voçê quer abrir por padrão quando o menu Agenda e selecionado
-AGENDA_REMINDER_EMAIL=Ativar lembrete de evento <b> por emails </b> (A opção de lembrar / atraso pode ser definida em cada evento). Nota: Módulo <strong> 1 %s </strong> deve ser habilitado e configurado corretamente para que o lembrete seja enviado na freqüência correta.
+AGENDA_REMINDER_EMAIL=Ativar lembrete de evento <b> por e-mails </b> (A opção de lembrar / atraso pode ser definida em cada evento). Nota: Módulo <strong> 1 %s </strong> deve ser habilitado e configurado corretamente para que o lembrete seja enviado na freqüência correta.
+AGENDA_REMINDER_BROWSER=Ativar lembrete de evento <b>no navegador do usuário</b> (quando a data do evento é atingida, cada usuário pode recusar isso da pergunta de confirmação do navegador)
 AGENDA_REMINDER_BROWSER_SOUND=Habilitar a notificação sonora
 AGENDA_SHOW_LINKED_OBJECT=Exibir objeto conectado na visualização da agenda
 ClickToDialSetup=Configurações do módulo clique para discar
 ClickToDialUrlDesc=URL chamada quando clica-se no ícone do telefone.  Na URL, você pode usar as tags<br><b>__PHONETO__</b> que será substituída pelo número do telefone da pessoa a chamar<br><b>__PHONEFROM__</b> que será substituída pelo telefone da pessoa que está chamando (o seu)<br><b>__LOGIN__</b> que será substituída pelo login clicktodial (definido no cartão do usuário)<br><b>__PASS__</b> que será substituída pela senha clicktodial (definida no cartão do usuário).
+ClickToDialDesc=Este módulo faz um número de telefone links clicáveis. Um clique no ícone fará com que seu telefone ligue para o número. Isso pode ser usado para chamar um sistema de call center da Dolibarr que pode ligar para o número de telefone em um sistema SIP, por exemplo.
 ClickToDialUseTelLink=Use apenas o link "tel." para os números de telefone
+CashDeskSetup=Configuração do módulo de ponto de vendas
 CashDeskBankAccountForSell=Conta default para usar nos pagamentos em dinheiro
+CashDeskBankAccountForCheque=Conta padrão a ser usada para receber pagamentos por cheque
 CashDeskBankAccountForCB=Conta default para usar nos pagamentos em cartão de crédito
 CashDeskIdWareHouse=Depósito para usar nas vendas
+StockDecreaseForPointOfSaleDisabledbyBatch=A redução de estoque no PDV não é compatível com o gerenciamento de série / lote do módulo (atualmente ativo), portanto, a redução de estoque é desativada.
 BookmarkSetup=Configurações do módulo de marcadores
 NbOfBoomarkToShow=Número máximo de marcadores para mostrar no menu esquerdo
 WebServicesSetup=Configurações do módulo de serviço de web
@@ -939,11 +1238,15 @@ OnlyActiveElementsAreExposed=Somente elementos de módulos habilitados são expo
 ApiKey=Chave para API
 WarningAPIExplorerDisabled=O explorador de API foi desabilitado. O explorador de API não é exigido para prover serviços de API. Isto é uma ferramenta para o desenvolvedor encontrar/testar as REST APIs. Se você precisa desta ferramenta, vá para a configuração do módulo API REST para ativá-lo.
 BankSetupModule=Configurações do módulo bancário
+FreeLegalTextOnChequeReceipts=Texto livre em recibos de cheques
 BankOrderShow=Mostrar ordem das contas bancárias para países usando "Número do banco detalhado"
 BankOrderGlobalDesc=Ordem geral exibida
 BankOrderES=Espanhol
 BankOrderESDesc=Ordem espanhola exibida
+ChequeReceiptsNumberingModule=Verificar módulo de numeração de recibos
 MultiCompanySetup=Configurações do módulo multi-empresas
+SuppliersSetup=Configuração do módulo de fornecedor
+SuppliersInvoiceNumberingModel=Modelos de numeração de faturas de fornecedores
 IfSetToYesDontForgetPermission=Se definido como sim, não se esqueça de fornecer permissões a grupos ou usuários autorizados para a segunda aprovação
 GeoIPMaxmindSetup=Configurações do módulo GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Caminho do arquivo que contêm Maxmind ip para tradução do país.<br>Exemplos:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
@@ -969,6 +1272,7 @@ NbIteConsecutive=Numero maximo dos mesmos caracteres repetidos
 NoAmbiCaracAutoGeneration=Não use caracteres ambíguos ("1","l","i","|","0","O") para a geração automática
 SalariesSetup=Configuração do módulo de salários
 SortOrder=Ordem de classificação
+TypePaymentDesc=0: tipo de pagamento do cliente, 1: tipo de pagamento do fornecedor, 2: tipo de pagamento de clientes e fornecedores
 IncludePath=Incluir caminho (definido na variável %s)
 ExpenseReportsSetup=Configuração do módulo de Relatórios de Despesas
 TemplatePDFExpenseReports=Modelos de documentos para gerar despesa documento de relatório
@@ -976,12 +1280,19 @@ ExpenseReportsIkSetup=Configuração do módulo Relatórios de Despesas - Índic
 ExpenseReportsRulesSetup=Configuração do módulo Relatórios de Despesas - Regras
 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:
+SomethingMakeInstallFromWebNotPossible2=Por esse motivo, o processo de atualização descrito aqui é um processo manual que somente um usuário privilegiado pode executar.
 InstallModuleFromWebHasBeenDisabledByFile=A instalação do módulo externo do aplicativo foi desabilitada pelo seu Administrador. Você deve pedir que ele remova o arquivo <strong>%s</strong> para permitir esta funcionalidade.
 ConfFileMustContainCustom=A instalação ou construção de um módulo externo a partir do aplicativo precisa salvar os arquivos do módulo no diretório <strong>%s</strong>. Para ter esse diretório processado pelo Dolibarr, você deve configurar o seu <strong>conf/conf.php</strong> para adicionar as 2 linhas de diretivas :<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Destacar linhas de tabela quando o mouse passar sobre elas
+HighlightLinesColor=Destaque a cor da linha quando o mouse passar (use 'ffffff' para não destacar)
+HighlightLinesChecked=Destaque a cor da linha quando esta estiver marcada (use 'ffffff' para não destacar)
 LinkColor=Cor dos linques
 PressF5AfterChangingThis=Pressione CTRL+F5 no teclado ou limpe o cache do seu navegador após mudar este valor para torná-lo efetivo
 NotSupportedByAllThemes=Trabalhará com os temas principais, pode não ser suportado por temas externos
@@ -998,6 +1309,8 @@ ColorFormat=A cor RGB está no formato HEX, ex.: FF0000
 PositionIntoComboList=Posição de linha em listas de combinação
 SellTaxRate=Taxa de imposto sobre venda
 RecuperableOnly=Sim para VAT "Não Percebido, mas Recuperável" dedicado a alguns estados na França. Mantenha o valor como "Não" em todos os outros casos.
+UrlTrackingDesc=Se o fornecedor ou serviço de transporte oferecer uma página ou site para verificar o status de suas remessas, você poderá inseri-lo aqui. Você pode usar a chave {TRACKID} nos parâmetros de URL para que o sistema os substitua pelo número de rastreamento que o usuário inseriu no cartão de envio.
+OpportunityPercent=Quando você criar um lead, você pode definir uma quantidade estimada de projeto / lead. De acordo com o status do lead, esse valor pode ser multiplicado por essa taxa para avaliar um valor total que todos os leads podem gerar. O valor é uma porcentagem (entre 0 e 100).
 TemplateForElement=O registro deste tema é dedicado a qual elemento
 VisibleEverywhere=Visível em qualquer lugar
 VisibleNowhere=Agora visível
@@ -1006,6 +1319,7 @@ FillFixTZOnlyIfRequired=Exemplo: +2 (preencher apenas se experimentou um problem
 CurrentChecksum=Checksum corrente
 ForcedConstants=Valores constantes exigidos
 MailToSendProposal=Propostas de cliente
+MailToSendOrder=Pedido de Venda
 MailToSendShipment=Fretes
 MailToUser=Usuários
 ByDefaultInList=Exibir como padrão na visualização em lista
@@ -1013,7 +1327,10 @@ YouUseLastStableVersion=Você utiliza a última versão estável
 TitleExampleForMajorRelease=Exemplo de mensagem que você pode usar para anunciar esta importante versão (sinta-se à vontade para usar isso nos seus websites)
 TitleExampleForMaintenanceRelease=Exemplo de mensagem que você pode usar para anunciar esta versão de manutenção (sinta-se à vontade para usar isso nos seus websites)
 ExampleOfNewsMessageForMajorRelease=O ERP e CRM Dolibarr %s está disponível. A versão %s é um lançamento principal com diversas novas funções para os usuários e desenvolvedores. Você pode baixá-la a partir da área de download do portal https://www.dolibarr.org (sub-diretório Versões estáveis). Você pode ler o <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> com a lista completa de mudanças.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s está disponível. Versão %s é uma versão de manutenção, portanto, contém apenas correções de bugs. Recomendamos que todos os usuários atualizem para esta versão. Uma versão de manutenção não introduz novos recursos ou alterações no banco de dados. Você pode baixá-lo da área de download do portal https://www.dolibarr.org (subdiretório versões estáveis). Você pode ler o <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> para obter uma lista completa de alterações.
+MultiPriceRuleDesc=Quando a opção "Vários níveis de preços por produto / serviço" está ativada, você pode definir preços diferentes (um por nível de preço) para cada produto. Para poupar tempo, aqui você pode inserir uma regra para calcular automaticamente um preço para cada nível com base no preço do primeiro nível, então você terá que inserir apenas um preço para o primeiro nível para cada produto. Esta página foi projetada para poupar tempo, mas é útil somente se os preços de cada nível forem relativos ao primeiro nível. Você pode ignorar esta página na maioria dos casos.
 ModelModulesProduct=Temas para os documentos do produto
+ToGenerateCodeDefineAutomaticRuleFirst=Para gerar códigos automaticamente, você deve primeiro definir um gerente para definir automaticamente o número do código de barras.
 SeeSubstitutionVars=Veja * nota para a lista das possíveis variáveis de substituição
 SeeChangeLog=Ver o arquivo ChangeLog (somente em inglês)
 AllPublishers=Todos os que publicam
@@ -1027,6 +1344,7 @@ AddTriggers=Adicionar disparadores
 AddModels=Adicionar temas de documentos ou de numeração
 DetectionNotPossible=Não foi possível a detecção
 ListOfAvailableAPIs=Lista de API's disponíveis
+CommandIsNotInsideAllowedCommands=O comando que você está tentando executar não está na lista de comandos permitidos definidos no parâmetro <strong>$ dolibarr_main_restrict_os_commands</strong> no arquivo <strong>conf.php</strong> .
 LandingPage=Página de destino
 ModuleEnabledAdminMustCheckRights=O módulo foi ativado. As permissões para módulo(s) ativado foram fornecidas apenas aos usuários de administração. Talvez seja necessário conceder permissões para outros usuários ou grupos manualmente, se necessário.
 BaseCurrency=Moeda de referência da companhia (ir para a configuração da companhia para alterá-la)
@@ -1034,10 +1352,70 @@ MAIN_PDF_MARGIN_LEFT=Margem esquerda no PDF
 MAIN_PDF_MARGIN_RIGHT=Margem direita no PDF
 MAIN_PDF_MARGIN_TOP=Margem superior no PDF
 MAIN_PDF_MARGIN_BOTTOM=Margem inferior no PDF
+NothingToSetup=Não há configuração específica necessária para este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Defina isto como yes se este grupo for um cálculo de outros grupos
 SeveralLangugeVariatFound=Várias variantes de idioma encontradas
+GDPRContactDesc=Se você armazenar dados sobre empresas / cidadãos europeus, poderá nomear o contato responsável pelo regulamento geral de proteção de dados aqui
+HelpOnTooltipDesc=Coloque texto ou uma chave de conversão aqui para o texto ser exibido em uma dica de ferramenta quando esse campo aparecer em um formulário
+YouCanDeleteFileOnServerWith=Você pode excluir este arquivo no servidor com a linha de comando: <br> %s
+EnableFeatureFor=Ativar recursos para <strong>%s</strong>
+VATIsUsedIsOff=Nota: A opção de usar o Imposto sobre vendas ou o IVA foi definida como <strong>Desligada</strong> no menu %s - %s, portanto, o imposto sobre vendas ou IVA usado será sempre 0 para vendas.
+SwapSenderAndRecipientOnPDF=Troque o remetente e a posição do endereço do destinatário em documentos PDF
+FeatureSupportedOnTextFieldsOnly=Atenção, recurso suportado apenas em campos de texto. Além disso, um parâmetro de URL action = create ou action = edit deve ser definido OU o nome da página deve terminar com 'new.php' para acionar esse recurso.
+EmailCollectorDescription=Adicione um trabalho agendado e uma página de configuração para verificar regularmente as caixas de e-mail (usando o protocolo IMAP) e registre os e-mails recebidos em seu aplicativo, no lugar certo e / ou crie alguns registros automaticamente (como leads).
+NewEmailCollector=Novo coletor de e-mail
+MaxEmailCollectPerCollect=Número máximo de e-mails coletados por coleta
+ConfirmCloneEmailCollector=Tem certeza de que deseja clonar o coletor de e-mail %s?
+DateLastCollectResult=Data da última coleta testada
+DateLastcollectResultOk=Data da última coleta bem-sucedida
+LastResult=Último resultado
+EmailCollectorConfirmCollectTitle=Confirmação de recebimento de e-mail
+EmailCollectorConfirmCollect=Deseja executar a coleta deste coletor agora?
+NoNewEmailToProcess=Nenhum novo e-mail (filtros correspondentes) para processar
+XEmailsDoneYActionsDone=%s e-mails qualificados, %s e-mails processados com sucesso (para registro %s/ações executadas)
+RecordEvent=Registrar evento de e-mail
+CreateLeadAndThirdParty=Criar lead (e terceiro, se necessário)
+CreateTicketAndThirdParty=Criar ticket (e terceiros, se necessário)
 CodeLastResult=Código do último resultado
+NbOfEmailsInInbox=Número de e-mails no diretório de origem
+LoadThirdPartyFromName=Carregar pesquisa de terceiros em %s (carregar somente)
+LoadThirdPartyFromNameOrCreate=Carregar pesquisa de terceiros em %s (criar se não for encontrado)
 FormatZip=CEP
+MainMenuCode=Código de entrada do menu (mainmenu)
+ECMAutoTree=Mostrar árvore de ECM automática
+OperationParamDesc=Defina valores a serem usados para ação ou como extrair valores. Por exemplo: <br> objproperty1 = SET: abc <br> objproperty1 = SET: um valor com substituição de __objproperty1__ <br> objproperty3 = SETIFEMPTY: abc <br> objproperty4 = EXTRAIR: CABEÇALHO: X-Myheaderkey. * [^ \\ s] + (. *) <br> options_myextrafield = EXTRACT: ASSUNTO: ([^ \\ s] *) <br> object.objproperty5 = EXTRATO: CORPO: O nome da minha empresa é \\ s ([^ \\ s] *) <br><br> Use um ; como separador para extrair ou definir várias propriedades.
+OpeningHours=Horário de abertura
+OpeningHoursDesc=Digite aqui os horários de funcionamento da sua empresa.
+ResourceSetup=Configuração do módulo de recursos
 UseSearchToSelectResource=Usa um formulário de busca para a escolha de um recurso (em vez de uma lista suspensa)
 DisabledResourceLinkUser=Desativar recurso para vincular um recurso a usuários
 DisabledResourceLinkContact=Desativar recurso para vincular um recurso a contatos
+MAIN_OPTIMIZEFORTEXTBROWSER=Simplifique a interface para pessoas cegas
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Ative esta opção se você for uma pessoa cega ou se usar o aplicativo em um navegador de texto como o Lynx ou o Links.
+ThisValueCanOverwrittenOnUserLevel=Este valor pode ser substituído por cada usuário a partir de sua página de usuário - na guia '%s'
+DefaultCustomerType=Tipo de Terceiro padrão para o formulário de criação de"Novo cliente"
+ABankAccountMustBeDefinedOnPaymentModeSetup=Nota: A conta bancária deve ser definida no módulo de cada modo de pagamento (Paypal, Stripe, ...) para que este recurso funcione.
+RootCategoryForProductsToSell=Categoria raiz de produtos para vender
+RootCategoryForProductsToSellDesc=Se definido, somente produtos dentro desta categoria ou filhos desta categoria estarão disponíveis no Ponto de Venda.
+DebugBar=Barra de depuração
+DebugBarDesc=Barra de ferramentas que vem com várias ferramentas para simplificar a depuração
+DebugBarSetup=Configuração da barra de depuração
+GeneralOptions=Opções gerais
+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
+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 5bd1006930f..cf795e7633e 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -17,9 +17,11 @@ ViewDay=Ver dia
 ViewWeek=ver semana
 ViewPerUser=Visão do usuário
 ViewPerType=Por visualização de tipo
+AgendaAutoActionDesc=Aqui voce pode definir eventos, os quais voce quer que o Dolibarr crie automáticamente na Agenda. Se nada estiver ticado, só as ações manuais serão incluidas nos logs e mostradas na Agenda. Acompanhamento automático de ações de negócio feitas nos objetos (Validação, alteração de situação) não serão salvas.
+AgendaSetupOtherDesc=Esta página fornece opções para exportar seus eventos Dolibarr, para um calendário externo(Thunderbird, google calendar, etc...)
 AgendaExtSitesDesc=Essa página permite declarar calendários externos para serem visto nos eventos da agenda Dolibarr.
 ActionsEvents=Eventos no qual Dolibarr cria uma ação na agenda automáticamente.
-EventRemindersByEmailNotEnabled=Lembretes por email desabilitados no %s setup
+EventRemindersByEmailNotEnabled=Lembretes por e-mail desabilitados no %s módulo setup
 NewCompanyToDolibarr=Terceiro %s criados
 ContractValidatedInDolibarr=Contrato %s validado
 PropalClosedSignedInDolibarr=Proposta %s assinada
@@ -40,6 +42,7 @@ MemberSubscriptionDeletedInDolibarr=Deletada inscrição %spara membro %s
 ShipmentValidatedInDolibarr=Envio %s validado
 ShipmentClassifyClosedInDolibarr=Expedição%s classificado(s) e faturado(s)
 ShipmentUnClassifyCloseddInDolibarr=Expedição%s classificado(s) reaberto(s)
+ShipmentBackToDraftInDolibarr=Embarque %s voltou à situação rascunho
 ShipmentDeletedInDolibarr=Envio %s cancelado
 OrderCreatedInDolibarr=Pedido %s criado
 OrderValidatedInDolibarr=Pedido %s validado
@@ -49,6 +52,13 @@ OrderBilledInDolibarr=Ordem %s classificadas faturado
 OrderApprovedInDolibarr=Pedido %s aprovado
 OrderRefusedInDolibarr=Pedido %s recusado
 OrderBackToDraftInDolibarr=Pedido %s voltou para o status de rascunho
+ProposalSentByEMail=Proposta comercial 1%s enviada por e-mail
+ContractSentByEMail=Contrato%s enviado por e-mail
+OrderSentByEMail=Ped. de venda 1%s enviado por e-mail
+InvoiceSentByEMail=Fat. %s do cliente enviada por e-mail
+SupplierOrderSentByEMail=Pedido de compra %s enviado por e-mail
+SupplierInvoiceSentByEMail=Fatura %s do fornec. enviada por e-mail
+ShippingSentByEMail=Embarque %s enviado por e-mail
 ShippingValidated=Envio %s validado
 ProposalDeleted=Proposta excluída
 OrderDeleted=Pedido excluído
@@ -63,6 +73,10 @@ EXPENSE_REPORT_DELETEInDolibarr=Realtório de despesas %s excluído
 EXPENSE_REPORT_REFUSEDInDolibarr=Relatório de despesas %s rejeitado
 PROJECT_MODIFYInDolibarr=Projeto %s modificado
 PROJECT_DELETEInDolibarr=Projeto %s excluído
+TICKET_CREATEInDolibarr=Bilhete %s criado
+TICKET_MODIFYInDolibarr=Bilhete %s modificado
+TICKET_CLOSEInDolibarr=Bilhete %s fechado
+TICKET_DELETEInDolibarr=Bilhete %s excluido
 AgendaModelModule=Modelos de documentos para o evento
 DateActionEnd=Data de término
 AgendaUrlOptions1=Você também pode adicionar os seguintes parâmetros nos filtros de saída:
@@ -75,7 +89,7 @@ AgendaHideBirthdayEvents=Ocultar datas de nascimento dos contatos
 ExportDataset_event1=Lista dos eventos da agenda
 DefaultWorkingDays=Padrão dias úteis por semana (Exemplo: 1-5, 1-6)
 DefaultWorkingHours=Padrão horas de trabalho em dia (Exemplo: 9-18)
-AgendaExtNb=Calendário no. %s
+AgendaExtNb=Calendário n°. %s
 ExtSiteUrlAgenda=URL para acessar arquivos .ical
 ExtSiteNoLabel=Sem descrição
 VisibleDaysRange=Intervalo de dias visíveis
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index 75d60abddc7..5be7583130b 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - banks
+MenuBankCash=Banco | Dinheiro
 BankAccounts=Contas bancárias
+BankAccountsAndGateways=Contas Bancárias | Gateways
 ShowAccount=Mostrar conta
 AccountRef=Ref. da conta financeira
 AccountLabel=Rótulo da conta financeira
@@ -28,10 +30,11 @@ AccountStatementShort=Extrato
 AccountStatements=Extratos da conta
 LastAccountStatements=Últimos extratos da conta
 IOMonthlyReporting=Relatório mensal
-BankAccountDomiciliation=Endereço da conta
+BankAccountDomiciliation=End. do banco
 BankAccountCountry=País da conta
 BankAccountOwner=Nome do titular da conta
 BankAccountOwnerAddress=Endereço do titular da conta
+RIBControlError=A verificação de integridade dos valores falhou. Isso significa que as informações desse número de conta não estão completas ou estão incorretas (verifique o país, números e IBAN).
 CreateAccount=Criar conta
 EditFinancialAccount=Editar conta
 LabelBankCashAccount=Rótulo do banco ou caixa
@@ -75,9 +78,10 @@ DateConciliating=Data da reconciliação
 BankLineConciliated=Transação reconciliada
 Reconciled=Conciliada
 NotReconciled=Não conciliada
-SupplierInvoicePayment=Pagamento a fornecedores
+SupplierInvoicePayment=Pagamento do fornecedores
 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)
 TransferFromToDone=Uma transferência de <b>%s</b> para <b>%s</b> de <b>%s</b> %s foi registrado.
 ValidateCheckReceipt=Validar este comprovante de cheque?
 ConfirmValidateCheckReceipt=Você tem certeza que deseja validar este comprovante de cheque, mesmo sabendo que nenhuma mudança poderá ser feita depois?
@@ -86,7 +90,7 @@ ConfirmDeleteCheckReceipt=Você tem certeza que deseja excluir este comprovante
 BankChecks=Cheques do banco
 BankChecksToReceipt=Cheques aguardando depósito
 ShowCheckReceipt=Mostrar recibo de depósito do cheque
-NumberOfCheques=Nº do Cheque
+NumberOfCheques=Nº. do Cheque
 DeleteTransaction=Excluir transação
 ConfirmDeleteTransaction=Você tem certeza que deseja excluir esta transação?
 ThisWillAlsoDeleteBankRecord=Isto também excluirá as transações geradas
@@ -102,6 +106,7 @@ BankTransactionLine=Entrada no bancária
 AllAccounts=Todas as contas Banco e Caixa
 BackToAccount=Voltar para conta
 ShowAllAccounts=Mostrar todas as contas
+FutureTransaction=Transação no futuro. Impossível reconciliar
 SelectChequeTransactionAndGenerate=Selecione / filtrar cheques para incluir no recibo do cheque caução e clique em "Criar".
 InputReceiptNumber=Escolha um estrato bancário relacionado com conciliação. Use um valor numérico classificável (tal como, YYYYMM)
 EventualyAddCategory=Eventualmente, especifique a categoria na qual os registros será classificado
@@ -117,3 +122,6 @@ 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.
 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
+NewCashFence=Nova caixa
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index ffe213d2469..c2f5c490616 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -2,8 +2,11 @@
 BillsCustomer=Fatura de cliente
 BillsCustomersUnpaid=Faturas de clientes não pagos
 BillsCustomersUnpaidForCompany=Faturas de clientes não pagas para %s
+BillsSuppliersUnpaid=Faturas de fornecedores não pagas
+BillsSuppliersUnpaidForCompany=Faturas de fornecedores não pagas para %s
 BillsLate=Pagamentos atrasados
 BillsStatistics=Estatísticas de faturas de clientes
+BillsStatisticsSuppliers=Estatísticas de faturas de fornecedores
 DisabledBecauseDispatchedInBookkeeping=Desativado porque a nota fiscal foi despachada na contabilidade
 DisabledBecauseNotLastInvoice=Desativado porque a fatura não é apagável. Algumas faturas foram gravadas após esta e ele criará buracos no balcão.
 DisabledBecauseNotErasable=Desativada já que não pode ser apagada
@@ -18,6 +21,7 @@ InvoiceReplacement=Fatura de substituição
 InvoiceReplacementAsk=Fatura de substituição por fatura
 InvoiceAvoir=Nota de crédito
 InvoiceAvoirAsk=Nota de crédito para fatura correta
+InvoiceAvoirDesc=A <b>nota de crédito</b> é uma fatura negativa usada para corrigir o fato de que uma fatura mostra um valor que difere do valor efetivamente pago (por exemplo, o cliente pagou muito por engano ou não pagará o valor total desde que alguns produtos foram devolvidos).
 invoiceAvoirWithLines=Criar Nota de Crédito conforme a fatura  original
 invoiceAvoirWithPaymentRestAmount=Cirar nota de credito com restante não pago da fatura original
 invoiceAvoirLineWithPaymentRestAmount=Nota de credito para valor restante não pago
@@ -29,6 +33,7 @@ CorrectInvoice=Fatura correta %s
 CorrectionInvoice=Correção de fatura
 UsedByInvoice=Usado para pagar fatura %s
 NotConsumed=Não consumida
+NoReplacableInvoice=Nenhuma fatura substituível
 NoInvoiceToCorrect=Nenhuma fatura para corrigir
 InvoiceHasAvoir=Foi fonte de uma ou várias notas de crédito
 CardBill=Ficha da fatura
@@ -36,6 +41,7 @@ InvoiceCustomer=Fatura de cliente
 CustomerInvoice=Fatura de cliente
 CustomersInvoices=Faturas de clientes
 SupplierInvoice=Fatura do fornecedores
+SuppliersInvoices=Faturas de fornecedores
 SupplierBill=Fatura do fornecedores
 SupplierBills=Faturas de fornecedores
 PaymentBack=Reembolso de pagamento
@@ -44,13 +50,23 @@ PaymentsBack=Reembolsos de pagamentos
 PaidBack=Reembolso pago
 DeletePayment=Deletar pagamento
 ConfirmDeletePayment=Você tem certeza que deseja excluir este pagamento?
+SupplierPayments=Pagamentos do fornecedor
 ReceivedCustomersPayments=Pagamentos recebidos de cliente
+PayedSuppliersPayments=Pagamentos pagos a fornecedores
 ReceivedCustomersPaymentsToValid=Pagamentos recebidos de cliente para validar
 PaymentsReportsForYear=Relatórios de pagamentos por %s
 PaymentsAlreadyDone=Pagamentos já feitos
 PaymentsBackAlreadyDone=Reembolsos de pagamentos já feitos
 PaymentRule=Regra de pagamento
+PaymentMode=Tipo de pagamento
 PaymentTypeDC=Cartão de débito / crédito
+IdPaymentMode=Tipo de pagamento (id)
+CodePaymentMode=Tipo de pagamento (código)
+LabelPaymentMode=Tipo de pagamento (etiqueta)
+PaymentModeShort=Tipo de pagamento
+PaymentTerm=Termo de pagamento
+PaymentConditions=Termos de pagamento
+PaymentConditionsShort=Termos de pagamento
 PaymentAmount=Valor a ser pago
 PaymentHigherThanReminderToPay=Pagamento superior ao valor a ser pago
 ClassifyPaid=Classificar 'pago'
@@ -62,6 +78,7 @@ AddBill=Adicionar fatura ou nota de crédito
 AddToDraftInvoices=Adicionar para rascunho de fatura
 DeleteBill=Deletar fatura
 SearchACustomerInvoice=Procurar fatura de cliente
+SearchASupplierInvoice=Procurar uma fatura de fornecedor
 SendRemindByMail=Enviar o restante por e-mail
 DoPayment=Digite o pagamento
 DoPaymentBack=Insira o reembolso
@@ -87,6 +104,8 @@ BillShortStatusNotPaid=Não pago
 BillShortStatusClosedUnpaid=Fechado
 BillShortStatusClosedPaidPartially=Pago (parcialmente)
 PaymentStatusToValidShort=Para validar
+ErrorNoPaiementModeConfigured=Nenhum tipo de pagamento padrão definido. Vá para a configuração do módulo Invoice para corrigir isso.
+ErrorCreateBankAccount=Crie uma conta bancária e acesse o painel Configuração do módulo Fatura para definir os tipos de pagamento
 ErrorBillNotFound=Fatura %s não existe
 ErrorDiscountAlreadyUsed=Erro, desconto já utilizado
 ErrorInvoiceAvoirMustBeNegative=Erro, fatura atual precisa ter um valor negativo
@@ -102,11 +121,14 @@ NotARecurringInvoiceTemplate=Não é um tema de fatura recorrente
 LastBills=Últimas notas %s
 LatestTemplateInvoices=Últimas faturas do modelo %s
 LatestCustomerTemplateInvoices=Últimas faturas do modelo de cliente %s
+LatestSupplierTemplateInvoices=Últimas faturas de modelo de fornecedor %s
 LastCustomersBills=Últimas notas de clientes %s
+LastSuppliersBills=Últimas faturas de fornecedor %s
 AllBills=Todas faturas
 AllCustomerTemplateInvoices=Todas as faturas do modelo
 DraftBills=Rascunho de faturas
 CustomersDraftInvoices=Faturas de rascunho do cliente
+SuppliersDraftInvoices=Faturas de faturas do fornecedor
 Unpaid=Não pago
 ConfirmDeleteBill=Você tem certeza que deseja excluir esta fatura?
 ConfirmValidateBill=Você tem certeza que deseja validar esta fatura com referência <b>%s</b>?
@@ -115,6 +137,7 @@ ConfirmClassifyPaidBill=Você tem certeza que deseja mudar a situação da fatur
 ConfirmCancelBill=Você tem certeza que deseja cancelar a fatura <b>%s</b>?
 ConfirmCancelBillQuestion=Por quê você deseja classificar esta fatura 'abandonada'?
 ConfirmClassifyPaidPartially=Você tem certeza que deseja mudar a situação da fatura <b>%s</b> para paga?
+ConfirmClassifyPaidPartiallyQuestion=Esta fatura não foi paga completamente. Qual é o motivo para fechar esta fatura?
 ConfirmClassifyPaidPartiallyReasonDiscount=Restante não remunerado <b> (%s %s) </b> é um desconto concedido porque o pagamento foi feito antes do prazo.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restante para pagar <b>(%s %s)</b> é um desconto concedido porque o pagamento foi feito antes do prazo. Eu aceitei perder o ICMS neste desconto.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Restante para pagar <b>(%s %s)</b> é um desconto concedido porque o pagamento foi feito antes do prazo. Eu recuperei o ICMS neste desconto sem uma nota de crédito.
@@ -129,8 +152,8 @@ ConfirmSupplierPayment=Você confirma o recebimento de pagamento para <b>%s</b>
 ConfirmValidatePayment=Você tem certeza que deseja validar este pagamento? Nenhuma alteração poderá ser feita após a validação do pagamento.
 ValidateBill=Validar faturao
 UnvalidateBill=Desvalidar fatura
-NumberOfBills=Nº de faturas
-NumberOfBillsByMonth=Nº de faturas por mês
+NumberOfBills=Nº. de faturas
+NumberOfBillsByMonth=Nº. de faturas por mês
 AmountOfBills=Quantidade de faturas
 AmountOfBillsByMonthHT=Quantidade de faturas por mês (líquido de taxa)
 ShowSocialContribution=Mostrar contribuição social
@@ -163,7 +186,10 @@ SendReminderBillByMail=Enviar o restante por e-mail
 RelatedRecurringCustomerInvoices=Faturas recorrentes relacionadas ao cliente
 MenuToValid=Validar
 ClassifyBill=Classificar fatura
+SupplierBillsToPay=Faturas de fornecedores não pagas
 CustomerBillsUnpaid=Faturas de clientes não pagos
+SetConditions=Definir condições de pagamento
+SetMode=Definir tipo de pagamento
 SetRevenuStamp=Definir o selo da receita
 RepeatableInvoice=Fatura pré-definida
 RepeatableInvoices=Faturas pré-definidas
@@ -178,11 +204,14 @@ ExportDataset_invoice_1=Faturas do cliente e detalhes da fatura
 ExportDataset_invoice_2=Faturas de clientes e pagamentos
 ProformaBill=Conta pro-forma:
 Reductions=Reduções
+ReductionsShort=Disco.
 AddDiscount=Criar desconto
 EditGlobalDiscounts=Editar desconto fixo
 ShowDiscount=Mostrar desconto
 ShowReduc=Mostrar o desconto
 GlobalDiscount=Desconto global
+CreditNote=Nota de crédito
+CreditNotes=Notas de crédito
 Deposit=Depósito
 Deposits=Depósitos
 DiscountFromCreditNote=Desconto de nota de crédito %s
@@ -194,15 +223,22 @@ IdSocialContribution=ID contribuição social
 PaymentId=ID pagamento
 PaymentRef=Ref. do pagamento
 InvoiceId=ID fatura
+InvoiceRef=Ref. fatura
 InvoiceDateCreation=Data da criação da fatura
 InvoiceStatus=Status da fatura
 InvoiceNote=Nota de fatura
+OrderBilled=Encomenda faturada
+DonationPaid=Doação paga
 RemoveDiscount=Remover desconto
 WatermarkOnDraftBill=Marca d'água nos rascunhos de faturas (nada se vazio)
 ConfirmCloneInvoice=Você tem certeza que deseja clonar esta fatura <b>%s</b>?
-NbOfPayments=Nº de pagamentos
+DescTaxAndDividendsArea=Esta área apresenta um resumo de todos os pagamentos feitos para despesas especiais. Apenas registros com pagamentos durante o ano fixo são incluídos aqui.
+NbOfPayments=Nº. de pagamentos
 SplitDiscount=Dividir desconto em dois
+ConfirmSplitDiscount=Tem certeza de que deseja dividir este desconto de <b>%s</b> %s em dois descontos menores?
+TotalOfTwoDiscountMustEqualsOriginal=O total dos dois novos descontos deve ser igual ao valor do desconto original.
 ConfirmRemoveDiscount=Você tem certeza que deseja remover este desconto?
+RelatedSupplierInvoices=Faturas de fornecedores relacionadas
 LatestRelatedBill=Últimas fatura correspondente
 MergingPDFTool=Mesclando ferramenta PDF
 AmountPaymentDistributedOnInvoice=Valor do pagamento distribuído na fatura
@@ -214,6 +250,7 @@ FrequencyPer_y=A cada %s anos
 toolTipFrequency=Exemplos: <br> <b> fixar 7, Day </b>: dê uma nova fatura a cada 7 dias <br> <b> Set 3, Month </b>: dê uma nova fatura a cada 3 meses
 NextDateToExecutionShort=Data da próxima geração.
 DateLastGenerationShort=Data da última geração.
+MaxPeriodNumber=Máx. número de geração de fatura
 InvoiceAutoValidate=Validar as faturas automaticamente
 GeneratedFromRecurringInvoice=Gerar a partir do tem de fatura recorrente %s
 DateIsNotEnough=Data ainda não alcançada
@@ -228,6 +265,7 @@ PaymentCondition60DENDMONTH=Dentro de 60 dias após o fim do mês
 PaymentConditionShortPT_DELIVERY=Na entrega
 PaymentConditionPT_ORDER=No pedido
 PaymentConditionPT_5050=50%% adiantado e 50%% na entrega
+FixAmount=Quantia fixa
 VarAmount=Variavel valor (%% total)
 PaymentTypePRE=Pedido com pagamento em Débito direto
 PaymentTypeShortPRE=Pedido com pagamento por débito
@@ -239,9 +277,13 @@ PaymentTypeTRA=Cheque administrativo
 PaymentTypeShortTRA=Minuta
 BankDetails=Detalhes bancário
 BankCode=Código bancário
+DeskCode=Código da Agência
 BankAccountNumber=Número da conta
+BankAccountNumberKey=Soma de verificação
 Residence=Endereço
+IBANNumber=Número da conta IBAN
 IBAN=Agencia
+BICNumber=Código BIC/SWIFT
 ExtraInfos=Informações extras
 RegulatedOn=Regulamentado em
 ChequeNumber=Nº do Cheque
@@ -252,7 +294,11 @@ NetToBePaid=Líquido a ser pago
 PhoneNumber=Telefone
 FullPhoneNumber=Telefone
 PrettyLittleSentence=Aceito o valor do pagamento devido pelo cheque emitido em meu nome como membro de uma associação de contabilidade aprovado pelo administração fiscal.
+IntracommunityVATNumber=ID do IVA intracomunitário
+PaymentByChequeOrderedTo=Cheque pagamentos (incluindo impostos) são pagas para %s, enviar para
+PaymentByChequeOrderedToShort=Cheque pagamentos (incl. Imposto) são pagas para
 SendTo=Enviar para
+PaymentByTransferOnThisBankAccount=Pagamento por transferência para a seguinte conta bancária
 VATIsNotUsedForInvoice=* Não aplicável ICMS art-293B de CGI
 LawApplicationPart1=Pela aplicação da lei 80.335 de 12/05/80
 LawApplicationPart2=os bens permanece propriedade de
@@ -261,10 +307,16 @@ LimitedLiabilityCompanyCapital=SARL com capital de
 UseDiscount=Usar desconto
 UseCredit=Usar crédito
 UseCreditNoteInInvoicePayment=Reduzir o valor a ser pago com esse crédito
+MenuChequeDeposits=Verificar depósitos
 MenuCheques=Cheques
+MenuChequesReceipts=Verificar recibos
 NewChequeDeposit=Novo depósito
+ChequesReceipts=Verificar recibos
+ChequesArea=Verifique a área de depósitos
+ChequeDeposits=Verificar depósitos
 DepositId=Depósito Id
 CreditNoteConvertedIntoDiscount=Este %s foi convertido em %s
+UsBillingContactAsIncoiveRecipientIfExist=Usar contato/endereço com o tipo 'contato de cobrança' em vez de endereço de terceiros como destinatário para faturas
 ShowUnpaidAll=Mostras todas as faturas não pagas
 ShowUnpaidLateOnly=Mostrar todas as faturas atrasadas não pagas
 PaymentInvoiceRef=Pagamento de fatura %s
@@ -273,10 +325,14 @@ Cash=DinheiroCash
 DisabledBecausePayments=Não é possivel devido alguns pagamentos
 CantRemovePaymentWithOneInvoicePaid=Não posso remover pagamento ao menos que o última fatura sejá classificada como pago
 ExpectedToPay=Esperando pagamento
+ClosePaidInvoicesAutomatically=Classifique "Pago" todas as faturas padrão, de entrada ou de substituição pagas totalmente.
 ClosePaidCreditNotesAutomatically=Classificar "pago" todas notas de crédito inteiramente pago de volta.
+AllCompletelyPayedInvoiceWillBeClosed=Todas as faturas sem saldo a pagar serão fechadas automaticamente com o status "Pago".
 ToMakePaymentBack=Pagar de volta
 NoteListOfYourUnpaidInvoices=Nota: Essa lista contém faturas de terceiros que você está a ligado como representante de vendas.
 RevenueStamp=Selo de receita
+YouMustCreateInvoiceFromThird=Esta opção só está disponível ao criar uma fatura na guia "Cliente" de terceiros
+YouMustCreateInvoiceFromSupplierThird=Essa opção só está disponível ao criar uma fatura na guia "Fornecedor" de terceiros
 YouMustCreateStandardInvoiceFirstDesc=Você deve criar antes uma fatura padrão e convertê-la em um "tema" para criar um novo tema de fatura
 PDFCrabeDescription=Template PDF de fatura Caranguejo. Um completo template de fatura (template recomendado)
 PDFCrevetteDescription=Tema Crevette para fatura em PDF. Um tema completo para a situação das faturas
@@ -288,6 +344,10 @@ TypeContact_facture_internal_SALESREPFOLL=Representativo seguindo de fatura de c
 TypeContact_facture_external_BILLING=Contato de fatura de cliente
 TypeContact_facture_external_SHIPPING=Contato de envio de cliente
 TypeContact_facture_external_SERVICE=Contato de serviço de cliente
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Fatura de fornecedor subsequente representativa
+TypeContact_invoice_supplier_external_BILLING=Contato da fatura do fornecedor
+TypeContact_invoice_supplier_external_SHIPPING=Contato de remessa do fornecedor
+TypeContact_invoice_supplier_external_SERVICE=Contato de serviço do fornecedor
 InvoiceFirstSituationAsk=Primeira situação da fatura
 InvoiceFirstSituationDesc=A <b>situação faturas</b> são amarradas às situações relacionadas com uma progressão, por exemplo, a progressão de uma construção. Cada situação é amarrada a uma fatura.
 InvoiceSituation=Situação da fatura
@@ -304,9 +364,12 @@ InvoiceSituationLast=Fatura final e geral
 PDFCrevetteSituationNumber=Situação Nº %s
 PDFCrevetteSituationInvoiceLineDecompte=Situação da fatura - CONTAR
 PDFCrevetteSituationInvoiceTitle=Situação da fatura
+PDFCrevetteSituationInvoiceLine=Situação N°. %s: Inv. N°. %s em %s
 invoiceLineProgressError=A linha de progresso da fatura não pode ser maior ou igual à próxima linha da fatura
+updatePriceNextInvoiceErrorUpdateline=Erro: atualize o preço na linha da fatura: %s
 ToCreateARecurringInvoice=Para criar uma fatura recorrente para este contrato, crie primeiro este rascunho de fatura, converta-a em um tema de fatura e defina então a frequência de geração das próximas faturas.
 ToCreateARecurringInvoiceGene=Para gerar as futuras faturas regular e manualmente, siga para o menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=Se você precisar que essas faturas sejam geradas automaticamente, peça ao seu administrador para ativar e configurar o módulo <strong>%s</strong>. Note que ambos os métodos (manual e automático) podem ser usados juntos sem risco de duplicação.
 DeleteRepeatableInvoice=Excluir tema de fatura
 ConfirmDeleteRepeatableInvoice=Você tem certeza que deseja excluir o tema de fatura?
 BillCreated=%s conta(s) criada(s)
diff --git a/htdocs/langs/pt_BR/blockedlog.lang b/htdocs/langs/pt_BR/blockedlog.lang
index 59369b254e0..caed4b69ec7 100644
--- a/htdocs/langs/pt_BR/blockedlog.lang
+++ b/htdocs/langs/pt_BR/blockedlog.lang
@@ -1,6 +1,6 @@
 BlockedLog=Logs nao modificaveis
 Field=Campo
-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).
+BlockedLogDesc=Este módulo rastreia alguns eventos em um log inalterável (que você não pode modificar uma vez gravado) em uma cadeia de blocos, em tempo real. Este módulo oferece compatibilidade com os requisitos das leis de alguns países (como a França com a lei Finance 2016 - Norme NF525).
 Fingerprints=Eventos e impressoes digitais arquivados
 FingerprintsDesc=Esta é a ferramenta para procurar ou extrair os logs inalteráveis. Logs inalteráveis são gerados e arquivados localmente em uma tabela dedicada, em tempo real, quando você registra um evento de negócios. Você pode usar essa ferramenta para exportar esse arquivo e salvá-lo em um suporte externo (alguns países, como a França, pedem que você faça isso todos os anos). Note que, não há nenhum recurso para limpar este log e todas as mudanças tentadas ser feitas diretamente neste log (por um hacker, por exemplo) serão reportadas com uma impressão digital não válida. Se você realmente precisar limpar essa tabela porque usou seu aplicativo para fins de demonstração / teste e deseja limpar seus dados para iniciar sua produção, peça ao seu revendedor ou integrador para redefinir seu banco de dados (todos os seus dados serão removidos).
 CompanyInitialKey=Chave inicial da empresa (hash do bloco genesis)
@@ -8,15 +8,15 @@ BrowseBlockedLog=Logs nao modificaveis
 ShowAllFingerPrintsMightBeTooLong=Mostrar todos os Logs Arquivados (pode ser demorado)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos os arquivos de log inválidos (pode demorar)
 DownloadBlockChain=Baixar impressoes digitais
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
-OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
+KoCheckFingerprintValidity=A entrada de log arquivada não é válida. Isso significa que alguém (um hacker?) Modificou alguns dados desse arquivo depois que foi gravado ou apagou o registro arquivado anterior (verifique se a linha com o número anterior existe).
+OkCheckFingerprintValidity=O registro de log arquivado é válido. Os dados nesta linha não foram modificados e a entrada segue a anterior.
 OkCheckFingerprintValidityButChainIsKo=O log arquivado parece válido em comparação com o anterior, mas a cadeia foi previamente corrompida.
 AddedByAuthority=Salvo na autoridade remota
 NotAddedByAuthorityYet=Ainda não armazenado em autoridade remota
 ShowDetails=Mostrar detalhes salvos
-logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
-logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
-logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
+logPAYMENT_VARIOUS_CREATE=Pagamento (não atribuído a uma fatura) criado
+logPAYMENT_VARIOUS_MODIFY=Pagamento (não atribuído a uma fatura) modificado
+logPAYMENT_VARIOUS_DELETE=Pagamento (não atribuído a uma fatura) exclusão lógica
 logPAYMENT_ADD_TO_BANK=Pagamento adicionado ao banco
 logPAYMENT_CUSTOMER_CREATE=Pagamento do cliente criado
 logPAYMENT_CUSTOMER_DELETE=Exclusão lógica de pagamento do cliente
@@ -35,7 +35,7 @@ logDON_DELETE=Exclusão lógica de doação
 logMEMBER_SUBSCRIPTION_CREATE=Inscrição de membro criada
 logMEMBER_SUBSCRIPTION_MODIFY=Inscrição de membro modificada
 logMEMBER_SUBSCRIPTION_DELETE=Exclusão lógica de assinatura de membro
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Gravação de caixa
 BlockedLogBillDownload=Download da fatura do cliente
 BlockedLogBillPreview=Pré-visualização da fatura do cliente
 BlockedlogInfoDialog=Detalhes do log
diff --git a/htdocs/langs/pt_BR/bookmarks.lang b/htdocs/langs/pt_BR/bookmarks.lang
index 1e62b9def06..6070fee6932 100644
--- a/htdocs/langs/pt_BR/bookmarks.lang
+++ b/htdocs/langs/pt_BR/bookmarks.lang
@@ -1,11 +1,13 @@
 # Dolibarr language file - Source file is en_US - bookmarks
 AddThisPageToBookmarks=Adicione a página atual aos marcadores
 ListOfBookmarks=Lista de marcadores
-OpenANewWindow=Abrir uma nova janela
-ReplaceWindow=Substituir atual janela
-BookmarkTargetReplaceWindowShort=Atual janela
+OpenANewWindow=Abra uma nova aba
+ReplaceWindow=Substituir guia atual
+BookmarkTargetNewWindowShort=Nova aba
+BookmarkTargetReplaceWindowShort=Guia atual
+BookmarkTitle=Nome do marcador
 BehaviourOnClick=Comportamento quando a URL de marcador é selecionada
-SetHereATitleForLink=Colocar título para o marcador
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Usar uma URL externa ou uma URL do Dolibarr
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Escolha se página vinculada deve abrir em uma nova janela ou não
+SetHereATitleForLink=Definir um nome para o marcador
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use um link externo/absoluto (https://URL) ou um link interno/relativo (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Escolha se a página vinculada deve abrir na guia atual ou em uma nova guia
 BookmarksManagement=Gestor de marcadores
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index 4c4b585864a..2715130360b 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -1,17 +1,32 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLoginInformation=Informações de Login
+BoxLastRssInfos=Informação de RSS
+BoxLastProducts=Últimos %s Produtos/Serviços
 BoxProductsAlertStock=Alertas de estoque para produtos
 BoxLastProductsInContract=Últimos %s produtos/serviços contratados
+BoxLastSupplierBills=Últimas faturas de fornecedores
+BoxLastCustomerBills=Faturas mais recentes do cliente
+BoxOldestUnpaidSupplierBills=Faturas mais antigas de fornecedores não pagas
 BoxLastProposals=Últimas propostas comerciais
 BoxLastProspects=Últimos prospectos de cliente modificados
+BoxLastCustomerOrders=Últimas encomendas
 BoxLastContacts=Últimos contatos/endereços
 BoxCurrentAccounts=Saldo das contas ativas
 BoxTitleLastRssInfos=Últimas %s novidades de %s
+BoxTitleLastProducts=Produtos/Serviços: %s modificado
 BoxTitleProductsAlertStock=Produtos: alerta de estoque
 BoxTitleLastSuppliers=Últimos %s fornecedores registrados
+BoxTitleLastModifiedSuppliers=Fornecedores: último %s modificado
+BoxTitleLastModifiedCustomers=Clientes: último %s modificado
 BoxTitleLastCustomersOrProspects=Últimos %s clientes ou prospectos de cliente
+BoxTitleLastCustomerBills=Últimas faturas do cliente %s
+BoxTitleLastSupplierBills=Últimas %s faturas do fornecedor
+BoxTitleLastModifiedProspects=Perspectivas: último %s modificado
 BoxTitleOldestUnpaidCustomerBills=Faturas do cliente: o mais antigo %s não pago
+BoxTitleOldestUnpaidSupplierBills=Faturas do fornecedor: o mais antigo %s não remunerado
 BoxTitleCurrentAccounts=Contas abertas: saldos
+BoxTitleLastModifiedContacts=Contatos/Endereços: último %s modificado
+BoxMyLastBookmarks=Marcadores: mais recente %s
 BoxOldestExpiredServices=Mais antigos serviços ativos expirados
 BoxLastExpiredServices=Ultimo %s dos contatos com serviço vencido ativo
 BoxTitleLastModifiedDonations=Últimas %s doações modificadas
@@ -21,20 +36,34 @@ LastRefreshDate=Ultima data atualizacao
 NoRecordedBookmarks=Nenhum marcador definido.
 NoRecordedContacts=Nenhum contato registrado
 NoActionsToDo=Nenhuma ação para fazer
+NoRecordedOrders=Nenhum pedido de venda registrado
 NoRecordedProposals=Nenhum possível cliente registrado
 NoRecordedInvoices=Nenhuma nota fiscal registrada
 NoUnpaidCustomerBills=Não há notas fiscais de clientes não pagas
+NoUnpaidSupplierBills=Nenhuma fatura de fornecedor não paga
+NoModifiedSupplierBills=Nenhuma fatura de fornecedor registrada
 NoRecordedProducts=Nenhum registro de produtos/serviços
 NoRecordedProspects=Nenhum registro de possíveis clientes
 NoContractedProducts=Nenhum produtos/serviços contratados
 NoRecordedContracts=Nenhum registro de contratos
 NoRecordedInterventions=Nenhum registro de intervenções
+BoxLatestSupplierOrders=Últimos pedidos de compra
+NoSupplierOrder=Nenhum pedido de compra registrado
 BoxCustomersInvoicesPerMonth=Faturas do cliente por mês
+BoxSuppliersInvoicesPerMonth=Faturas do fornecedor por mês
+BoxCustomersOrdersPerMonth=Pedidos de vendas por mês
+BoxSuppliersOrdersPerMonth=Ordens do fornecedor por mês
 NoTooLowStockProducts=Nenhum produto está sob o limite de estoque baixo
 BoxProductDistribution=Distribuição de Produtos / Serviços
+ForObject=Em %s
+BoxTitleLastModifiedSupplierBills=Faturas do Fornecedor: último%s modificado
+BoxTitleLatestModifiedSupplierOrders=Ordens do Vendedor: último %s modificado
+BoxTitleLastModifiedCustomerBills=Faturas do cliente: último %s modificado
+BoxTitleLastModifiedCustomerOrders=Pedidos de Vendas: último %s modificado
 BoxTitleLastModifiedPropals=Últimas %s propostas modificadas
 ForCustomersInvoices=Faturas de clientes
 ForCustomersOrders=Pedidos de clientes
 LastXMonthRolling=Ultima %s mensal
 ChooseBoxToAdd=Adicionar widget para sua area de notificacoes
 BoxAdded=A ferramenta foi adicionada no seu painel
+BoxTitleUserBirthdaysOfMonth=Aniversários deste mês
diff --git a/htdocs/langs/pt_BR/cashdesk.lang b/htdocs/langs/pt_BR/cashdesk.lang
index 059376dfa9f..af375b45e20 100644
--- a/htdocs/langs/pt_BR/cashdesk.lang
+++ b/htdocs/langs/pt_BR/cashdesk.lang
@@ -14,4 +14,27 @@ ShowCompany=Mostar empresa
 DeleteArticle=Clique para remover esse artigo
 FilterRefOrLabelOrBC=Procurar (Ref/Rótulo)
 DolibarrReceiptPrinter=Impressão de Recibo Dolibarr
+PointOfSale=Ponto de venda
+TakeposConnectorNecesary='TakePOS Connector' é requerido
+Header=Cabeçalho
+Footer=Rodapé
+AmountAtEndOfPeriod=Montante no final do período (dia, mês ou ano)
+TheoricalAmount=Quantidade teórica
+RealAmount=Quantidade real
+CashFenceDone=Caixa feita para o período
 NbOfInvoices=Núm de faturas
+Paymentnumpad=Tipo de Pad para inserir pagamento
+Numberspad=Números de Pad
+BillsCoinsPad=Almofada de moedas e notas
+DolistorePosCategory=Módulos TakePOS e outras soluções de POS para Dolibarr
+TakeposNeedsCategories=TakePOS precisa de categorias de produtos para funcionar
+OrderNotes=Notas de pedidos
+CashDeskBankAccountFor=Conta padrão a ser usada para pagamentos em
+NoPaimementModesDefined=Nenhum modo de embalagem definido na configuração do TakePOS
+TicketVatGrouped=Grupo de IVA por taxa em tickets
+AutoPrintTickets=Imprimir automaticamente os tickets
+EnableBarOrRestaurantFeatures=Ativar recursos para Bar ou Restaurante
+ConfirmDeletionOfThisPOSSale=Você confirma a exclusão desta venda atual?
+ValidateAndClose=Valide e feche
+NumberOfTerminals=Número de terminais
+TerminalSelect=Selecione o terminal que você deseja usar:
diff --git a/htdocs/langs/pt_BR/commercial.lang b/htdocs/langs/pt_BR/commercial.lang
index 9f786a4ec70..7968f7ede62 100644
--- a/htdocs/langs/pt_BR/commercial.lang
+++ b/htdocs/langs/pt_BR/commercial.lang
@@ -8,6 +8,7 @@ AddActionRendezVous=Criar um evento de reunião
 ConfirmDeleteAction=Tem certeza que quer deleitaar este evento ?
 CardAction=Ficha de evento
 ActionOnContact=Contato relacionado
+ShowTask=Mostrar tarefa
 ShowAction=Mostrar evento
 ActionsReport=Relatório de eventos
 SaleRepresentativesOfThirdParty=Representantes de vendas de terceiros
@@ -39,18 +40,21 @@ ActionDoneBy=Evento feito por
 ActionAC_TEL=Chamada telefônica
 ActionAC_PROP=Enviar proposta por correio
 ActionAC_EMAIL=Enviar e-mail
+ActionAC_EMAIL_IN=Recepção de e-mail
 ActionAC_INT=Intervenção no lugar
 ActionAC_FAC=Enviar fatura de cliente por correio
 ActionAC_REL=Enviar fatura de cliente por correio (lembrete)
 ActionAC_EMAILING=Enviar emails massivos
-ActionAC_COM=Enviar pedido de cliente por correio
+ActionAC_COM=Envia pedido de venda por email
 ActionAC_SHIP=Enviar frete por correio
+ActionAC_SUP_ORD=Enviar pedido por correio
+ActionAC_SUP_INV=Enviar fatura do fornecedor por email
 ActionAC_OTH=Outros
 Stats=Estatísticas de vendas
 StatusProsp=Status de prospecto de cliente
 DraftPropals=Minutas de orçamentos
 ToOfferALinkForOnlineSignature=Link para assinatura on-line
-WelcomeOnOnlineSignaturePage=Bem-vindo à página para aceitar orçamentos / propostas comerciais de %s
+WelcomeOnOnlineSignaturePage=Bem-vindo à página para aceitar propostas comerciais de %s
 ThisScreenAllowsYouToSignDocFrom=Esta tela permite que você aceite e assine ou recuse um orçamento / proposta comercial
-SignatureProposalRef=Assinatura do orçamento / proposta comercial %s
-FeatureOnlineSignDisabled=Recurso para assinatura on-line desabilitado ou documento gerado antes que o recurso fosse ativado
+SignatureProposalRef=Assinatura da cotação / proposta comercial %s
+FeatureOnlineSignDisabled=Recurso para assinatura online desabilitado ou documento gerado antes que o recurso fosse ativado
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index 9c52580a988..377642fd3f4 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -18,13 +18,22 @@ IdThirdParty=ID do terceiro
 IdCompany=ID da empresa
 IdContact=ID do contato
 Contacts=Contatos/Endereços
+ThirdPartyContacts=Contatos de terceiros
+ThirdPartyContact=Contato/endereço de terceiro
 AliasNames=Nome de fantasia (nome comercial, marca registrada etc.)
 CountryIsInEEC=País está dentro da Comunidade Econômica Européia
+PriceFormatInCurrentLanguage=Formato de apresentação do preço na linguagem atual e tipo de moeda
+ThirdPartyName=Nome do terceiro
+ThirdPartyEmail=E-mail do terceiro
+ThirdParty=Terceiro
+ThirdParties=Terceiros
 ThirdPartyProspects=Prospectos de cliente
 ThirdPartyProspectsStats=Prospectos de cliente
 ThirdPartyCustomersWithIdProf12=Clientes com %s ou %s
 ThirdPartySuppliers=Vendedores
+ThirdPartyType=Tipo de terceiro
 Individual=Pessoa física
+ToCreateContactWithSameName=Irá automaticamente criar um contato/endereço com a mesma informação do terceiro. Na maioria dos casos, mesmo que o terceiro seja uma pessoa física, a criação de um único terceiro é suficiente.
 ParentCompany=Matriz
 Subsidiaries=Filiais
 ReportByQuarter=Relatório pela taxa
@@ -44,12 +53,15 @@ Call=Chamar
 PhonePro=Tel. comercial
 PhonePerso=Tel. particular
 PhoneMobile=Celular
+No_Email=Recusar e-mails em massa
 Zip=CEP
 Town=Município
 Web=Website
 DefaultLang=Padrão de idioma
 VATIsNotUsed=O imposto sobre vendas não é usado
+CopyAddressFromSoc=Copie o endereço  do terceiro
 ThirdpartyNotCustomerNotSupplierSoNoRef=Terceiros nem cliente nem fornecedor, não há objetos de referência disponíveis
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Não existem descontos nem do cliente, fornecedor ou terceiro
 PaymentBankAccount=Pagamento conta bancária
 OverAllOrders=Pedidos
 OverAllSupplierProposals=Solicitações de preço
@@ -103,13 +115,21 @@ ProfId4TN=CCC
 ProfId1US=Id do Prof (FEIN)
 ProfId3DZ=Numero de Contribuinte
 ProfId4DZ=Numero de Identificação Social
+VATIntra=ID do IVA
+VATIntraShort=ID do IVA
 VATIntraSyntaxIsValid=Sintaxe é válida
 ProspectCustomer=Possível cliente / Cliente
 CustomerRelativeDiscount=Desconto relativo do cliente
 CustomerRelativeDiscountShort=Desconto relativo
 CompanyHasRelativeDiscount=Esse cliente tem um desconto padrão de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Esse cliente não tem desconto relativo por padrão
+HasRelativeDiscountFromSupplier=Desconto padrão de <b>%s%%</b>deste fornecedor
+HasNoRelativeDiscountFromSupplier=Não existe desconto padrão para este fornecedor
 CompanyHasCreditNote=Esse cliente ainda tem notas de crédito por <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=Não existe desconto de crédito desse fornecedor
+HasAbsoluteDiscountFromSupplier=Existem descontos disponíveis (Notas de credito or pagamentos baixados) para <b>%s</b>%s deste fornecedor
+HasDownPaymentOrCommercialDiscountFromSupplier=Existem descontos disponíveis(Comercial, pagamentos baixados) para <b>%s</b>%s deste fornecedor
+HasCreditNoteFromSupplier=Existem notas de crédito <b>%s</b> %s deste fornecedor
 CompanyHasNoAbsoluteDiscount=Esse cliente não tem desconto de crédito disponível
 CustomerAbsoluteDiscountAllUsers=Descontos absolutos do cliente (concedidos por todos os usuários)
 CustomerAbsoluteDiscountMy=Descontos absolutos do cliente (concedidos por você)
@@ -156,7 +176,11 @@ NewContactAddress=Novo contato / endereço
 MyContacts=Meus contatos
 CapitalOf=Capital de %s
 EditCompany=Editar empresa
+ThisUserIsNot=O usuário não é um possível cliente, cliente nem fornecedor
+VATIntraCheckDesc=O ID do IVA deve incluir o prefixo do país. O link <b>%s</b> usa o serviço europeu de verificação de IVA (VIES), que requer acesso à Internet do servidor Dolibarr.
+VATIntraCheckableOnEUSite=Verifique o ID do IVA intracomunitário no site da Comissão Europeia
 ErrorVATCheckMS_UNAVAILABLE=Verificação não é possível. Verifique o serviço não é necessário por um membro de estado (%s).
+NorProspectNorCustomer=Nem possivel cliente, nem cliente
 ProspectLevelShort=Pos. Cli.
 ProspectLevel=Possível cliente
 ContactPublic=Compartilhado
@@ -170,6 +194,7 @@ TE_MEDIUM=Empresa de médio porte
 TE_ADMIN=Governo
 TE_SMALL=Empresa de pequeno porte
 TE_RETAIL=Revendedor/Varejista
+TE_WHOLE=Atacadista
 TE_PRIVATE=Autônomo
 StatusProspect1=A contactar
 StatusProspect2=Contato em andamento
@@ -182,6 +207,13 @@ ChangeContactDone=Trocar status para 'Contato feito'
 ProspectsByStatus=Prospectos por status
 ContactNotLinkedToCompany=Contato não esta vinculado a nenhum terceiro
 NoDolibarrAccess=Sem acesso ao Dolibarr
+ExportDataset_company_1=Terceiros(Companhias/fundações/pessoas físicas) e suas propriedades
+ImportDataset_company_1=Terceiros e suas propriedades
+ImportDataset_company_2=Contatos/Enderecos adicionais e atributos de terceiros
+ImportDataset_company_3=Contas bancárias de terceiros
+ImportDataset_company_4=Vendedores de terceiros (assinalar vendedores/usuários para empresas)
+PriceLevel=Nível de preço
+PriceLevelLabels=Etiquetas de nível de preço
 DeliveryAddress=Endereço de entrega
 AddAddress=Adicionar endereço
 DeleteFile=Excluir arquivo
@@ -189,6 +221,7 @@ ConfirmDeleteFile=Você tem certeza que deseja deletar esse arquivo?
 AllocateCommercial=Designado para representante comercial
 Organization=Organização
 FiscalMonthStart=Primeiro mês do ano fiscal
+YouMustAssignUserMailFirst=Você deve criar um e-mail para esse usuário antes de poder adicionar uma notificação por e-mail.
 YouMustCreateContactFirst=Para estar apto a adicionar notificações por e-mail, você deve primeiramente definir contatos com e-mails válidos para o terceiro
 ListSuppliersShort=Lista de fornecedores
 ActivityCeased=Inativo
@@ -206,3 +239,9 @@ ThirdpartiesMergeSuccess=Terceiros foram fundidos
 SaleRepresentativeLogin=Login para o representante de vendas
 SaleRepresentativeLastname=Sobrenome do representante de vendas
 ErrorThirdpartiesMerge=Houve um erro ao excluir os terceiros. Por favor, verifique o log. As alterações foram revertidas.
+NewCustomerSupplierCodeProposed=Código de cliente/fornecedor já em uso, sugerido o uso de um novo código
+PaymentTypeCustomer=Tipo de pagamento - Cliente
+PaymentTermsCustomer=Termos de pagamento - cliente
+PaymentTypeSupplier=Tipo de pagamento - Fornecedor
+PaymentTermsSupplier=Termos de pagamento - Fornecedor
+MulticurrencyUsed=Uso de Multimoeda
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index 9a364419803..9167cc5f03d 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -10,6 +10,7 @@ FeatureIsSupportedInInOutModeOnly=função disponível somente ao modo contas CR
 VATReportBuildWithOptionDefinedInModule=Os valores aqui apresentados são calculados usando as regras definidas pela configuração do módulo Fiscal.
 LTReportBuildWithOptionDefinedInModule=Valores mostrados aqui são calculados usando as regras definidas nas configurações da empresa.
 Param=Configuração
+RemainingAmountPayment=Pagamento da quantia restante:
 Accountparent=Conta principal
 Accountsparent=Conta principal
 Income=Rendimentos
@@ -60,6 +61,7 @@ MenuSocialContributions=Contribuições fiscais/sociais
 NewSocialContribution=Nova contribuição fiscal/social
 ContributionsToPay=Encargos sociais / fiscais para pagar
 PaymentCustomerInvoice=Pagamento de fatura de cliente
+PaymentSupplierInvoice=pagamento de fatura do fornecedor
 PaymentSocialContribution=Pagamento de imposto social / fiscal
 PaymentVat=Pagamento de ICMS
 ListOfSupplierPayments=Lista de pagamentos do fornecedor
@@ -85,6 +87,7 @@ ShowVatPayment=Ver Pagamentos ICMS
 TotalToPay=Total a pagar
 BalanceVisibilityDependsOnSortAndFilters=O saldo é visível nessa lista somente se a tabela for ordenada ascendendo em %s e filtrada por 1 conta bancária
 CustomerAccountancyCode=Código contábil do cliente
+SupplierAccountancyCode=código de contabilidade do fornecedor
 CustomerAccountancyCodeShort=Cod. cont. cli.
 SupplierAccountancyCodeShort=Cod. cont. forn.
 AccountNumber=Número da conta
@@ -95,6 +98,7 @@ CheckReceiptShort=Depósito de cheque
 LastCheckReceiptShort=Últimos %s recibos de cheque
 NoWaitingChecks=Sem cheques a depositar.
 DateChequeReceived=Data introdução de dados de recepção cheque
+NbOfCheques=Nº. de cheques
 PaySocialContribution=Quitar um encargo fiscal/social
 ConfirmPaySocialContribution=Quer mesmo categorizar esta contribuição fiscal/social como paga?
 DeleteSocialContribution=Excluir um pagamento taxa social ou fiscal
@@ -116,6 +120,8 @@ AnnualByCompaniesInputOutputMode=Saldo de receitas e despesas, detalhe por grupo
 RulesAmountWithTaxIncluded=- Valores apresentados estão com todos os impostos incluídos
 RulesResultDue=- Isto inclui as faturas vencidas, despesas, ICMS (VAT), doações, pagas ou não. Isto também inclui os salários pagos. <br>- Isto isto baseado na data de validação das faturas e ICMS (VAT) e nas datas devidas para as despesas. Para os salários definidos com o módulo Salário, é usado o valor da data do pagamento.
 RulesResultInOut=- Isto inclui os pagamentos reais feitos nas faturas, despesas, ICMS (VAT) e salários. <br>- Isto é baseado nas datas de pagamento das faturas, despesas, ICMS (VAT) e salários. A data de doação para a doação.
+RulesCADue=- Inclui as faturas do cliente, sejam elas pagas ou não. <br> - É baseado na data de validação dessas faturas. <br>
+RulesCAIn=- Inclui todos os pagamentos efetivos de faturas recebidas de clientes. <br> - É baseado na data de pagamento dessas faturas <br>
 RulesAmountOnInOutBookkeepingRecord=Inclui registro em seu Ledger com contas contábeis que tem o grupo "DESPESAS" ou "RENDIMENTO"
 RulesResultBookkeepingPredefined=Inclui registro em seu Ledger com contas contábeis que tem o grupo "DESPESAS" ou "RENDIMENTO"
 RulesResultBookkeepingPersonalized=Mostra registro em seu Livro de Registro com contas contábeis <b> agrupadas por grupos personalizados </ b>
@@ -139,7 +145,6 @@ SellsJournal=Diário de Vendas
 PurchasesJournal=Diário de  Compras
 DescSellsJournal=Diário de Vendas
 DescPurchasesJournal=Diário de  Compras
-InvoiceRef=Ref. Fatura
 CodeNotDef=Não Definida
 DatePaymentTermCantBeLowerThanObjectDate=Data Prazo de pagamento não pode ser inferior a data da compra ou aquisição
 Pcg_version=Modelos de carta de contas
@@ -149,10 +154,12 @@ RefExt=Ref externo
 ToCreateAPredefinedInvoice=Para criar um tema para fatura, crie uma fatura padrão e então, sem validá-la, clique no botão "%s".
 LinkedOrder=Linque para o pedido
 CalculationRuleDesc=Para calcular o total do VAT, há dois métodos: <br> Método 1 é arredondamento cuba em cada linha, em seguida, soma-los. <br> Método 2 é somando tudo cuba em cada linha, em seguida, o arredondamento resultado. <br> Resultado final pode difere de alguns centavos. O modo padrão é o <b>modo% s.</b>
+CalculationRuleDescSupplier=De acordo com o fornecedor, escolha o método apropriado para aplicar a mesma regra de cálculo e obter o mesmo resultado esperado pelo fornecedor.
 CalculationMode=Forma de cálculo
 AccountancyJournal=código do Livro de Registro contábil
 ACCOUNTING_VAT_PAY_ACCOUNT=Conta da contabilidade padrão para o pagamento de ICMS
 ACCOUNTING_ACCOUNT_CUSTOMER=Conta contábil usada para terceiros de clientes
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=A conta contábil dedicada definida no cartão de terceiros será usada apenas para a contabilidade da subconta. Este será usado para contabilidade geral e como valor padrão da contabilidade do Contador, se a conta contábil do fornecedor dedicada a terceiros não estiver definida.
 CloneTaxForNextMonth=Clonar para o proximo mes
 AddExtraReport=Relatórios extra (adicionar relatório de clientes estrangeiros e nacionais)
 OtherCountriesCustomersReport=Relação de clientes estrangeiros
diff --git a/htdocs/langs/pt_BR/contracts.lang b/htdocs/langs/pt_BR/contracts.lang
index 6f061d58c67..bb90fb73e80 100644
--- a/htdocs/langs/pt_BR/contracts.lang
+++ b/htdocs/langs/pt_BR/contracts.lang
@@ -38,7 +38,7 @@ DateStartRealShort=Data real de início
 DateEndReal=Data Real Fim do Serviço
 DateEndRealShort=Data real de encerramento
 CloseService=Finalizar Serviço
-BoardRunningServices=Serviços Ativos Expirados
+BoardRunningServices=Serviços em execução
 ServiceStatus=Estado do Serviço
 DraftContracts=Contratos Rascunho
 CloseRefusedBecauseOneServiceActive=O contrato não pode ser fechado, pois há pelo menos um serviço aberto nele
diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
index 03ac6c7b79c..293b981cc67 100644
--- a/htdocs/langs/pt_BR/cron.lang
+++ b/htdocs/langs/pt_BR/cron.lang
@@ -9,7 +9,7 @@ OrToLaunchASpecificJob=Ou checkar e iniciar um specifico trabalho
 KeyForCronAccess=Chave seguranca para URL que lanca tarefas cron
 FileToLaunchCronJobs=Linha de comando para checar e iniciar tarefas cron qualificadas
 CronExplainHowToRunUnix=No ambiente Unix você deve usar a seguinte entrada crontab para executar a linha de comando a cada 5 minutos
-CronExplainHowToRunWin=Em ambiente Microsoft (tm)  Windows,  Você PODE USAR Ferramentas de Tarefa agendada Para executar a Linha de Comando de Cada 5 Minutos
+CronExplainHowToRunWin=No ambiente Microsoft (tm) Windows, você pode usar as ferramentas Tarefas agendadas para executar a linha de comando a cada 5 minutos
 CronMethodDoesNotExists=A classe %s não contém método %s algum
 CronJobDefDesc=Os perfis de trabalho do Cron são definidos no arquivo do descritor do módulo. Quando o módulo é ativado, eles são carregados e disponíveis para que você possa administrar os trabalhos no menu de ferramentas de administração %s.
 CronJobProfiles=Lista de perfis de tarefa cron predefinidas
@@ -25,7 +25,8 @@ CronNone=Nenhum
 CronDtEnd=Não depois
 CronDtNextLaunch=Próxima execução
 CronNoJobs=Nenhuma tarefa registrada
-CronNbRun=Nr. execuçao
+CronNbRun=Número de lançamentos
+CronMaxRun=Número máximo de lançamentos
 JobFinished=Trabalho iniciado e terminado
 CronAdd=Adicionar tarefa
 CronEvery=Executar cada tarefa
@@ -36,17 +37,20 @@ CronErrEndDateStartDt=A data final não pode ser anterior a data de início
 StatusAtInstall=Status na instalação do módulo
 CronTaskInactive=Está tarefa está desativada
 CronClassFile=Nome de arquivo com classe
-CronModuleHelp=Nome do diretório do módulo Dolibarr (também funciona com o módulo externo Dolibarr). <BR> Por exemplo, chamar o método de busca do objeto de produto Dolibarr /htdocs/<u>product</u>/class/product.class.php, o valor para o módulo é <br> <i> produto </i>
-CronClassFileHelp=O caminho relativo e o nome do arquivo para carregar (o caminho é relativo ao diretório raiz do servidor web). <BR> Por exemplo, para chamar o método de busca do objeto de produto Dolibarr htdocs / product / class / <u> product.class.php </u>, o valor para o nome do arquivo da classe é <br> <i> product / class / product.class.php </i>
-CronObjectHelp=O nome do objeto para carregar. <BR> Por exemplo, para chamar o método de busca do objeto de produto Dolibarr /htdocs/product/class/product.class.php, o valor para o nome do arquivo de classe é <br> <i> Produto </i>
-CronMethodHelp=O método do objeto para o lançamento. <BR> Por exemplo, para chamar o método de busca do objeto de produto Dolibarr /htdocs/product/class/product.class.php, o valor para o método é <br><i> buscar </i>
-CronArgsHelp=Os argumentos do método. <BR> Por exemplo, chamar o método de busca do objeto de produto Dolibarr /htdocs/product/class/product.class.php, o valor para parâmetros pode ser <br><i> 0, ProductRef </i>
+CronModuleHelp=Nome do diretório do módulo Dolibarr (também trabalhe com o módulo Dolibarr externo). <BR> Por exemplo, para chamar o método fetch do objeto do produto Dolibarr /htdocs/<u>product</u>/class/product.class.php, o valor para module é o <i> product </ i>
+CronClassFileHelp=O caminho relativo e o nome do arquivo a ser carregado (o caminho é relativo ao diretório-raiz do servidor da web). <BR> Por exemplo, para chamar o método fetch do objeto Product do Dolibarr htdocs / product / class / <u> product.class.php </ u>, o valor para o nome do arquivo de classe é <i> product / class / product.class.php </ i>
+CronObjectHelp=O nome do objeto a ser carregado. <BR> Por exemplo, para chamar o método fetch do objeto do produto Dolibarr /htdocs/product/class/product.class.php, o valor para o nome do arquivo de classe é <i> Produto </ i>
+CronMethodHelp=O método do objeto a ser lançado. <BR> Por exemplo, para chamar o método fetch do objeto Product do Dolibarr /htdocs/product/class/product.class.php, o valor para o método é <i> fetch </ i>
+CronArgsHelp=Os argumentos do método. <BR> Por exemplo, para chamar o método fetch do objeto Dolibarr Product /htdocs/product/class/product.class.php, o valor dos parâmetros pode ser <i> 0, ProductRef </ i>
 CronCommandHelp=A linha de comando de sistema que deve ser executada.
 CronCreateJob=Criar uma nova Tarefa agendada
 CronType=Tipo de tarefa
 CronType_method=Chamar método de uma Classe PHP
 CronType_command=Comando Shell
+CronCannotLoadClass=Não é possível carregar o arquivo de classe %s (para usar a classe %s)
+CronCannotLoadObject=O arquivo de classe %s foi carregado, mas o objeto %s não foi encontrado nele
 UseMenuModuleToolsToAddCronJobs=Vá até o menu "Home >> Ferramentas administrativas >> Tarefas agendadas" para visualizar e editar as tarefas agendadas.
 JobDisabled=Tarefa desativada
 MakeLocalDatabaseDumpShort=Backup do banco de dados local
+MakeLocalDatabaseDump=Crie um despejo de banco de dados local. Os parâmetros são: compression ('gz' ou 'bz' ou 'none'), tipo de backup ('mysql', 'pgsql', 'auto'), 1, 'auto' ou nome de arquivo para construir, número de arquivos de backup para manter
 WarningCronDelayed=Atenção, para fins de desempenho, seja qual for a próxima data de execução de tarefas habilitadas, suas tarefas podem ser atrasadas em até um máximo de %s horas, antes de serem executadas.
diff --git a/htdocs/langs/pt_BR/dict.lang b/htdocs/langs/pt_BR/dict.lang
index eecc8ea0800..aa48a015ad0 100644
--- a/htdocs/langs/pt_BR/dict.lang
+++ b/htdocs/langs/pt_BR/dict.lang
@@ -71,6 +71,7 @@ CurrencySingUSD=Dólar americano
 CurrencyUAH=Grívnias
 CurrencySingUAH=Grívnia
 CurrencyXPF=Francos CFP
+CurrencyCentEUR=centavos
 CurrencyCentSingEUR=centavo
 CurrencyCentINR=paise
 DemandReasonTypeSRC_CAMP_MAIL=Campanha por correspondência
@@ -79,6 +80,7 @@ DemandReasonTypeSRC_CAMP_PHO=Campanha por telefone
 DemandReasonTypeSRC_CAMP_FAX=Campanha por fax
 DemandReasonTypeSRC_SHOP=Contato na loja
 DemandReasonTypeSRC_WOM=Palavra da boca
+DemandReasonTypeSRC_SRC_CUSTOMER=Contato entrante de um cliente
 PaperFormatUSLETTER=Formato Carta, EUA
 PaperFormatUSLEGAL=Formato Legal, EUA
 PaperFormatUSEXECUTIVE=Formato Executivo, EUA
diff --git a/htdocs/langs/pt_BR/ecm.lang b/htdocs/langs/pt_BR/ecm.lang
index f1c0c8b5d44..178f8b993fa 100644
--- a/htdocs/langs/pt_BR/ecm.lang
+++ b/htdocs/langs/pt_BR/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nr. de documentos
+ECMNbOfDocs=N°. de documentos no diretório
 ECMSection=Pasta
 ECMSectionManual=Pasta manual
 ECMRoot=Raiz ECM
@@ -24,11 +24,16 @@ ECMDocsByProjects=Documentos associados a projetos
 ECMDocsByUsers=Documentos relacionados a usuários
 ECMDocsByInterventions=Documentos ligados a intervenções
 ECMDocsByExpenseReports=Documentos vinculados a relatórios de despesas
+ECMDocsByHolidays=Documentos ligados a feriados
+ECMDocsBySupplierProposals=Documentos vinculados a propostas de fornecedores
 ShowECMSection=Exibir pasta
 DeleteSection=Apagar pasta
 ConfirmDeleteSection=Por favor confirmar a remocao do diretorio <b>%s</b>?
 ECMDirectoryForFiles=Relação de pasta para arquivos
+CannotRemoveDirectoryContainsFilesOrDirs=Remoção impossível porque contém alguns arquivos ou subdiretórios
+CannotRemoveDirectoryContainsFiles=Remoção impossível porque contém alguns arquivos
 ECMFileManager=Gerenciador de arquivos
+ECMSelectASection=Selecione um diretório na árvore ...
 DirNotSynchronizedSyncFirst=Este diretório parece ser criado ou modificado fora do módulo ECM. Você deve clicar no botão "Sincronizar" primeiro para sincronizar o disco do banco de dados para obter o conteúdo desse diretório.
 ReSyncListOfDir=Sincronizar lista de diretórios
 HashOfFileContent=Hash do conteúdo do arquivo
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 011ae9c4cce..8951fdcbded 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - errors
 NoErrorCommitIsDone=Sem erros, garantimos
 ErrorButCommitIsDone=Erros foram encontrados mas, apesar disso, validamos
+ErrorBadEMail=E-mail %s está errado
 ErrorBadUrl=O URL %s está errado
 ErrorBadValueForParamNotAString=Valor ruim para o seu parâmetro por falta, possivelmente, de tradução.
 ErrorRecordNotFound=Registro não encontrado.
@@ -15,9 +16,13 @@ ErrorFailToDeleteDir=Houve uma falha ao eliminar o diretório '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Este contato já está definido como contato para este tipo.
 ErrorCashAccountAcceptsOnlyCashMoney=Esta conta bancaria é uma conta caixa e aceita, portanto, apenas pagamentos em dinheiro.
 ErrorFromToAccountsMustDiffers=As contas bancárias origem e alvo devem ser diferentes.
+ErrorBadThirdPartyName=Valor inválido para o nome de terceiros
 ErrorProdIdIsMandatory=%s é obrigatório
 ErrorBadCustomerCodeSyntax=Sintaxe inadequada para o código de cliente
+ErrorBadBarCodeSyntax=Má sintaxe para código de barras. Pode ser que você defina um tipo de código de barras incorreto ou tenha definido uma máscara de código de barras para numeração que não corresponda ao valor verificado.
 ErrorCustomerCodeRequired=Código de cliente necessário
+ErrorBarCodeRequired=Código de barras requerido
+ErrorBarCodeAlreadyUsed=Código de barras já usado
 ErrorSupplierCodeRequired=Código de fornecedor necessário
 ErrorSupplierCodeAlreadyUsed=Código do fornecedor já usado
 ErrorBadParameters=Parâmetros inadequados
@@ -26,8 +31,9 @@ ErrorBadImageFormat=Arquivo imagem de formato não suportado (Seu PHP não supor
 ErrorBadDateFormat=O valor '%s' tem o formato de data errada
 ErrorWrongDate=A data não está correta!
 ErrorFailedToWriteInDir=Houve uma falha ao escrever no diretório %s
-ErrorFoundBadEmailInFile=Encontrada sintaxis incorreta em email em %s linhas em Arquivo (Exemplo linha %s com email
+ErrorFoundBadEmailInFile=Encontrado uma sintaxe de e-mail incorreta para as linhas %s no arquivo (por exemplo, linha %s com e-mail = %s)
 ErrorFieldsRequired=Alguns campos obrigatórios não foram preenchidos.
+ErrorSubjectIsRequired=O campo do e-mail é obrigatório
 ErrorFailedToCreateDir=Error na creação de uma carpeta. Compruebe que 0 usuario del servidor Web tiene derechos de escritura en las carpetas de documentos de Dolibarr. Si 0  parámetro <b>safe_mode</b> está ativo en este PHP, Compruebe que los archivos php dolibarr pertencen ao usuario del servidor Web.
 ErrorNoMailDefinedForThisUser=Nenhum e-mail definido para este usuário
 ErrorFeatureNeedJavascript=Esta funcionalidade requer que o javascript seja ativado para funcionar. Altere isto em Configuração >> Aparência.
@@ -56,12 +62,20 @@ ErrorRefAlreadyExists=A ref. utilizada para a criação já existe.
 ErrorRecordHasAtLeastOneChildOfType=Object tem pelo menos um filho do tipo %s
 ErrorModuleRequireJavascript=Javascript não deve ser desativado para ter esse recurso funcionando. Para ativar / desativar o Javascript, vá ao menu Home-> Configuração-> Display.
 ErrorPasswordsMustMatch=Deve existir correspondência entre as senhas digitadas
+ErrorContactEMail=Ocorreu um erro técnico. Por favor, entre em contato com o administrador para o seguinte e-mail <b>%s</b> e forneça o código de erro <b>%s</b> em sua mensagem ou adicione uma cópia da tela desta página.
+ErrorWrongValueForField=Campo <b>%s</b> : '<b>%s</b>' não corresponde à regra de regex <b>%s</b>
+ErrorFieldValueNotIn=Campo <b>%s</b> : '<b>%s</b>' não é um valor encontrado no campo <b>%s</b> de <b>%s</b>
+ErrorFieldRefNotIn=Campo <b>%s</b> : '<b>%s</b>' não é uma referência existente <b>%s</b>
+ErrorsOnXLines=%s erros encontrados
 ErrorFileIsInfectedWithAVirus=O antivírus não foi capaz de atestar o arquivo (o arquivo pode estar infectado por um vírus)
 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
 ErrorCounterMustHaveMoreThan3Digits=Contador deve ter mais de 3 dígitos
 ErrorProdIdAlreadyExist=%s é atribuído a outro terço
 ErrorFailedToSendPassword=Houve uma falha no envio da senha
@@ -80,6 +94,7 @@ ErrorLoginDoesNotExists=Não existe um usuário com login <b>%s</b>.
 ErrorLoginHasNoEmail=Este usuário não tem endereço de e-mail. Processo abortado.
 ErrorBadValueForCode=Valor inadequado para código de segurança. Tente novamente com um novo valor...
 ErrorBothFieldCantBeNegative=Os campos %s e %s não podem ser ambos negativos
+ErrorFieldCantBeNegativeOnInvoice=O campo <strong>%s</strong> não pode ser negativo neste tipo de fatura. Se você quiser adicionar uma linha de desconto, basta criar o desconto primeiro com o link %s na tela e aplicá-lo à fatura. Você também pode solicitar que seu administrador defina a opção FACTURE_ENABLE_NEGATIVE_LINES como 1 para permitir o comportamento antigo.
 ErrorQtyForCustomerInvoiceCantBeNegative=A quantidade nas linhas das notas de clientes não pode ser negativa
 ErrorWebServerUserHasNotPermission=A conta de usuário <b>%s</b> usada para executar o servidor web não possui permissão para isto
 ErrorNoActivatedBarcode=Nenhum tipo de código de barras foi ativado
@@ -114,6 +129,7 @@ ErrorGlobalVariableUpdater2=Faltando parâmetro '%s'
 ErrorGlobalVariableUpdater5=Nenhuma variável global selecionado
 ErrorFieldMustBeANumeric=O campo <b>%s</b> deve ser um valor numérico
 ErrorMandatoryParametersNotProvided=Parâmetro (s) de preenchimento obrigatório não fornecidas
+ErrorOppStatusRequiredIfAmount=Você define um valor estimado para esse lead. Então você também deve inserir seu status.
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Má definição da matriz Menu No Módulo Descritor (mau valor para fk_menu chave)
 ErrorWarehouseRequiredIntoShipmentLine=É exigido um armazém na linha para a remessa
 ErrorSupplierCountryIsNotDefined=País para este fornecedor não está definido. Corrija isso primeiro.
@@ -122,12 +138,20 @@ ErrorModuleNotFound=O arquivo do módulo não foi encontrado.
 ErrorObjectMustHaveStatusDraftToBeValidated=O objeto %s deve ter status 'Rascunho' para ser validado.
 ErrorObjectMustHaveLinesToBeValidated=O objeto %s deve ter linhas a serem validadas.
 ErrorFileNotFoundWithSharedLink=Arquivo não encontrado. Pode ser que a chave do compartilhamento tenha sido modificada ou o arquivo tenha sido removido recentemente.
+ErrorDuringChartLoad=Erro ao carregar o plano de contas. Se algumas contas não foram carregadas, você ainda pode inseri-las manualmente.
+ErrorBadSyntaxForParamKeyForContent=Má sintaxe para o parâmetro keyforcontent . Deve ter um valor começando com %s ou %s
+ErrorVariableKeyForContentMustBeSet=Erro, a constante com nome %s (com conteúdo de texto para mostrar) ou %s (com URL externo para mostrar) deve ser definida.
+ErrorURLMustStartWithHttp=O URL %s deve começar com http:// ou https://
+ErrorNewRefIsAlreadyUsed=Erro, a nova referência já está sendo usada
 WarningPasswordSetWithNoAccount=A senha foi definida para esse membro. No entanto, nenhuma conta de usuário foi criada. Portanto, esta senha é armazenada, mas não pode ser usado para acessar Dolibarr. Ele pode ser usado por um módulo / interface externa, mas se você não precisa definir qualquer login nem palavra-passe para um membro, você pode desabilitar a opção "Gerenciar um login para cada membro" da configuração do módulo-Membro. Se você precisa para gerenciar um login, mas não precisa de qualquer senha, você pode manter este campo em branco para evitar este aviso. Nota: E-mail pode também ser utilizado como uma entre o membro se está ligado a um utilizador.
+WarningMandatorySetupNotComplete=Clique aqui para configurar os parâmetros obrigatórios
+WarningEnableYourModulesApplications=Clique aqui para ativar seus módulos e aplicativos
 WarningSafeModeOnCheckExecDir=Atenção, a opção PHP <b>safe_mode</b> está em modo de comando devem ser armazenados dentro de um diretório declarado pelo php parâmetro <b>safe_mode_exec_dir.</b>
 WarningBookmarkAlreadyExists=já existe um marcador com este título o esta URL.
 WarningPassIsEmpty=Atenção: a senha da base de dados está vazia. Esto é buraco na segurança. deve agregar uma senha e a sua base de dados e alterar a sua Arquivo conf.php para reflejar esto.
 WarningConfFileMustBeReadOnly=Atenção, o seu arquivo de configuração <b>(htdocs / conf / conf.php)</b> pode ser substituído pelo servidor web. Esta é uma falha de segurança grave. Modificar permissões em arquivos para estar no modo de somente leitura para usuário do sistema operacional utilizado pelo servidor web. Se você usa o formato Windows e FAT para o seu disco, você deve saber que este sistema de arquivos não permite adicionar permissões em arquivos, por isso não pode ser completamente seguro.
 WarningsOnXLines=Advertências sobre registro de <b>origem% s</b> (s)
+WarningLockFileDoesNotExists=Atenção, assim que a configuração estiver concluída, você deve desativar as ferramentas de instalação/migração adicionando um arquivo <b>install.lock</b> no diretório <b>%s</b>. Omitir a criação desse arquivo é um grave risco de segurança.
 WarningCloseAlways=Atenção, o fechamento é feito mesmo se o valor difere entre elementos de origem e de destino. Ative esse recurso com cautela.
 WarningUsingThisBoxSlowDown=Atenção, utilizando esta caixa de abrandar a sério todas as páginas que mostram a caixa.
 WarningClickToDialUserSetupNotComplete=Configuração de informações ClickToDial para o usuário não são completas (ver guia ClickToDial no seu cartão de usuário).
@@ -136,3 +160,4 @@ WarningPaymentDateLowerThanInvoiceDate=A data de pagamento (%s) é anterior a da
 WarningTooManyDataPleaseUseMoreFilters=Dados em demasia (mais de %s linhas). Por favor, utilize mais filtros ou defina a constante %s para um limite maior.
 WarningSomeLinesWithNullHourlyRate=Algumas vezes foram registrados por alguns usuários enquanto sua taxa por hora não foi definida. Um valor de 0 %s por hora foi usado, mas isto pode resultar em uma valoração errada do tempo gasto.
 WarningYourLoginWasModifiedPleaseLogin=O seu login foi modificado. Por questões de segurança, você terá de autenticar-se com o seu novo login antes da próxima ação.
+WarningProjectClosed=O projeto está fechado. Você deve reabri-lo primeiro.
diff --git a/htdocs/langs/pt_BR/exports.lang b/htdocs/langs/pt_BR/exports.lang
index 1dd24b03c79..672030f9aa2 100644
--- a/htdocs/langs/pt_BR/exports.lang
+++ b/htdocs/langs/pt_BR/exports.lang
@@ -1,21 +1,11 @@
 # Dolibarr language file - Source file is en_US - exports
-ImportArea=Área de importação
-NewImport=Nova importação
 ImportableDatas=Conjunto de dados que podem ser importados
 SelectExportDataSet=Escolha um conjunto predefinido de dados que deseja exportar...
 SelectImportDataSet=Escolha um conjunto predefinido de dados que deseja importar...
-SelectImportFields=Escolha campos de arquivo de fonte que você deseja importar e seu campo de destino no banco de dados, movendo-os para cima e para baixo com a seta, ou selecione um perfil de importação pré-definido:
 NotImportedFields=Os campos de arquivo de origem não importado
-SaveImportModel=Guardar este perfil de importação assim pode reutiliza-lo posteriormente...
 ImportModelName=Nome do perfil de importação
-ImportModelSaved=Perfil de importação guardado com o nome de <b>%s</b>.
 DatasetToImport=Conjunto de dados a importar
-NowClickToGenerateToBuildExportFile=Agora, faça click em "Gerar" para gerar o arquivo exportação...
-FormatedImport=Assistente de importação
-FormatedImportDesc2=O primeiro passo consiste em escolher o tipo de dado que deve importar, logo o arquivo e a continuação escolher os campos que deseja importar.
-FormatedExport=Assistente de exportação
-FormatedExportDesc2=O primeiro passo consiste em escolher um dos conjuntos de dados predefinidos, a continuação escolher os campos que quer exportar para o arquivo e em que ordem.
-FormatedExportDesc3=Uma vez selecionados os dados, é possível escolher o formato do arquivo de exportação gerado.
+FormatedImportDesc1=Este módulo permite atualizar dados existentes ou adicionar novos objetos ao banco de dados a partir de um arquivo sem conhecimento técnico, usando um assistente.
 NoImportableData=Não existe tipo de dados importavel (não existe nenhum módulo com definições de dados importavel ativado)
 FileSuccessfullyBuilt=Arquivo gerado
 SQLUsedForExport=Pedido de SQL usado para construir exportação de arquivo
@@ -24,15 +14,11 @@ LineDescription=Descrição da Linha
 LineUnitPrice=Preço Unitário da Linha
 LineVATRate=Taxa ICMS por Linha
 LineQty=Quantidade por Linha
-LineTotalHT=Valor do HT por linha
+LineTotalHT=Quantidade de imposto liq. por linha
 LineTotalTTC=Acrescido de ICMS da linha
 LineTotalVAT=Valor ICMS por Linha
 TypeOfLineServiceOrProduct=Tipo de Linha (0
 FileToImport=Arquivo de origem de importação
-FileMustHaveOneOfFollowingFormat=Arquivo para importação deve ter um dos seguinte formato
-DownloadEmptyExample=Baixar exemplo de arquivo de origem vazio
-ChooseFormatOfFileToImport=Escolha o formato de arquivo a ser usado como formato de arquivo de importação clicando no para selecioná-lo ...
-ChooseFileToImport=Carregar arquivo e clique no picto% s para selecionar o arquivo como arquivo de importação de fonte ...
 FieldsInSourceFile=Campos em arquivo de origem
 FieldsInTargetDatabase=Campos de destino no banco de dados Dolibarr (negrito = obrigatório)
 MoveField=Mover campo número da colunas
@@ -43,53 +29,39 @@ TablesTarget=Mesas alvejados
 FieldsTarget=Alvo
 FieldTarget=Campo de destino
 FieldSource=Campo Fonte
-NowClickToTestTheImport=Verifique os parâmetros de importação que você definiu. Se eles estiverem corretos, clique no botão <b>"% s"</b> para iniciar uma simulação do processo de importação (os dados não serão alterados em seu banco de dados, é apenas uma simulação para o momento) ...
+NowClickToTestTheImport=Verifique se o formato de arquivo (delimitadores de campo e cadeia) do arquivo corresponde às opções mostradas e se você omitiu a linha de cabeçalho ou se elas serão sinalizadas como erros na simulação a seguir. <br> Clique no botão "<b>%s</b>" para executar uma verificação da estrutura/conteúdo do arquivo e simular o processo de importação. <br> <b>Nenhum dado será alterado em seu banco de dados</b>.
 FieldNeedSource=Este campo requer dados do arquivo de origem
 SomeMandatoryFieldHaveNoSource=Alguns campos obrigatórios não têm nenhuma fonte de arquivo de dados
 InformationOnSourceFile=Informações sobre arquivo de origem
 SelectAtLeastOneField=Mude pelo menos um campo de origem na coluna de campos para exportar
 SelectFormat=Escolha este formato de arquivo de importação
-RunImportFile=Arquivo de importação de lançamento
-NowClickToRunTheImport=Verifique o resultado da simulação de importação. Se tudo estiver ok, inicie a importação definitiva.
-DataLoadedWithId=Todos os dados serão carregados com o seguinte id de importação: <b>%s</b>
-ErrorMissingMandatoryValue=Dados obrigatórios esta vazio no arquivo de origem para o campo.
-TooMuchErrors=Há ainda outras linhas de origem com erros mas a produção tem sido limitado.
-TooMuchWarnings=Há ainda outras linhas de origem com avisos, mas a produção tem sido limitado.
+DataLoadedWithId=Os dados importados terão um campo adicional em cada tabela de banco de dados com este ID de importação: <b>%s</b>, para permitir que ele seja pesquisável no caso de investigar um problema relacionado a essa importação.
 EmptyLine=Linha vazia (serão descartados)
 FileWasImported=O arquivo foi importado com o números.
-YouCanUseImportIdToFindRecord=Você pode encontrar todos os registros importados para o seu banco de dados pela filtragem no campo <b>import_key='%s'</b>.
 NbOfLinesOK=Número de linhas sem erros e sem avisos:
 NbOfLinesImported=Número de linhas de importados com sucesso:
 DataComeFromNoWhere=Valor para inserir vem do erro,no arquivo de origem.
 DataComeFromFileFieldNb=Valor para inserir vem do campo de número do arquivo de origem.
-DataComeFromIdFoundFromRef=Valor que vem do campo de número do arquivo de origem, será usado para encontrar id do objeto. (Então o objeto que tem a ref. De arquivo de origem deve existir em Dolibarr).
-DataComeFromIdFoundFromCodeId=O código que vem de número do campo do arquivo de origem será usado para encontrar id do objeto pai de usar (Assim, o código do arquivo de origem deve existe no dicionário).  Note que, se você sabe id, você também pode usá-lo em arquivo de origem em vez de código. Importação deve trabalhar em ambos os casos.
 DataIsInsertedInto=Dados provenientes do arquivo de origem será inserido o seguinte campo:
-DataIDSourceIsInsertedInto=O id do objeto pai encontrado usando os dados em arquivo de origem, será inserido o seguinte campo:
 DataCodeIDSourceIsInsertedInto=O ID da linha pai encontrado a partir do código, será inserido no campo a seguir:
 SourceExample=Exemplo de possível valor dos dados
 ExampleAnyRefFoundIntoElement=Qualquer ref encontrada para o elemento
 ExampleAnyCodeOrIdFoundIntoDictionary=Qualquer código (ou id) encontrado em dicionário
-CSVFormatDesc=Formato de arquivo de valores separados por vírgulas . Este é um formato de arquivo de texto, onde os campos são separados pelo separador. Se separador é encontrado dentro de um conteúdo de campo, o campo é arredondado pelo caráter rodada . Fuja personagem para escapar caráter rodada é
-Excel95FormatDesc=Formato de arquivo do Excel. (Xls) Este é o formato Excel 95 nativa (BIFF5).
-Excel2007FormatDesc=Formato de arquivo do Excel (. Xlsx) Este é o formato Excel 2007 nativo (SpreadsheetML).
 TsvFormatDesc=Formato de arquivo Tab Separated Value (. TSV) Este é um formato de arquivo de texto, onde os campos são separados por um tabulador [Tab].
 ExportFieldAutomaticallyAdded=O campo <b>%s</b> foi adicionado automaticamente. Isto evitará que você tenha linhas semelhantes a serem tratadas como registro duplicado (com este campo adicionado, todas as linhas terão sua própria ID e serão então diferentes).
-CsvOptions=Opções csv
-Enclosure=Recinto
 SpecialCode=Código especial
 ExportStringFilter=Permite substituir um ou mais caracteres no texto
-ExportDateFilter=AAAA, AAAAMM, AAAAMMDD : filtros por um ano / mês / dia<br>AAAA+AAAA, AAAAMM+AAAAMM, AAAAMMDD+AAAAMMDD : filtros mais de uma gama de ano / mês / dia inicial<br> > AAAA, > AAAAMM, > AAAAMMDD : filtros em todos seguindo anos / meses / dias<br> < AAAA, < AAAAMM, < AAAAMMDD : filtros em todos os anos / meses / dias anteriores
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtra por um ano/mês/dia <br> YYYY + YYYY, YYYYMM + YYYYMM, YYYYMMDD + YYYYMMDD: filtros ao longo de um intervalo de anos/meses/dias <br> > YYYY, > YYYYMM, > YYYYMMDD: filtros em todos os anos / meses / dias seguintes <br> < YYYY, < YYYYMM, < YYYYMMDD: filtros em todos os anos / meses / dias anteriores
 ExportNumericFilter=filtros NNNNN por um valor <br> filtros NNNNN+NNNNN acima de uma faixa de valores <br> < filtros NNNNN por valores mais baixos <br> > filtros NNNNN por valores mais elevados
 ImportFromLine=Importar iniciando da linha número
-ImportFromToLine=Importar números de linhas (de -para)
-SetThisValueTo2ToExcludeFirstLine=Por exemplo, coloque 3 para este valor para excluir as 2 primeiras linhas
-KeepEmptyToGoToEndOfFile=Manter este campo em branco para ir até o fim do arquivo
+ImportFromToLine=Limite de alcance (De - Para) por exemplo. <b>omitir linha(s) de cabeçalho</b>
+SetThisValueTo2ToExcludeFirstLine=Por exemplo, defina esse valor como 3 para excluir as 2 primeiras linhas. <br> Se as linhas de cabeçalho NÃO forem omitidas, isso resultará em vários erros na simulação de importação.
+KeepEmptyToGoToEndOfFile=Mantenha este campo vazio para processar todas as linhas até o final do arquivo.
+SelectPrimaryColumnsForUpdateAttempt=Selecione coluna(s) para usar como chave primária para uma importação de UPDATE
 UpdateNotYetSupportedForThisImport=Atualizar não é suportado para este tipo de importação (apenas inserir)
 NoUpdateAttempt=Nenhuma tentativa de atualização foi realizada, apenas insira
 ImportDataset_user_1=Usuários (funcionários ou não) e propriedades
 ComputedField=Campo computado
 SelectFilterFields=Se você deseja filtrar alguns valores, apenas os valores de entrada aqui.
 FilteredFieldsValues=Valor para o filtro
-KeysToUseForUpdates=Chave para atualizar dados
 MultipleRecordFoundWithTheseFilters=Múltiplos registros foram encontrados com esses filtros: %s
diff --git a/htdocs/langs/pt_BR/ftp.lang b/htdocs/langs/pt_BR/ftp.lang
index efafabd98a2..bbee2149a4e 100644
--- a/htdocs/langs/pt_BR/ftp.lang
+++ b/htdocs/langs/pt_BR/ftp.lang
@@ -2,12 +2,12 @@
 FTPClientSetup=Configuração do módulo cliente FTP
 NewFTPClient=Nova configuração da conexão FTP
 FTPArea=Área FTP
-FTPAreaDesc=Esta tela mostrar o conteúdo do servidor FTP
-SetupOfFTPClientModuleNotComplete=A configuração do módulo cliente FTP parece não estar completa
+FTPAreaDesc=Esta tela mostra uma visão de um servidor FTP.
+SetupOfFTPClientModuleNotComplete=A configuração do módulo do cliente FTP parece estar incompleta
 FTPFeatureNotSupportedByYourPHP=Seu PHP não suporta as funções de FTP
 FailedToConnectToFTPServer=Falha na conexão ao servidor FTP (server% s, porta% s)
 FailedToConnectToFTPServerWithCredentials=Falha ao efetuar login no servidor FTP com login/senha
 FTPFailedToRemoveFile=Falha ao remover o arquivo <b>%s</ b>.
-FTPFailedToRemoveDir=Falha ao remover diretório <b>%s</ b> (verifique as permissões e se o diretório está vazio).
-ChooseAFTPEntryIntoMenu=Escolha uma entrada de FTP em menu ...
+FTPFailedToRemoveDir=Falha ao remover a pasta <b>%s </b>: Verifique as permissões e que a pasta está vazia
+ChooseAFTPEntryIntoMenu=Escolha um Site FTP do menu ...
 FailedToGetFile=Falha ao obter arquivos %s
diff --git a/htdocs/langs/pt_BR/help.lang b/htdocs/langs/pt_BR/help.lang
index d5a3bb13944..3f5625ca3bf 100644
--- a/htdocs/langs/pt_BR/help.lang
+++ b/htdocs/langs/pt_BR/help.lang
@@ -1,20 +1,13 @@
 # Dolibarr language file - Source file is en_US - help
 CommunitySupport=Fórum/Wiki suporte
 EMailSupport=E-mails de suporte
-RemoteControlSupport=Suporte em tempo real / remoto
+RemoteControlSupport=Suporte online em tempo real/remoto
 OtherSupport=Outros suportes
 ToSeeListOfAvailableRessources=Entrar em contato com/consulte os recursos disponíveis:
 HelpCenter=Central de ajuda
-DolibarrHelpCenter=Centro de suporte e ajuda Dolibarr
-ToGoBackToDolibarr=Caso contrário, clique aqui para usar Dolibarr
-TypeOfSupport=Fonte de suporte
 NeedHelpCenter=PRecisa de ajuda ou suporte?
 Efficiency=eficiência
 TypeHelpOnly=Somente ajuda
 TypeHelpDev=Ajuda+Desenvolvimento
-TypeHelpDevForm=Ajuda+Desenvolvimento+Formação
-BackToHelpCenter=Caso contrário, clique aqui para ir para trás para ajudar a home page .
-LinkToGoldMember=Você pode ligar para um dos técnicos pré-selecionada por Dolibarr para o seu idioma, clicando em seu Widget (status e preço máximo são atualizados automaticamente):
 PossibleLanguages=Os idiomas suportados
-SubscribeToFoundation=Ajuda projeto Dolibarr, assine a fundação
 SeeOfficalSupport=Para obter suporte oficial do Dolibarr no seu idioma:  <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/pt_BR/holiday.lang b/htdocs/langs/pt_BR/holiday.lang
index 9daa4e6079d..bd18ebe9156 100644
--- a/htdocs/langs/pt_BR/holiday.lang
+++ b/htdocs/langs/pt_BR/holiday.lang
@@ -2,16 +2,15 @@
 HRM=RH
 MenuReportMonth=Relatório mensal
 MenuAddCP=Nova solicitação de licença
-NotActiveModCP=Você deve ativar o módulo Gestão de solicitações de licença para visualizar esta página.
 AddCP=Fazer uma solicitação de licença
 DateFinCP=Data de término
 ToReviewCP=Aguardando aprovação
 RefuseCP=Negado
-ListeCP=Lista de licenças
+LeaveId=Deixe ID
+UserForApprovalID=Usuário para ID de aprovação
+UserForApprovalLogin=Login do usuário de aprovação
 SendRequestCP=Criar solicitação de licença
 DelayToRequestCP=Solicitações devem ser feitas pelo menos<b> %s dias (s)</b> antes.
-MenuConfCP=Saldo de folgas
-SoldeCPUser=O saldo de folgas é de <b>%s</b> dias.
 ErrorEndDateCP=Você deve selecionar uma data final posterior à data inicial.
 ErrorSQLCreateCP=Ocorreu um erro de SQL durante a criação:
 ErrorIDFicheCP=Ocorreu um erro, a solicitação de licença não existe.
@@ -20,6 +19,8 @@ ErrorUserViewCP=Você não está autorizado a ler este pedido de licença.
 InfosWorkflowCP=Workflow da informação
 RequestByCP=Solicitada por
 TitreRequestCP=Solicitação de licença
+TypeOfLeaveCode=Tipo de licença
+TypeOfLeaveLabel=Tipo de etiqueta de licença
 NbUseDaysCP=Número de dias de folga consumidos
 DeleteCP=Excluir
 TitleDeleteCP=Excluir a solicitação de licença
@@ -61,21 +62,20 @@ EmployeeLastname=Sobrenome do empregado
 EmployeeFirstname=Nome do empregado
 TypeWasDisabledOrRemoved=A licença do tipo (id %s) foi desabilitada ou removida
 LastHolidays=Últimos pedidos de licença %s
-LastUpdateCP=Última atualização automática de fixação de licenças
-MonthOfLastMonthlyUpdate=Mês da última atualização automática de fixação de licenças
+LEAVE_SICK=Atestado médico
+LEAVE_OTHER=Outra licença
 Module27130Name=Gestão de solicitações de licença
 Module27130Desc=Gestão de solicitações de licença
 ErrorMailNotSend=Ocorreu um erro durante o envio de e-mail:
 HolidaysToValidate=Confirmar as solicitações de licença
 HolidaysToValidateBody=Segue abaixo uma solicitação de licença a confirmar
 HolidaysToValidateDelay=Este pedido de licença terá lugar dentro de um período de menos de %s dias.
-HolidaysToValidateAlertSolde=O usuário que fez esta solicitação de licença não possui dias disponíveis suficientes.
+HolidaysToValidateAlertSolde=O usuário que solicitou as férias não tem dias disponíveis
 HolidaysValidated=Solicitações de licença confirmadas
 HolidaysValidatedBody=O seu pedido de licença para %s para %s foi validado.
 HolidaysRefused=Solicitação negada
-HolidaysRefusedBody=O seu pedido de licença para %s para %s foi negado pelo seguinte motivo:
+HolidaysRefusedBody=Sua solicitação de férias de %s até %s foi negada pelas seguintes razões:
 HolidaysCanceled=Solicitação de licença cancelada
 HolidaysCanceledBody=O seu pedido de licença para %s para %s foi cancelada.
 FollowedByACounter=1: Este tipo de licença precisa ser controlado por um contador. O contador é incrementado manualmente ou automaticamente e quando uma solicitação de licença é confirmada, o contador é decrementado.<br>0: Não controlada por um contador.
 NoLeaveWithCounterDefined=Não há tipos de licença definidos que necessitem de controle por meio de um contador
-GoIntoDictionaryHolidayTypes=Vá até <strong>Início >> Configuração >> Dicionários >> Tipo de licenças</strong> para configurar os diferentes tipos de licenças.
diff --git a/htdocs/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang
index f8fa9f65cad..db4289faf16 100644
--- a/htdocs/langs/pt_BR/install.lang
+++ b/htdocs/langs/pt_BR/install.lang
@@ -5,8 +5,10 @@ ConfFileExists=O arquivo de configuração <b>conf.php</b> existe.
 ConfFileCouldBeCreated=O arquivo de configuração <b>conf.php</b> pôde ser criado.
 ConfFileIsWritable=O arquivo de configuração <b>conf.php</b> tem as permissões corretas.
 ConfFileMustBeAFileNotADir=O arquivo de configuração <b> %s </ b> deve ser um arquivo, não um diretório.
+PHPSupportIntl=Este PHP suporta funções Intl.
 PHPMemoryOK=Seu parametro PHP max session memory está definido <b>para %s.</b> Isto deve ser suficiente.
 ErrorPHPDoesNotSupportCurl=Sua instalacao do PHP nao suporta Curl.
+ErrorPHPDoesNotSupportIntl=Sua instalação do PHP não suporta funções Intl.
 ErrorDirDoesNotExists=Diretório %s não existe.
 ErrorWrongValueForParameter=Você pode ter digitado um valor incorreto para o parâmetro ' %s'.
 ErrorFailedToCreateDatabase=Erro ao criar a base de dados' %s'.
@@ -64,6 +66,7 @@ InstallChoiceRecommanded=Versao recomendada para instalação <b>%s</b> da sua v
 InstallChoiceSuggested=<b>Escolha sugerida pelo sistema de installação</b>
 IfAlreadyExistsCheckOption=Se este nome esta correto, e o banco de dados ainda não existe, voce tem que selecionar a opção "Criar banco de dados".
 OpenBaseDir=Parametro PHP openbasedir
+MigrationCustomerOrderShipping=Migrar envio para armazenamento de pedidos de vendas
 MigrationShippingDelivery=Atualizar armazenamento de expedições
 MigrationShippingDelivery2=Atualizar armazenamento de expedição 2
 ActivateModule=Ativar modulo %s
@@ -106,8 +109,10 @@ MigrationDeliveryAddress=Atualizar o endereço de entrega nos envios
 MigrationProjectUserResp=Dados da migração do campo fk_user_resp de llx_projet para llx_element_contact
 MigrationProjectTaskTime=Atualizar tempo gasto em segundos
 MigrationActioncommElement=Atualizar dados nas ações
+MigrationPaymentMode=Migração de dados para tipo de pagamento
 MigrationRemiseEntity=Atulizacao do valor da tabela llx_societe_remise
 MigrationRemiseExceptEntity=Atualizacao do valor no campo da tabela llx_societe_remise_except
 MigrationUserRightsEntity=Atualizar o valor do campo da entidade de llx_user_rights
 MigrationUserGroupRightsEntity=Atualizar o valor do campo da entidade de llx_usergroup_rights
+MigrationUserPhotoPath=Migração de caminhos de foto para usuários
 MigrationResetBlockedLog=Redefinir o módulo BlockedLog para o algoritmo v7
diff --git a/htdocs/langs/pt_BR/interventions.lang b/htdocs/langs/pt_BR/interventions.lang
index e22c9b76546..278d3168e9e 100644
--- a/htdocs/langs/pt_BR/interventions.lang
+++ b/htdocs/langs/pt_BR/interventions.lang
@@ -12,14 +12,18 @@ ConfirmValidateIntervention=Você tem certeza que deseja validar esta intervenç
 ConfirmModifyIntervention=Você tem certeza que deseja modificar esta intervenção?
 ConfirmDeleteInterventionLine=Você tem certeza que deseja excluir esta linha de intervenção?
 ConfirmCloneIntervention=Você tem certeza que deseja clonar esta intervenção?
+NameAndSignatureOfInternalContact=Nome e Assinatura do Participante:
+NameAndSignatureOfExternalContact=Nome e Assinatura do Cliente :
 InterventionClassifyBilled=Classificar "Faturado"
 InterventionClassifyUnBilled=Classificar "à faturar"
 InterventionClassifyDone=Classificar "Feito"
 StatusInterInvoiced=Faturado
 SendInterventionRef=Apresentação de intervenção %s
+SendInterventionByMail=Envio da intervenção por e-mail
 InterventionModifiedInDolibarr=Intervenção %s alterada
 InterventionClassifiedBilledInDolibarr=Intervenção %s classificada como Faturada
 InterventionClassifiedUnbilledInDolibarr=Intervenção %s definida como à faturar
+InterventionSentByEMail=Intervenção %s enviada por e-mail
 InterventionDeletedInDolibarr=Intervenção %s excluída
 InterventionsArea=Área intervenções
 DraftFichinter=Rascunho de intervenções
@@ -31,8 +35,8 @@ UseServicesDurationOnFichinter=duração de uso de serviços para intervenções
 UseDurationOnFichinter=Esconde o campo de duração para os registros de intermediações
 UseDateWithoutHourOnFichinter=Oculta horas e minutos fora do campo de data para registros de intermediação
 InterventionStatistics=Estatística de intervenções
-NbOfinterventions=Nº de cartões de intervenção
-NumberOfInterventionsByMonth=Nº de cartões de intervenção por mês (data de validação)
+NbOfinterventions=Nº. de cartões de intervenção
+NumberOfInterventionsByMonth=Nº. de cartões de intervenção por mês (data de validação)
 AmountOfInteventionNotIncludedByDefault=A quantidade de intervenção não é incluída por padrão no lucro (na maioria dos casos, as planilhas de tempo são usadas para contar o tempo gasto). Adicione a opção PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT para 1 em home-setup-other para incluí-los.
 InterId=ID de intervenção
 InterRef=Intervenção ref.
diff --git a/htdocs/langs/pt_BR/ldap.lang b/htdocs/langs/pt_BR/ldap.lang
index e7a65590bb4..4b752dc483c 100644
--- a/htdocs/langs/pt_BR/ldap.lang
+++ b/htdocs/langs/pt_BR/ldap.lang
@@ -8,6 +8,6 @@ LDAPUsers=Usuário na base de dados LDAP
 LDAPFieldFirstSubscriptionAmount=Valor da Primeira Adesão
 LDAPFieldLastSubscriptionDate=Data da última adesão
 LDAPFieldLastSubscriptionAmount=Valor da última adesão
-LDAPFieldSkypeExample=Exemplo : nomeskype
 UserSynchronized=Usuário Sincronizado
 ErrorFailedToReadLDAP=Erro na leitura do anuário LDAP. Verificar a configuração do módulo LDAP e a acessibilidade do anuário.
+PasswordOfUserInLDAP=Senha do usuário no LDAP
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index 2a5284078ee..4155fd6bbe9 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -9,37 +9,54 @@ MailTo=Destinatário(s)
 MailToUsers=Para usuário (s)
 MailCC=Copiar para
 MailToCCUsers=Copiar para o (s) usuário (s)
+MailTopic=Tópico de e-mail
 MailFile=Arquivos anexados
 NewMailing=Novo Mailing
 ResetMailing=Limpar Mailing
-TestMailing=Testar email
+TestMailing=Testar e-mail
 MailSuccessfulySent=E-mail (de %s para %s)  aceito com sucesso para entrega
 MailingSuccessfullyValidated=Emailins validado com sucesso
 MailUnsubcribe=Desenscrever
 MailingStatusNotContact=Nao contactar mais
 MailingStatusReadAndUnsubscribe=Ler e cancelar a asiinatura
-ErrorMailRecipientIsEmpty=A endereço do destinatário está vazia
-WarningNoEMailsAdded=nenhum Novo e-mail a Adicionar à lista destinatários.
+ErrorMailRecipientIsEmpty=O endereço do destinatário está vazia
+WarningNoEMailsAdded=Nenhum novo e-mail a adicionar à lista destinatários.
 ConfirmValidMailing=Você tem certeza que deseja validar esta lista de e-mails?
+ConfirmResetMailing=Atenção, ao reinicializar o e-mail <b>%s</b>, você permitirá o reenvio deste e-mail em uma correspondência em massa. Você tem certeza de que quer fazer isso?
+NbOfUniqueEMails=N°. de e-mails exclusivos
+NbOfEMails=N°. de E-mails
 TotalNbOfDistinctRecipients=Número de destinatários únicos
 NoTargetYet=Nenhum destinatário definido
+NoRecipientEmail=Nenhum e-mail de destinatário para %s
 RemoveRecipient=Eliminar destinatário
 YouCanAddYourOwnPredefindedListHere=Para Criar o seu módulo de seleção e-mails, tem que ir a htdocs/core/modules/mailings/README.
 MailingAddFile=Adicionar este Arquivo
 NoAttachedFiles=Sem arquivos anexos
+BadEMail=Valor inválido para o e-mail
 ConfirmCloneEMailing=Você tem certeza que deseja clonar esta lista de e-mails?
 CloneContent=Clonar mensagem
 CloneReceivers=Clonar recebidores
 DateSending=Data envio
+YourMailUnsubcribeOK=O e-mail <b>%s</b> está desinscrito corretamente da lista de discussão
 ActivateCheckReadKey=Chave usada para criptografar URL usada para o recurso "Recibo de leitura" e "Cancelar inscrição"
+EMailSentToNRecipients=E-mail enviado para destinatários %s.
+EMailSentForNElements=E-mail enviado para os elementos %s.
 XTargetsAdded=<b>%s </b> destinatários adicionados à lista de destino
+OnlyPDFattachmentSupported=Se os documentos PDF já foram gerados para os objetos enviarem, eles serão anexados ao e-mail. Caso contrário, nenhum e-mail será enviado (note também que apenas documentos PDF são suportados como anexos no envio em massa nesta versão).
+OneEmailPerRecipient=Um e-mail por destinatário (por padrão, um e-mail por registro selecionado)
+ResultOfMailSending=Resultado do envio massivo de e-mails
+NbSelected=N°. selecionados
+NbIgnored=N°. de ignorados
+NbSent=N°. de enviados
+MailingModuleDescContactsByCompanyCategory=Contatos por categoria de terceiros
 LineInFile=Linha %s em arquivo
 RecipientSelectionModules=Módulos de seleção dos destinatários
 MailSelectedRecipients=Destinatários selecionados
 TargetsStatistics=Estatísticas destinatários
 NbOfCompaniesContacts=Contatos únicos de empresas
 MailNoChangePossible=Destinatários de um mailing validado não modificaveis
-MailingNeedCommand2=Pode enviar em linha adicionando o parâmetro MAILING_LIMIT_SENDBYWEB com um valor número que indica o máximo n� de e-mails enviados por Sessão.
+MailingNeedCommand=O envio de um e-mail pode ser executado a partir da linha de comando. Peça ao administrador do servidor para iniciar o seguinte comando para enviar o e-mail para todos os destinatários:
+MailingNeedCommand2=Pode enviar em linha adicionando o parâmetro MAILING_LIMIT_SENDBYWEB com um valor número que indica o número máximo de e-mails enviados por Sessão.
 LimitSendingEmailing=Observação: Envios de mailings em massa da interface web são feitas em varias vezes por causa de segurança e tempo limite, <b>%s</b> destinatarios por sessão de envio.
 ToClearAllRecipientsClickHere=Para limpar a lista dos destinatários deste mailing, faça click ao botão
 ToAddRecipientsChooseHere=Para Adicionar destinatários, escoja os que figuran em listas a continuação
@@ -49,18 +66,24 @@ DeliveryReceipt=Entrega Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Pode usar o caracter0 de separação <b>coma </b> para especificar multiplos destinatários.
 TagCheckMail=Seguir quando o e-mail sera lido
 TagUnsubscribe=Atalho para se desenscrever
+EMailRecipient=E-mail do destinatário
+TagMailtoEmail=E-mail do destinatário (incluindo o link "mailto:" em html)
 NoEmailSentBadSenderOrRecipientEmail=Nenhum e-mail enviado. Bad remetente ou destinatário de e-mail. Verifique perfil de usuário.
-AddNewNotification=Ativar um novo alvo / evento de notificação por email
+AddNewNotification=Ativar um novo alvo / evento de notificação por e-mail
+ListOfActiveNotifications=Listar todos os destinos/eventos ativos para notificação por e-mail
 ListOfNotificationsDone=Listar todas as notificações de e-mail enviadas
 MailSendSetupIs=Configuração do envio de e-mails foi configurado a '%s'. Este modo não pode ser usado para envios de massa de e-mails.
-MailSendSetupIs2=Voçê precisa primeiramente acessar com uma conta de Administrador o menu %sInicio - Configurações - EMails%s para mudar o parametro <strong>'%s'</strong> para usar o modo '%s'. Neste modo voçê pode entrar a configuração do servidor SMTP fornecido pelo seu Provedor de Acesso a Internet e usar a funcionalidade de envios de massa de EMails.
+MailSendSetupIs2=Voçê precisa primeiramente acessar com uma conta de Administrador o menu %sInicio - Configurações - E-mails%s para mudar o parâmetro <strong>'%s'</strong> para usar o modo '%s'. Neste modo você pode entrar a configuração do servidor SMTP fornecido pelo seu Provedor de Acesso a Internet e usar a funcionalidade de envios de massa de e-mails.
 MailSendSetupIs3=Se tiver perguntas sobre como configurar o seu servidor SMTP voçê pode perguntar %s.
-YouCanAlsoUseSupervisorKeyword=Você também pode adicionar a palavra-chave <strong>__SUPERVISOREMAIL__</strong> ter e-mail que está sendo enviado ao supervisor do usuário (só funciona se um email é definido para este supervisor)
+YouCanAlsoUseSupervisorKeyword=Você também pode adicionar a palavra-chave <strong>__SUPERVISOREMAIL__</strong> ter e-mail que está sendo enviado ao supervisor do usuário (só funciona se um e-mail é definido para este supervisor)
 NbOfTargetedContacts=Número atual de e-mails de contatos direcionados
+UseFormatFileEmailToTarget=O arquivo importado deve ter formato <strong>email; nome; nome; outro</strong>
+UseFormatInputEmailToTarget=Digite uma string com o formato <strong>email; nome; nome; outro</strong>
 AdvTgtSearchIntHelp=Use o intervalo para selecionar o valor int ou flutuante
 AdvTgtSearchDtHelp=Use o intervalo para selecionar o valor da data
 AdvTgtStartDt=Data in.
 AdvTgtEndDt=Data fn.
+AdvTgtTypeOfIncudeHelp=E-mail de destino de terceiros e e-mail de contato do terceiro ou apenas e-mail de terceiros ou apenas entre em contato com o e-mail
 AdvTgtTypeOfIncude=Tipo de e-mail do destino
 AdvTgtContactHelp=Usar apenas de você colocou o contato no "Tipo de e-mail de destino"
 ItemsCount=Item(ns)
@@ -69,3 +92,8 @@ AdvTgtDeleteFilter=Excluir filtro
 AdvTgtSaveFilter=Salvar filtro
 NoContactWithCategoryFound=Nenhum foi encontrado nenhum contato/endereço com uma categoria
 NoContactLinkedToThirdpartieWithCategoryFound=Nenhum foi encontrado nenhum contato/endereço com uma categoria
+OutGoingEmailSetup=Configuração de e-mail de saída
+InGoingEmailSetup=Configuração de e-mail de entrada
+OutGoingEmailSetupForEmailing=Configuração de e-mail de saída (para envio em massa)
+DefaultOutgoingEmailSetup=Configuração de e-mail de saída padrão
+ContactsWithThirdpartyFilter=Contatos com filtro de terceiros
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index 03c28501c88..761e3b323af 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -41,10 +41,13 @@ ErrorWrongValue=Valor incorreto
 ErrorWrongValueForParameterX=Valor incorreto para o parâmetro %s
 ErrorServiceUnavailableTryLater=Serviço não disponível no momento. Tente mais tarde.
 ErrorSomeErrorWereFoundRollbackIsDone=Alguns erros foram encontrados. As alterações foram revertidas.
+ErrorConfigParameterNotDefined=Parametro <b>%s</b> nao está definidio no arquivo config <b>conf.php</b> do Dolibarr.
 ErrorCantLoadUserFromDolibarrDatabase=Impossível encontrar o usuário <b>%s</b> na base de dados do Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de ICMS definido para o país '%s'.
 ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de imposto social / fiscal definidos para o país '%s'.
 ErrorFailedToSaveFile=Erro, o registo do arquivo falhou.
+ErrorCannotAddThisParentWarehouse=Voce está tentando adicionar um armazém pai, o qual ja é um filho do armazém existente
+MaxNbOfRecordPerPage=Número máx de registros por página
 NotAuthorized=Você não está autorizado a fazer isso.
 SelectDate=Selecionar uma data
 SeeAlso=Ver tambem %s
@@ -58,16 +61,19 @@ FileUploaded=O arquivo foi carregado com sucesso
 FileTransferComplete=Arquivo (s) carregado (s) com sucesso
 FilesDeleted=Arquivo (s) removido (s) com sucesso
 FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique no "Anexar arquivo" para proceder.
-NbOfEntries=Número de entradas
+NbOfEntries=N°. de entradas
 GoToWikiHelpPage=Ler a ajuda online (necessário acesso a Internet)
 GoToHelpPage=Consulte a ajuda (pode necessitar de acesso à internet)
 RecordDeleted=Registro apagado
+RecordGenerated=istro criado
 LevelOfFeature=Nível de funções
 DolibarrInHttpAuthenticationSoPasswordUseless=Modo de autenticação do Dolibarr está definido como <b>%s</b> no arquivo de configuração<b>conf.php</b>.<br>Isso significa que o banco de dados das senhas é externo ao Dolibarr, assim mudar este campo, pode não ter efeito.
 PasswordForgotten=Esqueceu a senha?
 NoAccount=Sem conta?
 SeeAbove=Mencionar anteriormente
 HomeArea=Inicio
+LastConnexion=Último login
+PreviousConnexion=Login anterior
 ConnectedOnMultiCompany=Conectado no ambiente
 AuthenticationMode=Modo de Autenticação
 RequestedUrl=URL solicitada
@@ -79,6 +85,7 @@ YouCanSetOptionDolibarrMainProdToZero=Você pode ler o arquivo de log ou definir
 InformationToHelpDiagnose=Esta informação pode ser útil para fins de diagnóstico (você pode definir a opção $ dolibarr_main_prod para '1' para remover esses avisos)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr está configurado para limitar a precisão dos preços unitários a <b>%s</b> Decimais.
 NoFilter=Nenhum filtro
+WarningYouHaveAtLeastOneTaskLate=Atenção. Voce tem no mínimo um elemento que excedeu o tempo de tolerancia
 no=não
 Home=Inicio
 OnlineHelp=Ajuda online
@@ -104,12 +111,14 @@ ToValidate=A Confirmar
 SaveAs=Guardar como
 TestConnection=Teste a login
 ToClone=Cópiar
+ConfirmClone=Escolha o dado que voce quer clonar
 NoCloneOptionsSpecified=Não existem dados definidos para copiar
 Go=Ir
 Run=Attivo
 Show=Ver
 Hide=ocultar
 ShowCardHere=Mostrar cartão
+Upload=Carregar
 Resize=Modificar tamanho
 ResizeOrCrop=Redimensionar ou cortar
 Recenter=Recolocar no centro
@@ -118,11 +127,14 @@ Users=Usuário
 NoUserGroupDefined=Nenhum grupo definido pelo usuário
 PasswordRetype=Repetir Senha
 NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo
+NameSlashCompany=Nome / Companhia
 PersonalValue=Valor Personalizado
 CurrentValue=Valor atual
 MultiLanguage=Multi Idioma
 RefOrLabel=Ref. da etiqueta
 DescriptionOfLine=Descrição da Linha
+DateOfLine=Data da linha
+DurationOfLine=Duração da linha
 Model=Template doc
 DefaultModel=Modelo de documento padrão
 Action=Ação
@@ -168,6 +180,8 @@ Default=Padrao
 DefaultValue=Valor por default
 DefaultValues=Valores / filtros / classificação padrão
 UnitPrice=Preço Unit.
+UnitPriceHT=Preço Unit. (liq.)
+UnitPriceHTCurrency=Preço unitário (sem) (Moeda)
 UnitPriceTTC=Preço Unit. Total
 PriceU=Preço Unit.
 PriceUHT=Preço Unit.
@@ -177,11 +191,14 @@ Amount=Valor
 AmountInvoice=Valor Fatura
 AmountInvoiced=Valor faturado
 AmountPayment=Valor Pagamento
+AmountHTShort=Quantidade (liq.)
 AmountTTCShort=Valor (incl. taxas)
+AmountHT=Valor (sem impostos)
 AmountTTC=Valor
 AmountVAT=Valor ICMS
 MulticurrencyAlreadyPaid=Já paga, moeda original
 MulticurrencyRemainderToPay=Permanecer para pagar, moeda original
+MulticurrencyAmountHT=Valor (sem impostos) moeda original
 MulticurrencyAmountTTC=Quantia (com as taxas), na moeda original
 MulticurrencyAmountVAT=Valor das taxas, na moeda original
 AmountLT1=Valor taxa 2
@@ -190,13 +207,21 @@ AmountLT1ES=Valor RE
 AmountLT2ES=Valor IRPF
 AmountTotal=Valor Total
 AmountAverage=Valor médio
+PriceQtyMinHT=Quantidade de preço min. (sem imposto)
+PriceQtyMinHTCurrency=Quantidade de preço min. (sem imposto) (moeda)
+TotalHTShort=Total (liq.)
+TotalHT100Short=Total 100%% (liq.)
+TotalHTShortCurrency=Total (excluindo em moeda)
 TotalTTCShort=Total (incl. taxas)
+TotalHT=Total (sem imposto)
+TotalHTforthispage=Total (sem imposto) para esta página
 TotalTTC=Total
 TotalTTCToYourCredit=Total a crédito
 TotalVAT=Total do ICMS
 TotalVATIN=IGST total
 TotalLT1=Total taxa 2
 TotalLT2=Total taxa 3
+HT=Sem imposto
 TTC=ICMS Incluido
 INCVATONLY=Com ICMS
 INCT=Inc. todos os impostos
@@ -205,6 +230,7 @@ VATs=Impostos sobre vendas
 VATINs=Impostos IGST
 LT1Type=Tipo de imposto sobre vendas 2
 LT2Type=Tipo de imposto sobre vendas 3
+LT1GC=Centavos adicionais
 VATRate=Taxa ICMS
 VATCode=Codigo do ICMS
 VATNPR=Valor taxa NPR
@@ -228,6 +254,8 @@ Accountant=Contador
 ContactsForCompany=Contatos desta empresa
 ContactsAddressesForCompany=Contatos/Endereços do Cliente ou Fornecedor
 AddressesForCompany=Endereços para este terceiro
+ActionsOnCompany=Eventos para o terceiro
+ActionsOnContact=Eventos para este contato/Endereço
 ActionsOnMember=Eventos deste membro
 ActionsOnProduct=Eventos deste produto
 ToDo=Para fazer
@@ -236,6 +264,7 @@ FilterOnInto=Critério da pesquisa  '<strong>%s</strong>' nos campos %s
 RemoveFilter=Eliminar filtro
 GeneratedOn=Gerado a %s
 DolibarrStateBoard=Estatísticas do banco de dados
+DolibarrWorkBoard=Itens abertos
 Available=Disponivel
 NotYetAvailable=Ainda não disponível
 NotAvailable=Não disponível
@@ -244,12 +273,14 @@ Category=Tag / categoria
 to=para
 OtherInformations=Outra informação
 ApprovedBy2=Aprovado pelo (segunda aprovação)
+ClosedAll=Fechados(Todos)
 ByUsers=Pelo usuário
+LateDesc=Um item é definido como atrasado de acordo com a configuração do sistema no menu Início - Configuração - Alertas.
 NoItemLate=Nenhum item atrasado
 DeletePicture=Apagar foto
 ConfirmDeletePicture=Confirmar eliminação de fotografias
-LoginEmail=Usuario (email)
-LoginOrEmail=Usuraio ou Email
+LoginEmail=Usuario (e-mail)
+LoginOrEmail=Usuraio ou E-mail
 CurrentLogin=Login atual
 EnterLoginDetail=Digite os detalhes do login
 MonthShort02=Fev
@@ -276,8 +307,10 @@ CustomerPreview=Historico Cliente
 SupplierPreview=Visualização do fornecedor
 ShowCustomerPreview=Ver Historico Cliente
 SeeAll=Ver tudo
+SendByMail=Envio por e-mail
 MailSentBy=Mail enviado por
 Email=E-mail
+AlreadyRead=Já lido
 NoMobilePhone=Sem celular
 Refresh=Atualizar
 BackToList=Mostar Lista
@@ -286,6 +319,9 @@ CanBeModifiedIfKo=Pode modificarse senão é valido
 ValueIsValid=Valor é válido
 ValueIsNotValid=Valor inválido
 RecordCreatedSuccessfully=Registro criado com sucesso
+RecordsModified=%sregistros modificados
+RecordsDeleted=%sregistros deletados
+RecordsGenerated=%sregistros gerados
 FeatureDisabled=Função Desativada
 MoveBox=Widget de movimento
 NotEnoughPermissions=Não tem permissões para esta ação
@@ -298,17 +334,21 @@ UploadDisabled=Carregamento Desativada
 ThisLimitIsDefinedInSetup=Límite Dolibarr (menu inicio-configuração-segurança): %s Kb, PHP limit: %s Kb
 CurrentTheme=Tema atual
 CurrentMenuManager=Administração do menu atual
+Browser=Navegador
 Screen=Tela
 DisabledModules=Módulos desativados
 HidePassword=Mostrar comando com senha oculta
 UnHidePassword=Mostrar comando real com a senha visivel
 AddFile=Adicionar arquivo
 FreeZone=Não é um produto / serviço predefinido
+FreeLineOfType=Item de texto livre, digite:
 CloneMainAttributes=Clonar o objeto com estes atributos
+ReGeneratePDF=Re-gerar PDF
 PDFMerge=Fusão de PDF
 Merge=Fusão
 PrintContentArea=Mostrar pagina a se imprimir na area principal
 MenuManager=Administração do menu
+WarningYouAreInMaintenanceMode=Aviso, voce está em modo manutenção> Só login <b>%s</b> é permitido usar a app neste modo.
 CoreErrorMessage=Desculpe, ocorreu um erro. Entre em contato com o administrador do sistema para verificar os registros ou desative $ dolibarr_main_prod = 1 para obter mais informações.
 CreditCard=Cartão de credito
 CreditOrDebitCard=Cartao de credito ou debito
@@ -333,6 +373,9 @@ LinkToProposal=Link para a proposta
 LinkToOrder=Linque para o pedido
 LinkToInvoice=Link para a fatura
 LinkToTemplateInvoice=Link para fatura modelo
+LinkToSupplierOrder=Link para Ordem de compra
+LinkToSupplierProposal=Link para a proposta do fornecedor
+LinkToSupplierInvoice=Link para a fatura do fornecedor
 LinkToContract=Link para o Contrato
 LinkToIntervention=Link para a Intervensão
 SetToDraft=Voltar para modo rascunho
@@ -383,6 +426,8 @@ TooManyRecordForMassAction=Registros demais selecionados para ação em massa. A
 NoRecordSelected=Nenhum registro selecionado
 MassFilesArea=Área para os arquivos gerados pelas ações em massa
 ShowTempMassFilesArea=Exibir área dos arquivos gerados pelas ações em massa
+ConfirmMassDeletion=Confirmação exclusão em massa
+ConfirmMassDeletionQuestion=Tem certeza que voce quer excluir %s registros selecionados
 RelatedObjects=Objetos Relacionados
 ClassifyBilled=Classificar Faturado
 ClassifyUnbilled=Classificar nao faturado
@@ -402,8 +447,9 @@ Download=Baixar
 DownloadDocument=Descarregar documento
 ActualizeCurrency=Atualizar taxa de câmbio
 Fiscalyear=Ano fiscal
-ModuleBuilder=Construtor de Módulos
+ModuleBuilder=Módulo e Application Builder
 ClickToShowHelp=Clique para mostrar ajuda de ajuda
+WebSiteAccounts=Conta do website
 TitleSetToDraft=Volte para o rascunho
 ConfirmSetToDraft=Tem certeza de que deseja voltar ao status de rascunho?
 EMailTemplates=Modelos de e-mail
@@ -415,11 +461,11 @@ Leads=Conduz
 ListOpenLeads=Listar leads abertos
 ListOpenProjects=Listar projetos abertos
 NewLeadOrProject=Novo lead ou projeto
-LineNb=Linha não.
+LineNb=Sem Linha.
 TabLetteringCustomer=Rotulação do cliente
+TabLetteringSupplier=Rotulação de fornecedor
 Saturday=Sabado
 SaturdayMin=Sab
-SelectMailModel=Selecione um modelo de email
 SetRef=Escolher referência
 Select2ResultFoundUseArrows=Alguns resultados encontrados. Use as setas para selecionar.
 Select2Enter=Forneça
@@ -428,10 +474,12 @@ Select2LoadingMoreResults=Carregando mais resultados...
 Select2SearchInProgress=Busca em andamento...
 SearchIntoContacts=Contatos
 SearchIntoUsers=Usuários
+SearchIntoCustomerOrders=Pedido de Venda
 SearchIntoCustomerProposals=Propostas de cliente
 SearchIntoSupplierProposals=Propostas de fornecedores
 SearchIntoContracts=Contratos
 SearchIntoCustomerShipments=Remessas do cliente
+SearchIntoTickets=Tíquetes
 CommentLink=Comentarios
 CommentPage=Espaço para comentarios
 CommentDeleted=Comentário deletado
@@ -445,3 +493,7 @@ ConfirmMassDraftDeletion=Confirmação de exclusão de massa de esboço
 FileSharedViaALink=Arquivo compartilhado via um link
 SelectAThirdPartyFirst=Selecione um terceiro primeiro ...
 YouAreCurrentlyInSandboxMode=No momento você está no %s modo "caixa de areia"
+AnalyticCode=Código analitico
+ShowMoreInfos=Mostrar mais informações
+NoFilesUploadedYet=Por favor, carregue um doc. primeiro
+SeePrivateNote=Veja avisos privados
diff --git a/htdocs/langs/pt_BR/margins.lang b/htdocs/langs/pt_BR/margins.lang
index 5c78d471f7c..fb4039fb535 100644
--- a/htdocs/langs/pt_BR/margins.lang
+++ b/htdocs/langs/pt_BR/margins.lang
@@ -17,6 +17,7 @@ MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define se um desconto global e tratado como
 MARGIN_TYPE=Compra / Preço de custo sugerido por padrão para cálculo da margem de
 MargeType2=Margem sobre o Preço Médio Ponderado (PMP)
 MargeType3=Margem sobre o preço de custo
+MarginTypeDesc=*Margem sobre o melhor preço de compra = Preço de venda - Melhor preço de fornecedor definido no cartão do produto <br> *Margem no Preço Médio Ponderado (WAP) = Preço de Venda - Preço Médio Ponderado pelo Produto (WAP) ou melhor preço de fornecedor se o WAP ainda não estiver definido <br> *Margem no preço de custo = preço de venda - preço de custo definido no cartão do produto ou WAP se o preço de custo não estiver definido ou o melhor preço do fornecedor se o WAP ainda não estiver definido
 AgentContactType=Tipo contato do agente comercial
 AgentContactTypeDetails=Defina o tipo de contato (conectado coma as faturas) sera usado para o relatorio de margem dos representantes
 rateMustBeNumeric=Rata deve ser um valor numerico
diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang
index 783902b7405..cc31b4ccb7e 100644
--- a/htdocs/langs/pt_BR/members.lang
+++ b/htdocs/langs/pt_BR/members.lang
@@ -5,7 +5,7 @@ SubscriptionCard=Ficha de filiação
 Member=Associado
 ShowMember=Exibir ficha do associado
 UserNotLinkedToMember=Usuário não vinculado a um associado
-ThirdpartyNotLinkedToMember=Fornecedores não ligados a um membro
+ThirdpartyNotLinkedToMember=Terceiros não vinculados a um membro
 MembersTickets=Etiquetas de associado
 FundationMembers=Membros da fundação
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro  já está vinculado a um terceiro. Remover este link em primeiro lugar porque um terceiro não pode ser ligado a apenas um membro (e vice-versa).
@@ -25,6 +25,7 @@ SubscriptionId=Id adesão
 MemberId=Id adesão
 MemberStatusDraft=Minuta (requer confirmação)
 MemberStatusDraftShort=Minuta
+MemberStatusActiveLate=Assinatura expirada
 MemberStatusActiveLateShort=Vencido
 MemberStatusPaid=Assinatura em dia
 MemberStatusPaidShort=Até à data
@@ -38,8 +39,9 @@ Subscriptions=Filiações
 SubscriptionLate=Atraso
 SubscriptionNotReceived=filiação não recibida
 ListOfSubscriptions=Lista de Filiações
-SendCardByMail=Enviar ficha por E-mail
+SendCardByMail=Enviar cartão por e-mail
 NoTypeDefinedGoToSetup=nenhum tipo de membro definido. ir a configuração -> Tipos de Membros
+WelcomeEMail=Bem-vindo e-mail
 DeleteType=Excluir
 Physical=Físico
 MorPhy=Moral/Físico
@@ -50,14 +52,28 @@ ConfirmDeleteMember=Você tem certeza que deseja excluir este membro (a exclusã
 ConfirmDeleteSubscription=Você tem certeza que deseja excluir esta assinatura?
 Filehtpasswd=Arquivo htpasswd
 ConfirmValidateMember=Você tem certeza que deseja validar este membro?
-FollowingLinksArePublic=os vínculos seguintes são páginas acessiveis a todos e não protegidas por Nenhuma habilitação Dolibarr.
 PublicMemberList=Lista público de Membros
 ExportDataset_member_1=Membros e Filiações
 LastMembersModified=Últimos %s membros modificados
 PublicMemberCard=Ficha pública membro
 SubscriptionNotRecorded=Subscrição não registrada
 AddSubscription=Criar subscripção
+SendingAnEMailToMember=Envio de e-mail informativo para o membro
+SendingEmailOnAutoSubscription=Envio de e-mail no registro automático
+SendingEmailOnMemberValidation=Enviando e-mail na validação de novo membro
+SendingEmailOnNewSubscription=Enviando e-mail na nova assinatura
+SendingEmailOnCancelation=Envio de e-mail no cancelamento
 CardContent=Conteúdo da sua ficha de membro
+ThisIsContentOfSubscriptionReminderEmail=Gostaríamos de informar que sua assinatura está prestes a expirar ou já expirou (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Esperamos que você renove. <br><br>
+ThisIsContentOfYourCard=Este é um resumo das informações que temos sobre você. Por favor, entre em contato conosco se alguma coisa estiver incorreta. <br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Assunto do e-mail de notificação recebido em caso de inscrição automática de um convidado
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Conteúdo do e-mail de notificação recebido em caso de inscrição automática de um convidado
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Modelo de e-mail a ser usado para enviar e-mail para um membro da auto-subscrição de membro
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Modelo de e-mail a ser usado para enviar e-mail para um membro na validação de membro
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modelo de e-mail a ser usado para enviar e-mail para um membro em uma nova gravação de assinatura
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modelo de e-mail a ser usado para enviar um lembrete por e-mail quando a assinatura estiver prestes a expirar
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Modelo de e-mail a ser usado para enviar e-mail para um membro no cancelamento de membro
+DescADHERENT_MAIL_FROM=E-mail do remetente para e-mails automáticos
 DescADHERENT_ETIQUETTE_TEXT=Texto impresso em folhas de endereço de membros
 DescADHERENT_CARD_TYPE=Formato da página fichas
 DescADHERENT_CARD_HEADER_TEXT=Texto a imprimir na parte superior do cartão de membro
@@ -73,8 +89,8 @@ LinkToGeneratedPages=Gerar cartões de visitas
 LinkToGeneratedPagesDesc=Esta tela permite gerar arquivos PDF com cartões de visita para todos os seus membros ou um membro particular.
 DocForAllMembersCards=Gerar cartões de visita para todos os membros
 DocForLabels=Gerar folhas de endereço
-LastSubscriptionDate=Data da última adesão
-LastSubscriptionAmount=Valor da última adesão
+LastSubscriptionDate=Data do último pagamento da subscrição
+LastSubscriptionAmount=Quantidade da última assinatura
 MembersStatisticsByTown=Membros estatísticas por cidade
 MembersStatisticsByRegion=Membros por região estatísticas
 NoValidatedMemberYet=Nenhum membro validados encontrado
@@ -95,5 +111,8 @@ MEMBER_NEWFORM_PAYONLINE=Ir na página de pagamento online integrado
 MembersByNature=Esta tela mostrará estatísticas por natureza de usuários.
 MembersByRegion=Esta tela mostrará estatísticas sobre usuários por região.
 VATToUseForSubscriptions=Taxa de VAT para utilizar as assinaturas
-NoVatOnSubscription=Não TVA para assinaturas
+NoVatOnSubscription=Nenhum IVA para assinaturas
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produto utilizado para a linha de assinatura em nota fiscal: %s
+NoEmailSentToMember=Nenhum e-mail enviado para o membro
+MembershipPaid=Filiação paga pelo período atual (até %s)
+YouMayFindYourInvoiceInThisEmail=Você pode encontrar sua fatura anexada a este e-mail
diff --git a/htdocs/langs/pt_BR/modulebuilder.lang b/htdocs/langs/pt_BR/modulebuilder.lang
index 7941b142c31..f740c57c3ec 100644
--- a/htdocs/langs/pt_BR/modulebuilder.lang
+++ b/htdocs/langs/pt_BR/modulebuilder.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - modulebuilder
+ModuleBuilderDesc=Esta ferramenta deve ser usada apenas por usuários experientes ou desenvolvedores. Ele fornece utilitários para construir ou editar seu próprio módulo. A documentação para o <a href="%s" target="_blank">desenvolvimento manual alternativo está aqui </a> .
 EnterNameOfModuleDesc=Digite o nome do módulo / aplicativo para criar sem espaços. Use letras maiúsculas para separar palavras (por exemplo: MyModule, EcommerceForShop, SyncWithMySystem ...)
+ModuleBuilderDesc2=Caminho onde os módulos são gerados/editados (primeiro diretório para módulos externos definidos em %s): <strong>%s</strong>
 ModuleBuilderDesc3=Módulos gerados / editáveis ​​encontrados: <strong> %s </ strong>
 ModuleBuilderDescmenus=Esta guia é dedicada a definir as entradas do menu fornecidas pelo seu módulo.
 ModuleBuilderDescpermissions=Essa guia é dedicada para definir as novas permissões que você deseja fornecer com seu módulo.
@@ -7,14 +9,38 @@ ModuleBuilderDesctriggers=Esta é a visão dos gatilhos fornecidos pelo seu mód
 ModuleBuilderDeschooks=Esta aba é dedicada aos ganchos.
 ModuleBuilderDescwidgets=Esta aba é dedicada a gerenciar / construir widgets.
 ModuleBuilderDescbuildpackage=Você pode gerar aqui um arquivo de pacote "pronto para distribuir" (um arquivo .zip normalizado) do seu módulo e um arquivo de documentação "pronto para distribuir". Basta clicar no botão para criar o pacote ou arquivo de documentação.
+EnterNameOfModuleToDeleteDesc=Você pode excluir seu módulo. AVISO: Todos os arquivos de codificação do módulo (gerados ou criados manualmente) e dados estruturados e documentação serão apagados!
+EnterNameOfObjectToDeleteDesc=Você pode excluir um objeto. AVISO: Todos os arquivos de codificação (gerados ou criados manualmente) relacionados ao objeto serão excluídos!
 BuildDocumentation=Documentação de compilação
-ModuleIsLive=Este módulo foi ativado. Qualquer alteração pode interromper um recurso ativo atual.
+ModuleIsLive=Este módulo foi ativado. Qualquer alteração pode interromper um recurso atual ao vivo.
 DescriptionLong=Longa descrição
 DescriptorFile=Arquivo descritor do módulo
 ApiClassFile=Arquivo para classe API do PHP
 PageForList=Página PHP para lista de registro
 PageForCreateEditView=Página PHP para criar / editar / visualizar um registro
 PathToModulePackage=Caminho para o zip do pacote de módulo / aplicativo
+PathToModuleDocumentation=Caminho para o arquivo da documentação do módulo/aplicativo (%s)
 FileNotYetGenerated=Arquivo ainda não gerado
+RegenerateClassAndSql=Forçar atualização de arquivos .class e .sql
+SpecificationFile=Arquivo de documentação
+ObjectProperties=Propriedades do Objeto
 DatabaseIndex=Índice do banco de dados
+PageForLib=Arquivo para biblioteca PHP
+PageForObjLib=Arquivo para biblioteca PHP dedicada ao objeto
+VisibleDesc=O campo está visível? (Exemplos: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view (não na lista), 4 = Visível na lista e apenas um formulário de update/view (não criar). Usando um valor negativo significa que o campo não é mostrado por padrão na lista, mas pode ser selecionado para visualização). Pode ser uma expressão, por exemplo: preg_match ('/public /', $_SERVER ['PHP_SELF'])?0: 1
+MenusDefDesc=Defina aqui os menus fornecidos pelo seu módulo
+PermissionsDefDesc=Defina aqui as novas permissões fornecidas pelo seu módulo
+MenusDefDescTooltip=Os menus fornecidos pelo seu módulo/aplicativo são definidos nos <strong>menus $this-></strong> do array no arquivo descritor do módulo. Você pode editar manualmente este arquivo ou usar o editor incorporado. <br><br> Nota: Uma vez definido (e módulo reativado), os menus também são visíveis no editor de menu disponível para usuários administradores em %s.
+PermissionsDefDescTooltip=As permissões fornecidas pelo seu módulo/aplicativo são definidas no array <strong>$this-> rights</strong> no arquivo descritor do módulo. Você pode editar manualmente este arquivo ou usar o editor incorporado. <br><br> Nota: Uma vez definida (e módulo reativado), as permissões são visíveis na configuração de permissões padrão %s.
 AddLanguageFile=Adicionar arquivo de idioma
+ContentCantBeEmpty=O conteúdo do arquivo não pode estar vazio
+WidgetDesc=Você pode gerar e editar aqui os widgets que serão incorporados ao seu módulo.
+CLIDesc=Você pode gerar aqui alguns scripts de linha de comando que você deseja fornecer com seu módulo.
+CLIFile=Arquivo CLI
+NoCLIFile=Nenhum arquivo CLI
+UseSpecificEditorName =Use um nome de editor específico
+UseSpecificEditorURL =Use um URL de editor específico
+UseSpecificFamily =Use uma família específica
+UseSpecificAuthor =Use um autor específico
+UseSpecificVersion =Use uma versão inicial específica
+ModuleMustBeEnabled=O módulo/aplicativo deve ser ativado primeiro
diff --git a/htdocs/langs/pt_BR/multicurrency.lang b/htdocs/langs/pt_BR/multicurrency.lang
index de85eb11dc4..b5dc54f3023 100644
--- a/htdocs/langs/pt_BR/multicurrency.lang
+++ b/htdocs/langs/pt_BR/multicurrency.lang
@@ -4,9 +4,10 @@ ErrorDeleteCurrencyFail=Erro ao excluir falha
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use a data do documento para encontrar a taxa de câmbio, em vez de usar a taxa conhecida mais recente
 multicurrency_useOriginTx=Quando um objeto é criado a partir de outro, mantenha a taxa original do objeto de origem (caso contrário, use a taxa conhecida mais recente)
 CurrencyLayerAccount=API CurrencyLayer
-CurrencyLayerAccount_help_to_synchronize=Você deve criar uma conta em seu site para usar essa funcionalidade. <br> Obtenha sua <b> chave de API </ b>. <br> Se você usa uma conta gratuita, não é possível alterar a <b> origem da moeda </ b> (USD por padrão). <br> Se sua moeda principal não for USD, você pode usar a <b> fonte de moeda alternativa </ b> para forçar sua moeda principal. <br> <br> Você está limitado a 1000 sincronizações por mês.
+CurrencyLayerAccount_help_to_synchronize=Você deve criar uma conta no site %s para usar essa funcionalidade. <br> Obtenha sua <b>chave de API</b>. <br> Se você usar uma conta gratuita, não poderá alterar a <b>moeda de origem</b> (USD por padrão). <br> Se sua moeda principal não for USD, o aplicativo irá recalcular automaticamente. <br><br> Você está limitado a 1000 sincronizações por mês.
 multicurrency_appId=Chave API
-multicurrency_appCurrencySource=Moeda corrente
+multicurrency_appCurrencySource=Moeda de origem
+multicurrency_alternateCurrencySource=Moeda de origem alternativa
 CurrenciesUsed=Moedas utilizadas
 CurrenciesUsed_help_to_add=Adicione as diferentes moedas e taxas que você precisa usar nas suas <b> propostas </ b>, <b> ordens </ b> etc.
 MulticurrencyReceived=Moeda original recebida
diff --git a/htdocs/langs/pt_BR/oauth.lang b/htdocs/langs/pt_BR/oauth.lang
index 073c5e06cf9..e91d8d1d365 100644
--- a/htdocs/langs/pt_BR/oauth.lang
+++ b/htdocs/langs/pt_BR/oauth.lang
@@ -1,7 +1,8 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=Configuração Oauth
+ConfigOAuth=Configuração do OAuth
+OAuthServices=Serviços OAuth
 ManualTokenGeneration=Geração manual do token
-TokenManager=Gerenciador de Token
+TokenManager=Gerenciador de tokens
 IsTokenGenerated=O token está gerado?
 NoAccessToken=Nenhum token de acesso guardado na base de dados local
 HasAccessToken=Um token foi gerado e salvo no banco de dados local
@@ -10,18 +11,16 @@ ToCheckDeleteTokenOnProvider=Clique aqui para verificar/apagar autorização sal
 TokenDeleted=Token excluído
 RequestAccess=Clique aqui para solicitar/renovar o acesso e receber um novo token para salvar
 DeleteAccess=Clique aqui para apagar o token
-UseTheFollowingUrlAsRedirectURI=Utilize o seguinte URL como o URI de redirecionamento ao criar a sua credencial de seu provedor de OAuth:
-ListOfSupportedOauthProviders=Forneça aqui a credencial fornecida pelo seu provedor OAuth2. Apenas provedores OAuth2 suportados estão visíveis aqui. Esta configuração talvez seja usada por outros módulos que necessitem de autenticação OAuth2.
+UseTheFollowingUrlAsRedirectURI=Use o URL a seguir como o URI de redirecionamento ao criar suas credenciais com seu provedor OAuth:
+ListOfSupportedOauthProviders=Insira as credenciais fornecidas pelo seu provedor do OAuth2. Apenas fornecedores suportados do OAuth2 são listados aqui. Esses serviços podem ser usados por outros módulos que precisam da autenticação OAuth2.
 SeePreviousTab=Ver aba anterior
 OAuthIDSecret=Identificação OAuth e Senha
 TOKEN_REFRESH=Token Atualizar Presente
 TOKEN_EXPIRED=Token vencido
 TOKEN_EXPIRE_AT=Token expira no
 TOKEN_DELETE=Excluir token salvo
-OAUTH_GOOGLE_NAME=Serviço Google Oauth
-OAUTH_GOOGLE_ID=ID do Google Oauth
-OAUTH_GOOGLE_SECRET=Chave secreta do Google Oauth
-OAUTH_GOOGLE_DESC=Ir para <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">esta página</a> e então a "Credentials" para criar as credenciais Oauth
-OAUTH_GITHUB_ID=ID do Oauth GitHub
-OAUTH_GITHUB_SECRET=Chave secreta do Oauth GitHub
-OAUTH_GITHUB_DESC=Ir para <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">esta página</a> e então "Register a new application" para criar as credenciais Oauth
+OAUTH_GOOGLE_NAME=Serviço do Google OAuth
+OAUTH_GOOGLE_DESC=Ir para <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">esta página e</a> depois "Credenciais" para criar credenciais do OAuth
+OAUTH_GITHUB_NAME=Serviço OAuth GitHub
+OAUTH_GITHUB_SECRET=OAuth GitHub secreto
+OAUTH_GITHUB_DESC=Vá para <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">esta página</a> e, em seguida, "Registrar um novo aplicativo" para criar credenciais do OAuth
diff --git a/htdocs/langs/pt_BR/opensurvey.lang b/htdocs/langs/pt_BR/opensurvey.lang
index d44486228c3..dde4de583b7 100644
--- a/htdocs/langs/pt_BR/opensurvey.lang
+++ b/htdocs/langs/pt_BR/opensurvey.lang
@@ -10,7 +10,6 @@ PollTitle=Titulo da enquete
 ToReceiveEMailForEachVote=Receba um e-mail a cada novo voto
 TypeDate=Modelo para datas
 TypeClassic=Modelo padrão
-OpenSurveyStep2=Selecione os dias livres (cinza). Os dias escolhidos são verdes. Você pode desmarcar um dia previamente selecionado, clicando novamente sobre ele
 RemoveAllDays=Remova todos os dias
 CopyHoursOfFirstDay=Copiar horários do primeiro dia
 RemoveAllHours=Apagar todos os horários
@@ -29,7 +28,6 @@ PourContreList=Escolher (nulo/a favor/contra)
 TitleChoice=Escolha a resposta
 ExportSpreadsheet=Exportar resultado para planilha
 NbOfSurveys=Número de enquetes
-NbOfVoters=Nr. de eleitores
 SurveyResults=Resultado
 PollAdminDesc=Você está autorizado a alterar todas as linhas da votação desta enquete, com o botão "Editar". Você pode, também remover uma coluna ou uma linha com o %s. Você também pode adicionar uma nova coluna com o %s.
 YouAreInivitedToVote=Você foi convidado para votar nesta enquete
@@ -39,7 +37,7 @@ votes=voto(s)
 NoCommentYet=Nenhum comentário foi publicado para este voto ainda
 CanComment=Os eleitores podem comentar na enquete
 CanSeeOthersVote=Os eleitores podem ver os votos de outras pessoas
-SelectDayDesc=Em cada dia selecionado, você pode escolher ou não preencher os horários com o seguinte formato:<br>- vazio,<br>- "8h", "8H" ou "08:00"  horário de início da reunião, <br>- "8-11", "8h-11h", "8H-11H" ou "8:00-11:00" horário de início da reunião e do termino,<br> - "8h15-11h15", "8h15-11H15 " ou " 8:15-11:15 " mesma funcionalidade, mas com preenchimento dos minutos.
+SelectDayDesc=Para cada dia selecionado, você pode escolher, ou não, as horas de reunião no seguinte formato: <br> - vazio <br> - "8h", "8H" ou "8:00" para dar a hora de início de uma reunião, <br> - "8-11", "8h-11h", "8H-11H" ou "8: 00-11: 00" para dar as horas de início e fim de uma reunião, <br> - "8h15-11h15", "8H15-11H15" ou "8: 15-11: 15" para a mesma coisa, mas com minutos.
 ErrorOpenSurveyFillFirstSection=Você não preencheu o primeiro passo para criação da enquete
 ErrorOpenSurveyOneChoice=Digite pelo menos uma opção
 ErrorInsertingComment=Houve um erro ao inserir o seu comentário
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index 196ed4bd8bf..bbaec009f91 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -13,6 +13,14 @@ NewOrder=Novo Pedido
 ToOrder=Realizar Pedido
 MakeOrder=Realizar Pedido
 SuppliersOrdersRunning=Pedidos de compra atuais
+CustomerOrder=Pedido de venda
+CustomersOrders=Ordens de venda
+CustomersOrdersRunning=Ordens de venda atuais
+CustomersOrdersAndOrdersLines=Pedidos de venda e detalhes do pedido
+OrdersDeliveredToBill=Pedidos de vendas entregues para fatura
+OrdersToBill=Ordens de vendas entregues
+OrdersInProcess=Pedidos de venda em andamento
+OrdersToProcess=Ordens de vendas para processar
 SuppliersOrdersToProcess=Pedidos de compra para processar
 StatusOrderSent=Entrega encaminhada
 StatusOrderOnProcessShort=Pedido
@@ -47,6 +55,8 @@ ShowOrder=Mostrar Pedido
 OrdersOpened=Pedidos a processar
 NoDraftOrders=Não há projetos de pedidos
 NoOrder=Sem pedidos
+LastOrders=Últimas ordens de vendas %s
+LastCustomerOrders=Últimas ordens de vendas %s
 LastSupplierOrders=Últimos pedidos de compra %s
 LastModifiedOrders=Últimos %s pedidos modificados
 AllOrders=Todos os Pedidos
@@ -54,6 +64,7 @@ NbOfOrders=Número de Pedidos
 OrdersStatistics=Estatísticas de pedidos
 OrdersStatisticsSuppliers=Estatísticas do pedido de compra
 NumberOfOrdersByMonth=Número de Pedidos por Mês
+AmountOfOrdersByMonthHT=Quantidade de pedidos por mês (sem impostos)
 ListOfOrders=Lista de Pedidos
 CloseOrder=Fechar Pedido
 ConfirmCloseOrder=Tem certeza de que deseja definir esse pedido como entregue? Depois que um pedido é entregue, ele pode ser definido como faturado.
@@ -78,11 +89,13 @@ OrderMode=Método de pedido
 UserWithApproveOrderGrant=Usuários autorizados a aprovar os pedidos.
 PaymentOrderRef=Pagamento de Pedido %s
 ConfirmCloneOrder=Você tem certeza que deseja clonar este pedido, o <b>%s</b>?
+DispatchSupplierOrder=Recebimento da ordem de compra %s
 FirstApprovalAlreadyDone=A primeira aprovação já feito
 SecondApprovalAlreadyDone=Segundo aprovação já feito
 SupplierOrderReceivedInDolibarr=Pedido de compra %s recebeu %s
 SupplierOrderSubmitedInDolibarr=Pedido de compra %s enviado
 SupplierOrderClassifiedBilled=Pedido de compra %s set faturado
+TypeContact_commande_internal_SALESREPFOLL=Ordem de venda de acompanhamento representativa
 TypeContact_commande_internal_SHIPPING=Representante seguindo o envio
 TypeContact_commande_external_BILLING=Contato fatura cliente
 TypeContact_commande_external_SHIPPING=Contato envio cliente
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 503fa5d4e60..6248fcfe22a 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -10,9 +10,17 @@ TextNextMonthOfInvoice=Mês seguinte (texto) da data da fatura
 ZipFileGeneratedInto=Arquivo zip gerado em <b> %s </ b>.
 DocFileGeneratedInto=Arquivo doc gerado em <b> %s </ b>.
 JumpToLogin=Desconectado. Vá para a página de login ...
+MessageOK=Mensagem na página de retorno para um pagamento validado
+MessageKO=Mensagem na página de retorno para um pagamento cancelado
 ContentOfDirectoryIsNotEmpty=O conteúdo deste diretório não está vazio.
 PreviousYearOfInvoice=Ano anterior da data da fatura
 NextYearOfInvoice=Após o ano da data da fatura
+Notify_ORDER_VALIDATE=Pedido de venda validado
+Notify_ORDER_SENTBYMAIL=Pedido de venda enviado por e-mail
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Pedido de compra enviado por e-mail
+Notify_ORDER_SUPPLIER_VALIDATE=Pedido de compra registrado
+Notify_ORDER_SUPPLIER_APPROVE=Pedido de compra aprovado
+Notify_ORDER_SUPPLIER_REFUSE=Pedido de compra recusado
 Notify_PROPAL_VALIDATE=Proposta cliente validada
 Notify_PROPAL_SENTBYMAIL=Proposta comercial enviada por e-mail
 Notify_WITHDRAW_TRANSMIT=Revogação de transmissão
@@ -23,6 +31,10 @@ Notify_BILL_VALIDATE=Fatura de cliente confirmada
 Notify_BILL_UNVALIDATE=Fatura de cliente anulada
 Notify_BILL_CANCEL=Fatura cliente cancelada
 Notify_BILL_SENTBYMAIL=Fatura cliente enviada por e-mail
+Notify_BILL_SUPPLIER_VALIDATE=Fatura do fornecedor validada
+Notify_BILL_SUPPLIER_PAYED=Fatura do fornecedor paga
+Notify_BILL_SUPPLIER_SENTBYMAIL=Fatura do fornecedor enviada pelo correio
+Notify_BILL_SUPPLIER_CANCELED=Fatura do fornecedor cancelada
 Notify_FICHEINTER_VALIDATE=Intervenção validada
 Notify_FICHINTER_ADD_CONTACT=Contato adicionado à intervenção
 Notify_FICHINTER_SENTBYMAIL=Intervenção enviada por e-mail
@@ -39,6 +51,16 @@ NbOfAttachedFiles=Número Arquivos/Documentos Anexos
 TotalSizeOfAttachedFiles=Tamanho Total dos Arquivos/Documentos Anexos
 AttachANewFile=Adicionar Novo Arquivo/Documento
 LinkedObject=Arquivo Anexo
+NbOfActiveNotifications=Número de notificações (nº. de e-mails de destinatários)
+PredefinedMailContentSendInvoice=__ (Olá) __ Por favor, encontre a fatura __REF__ anexada __ONLINE_PAYMENT_TEXT_AND_URL__ __ (Atenciosamente) __ __USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__ (Olá) __ Gostaríamos de lembrar que a fatura __REF__ parece não ter sido paga. Uma cópia da fatura é anexada como um lembrete. __ONLINE_PAYMENT_TEXT_AND_URL__ __ (Atenciosamente) __ __USER_SIGNATURE__
+PredefinedMailContentSendProposal=__ (Olá) __ Por favor encontre uma proposta comercial __REF__ anexada __ (Atenciosamente) __ __USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__ (Olá) __ Por favor encontre o pedido de preço __REF__ anexada __ (Atenciosamente) __ __USER_SIGNATURE__
+PredefinedMailContentSendOrder=__ (Olá) __ Por favor, encontre a ordem __REF__ anexada __ (Atenciosamente) __ __USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__ (Olá) __ Por favor, encontre o nosso pedido __REF__ anexada __ (Atenciosamente) __ __USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__ (Olá) __ Por favor, encontre a fatura __REF__ anexada __ (Atenciosamente) __ __USER_SIGNATURE__
+PredefinedMailContentSendShipping=__ (Olá) __ Por favor encontre o envio __REF__ anexada __ (Atenciosamente) __ __USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__ (Olá) __ Por favor, encontre a intervenção __REF__ anexada __ (Atenciosamente) __ __USER_SIGNATURE__
 DemoDesc=Dolibarr e um ERP/CRM compacto, o qual suporta varios modulos para negocios. Uma demo mostrando todos os modulos nao faz sentido pois este cenario nunca occore (mais de cem modulos disponiveis). Portanto varios perfis de demo estao a disposicao.
 ChooseYourDemoProfil=Escolha o perfil de demonstração que melhor se enquadra nas suas necessidades...
 ChooseYourDemoProfilMore=... ou crie seu próprio perfil <br> (seleção de módulo manual)
@@ -74,11 +96,35 @@ AuthenticationDoesNotAllowSendNewPassword=o modo de autentificação de Dolibarr
 EnableGDLibraryDesc=Instale ou ative a biblioteca GD da sua instalação PHP para usar esta opção.
 ProfIdShortDesc=<b>Prof Id %s</b> é uma informação dePendente do país do Fornecedor.<br>Por Exemplo, para o país  <b>%s</b>, é o código <b>%s</b>.
 StatsByNumberOfUnits=Estatisticas para soma das quantidades nos produtos/servicos
+StatsByNumberOfEntities=Estatísticas em número de entidades de referência (nº. de faturas ou ordens ...)
 NumberOfProposals=Numero de propostas
+NumberOfCustomerOrders=Número de pedidos de vendas
 NumberOfCustomerInvoices=Numero de faturas de clientes
+NumberOfSupplierProposals=Número de propostas de fornecedores
+NumberOfSupplierOrders=Número de pedidos de compra
+NumberOfSupplierInvoices=Número de faturas de fornecedor
 NumberOfUnitsProposals=Numero de unidades nas propostas
+NumberOfUnitsCustomerOrders=Número de unidades em ordens de venda
 NumberOfUnitsCustomerInvoices=Numero de unidades nas faturas dos clientes
+NumberOfUnitsSupplierProposals=Número de unidades em propostas de fornecedores
+NumberOfUnitsSupplierOrders=Número de unidades em pedidos de compra
+NumberOfUnitsSupplierInvoices=Número de unidades em faturas de fornecedor
 EMailTextInterventionValidated=A intervenção %s foi validada
+EMailTextInvoiceValidated=A fatura %s foi validada.
+EMailTextInvoicePayed=A fatura %s foi paga.
+EMailTextProposalValidated=A proposta %s foi validada.
+EMailTextProposalClosedSigned=Proposta %s foi fechado assinado.
+EMailTextOrderValidated=O pedido %s foi validado.
+EMailTextOrderApproved=Encomenda %s foi aprovada.
+EMailTextOrderValidatedBy=Ordem %s foi registrado por %s.
+EMailTextOrderApprovedBy=Ordem %s foi aprovado por %s.
+EMailTextOrderRefused=O pedido %s foi recusado.
+EMailTextOrderRefusedBy=Ordem %s foi recusado por %s.
+EMailTextExpeditionValidated=O envio de %s foi validado.
+EMailTextExpenseReportValidated=O relatório de despesas %s foi validado.
+EMailTextExpenseReportApproved=O relatório de despesas %s foi aprovado.
+EMailTextHolidayValidated=Deixar o pedido %s foi validado.
+EMailTextHolidayApproved=Deixar o pedido %s foi aprovado.
 ImportedWithSet=Data importacao
 DolibarrNotification=Notificação automatica
 ResizeDesc=Insira a nova largura <b>OU</b> o novo peso. A proporção sera mantida durante a transformacao...
@@ -108,9 +154,16 @@ SourcesRepository=Repositório de fontes
 PassEncoding=Codificação de senha
 YourPasswordMustHaveAtLeastXChars=Sua senha deve ter pelo menos <strong> %s </ strong> chars
 YourPasswordHasBeenReset=Sua senha foi redefinida com sucesso
+ThirdPartyCreatedByEmailCollector=Terceiro criado pelo coletor de e-mail do e-mail MSGID %s
+ContactCreatedByEmailCollector=Contato/endereço criado pelo coletor de e-mail do e-mail MSGID %s
+ProjectCreatedByEmailCollector=Projeto criado pelo coletor de e-mail do e-mail MSGID %s
+TicketCreatedByEmailCollector=Ticket criado pelo coletor de e-mail do e-mail MSGID %s
 AvailableFormats=Formatos disponíveis
 LibraryUsed=Biblioteca usada
 ExportableDatas=dados exportáveis
 NoExportableData=não existe dados exportáveis (sem módulos com dados exportáveis gastodos, necessitam de permissões)
 WebsiteSetup=Configuração do módulo website
+WEBSITE_IMAGEDesc=Caminho relativo da mídia de imagem. Você pode mantê-lo vazio, pois isso raramente é usado (ele pode ser usado pelo conteúdo dinâmico para mostrar uma visualização de uma lista de postagens do blog).
 LinesToImport=Linhas para importar
+MemoryUsage=Uso de memória
+RequestDuration=Duração do pedido
diff --git a/htdocs/langs/pt_BR/paybox.lang b/htdocs/langs/pt_BR/paybox.lang
index fef05a17b9b..5da990a5d54 100644
--- a/htdocs/langs/pt_BR/paybox.lang
+++ b/htdocs/langs/pt_BR/paybox.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=Configuração do módulo PayBox
 PayBoxDesc=Este módulo oferece uma página de pagamento atravé do fornecedor <a href
 FollowingUrlAreAvailableToMakePayments=As seguintes URL estão disponíveis para permitir a um cliente efetuar um pagamento
 PaymentForm=Formulário de Pagamento
-WelcomeOnPaymentPage=Bem Vindos a Nossos serviços de pagamento on-line
 ThisScreenAllowsYouToPay=Esta página lhe permite fazer seu pagamento on-line destinado a %s.
 ThisIsInformationOnPayment=Aqui está a informação sobre o pagamento a realizar
 Creditor=Beneficiário
-PayBoxDoPayment=Pagar com Cartão de Débito ou Crédito (Paybox)
 YouWillBeRedirectedOnPayBox=Va a ser redirecionado a a página segura de  Paybox para indicar seu cartão de crédito
 ToOfferALinkForOnlinePayment=URL para %s pagamento
-ToOfferALinkForOnlinePaymentOnOrder=URL que oferece uma interface de pagamento on-line %s baseada no valor de un pedido de cliente
+ToOfferALinkForOnlinePaymentOnOrder=URL que oferece uma interface de pagamento on-line %s para um pedido de venda
 ToOfferALinkForOnlinePaymentOnInvoice=URL que oferece uma interface de pagamento on-line %s baseada no valor de uma fatura
 ToOfferALinkForOnlinePaymentOnContractLine=URL que oferece uma interface de pagamento on-line %s baseada no valor de uma linha de contrato
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL que oferece uma interface de pagamento on-line %s baseada em um valor livre
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL fornecido pela interface de pagamento on-line %s em função da adesão encargos
+ToOfferALinkForOnlinePaymentOnDonation=URL que oferece uma interface de pagamento on-line %s para o pagamento de uma doação
 YouCanAddTagOnUrl=Também pode adicionar 0 parámetro url <b>&tag
-SetupPayBoxToHavePaymentCreatedAutomatically=Configure sua url PayBox <b>%s</b> para que o pagamento se crie automaticamente ao Confirmar.
+SetupPayBoxToHavePaymentCreatedAutomatically=Configure seu Paybox com url <b> %s </ b> para que o pagamento seja criado automaticamente quando validado pelo Paybox.
 YourPaymentHasBeenRecorded=Esta pagina confirma que o seu pagamento foi registrado com suçesso. Obrigado.
-YourPaymentHasNotBeenRecorded=Seu pagamento nao foi registrado e a transaçao foi cancelada. Obrigado.
+YourPaymentHasNotBeenRecorded=Seu pagamento NÃO foi registrado e a transação foi cancelada. Obrigado.
 AccountParameter=Parametros da conta
 UsageParameter=Parametros de uso
 InformationToFindParameters=Ajuda a buscar suas %s informaçoes da conta
@@ -26,5 +26,5 @@ VendorName=Nome do vendedor
 CSSUrlForPaymentForm=CSS style sheet URL para modelo de pagamento
 NewPayboxPaymentReceived=Novo pagamento recebido Paybox
 NewPayboxPaymentFailed=Novo pagamento Paybox tentou, mas não conseguiu
-PAYBOX_PAYONLINE_SENDEMAIL=Aviso por e-mail depois de um pagamento (sucesso ou falha)
+PAYBOX_PAYONLINE_SENDEMAIL=Aviso por e-mail depois de uma tentativa de pagamento (sucesso ou falha)
 PAYBOX_PBX_IDENTIFIANT=Valor para PBX ID
diff --git a/htdocs/langs/pt_BR/paypal.lang b/htdocs/langs/pt_BR/paypal.lang
index 72be5cc803c..f9f857755a3 100644
--- a/htdocs/langs/pt_BR/paypal.lang
+++ b/htdocs/langs/pt_BR/paypal.lang
@@ -1,21 +1,19 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Configuração do módulo PayPal
-PaypalDesc=Este modulo oferece paginas que permitem o pagamento no <a href="http://www.paypal.com" target="_blank">PayPal</a> aos clientes. Pode ser usado para o pagamento livre ou para o pagamento de algum objeto Dolibarr (fatura, pedido, ...)
-PaypalOrCBDoPayment=Pagar com PayPal (Cartão de Crédito ou Paypal)
-PaypalDoPayment=Pagar com Paypal
+PaypalDesc=Este módulo permite o pagamento por clientes via <a href="http://www.paypal.com" target="_blank">PayPal</a>. Isso pode ser usado para um pagamento ad-hoc ou para um pagamento relacionado a um objeto Dolibarr (fatura, pedido, ...)
+PaypalOrCBDoPayment=Pague com PayPal (cartão ou PayPal)
 PAYPAL_API_SANDBOX=Modo teste/caixa de areia
 PAYPAL_API_USER=API usuario
 PAYPAL_API_PASSWORD=API senha
 PAYPAL_API_SIGNATURE=API assinatura
 PAYPAL_SSLVERSION=Versão do SSL do cURL
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferecer pagamento "integral" (Cartao de credito + Paypal) ou somente "Paypal"
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferta de pagamento "integral" (cartão de crédito + PayPal) ou apenas "PayPal"
 PaypalModeIntegral=Integralmente
 PaypalModeOnlyPaypal=PayPal apenas
-ONLINE_PAYMENT_CSS_URL=URL opcional de CSS na página de pagamento
 ThisIsTransactionId=Eis o id da transação: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Adicionar URL do pagamento Paypal quando se envia o documento por e-mail
+PAYPAL_ADD_PAYMENT_URL=Inclua o URL de pagamento do PayPal quando enviar um documento por e-mail
 NewOnlinePaymentFailed=Foi tentado novo pagamento online, mas sem hêxito
-ONLINE_PAYMENT_SENDEMAIL=Endereço e-mail para aviso apos o pagamento (positivo ou nao)
+ONLINE_PAYMENT_SENDEMAIL=Endereço de e-mail para notificações após cada tentativa de pagamento (para sucesso e falha)
 ReturnURLAfterPayment=Retornar ao URL após o pagamento
 ValidationOfOnlinePaymentFailed=A validação do pagamento online falhou
 PaymentSystemConfirmPaymentPageWasCalledButFailed=A página de confirmação de pagamento, que foi chamada pelo sistema de pagamento, retornou um erro
@@ -25,4 +23,6 @@ DetailedErrorMessage=Mensagem de erro detalhada
 ShortErrorMessage=Mensagem curta de erro
 ErrorCode=Código do erro
 ErrorSeverityCode=Erro grave de código
-PaypalLiveEnabled=Paypal live ativado (caso contrário, teste/modo caixa de areia)
+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
diff --git a/htdocs/langs/pt_BR/printing.lang b/htdocs/langs/pt_BR/printing.lang
index 5dbb32f94ae..34ff9d02352 100644
--- a/htdocs/langs/pt_BR/printing.lang
+++ b/htdocs/langs/pt_BR/printing.lang
@@ -1,26 +1,24 @@
 # Dolibarr language file - Source file is en_US - printing
 Module64000Desc=Habilitar Sistema de Impressão Direta
 PrintingSetup=Configuração do Sistema de Impressão Direta
-PrintingDesc=Este módulo adiciona um botão Imprimir para enviar documentos diretamente para uma impressora (sem abrir documento em um aplicativo) com vários módulos.
 MenuDirectPrinting=Trabalhos de Impressão Direta
 DirectPrint=Impressão directa
 PrintingDriverDesc=Configuração de variáveis para o driver de impressão.
 ListDrivers=Lista de drivers
 FileWasSentToPrinter=Arquivo %s enviado para impressora
+NoActivePrintingModuleFound=Nenhum driver ativo para imprimir documento. Verifique a configuração do módulo %s.
 PleaseSelectaDriverfromList=Por favor, selecione um driver da lista.
 PleaseConfigureDriverfromList=Por favor, configure o driver selecionado da lista.
 SetupDriver=Configuração de Driver
 TargetedPrinter=Impressora em questão
 UserConf=Configuração por usuário
 PRINTGCP_INFO=Configuração API do Google OAuth
-PrintGCPDesc=Este driver permite enviar documentos diretamente para uma impressora com o Google Cloud Print.
 GCP_displayName=Nome De Exibição
 GCP_Id=ID da impressora
 GCP_OwnerName=Nome do proprietário
 GCP_State=Estado da impressora
 GCP_connectionStatus=Estado online
 GCP_Type=Tipo de impressora
-PrintIPPDesc=Este driver permite enviar documentos diretamente para uma impressora. Ele requer um sistema Linux com CUPS instalados.
 PRINTIPP_HOST=Servidor de impressão
 NoDefaultPrinterDefined=Nenhuma impressora padrão definida
 DefaultPrinter=Impressora padrão
@@ -31,6 +29,6 @@ IPP_State_reason1=Estado razão1
 IPP_Media=Mídia da impressora
 IPP_Supported=Tipo de mídia
 DirectPrintingJobsDesc=Esta página lista os trabalhos de impressão encontrado para impressoras disponíveis.
-GoogleAuthNotConfigured=Configuração do Google OAuth não feito. Ativar módulo OAuth e definir um GoogleID/Secret.
+GoogleAuthNotConfigured=O OAuth do Google não foi configurado. Ative o módulo OAuth e defina um ID/secreto do Google.
 PrintingDriverDescprintgcp=Configuração das variáveis para o driver de impressão do Google Cloud Print.
 PrintTestDescprintgcp=Lista de Impressoras para Google Cloud Print.
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index b1a77048ced..0ebc2916b18 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -7,6 +7,8 @@ ProductNoteTranslated=Nota produto traduzido
 ProductServiceCard=Ficha do produto/serviço
 ProductId=ID do produto/serviço
 Reference=Referência
+ProductVatMassChange=Atualização global do IVA
+ProductVatMassChangeDesc=Esta ferramenta atualiza a taxa de IVA definida em <b><u>TODOS os</u></b> produtos e serviços!
 MassBarcodeInit=Inicialização de código de barras.
 MassBarcodeInitDesc=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 antes que a instalação do módulo de código de barras é completa.
 ProductAccountancyBuyCode=Código contábil (compra)
@@ -25,6 +27,7 @@ LastRecordedServices=Últimos %s serviços gravados
 CardProduct1=Servico
 Stock=Estoque
 MenuStocks=Estoques
+Stocks=Estoques e localizações (armazéns) de produtos
 OnSell=Vende-se
 OnBuy=Para compra
 NotOnSell=Não se vende
@@ -36,14 +39,22 @@ ProductStatusNotOnBuy=Não para-se comprar
 ProductStatusNotOnBuyShort=Não para-se comprar
 UpdateVAT=Atualização IVA
 UpdateDefaultPrice=Atualização de preço padrão
+AppliedPricesFrom=Aplicado a partir de
+SellingPriceHT=Preço de venda (sem impostos)
 SellingPriceTTC=Preço de venda (incl. taxas)
+SellingMinPriceTTC=reço de venda mínimo (inc. impostos)
+CostPriceDescription=Este campo de preço (livre de impostos) pode ser usado para armazenar a quantidade média do custo do produto para sua empresa. Pode ser qualquer preço a se calcular, por exemplo, a partir do preço médio de compra mais o custo médio de produção e distribuição.
 SoldAmount=Total vendido
 PurchasedAmount=Total comprado
+MinPrice=Preço mínimo de venda
 CantBeLessThanMinPrice=O preço de venda não deve ser inferior ao mínimo para este produto (%s ICMS)
 ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorreto
 ErrorProductClone=Aconteceu um problema durante a clonação do produto ou serviço.
+SupplierRef=Código do produto do fornecedor
 ListOfStockMovements=Lista de movimentos de estoque
+SupplierCard=Cartão de fornecedor
 NoteNotVisibleOnBill=Nota (não visivel em faturas, orçamentos etc.)
+MultiPricesAbility=Vários segmentos de preço por produto/serviço (cada cliente está em um segmento de preço)
 MultiPricesNumPrices=Número de preços
 AssociatedProductsNumber=N� de produtos associados
 ParentProductsNumber=Numero de pacotes pais do produto
@@ -53,10 +64,20 @@ IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto nao e usado por nenhum prod
 KeywordFilter=Filtro por palavra-chave
 CategoryFilter=Filtro por categoria
 ListOfProductsServices=Lista de produtos/serviços
+ProductAssociationList=Lista dos produtos / serviços que são componente(s) deste produto / pacote virtual
 ProductParentList=Lista de produtos/servicos virtuais com este produto como componente
 ErrorAssociationIsFatherOfThis=Um dos produtos selecionados é pai do produto em curso
 ConfirmDeleteProduct=? Tem certeza que quer eliminar este produto/serviço?
 ConfirmDeleteProductLine=Tem certeza que quer eliminar esta linha de produto?
+QtyMin=Qtde min. de compra
+PriceQtyMin=Quantidade de preço min.
+PriceQtyMinCurrency=Preço (moeda) para esta quant.. (sem desconto)
+VATRateForSupplierProduct=Taxa de IVA (para este fornecedor/produto)
+DiscountQtyMin=Desconto para esta qtde.
+NoPriceDefinedForThisSupplier=Nenhum Preço/Quant. definido para este fornecedor/produto
+NoSupplierPriceDefinedForThisProduct=Nenhum Preço/Quant. do fornecedor definido para este produto
+PredefinedProductsToSell=Produto pré-definidos
+PredefinedServicesToSell=Servico pré-definidos
 PredefinedProductsAndServicesToSell=Produtos / serviços pré-definidas para vender
 PredefinedProductsToPurchase=Produto pré-definidas para compra
 NotPredefinedProducts=Produtos/Serviços sem predefinição
@@ -67,12 +88,14 @@ ListServiceByPopularity=Lista de serviços por popularidade
 Finished=Produto manufaturado
 RowMaterial=Materia prima
 ConfirmCloneProduct=Você tem certeza que deseja clonar o produto ou serviço <b>%s</b>?
+CloneCompositionProduct=Clonar produto/serviço virtual
 CloneCombinationsProduct=Variantes do produto clone
 ProductIsUsed=Este produto é usado
 SellingPrices=Preços para Venda
 BuyingPrices=Preços para Compra
 CustomerPrices=Preços de cliente
 SuppliersPrices=Preços de fornecedores
+SuppliersPricesOfProductsOrServices=Preços do fornecedor (produtos ou serviços)
 CountryOrigin=Pais de origem
 ShortLabel=Etiqueta curta
 set=conjunto
@@ -96,12 +119,17 @@ Quarter1=1° Trimestre
 Quarter2=2° Trimestre
 Quarter3=3° Trimestre
 Quarter4=4° Trimestre
+PageToGenerateBarCodeSheets=Com esta ferramenta, você pode imprimir folhas de adesivos de código de barras. Escolha o formato da sua página de adesivos, o tipo de código de barras e o valor do código de barras, depois clique no botão <b>%s</b>.
 NumberOfStickers=Numero de etiquetas a se imprimir numa pagina
 PrintsheetForOneBarCode=Imprimir varias etiquetas para um codigo de barras
 BuildPageToPrint=Gerar pagina a se imprimir
 FillBarCodeTypeAndValueManually=Preencher codigo de barras e valor manualmente.
 FillBarCodeTypeAndValueFromProduct=Preencha o código de barras e valor a partir do código de barras de um produto.
 FillBarCodeTypeAndValueFromThirdParty=Preencher o tipo de código de barras e o seu valor de um terceiro.
+DefinitionOfBarCodeForProductNotComplete=Definição do tipo ou valor do código de barras não está completo para o produto %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definição do tipo ou valor do código de barras incompleto para o terceiro %s.
+BarCodeDataForProduct=Informações de código de barras do produto %s:
+BarCodeDataForThirdparty=Informação do código de barras do terceiro %s :
 ResetBarcodeForAllRecords=Definir o valor do código de barras para todos os registros (isto também redefinirá o valor do código de barras já definido com novos valores)
 PriceByCustomer=Preços diferenteas para cada cliente
 PriceCatalogue=Um único preço de venda por produto/serviço
@@ -109,17 +137,21 @@ AddCustomerPrice=Adicionar preço por cliente
 ForceUpdateChildPriceSoc=Situado mesmo preço em outros pedidos dos clientes
 PriceByCustomerLog=Registros de preços de cliente anteriores
 MinimumPriceLimit=Preço mínimo não pode ser inferior, em seguida %s
+MinimumRecommendedPrice=Preço minimo recomendado é : %s
 PriceExpressionEditor=Editor de expressão Preço
 PriceExpressionSelected=Expressão de preço Selecionado
 PriceExpressionEditorHelp1="Preço = 2 + 2" ou "2 + 2" para fixação do preço. use; para separar expressões
 PriceExpressionEditorHelp2=Você pode acessar ExtraFields com variáveis como <b>#extrafield_myextrafieldkey#</b> e variáveis globais com o <b>#global_mycode #</b>
+PriceExpressionEditorHelp3=Em ambos preços, de produtos/serviços e fornecedores existem essas variáveis disponíveis:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=No preço do produto/serviço : <b>#supplier_min_price#</b><br>No preço do fornecedor: <b>#supplier_quantity# e #supplier_tva_tx#</b>
 PriceMode=Modo de Preço
 DefaultPrice=Preço padrão
 ComposedProductIncDecStock=Aumento/diminuição do estoque, armazém, atual
+ComposedProduct=Produtos filhos
 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=Updaters variáveis ​​globais
 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
@@ -129,6 +161,7 @@ IncludingProductWithTag=Incluindo produto/serviço com tag
 DefaultPriceRealPriceMayDependOnCustomer=Preço padrão, o preço real pode depender do cliente
 NbOfQtyInProposals=Qtde nas Propostas
 ClinkOnALinkOfColumn=Clique no link da coluna %s para ter uma visão detalhada...
+ProductsOrServicesTranslations=Traduções de produtos/serviços
 TranslatedLabel=Rótulo traduzido
 ProductWeight=Peso de 1 produto
 ProductVolume=Volume de 1 produto
@@ -137,3 +170,9 @@ VolumeUnits=Unidade de Volume
 SizeUnits=Unidade de Tamanho
 DeleteProductBuyPrice=Apagar preço de Compra
 ConfirmDeleteProductBuyPrice=Tem certeza que que deseja excluir este preço de compra?
+UseProductFournDesc=Adicione uma característica para definir a descrição do produto definida pelo fornecedor em complemento a descrição para os clientes
+ProductSupplierDescription=Descrição do fornecedor do produto
+NbOfDifferentValues=N°. de valores diferentes
+NbProducts=N°. de produtos
+ActionAvailableOnVariantProductOnly=Ação só disponível na variante do produto
+ProductsPricePerCustomer=Preços de produto por cliente
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index 1231d625a3e..0e22f1da168 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -5,6 +5,7 @@ ProjectLabel=Etiqueta projeto
 ProjectsArea=Setor de projetos
 SharedProject=A todos
 PrivateProject=Contatos do projeto
+ProjectsImContactFor=Projetos para eu sou explicitamente um contato
 AllAllowedProjects=Todo projeto que eu posso ler (meu + público)
 ProjectsPublicDesc=Exibe todos os projetos que você esta autorizado a ver.
 TasksOnProjectsPublicDesc=Esta visualização apresenta todas as tarefas nos projetos que você tem permissão para ver.
@@ -26,14 +27,18 @@ OpenedProjects=Projetos em andamento
 OpenedTasks=Tarefas em andamento
 ShowProject=Mostrar projeto
 NoProject=Nenhum Projeto Definido
+NbOfProjects=Nº. de projetos
+NbOfTasks=N°. de tarefas
 TimeSpent=Dispêndio de tempo
 TimeSpentByUser=Tempo gasto por usuário
 TimesSpent=Dispêndio de tempo
-RefTask=Ref. da tarefa
 TaskTimeSpent=Dispêndio de tempo com tarefas
 TaskTimeUser=Usuário
 NewTimeSpent=Dispêndio de tempo
 MyTimeSpent=Meu dispêndio de tempo
+BillTimeShort=Hora da fatura
+TimeToBill=Hora não cobrada
+TimeBilled=Hora cobrada
 TaskDateEnd=Data final da tarefa
 AddTask=Criar tarefa
 Activities=Tarefas/atividades
@@ -42,6 +47,9 @@ MyProjectsArea=Minha Área de projetos
 ProgressDeclared=o progresso declarado
 ProgressCalculated=calculado do progresso
 GoToListOfTimeConsumed=Ir para a lista de dispêndios de tempo
+ListOrdersAssociatedProject=Lista de pedidos de vendas relacionadas ao projeto
+ListSupplierOrdersAssociatedProject=Lista de ordens de compra relacionadas ao projeto
+ListSupplierInvoicesAssociatedProject=Lista de faturas do fornec. relacionadas ao projeto
 ListTaskTimeUserProject=Lista de tempo consumido nas tarefas de projecto
 ActivityOnProjectYesterday=Atividade de ontem no projeto
 ActivityOnProjectThisWeek=Atividade ao Projeto esta Semana
@@ -63,6 +71,7 @@ DeleteATimeSpent=Excluir dispêndio de tempo
 ConfirmDeleteATimeSpent=Você tem certeza que deseja excluir este tempo gasto?
 DoNotShowMyTasksOnly=Ver tambem tarefas não associadas comigo
 ShowMyTasksOnly=Visualizar apenas tarefas incumbidas a mim
+TaskRessourceLinks=Contatos da Tarefa
 NoTasks=Não há tarefas para este projeto
 LinkedToAnotherCompany=Ligado a outros terceiros
 ErrorTimeSpentIsEmpty=O dispêndio de tempo está em branco
@@ -80,6 +89,11 @@ ProjectModifiedInDolibarr=Projeto %s modificado
 TaskCreatedInDolibarr=Tarefa %s criada
 TaskModifiedInDolibarr=Tarefa %s alterada
 TaskDeletedInDolibarr=Tarefa %s excluída
+OpportunityStatusShort=Situação de um potencial contrato
+OpportunityProbabilityShort=Probab. de um potencial negócio
+OpportunityAmountShort=Quantidade de lead
+OpportunityAmountAverageShort=Valor do potencial negócio
+OpportunityAmountWeigthedShort=Quantidade de lead ponderada
 WonLostExcluded=Ganho/Perda excluída
 TypeContact_project_internal_PROJECTLEADER=Chefe de projeto
 TypeContact_project_external_PROJECTLEADER=Chefe de projeto
@@ -94,13 +108,27 @@ ProjectsWithThisUserAsContact=Projetos com este usuário como contato
 TasksWithThisUserAsContact=As tarefas atribuídas a esse usuário
 ProjectOverview=Visão geral
 ManageOpportunitiesStatus=Use projetos para acompanhar leads / opportinuties
+ProjectNbProjectByMonth=Nº. de projetos criados por mês
+ProjectNbTaskByMonth=Nº. de tarefas criadas por mês
 ProjectsStatistics=As estatísticas sobre projetos / leads
 TaskAssignedToEnterTime=Tarefa atribuída. Entrando tempo nesta tarefa deve ser possível.
 IdTaskTime=Horário do ID da tarefa
+YouCanCompleteRef=Se vc quiser completar o num.ref com algum sufixo, é recomendado adicionar um caractere separador, dessa forma a numeração automática irá funcionar corretamente para os prox. projetos. Ex. 1%s-meusufix
 OpenedProjectsByThirdparties=Abrir projetos de terceiros
+NotOpenedOpportunitiesShort=Não é um lead aberto
 OppStatusPROSP=Prospecção
 OppStatusPROPO=Proposta
 OppStatusWON=Ganhou
+AllowToLinkFromOtherCompany=Permitir vincular projeto de outra empresa <br><br> <u>Valores Suportados:</u> <br> - Manter vazio: pode vincular qualquer projeto da empresa (padrão) <br> - "todos" pode vincular qualquer projeto, até mesmo projetos de outras empresas <br> - Uma lista de IDs de terceiros separados por vírgulas: pode vincular todos os projetos desses terceiros (Exemplo: 123,4795,53) <br>
 LatestModifiedProjects=Últimos projetos modificados %s
+NoAssignedTasks=Nenhuma tarefa atribuída foi encontrada (atribua projeto/tarefas ao usuário atual na caixa de seleção superior para inserir a hora nele)
+ThirdPartyRequiredToGenerateInvoice=Um terceiro deve estar definido no projeto para que vc possa faturar contra ele
 DontHaveTheValidateStatus=O projeto %s deve estar aberto para ser fechado
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Módulo 'Salário' deve estar habilitado para def. taxas hh, para ter o tempo gasto valorizado
+NewTaskRefSuggested=Tarefa ref.  já usada, uma nova tarefa ref. é necessária
+TimeSpentInvoiced=Tempo gasto faturado
 TimeSpentForInvoice=Dispêndio de tempo
+OneLinePerUser=Uma linha por usuário
+ServiceToUseOnLines=Serviço para usar em linhas
+InvoiceGeneratedFromTimeSpent=Fatura %s foi gerada a partir do tempo gasto no projeto
+ProjectBillTimeDescription=Verifique se você inseriu o quadro de horários nas tarefas do projeto E planeja gerar fatura(s) do quadro de horários para faturar o cliente do projeto (não verifique se planeja criar fatura que não seja baseada em quadros de horas inseridos).
diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang
index 84d2e017947..85ae18405e8 100644
--- a/htdocs/langs/pt_BR/propal.lang
+++ b/htdocs/langs/pt_BR/propal.lang
@@ -16,6 +16,7 @@ AllPropals=Todos Os Orçamentos
 SearchAProposal=Procurar um Orçamento
 NoProposal=Sem propostas
 ProposalsStatistics=Estatísticas de Orçamentos
+AmountOfProposalsByMonthHT=Valor por mês (sem Imposto)
 NbOfProposals=Número Orçamentos
 ShowPropal=Ver Orçamento
 PropalsOpened=Aberto
@@ -61,3 +62,4 @@ DefaultModelPropalCreate=Criaçao modelo padrao
 DefaultModelPropalToBill=Modelo padrao no fechamento da proposta comercial ( a se faturar)
 DefaultModelPropalClosed=Modelo padrao no fechamento da proposta comercial (nao faturada)
 ProposalCustomerSignature=Aceite por escrito, carimbo da empresa, data e assinatura
+ProposalsStatisticsSuppliers=Estatísticas de propostas de fornecedores
diff --git a/htdocs/langs/pt_BR/sms.lang b/htdocs/langs/pt_BR/sms.lang
index b607fdd45c3..78b5b2da3e3 100644
--- a/htdocs/langs/pt_BR/sms.lang
+++ b/htdocs/langs/pt_BR/sms.lang
@@ -1,30 +1,16 @@
 # Dolibarr language file - Source file is en_US - sms
 Sms=SMS
-SmsSetup=Configuração do SMS
-SmsDesc=Esta pagina permite definir as opçoes globais para os SMS
 SmsCard=Chip SMS
-AllSms=Todas as campnhas SMS
 SmsTargets=Alvos
 SmsRecipients=Alvos
 SmsTopic=Topico do SMS
-ListOfSms=Listar campanhas SMS
-NewSms=Nova campanha SMS
 ResetSms=Novo envio
-DeleteSms=Apagar campanha SMS
-DeleteASms=Remover uma campanha SMS
-PreviewSms=Pre-visualizar SMS
-PrepareSms=Preparar SMS
-SmsResult=Resultado do envio SMS
-TestSms=Testar SMS
 SmsStatusNotSent=Nao enviado
-SmsSuccessfulySent=SMS enviado coretamente (de %s a %s)
 ErrorSmsRecipientIsEmpty=Numero de alvos vazio
 WarningNoSmsAdded=Falta numero telefone para adicionar a lista de alvos
-ConfirmValidSms=Quer confirmar a validacao desta campanha?
-NbOfUniqueSms=Nr. de numeros telefonicos unicos
-NbOfSms=Numero de numeros telefonicos
+NbOfUniqueSms=N°. de números de telefone exclusivos
+NbOfSms=N°. de números de telefone
 ThisIsATestMessage=Isto e uma mensagem de teste
-SmsInfoCharRemain=Nr de caracteres restantes
-SmsInfoNumero=(formato internacional ex: +33899701761)
+SmsInfoCharRemain=N°. de caracteres restantes
 SmsNoPossibleSenderFound=Nenhum expedidor disponível. Verifique a configuração do seu provedor de SMS.
 DisableStopIfSupported=Desabilitar mensagem PARAR (se suportado)
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index 2a5a83701c8..44b87dc0a16 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -1,7 +1,9 @@
 # Dolibarr language file - Source file is en_US - stocks
-NewWarehouse=Novo armazém / setor de armazenagem
+ParentWarehouse=Armazém pai
+NewWarehouse=Novo armazém/local de estoque
 WarehouseSource=Armazém de origem
 WarehouseSourceNotDefined=Nenhum armazém definido,
+DefaultWarehouse=Armazém padrão
 WarehouseTarget=Armazém de destino
 ValidateSending=Apagar envio
 CancelSending=Cancelar envio
@@ -11,8 +13,11 @@ LotSerial=Lotes/Series
 LotSerialList=Listagem de lotes/series
 ErrorWarehouseRefRequired=A referência do armazém é necessária
 ListOfWarehouses=Lista de armazéns
+MovementId=ID de movimento
+StockMovementForId=ID de movimento %d
 StocksArea=Setor de armazenagem
 NumberOfProducts=Número total de produtos
+LastMovement=Último movimento
 CorrectStock=Corrigir estoque
 StockTransfer=Banco de transferência
 TransferStock=Tranferencia de Estoque
@@ -21,23 +26,25 @@ StockMovements=Movimentações de estoque
 UnitPurchaseValue=Preço unitário de compra
 StockTooLow=Estoque muito baixo
 EnhancedValueOfWarehouses=Valor de estoques
-IndependantSubProductStock=Estoque de produtos e estoque subproduto são independentes
+AllowAddLimitStockByWarehouse=Gerencie também os valores de estoque mínimo e desejado por pareamento (produto-armazém), além dos valores por produto
 QtyDispatched=Quantidade despachada
 QtyDispatchedShort=Qtde despachada
 QtyToDispatchShort=Qtde a despachar
-RuleForStockManagementDecrease=Regra para baixa automática de estoque ( baixa manual é sempre possível, independente se existe regra de baixa automática ativada)
-RuleForStockManagementIncrease=Regra para entrada automática de estoque ( entrada manual é sempre possível, independente se existe regra de entrada automática ativada)
-DeStockOnBill=Diminuir ações reais em clientes validação facturas / notas de crédito
-DeStockOnValidateOrder=Decrementar os estoques físicos sobre os pedidos
+OrderDispatch=Recibos de itens
+DeStockOnValidateOrder=Diminuir estoques reais na validação do pedido de venda
 DeStockOnShipment=Diminuir o estoque real na validação do envio
 DeStockOnShipmentOnClosing=Baixa real no estoque ao classificar o embarque como fechado
-ReStockOnBill=Incrementar os estoques físicos sobre as faturas/recibos
+ReStockOnBill=Aumentar os estoques reais na validação da fatura/nota de crédito do fornecedor
+ReStockOnDispatchOrder=Aumentar os estoques reais no despacho manual para o depósito, após o recebimento do pedido de compra de mercadorias
 OrderStatusNotReadyToDispatch=Não tem ordem  ainda não ou nato tem um status que permite envio de produtos em para armazenamento.
 NoPredefinedProductToDispatch=Não há produtos pré-definidos para este objeto. Portanto, não envio em estoque é necessária.
 DispatchVerb=Despachar
 PhysicalStock=Estoque físico
 RealStock=Estoque real
+RealStockDesc=Estoque físico/real é o estoque atualmente nos depósitos.
+RealStockWillAutomaticallyWhen=O estoque real será modificado de acordo com esta regra (conforme definido no módulo Stock):
 VirtualStock=Estoque virtual
+VirtualStockDesc=O estoque virtual é o estoque calculado disponível uma vez que todas as ações abertas/pendentes (que afetam os estoques) sejam fechadas (pedidos de compra recebidos, pedidos de vendas enviados etc.)
 IdWarehouse=Id. armazenamento
 DescWareHouse=Descrição do armazém
 LieuWareHouse=Localização do armazenamento
@@ -55,6 +62,7 @@ ThisWarehouseIsPersonalStock=Este armazenamento representa estoque pessoal de:
 SelectWarehouseForStockDecrease=Escolha arquivo para usar a redução estoque
 SelectWarehouseForStockIncrease=Escolha arquivo para usar no aumento de estoque
 NoStockAction=Nenhuma ação de estocagem
+DesiredStock=Estoque desejado
 DesiredStockDesc=Esta quantidade será usada para determinar o estoque a ser reposto.
 StockToBuy=Para encomendar
 Replenishment=Reposição
@@ -66,13 +74,12 @@ UsePhysicalStock=Usar estoque físico
 CurentlyUsingVirtualStock=Estoque virtual
 CurentlyUsingPhysicalStock=Estoque físico
 RuleForStockReplenishment=Regra para a reposição de estoques
-SelectProductWithNotNullQty=Selecione pelo menos um produto com um qty não nulo e um fornecedor
 AlertOnly=Alertas apenas
 WarehouseForStockDecrease=Os arquivos serão utilizados para redução estoque
 WarehouseForStockIncrease=O arquivos serão utilizados para aumento de
 ForThisWarehouse=Para este armazenamento
-ReplenishmentStatusDesc=Esta é a lista de todos os produtos que esão abaixo do estoque mínimo (ou  menor que a quantidade de alerta, caso a caixa de seleção "Alerta Apenas" esteja marcada). Usando a caixa de seleção você poderá criar ordens de compra para preencher a diferença.
-ReplenishmentOrdersDesc=Esta é a lista de todas as  Ordens de Compras abertas, incluindo produtos pré-definidos. Somente ordens com produtos pré-definidos que podem alterar o estoque, são visíveies aqui.
+ReplenishmentStatusDesc=Esta é uma lista de todos os produtos com um estoque menor que o estoque desejado (ou menor que o valor de alerta, se a caixa de seleção "somente alerta" estiver marcada). Usando a caixa de seleção, você pode criar pedidos para preencher a diferença.
+ReplenishmentOrdersDesc=Esta é uma lista de todos os pedidos de compra em aberto, incluindo produtos predefinidos. Somente pedidos abertos com produtos predefinidos, portanto, os pedidos que podem afetar os estoques são visíveis aqui.
 NbOfProductBeforePeriod=Quantidade de produtos em estoque antes do período selecionado
 NbOfProductAfterPeriod=Quantidade de produtos em estoque período selecionado depois
 MassMovement=Movimentações em massa
@@ -80,9 +87,6 @@ SelectProductInAndOutWareHouse=Selecione um produto, uma quantidade, um armazém
 ReceivingForSameOrder=Recibos para este fim
 StockMovementRecorded=Movimentações de estoque registradas
 RuleForStockAvailability=Regras sobre os requisitos de ações
-StockMustBeEnoughForInvoice=O nível de estoque deve ser suficiente para se adicionar produto/serviço à fatura (é feita uma verificação no estoque real quando da adição de uma linha na fatura sempre que a regra for a mudança automática de estoque)
-StockMustBeEnoughForOrder=O nível de estoque deve ser suficiente para se adicionar produto/serviço ao pedido (é feita uma verificação no estoque real quando da adição de uma linha no pedido sempre que a regra for a mudança automática de estoque)
-StockMustBeEnoughForShipment=O nível de estoque deve ser suficiente para se adicionar produto/serviço à remessa (é feita uma verificação no estoque real quando da adição de uma linha na remessa sempre que a regra for a mudança automática de estoque)
 MovementLabel=Rótulo de movimentação
 InventoryCode=Código da movimentação ou do inventário
 IsInPackage=Contido em pacote
@@ -90,13 +94,17 @@ WarehouseAllowNegativeTransfer=O estoque pode ser negativo
 MovementCorrectStock=Da correção para o produto %s
 MovementTransferStock=Da transferência de produto %s em um outro armazém
 InventoryCodeShort=Código mov./inv.
-NoPendingReceptionOnSupplierOrder=Sem recepção pendente devido a abrir ordem fornecedor
+NoPendingReceptionOnSupplierOrder=Não há recepção pendente devido ao pedido de compra em aberto
 ThisSerialAlreadyExistWithDifferentDate=Este lote / número de série (<strong>(%s)</strong>) já existe, mas com diferente entradas/saídas (encontrado <strong>%s,</strong> mas você <strong>confirma% s).</strong>
+UseDispatchStatus=Usar um status de despacho (aprovar/recusar) para linhas de produtos na recepção do pedido
 OptionMULTIPRICESIsOn=A opção "diversos preços por segmento" está habilitada. Isto significa que um produto possui diversos preços de venda, desta forma o valor para venda não pode ser calculado
 ProductStockWarehouseCreated=Limite de estoque para alerta e estoque ótimo desejado corretamente criados
 ProductStockWarehouseUpdated=Limite de estoque para alerta e estoque ótimo desejado corretamente atualizados
 ProductStockWarehouseDeleted=Limite de estoque para alerta e estoque ótimo desejado corretamente excluídos
 AddNewProductStockWarehouse=Definir novo limite para alerta e estoque ótimo desejado
 inventoryDraft=Em vigência
+inventoryErrorQtyAdd=Erro: a quantidade é menor que zero
 SelectCategory=Filtro por categoria
+INVENTORY_DISABLE_VIRTUAL=Produto virtual (kit): não diminua o estoque de um produto filho
 inventoryDeleteLine=Apagar linha
+StockSupportServicesDesc=Por padrão, você pode estocar somente produtos do tipo "produto". Você também pode estocar um produto do tipo "serviço" se ambos os serviços do módulo e essa opção estiverem ativados.
diff --git a/htdocs/langs/pt_BR/stripe.lang b/htdocs/langs/pt_BR/stripe.lang
index 604796779a4..6f818376f5a 100644
--- a/htdocs/langs/pt_BR/stripe.lang
+++ b/htdocs/langs/pt_BR/stripe.lang
@@ -1,9 +1,8 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configuração do módulo de boleto
-StripeDesc=Módulo para oferecer uma página de pagamento on-line aceitando pagamentos com cartão de crédito / débito via <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Isso pode ser usado para permitir que seus clientes façam pagamentos gratuitos ou para um pagamento em um determinado objeto Dolibarr (fatura, pedido, ...)
+StripeDesc=Ofereça aos clientes uma página de pagamento on-line do Stripe para pagamentos com cartões de crédito/cebit via <a href="http://www.stripe.com" target="_blank">Stripe</a> . Isso pode ser usado para permitir que seus clientes façam pagamentos ad-hoc ou para pagamentos relacionados a um determinado objeto Dolibarr (fatura, pedido, ...)
 StripeOrCBDoPayment=Pagar com cartão de crédito ou boleto
-STRIPE_PAYONLINE_SENDEMAIL=Endereço e-mail para aviso apos o pagamento (positivo ou nao)
-StripeDoPayment=Pagar com cartão de crédito ou débito (boleto)
+STRIPE_PAYONLINE_SENDEMAIL=Notificação por e-mail após uma tentativa de pagamento (sucesso ou falha)
 YouWillBeRedirectedOnStripe=Você será redirecionado na página de boleto protegida para inserir as informações do cartão de crédito
 SetupStripeToHavePaymentCreatedAutomatically=Configure seu boleto com url <b> %s </b> para que o pagamento seja criado automaticamente quando validado por boleto
 STRIPE_CGI_URL_V2=Url de boleto CGI módulo para pagamento
@@ -15,4 +14,16 @@ STRIPE_LIVE_SECRET_KEY=Chave ao vivo secreta
 STRIPE_LIVE_PUBLISHABLE_KEY=Chave editável
 StripeLiveEnabled=Boleto ativado (caso contrário teste / modo cx)
 StripeImportPayment=Importação de pagamentos de franquia
-ExampleOfTestCreditCard=Exemplo de cartão de crédito para teste: %s (válido), %s (erro CVC), %s (expirou), %s (falha na carga)
+ExampleOfTestCreditCard=Exemplo de cartão de crédito para teste: %s => válido, %s => error CVC, %s => expired, %s => charge fails
+StripeAccount=Conta Stripe
+StripeTransactionList=Lista de transações Stripe
+LocalID=ID local
+CardNumber=Número do cartão
+ExpiryDate=Data de validade
+CreateCustomerOnStripe=Crie um cliente na Stripe
+CreateCardOnStripe=Criar cartão no Stripe
+ShowInStripe=Mostrar na Stripe
+StripeUserAccountForActions=Conta de usuário a ser usada para notificação por e-mail de alguns eventos do Stripe (pagamentos Stripe)
+StripePayoutList=Lista de pagamentos do Stripe
+ToOfferALinkForTestWebhook=Link para configurar o Stripe WebHook para chamar o IPN (modo de teste)
+ToOfferALinkForLiveWebhook=Link para configurar Stripe WebHook para chamar o IPN (modo ao vivo)
diff --git a/htdocs/langs/pt_BR/suppliers.lang b/htdocs/langs/pt_BR/suppliers.lang
index ff80027fe85..85614b809bb 100644
--- a/htdocs/langs/pt_BR/suppliers.lang
+++ b/htdocs/langs/pt_BR/suppliers.lang
@@ -1,17 +1,38 @@
 # Dolibarr language file - Source file is en_US - suppliers
+Suppliers=Vendedores
+SuppliersInvoice=Fatura do fornecedores
+ShowSupplierInvoice=Mostrar fatura do fornecedores
+NewSupplier=Novo fornecedores
+ShowSupplier=Mostrar fornecedores
 TotalBuyingPriceMinShort=Total de precos de compra dos subprodutos
 TotalSellingPriceMinShort=Total de preços de venda de sub-produtos
 SomeSubProductHaveNoPrices=Algums dos sub-produtos nao tem um preco definido
 ChangeSupplierPrice=Modificar preço de compra
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Esta referencia de fornecedor ja esta asociada com a referenca: %s
+SupplierPrices=Preços de fornecedores
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Este código de fornec. já está associado com um produto %s
+NoRecordedSuppliers=Nenhum fornecedores gravado
+SupplierPayment=Pagamento do fornecedores
+SuppliersArea=Área do fornecedores
+RefSupplierShort=Ref. fornecedor
 Availability=Entrega
+ExportDataset_fournisseur_1=Faturas do fornecedores e detalhes da fatura
+ExportDataset_fournisseur_2=Faturas e pagamentos do fornecedores
+ExportDataset_fournisseur_3=Pedidos de compra e detalhes do pedido
 ConfirmApproveThisOrder=Tem certeza que deseja aprovar o pedido <b>%s</b>?
 DenyingThisOrder=Negar esta pedido
 ConfirmDenyingThisOrder=Você tem certeza que deseja negar este pedido <b>%s</b>?
 ConfirmCancelThisOrder=Você tem certeza que deseja cancelar este pedido <b>%s</b>?
-NbDaysToDelivery=Atraso de entrega em dias
-DescNbDaysToDelivery=O maior atraso de entregar os produtos a partir deste fim
+AddSupplierOrder=Criar pedido
+AddSupplierInvoice=Criar fatura de fornecedores
+ListOfSupplierProductForSupplier=Lista de produtos e preços para o fornecedores <b> %s </ b>
+SentToSuppliers=Enviado para fornecedores
+ListOfSupplierOrders=Lista de pedidos de compra
+MenuOrdersSupplierToBill=Pedidos de compra para fatura
+NbDaysToDelivery=Tempo de entrega (dias)
+DescNbDaysToDelivery=O maior atraso de entrega de produtos deste pedido
+SupplierReputation=Reputação do fornecedores
 DoNotOrderThisProductToThisSupplier=Não pedir
-NotTheGoodQualitySupplier=Qualidade inadequada
+NotTheGoodQualitySupplier=Baixa qualidade
 AllProductServicePrices=Todos os preços dos produtos / serviços
-AllProductReferencesOfSupplier=Todas as referências de produtos / serviços do fornecedor
+AllProductReferencesOfSupplier=Todos os produtos / Referencias de serviço do vendedor
+BuyingPriceNumShort=Preços de fornecedores
diff --git a/htdocs/langs/pt_BR/ticket.lang b/htdocs/langs/pt_BR/ticket.lang
index cd2484ddb52..c7ea52ddd64 100644
--- a/htdocs/langs/pt_BR/ticket.lang
+++ b/htdocs/langs/pt_BR/ticket.lang
@@ -25,11 +25,11 @@ Permission56001=Veja bilhetes
 Permission56002=Modificar bilhetes
 Permission56003=Excluir bilhetes
 Permission56004=Gerenciar bilhetes
-Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56005=Veja ingressos de todos os terceiros (não são efetivos para usuários externos, sempre limitados a terceiros de que dependem)
 
-TicketDictType=Ticket - Types
-TicketDictCategory=Ticket - Groupes
-TicketDictSeverity=Ticket - Severities
+TicketDictType=Tiquetes - Tipos
+TicketDictCategory=Tiquetes - Grupos
+TicketDictSeverity=Tiquete - Severidades
 TicketTypeShortBUGSOFT=Lógica do sistema de desconexão
 TicketTypeShortBUGHARD=Disfonctionnement matériel
 TicketTypeShortCOM=Questão comercial
@@ -53,25 +53,26 @@ TypeContact_ticket_external_SUPPORTCLI=Contato com o cliente / acompanhamento de
 TypeContact_ticket_external_CONTRIBUTOR=Contribuidor externo
 
 OriginEmail=Fonte de e-mail
-Notify_TICKET_SENTBYMAIL=Send ticket message by email
+Notify_TICKET_SENTBYMAIL=Envio do ticket por e-mail
 
 # Status
 NotRead=Não lido
 Read=Ler
-Answered=Respondidas
 Assigned=Atribuído
 InProgress=Em progresso
+NeedMoreInformation=Aguardando informação
+Answered=Respondidas
 Waiting=Aguardando
 Closed=Fechada
 Deleted=Excluído
 
 # Dict
 Type=Tipo
-Category=Analytic code
+Category=Código analitico
 Severity=Gravidade
 
 # Email templates
-MailToSendTicketMessage=Para enviar email da mensagem do ticket
+MailToSendTicketMessage=Para enviar e-mail da mensagem do ticket
 
 #
 # Admin page
@@ -80,21 +81,21 @@ TicketSetup=Configuração do módulo de ticket
 TicketSettings=Configurações
 TicketSetupPage=
 TicketPublicAccess=Uma interface pública que não requer identificação está disponível no seguinte url
-TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
+TicketSetupDictionaries=O tipo do tiquete, severidade e código analítico sao configuraveis a partir do dicionário
 TicketParamModule=Configuração da variável do módulo
 TicketParamMail=Configuração de e-mail
 TicketEmailNotificationFrom=E-mail de notificação de
 TicketEmailNotificationFromHelp=Usado na resposta da mensagem do ticket pelo exemplo
 TicketEmailNotificationTo=E-mail de notificações para
-TicketEmailNotificationToHelp=Envie notificações por email para este endereço.
-TicketNewEmailBodyLabel=Text message sent after creating a ticket
-TicketNewEmailBodyHelp=O texto especificado aqui será inserido no email confirmando a criação de um novo ticket a partir da interface pública. Informações sobre a consulta do ticket são automaticamente adicionadas.
+TicketEmailNotificationToHelp=Envie notificações por e-mail para este endereço.
+TicketNewEmailBodyLabel=Mensagem de texto enviada após a criação do tiquete
+TicketNewEmailBodyHelp=O texto especificado aqui será inserido no e-mail confirmando a criação de um novo ticket a partir da interface pública. Informações sobre a consulta do ticket são automaticamente adicionadas.
 TicketParamPublicInterface=Configuração da interface pública
-TicketsEmailMustExist=Exigir um endereço de email existente para criar um ticket
-TicketsEmailMustExistHelp=Na interface pública, o endereço de email já deve estar preenchido no banco de dados para criar um novo ticket.
+TicketsEmailMustExist=Exigir um endereço de e-mail existente para criar um ticket
+TicketsEmailMustExistHelp=Na interface pública, o endereço de e-mail já deve estar preenchido no banco de dados para criar um novo ticket.
 PublicInterface=Interface pública
-TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
-TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
+TicketUrlPublicInterfaceLabelAdmin=URL alternativa para interface pública
+TicketUrlPublicInterfaceHelpAdmin=É possivel definir um alias para o servidor WEB e desse modo disponibilizar uma interface pública com outra URL (o servidor deve funcionar como um proxy para a nova URL)
 TicketPublicInterfaceTextHomeLabelAdmin=Texto de boas vindas da interface pública
 TicketPublicInterfaceTextHome=Você pode criar um ticket ou visualização de suporte existente a partir do ticket de rastreamento do identificador.
 TicketPublicInterfaceTextHomeHelpAdmin=O texto aqui definido aparecerá na home page da interface pública.
@@ -105,33 +106,34 @@ TicketPublicInterfaceTextHelpMessageHelpAdmin=Este texto aparecerá acima da ár
 ExtraFieldsTicket=Atributos extras
 TicketCkEditorEmailNotActivated=O editor de HTML não está ativado. Coloque o conteúdo de FCKEDITOR_ENABLE_MAIL em 1 para obtê-lo.
 TicketsDisableEmail=Não envie e-mails para criação de bilhetes ou gravação de mensagens
-TicketsDisableEmailHelp=Por padrão, os emails são enviados quando novos bilhetes ou mensagens são criados. Ative esta opção para desativar * todas as notificações por e-mail
-TicketsLogEnableEmail=Ativar log por email
+TicketsDisableEmailHelp=Por padrão, os e-mails são enviados quando novos bilhetes ou mensagens são criados. Ative esta opção para desativar * todas as notificações por e-mail
+TicketsLogEnableEmail=Ativar log por e-mail
 TicketsLogEnableEmailHelp=A cada alteração, um e-mail será enviado ** para cada contato ** associado ao ticket.
 TicketParams=Params
 TicketsShowModuleLogo=Exibe o logotipo do módulo na interface pública
 TicketsShowModuleLogoHelp=Ative esta opção para ocultar o módulo de logotipo nas páginas da interface pública
 TicketsShowCompanyLogo=Exibir o logotipo da empresa na interface pública
 TicketsShowCompanyLogoHelp=Ative esta opção para ocultar o logotipo da empresa principal nas páginas da interface pública
-TicketsEmailAlsoSendToMainAddress=Também enviar notificação para o endereço de email principal
-TicketsEmailAlsoSendToMainAddressHelp=Ative esta opção para enviar um email para o endereço "Notificação de email de" (veja a configuração abaixo)
-TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
+TicketsEmailAlsoSendToMainAddress=Também enviar notificação para o endereço de e-mail principal
+TicketsEmailAlsoSendToMainAddressHelp=Ative esta opção para enviar um e-mail para o endereço "Notificação de e-mail de" (veja a configuração abaixo)
+TicketsLimitViewAssignedOnly=Restringir a exibição aos tiquetes atribuídos ao usuário atual (não efetivo para usuários externos, sempre limitado à terceira parte da qual eles dependem)
 TicketsLimitViewAssignedOnlyHelp=Somente bilhetes atribuídos ao usuário atual ficarão visíveis. Não se aplica a um usuário com direitos de gerenciamento de bilhetes.
 TicketsActivatePublicInterface=Ativar interface pública
 TicketsActivatePublicInterfaceHelp=A interface pública permite que qualquer visitante crie bilhetes.
 TicketsAutoAssignTicket=Atribuir automaticamente o usuário que criou o ticket
 TicketsAutoAssignTicketHelp=Ao criar um ticket, o usuário pode ser atribuído automaticamente ao ticket.
 TicketNumberingModules=Módulo de numeração de bilhetes
-TicketNotifyTiersAtCreation=Notify third party at creation
+TicketNotifyTiersAtCreation=Notificar o terceiro no momento do terceiro
 TicketGroup=Grupo
-TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
+TicketsDisableCustomerEmail=Sempre disabilitar e-mail quando um ticket é criado de uma interface pública
 #
 # Index & list page
 #
 TicketsIndex=Bilhete - em casa
 TicketList=Lista de bilhetes
-TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
+TicketAssignedToMeInfos=Esta página mostra os tíquetes criado pelo ou assinalados para o usuário corrente
 NoTicketsFound=Nenhum bilhete encontrado
+NoUnreadTicketsFound=No unread ticket found
 TicketViewAllTickets=Ver todos os bilhetes
 TicketViewNonClosedOnly=Ver apenas bilhetes abertos
 TicketStatByStatus=Tickets por status
@@ -148,7 +150,7 @@ CreatedBy=Criado por
 NewTicket=Novo Bilhete
 SubjectAnswerToTicket=Bilhete de resposta
 TicketTypeRequest=Tipo de solicitação
-TicketCategory=Analytic code
+TicketCategory=Código analitico
 SeeTicket=Veja o ingresso
 TicketMarkedAsRead=O ticket foi marcado como lido
 TicketReadOn=Leia
@@ -158,7 +160,7 @@ TicketHistory=Histórico de bilhetes
 AssignUser=Atribuir ao usuário
 TicketAssigned=Bilhete agora é atribuído
 TicketChangeType=Alterar tipo
-TicketChangeCategory=Change analytic code
+TicketChangeCategory=Modifica o código analítico
 TicketChangeSeverity=Alterar gravidade
 TicketAddMessage=Adiciona uma mensagem
 AddMessage=Adiciona uma mensagem
@@ -181,19 +183,19 @@ TicketMarkedAsClosed=Bilhete marcado como fechado
 TicketDurationAuto=Duração calculada
 TicketDurationAutoInfos=Duração calculada automaticamente a partir de intervenções relacionadas
 TicketUpdated=Bilhete atualizado
-SendMessageByEmail=Enviar mensagem por email
+SendMessageByEmail=Enviar mensagem por e-mail
 TicketNewMessage=Nova mensagem
-ErrorMailRecipientIsEmptyForSendTicketMessage=O destinatário está vazio. Nenhum email enviado
+ErrorMailRecipientIsEmptyForSendTicketMessage=O destinatário está vazio. Nenhum e-mail enviado
 TicketGoIntoContactTab=Por favor, vá para a aba "Contatos" para selecioná-los
 TicketMessageMailIntro=Introdução
-TicketMessageMailIntroHelp=Este texto é adicionado apenas no início do email e não será salvo.
+TicketMessageMailIntroHelp=Este texto é adicionado apenas no início do e-mail e não será salvo.
 TicketMessageMailIntroLabelAdmin=Introdução à mensagem ao enviar e-mail
 TicketMessageMailIntroText=Olá, <br> Uma nova resposta foi enviada em um ticket que você contata. Aqui está a mensagem: <br>
 TicketMessageMailIntroHelpAdmin=Este texto será inserido antes do texto da resposta a um ticket.
 TicketMessageMailSignature=Assinatura
-TicketMessageMailSignatureHelp=Este texto é adicionado somente no final do email e não será salvo.
+TicketMessageMailSignatureHelp=Este texto é adicionado somente no final do e-mail e não será salvo.
 TicketMessageMailSignatureText=<p> Atenciosamente, </ p> <p> - </ p>
-TicketMessageMailSignatureLabelAdmin=Assinatura do email de resposta
+TicketMessageMailSignatureLabelAdmin=Assinatura do e-mail de resposta
 TicketMessageMailSignatureHelpAdmin=Este texto será inserido após a mensagem de resposta.
 TicketMessageHelp=Apenas este texto será salvo na lista de mensagens no cartão do ticket.
 TicketMessageSubstitutionReplacedByGenericValues=As variáveis ​​de substituição são substituídas por valores genéricos.
@@ -202,7 +204,7 @@ TicketTimeToRead=Tempo decorrido antes de ler
 TicketContacts=Bilhete de contatos
 TicketDocumentsLinked=Documentos vinculados ao ticket
 ConfirmReOpenTicket=Confirmar reabrir este ticket?
-TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
+TicketMessageMailIntroAutoNewPublicMessage=Uma nova mensagem foi postado no tíquete com o assunto %s
 TicketAssignedToYou=Bilhete atribuído
 TicketAssignedEmailBody=Você recebeu o bilhete # %s por %s
 MarkMessageAsPrivate=Marcar mensagem como privada
@@ -211,25 +213,25 @@ TicketEmailOriginIssuer=Emissor na origem dos bilhetes
 InitialMessage=Mensagem inicial
 LinkToAContract=Link para um contrato
 TicketPleaseSelectAContract=Selecione um contrato
-UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
+UnableToCreateInterIfNoSocid=Não é possivel criar uma intervenção quando não existe um terceiro definido
 TicketMailExchanges=Trocas de correio
 TicketInitialMessageModified=Mensagem inicial modificada
 TicketMessageSuccesfullyUpdated=Mensagem atualizada com sucesso
 TicketChangeStatus=Alterar status
-TicketConfirmChangeStatus=Confirm the status change: %s ?
-TicketLogStatusChanged=Status changed: %s to %s
+TicketConfirmChangeStatus=Confirma alteração de situação %s ?
+TicketLogStatusChanged=Situação modificada  de%s para %s 
 TicketNotNotifyTiersAtCreate=Não notificar a empresa na criação
 Unread=Não lida
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Ticket %s read by %s
+TicketLogMesgReadBy=Tíquete %s lido por %s
 NoLogForThisTicket=Ainda não há registro para este ticket
-TicketLogAssignedTo=Ticket %s assigned to %s
-TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
-TicketLogClosedBy=Ticket %s closed by %s
-TicketLogReopen=Ticket %s re-opened
+TicketLogAssignedTo=Tíquete %s assinalado para %s
+TicketLogPropertyChanged=Tíquete %s modificado : Classificação passou de %s para %s
+TicketLogClosedBy=íquete %s encerrado por %s
+TicketLogReopen=Tíquete %s re-aberto
 
 #
 # Public pages
@@ -243,38 +245,41 @@ MesgInfosPublicTicketCreatedWithTrackId=Um novo ticket foi criado com o ID %s.
 PleaseRememberThisId=Por favor, mantenha o número de rastreamento que podemos perguntar mais tarde.
 TicketNewEmailSubject=Confirmação de criação de bilhetes
 TicketNewEmailSubjectCustomer=Novo ticket de suporte
-TicketNewEmailBody=Este é um email automático para confirmar que você registrou um novo ticket.
-TicketNewEmailBodyCustomer=Este é um email automático para confirmar que um novo ticket acaba de ser criado na sua conta.
+TicketNewEmailBody=Este é um e-mail automático para confirmar que você registrou um novo ticket.
+TicketNewEmailBodyCustomer=Este é um e-mail automático para confirmar que um novo ticket acaba de ser criado na sua conta.
 TicketNewEmailBodyInfosTicket=Informações para monitorar o ticket
-TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
+TicketNewEmailBodyInfosTrackId=Número de acompanhamento do tíquete : %s
 TicketNewEmailBodyInfosTrackUrl=Você pode ver o progresso do ticket clicando no link acima.
 TicketNewEmailBodyInfosTrackUrlCustomer=Você pode ver o progresso do ticket na interface específica clicando no seguinte link
 TicketEmailPleaseDoNotReplyToThisEmail=Por favor, não responda diretamente a este e-mail! Use o link para responder na interface.
 TicketPublicInfoCreateTicket=Este formulário permite que você registre um ticket de suporte em nosso sistema de gerenciamento.
 TicketPublicPleaseBeAccuratelyDescribe=Por favor descreva com precisão o problema. Forneça o máximo de informações possíveis para permitir que identifiquemos sua solicitação corretamente.
 TicketPublicMsgViewLogIn=Insira o código de acompanhamento do bilhete
-TicketTrackId=Public Tracking ID
-OneOfTicketTrackId=One of your tracking ID
-ErrorTicketNotFound=Ticket with tracking ID %s not found!
+TicketTrackId=ID de acompanhamento público
+OneOfTicketTrackId=Um de seu ID de acompanhamento
+ErrorTicketNotFound=Tíquete com número %s não encontrado
 Subject=Assunto
 ViewTicket=Visualizar passagem
 ViewMyTicketList=Ver minha lista de bilhetes
-ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
+ErrorEmailMustExistToCreateTicket=Erro : Endereço de e-mail não encontrado em nosso banco de dados
 TicketNewEmailSubjectAdmin=Novo ticket criado
-TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
+TicketNewEmailBodyAdmin=<p>O ticket acabou de ser criado com a ID #%s, consulte as informações:</p>
 SeeThisTicketIntomanagementInterface=Veja o ticket na interface de gerenciamento
-TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
-ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
-
+TicketPublicInterfaceForbidden=A interface pública dos tickets não foi ativada
+ErrorEmailOrTrackingInvalid=Valor ruim para o ID ou o e-mail de rastreamento
+OldUser=Old user
+NewUser=Novo usuário
+NumberOfTicketsByMonth=Number of tickets per month
+NbOfTickets=Number of tickets
 # notifications
 TicketNotificationEmailSubject=Bilhete %s atualizado
 TicketNotificationEmailBody=Esta é uma mensagem automática para notificá-lo de que o ticket %s acabou de ser atualizado
 TicketNotificationRecipient=Destinatário da notificação
 TicketNotificationLogMessage=Mensagem de log
 TicketNotificationEmailBodyInfosTrackUrlinternal=Visualizar ticket na interface
-TicketNotificationNumberEmailSent=Notification email sent: %s
+TicketNotificationNumberEmailSent=E-mail de notificação enviado: %s
 
-ActionsOnTicket=Events on ticket
+ActionsOnTicket=Eventos no ticket
 
 #
 # Boxes
diff --git a/htdocs/langs/pt_BR/trips.lang b/htdocs/langs/pt_BR/trips.lang
index 97733be6018..bc636713f41 100644
--- a/htdocs/langs/pt_BR/trips.lang
+++ b/htdocs/langs/pt_BR/trips.lang
@@ -54,6 +54,7 @@ EX_PAR_VP=Estacionamento PV
 EX_CAM_VP=Manutenção e reparo de PV
 DefaultCategoryCar=Modo de transporte padrão
 DefaultRangeNumber=Número da faixa padrão
+UploadANewFileNow=Enviar um novo documento agora
 Error_EXPENSEREPORT_ADDON_NotDefined=Erro, a regra para a referência de numeração de relatório de despesas não foi definida na configuração do módulo 'Relatório de Despesas'
 ErrorDoubleDeclaration=Você declarou outro relatório de despesas em um intervalo de datas semelhante.
 AucuneLigne=Não há relatório de despesas declaradas ainda
@@ -121,3 +122,4 @@ nolimitbyEX_EXP=por linha (sem limitação)
 CarCategory=Categoria de carro
 ExpenseRangeOffset=Quantidade de deslocamento: %s
 RangeIk=Alcance de quilometragem
+AttachTheNewLineToTheDocument=Adicionar uma linha para um documento enviado
diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
index 43f6e19e72f..a832797dc3e 100644
--- a/htdocs/langs/pt_BR/users.lang
+++ b/htdocs/langs/pt_BR/users.lang
@@ -10,6 +10,7 @@ PasswordChangedTo=Senha alterada em: %s
 SubjectNewPassword=Sua nova senha para %s
 GroupRights=Permissões do grupo
 UserRights=Permissões do usuário
+UserGUISetup=Configuração de exibição do usuário
 DisableAUser=Desativar um usuário
 DeleteUser=Excluir
 DeleteAUser=Excluir um usuário
@@ -28,6 +29,8 @@ NameNotDefined=O nome não está definido
 ListOfUsers=Lista de usuário
 SuperAdministrator=Super Administrador
 SuperAdministratorDesc=Administrador geral
+DefaultRights=Permissões padrão
+DefaultRightsDesc=Defina aqui as permissões <u>padrão</u> que são automaticamente concedidas a um <u>novo</u> usuário (para modificar permissões para usuários existentes, vá para o cartão de usuário).
 DolibarrUsers=Usuário Dolibarr
 LastName=Último nome
 FirstName=Primeiro nome
@@ -57,6 +60,8 @@ CreateDolibarrThirdParty=Criar um fornecedor
 LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr
 ExportDataset_user_1=Usuários e suas propriedades
 DomainUser=Usuário de Domínio
+CreateInternalUserDesc=Este formulário permite que você crie um usuário interno em sua empresa / organização. Para criar um usuário externo (cliente, fornecedor, etc.), use o botão 'Criar usuário Dolibarr' do cartão de contato de terceiros.
+InternalExternalDesc=Um usuário <b>interno</b> é um usuário que faz parte de sua empresa/organização. <br> Um usuário <b>externo</b> é um cliente, fornecedor ou outro. <br><br> Em ambos os casos, permissões definem direitos no Dolibarr, também o usuário externo pode ter um gerenciador de menu diferente do usuário interno (Veja Início - Configurações - Exibir)
 PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertence o usuário.
 UserWillBeInternalUser=Usuario criado sera um usuario interno (porque nao esta conectado a um particular terceiro)
 UserWillBeExternalUser=Usuario criado sera um usuario externo (porque esta conectado a um particular terceiro)
@@ -76,8 +81,8 @@ LoginToCreate=Login a Criar
 NameToCreate=Nome do Fornecedor a Criar
 YourRole=Suas funções
 YourQuotaOfUsersIsReached=Sua cota de usuarios ativos atingida !
-NbOfUsers=Não de usuários
-NbOfPermissions=No. de permissões
+NbOfUsers=N°. de usuários
+NbOfPermissions=N°. de permissões
 DontDowngradeSuperAdmin=Somente um Super Administrador pode rebaixar um Super Administrador
 HierarchicView=Visão hierárquica
 UseTypeFieldToChange=Use campo Tipo para mudar
@@ -89,3 +94,6 @@ ColorUser=Cor do usuario
 UserAccountancyCode=Código de contabilidade do usuário
 UserLogoff=Usuário desconetado
 UserLogged=Usuário Conectado
+DateEmployment=Data de Início do Emprego
+DateEmploymentEnd=Data de término do emprego
+CantDisableYourself=Você não pode desativar seu próprio registro de usuário
diff --git a/htdocs/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang
index d813f54ecf2..91b0123fe9f 100644
--- a/htdocs/langs/pt_BR/website.lang
+++ b/htdocs/langs/pt_BR/website.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - website
+WebsiteSetupDesc=Aqui você pode criar os sites que você deseja usar. Em seguida, vá para o menu Websites para editá-los.
 DeleteWebsite=Apagar website
 WEBSITE_PAGE_EXAMPLE=Página da Web para usar como exemplo
 WEBSITE_PAGENAME=Nome da Página/Apelido
@@ -7,7 +8,7 @@ WEBSITE_CSS_URL=URL do arquivo CSS externo.
 WEBSITE_HTML_HEADER=Adição na parte inferior do cabeçalho HTML (comum a todas as páginas)
 WEBSITE_ROBOT=Arquivo robô (robots.txt)
 HtmlHeaderPage=Cabeçalho HTML (específico apenas para esta página)
-PageNameAliasHelp=Nome ou alias da página. Este alias também é usado para forjar um URL de SEO quando o site é executado a partir de um host virtual de um servidor Web (como o Apacke, o Nginx, ...). Use o botão "<strong> %s </ strong>" para editar este alias.
+PageNameAliasHelp=Nome ou alias da página. <br> Esse alias também é usado para forjar uma URL de SEO quando o site é executado a partir de um host virtual de um servidor da Web (como Apacke, Nginx, ...). Use o botão <strong>%s</strong> para editar este alias.
 EditTheWebSiteForACommonHeader=Nota: Se você quiser definir um cabeçalho personalizado para todas as páginas, edite o cabeçalho no nível do site em vez de na página / recipiente.
 MediaFiles=Biblioteca de mídias
 AddWebsite=Adicionar site
@@ -15,6 +16,7 @@ Webpage=Página WEB / container
 AddPage=Adicionar página / recipiente
 HomePage=Pagina inicial
 PageContainer=Página / recipiente
+PreviewOfSiteNotYetAvailable=Pré-visualização do seu site <strong>%s</strong> ainda não estão disponíveis. Você deve primeiro <strong>Importar um modelo de site completo</strong> ou apenas <strong>Adicionar uma página / contêiner</strong>
 RequestedPageHasNoContentYet=A página solicitada com id %s ainda não possui conteúdo ou o arquivo de cache .tpl.php foi removido. Edite o conteúdo da página para resolver isso.
 PageContent=Página / Contenair
 PageDeleted=Página / Contenair '%s' do site %s excluído
@@ -24,26 +26,39 @@ ViewPageInNewTab=Visualizar página numa nova aba
 SetAsHomePage=Definir com Página Inicial
 RealURL=URL real
 ViewWebsiteInProduction=Visualizar website usando origem URLs
+SetHereVirtualHost=<u>Use com o Apache / NGinx / ...</u> <br> Se você puder criar, no seu servidor web (Apache, Nginx, ...), um Host Virtual dedicado com PHP habilitado e um diretório Root no <br> <strong>%s</strong> <br> em seguida, defina o nome do host virtual que você criou nas propriedades do site, para que a visualização possa ser feita também usando esse acesso ao servidor web dedicado, em vez do servidor Dolibarr interno.
 YouCanAlsoTestWithPHPS=<u> Usar com servidor embutido em PHP </ u> <br> No ambiente de desenvolvimento, você pode preferir testar o site com o servidor da Web incorporado em PHP (o PHP 5.5 é necessário) executando o <strong> php -S 0.0. 0,0: 8080 -t %s </ strong>
+TestDeployOnWeb=Testar / implementar na web
 PreviewSiteServedByWebServer=<u> Visualize %s em uma nova guia. </ u> <br> <br> O %s será servido por um servidor web externo (como Apache, Nginx, IIS). Você deve instalar e configurar este servidor antes de apontar para o diretório: <br> <strong> %s </ strong> <br> URL servido por servidor externo: <br> <strong> %s </ strong>
 PreviewSiteServedByDolibarr=<u> Visualize %s em uma nova guia. </ u> <br> <br> O %s será servido pelo servidor Dolibarr para que não seja necessário instalar qualquer servidor web extra (como Apache, Nginx, IIS). < br> O inconveniente é que o URL das páginas não é amigável e comece com o caminho do seu Dolibarr. URL de URL servido por Dolibarr: <br> <strong> %s </ strong> <br> <br> Para usar o seu próprio servidor web externo para servir este site, crie um host virtual em seu servidor web que aponte para o diretório <br> <strong> %s </ strong> <br> e digite o nome deste servidor virtual e clique no outro botão de visualização .
 VirtualHostUrlNotDefined=URL do host virtual veiculado pelo servidor web externo não definido
 NoPageYet=Ainda não há páginas
 SyntaxHelp=Ajuda sobre dicas de sintaxe específicas
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Você pode incluir código PHP nesta fonte usando tags <strong>&lt;?php ?&gt;</strong> . As seguintes variáveis globais estão disponíveis: $ conf, $ db, $ mysoc, $ usuário, $ website, $ websitepage, $ weblangs. <br><br><span class="fa fa-bug"></span> Você também pode incluir o conteúdo de outra Página / Conteúdo com a seguinte sintaxe: <br> <strong>&lt;?php includeContainer (&#39;alias_of_container_to_include&#39;); ?&gt;</strong> <br><br><span class="fa fa-bug"></span> Você pode fazer um redirecionamento para outra Página / Contêiner com a seguinte sintaxe (Nota: não produza nenhum conteúdo antes do redirecionamento): <br> <strong>&lt;? php redirectToContainer (&#39;alias_of_container_to_redirect_to&#39;); ?&gt;</strong> <br><br><span class="fa fa-link"></span> Para adicionar um link para outra página, use a sintaxe: <br> <strong>&lt;a href=&quot;alias_of_page_to_link_to.php&quot;&gt; mylink &lt;a&gt;</strong> <br><br><span class="fa fa-download"></span> Para incluir um <strong>link para baixar</strong> um arquivo armazenado no diretório de <strong>documentos</strong> , use o wrapper <strong>document.php</strong> : <br> Exemplo, para um arquivo em documents / ecm (precisa ser registrado), a sintaxe é: <br> <strong>&lt;a href=&quot;/document.php?modulepart=ecm&amp;file=[relative_dir/]filename.ext&quot;&gt;</strong> <br> Para um arquivo em documents / medias (diretório aberto para acesso público), a sintaxe é: <br> <strong>&lt;a href=&quot;/document.php?modulepart=medias&amp;file=[relative_dir/]filename.ext&quot;&gt;</strong> <br> Para um arquivo compartilhado com um link de compartilhamento (acesso aberto usando a chave de hash de compartilhamento do arquivo), a sintaxe é: <br> <strong>&lt;a href=&quot;/document.php?hashp=publicsharekeyoffile&quot;&gt;</strong> <br><br><span class="fa fa-picture-o"></span> Para incluir uma <strong>imagem</strong> armazenada no diretório de <strong>documentos</strong> , use o wrapper <strong>viewimage.php</strong> : <br> Exemplo, para uma imagem em documentos / mídias (diretório aberto para acesso público), a sintaxe é: <br> <strong>&lt;img src = &quot;/ viewimage.php? modulepart = mídias &amp; arquivo = [relative_dir /] nome_do_arquivo.ext&quot;&gt;</strong> <br>
 ClonePage=Página clone / container
 CloneSite=Site Clone
+SiteAdded=Site adicionado
 ConfirmClonePage=Digite o código / alias da nova página e se é uma tradução da página clonada.
 CreateByFetchingExternalPage=Criar página / recipiente obtendo página do URL externo ...
-FetchAndCreate=Procure e crie
+OrEnterPageInfoManually=Ou você pode criar uma página do zero ou de um modelo de página ...
+FetchAndCreate=Procure e comece a criar
 BlogPost=Postagem do blog
+WebsiteAccounts=Conta do website
 AddWebsiteAccount=Criar conta do site
 BackToListOfThirdParty=Voltar à lista para Terceiros
 DisableSiteFirst=Desativar o site primeiro
 MyContainerTitle=Título do meu site
 WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar a tabela da conta do site
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ative a tabela para armazenar contas do site (login / senha) para cada site /  terceiros
 YouMustDefineTheHomePage=Você deve primeiro definir a Home page padrão
+OnlyEditionOfSourceForGrabbedContentFuture=Atenção: A criação de uma página da web através da importação de uma página web externa é reservada para usuários experientes. Dependendo da complexidade da página de origem, o resultado da importação pode diferir do original. Além disso, se a página de origem usar estilos CSS comuns ou javascript conflitante, isso poderá quebrar a aparência ou os recursos do editor de site ao trabalhar nesta página. Esse método é uma maneira mais rápida de criar uma página, mas é recomendável criar sua nova página a partir do zero ou de um modelo de página sugerido. <br> Note também que as edições de fontes HTML serão possíveis quando o conteúdo da página for inicializado, editando a partir de uma página externa (o editor 'Online' NÃO estará disponível)
 OnlyEditionOfSourceForGrabbedContent=Apenas uma edição de fonte HTML é possível quando o conteúdo foi extraído de um site externo
 GrabImagesInto=Pegue também imagens encontradas no css e na página.
 WebsiteRootOfImages=Diretório raiz para imagens do site
-AliasPageAlreadyExists=Alias ​​página <strong> %s </ strong> já existe
+AliasPageAlreadyExists=Página de alias <strong>%s</strong> já existe
 CorporateHomePage=Página inicial corporativa
+ThisPageIsTranslationOf=Esta página/conteúdo é traduzido de
+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.
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index 89db209e4bd..b7e6e587e31 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -12,18 +12,17 @@ WithdrawalsLines=Linhas do pedido para Débito direto
 RequestStandingOrderToTreat=Solicitação para processar o pagamento do pedido por Débito direto
 RequestStandingOrderTreated=Solicitação de pagamento do pedido por Débito direto processada
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Ainda não é possível. Retirar o status deve ser definido como 'creditado' antes de declarar rejeitar em linhas específicas.
-NbOfInvoiceToWithdraw=Nº da Nota Fiscal qualificada com ordem de débito direto
-NbOfInvoiceToWithdrawWithInfo=Nº da fatura do cliente com pedidos para pagamento por Débito direto com informação bancária definida
+NbOfInvoiceToWithdrawWithInfo=Nº. de fatura do cliente com ordens de pagamento por débito direto com informações definidas sobre a conta bancária
 InvoiceWaitingWithdraw=Fatura aguardando o Débito direto
 NoInvoiceToWithdraw=Nenhuma Nota Fiscal do cliente com aberto 'Ordem de débito direto' está aguardando. Vá na guia '%s' no cartão de Nota Fiscal para fazer um pedido.
-ResponsibleUser=Usuário Responsável dos Débitos Diretos
+ResponsibleUser=Usuário Responsável
+WithdrawalsSetup=Configuração do pagamento por Débito direto
 WithdrawStatistics=Estatísticas do pagamento por Débito direto
 WithdrawRejectStatistics=Estatísticas de recusa do pagamento por Débito direto
 LastWithdrawalReceipt=Últimos %s recibos de Débito direto
 MakeWithdrawRequest=Efetuar um pedido de débito direto
 WithdrawRequestsDone=%s solicitações de pagamento de débito direto gravadas
-ThirdPartyBankCode=Código Banco do Fornecedor
-NoInvoiceCouldBeWithdrawed=Nenhuma Nota Fiscal retirada com sucesso. Verifique se as Notas Fiscais estão em empresas com uma BAN padrão e que BAN possui um RUM com o modo <strong> %s </ strong>.
+ThirdPartyBankCode=Código bancário de terceiros
 ClassCredited=Classificar Acreditados
 ClassCreditedConfirm=Você tem certeza que querer marcar este pagamento como realizado em a sua conta bancaria?
 TransData=Data da transferência
@@ -40,14 +39,14 @@ StatusRefused=Negado
 StatusMotif1=Saldo insuficiente
 StatusMotif2=Solicitação contestada
 StatusMotif3=Nenhum pedido para pagamento por Débito direto
-StatusMotif4=Pedido do Cliente
+StatusMotif4=Pedido de venda
 StatusMotif8=Outras razões
 CreateGuichet=Apenas do escritório
 OrderWaiting=Aguardando resolução
 NotifyTransmision=Retirada de Transmissão
 NotifyCredit=Revogação de crédito
 NumeroNationalEmetter=Nacional Número Transmissor
-BankToReceiveWithdraw=Conta bancária para receber o Débito direto
+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
@@ -58,6 +57,7 @@ SetToStatusSent=Defina o status "arquivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Isso também registrará pagamentos em Notas Fiscais e classificá-las como "Paga" se permanecer para pagar é nulo
 StatisticsByLineStatus=Estatísticas por situação de linhas
 RUMLong=Unique Mandate Reference (Referência Única de Mandato)
+RUMWillBeGenerated=Se estiver vazio, uma UMR (Unique Mandate Reference) será gerada assim que as informações da conta bancária forem salvas.
 WithdrawMode=Modo de Débito direto (FRST ou RECUR)
 WithdrawRequestAmount=Quantidade de pedido de débito direto:
 WithdrawRequestErrorNilAmount=Não foi possível criar solicitação de débito direto para quantidade vazia.
@@ -70,6 +70,7 @@ SEPAFormYourBIC=Código Identificador do Seu Banco (BIC)
 ModeRECUR=Pagamento recorrente
 PleaseCheckOne=Favor marcar apenas um
 DirectDebitOrderCreated=Pedido de débito direto %s criado
+CreateForSepa=Crie um arquivo de débito direto
 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_BR/workflow.lang b/htdocs/langs/pt_BR/workflow.lang
index 3962126b57f..abd2e8e9b4c 100644
--- a/htdocs/langs/pt_BR/workflow.lang
+++ b/htdocs/langs/pt_BR/workflow.lang
@@ -1,13 +1,12 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Configuração do módulo de Fluxo de Trabalho
-WorkflowDesc=Este módulo é concebido para modificar o comportamento das ações automáticas para aplicação. Por padrão, o fluxo de trabalho está aberto (você pode fazer as coisas na ordem que você quiser). Você pode ativar as ações automáticas que você está interessado.
 ThereIsNoWorkflowToModify=Não há alterações do fluxo de trabalho disponíveis com os módulos ativados.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crie automaticamente uma ordem de cliente após a assinatura de uma proposta comercial (a nova ordem terá o mesmo valor que a proposta)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crie automaticamente uma fatura do cliente após a assinatura de uma proposta comercial (a nova fatura terá o mesmo valor que a proposta)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar automaticamente uma pedido de venda após a assinatura de uma proposta comercial (a nova ordem terá o mesmo valor que constar na proposta)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Criar automaticamente uma fatura de cliente depois que um contrato é validado
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crie automaticamente uma fatura do cliente após a conclusão de uma ordem do cliente (a nova fatura terá o mesmo valor do que o pedido)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifique a(s) proposta(s) de origem vinculada a faturada quando a ordem do cliente é definida como faturada (e se a quantidade da ordem for igual à quantidade total de propostas vinculadas assinadas)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classifique a(s) proposta(s) de origem vinculada a faturada quando a fatura do cliente é validada (e se o valor da fatura for igual ao montante total de propostas vinculadas assinadas)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifique a(s) ordem(s) do cliente de origem vinculada a faturar quando a fatura do cliente é validada (e se o valor da fatura for igual ao montante total de pedidos vinculados)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifique a(s) ordem(s) do cliente de origem vinculada a faturar quando a fatura do cliente é definida como paga (e se o valor da fatura for igual ao montante total de pedidos vinculados)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifique a ordem do cliente de origem vinculada a ser enviada quando uma remessa é validada (e se a quantidade enviada por todas as remessas for o mesmo que na ordem de atualização)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Criar automaticamente uma fatura após a conclusão do pedido (a nova fatura terá o mesmo valor que constar no pedido)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifique a proposta de origem vinculada como faturado quando a ordem do cliente é definida como faturado (e se a quantidade da ordem for igual à quantidade total de propostas vinculadas assinadas)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classificar a proposta de origem vinculada como faturado quando a fatura do cliente é validada (e se o valor da fatura é o mesmo que o valor total da proposta vinculada assinada)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifique pedidos do cliente de origem vinculada como faturado quando a fatura do cliente for validada (e se o valor da fatura for igual ao montante total de pedidos vinculados)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifique pedidos do cliente de origem vinculada como faturado quando a fatura do cliente constar o pagamento (e se o valor da fatura for igual ao montante total de pedidos vinculados)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifique pedidos do cliente de origem vinculada como enviados quando uma remessa for validada (e se a quantidade enviada por todas as remessas for o mesmo que na ordem de atualização)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classificar a proposta do fornecedor de origem vinculada como faturado quando a fatura do fornecedor for validada (e se o valor da fatura for o mesmo que o valor total da proposta vinculada)
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 9175601ad94..a7b48f70053 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Vinculação do relatório de despesas
 CreateMvts=Criar nova transação
 UpdateMvts=Modificação de uma transação
 ValidTransaction=Validar transação
-WriteBookKeeping=Registar transações no Livro Razão
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Livro Razão
 AccountBalance=Saldo da conta
 ObjectsRef=Ref de objeto de origem
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contabilística padrão para produtos comprados (usado se não for definida na folha de produto)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta contabilística padrão para produtos vendidos (utilizada se não for definida na folha de produto)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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=Conta contabilística padrão para compra de serviços (usada se não for definida na folha de serviço)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contabilística padrão para serviços vendidos (usada se não for definida na folha de serviço)
 
@@ -177,6 +177,7 @@ LabelAccount=Etiqueta de conta
 LabelOperation=Operação de etiqueta
 Sens=Sentido
 LetteringCode=Código de rotulação
+Lettering=Lettering
 Codejournal=Diário
 JournalLabel=Journal label
 NumPiece=Número da peça
@@ -288,8 +289,10 @@ 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=Exportar CSV configurável
-Modelcsv_FEC=Exportação FEC (Art. L47 A) (Teste)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=ID de plano de contas
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=Esta página pode ser usada para definir uma conta padrão a
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=Opções
 OptionModeProductSell=Modo de vendas
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Modo de compras
 OptionModeProductSellDesc=Mostrar todos os produtos com conta contabilística para as vendas.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Mostrar todos os produtos com conta contabilística para as compras.
 CleanFixHistory=Remover o código contábil das linhas que não existem nos gráficos de contas
 CleanHistory=Repor todas as vinculações para o ano selecionado
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 83feda961f7..942139f6e01 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Se tiver um grande número de terceiros (> 100 0
 UseSearchToSelectContactTooltip=Se você tiver grande número de contactos (> 100 000), você pode aumentar a velocidade, definindo a constante CONTACT_DONOTSEARCH_ANYWHERE para 1 em Configuração -> Outros. A pesquisa será então limitada ao início da sequência de caracteres.
 DelaiedFullListToSelectCompany=Aguarde até que uma tecla seja pressionada antes de carregar o conteúdo da lista de combinação de terceiros. <br> Isso pode aumentar o desempenho se você tiver um grande número de terceiros, mas é menos conveniente.
 DelaiedFullListToSelectContact=Aguarde até que uma tecla seja pressionada antes de carregar o conteúdo da lista de combinação de contatos. <br> Isso pode aumentar o desempenho se você tiver um grande número de contatos, mas for menos conveniente)
-NumberOfKeyToSearch=Número de carateres para acionar a procura: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Não está disponível quando o Ajax está desativado
 AllowToSelectProjectFromOtherCompany=No documento de um terceiro, pode escolher um projeto associado a outro terceiro
 JavascriptDisabled=JavaScript desativado
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=Este é o nome do campo HTML. O conhecimento técnico
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Ativar o uso de tradução sobrescrita
 GoIntoTranslationMenuToChangeThis=Uma tradução foi encontrada para a chave com este código. Para alterar este valor, você deve editá-lo em Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Porta
 VirtualServerName=Nome do servidor virtual
 OS=SO
 PhpWebLink=Ligação Web-PHP
-Browser=Navegador
 Server=Servidor
 Database=Base de dados
 DatabaseServer=Hospedeiro da base de dados
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Esta informação do sistema é uma informação técnica acessí
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edite as informações da empresa / entidade. Clique no botão "%s" ou "%s" na parte inferior da página.
 AccountantDesc=Edite os detalhes do seu contador / contabilista
-AccountantFileNumber=Número do arquivo
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Aplicações/módulos disponíveis
 ToActivateModule=Para ativar os módulos, vá para a Área (Início->Configuração->Módulos).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Módulo de numeração de faturas e entregas
 BillsPDFModules=Modelo de documentos de faturas
 BillsPDFModulesAccordindToInvoiceType=Modelos de documentos de faturas de acordo com o tipo de fatura
 PaymentsPDFModules=Modelos de documentos de pagamento
-CreditNote=Nota de crédito
-CreditNotes=Notas de crédito
 ForceInvoiceDate=Forçar a data de fatura para a data de validação
 SuggestedPaymentModesIfNotDefinedInInvoice=Formas de pagamento sugeridas para faturas por defeito, se não estiverem definidas explicitamente
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Gráfico de conta carregado
 SocialNetworkSetup=Configuração do módulo Redes Sociais
 EnableFeatureFor=Ativar recursos para <strong> %s </ strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Trocar o remetente e o endereço do destinatário no PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Coletor de e-mail
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host do servidor IMAP de e-mail
 MailboxSourceDirectory=Diretório de origem da caixa de correio
 MailboxTargetDirectory=Diretório de destino da caixa de correio
 EmailcollectorOperations=Operações para fazer pelo coletor
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Recolher agora
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=ID de acompanhamento Dolibarr não encontrado
 FormatZip=Código postal
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index 0c8327247ee..790a4dac0de 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Eventos em que o Dolibarr criará uma acção em agenda automátic
 EventRemindersByEmailNotEnabled=Os lembretes de eventos por email não foram ativados na configuração do módulo %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Terceiro %s, criado
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contrato %s, validado
 CONTRACT_DELETEInDolibarr=Contrato %s excluído
 PropalClosedSignedInDolibarr=Orçamento %s assinado
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Projeto %s, modificado
 PROJECT_DELETEInDolibarr=Projeto %s, eliminado
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index fecc9f68825..cb778f9ada2 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banco
-MenuBankCash=Banco | Caixa
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Pagamentos diversos
 MenuNewVariousPayment=Novo pagamento diverso
 BankName=Nome do banco
 FinancialAccount=Conta
 BankAccount=Conta bancária
 BankAccounts=Contas Bancárias
-BankAccountsAndGateways=Banco | Entradas
+BankAccountsAndGateways=Contas bancárias | Entradas
 ShowAccount=Mostrar Conta
 AccountRef=Ref. Conta financeira
 AccountLabel=Etiqueta Conta financeira
@@ -30,7 +30,7 @@ AllTime=Do início
 Reconciliation=Conciliação
 RIB=Conta bancária
 IBAN=Número IBAN
-BIC=Número BIC/SWIFT
+BIC=BIC/SWIFT code
 SwiftValid=BIC / SWIFT válido
 SwiftVNotalid=BIC/SWIFT inválido
 IbanValid=BAN válido
@@ -42,11 +42,11 @@ AccountStatementShort=Extracto
 AccountStatements=Extractos
 LastAccountStatements=Últimos extractos bancários
 IOMonthlyReporting=Relatório mensal E/S
-BankAccountDomiciliation=Domiciliação de Conta
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Conta do país
 BankAccountOwner=Nome do proprietário da Conta
 BankAccountOwnerAddress=Direcção do proprietário da Conta
-RIBControlError=A verificação de integridade dos valores falha. Isso significa que as informações desse número de conta estão incompletas ou incorretas (verifique o país, números e IBAN).
+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=Criar Conta
 NewBankAccount=Nova conta
 NewFinancialAccount=Nova conta financeira
@@ -98,14 +98,14 @@ BankLineConciliated=Entrada reconciliada
 Reconciled=Reconciliado
 NotReconciled=Não reconciliado
 CustomerInvoicePayment=Pagamento de cliente
-SupplierInvoicePayment=Pagamento a Fornecedor
+SupplierInvoicePayment=Pagamento de fornecedor
 SubscriptionPayment=Pagamento Assinatura
 WithdrawalPayment=Pagamento de retirada
 SocialContributionPayment=Pagamento da taxa social/fiscal
 BankTransfer=Transferência bancária
 BankTransfers=Transferencias bancarias
 MenuBankInternalTransfer=Transferência interna
-TransferDesc=Transferência de uma conta para outra, Dolibarr vai escrever dois registros (um débito na conta de origem e um crédito na conta de destino). A mesma quantia (exceto sinal), rótulo e data serão usados ​​para essa transação)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=De
 TransferTo=Para
 TransferFromToDone=A transferência de <b>%s</b> para <b>%s</b> de <b>%s</b> %s foi criado.
@@ -136,7 +136,7 @@ BankTransactionLine=Entrada bancária
 AllAccounts=Todas as contas bancárias e de caixa
 BackToAccount=Voltar à Conta
 ShowAllAccounts=Mostrar para todas as Contas
-FutureTransaction=Transação no futuro. Não há como reconciliar.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Selecione / filtrar cheques para incluir no recibo do cheque e clique em "Criar".
 InputReceiptNumber=Escolha o extrato bancário relacionado com a conciliação. Use um valor numérico classificável: YYYYMM ou YYYYMMDD
 EventualyAddCategory=Eventualmente, especifique uma categoria que deseja classificar os movimentos
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Cheque devolvido e faturas reabertas
 BankAccountModelModule=Modelos de documentos para contas bancárias
 DocumentModelSepaMandate=Modelo do mandato da SEPA. Útil para países europeus apenas no EEC.
 DocumentModelBan=Modelo para imprimir uma página com informações de BAN.
-NewVariousPayment=Novos pagamentos diversos
-VariousPayment=Pagamentos diversos
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Pagamentos diversos
-ShowVariousPayment=Mostrar pagamentos diversos
-AddVariousPayment=Adicionar pagamentos diversos
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=Mandato SEPA
 YourSEPAMandate=Seu mandato SEPA
 FindYourSEPAMandate=Este é o seu mandato da SEPA para autorizar a nossa empresa a efetuar um pedido de débito direto ao seu banco. Devolva-o assinado (digitalização do documento assinado) ou envie-o por correio para
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 9f5b7916113..e0f25e98f61 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=na moeda das faturas
 PaidBack=Reembolsada
 DeletePayment=Eliminar pagamento
 ConfirmDeletePayment=Tem a certeza que deseja eliminar este pagamento?
-ConfirmConvertToReduc=Deseja converter este %s em um desconto absoluto? <br> O valor será economizado entre todos os descontos e poderá ser usado como um desconto para uma fatura atual ou futura para este cliente.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Pagamentos recebidos
 ReceivedCustomersPayments=Pagamentos recebidos dos clientes
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Montante a Pagar
-ValidatePayment=Validar pagamento
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validar faturas automaticamente
 GeneratedFromRecurringInvoice=Gerado a partir do modelo de fatura recorrente %s
 DateIsNotEnough=Data ainda não atingida
 InvoiceGeneratedFromTemplate=Fatura %s gerada a partir da fatura modelo recorrente %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Atenção, a data da fatura é maior que a data atual
 WarningInvoiceDateTooFarInFuture=Atenção, a data da fatura está muito longe da data atual
 ViewAvailableGlobalDiscounts=Ver descontos disponíveis
diff --git a/htdocs/langs/pt_PT/cashdesk.lang b/htdocs/langs/pt_PT/cashdesk.lang
index 82412722ae7..6b30f07ae0a 100644
--- a/htdocs/langs/pt_PT/cashdesk.lang
+++ b/htdocs/langs/pt_PT/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Histórico
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 1cb3fa31cae..1605882ed6d 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Adicionar imposto social / fiscal
 ContributionsToPay=Impostos sociais/fiscais por pagar
 AccountancyTreasuryArea=Área de cobrança e pagamento
 NewPayment=Novo pagamento
-Payments=Pagamentos
 PaymentCustomerInvoice=Pagamento de fatura do cliente
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Pagamento da taxa social/fiscal
@@ -205,7 +204,6 @@ SellsJournal=Relatório vendas
 PurchasesJournal=Relatório compras
 DescSellsJournal=Relatório vendas
 DescPurchasesJournal=Relatório compras
-InvoiceRef=Ref fatura.
 CodeNotDef=Não definido
 WarningDepositsNotIncluded=As faturas de adiantamento não estão incluídas nesta versão com este módulo de contabilidade.
 DatePaymentTermCantBeLowerThanObjectDate=A data do termo de pagamento não pode ser inferior à data do objeto.
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 9db45579a2d..16ff4e1572f 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang
index 9162c2c35e2..c5a2795122f 100644
--- a/htdocs/langs/pt_PT/holiday.lang
+++ b/htdocs/langs/pt_PT/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Pedidos de licença validados
 HolidaysValidatedBody=O seu pedido de licença para o período de %s a %s foi validado.
 HolidaysRefused=Pedido negado
-HolidaysRefusedBody=O seu pedido de licença para o período de %s a %s foi negado pela seguinte razão:
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Pedido de licença cancelado
 HolidaysCanceledBody=O seu pedido de licença para o período de %s a %s foi cancelado.
 FollowedByACounter=1: Este tipo de licença precisa ser seguido por um contador. O contador é incrementado manualmente ou automaticamente, quando um pedido de licença é validado o contador é diminuído.<br> 0: Não seguido por um contador.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Deixar modelos de numeração de pedidos
 TemplatePDFHolidays=Modelo para solicitações de licenças PDF
 FreeLegalTextOnHolidays=Texto livre em PDF
 WatermarkOnDraftHolidayCards=Marcas d'água em pedidos de licença de rascunho
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 90dc059c47f..1c175a3c7b2 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentagem
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (IVA inc.)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Enviar email de confirmação
 SendMail=Enviar e-mail
 Email=Email
 NoEMail=Sem e-mail
-Email=Email
 AlreadyRead=Already read
 NotRead=Não lido
 NoMobilePhone=Sem telefone móvel
@@ -671,7 +671,6 @@ Method=Método
 Receive=Receção
 CompleteOrNoMoreReceptionExpected=Complete ou nada mais é esperado
 ExpectedValue=Valor esperado
-CurrentValue=Valor actual
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca Recebido
@@ -834,6 +833,7 @@ RelatedObjects=Objetos relacionados
 ClassifyBilled=Classificar como faturado
 ClassifyUnbilled=Classificar como não faturado
 Progress=Progresso
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=Vista
@@ -842,6 +842,11 @@ Exports=Exportados
 ExportFilteredList=Exportar lista filtrada
 ExportList=Exportar lista
 ExportOptions=Opções de exportação
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Diversos
 Calendar=Calendario
 GroupBy=Agrupar por...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download do documento
 ActualizeCurrency=Atualizar taxa de conversão da moeda
 Fiscalyear=Ano Fiscal
-ModuleBuilder=Construtor de módulos
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Definir moeda
 BulkActions=Ações em massa
 ClickToShowHelp=Clique para mostrar o balão de ajuda
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index 508e869f72a..769a92d3937 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -6,7 +6,7 @@ Member=Membro
 Members=Membros
 ShowMember=Mostrar ficha de membro
 UserNotLinkedToMember=Utilizador não vinculado a um membro
-ThirdpartyNotLinkedToMember=Terceiro não está associado a um membro
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Etiquetas Membros
 FundationMembers=Membros da organização
 ListOfValidatedPublicMembers=Lista de Membros públicos validados
@@ -67,11 +67,11 @@ Subscriptions=Filicações
 SubscriptionLate=Em atraso
 SubscriptionNotReceived=Filiação não recebida
 ListOfSubscriptions=Lista de Filicações
-SendCardByMail=Enviar ficha por email
+SendCardByMail=Send card by email
 AddMember=Criar membro
 NoTypeDefinedGoToSetup=Nenhum tipo de membro definido. ir a configuração -> Tipos de Membros
 NewMemberType=Novo tipo de membro
-WelcomeEMail=E-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Sujeito a cotação
 DeleteType=Apagar
 VoteAllowed=Voto autorizado
@@ -124,16 +124,16 @@ CardContent=Conteúdo do seu cartão de membro
 ThisIsContentOfYourMembershipRequestWasReceived=Queremos que você saiba que sua solicitação de adesão foi recebida. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=Queremos informar que sua associação foi validada com as seguintes informações: <br> <br>
 ThisIsContentOfYourSubscriptionWasRecorded=Queremos informar que sua nova assinatura foi registrada. <br> <br>
-ThisIsContentOfSubscriptionReminderEmail=Gostaríamos de informar que sua assinatura está prestes a expirar ou já expirou (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Esperamos que você possa renová-lo. <br> <br>
-ThisIsContentOfYourCard=Este é um lembrete das informações que recebemos sobre você. Sinta-se à vontade para nos contatar se algo parecer errado. <br> <br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Assunto do e-mail recebido em caso de auto-inscrição de um convidado
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail recebido em caso de auto-inscrição de um convidado
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=E-mail de modelo a ser usado para enviar e-mail para um membro da autosubscrição de membro
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Modelo EMail para usar para enviar email para um membro na validação de membro
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modelo de e-mail para usar para enviar e-mail para um membro em nova gravação de assinatura
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=O modelo de e-mail a ser usado para enviar e-mails é lembrado quando a assinatura está prestes a expirar
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Modelo de e-mail para usar para enviar e-mail para um membro no cancelamento de membro
-DescADHERENT_MAIL_FROM=E-mail emissor para os e-mails automáticos
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Formato etiquetas
 DescADHERENT_ETIQUETTE_TEXT=Texto impresso na folhas de endereços dos membros
 DescADHERENT_CARD_TYPE=Formato da página de cartões
@@ -156,8 +156,8 @@ DocForAllMembersCards=Gerar cartões de negócio para todos os membros
 DocForOneMemberCards=Gerar cartões de visita para um determinado membro
 DocForLabels=Gerar folhas de endereço (Formato de saída realmente configuração: <b>%s)</b>
 SubscriptionPayment=Pagamento Assinatura
-LastSubscriptionDate=Data da última subscrição
-LastSubscriptionAmount=Montante da última subscrição
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Membros estatísticas por país
 MembersStatisticsByState=Membros estatísticas por estado / província
 MembersStatisticsByTown=Membros estatísticas por localidade
@@ -187,7 +187,7 @@ MembersStatisticsByProperties=Estatísticas dos membros por natureza
 MembersByNature=Esta tela mostra estatísticas sobre membros por natureza.
 MembersByRegion=Esta tela mostra estatísticas sobre membros por região.
 VATToUseForSubscriptions=Taxa de IVA a utilizar para assinaturas
-NoVatOnSubscription=Sem TVA para assinaturas
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produto utilizado para assinatura na fatura: %s
 NameOrCompany=Nome ou empresa
 SubscriptionRecorded=Assinatura registrada
@@ -195,3 +195,6 @@ NoEmailSentToMember=Nenhum email enviado para o membro
 EmailSentToMember=E-mail enviado para o membro em %s
 SendReminderForExpiredSubscriptionTitle=Enviar lembrete por email para assinatura expirada
 SendReminderForExpiredSubscription=Enviar lembrete por e-mail aos membros quando a assinatura estiver prestes a expirar (o parâmetro é o número de dias antes do final da assinatura para enviar o lembrete. Pode ser uma lista de dias separados por ponto e vírgula, por exemplo, '10; 5; 0; -5 ')
+MembershipPaid=Membership paid for current period (until %s)
+YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
+XMembersClosed=%s member(s) closed
diff --git a/htdocs/langs/pt_PT/modulebuilder.lang b/htdocs/langs/pt_PT/modulebuilder.lang
index 0a8fd99d9d2..bf7aa39131d 100644
--- a/htdocs/langs/pt_PT/modulebuilder.lang
+++ b/htdocs/langs/pt_PT/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Introduza o nome do módulo/aplicação a criar, sem espaços. Use maiúsculas para separar palavras (Por exemplo: MyModule, EcommerceForShop, SyncWithMySystem ...)
 EnterNameOfObjectDesc=Digite o nome do objeto para criar sem espaços. Use letras maiúsculas para separar palavras (por exemplo: MyObject, Student, Teacher ...). O arquivo de classe CRUD, mas também o arquivo da API, serão geradas páginas para listar / adicionar / editar / excluir objetos e arquivos SQL.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=Esta é a vista dos acionadores fornecidos pelo seu m
 ModuleBuilderDeschooks=Este separador é dedicado para hooks.
 ModuleBuilderDescwidgets=Este separador é dedicado para gerir/criar widgets.
 ModuleBuilderDescbuildpackage=Você pode gerar aqui um ficheiro pacote "pronto para distribuir" (um ficheiro .zip normalizado) do seu módulo e um ficheiro de documentação "pronto para distribuir". Basta clicar no botão para criar o ficheiro pacote do módulo e o ficheiro de documentação.
-EnterNameOfModuleToDeleteDesc=Você pode excluir seu módulo. AVISO: TODOS os arquivos de dados e documentação do módulo E estruturados serão excluídos!
-EnterNameOfObjectToDeleteDesc=Você pode excluir um objeto. AVISO: Todos os arquivos relacionados ao objeto serão excluídos!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Zona de perigo
 BuildPackage=Pacote de construção
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Criar documentação
 ModuleIsNotActive=Este módulo não está ativado ainda. Vá até %s para fazê-lo funcionar ou clique aqui:
-ModuleIsLive=Este módulo foi ativado. Qualquer alteração pode causar problemas numa característica ativa atual.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Descrição longa
 EditorName=Nome do editor
 EditorUrl=URL do editor
@@ -43,10 +44,11 @@ PathToModulePackage=Caminho para o ficheiro pacote .zip do módulo/aplicação
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Espaços ou caracteres especiais não são permitidos.
 FileNotYetGenerated=O ficheiro ainda não foi gerado
-RegenerateClassAndSql=Apagar e regenerar arquivos de classe e sql
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Gere arquivos ausentes
 SpecificationFile=File of documentation
 LanguageFile=Arquivar por idioma
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Tem certeza de que deseja excluir a propriedade <strong> %s </ strong>? Isso irá mudar o código na classe PHP, mas também removerá a coluna da definição da tabela do objeto.
 NotNull=Não nulo
 NotNullDesc=1 = Definir banco de dados para NOT NULL. -1 = Permitir valores nulos e forçar valor para NULL se vazio ('' ou 0).
@@ -62,9 +64,11 @@ ReadmeFile=Arquivo Leiame
 ChangeLog=Arquivo ChangeLog
 TestClassFile=Arquivo para a classe de teste de unidade do PHP
 SqlFile=Arquivo Sql
-PageForLib=Arquivo para bibliotecas PHP
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Arquivo Sql para atributos complementares
 SqlFileKey=Arquivo Sql para chaves
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=Um objeto já existe com este nome e um caso diferente
 UseAsciiDocFormat=Você pode usar o formato Markdown, mas é recomendável usar o formato Asciidoc (omparison entre .md e .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=É uma medida
@@ -81,8 +85,10 @@ IsAMeasureDesc=O valor do campo pode ser acumulado para obter um total na lista?
 SearchAllDesc=O campo é usado para fazer uma pesquisa a partir da ferramenta de pesquisa rápida? (Exemplos: 1 ou 0)
 SpecDefDesc=Digite aqui toda a documentação que você deseja fornecer com seu módulo que ainda não está definido por outras guias. Você pode usar .md ou melhor, a rica sintaxe .asciidoc.
 LanguageDefDesc=Entre neste arquivo, toda a chave e a tradução para cada arquivo de idioma.
-MenusDefDesc=Defina aqui os menus fornecidos pelo seu módulo (uma vez definidos, eles são visíveis no editor de menu %s)
-PermissionsDefDesc=Defina aqui as novas permissões fornecidas pelo seu módulo (uma vez definidas, elas são visíveis na configuração de permissões padrão %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Defina na propriedade <b> module_parts ['hooks'] </ b>, no descritor de módulo, o contexto dos ganchos que você deseja gerenciar (lista de contextos pode ser encontrada por uma pesquisa em '<b> initHooks (</ b> 'in core code). <br> Edite o arquivo hook para adicionar código de suas funções (funções hookable podem ser encontradas por uma pesquisa em' <b> executeHooks </ b> 'no código principal).
 TriggerDefDesc=Defina no arquivo acionador o código que você deseja executar para cada evento de negócios executado.
 SeeIDsInUse=Veja os códigos em uso na sua instalação
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/pt_PT/paybox.lang b/htdocs/langs/pt_PT/paybox.lang
index 18ed6d8b0c8..e8966645c9b 100644
--- a/htdocs/langs/pt_PT/paybox.lang
+++ b/htdocs/langs/pt_PT/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=A completar
 YourEMail=E-Mail de confirmação de pagamento
 Creditor=Beneficiario
 PaymentCode=Código de pagamento
-PayBoxDoPayment=Pagar com cartão de crédito ou débito (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Emitir pagamento
 YouWillBeRedirectedOnPayBox=Você será redirecionado para a página Paybox não se esqueça de introduzir a informação do seu cartão de crédito
 Continue=Continuar
 ToOfferALinkForOnlinePayment=URL para o pagamento %s
-ToOfferALinkForOnlinePaymentOnOrder=URL que fornece pagamento on-line interface% s com base no valor de um pedido de venda
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL que fornece pagamento on-line interface% s com base no valor de um projeto de lei
 ToOfferALinkForOnlinePaymentOnContractLine=URL que fornece linha de pagamento  interface% com base na quantidade de uma linha de contrato
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL que fornece pagamento on-line %s interface baseada numa quantidade livre
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL para oferecer uma interface on-line %s pagamento de uma subscrição de membro
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Você também pode adicionar o parâmetro url <b>&tag=<i>value</i></b>  para o endereço (exigida apenas para o pagamento livre) para ver o seu código próprio, observação do pagamento.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Esta página confirma que o pagamento tenha sido gravada. Obrigado.
@@ -33,7 +33,8 @@ VendorName=Nome do fornecedor
 CSSUrlForPaymentForm=CSS url folha de estilo para forma de pagamento
 NewPayboxPaymentReceived=Novo pagamento Paybox recebido
 NewPayboxPaymentFailed=Nova tentativa de pagamento Paybox falhou
-PAYBOX_PAYONLINE_SENDEMAIL=E-mail de notificação após um pagamento (sucesso ou falha)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Valor para PBX SITE
 PAYBOX_PBX_RANG=Valor para PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Valor para ID de PBX
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/pt_PT/paypal.lang b/htdocs/langs/pt_PT/paypal.lang
index 4f16f939c6d..c0960d9050d 100644
--- a/htdocs/langs/pt_PT/paypal.lang
+++ b/htdocs/langs/pt_PT/paypal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Configurar módulo do PayPal
-PaypalDesc=Este módulo permite o pagamento em <a href="http://www.paypal.com" target="_blank"> PayPal </a> pelos clientes. Isso pode ser usado para um pagamento gratuito ou para um pagamento em um determinado objeto Dolibarr (fatura, ordem, ...)
-PaypalOrCBDoPayment=Pague com PayPal (cartão de crédito ou PayPal)
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
 PaypalDoPayment=Pague com PayPal
 PAYPAL_API_SANDBOX=Modo de teste / sandbox
 PAYPAL_API_USER=Nome de utilizador API
 PAYPAL_API_PASSWORD=Senha API
 PAYPAL_API_SIGNATURE=Assinatura API
 PAYPAL_SSLVERSION=Versão do Curl SSL
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferta de pagamento "integral" (cartão de crédito + PayPal) ou "PayPal" apenas
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=Apenas Paypal
 ONLINE_PAYMENT_CSS_URL=URL opcional da folha de estilo CSS na página de pagamento on-line
 ThisIsTransactionId=Esta é id. da transação: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Adicione o URL do pagamento do PayPal quando enviar um documento por correio
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=Novo pagamento online recebido
 NewOnlinePaymentFailed=Novo pagamento em linha tentado, mas falhado
-ONLINE_PAYMENT_SENDEMAIL=Correio eletrónico para avisar depois de um pagamento (bem sucedido ou não)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=URL de retorno depois do pagamento
 ValidationOfOnlinePaymentFailed=Falha na validação do pagamento online
 PaymentSystemConfirmPaymentPageWasCalledButFailed=A página de confirmação de pagamento foi chamada pelo sistema de pagamento mas retornou um erro
@@ -27,8 +27,10 @@ ShortErrorMessage=Mensagem de Erro Abreviada
 ErrorCode=Código de Erro
 ErrorSeverityCode=Código de Severidade do Erro
 OnlinePaymentSystem=Sistema de pagamento online
-PaypalLiveEnabled=PayPal ativado ao vivo (caso contrário, modo de teste / sandbox)
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
 PaypalImportPayment=Importar pagamentos do PayPal
 PostActionAfterPayment=Ações posteriores depois dos pagamentos
 ARollbackWasPerformedOnPostActions=Uma reversão foi executada em todas as ações do Post. Você deve concluir as ações de postagem manualmente, se necessário.
 ValidationOfPaymentFailed=A validação do pagamento falhou
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index f2321a5d54c..bbe63fc079e 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -260,7 +260,7 @@ AddVariable=Adicionar Variável
 AddUpdater=Adicionar atualizador
 GlobalVariables=Variáveis globais
 VariableToUpdate=Variável para atualizar
-GlobalVariableUpdaters=Atualizadores de Variáveis ​​Globais
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=Dados JSON
 GlobalVariableUpdaterHelp0=Analisa os dados JSON do URL especificado, VALUE especifica a localização do valor relevante,
 GlobalVariableUpdaterHelpFormat0=Formato para solicitação {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Ficha do Produto
 ServiceSheet=Folha de serviço
 PossibleValues=Valores possíveis
 GoOnMenuToCreateVairants=Vá no menu %s - %s para preparar variantes de atributos (como cores, tamanho, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Atributos variantes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=Ocorreu um erro ao copiar as variantes do produto
 ErrorDestinationProductNotFound=Produto de destino não encontrado
 ErrorProductCombinationNotFound=Variante de produto não encontrada
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index a5c0a96b8e9..bdc40a6cc22 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Tempo Dispendido
 TimeSpentByYou=Tempo gasto por você
 TimeSpentByUser=Tempo gasto pelo utilizador
 TimesSpent=Tempos Dispendidos
-RefTask=Ref. da Tarefa
-LabelTask=Etiqueta de Tarefa
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Tempo despendido nas tarefas
 TaskTimeUser=Utilizador
 TaskTimeNote=Nota
diff --git a/htdocs/langs/pt_PT/stripe.lang b/htdocs/langs/pt_PT/stripe.lang
index 9600d2dd78f..4b3edb96134 100644
--- a/htdocs/langs/pt_PT/stripe.lang
+++ b/htdocs/langs/pt_PT/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configurar módulo de Stripe
-StripeDesc=Módulo para oferecer uma página de pagamento on-line que aceita pagamentos com cartão de crédito / débito via <a href="http://www.stripe.com" target="_blank"> Listra </a>. Isso pode ser usado para permitir que seus clientes façam pagamentos gratuitos ou para um pagamento em um determinado objeto Dolibarr (fatura, ordem, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pagar com cartão de crédito ou Stripe
 FollowingUrlAreAvailableToMakePayments=As seguintes URL estão disponiveis para permitir a um cliente efectuar um pagamento
 PaymentForm=Forma de pagamento
@@ -9,14 +9,14 @@ ThisScreenAllowsYouToPay=Esta tela permite que você faça o seu pagamento onlin
 ThisIsInformationOnPayment=Aqui estão as informações de pagamento para fazer
 ToComplete=A completar
 YourEMail=E-Mail de confirmação de pagamento
-STRIPE_PAYONLINE_SENDEMAIL=Correio eletrónico para avisar depois de um pagamento (bem sucedido ou não)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Beneficiario
 PaymentCode=Código de pagamento
-StripeDoPayment=Pagar com cartão de crédito ou débito (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=Você será redirecionado para uma página segura do Stripe de forma a inserir as informações do seu cartão de crédito
 Continue=Continuar
 ToOfferALinkForOnlinePayment=URL para o pagamento %s
-ToOfferALinkForOnlinePaymentOnOrder=URL que fornece pagamento on-line interface% s com base no valor de um pedido de venda
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL que fornece pagamento on-line interface% s com base no valor de um projeto de lei
 ToOfferALinkForOnlinePaymentOnContractLine=URL que fornece linha de pagamento  interface% com base na quantidade de uma linha de contrato
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL que fornece pagamento on-line %s interface baseada numa quantidade livre
@@ -40,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Chave ao vivo do Webhook
 ONLINE_PAYMENT_WAREHOUSE=Estoque a ser usado para redução de estoque quando o pagamento on-line é feito <br> (TODO Quando a opção para diminuir o estoque é feita em uma ação na fatura e o pagamento on-line gera a fatura em si?)
 StripeLiveEnabled=Stripe live enabled (caso contrário, modo de teste / sandbox)
 StripeImportPayment=Importar pagamentos de tarja
-ExampleOfTestCreditCard=Exemplo de cartão de crédito para teste: %s (válido), %s (erro CVC), %s (expirado), %s (falha de carga)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Gateways listra
 OAUTH_STRIPE_TEST_ID=ID do cliente do Stripe Connect (ca _...)
 OAUTH_STRIPE_LIVE_ID=ID do cliente do Stripe Connect (ca _...)
@@ -61,4 +61,7 @@ ConfirmDeleteCard=Tem certeza de que deseja excluir este cartão de crédito ou
 CreateCustomerOnStripe=Criar cliente no Stripe
 CreateCardOnStripe=Criar ficha no Stripe
 ShowInStripe=Mostrar na listra
-StripeUserAccountForActions=Conta de usuário para usar para alguns e-mails de notificação de eventos Stripe (pagamentos de faixa)
+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)
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index 33be5995510..262cc348365 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=Esta página / contêiner tem tradução
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 2c52027a293..09bd7419c85 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Raportul de cheltuieli obligatoriu
 CreateMvts=Creați o nouă tranzacție
 UpdateMvts=Modificarea unei tranzacții
 ValidTransaction=Tranzacție validată
-WriteBookKeeping=Introducerea tranzactiilor in Jurnalul Cartea mare
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Cartea mare
 AccountBalance=Sold cont
 ObjectsRef=Referinţă sursă obiect
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Contul Contabilitate pentru a înregistr
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cont contabil implicit pentru produsele achiziționate (utilizate dacă nu este definit în fișa produsului)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cont contabil implicit pentru produsele vândute (utilizate dacă nu este definit în fișa produsului)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Contul de contabilitate implicit pentru produsele vândute în CEE (utilizat dacă nu este definit în fișa produsului)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Contul de contabilitate implicit pentru exportul de produse vândute din CEE (utilizat dacă nu este definit în fișa produsului)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Contul de contabilitate implicit pentru produsele vândute în CEE (utilizat dacă nu este definit în fișa produsului)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Contul de contabilitate implicit pentru exportul de produse vândute din CEE (utilizat dacă nu este definit în fișa produsului)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Contul contabil implicit pentru serviciile cumpărate (utilizat dacă nu este definit în fișa serviciului)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Contul contabil implicit pentru serviciile vândute (utilizat dacă nu este definit în fișa de servicii)
 
@@ -177,6 +177,7 @@ LabelAccount=Etichetă cont
 LabelOperation=Etichetarea operaţiei
 Sens=Sens
 LetteringCode=Codul de scriere
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Eticheta jurnalului
 NumPiece=Număr nota contabila
@@ -288,8 +289,10 @@ Modelcsv_quadratus=Export pentru Quadratus QuadraCompta
 Modelcsv_ebp=Export pentru EBP
 Modelcsv_cogilog=Export pentru Cogilog
 Modelcsv_agiris=Export pentru Agiris
+Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Exportați CSV configurabil
-Modelcsv_FEC=Export FEC (articolul L47 A) (test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Id-ul listei de conturi
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=Această pagină poate fi utilizată pentru a seta un cont im
 DefaultClosureDesc=Această pagină poate fi utilizată pentru a seta parametrii care trebuie utilizați pentru a închide un bilanț.
 Options=Opţiuni
 OptionModeProductSell=Mod vanzari
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mod cumparari
 OptionModeProductSellDesc=Afișați toate produsele ce au cont contabil pentru vânzări.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Afișați toate produsele ce au cont contabil pentru achiziții.
 CleanFixHistory=Eliminați codul contabil din linii care nu există în diagramele de cont
 CleanHistory=Resetați toate asocierile pentru anul selectat
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index ed392a6152c..006b0777335 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip= De asemenea, dacă aveți un număr mare de ter
 UseSearchToSelectContactTooltip=De asemenea, dacă aveți un număr mare de terţi (> 100 000), puteți crește viteza prin setarea constantei COMPANY_DONOTSEARCH_ANYWHERE la 1 la Setup->Other. Căutarea va fi limitată la începutul șirului.
 DelaiedFullListToSelectCompany=Așteptați până când o tastă este apăsată înainte de a încărca conținutul listei combo-urilor terțe. <br> Acest lucru ar putea crește performanța dacă aveți un număr mare de terțe părți, dar este mai puțin convenabil.
 DelaiedFullListToSelectContact=Așteptați până când este apăsată o tastă înainte de a încărca conținutul listei de contacte combo. <br> Aceasta ar putea crește performanța dacă aveți un număr mare de contacte, dar este mai puțin convenabil)
-NumberOfKeyToSearch=Nr caractere pentru a declanşa căutare: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Nu este disponibil, atunci când Ajax cu handicap
 AllowToSelectProjectFromOtherCompany=Pe documentul unui terț, puteți alege un proiect legat de un alt terț
 JavascriptDisabled=JavaScript dezactivat
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=Acesta este numele câmpului HTML. Cunoștințele teh
 PageUrlForDefaultValues=Trebuie să introduceți calea relativă a adresei URL a paginii. Dacă includeți parametrii în URL, valorile implicite vor fi eficiente dacă toți parametrii sunt setați la aceeași valoare.
 PageUrlForDefaultValuesCreate=<br> Exemplu: <br> Pentru formularul de creare a unei terțe părți noi este <strong> %s </strong>. <br> Pentru URL-ul modulelor externe instalate în directorul personalizat, nu includeți "personalizat/" , astfel folosiți o cale ca <strong> mymodule / mypage.php </strong> și nu personalizat /mymodule/mypage.php. <br> Dacă doriți valoarea implicită numai dacă url are un anumit parametru, puteți utiliza <strong> %s </strong>
 PageUrlForDefaultValuesList=<br> Exemplu: <br> Pentru pagina care afișează terțe părți, este <strong> %s </strong>. <br> Pentru URL-ul modulelor externe instalate în directorul personalizat, nu includeți "personalizat / utilizati o cale ca <strong> mymodule / mypagelist.php </strong> și nu personalizat /mymodule/mypagelist.php. <br> Dacă doriți valoarea implicită numai dacă URL-ul are un anumit parametru, puteți utiliza <strong> %s </strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Activați personalizarea valorilor implicite
 EnableOverwriteTranslation=Activați utilizarea traducerilor suprascrise
 GoIntoTranslationMenuToChangeThis=A fost găsită o traducere pentru cheia cu acest cod. Pentru a modifica această valoare, trebuie să o editați din Acasă-Configurare-Traducere.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server de nume
 OS=OS
 PhpWebLink=Web link-PHP
-Browser=Browser
 Server=Server
 Database=Baza de date
 DatabaseServer=Baza de date gazdă
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Sistemul de informare este diverse informaţii tehnice ai citit d
 SystemAreaForAdminOnly=Acest zonă este disponibilă numai administratori. Permisiunile utilizatorilor Dolibarr nu pot modifica această restricție
 CompanyFundationDesc=Editați informațiile companiei / entității. Click pe "%s" sau "%s" din partea de jos a paginii.
 AccountantDesc=Editați detaliile contabilului/angajatului la contabilitate
-AccountantFileNumber=Numărul fișierului
+AccountantFileNumber=Accountant code
 DisplayDesc=Parametrii care afectează aspectul şi comportamentul  Dolibarr pot fi modificaţi aici.
 AvailableModules=Aplicații/module disponibile 
 ToActivateModule=Pentru a activa modulele, du-te la zona de configurare.
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Facturi şi note de credit, modul de numerotare
 BillsPDFModules=Factura modele de documente
 BillsPDFModulesAccordindToInvoiceType=Modele de documente de facturare în funcție de tipul de factură
 PaymentsPDFModules=Modele de documente de plată
-CreditNote=Nota de credit
-CreditNotes=Credit note
 ForceInvoiceDate=Vigoare la data facturii de validare data
 SuggestedPaymentModesIfNotDefinedInInvoice=Sugestii cu privire la modul de plata facturii, în mod implicit, dacă nu este definit de factură
 SuggestPaymentByRIBOnAccount=Sugerați plata prin retragere din cont
@@ -1819,7 +1819,7 @@ ChartLoaded=Schema de cont încărcată
 SocialNetworkSetup=Configurarea modulelor Rețele sociale
 EnableFeatureFor=Activați caracteristici pentru <strong> %s </strong>
 VATIsUsedIsOff=Nota: Opțiunea de a utiliza impozitul pe vânzări sau TVA a fost setată la <strong>Oprit</strong> în meniu %s - %s, astfel încât impozitul pe vânzări sau TVA utilizate vor fi întotdeauna 0 pentru vânzări.
-SwapSenderAndRecipientOnPDF=Schimbați adresa expeditorului cu adresa destinatarului în format PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Avertizare, caracteristică acceptată numai pe câmpurile de text. De asemenea, trebuie să fie setat un parametru URL = create sau action = editare SAU numele paginii trebuie să se termine cu "new.php" pentru a declanșa această caracteristică.
 EmailCollector=Colector de e-mailuri
 EmailCollectorDescription=Adăugați o lucrare programată și o pagină de configurare pentru a scana în mod regulat căsuţele de e-mail (utilizând protocolul IMAP) și pentru a înregistra e-mailurile primite în aplicația dvs., la locul potrivit și/sau pentru a crea automat înregistrări (cum ar fi clienții).
@@ -1828,7 +1828,9 @@ EMailHost=Gazdă a serverului de email IMAP
 MailboxSourceDirectory=Directorul sursă al cutiei poștale
 MailboxTargetDirectory=Directorul ţintă al cutiei poștale 
 EmailcollectorOperations=Operațiuni de făcut de către colector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Colectați acum
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=ID de urmărire Dolibarr nu a fost găsit
 FormatZip=Zip
 MainMenuCode=Codul de introducere a meniului (meniu principal)
 ECMAutoTree=Afișați arborele ECM automat
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Ore de program
 OpeningHoursDesc=Introduceți aici orele de program normale ale companiei dvs.
 ResourceSetup=Configurarea modulului Resurse 
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index 3fdbd5abfaa..234ff002d13 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Evenimente pentru care Dolibarr va crea o acţiune în agendă în
 EventRemindersByEmailNotEnabled=Evenimentul pentru mementouri prin e-mail nu a fost activat în configurarea modulului %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Terța parte %s a fost creată
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validat
 CONTRACT_DELETEInDolibarr=Contractul %s a fost șters
 PropalClosedSignedInDolibarr=Oferta  %s semnată
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Proiect %s modificat
 PROJECT_DELETEInDolibarr=Proiect %s sters
 TICKET_CREATEInDolibarr=Tichetul%s a fost creat
 TICKET_MODIFYInDolibarr=Tichetul %s a fost modificat
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Tichetul %s a fost șters
 ##### End agenda events #####
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index 0ba7e8bd7bf..bc5ea989653 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banca
-MenuBankCash=Bank | Cash
-MenuVariousPayment=Miscellaneous payments
-MenuNewVariousPayment=New Miscellaneous payment
+MenuBankCash=Bănci | Casa
+MenuVariousPayment=Diverse plăţi
+MenuNewVariousPayment=Plată nouă diversă
 BankName=Nume bancă
 FinancialAccount=Cont
 BankAccount=Cont bancar
 BankAccounts=Conturi bancare
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Conturi bancare | Gateway-uri
 ShowAccount=Arată Cont
 AccountRef=Contul financiar ref
 AccountLabel=Contul financiar etichetă
@@ -30,11 +30,11 @@ AllTime=De la inceput
 Reconciliation=Reconciliere
 RIB=Număr Cont Bancă
 IBAN=Cod IBAN
-BIC=Cod BIC / SWIFT
-SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
+BIC=cod BIC/SWIFT 
+SwiftValid=BIC/SWIFT valabil
+SwiftVNotalid=BIC/SWIFT invalid
+IbanValid=BAN valabil
+IbanNotValid=BAN invalid
 StandingOrders=Ordine de plată directe
 StandingOrder=Ordin de plată direct
 AccountStatement=Extras Cont
@@ -42,11 +42,11 @@ AccountStatementShort=Extras
 AccountStatements=Extrase Cont
 LastAccountStatements=Ultimele extrase de cont
 IOMonthlyReporting=Raport Lunar
-BankAccountDomiciliation=Adresă Cont
+BankAccountDomiciliation=Adresa băncii
 BankAccountCountry=Tară Cont
 BankAccountOwner=Nume Proprietar Cont
 BankAccountOwnerAddress=Adresă Proprietar Cont
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+RIBControlError=Verificarea corectitudinii a eșuat. Aceasta înseamnă că informațiile pentru acest număr de cont nu sunt complete sau sunt incorecte (bifați țara, numerele și IBAN).
 CreateAccount=Crează cont
 NewBankAccount=Cont nou
 NewFinancialAccount=Cont financiar nou
@@ -62,69 +62,69 @@ AccountCard=Fişa Cont
 DeleteAccount=Şterge cont
 ConfirmDeleteAccount=Sunteţi sigur că doriţi să ştergeţi acest cont?
 Account=Cont
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
+BankTransactionByCategories=Înregistrări bancare pe categorii
+BankTransactionForCategory=Înregistrări bancare pentru categorii <b> %s </b>
 RemoveFromRubrique=Eliminaţi link-ul cu categoria
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
+RemoveFromRubriqueConfirm=Sigur doriți să eliminați legătura dintre intrare și categorie?
+ListBankTransactions=List de intrări bancare
 IdTransaction=ID-ul tranzacţiei
-BankTransactions=Bank entries
-BankTransaction=Bank entry
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
+BankTransactions=Intrări bancare
+BankTransaction=Intrare bancară
+ListTransactions=Lista înregistrări
+ListTransactionsByCategory=Lista înregistrări/categorii
+TransactionsToConciliate=Intrări pentru reconciliere
 Conciliable=Decontabil
 Conciliate=Deconteaza
 Conciliation=Conciliere
-SaveStatementOnly=Save statement only
-ReconciliationLate=Reconciliation late
+SaveStatementOnly=Salvați numai declarația
+ReconciliationLate=Reconciliere târzie
 IncludeClosedAccount=Includeţi conturile închise
 OnlyOpenedAccount=Numai conturile deschise 
 AccountToCredit=Cont de credit
 AccountToDebit=Cont de debit
 DisableConciliation=Dezactivaţi reconcilierea pentru acest cont
 ConciliationDisabled=Reconciliere dezactivată
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
+LinkedToAConciliatedTransaction=Conectat la o intrare conciliată
 StatusAccountOpened=Deschis
 StatusAccountClosed=Închis
 AccountIdShort=Cod
 LineRecord=Tranzacţie
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
-Conciliated=Reconciled
+AddBankRecord=Adaugă intrare
+AddBankRecordLong=Adăugați intrarea manual
+Conciliated=Reconciliat
 ConciliatedBy=Decontat de
 DateConciliating=Data Decontare
-BankLineConciliated=Entry reconciled
-Reconciled=Reconciled
-NotReconciled=Not reconciled
+BankLineConciliated=Intrarea reconciliată
+Reconciled=Reconciliat
+NotReconciled=Nu este conciliat
 CustomerInvoicePayment=Plată Client
-SupplierInvoicePayment=Plată Furnizor
+SupplierInvoicePayment=Plata furnizorului
 SubscriptionPayment=Plată cotizaţie
 WithdrawalPayment=Retragerea de plată
 SocialContributionPayment=Plata taxe sociale sau fiscale și tva
 BankTransfer=Virament bancar
 BankTransfers=Viramente 
-MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+MenuBankInternalTransfer=Transfer intern
+TransferDesc=La un transfer de la un cont la altul, Dolibarr va scrie două înregistrări (un debit în contul sursă și un credit în contul țintă). Aceeași sumă (cu excepția semnului), eticheta și data va fi utilizată pentru această tranzacție)
 TransferFrom=De la
 TransferTo=La
 TransferFromToDone=Un viramentr de la  <b>%s</b> la <b> %s </b>  de<b> %s</b> %s a fost creată.
 CheckTransmitter=Emiţător
-ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
-DeleteCheckReceipt=Delete this check receipt?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+ValidateCheckReceipt=Validați această chitanță de confirmare?
+ConfirmValidateCheckReceipt=Sigur doriți să validați această chitanță de verificare, nu va fi posibilă nicio modificare după ce aceasta va fi efectuată?
+DeleteCheckReceipt=Ștergeți această chitanță de confirmare? 
+ConfirmDeleteCheckReceipt=Sigur stergeți această chitanță de confirmare? 
 BankChecks=Cecuri bancare
 BankChecksToReceipt=CEC-uri spre încasare
 ShowCheckReceipt=Arată borderou de cecuri remise
-NumberOfCheques=No. of check
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+NumberOfCheques=Nr. cecului
+DeleteTransaction=Ștergeți intrarea
+ConfirmDeleteTransaction=Sigur doriți să ștergeți această intrare?
+ThisWillAlsoDeleteBankRecord=Aceasta va șterge, de asemenea, intrarea bancară generată
 BankMovements=Mişcările
-PlannedTransactions=Planned entries
+PlannedTransactions=Intrări planificate
 Graph=Grafice
-ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_1=Înregistrări bancare și extras de cont
 ExportDataset_banque_2=Formular depunere
 TransactionOnTheOtherAccount=Tranzacţie pe de alt cont
 PaymentNumberUpdateSucceeded=Număr plată actualizat cu succes
@@ -132,12 +132,12 @@ PaymentNumberUpdateFailed=Numărul plaţii nu a putut fi actualizat
 PaymentDateUpdateSucceeded=Data plăţii actualizată cu succes
 PaymentDateUpdateFailed=Data Plata  nu a putut fi actualizată
 Transactions=Tranzacţii
-BankTransactionLine=Bank entry
-AllAccounts=All bank and cash accounts
+BankTransactionLine=Intrare bancară
+AllAccounts=Toate conturile bancare și de numerar
 BackToAccount=Inapoi la cont
 ShowAllAccounts=Arată pentru toate conturile
-FutureTransaction=Transaction in future. No way to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+FutureTransaction=Tranzacție viitoare. Imposibil de reconciliat.
+SelectChequeTransactionAndGenerate=Selectați / filtrați cecurile pentru a include în chitanța de depozit de cec și faceți clic pe "Creați"
 InputReceiptNumber=Alegeți extrasul de cont privitor la conciliere. Folosiţi o valoare numerică sortabile : YYYYMM sau YYYYMMDD
 EventualyAddCategory=În cele din urmă, precizează o categorie în care să clasezi înregistrările
 ToConciliate=Să se acorde?
@@ -147,21 +147,23 @@ AllRIB=Tot BAN
 LabelRIB=Etichetă BAN
 NoBANRecord=Nicio înregistrare BAN
 DeleteARib=Ștergeți înregistrarea BAN
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
+ConfirmDeleteRib=Sigur doriți să ștergeți această înregistrare BAN?
 RejectCheck=Cec returnat
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
+ConfirmRejectCheck=Sigur doriți să marcați acest cec ca respins?
 RejectCheckDate=data cecului ce a fost returnat
 CheckRejected=Cec returnat
 CheckRejectedAndInvoicesReopened=Cec returnat si facturi redeschise
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
-VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
-SEPAMandate=SEPA mandate
-YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+BankAccountModelModule=Șabloane de documente pentru conturi bancare
+DocumentModelSepaMandate=Modelul mandatului SEPA. Utile pentru țările europene numai în CEE.
+DocumentModelBan=Șablon pentru a imprima o pagină cu informații despre BAN.
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
+VariousPayments=Diverse plăţi
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
+SEPAMandate=Mandat SEPA 
+YourSEPAMandate=Mandatul dvs. SEPA  
+FindYourSEPAMandate=Acesta este mandatul dvs. SEPA pentru a autoriza compania noastră să efectueze un ordin de debitare directă către banca dvs. Reveniți semnat (scanarea documentului semnat) sau trimiteți-l prin poștă la
+AutoReportLastAccountStatement=Completați automat câmpul "numărul extrasului de cont" cu ultimul număr al declarației atunci când efectuați reconcilierea
+CashControl= Limită de numerar POS
+NewCashFence= Limită nouă de numerar
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 90173f3bf69..1018e4a2b24 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in moneda facturii
 PaidBack=Restituit
 DeletePayment=Ştergere plată
 ConfirmDeletePayment=Sunteţi sigur că doriţi să ştergeţi această plată?
-ConfirmConvertToReduc=Doriți să convertiți aceasta %s într-un discount absolut? <br> Suma va fi salvată între toate reducerile and ar putea fi utilizată ca o reducere pentru o factură curentă sau un viitoare pentru acest client.
-ConfirmConvertToReducSupplier=Doriți să convertiți aceasta %s într-un discount absolut? <br> Suma va fi salvată între toate reducerile and ar putea fi utilizată ca o reducere pentru o factură curentă sau un viitoare pentru acest furnizor. 
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Plățile furnizorului
 ReceivedPayments=Încasări primite
 ReceivedCustomersPayments=Încasări  Clienţi
@@ -89,7 +91,6 @@ PaymentTerm=Termenul plăţii
 PaymentConditions=Termeni de plată
 PaymentConditionsShort=Termeni de plată
 PaymentAmount=Sumă de plată
-ValidatePayment=Validează plata
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validare automată facturi
 GeneratedFromRecurringInvoice=Generate din model factura recurentă %s
 DateIsNotEnough=Incă nu este data setată
 InvoiceGeneratedFromTemplate=Factură %s generată din model factură recurentă %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Avertisment, data facturii este mai mare decât data curentă
 WarningInvoiceDateTooFarInFuture=Avertisment, data facturii este prea departe de data curentă
 ViewAvailableGlobalDiscounts=Vedeți reducerile disponibile
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index 1436ecd6751..48bed8242c1 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Istoric
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index e3d6ced30cc..2a1c20c9c9b 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Adăugați o taxă socială/fiscală
 ContributionsToPay=Taxe sociale / fiscale de plata
 AccountancyTreasuryArea=Zona de facturare și de plată
 NewPayment=Plată nouă
-Payments=Plăţi
 PaymentCustomerInvoice=Plată factură client
 PaymentSupplierInvoice=plata facturii furnizorilor
 PaymentSocialContribution=Plata taxe sociale sau fiscale
@@ -205,7 +204,6 @@ SellsJournal=Jurnalul de vânzări
 PurchasesJournal=Jurnalul de cumpărări
 DescSellsJournal=Jurnalul de vânzări
 DescPurchasesJournal=Jurnalul de cumpărări
-InvoiceRef=Factură ref.
 CodeNotDef=Nedefinit
 WarningDepositsNotIncluded=Facturile de plată în avans nu sunt incluse în această versiune cu acest modul de contabilitate.
 DatePaymentTermCantBeLowerThanObjectDate=Termenul de plată nu poate fi mai mic decât data obiectului.
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index b40204b6542..79f0d4f6f50 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Sintaxă greşită pentru parametru keyforco
 ErrorVariableKeyForContentMustBeSet=Eroare, trebuie să fie setată constanta cu numele %s (cu conținut de text care trebuie afișat) sau %s (cu adresa URL externă de afișat).
 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
 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
diff --git a/htdocs/langs/ro_RO/holiday.lang b/htdocs/langs/ro_RO/holiday.lang
index 90589aa0a5e..f36cee3ef3e 100644
--- a/htdocs/langs/ro_RO/holiday.lang
+++ b/htdocs/langs/ro_RO/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leave
-CPTitreMenu=Leave
+Holidays=Concediu
+CPTitreMenu=Concediu
 MenuReportMonth=Situaţia lunară
 MenuAddCP=Cerere de concediu noua
-NotActiveModCP=You must enable the module Leave to view this page.
+NotActiveModCP=Trebuie să activați modulul Concediu pentru a vedea această pagină.
 AddCP=Crează o cerere de concediu
 DateDebCP=Dată început
 DateFinCP=Dată sfărşit
@@ -15,18 +15,18 @@ ApprovedCP=Aprobat
 CancelCP=Şters
 RefuseCP=Refuzat
 ValidatorCP=Aprobator
-ListeCP=List of leave
-LeaveId=Leave ID
-ReviewedByCP=Will be approved by
-UserForApprovalID=User for approval ID
-UserForApprovalFirstname=First name of approval user
-UserForApprovalLastname=Last name of approval user
-UserForApprovalLogin=Login of approval user
+ListeCP=Lista concediilor
+LeaveId=Lăsați ID-ul
+ReviewedByCP=Va fi aprobat de către
+UserForApprovalID=Utilizator pentru ID de aprobare
+UserForApprovalFirstname=Prenumele utilizatorului de aprobare
+UserForApprovalLastname=Numele utilizatorului de aprobare
+UserForApprovalLogin=Conectarea utilizatorului de aprobare
 DescCP=Descriere
 SendRequestCP=Crează o cerere de concediu
 DelayToRequestCP=Cererile pentru concediu trebuiesc făcute cu cel puţin <b>%s zi(le)</b> înainte.
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+MenuConfCP=Restul concediului
+SoldeCPUser=Restul concediului este de <b> %s </b> zile.
 ErrorEndDateCP=Trebuie să selectaţi data de sfârşit mai mare decât data de început.
 ErrorSQLCreateCP=O eroare SQL întâlnită în timpul creării:
 ErrorIDFicheCP=O eroare a intervenit, cererea de concediu nu exista
@@ -35,14 +35,14 @@ ErrorUserViewCP=Dvs nu aveti dreptul de a citi aceata cerere de concediu.
 InfosWorkflowCP=Flux de lucru Informatii
 RequestByCP=Solicitat de
 TitreRequestCP=Cereri de concedii
-TypeOfLeaveId=Type of leave ID
-TypeOfLeaveCode=Type of leave code
-TypeOfLeaveLabel=Type of leave label
+TypeOfLeaveId=Tipul de ID de concediu
+TypeOfLeaveCode=Tipul codului de concediu
+TypeOfLeaveLabel=Tipul tabelului de concediu
 NbUseDaysCP=Numărul de zile de concediu consumate
-NbUseDaysCPShort=Days consumed
-NbUseDaysCPShortInMonth=Days consumed in month
-DateStartInMonth=Start date in month
-DateEndInMonth=End date in month
+NbUseDaysCPShort=Zile consumate
+NbUseDaysCPShortInMonth=Zilele consumate în lună
+DateStartInMonth=Data de începere în lună
+DateEndInMonth=Data de încheiere în lună
 EditCP=Editare
 DeleteCP=Ştergere
 ActionRefuseCP=Refuzare
@@ -71,7 +71,7 @@ DateRefusCP=Data refuzului
 DateCancelCP=Data anulării
 DefineEventUserCP=Atribuie un concediu excepţional pentru un utilizator
 addEventToUserCP=Atribuie concediu
-NotTheAssignedApprover=You are not the assigned approver
+NotTheAssignedApprover=Nu sunteți persoana desemnată pentru aprobare
 MotifCP=Motiv
 UserCP=Utilizator
 ErrorAddEventToUserCP=O eroare a survenit in timpul adaugarii de concediu exceptional.
@@ -85,24 +85,24 @@ NewSoldeCP=Soldul nou
 alreadyCPexist=O cerere de concediu a fost deja făcută pe această perioadă.
 FirstDayOfHoliday=Prima zi a concediului
 LastDayOfHoliday=Ultima zi a concediului
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
+BoxTitleLastLeaveRequests=Ultimele %s cereri de modificare a concediului 
 HolidaysMonthlyUpdate=Actualizare lunară
 ManualUpdate=Actualizare manuală
 HolidaysCancelation=Anulare cerere concediu
-EmployeeLastname=Employee last name
-EmployeeFirstname=Employee first name
-TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
-LastHolidays=Latest %s leave requests
-AllHolidays=All leave requests
-HalfDay=Half day
-NotTheAssignedApprover=You are not the assigned approver
-LEAVE_PAID=Paid vacation
-LEAVE_SICK=Sick leave
-LEAVE_OTHER=Other leave
-LEAVE_PAID_FR=Paid vacation
+EmployeeLastname=Numele de familie al angajatului
+EmployeeFirstname=Prenumele angajatului
+TypeWasDisabledOrRemoved=Tipul de concediu (id %s) a fost dezactivat sau eliminat
+LastHolidays=Ultimele %s cereri de concediu
+AllHolidays=Toate cererile de concediu
+HalfDay=Jumătate de zi
+NotTheAssignedApprover=Nu sunteți persoana desemnată pentru aprobare
+LEAVE_PAID=Vacanţă platită
+LEAVE_SICK=Concediu medical
+LEAVE_OTHER=Alte concedii
+LEAVE_PAID_FR=Vacanţă plătită
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+LastUpdateCP=Ultima actualizare automată a alocării concediilor
+MonthOfLastMonthlyUpdate=Luna ultimei actualizări automate a alocării concediilor
 UpdateConfCPOK=Actualizare realizată.
 Module27130Name= Managementul cererilor de concedii
 Module27130Desc= Managementul cererilor de concedii
@@ -112,18 +112,19 @@ NoticePeriod=Perioadă notita
 HolidaysToValidate=Validează cereri concedii
 HolidaysToValidateBody=Mai jos este o cerere de concediu de validat
 HolidaysToValidateDelay=Această cerere de concediuva avea loc intr-o  perioadă de mai puţin de %s zile.
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysToValidateAlertSolde=Utilizatorul care a făcut această solicitare de concediu nu are suficiente zile disponibile.
 HolidaysValidated=Cereri de concedii validate
 HolidaysValidatedBody=Cererea dvs pentru concediu  pentru %s la %s a fost validată.
 HolidaysRefused=Cerere respinsă
-HolidaysRefusedBody=Cererea dvs pentru concediu  pentru %s la %s a fost respinsă pentru următoul motiv:
+HolidaysRefusedBody=Solicitarea dvs. de concediu pentru %s la %s a fost respinsă din următorul motiv:
 HolidaysCanceled=Cereri Concedii anulate
 HolidaysCanceledBody=Cererea dvs pentru concediu  pentru %s la %s a fost anulată.
-FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
-NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Holiday
-HolidaysNumberingModules=Leave requests numbering models
-TemplatePDFHolidays=Template for leave requests PDF
-FreeLegalTextOnHolidays=Free text on PDF
-WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+FollowedByACounter=1: Acest tip de concediu trebuie urmat de un contor. Counter-ul este incrementat manual sau automat și atunci când o solicitare de concediu este validată, contorul este diminuat. <br> 0: Nu este urmat de un contor.
+NoLeaveWithCounterDefined=Nu sunt definite tipuri de concediu care trebuie urmate de un contor
+GoIntoDictionaryHolidayTypes=Mergi la <strong> Acasă - Configurare - Dicționare - Tip de concediu </strong> pentru a configura diferitele tipuri de concedii.
+HolidaySetup=Configurarea modulului Vacanță
+HolidaysNumberingModules=Modelele de numerotare a cererilor de concediu
+TemplatePDFHolidays=Șablon pentru cererile de concediu PDF
+FreeLegalTextOnHolidays=Text gratuit pe PDF
+WatermarkOnDraftHolidayCards=Bază de fundal privind cererile de permis de concediu
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 541014c41d9..fa6ed942ed0 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -371,6 +371,7 @@ Percentage=Procentaj
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (exclusiv)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (exclusiv în valută)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (fără taxă)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Trimite confirmare email
 SendMail=Trimite un email
 Email=Email
 NoEMail=Niciun email
-Email=Email
 AlreadyRead=Citit deja
 NotRead=Necitit
 NoMobilePhone=Fără număr mobil
@@ -671,7 +671,6 @@ Method=Metoda
 Receive=Recepţionează
 CompleteOrNoMoreReceptionExpected=Completă sau nimic de așteptat
 ExpectedValue=Valoarea estimată
-CurrentValue=Valoarea curentă
 PartialWoman=Parţial
 TotalWoman=Total
 NeverReceived=Niciodată primit
@@ -834,6 +833,7 @@ RelatedObjects=Obiecte asociate
 ClassifyBilled=Clasează facturată
 ClassifyUnbilled=Clasificați nefacturabil
 Progress=Progres
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=Vizualizare
@@ -842,6 +842,11 @@ Exports=Exporturi
 ExportFilteredList=Exportați lista filtrată
 ExportList=Exportați lista
 ExportOptions=Opţiuni Export
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Diverse
 Calendar=Calendar
 GroupBy=A se grupa cu...
@@ -854,7 +859,7 @@ Download=Descarcă
 DownloadDocument=Descărcați documentul
 ActualizeCurrency=Actualizați cursul valutar
 Fiscalyear=An fiscal
-ModuleBuilder=Modul Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Setați moneda
 BulkActions=Acțiunile în masă
 ClickToShowHelp=Faceți clic pentru a afișa instrumente pentru ajutor
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index 75d2e35d26e..38de939cf93 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -197,3 +197,4 @@ SendReminderForExpiredSubscriptionTitle=Trimiteți un memento prin email pentru
 SendReminderForExpiredSubscription=Trimiteți un memento prin email membrilor când abonamentul este pe cale să expire (parametrul este numărul de zile înainte de încheierea abonamentului pentru a trimite o reamintire. Poate fi o listă de zile separate prin punct și virgulă, de exemplu '10; 5; 0; -5 „)
 MembershipPaid=Abonament plătit pentru perioada curentă (până la %s)
 YouMayFindYourInvoiceInThisEmail=Găsiți factura dvs. atașată acestui email
+XMembersClosed=%s member(s) closed
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index 9c19b45ff00..4445d050870 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Introduceți numele modulului/aplicației pentru a crea fără spații. Utilizați majusculă pentru a separa cuvintele (De exemplu: MyModule, EcommerceForShop, SyncWithMySystem ...)
 EnterNameOfObjectDesc=Introduceți numele obiectului de creat fără spații. Utilizați majusculă pentru a separa cuvintele (De exemplu: MyObject, Student, Profesor ...). Se va genera și fișierul clasa CRUD, dar și fișierul API, paginile care vor lista/adăuga/edita/șterge obiectul și fișierele SQL.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=Aceasta este vizualizarea declanșatorilor furnizați
 ModuleBuilderDeschooks=Această filă este dedicată cârligelor.
 ModuleBuilderDescwidgets=Această filă este dedicată administrării/construirii widgeturilor.
 ModuleBuilderDescbuildpackage=Puteți genera aici un fișier pachet "pregătit pentru distribuire" (un fișier .zip normalizat) al modulului dvs. și un fișier de documentație "gata de distribuire". Doar faceți clic pe butonul pentru a construi pachetul sau documentația.
-EnterNameOfModuleToDeleteDesc=Puteți șterge modulul dvs.. AVERTISMENT: TOATE fișierele modulului ȘI datele structurate și documentația vor fi șterse!
-EnterNameOfObjectToDeleteDesc=Puteți șterge un obiect. AVERTISMENT: Toate fișierele legate de obiect vor fi șterse!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Zona periculoasă
 BuildPackage=Construiți pachetul
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Construiți documentația
 ModuleIsNotActive=Acest modul nu este activat încă. Mergeți la %s pentru a-l face live sau faceți clic aici:
-ModuleIsLive=Acest modul a fost activat. Orice modificare asupra lui poate denatura o caracteristică activă curentă.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Descriere lungă
 EditorName=Numele editorului
 EditorUrl=Adresa URL a editorului
@@ -43,10 +44,11 @@ PathToModulePackage=Calea pentru zipul pachetului de module/aplicații
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spațiile sau caracterele speciale nu sunt permise.
 FileNotYetGenerated=Fișierul nu a fost încă generat
-RegenerateClassAndSql=Ștergeți și regenerați fișierele de clasă și SQL
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generați fișierele lipsă
 SpecificationFile=File of documentation
 LanguageFile=Fișier pentru limbă
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Sigur doriți să ștergeți proprietatea <strong> %s </strong>? Acest lucru va schimba codul în clasa PHP, dar va elimina și coloana din definiția tabelului de obiect.
 NotNull=Nu NUL
 NotNullDesc=1 = Setați baza de date la NOT NULL. -1 = Permite valorile null și valoarea forței la NULL dacă este goală ('' sau 0).
@@ -62,9 +64,11 @@ ReadmeFile=Fișierul Readme
 ChangeLog=Fișierul ChangeLog
 TestClassFile=Fișier pentru unitatea PHP Unitate de testare
 SqlFile=Dosar SQL
-PageForLib=Fișier pentru biblioteci PHP
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Dosar SQL pentru atributele complementare
 SqlFileKey=Dosar SQL pentru chei
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=Un obiect există deja cu acest nume și cu un alt caz
 UseAsciiDocFormat=Puteți utiliza formatul Markdown, dar este recomandat să utilizați formatul Asciidoc (omparison între .md și .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Este o măsură
@@ -81,8 +85,10 @@ IsAMeasureDesc=Poate fi cumulata valoarea câmpului pentru a obține un total î
 SearchAllDesc=Este câmpul folosit pentru a face o căutare din instrumentul de căutare rapidă? (Exemple: 1 sau 0)
 SpecDefDesc=Introduceți aici toată documentația pe care doriți să o furnizați împreună cu modulul, care nu este deja definită de alte file. Puteți utiliza .md sau mai bine, sintaxa bogată .asciidoc.
 LanguageDefDesc=Introduceți în aceste fișiere toate cheile și traducerea pentru fiecare fișier lingvistic.
-MenusDefDesc=Definiți aici meniurile furnizate de modulul dvs. (odată definite, ele sunt vizibile în editorul de meniuri %s)
-PermissionsDefDesc=Definiți aici noile permisiuni furnizate de modulul dvs. (odată definite, acestea sunt vizibile în setările prestabilite de permisiuni %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Definiți în proprietatea <b> module_parts ['hooks'] </b>, în descriptorul modulului, contextul de cârlige pe care doriți să îl gestionați (lista de contexte poate fi găsită printr-o căutare pe '<b> initHooks (</b>' din codul principal) <br> Edit fișierul cu cârlig pentru a adăuga codul funcțiilor dvs. înclinate (funcțiile legate pot fi găsite printr-o căutare pe '<b> executeHooks </b>' în codul principal).
 TriggerDefDesc=Definiți în fișierul declanșator codul pe care doriți să-l executați pentru fiecare eveniment de afaceri executat.
 SeeIDsInUse=Vedeți ID-urile utilizate în instalarea dvs.
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/ro_RO/paybox.lang b/htdocs/langs/ro_RO/paybox.lang
index bd0901dfef1..a78beb80d08 100644
--- a/htdocs/langs/ro_RO/paybox.lang
+++ b/htdocs/langs/ro_RO/paybox.lang
@@ -3,28 +3,28 @@ PayBoxSetup=PayBox modul de configurare
 PayBoxDesc=Acest modul oferă pagini pentru a permite plata pe <a href="http://www.paybox.com" target="_blank">Paybox</a> de către clienţi. Acest lucru poate fi folosit pentru un cont gratuit sau plată pentru o plată de pe un anumit obiect Dolibarr (factură, pentru, ...)
 FollowingUrlAreAvailableToMakePayments=Ca urmare a URL-uri sunt disponibile pentru a oferi o pagină de la un client pentru a face o plată pe Dolibarr obiecte
 PaymentForm=Formă de plată
-WelcomeOnPaymentPage=Welcome to our online payment service
+WelcomeOnPaymentPage=Bine ați venit la serviciul nostru de plată online
 ThisScreenAllowsYouToPay=Acest ecran vă permite de a face o plată online pentru %s.
 ThisIsInformationOnPayment=Acest lucru este de informatii cu privire la plata de a face
 ToComplete=Pentru a completa
 YourEMail=E-mail de confirmare de plată
 Creditor=Creditor
 PaymentCode=Cod Plata
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Emite plata
 YouWillBeRedirectedOnPayBox=Veţi fi redirecţionat pe pagina Paybox securizat la intrare ai card de credit Informatii
 Continue=Următorul
 ToOfferALinkForOnlinePayment=URL-ul pentru plata %s
-ToOfferALinkForOnlinePaymentOnOrder=URL-ul pentru a oferi un %s plata online pentru o interfaţă de utilizator pentru
+ToOfferALinkForOnlinePaymentOnOrder=URL pentru a oferi o  %s interfață utilizator de plată online pentru o comandă de vânzări
 ToOfferALinkForOnlinePaymentOnInvoice=URL-ul pentru a oferi un %s plata online interfaţă de utilizator pentru o factură
 ToOfferALinkForOnlinePaymentOnContractLine=URL-ul pentru a oferi un %s plata online interfaţă cu utilizatorul pentru un contract de linie
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL-ul pentru a oferi un %s plata online interfaţă de utilizator pentru o suma de liber
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL-ul pentru a oferi o plată %s interfata online pentru un abonament de membru
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL pentru a oferi o  %s plată online, interfața cu utilizatorul pentru plata donației
 YouCanAddTagOnUrl=Puteţi, de asemenea, să adăugaţi URL-ul parametru <b>& tag= <i>valoarea</i></b> la oricare dintre aceste URL-ul (necesar doar pentru liber de plată) pentru a adăuga propriul plată comentariu tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Configurați-vă caseta de plată cu url <b> %s </b> pentru a avea o plată creată automat când este validată de Paybox.
 YourPaymentHasBeenRecorded=Această pagină confirmă faptul că plata dvs. a fost înregistrată. Mulţumesc.
-YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Plata dvs. NU a fost înregistrată și tranzacția a fost anulată. Mulțumesc.
 AccountParameter=Parametri Cont
 UsageParameter=Utilizarea parametrilor
 InformationToFindParameters=Ajutor pentru a găsi informaţiile dvs. de cont %s
@@ -33,7 +33,8 @@ VendorName=Numele vânzătorului
 CSSUrlForPaymentForm=CSS foaie de URL-ul de stil pentru forma de plată
 NewPayboxPaymentReceived=O nouă plată Paybox primită
 NewPayboxPaymentFailed=O plată nouă Paybox încercată dar eşuată
-PAYBOX_PAYONLINE_SENDEMAIL=Email pentru avertizare după o plată (realizată sau nu)
+PAYBOX_PAYONLINE_SENDEMAIL=E-mail notificare după încercarea de plată (succes sau eșec)
 PAYBOX_PBX_SITE=Valoare pentru PBX SITE
 PAYBOX_PBX_RANG=Valoare pentru PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Valoare pentru PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/ro_RO/paypal.lang b/htdocs/langs/ro_RO/paypal.lang
index 5399d8d4a2c..91f38d16710 100644
--- a/htdocs/langs/ro_RO/paypal.lang
+++ b/htdocs/langs/ro_RO/paypal.lang
@@ -1,34 +1,36 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal modul de configurare
-PaypalDesc=Această ofertă modul de pagini pentru a permite plata pe <a href="http://www.paypal.com" target="_blank">PayPal</a> de catre clientii. Acest lucru poate fi folosit pentru o plată gratuit sau pentru o plată pe un anumit obiect Dolibarr (facturi, ordine, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Plata cu Paypal
+PaypalDesc=Acest modul permite plata de către clienți prin intermediul  <a href="http://www.paypal.com" target="_blank">PayPal </a> . Aceasta poate fi utilizată pentru o plată ad-hoc sau pentru o plată aferentă unui obiect Dolibarr (factură, comandă, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Plătiți cu PayPal
 PAYPAL_API_SANDBOX=Mod de încercare / sandbox
 PAYPAL_API_USER=API numele de utilizator
 PAYPAL_API_PASSWORD=API parola
 PAYPAL_API_SIGNATURE=API semnătura
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferta de plată integral (carte de credit + Paypal) sau Paypal numai
+PAYPAL_SSLVERSION=Versiune Curl SSL 
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferiți o plată integrală (card de credit + PayPal) sau doar "PayPal"
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=Numai PayPal
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Adresa URL opțională a foii de stil CSS pe pagina de plată online
 ThisIsTransactionId=Acesta este ID-ul de tranzacţie: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Adăugaţi URL-ul de plată Paypal atunci când trimiteţi un document prin e-mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
-NewOnlinePaymentReceived=New online payment received
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=E-mail pentru avertizare după o plată (realizată sau nu)
+PAYPAL_ADD_PAYMENT_URL=Includeți URL cu plata PayPal atunci când trimiteți un document prin e-mail
+NewOnlinePaymentReceived=A fost primită o nouă plată online
+NewOnlinePaymentFailed=Noua plata online a încercat, dar nu a reușit
+ONLINE_PAYMENT_SENDEMAIL=Adresa de e-mail pentru notificări după fiecare încercare de plată (in caz de succes și eșec)
 ReturnURLAfterPayment=URL-ul return după plată
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
+ValidationOfOnlinePaymentFailed=Validarea plății online a eșuat
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Pagina de confirmare a plății apelată de sistemul de plăți a întors o eroare
 SetExpressCheckoutAPICallFailed=Apel API SetExpressCheckout eșuat..
 DoExpressCheckoutPaymentAPICallFailed=Apel API DoExpressCheckoutPayment  eșuat.
 DetailedErrorMessage=Mesaj  eroare detaliat
 ShortErrorMessage=Mesaj eroare scurt
 ErrorCode=Cod de eroare
 ErrorSeverityCode=Cod Severitate eroare
-OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+OnlinePaymentSystem=Sistem de plată online
+PaypalLiveEnabled=ModcPayPal "live" activat (altfel test / modul sandbox)
+PaypalImportPayment=Importați plăți PayPal
+PostActionAfterPayment=Acțiuni postate după plăți
+ARollbackWasPerformedOnPostActions=A fost efectuată o revocare a tuturor acțiunilor Post. Trebuie să finalizați manual acțiunile postate dacă acestea sunt necesare.
+ValidationOfPaymentFailed=Validarea plății a eșuat
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index ce8a63512d0..95a608ea2c7 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -260,7 +260,7 @@ AddVariable=Adăugați variabilă
 AddUpdater=Adăugați Updater
 GlobalVariables=Variabile globale
 VariableToUpdate=Variabilă de actualizat
-GlobalVariableUpdaters=Actualizatori de variabile globale
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=Date JSON
 GlobalVariableUpdaterHelp0=Analizează datele JSON din adresa URL specificată, VALUE specifică locația valorii relevante,
 GlobalVariableUpdaterHelpFormat0=Format pentru solicitare {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Fișa produsului
 ServiceSheet=Foaia de service
 PossibleValues=Valori posibile
 GoOnMenuToCreateVairants=Mergeți în meniul %s - %s pentru a pregăti variantele atributelor (cum ar fi culorile, mărimea, ...)
-UseProductFournDesc=Utilizați descrierile furnizorilor de produse în documentele furnizorilor
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Descrierea furnizorului pentru produs
 #Attributes
 VariantAttributes=Atribute variabile
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=A apărut o eroare la copierea variantelor de produ
 ErrorDestinationProductNotFound=Destinația produsului nu a fost găsita
 ErrorProductCombinationNotFound=Varianta de produs nu a fost găsită
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index c056a1b9407..36de3c1d572 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Timp comsumat
 TimeSpentByYou=Timpul consumat  da tine
 TimeSpentByUser=Timp consumat pe utilizator
 TimesSpent=Timpi consumaţi
-RefTask=Ref. Task
-LabelTask=Eticheta Task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Timp consumat pe task
 TaskTimeUser=Utilizator
 TaskTimeNote=Nota
diff --git a/htdocs/langs/ro_RO/stripe.lang b/htdocs/langs/ro_RO/stripe.lang
index 9241dddbc38..92ff044dd88 100644
--- a/htdocs/langs/ro_RO/stripe.lang
+++ b/htdocs/langs/ro_RO/stripe.lang
@@ -12,7 +12,7 @@ YourEMail=E-mail de confirmare de plată
 STRIPE_PAYONLINE_SENDEMAIL=Email de notificare după o încercare de plată (succes sau eșec)
 Creditor=Creditor
 PaymentCode=Cod Plata
-StripeDoPayment=Plătiți cu card de credit sau de debit (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=Veți fi redirecționat pe pagina Stripe securizată pentru a vă introduce informațiile despre cardul de credit
 Continue=Următor
 ToOfferALinkForOnlinePayment=URL-ul pentru plata %s
@@ -40,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Cheie in direct Webhook
 ONLINE_PAYMENT_WAREHOUSE=Stoc de utilizat pentru scăderea stocului atunci când se efectuează plata online <br> (TODO Când opțiunea de a reduce stocul se face printr-o acțiune pe factură, iar plata online generează factura?)
 StripeLiveEnabled=Stripe live activat (altfel test / modul sandbox)
 StripeImportPayment=Plățile pentru importul Stripe
-ExampleOfTestCreditCard=Exemplu de card de credit pentru test: %s (valid), %s (eroare CVC), %s (expirat), %s (taxa nu reușește)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Iesiri Stripe
 OAUTH_STRIPE_TEST_ID=ID-ul de conectare Stripe a clientului (ca _...)
 OAUTH_STRIPE_LIVE_ID=ID-ul de conectare Stripe a clientului (ca _...)
@@ -63,3 +63,5 @@ CreateCardOnStripe=Creați un card pe Stripe
 ShowInStripe=Arată în Stripe
 StripeUserAccountForActions=Cont utilizator pe care să îl utilizați pentru notificarea prin email a anumitor evenimente Stripe (plăți Stripe)
 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)
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index 04734c639f8..f250cd13e96 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=Această pagină/recipient este o traducere a
 ThisPageHasTranslationPages=Această pagină / recipient are traducere
 NoWebSiteCreateOneFirst=Niciun site nu a fost creat încă. Creați primul.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 931b325baf9..2b7279ae30c 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Создать новую транзакцию
 UpdateMvts=Изменить транзакцию
 ValidTransaction=Validate transaction
-WriteBookKeeping=Журнализировать транзакции в Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Метка бухгалтерского счёта
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Журнал
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index ca402e00a77..2356df7c003 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Кроме того, если у вас есть
 UseSearchToSelectContactTooltip=Кроме того, если у вас есть большое количество третьих лиц (> 100 000), вы можете увеличить скорость, установив постоянную связь CONTACT_DONOTSEARCH_ANYWHERE в 1 в Setup-> Other. Затем поиск будет ограничен началом строки.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Кол-во символов для запуска поиска: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Недоступно при отключенном Ajax
 AllowToSelectProjectFromOtherCompany=В документе третьей стороны можно выбрать проект, связанный с другой третьей стороной
 JavascriptDisabled=JavaScript отключен
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Порт
 VirtualServerName=Имя Виртуального сервера
 OS=OS
 PhpWebLink=Веб-ссылка Php
-Browser=Браузер
 Server=Сервер
 Database=База данных
 DatabaseServer=Хост Базы данных
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Система информации разного техниче
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=Номер файла
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Доступное приложение/модули
 ToActivateModule=Чтобы активировать модуль, перейдите на настройку зоны.
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Счета и кредитных нот нумерации
 BillsPDFModules=Счет документы моделей
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Модели платежных документов
-CreditNote=Кредитное авизо
-CreditNotes=Кредитные авизо
 ForceInvoiceDate=Силы дата счета-фактуры для подтверждения даты
 SuggestedPaymentModesIfNotDefinedInInvoice=Предлагаемые платежи на счета в режиме по умолчанию, если не определено в счете-фактуре
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Индекс
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang
index e80f5125235..b260f63865c 100644
--- a/htdocs/langs/ru_RU/agenda.lang
+++ b/htdocs/langs/ru_RU/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=События, за которые Dolibarr создадут де
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Третья сторона %s создана
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Контакт %s подтверждён
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Ком. предложение  %s подписано
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Проект %s изменен
 PROJECT_DELETEInDolibarr=Проект %s удален
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index 299d1baa17b..825ad45c19c 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Банк
-MenuBankCash=Банк | Денежные средства
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Смешанные платежи
 MenuNewVariousPayment=Новый смешанный платеж
 BankName=Название банка
 FinancialAccount=Учетная запись
 BankAccount=Банковский счет
 BankAccounts=Банковские счета
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Банковские счета | Шлюзы
 ShowAccount=Показать учётную запись
 AccountRef=Финансовые счета исх
 AccountLabel=Финансовые счета этикетки
@@ -30,7 +30,7 @@ AllTime=Сначала
 Reconciliation=Примирение
 RIB=Bank Account Number
 IBAN=IBAN номера
-BIC=BIC / SWIFT число
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT действителен
 SwiftVNotalid=BIC / SWIFT недействителен
 IbanValid=BAN действителен
@@ -42,11 +42,11 @@ AccountStatementShort=Утверждение
 AccountStatements=Выписки со счета
 LastAccountStatements=Последнее счета
 IOMonthlyReporting=Ежемесячная отчетность
-BankAccountDomiciliation=Счет адрес
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Счет страны
 BankAccountOwner=Имя владельца счета
 BankAccountOwnerAddress=Адрес владельца счета
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Создать аккаунт
 NewBankAccount=Новый счет
 NewFinancialAccount=Новые финансовые счета
@@ -98,14 +98,14 @@ BankLineConciliated=Запись согласована
 Reconciled=Согласовано
 NotReconciled=Не согласовано
 CustomerInvoicePayment=Заказчиком оплаты
-SupplierInvoicePayment=Оплаты поставщика
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Абонентская плата
 WithdrawalPayment=Снятие оплаты
 SocialContributionPayment=Социальный/налоговый сбор
 BankTransfer=Банковский перевод
 BankTransfers=Банковские переводы
 MenuBankInternalTransfer=Внутренний трансфер
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=От
 TransferTo=К
 TransferFromToDone=<b>Передача%</b> от <b>S в% х %s%</b> S был записан.
@@ -136,7 +136,7 @@ BankTransactionLine=Банковская запись
 AllAccounts=Все банковские и кассовые счета
 BackToAccount=Перейти к ответу
 ShowAllAccounts=Шоу для всех учетных записей
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Выберите банковскую выписку, связанную с согласительной процедурой. Используйте сортируемое числовое значение: ГГГГММ или ГГГГММДД
 EventualyAddCategory=Укажите категорию для классификации записей
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Проверка возвращена, а сч
 BankAccountModelModule=Шаблоны документов для банковских счетов
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Шаблон для печати страницы с информацией о BAN.
-NewVariousPayment=Новые смешанные платежи
-VariousPayment=Смешанные платежи
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Смешанные платежи
-ShowVariousPayment=Показать смешанные платежи
-AddVariousPayment=Добавить смешанные платежи
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=Мандат SEPA
 YourSEPAMandate=Ваш мандат SEPA
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index ba1bb8ccd39..9d8cac3c0a1 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Возврат платежа
 DeletePayment=Удалить платеж
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Полученные платежи
 ReceivedCustomersPayments=Платежи, полученные от покупателей
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Сумма платежа
-ValidatePayment=Подтвердть платёж
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
@@ -479,7 +481,7 @@ CantRemovePaymentWithOneInvoicePaid=Не удается удалить опла
 ExpectedToPay=Ожидаемые платежи
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Оплачен этим платежом
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down-payment or replacement invoices paid entirely.
+ClosePaidInvoicesAutomatically=Классифицируйте все стандартные, авансовые или заменяющие счета как полностью оплаченные.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
 ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index 28362e170b8..fb42546d199 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=История
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index 38962964846..8c7cd9b904e 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Новые оплаты
-Payments=Платежи
 PaymentCustomerInvoice=Заказчиком оплаты счетов-фактур
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Социальный/налоговый сбор
@@ -205,7 +204,6 @@ SellsJournal=Продажи журнала
 PurchasesJournal=Покупки Журнал
 DescSellsJournal=Продажи журнала
 DescPurchasesJournal=Покупки Журнал
-InvoiceRef=Счет реф.
 CodeNotDef=Не определено
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 9c3a7d85d1b..b8e12a8f6bc 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang
index 9dd4adb55e0..f9c08748017 100644
--- a/htdocs/langs/ru_RU/holiday.lang
+++ b/htdocs/langs/ru_RU/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Подтверждённые заявления на отпуск
 HolidaysValidatedBody=Ваше заявление на отпуск с  %s по %s  подтверждено.
 HolidaysRefused=Заявление отклонено.
-HolidaysRefusedBody=Ваше заявление на отпуск с  %s по %s отклонено по следующей причине: 
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Отменённые заявления на отпуск
 HolidaysCanceledBody=Ваше заявление на отпуск с  %s по %s отменено. 
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 60046636d45..2358fc8d01d 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -371,6 +371,7 @@ Percentage=Процент
 Total=Всего
 SubTotal=Подитог
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Всего (вкл-я налог)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Отправить подтверждение на э
 SendMail=Отправить письмо
 Email=Адрес электронной почты
 NoEMail=Нет Email
-Email=Адрес электронной почты
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=Нет мобильного телефона
@@ -671,7 +671,6 @@ Method=Метод
 Receive=Получить
 CompleteOrNoMoreReceptionExpected=Завершено или ничего больше не ожидается
 ExpectedValue=Ожидаемое значение
-CurrentValue=Текущее значение
 PartialWoman=Частичное
 TotalWoman=Всего
 NeverReceived=Никогда не получено
@@ -834,6 +833,7 @@ RelatedObjects=Связанные объекты
 ClassifyBilled=Классифицировать счета
 ClassifyUnbilled=Классифицировать невыполненные
 Progress=Прогресс
+ProgressShort=Progr.
 FrontOffice=Дирекция
 BackOffice=Бэк-офис
 View=Вид
@@ -842,6 +842,11 @@ Exports=Экспорт
 ExportFilteredList=Экспорт списка фильтров
 ExportList=Экспорт списка
 ExportOptions=Настройки экспорта
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Разное
 Calendar=Календарь
 GroupBy=Группировка по...
@@ -854,7 +859,7 @@ Download=Загрузка
 DownloadDocument=Скачать документ
 ActualizeCurrency=Обновить текущий курс
 Fiscalyear=Финансовый год
-ModuleBuilder=Создатель Модуля
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Настройка валюты
 BulkActions=Массовые действия
 ClickToShowHelp=Нажмите для отображения подсказок
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index 37a3c5fa974..a4328089382 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -6,7 +6,7 @@ Member=Участник
 Members=Участники
 ShowMember=Показать карточку участника
 UserNotLinkedToMember=Пользователь не связан с участником
-ThirdpartyNotLinkedToMember=Контр-агент не связан с участником
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Члены Билеты
 FundationMembers=Члены фонда
 ListOfValidatedPublicMembers=Список проверенных общественности
@@ -67,11 +67,11 @@ Subscriptions=Подписки
 SubscriptionLate=Поздно
 SubscriptionNotReceived=Подписка никогда не получал
 ListOfSubscriptions=Список подписчиков
-SendCardByMail=Отправить карту
+SendCardByMail=Send card by email
 AddMember=Создать участника
 NoTypeDefinedGoToSetup=Ни один из членов определенных типов. Переход к установке - членов типов
 NewMemberType=Новый тип участника
-WelcomeEMail=Приветственное Email-письмо
+WelcomeEMail=Welcome email
 SubscriptionRequired=Подписка требуется
 DeleteType=Удалить
 VoteAllowed=Голосовать разрешается
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd файл
 ValidateMember=Проверка членов
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=Следующие ссылки открытых страниц не защищены какими-либо Dolibarr разрешения. Они не отформатированный страниц при условии, что в качестве примера, чтобы показать, как в списке членов данных.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Общественная член списка
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Содержание Вашей карточки участника
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Тема письма, которое будет получено в случае автоматически подписки гостя
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Тело письма, которое будет получено в случае автоматическоей подписки гостя
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Отправитель EMail для автоматического письма
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Этикетки формате
 DescADHERENT_ETIQUETTE_TEXT=Текст, который будет напечетан на адресном листе пользователя
 DescADHERENT_CARD_TYPE=Формат карт страницы
@@ -156,8 +156,8 @@ DocForAllMembersCards=Создание визитной карточки для
 DocForOneMemberCards=Создание визитной карточки для конкретного члена (формат для вывода на самом деле установки: <b>%s)</b>
 DocForLabels=Создание листов адрес (формат для вывода на самом деле установки: <b>%s)</b>
 SubscriptionPayment=Абонентская плата
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Члены статистику по странам
 MembersStatisticsByState=Члены статистики штата / провинции
 MembersStatisticsByTown=Члены статистики города
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Значение НДС, для ипользования в подписках
-NoVatOnSubscription=Нет НДС для подписок
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Товар, который будет использован, чтобы включить подписку в счёт: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/ru_RU/modulebuilder.lang b/htdocs/langs/ru_RU/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/ru_RU/modulebuilder.lang
+++ b/htdocs/langs/ru_RU/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/ru_RU/paybox.lang b/htdocs/langs/ru_RU/paybox.lang
index 839cc8237bf..ff7a013445c 100644
--- a/htdocs/langs/ru_RU/paybox.lang
+++ b/htdocs/langs/ru_RU/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Для завершения
 YourEMail=Электронная почта для подтверждения оплаты
 Creditor=Кредитор
 PaymentCode=Код платежа
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Совершить платеж
 YouWillBeRedirectedOnPayBox=Вы будете перенаправлены по обеспеченным Paybox страницу для ввода данных кредитной карточки
 Continue=Далее
 ToOfferALinkForOnlinePayment=URL-адрес для оплаты %s
-ToOfferALinkForOnlinePaymentOnOrder=URL предложить %s онлайн платежей пользовательский интерфейс для заказа
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL предложить %s онлайн платежей пользовательский интерфейс для счета
 ToOfferALinkForOnlinePaymentOnContractLine=URL предложить% интернет-платежей с интерфейсом пользователя на контракт линия
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL предложить% интернет-платежей с пользовательским интерфейсом для свободного сумму
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL предложить оплаты %s онлайн пользовательский интерфейс для членов подписки
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Вы также можете добавить URL параметр И <b>тег= <i>значение</i></b> для любой из этих URL (требуется только для свободного платежа), чтобы добавить свой комментарий оплаты метки.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Эта страница подтверждает, что ваш платеж был записан. Спасибо.
@@ -33,7 +33,8 @@ VendorName=Имя поставщика
 CSSUrlForPaymentForm=CSS-стилей URL для оплаты форме
 NewPayboxPaymentReceived=Новый платёж Paybox поулчен.
 NewPayboxPaymentFailed=Попытка нового платежа Paybox не удалась
-PAYBOX_PAYONLINE_SENDEMAIL=Адрес электронной почты, куда будет высылаться уведомление о платеже (успешном или нет)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Значение PBX SITE
 PAYBOX_PBX_RANG=Значение PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Значение PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/ru_RU/paypal.lang b/htdocs/langs/ru_RU/paypal.lang
index 4c5741bca93..6aab1d37bc5 100644
--- a/htdocs/langs/ru_RU/paypal.lang
+++ b/htdocs/langs/ru_RU/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Настройка модуля PayPal 
-PaypalDesc=Этот модуль предлагает страниц, чтобы выплаты по <a href="http://www.paypal.com" target="_blank">PayPal</a> клиентами. Это может быть использовано для свободного оплаты или оплаты на определенный объект Dolibarr (счет-фактура, заказ, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Оплатить с помощью Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Режим тестирования / песочницы
 PAYPAL_API_USER=API имя пользователя
 PAYPAL_API_PASSWORD=API пароль
 PAYPAL_API_SIGNATURE=API подпись
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Предлагает платеж &quot;Интегральный&quot; (кредитные карты + Paypal) или только &quot;PayPal&quot;
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Интегральный
 PaypalModeOnlyPaypal=только PayPal
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=Это идентификатор транзакции: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Добавить адрес Paypal оплата при отправке документа по почте
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Адрес электронной почты, куда будут высылаться уведомления о платежах (успешных или нет)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Ссылка, куда будет возвращаться пользователь после оплаты
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index b553d347c3f..f394042923f 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -260,7 +260,7 @@ AddVariable=Добавить переменную
 AddUpdater=Добавить обновление
 GlobalVariables=Глобальные переменные
 VariableToUpdate=Переменная для обновления
-GlobalVariableUpdaters=Обновители глобальных переменных
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=Данные JSON
 GlobalVariableUpdaterHelp0=Анализирует данные JSON из указанной ссылки,  VALUE определяет местоположение соответствующего значения,
 GlobalVariableUpdaterHelpFormat0=Формат для запроса {«URL»: «http://example.com/urlofjson», «VALUE»: «array1, array2, targetvalue»}
@@ -294,7 +294,7 @@ ProductSheet=Лист продукта
 ServiceSheet=Сервисный лист
 PossibleValues=Возможные значения
 GoOnMenuToCreateVairants=Перейдите в меню %s - %s, чтобы подготовить варианты атрибутов (например, цвета, размер, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Вариант атрибутов
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=При копировании вариантов п
 ErrorDestinationProductNotFound=Продукт назначения не найден
 ErrorProductCombinationNotFound=Вариант продукта не найден
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index d1e5ca56db8..2535b60885f 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Время, затраченное
 TimeSpentByYou=Затраченное мной время
 TimeSpentByUser=Затраченное пользователем время
 TimesSpent=Время, проведенное
-RefTask=Ref. задача
-LabelTask=Этикетка задачи
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Время, потраченное на задачи
 TaskTimeUser=Пользователь
 TaskTimeNote=Заметка
diff --git a/htdocs/langs/ru_RU/stripe.lang b/htdocs/langs/ru_RU/stripe.lang
index 4989304a344..10b6c4748d1 100644
--- a/htdocs/langs/ru_RU/stripe.lang
+++ b/htdocs/langs/ru_RU/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=После URL, можно предложить страницу к клиенту сделать платеж по Dolibarr объектов
 PaymentForm=Форма оплаты
-WelcomeOnPaymentPage=Добро пожаловать на наш интернет-платежей службы
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=На этом экране можно сделать онлайн-платежей для %s.
 ThisIsInformationOnPayment=Это данные по оплате делать
 ToComplete=Для завершения
 YourEMail=Электронная почта для подтверждения оплаты
-STRIPE_PAYONLINE_SENDEMAIL=Адрес электронной почты, куда будут высылаться уведомления о платежах (успешных или нет)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Кредитор
 PaymentCode=Код платежа
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Дальше
 ToOfferALinkForOnlinePayment=URL-адрес для оплаты %s
-ToOfferALinkForOnlinePaymentOnOrder=URL предложить %s онлайн платежей пользовательский интерфейс для заказа
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL предложить %s онлайн платежей пользовательский интерфейс для счета
 ToOfferALinkForOnlinePaymentOnContractLine=URL предложить% интернет-платежей с интерфейсом пользователя на контракт линия
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL предложить% интернет-платежей с пользовательским интерфейсом для свободного сумму
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL предложить оплаты %s онлайн пользовательский интерфейс для членов подписки
 YouCanAddTagOnUrl=Вы также можете добавить URL параметр И <b>тег= <i>значение</i></b> для любой из этих URL (требуется только для свободного платежа), чтобы добавить свой комментарий оплаты метки.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=Эта страница подтверждает, что ваш платеж был записан. Спасибо.
-YourPaymentHasNotBeenRecorded=Вы платеж не был записан и сделка была отменена. Спасибо.
 AccountParameter=Счет параметры
 UsageParameter=Использование параметров
 InformationToFindParameters=Помогите найти %s информацию об учетной записи
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 311e55fe79f..16241e44e31 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index ec69e20fa98..8699ebfc2ad 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Vytvorte novú transakciu
 UpdateMvts=Úprava transakcie
 ValidTransaction=Validate transaction
-WriteBookKeeping=Zmeniť transakcie v knihe Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Hlavná kniha
 AccountBalance=Stav účtu
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Účtovný účet štandardne pre zakúpené produkty (používa sa, ak nie je definovaný v produktovom liste)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Účtovný účet štandardne pre predané produkty (použité, ak nie sú definované v produktovom liste)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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=Účtovný účet predvolene pre zakúpené služby (používa sa, ak nie je definovaný v služobnom liste)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Účtovný účet predvolene pre predané služby (používa sa, ak nie je definovaný v služobnom liste)
 
@@ -177,6 +177,7 @@ LabelAccount=Značkový účet
 LabelOperation=Label operation
 Sens=sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=časopis
 JournalLabel=Journal label
 NumPiece=Číslo kusu
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=Táto stránka môže byť použitá na nastavenie predvolen
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=Možnosti
 OptionModeProductSell=Mód predaja
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mód nákupu
 OptionModeProductSellDesc=Zobraziť všetky produkty s účtovným účtom pre predaj.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Zobraziť všetky produkty s účtovným účtom pre nákupy.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Resetovať všetky priradenia pre zvolený rok
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 2a818fe6f9a..681dd2774b2 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Predradníka znaky na spustenie hľadania: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Nie je k dispozícii pri Ajax vypnutej
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript so zdravotným postihnutím
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Prístav
 VirtualServerName=Názov virtuálneho servera
 OS=OS
 PhpWebLink=Web Php link
-Browser=Prehliadač
 Server=Server
 Database=Databáza
 DatabaseServer=Databáza hostiteľa
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Systémové informácie je rôzne technické informácie získate
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=Pre aktiváciu modulov, prejdite na nastavenie priestoru (Domov-&gt; Nastavenie-&gt; Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Faktúry a dobropisy číslovanie modelu
 BillsPDFModules=Fakturačné doklady modely
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Dobropis
-CreditNotes=Dobropisy
 ForceInvoiceDate=Force faktúry dátum Dátum overenia
 SuggestedPaymentModesIfNotDefinedInInvoice=Navrhované platby režime na faktúre v predvolenom nastavení, ak nie je definovaný pre faktúry
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zips
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang
index 833e1a0a701..dcd977130f7 100644
--- a/htdocs/langs/sk_SK/agenda.lang
+++ b/htdocs/langs/sk_SK/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Udalosti, pre ktoré Dolibarr vytvorí akciu v programe automatick
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tretia strana %s vytvorená
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Zmluva %s overená
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Ponuka %s podpísaná
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index 3a157f1d2ee..9bb75e13891 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banka
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Názov banky
 FinancialAccount=Účet
 BankAccount=Bankový účet
 BankAccounts=Bankové účty
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Zobraziť účet
 AccountRef=Finančný účet ref
 AccountLabel=Finančný účet štítok
@@ -30,7 +30,7 @@ AllTime=Od začiatku
 Reconciliation=Zmierenie
 RIB=Číslo bankového účtu
 IBAN=IBAN
-BIC=BIC / SWIFT číslo
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Vyhlásenie
 AccountStatements=Výpisy z účtov
 LastAccountStatements=Posledný výpis z účtu
 IOMonthlyReporting=Mesačný reporting
-BankAccountDomiciliation=Účtovné adresa
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Účet krajiny
 BankAccountOwner=Majiteľ účtu Názov
 BankAccountOwnerAddress=Majiteľ účtu adresa
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Vytvoriť účet
 NewBankAccount=Nový účet
 NewFinancialAccount=Nový finančný účet
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Zlúčiť
 NotReconciled=Nezlúčené
 CustomerInvoicePayment=Klientská platba
-SupplierInvoicePayment=Dodávatelská platba
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Odberatelská platba
 WithdrawalPayment=Odstúpenie platba
 SocialContributionPayment=Platba sociálnej/fiškálnej dane
 BankTransfer=Bankový prevod
 BankTransfers=Bankové prevody
 MenuBankInternalTransfer=Interný prevod
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Z
 TransferTo=Na
 TransferFromToDone=Transfer z <b>%s</b> na <b>%s</b> %s <b>%s</b> zo bol zaznamenaný.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Späť na účte
 ShowAllAccounts=Zobraziť pre všetky účty
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Zvoľte výpis z účtu  potrebný pre náhľad. Zoraďťe podľa číselnej hodnoty YYYYMM alebo YYYYMMDD
 EventualyAddCategory=Nakoniec určiť kategóriu, v ktorej chcete klasifikovať záznamy
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Šek vrátený a faktúra znova otvorená
 BankAccountModelModule=Šablóny dokumentov pre bankové účty
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Šablóna pre tlač strany s BAN informáciami
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 0861d4b975b..0a0e51aa0bb 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Platené späť
 DeletePayment=Odstrániť platby
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Prijaté platby
 ReceivedCustomersPayments=Platby prijaté od zákazníkov
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Suma platby
-ValidatePayment=Overenie platby
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Overiť faktúrý automaticky
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/sk_SK/cashdesk.lang b/htdocs/langs/sk_SK/cashdesk.lang
index 8c61e6b0320..0a6729d26a6 100644
--- a/htdocs/langs/sk_SK/cashdesk.lang
+++ b/htdocs/langs/sk_SK/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=História
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index 2370849c9a6..c587fcd1b25 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Nový platobný
-Payments=Platby
 PaymentCustomerInvoice=Zákazník faktúru
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Platba sociálnej/fiškálnej dane
@@ -205,7 +204,6 @@ SellsJournal=Predaj Journal
 PurchasesJournal=Nákupy Journal
 DescSellsJournal=Predaj Journal
 DescPurchasesJournal=Nákupy Journal
-InvoiceRef=Faktúra čj.
 CodeNotDef=Nie je definované
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Termín vyplatenia dátum nemôže byť nižšia ako objektu dáta.
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 4aa12b5aad3..6c0c9221b52 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/sk_SK/holiday.lang b/htdocs/langs/sk_SK/holiday.lang
index 50fbcef66eb..2fc15b1ac3e 100644
--- a/htdocs/langs/sk_SK/holiday.lang
+++ b/htdocs/langs/sk_SK/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index cc9951cf4fc..52f6af95054 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -371,6 +371,7 @@ Percentage=Percento
 Total=Celkový
 SubTotal=Medzisúčet
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Celkom (s DPH)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Odoslať e-mail
 Email=E-mail
 NoEMail=Žiadny e-mail
-Email=E-mail
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=Žiadny mobil
@@ -671,7 +671,6 @@ Method=Metóda
 Receive=Prijať
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Súčasná hodnota
 PartialWoman=Čiastočný
 TotalWoman=Celkový
 NeverReceived=Nikdy nedostal
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Klasifikovať účtované
 ClassifyUnbilled=Classify unbilled
 Progress=Pokrok
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Možnosti exportu
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Zmiešaný
 Calendar=Kalendár
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiškálny rok
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index a9f0a1ae348..b99cf3c9482 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -6,7 +6,7 @@ Member=Člen
 Members=Členovia
 ShowMember=Zobraziť členskú kartu
 UserNotLinkedToMember=Používateľ nie je spojená s členom
-ThirdpartyNotLinkedToMember=Tretích strán nie sú spojené člena
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Členovia Vstupenky
 FundationMembers=Členmi Nadácia
 ListOfValidatedPublicMembers=Zoznam potvrdených verejné členmi
@@ -67,11 +67,11 @@ Subscriptions=Predplatné
 SubscriptionLate=Neskoro
 SubscriptionNotReceived=Vstupné nikdy nedostal
 ListOfSubscriptions=Zoznam predplatné
-SendCardByMail=Poslať kartu e-mailom
+SendCardByMail=Send card by email
 AddMember=Vytvoriť používateľa
 NoTypeDefinedGoToSetup=Žiadny člen definované typy. Choď na menu &quot;Členovia typy&quot;
 NewMemberType=Nový člen typu
-WelcomeEMail=Vitajte e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Predplatné vyžadovalo
 DeleteType=Odstrániť
 VoteAllowed=Hlasovať povolená
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd súboru
 ValidateMember=Overenie člena
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=Nasledujúce odkazy sú otvorené stránky nie sú chránené žiadnym povolením Dolibarr. Oni nie sú formátované stránky, ak ako v príklade ukázať, ako do zoznamu členov databázu.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Verejný zoznam členov
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Obsah vašej členskú kartu
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Predmet e-mailu dostal v prípade auto-nápis host
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail prijatý v prípade auto-nápis host
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Odosielateľa pre automatické e-maily
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Formát etikety stránku
 DescADHERENT_ETIQUETTE_TEXT=Text tlačený na listoch členských adrese
 DescADHERENT_CARD_TYPE=Formát strany karty
@@ -156,8 +156,8 @@ DocForAllMembersCards=Vytvoriť vizitky pre všetkých členov
 DocForOneMemberCards=Vytvoriť vizitky pre konkrétny člena
 DocForLabels=Vytvoriť adresy listy
 SubscriptionPayment=Odberatelská platba
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Členovia Štatistiky podľa krajiny
 MembersStatisticsByState=Členovia štatistika štát / provincia
 MembersStatisticsByTown=Členovia štatistika podľa mesta
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Tento pohľad zobrazuje štatistiky používateľov podľa krajiny
 MembersByRegion=Tento pohľad zobrazuje štatistiky používateľov podľa regiónu
 VATToUseForSubscriptions=Sadzba DPH sa má použiť pre predplatné
-NoVatOnSubscription=Nie TVA za upísané vlastné imanie
-MEMBER_PAYONLINE_SENDEMAIL=Email pre upozornenia ked Dolibarr zaznamená potvrdenie overenej platby pre odber. ( pr. paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt použitý pre riadok predplatného vo faktúre %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/sk_SK/modulebuilder.lang b/htdocs/langs/sk_SK/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/sk_SK/modulebuilder.lang
+++ b/htdocs/langs/sk_SK/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/sk_SK/paybox.lang b/htdocs/langs/sk_SK/paybox.lang
index 2326c18a84c..efe44d9eb3b 100644
--- a/htdocs/langs/sk_SK/paybox.lang
+++ b/htdocs/langs/sk_SK/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Ak chcete dokončiť
 YourEMail=E-mail obdržať potvrdenie platby
 Creditor=Veriteľ
 PaymentCode=Platobné kód
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Do platbu
 YouWillBeRedirectedOnPayBox=Budete presmerovaný na zabezpečené stránky Paybox vstupné vás informácie o kreditnej karte
 Continue=Ďalšie
 ToOfferALinkForOnlinePayment=URL pre %s platby
-ToOfferALinkForOnlinePaymentOnOrder=URL ponúknuť %s on-line platobný užívateľské rozhranie pre objednávky zákazníka
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL ponúknuť %s on-line platobný užívateľské rozhranie pre zákazníka faktúry
 ToOfferALinkForOnlinePaymentOnContractLine=URL ponúknuť %s on-line platobný užívateľské rozhranie pre zmluvy linky
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL ponúknuť %s on-line platobný užívateľské rozhranie pre voľný čiastku
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL ponúknuť %s on-line platobný užívateľské rozhranie pre členské predplatné
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Môžete tiež pridať parameter URL <b>&amp; tag = <i>hodnota</i></b> na niektorú z týchto URL (nutné iba pre voľný platby) pridať vlastný komentár platobnej tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Táto stránka potvrdzuje, že platba bola zaznamenaná. Ďakujem.
@@ -33,7 +33,8 @@ VendorName=Názov dodávateľa
 CSSUrlForPaymentForm=CSS štýlov url platobného formulára
 NewPayboxPaymentReceived=Nový Paybox prijatej platby
 NewPayboxPaymentFailed=Nový Paybox platba snažil sa ale prepadal
-PAYBOX_PAYONLINE_SENDEMAIL=E-mail upozorniť po platbe (úspech alebo zlyhanie)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Hodnota pre PBX SITE
 PAYBOX_PBX_RANG=Hodnota pre PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Hodnota pre PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/sk_SK/paypal.lang b/htdocs/langs/sk_SK/paypal.lang
index d46c1b7a783..6d477fd363c 100644
--- a/htdocs/langs/sk_SK/paypal.lang
+++ b/htdocs/langs/sk_SK/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal modul nastavenia
-PaypalDesc=Tento modul ponúkajú stránky, ktoré umožnia platby na <a href="http://www.paypal.com" target="_blank">PayPal</a> zákazníkov. Toho možno využiť pre voľný platbu alebo platbu na určitý objekt Dolibarr (faktúry, objednávky, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Platby pomocou PayPal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Režim test / pieskovisko
 PAYPAL_API_USER=API užívateľské meno
 PAYPAL_API_PASSWORD=API heslo
 PAYPAL_API_SIGNATURE=API podpis
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Ponuka platba &quot;integrálne&quot; (Credit card + Paypal) alebo &quot;Paypal&quot; iba
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integrálne
 PaypalModeOnlyPaypal=PayPal iba
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=To je id transakcie: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Pridať URL Paypal platby pri odoslaní dokumentu e-mailom
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=E-mail upozorniť po platbe (úspech alebo nie)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index 98084bd1033..bf1688aca37 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -260,7 +260,7 @@ AddVariable=Pridať premennú
 AddUpdater=Pridať aktualizátor
 GlobalVariables=Globálna premenná
 VariableToUpdate=Premenná pre úpravu
-GlobalVariableUpdaters=Upravovač globálnej premennej
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index cd003f1f4c6..353ae6a2ef0 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Čas strávený
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Čas strávený
-RefTask=Ref úloha
-LabelTask=Label úloha
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Užívateľ
 TaskTimeNote=Poznámka
diff --git a/htdocs/langs/sk_SK/stripe.lang b/htdocs/langs/sk_SK/stripe.lang
index a4618f5156a..db2a3b0a561 100644
--- a/htdocs/langs/sk_SK/stripe.lang
+++ b/htdocs/langs/sk_SK/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Nasledovné adresy URL sú k dispozícii ponúknuť stránky na zákazníka, aby platbu na Dolibarr objektov
 PaymentForm=Platba formulár
-WelcomeOnPaymentPage=Vítame Vás na našej on-line platobné služby
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Táto obrazovka vám umožní vykonať on-line platbu %s.
 ThisIsInformationOnPayment=Sú to informácie o platbe robiť
 ToComplete=Ak chcete dokončiť
 YourEMail=E-mail obdržať potvrdenie platby
-STRIPE_PAYONLINE_SENDEMAIL=E-mail upozorniť po platbe (úspech alebo nie)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Veriteľ
 PaymentCode=Platobné kód
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Ďalšie
 ToOfferALinkForOnlinePayment=URL pre %s platby
-ToOfferALinkForOnlinePaymentOnOrder=URL ponúknuť %s on-line platobný užívateľské rozhranie pre objednávky zákazníka
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL ponúknuť %s on-line platobný užívateľské rozhranie pre zákazníka faktúry
 ToOfferALinkForOnlinePaymentOnContractLine=URL ponúknuť %s on-line platobný užívateľské rozhranie pre zmluvy linky
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL ponúknuť %s on-line platobný užívateľské rozhranie pre voľný čiastku
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL ponúknuť %s on-line platobný užívateľské rozhranie pre členské predplatné
 YouCanAddTagOnUrl=Môžete tiež pridať parameter URL <b>&amp; tag = <i>hodnota</i></b> na niektorú z týchto URL (nutné iba pre voľný platby) pridať vlastný komentár platobnej tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=Táto stránka potvrdzuje, že platba bola zaznamenaná. Ďakujem.
-YourPaymentHasNotBeenRecorded=Vaša platba nebola zaznamenaná a transakcia bola zrušená. Ďakujem.
 AccountParameter=Parametre účtu
 UsageParameter=Používanie parametrov
 InformationToFindParameters=Pomôžte nájsť %s informácie o účte
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index 8284190fa2a..453b2664395 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 6d090702a77..919b362b2b9 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Račun Label
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Revija
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index a7357f1d694..e3269c848b7 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Če je partnerjev zelo veliko (> 100 000), lahko
 UseSearchToSelectContactTooltip=Če je partnerjev zelo veliko (> 100 000), lahko hitrost povišate z nastavitvijo konstante SOCIETE_DONOTSEARCH_ANYWHERE na 1 v Nastavitve->Ostale nastavitve. Iskanje bo s tem omejeno na začetek niza.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Število znakov za sproženje iskanja: %s ViewFullDateActions=Prikaži celotne datume aktivnosti na tretjem listu
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Ni na voljo, če je Ajax onemogočen
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript onemogočen
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Vrata
 VirtualServerName=Ime virtualnega strežnika
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Iskalnik
 Server=Strežnik
 Database=Baza podatkov
 DatabaseServer=Strežnik za bazo podatkov
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Sistemske informacije so raznovrstne tehnične informacije, ki so
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=Za aktivacijo modula, pojdite na področje nastavitev (Domov->Nastavitve->Moduli).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Modul za številčenje računov in dobropisov
 BillsPDFModules=Modeli obrazcev računov
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Dobropis
-CreditNotes=Dobropisi
 ForceInvoiceDate=Vsili datum računa kot datum potrditve
 SuggestedPaymentModesIfNotDefinedInInvoice=Privzet predlagan način plačila na računu, če ni definiran drugačen način
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang
index b7910104914..47b3f374ff0 100644
--- a/htdocs/langs/sl_SI/agenda.lang
+++ b/htdocs/langs/sl_SI/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Dogodki, za katere bo Dolibarr avtomatsko kreiral aktivnost v urni
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Pogodba %s potrjena
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Ponudba %s podpisana
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index 6dca963b12f..3ed626d71d1 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banka
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Ime banke
 FinancialAccount=Račun
 BankAccount=Bančni račun
 BankAccounts=Bančni računi
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Prikaži račun
 AccountRef=Referenca finančnega računa
 AccountLabel=Naziv finančnega računa
@@ -30,7 +30,7 @@ AllTime=Od začetka
 Reconciliation=Usklajevanje
 RIB=Transakcijski račun
 IBAN=IBAN številka
-BIC=BIC/SWIFT številka
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Izpisek
 AccountStatements=Izpiski računa
 LastAccountStatements=Zadnji izpiski računa
 IOMonthlyReporting=Mesečno poročilo
-BankAccountDomiciliation=Naslov računa
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Država računa
 BankAccountOwner=Ime lastnika računa
 BankAccountOwnerAddress=Naslov lastnika računa
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Kreiranje računa
 NewBankAccount=Nov konto
 NewFinancialAccount=Nov finančni račun
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Plačilo kupca
-SupplierInvoicePayment=Plačilo dobavitelju
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Plačilo naročnine
 WithdrawalPayment=Nakazano plačilo
 SocialContributionPayment=Plačilo socialnega/fiskalnega davka
 BankTransfer=Bančni transfer
 BankTransfers=Bančni transferji
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od
 TransferTo=Na
 TransferFromToDone=Zabeležen je bil transfer od <b>%s</b> na <b>%s</b> v znesku <b>%s</b> %s.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Nazaj na račun
 ShowAllAccounts=Prikaži vse račune
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Izberi bančni izpisek, povezan s posredovanjem. Uporabi numerično vrednost, ki se lahko sortira: YYYYMM ali YYYYMMDD
 EventualyAddCategory=Eventuelno določi kategorijo, v katero se razvrsti zapis
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Vrnjen ček in ponovno odprti računi
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 46199689050..f818dd4b127 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Vrnjeno plačilo
 DeletePayment=Brisanje plačila
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Prejeta plačila
 ReceivedCustomersPayments=Prejeta plačila od kupcev
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Znesek plačila
-ValidatePayment=Potrdi plačilo
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/sl_SI/cashdesk.lang b/htdocs/langs/sl_SI/cashdesk.lang
index 1343d1aca17..d3f5c731ac5 100644
--- a/htdocs/langs/sl_SI/cashdesk.lang
+++ b/htdocs/langs/sl_SI/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Zgodovina
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index d9dac559b2b..aadfe3b9ee4 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Novo plačilo
-Payments=Plačila
 PaymentCustomerInvoice=Plačilo računa kupca
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Plačilo socialnega/fiskalnega davka
@@ -205,7 +204,6 @@ SellsJournal=Poročilo o prodaji
 PurchasesJournal=Poročilo o nabavi
 DescSellsJournal=Poročilo o prodaji
 DescPurchasesJournal=Poročilo o nabavi
-InvoiceRef=Referenca računa
 CodeNotDef=Ni definirano
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Datum plačila ne more biti nižji od datuma storitve.
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 7c3a1a37779..bfaf9c8505a 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/sl_SI/holiday.lang b/htdocs/langs/sl_SI/holiday.lang
index e5a183da459..b4ee1633d07 100644
--- a/htdocs/langs/sl_SI/holiday.lang
+++ b/htdocs/langs/sl_SI/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Potrjeni zahtevki za dopust
 HolidaysValidatedBody=Vaš zahtevek za dopust od %s do %s je bil potrjen.
 HolidaysRefused=Zahtevek je bil zavrnjen
-HolidaysRefusedBody=Vaš zahtevek za dopust od %s do %s je bil zavrnjen zaradi naslednjih razlogov :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Preklican zahtevek za dopust
 HolidaysCanceledBody=Vaš zahtevek za dopust od %s do %s je bil preklican.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 866c7cd22c4..efbfbfef0dc 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -371,6 +371,7 @@ Percentage=Procent
 Total=Skupaj
 SubTotal=Delna vsota
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Skupaj (z DDV)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Pošlji e-pošto
 Email=E-pošta
 NoEMail=Ni email-a
-Email=E-pošta
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=Ni mobilnega telefona
@@ -671,7 +671,6 @@ Method=Metoda
 Receive=Prejeto
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Trenutna vrednost
 PartialWoman=Delni
 TotalWoman=Skupna
 NeverReceived=Nikoli prejeto
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Klasificiraj kot fakturirano
 ClassifyUnbilled=Classify unbilled
 Progress=Napredek
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Administracija
 View=View
@@ -842,6 +842,11 @@ Exports=Izvoz
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Izvozne opcije
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Razno
 Calendar=Koledar
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiskalno leto
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index 56fe27bf110..077f7849c3e 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -6,7 +6,7 @@ Member=Član
 Members=Člani
 ShowMember=Prikaži člansko kartico
 UserNotLinkedToMember=Uporabnik ni povezan s članstvom
-ThirdpartyNotLinkedToMember=Partner ni povezan s članom
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Članske vstopnice
 FundationMembers=Člani fundacije
 ListOfValidatedPublicMembers=Seznam potrjenih javnih članov
@@ -67,11 +67,11 @@ Subscriptions=Vpisi
 SubscriptionLate=Zamujen
 SubscriptionNotReceived=Članarina nikoli prejeta
 ListOfSubscriptions=Spisek članarin
-SendCardByMail=Pošlji kartico
+SendCardByMail=Send card by email
 AddMember=Ustvari člana
 NoTypeDefinedGoToSetup=Tipi članov niso določeni. Pojdite v Nastavitve – ipi članov
 NewMemberType=Nov tip člana
-WelcomeEMail=e-pošta za dobrodošlico
+WelcomeEMail=Welcome email
 SubscriptionRequired=Zahtevana včlanitev
 DeleteType=Izbriši
 VoteAllowed=Dovoljeno glasovanje
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=Datoteka htpasswd
 ValidateMember=Potrdi člana
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=Naslednje povezave so odprte strani, ki niso zaščitene z Dolibarr dovoljenji. Strani niso formatirane, ponujajo le primer prikaza seznama članske baze podatkov.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Javni seznam članov
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Vsebina vaše članske kartice
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Zadeva v e-pošti, ki je prejeta ob avtomatskem vpisu gosta
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-pošta, ki je prejeta ob avtomatskem vpisu gosta
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Pošiljateljev E-Mail za avtomatsko pošto
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format nalepk
 DescADHERENT_ETIQUETTE_TEXT=Tekst na evidenčnem listu člana
 DescADHERENT_CARD_TYPE=Format kartic
@@ -156,8 +156,8 @@ DocForAllMembersCards=Ustvari vizitke za vse člane (Format za izhod dejanske na
 DocForOneMemberCards=Ustvari vizitke za določenega člana (Format za izhod dejanske nastavitve: <b>%s)</b>
 DocForLabels=Ustvari seznam naslovov (Format za izhod dejanske nastavitve: <b>%s)</b>
 SubscriptionPayment=Plačilo naročnine
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Statistika članov po državah
 MembersStatisticsByState=Statistika članov po deželah
 MembersStatisticsByTown=Statistika članov po mestih
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Na tem zaslonu je prikazana statistika članov po lastnostih.
 MembersByRegion=Na tem zaslonu je prikazana statistika članov po regijah.
 VATToUseForSubscriptions=Stopnja DDV za naročnine
-NoVatOnSubscription=Ni davka za naročnine
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod uporabljen za naročniško vrstico v računu: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/sl_SI/modulebuilder.lang b/htdocs/langs/sl_SI/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/sl_SI/modulebuilder.lang
+++ b/htdocs/langs/sl_SI/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/sl_SI/paybox.lang b/htdocs/langs/sl_SI/paybox.lang
index 01584d70a69..1d27077d9a1 100644
--- a/htdocs/langs/sl_SI/paybox.lang
+++ b/htdocs/langs/sl_SI/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Za dokončanje
 YourEMail=E-pošta za potrditev plačila
 Creditor=Upnik
 PaymentCode=Koda plačila
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Izvrši plačilo
 YouWillBeRedirectedOnPayBox=Preusmerjeni boste na varno Paybox stran za vnos podatkov o vaši kreditni kartici
 Continue=Naslednji
 ToOfferALinkForOnlinePayment=URL za %s plačila
-ToOfferALinkForOnlinePaymentOnOrder=URL naslov s ponudbo %s vmesnika za online plačila naročil
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL naslov s ponudbo %s vmesnika za online plačila računov
 ToOfferALinkForOnlinePaymentOnContractLine=URL naslov s ponudbo %s vmesnika za online plačila po pogodbi
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL naslov s ponudbo %s vmesnika za online plačila poljubnih zneskov
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL naslov s ponudbo %s vmesnika za online plačila članarin
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Vsakemu od teh URL naslovov lahko tudi dodate url parameter <b>&tag=<i>vrednost</i></b> (zahtevano samo pri poljubnih plačilih) s komentarjem vašega plačila.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Ta stran potrjuje, da je bilo vaše plačilo sprejeto. Hvala.
@@ -33,7 +33,8 @@ VendorName=Ime prodajalca
 CSSUrlForPaymentForm=url CSS vzorca obrazca plačila
 NewPayboxPaymentReceived=Novo Paybox plačilo prejeto
 NewPayboxPaymentFailed=Zavrnjen poskus novega Paybox plačila
-PAYBOX_PAYONLINE_SENDEMAIL=E-poštno opozorilo po plačilu (uspešno ali zavrnjeno)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Vrednost za PBX SITE
 PAYBOX_PBX_RANG=Vrednost za PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Vrednost za PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/sl_SI/paypal.lang b/htdocs/langs/sl_SI/paypal.lang
index 12f98ad9728..e3e7642eddd 100644
--- a/htdocs/langs/sl_SI/paypal.lang
+++ b/htdocs/langs/sl_SI/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Nastavitev modula PayPal
-PaypalDesc=Ta modul ponuja stran, ki kupcem omogoča plačila na <a href="http://www.paypal.com" target="_blank">PayPal</a>. Lahko se uporablja za prosta plačila ali za plačila določenih Dolibarr objektov (računi, naročila, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Plačilo z Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Način test/sandbox
 PAYPAL_API_USER=API ime uporabnika
 PAYPAL_API_PASSWORD=API geslo
 PAYPAL_API_SIGNATURE=API podpis
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Ponujeno plačilo "integral" (kreditna kartica+Paypal) ali samo "Paypal"
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Celovito
 PaypalModeOnlyPaypal=Samo PayPal
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=To je ID transakcije: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Pri pošiljanju dokumenta po pošti dodaj url Paypal plačila
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=E-poštno opozorilo po plačilu (uspešno ali ne)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=URL za vrnitev po izvedenem plačilu
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 0688e0b1748..c86769e3db1 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Globalne spremenljivke
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Posodobitve globalnih spremenljivk
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON podatki
 GlobalVariableUpdaterHelp0=Razčleni JSON podatke iz specifičnega URL, VALUE določa lokacijo ustrezne vrednosti,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 62b197fd8ef..93ca5bc454a 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Porabljen čas
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Porabljen čas
-RefTask=Referenčna naloga
-LabelTask=Naziv naloge
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Uporabnik
 TaskTimeNote=Beležka
diff --git a/htdocs/langs/sl_SI/stripe.lang b/htdocs/langs/sl_SI/stripe.lang
index c0ee4a81af8..53ce253eb09 100644
--- a/htdocs/langs/sl_SI/stripe.lang
+++ b/htdocs/langs/sl_SI/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Naslednji URL naslovi so na voljo kupcem za izvedbo plačil Dolibarr postavk
 PaymentForm=Obrazec za plačilo
-WelcomeOnPaymentPage=Dobrodošli v naši storitvi online plačil
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Ta zaslon omogoča online plačilo za %s.
 ThisIsInformationOnPayment=To je informacija o potrebnem plačilu
 ToComplete=Za dokončanje
 YourEMail=E-pošta za potrditev plačila
-STRIPE_PAYONLINE_SENDEMAIL=E-poštno opozorilo po plačilu (uspešno ali ne)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Upnik
 PaymentCode=Koda plačila
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Naslednji
 ToOfferALinkForOnlinePayment=URL za %s plačila
-ToOfferALinkForOnlinePaymentOnOrder=URL naslov s ponudbo %s vmesnika za online plačila naročil
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL naslov s ponudbo %s vmesnika za online plačila računov
 ToOfferALinkForOnlinePaymentOnContractLine=URL naslov s ponudbo %s vmesnika za online plačila po pogodbi
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL naslov s ponudbo %s vmesnika za online plačila poljubnih zneskov
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL naslov s ponudbo %s vmesnika za online plačila članarin
 YouCanAddTagOnUrl=Vsakemu od teh URL naslovov lahko tudi dodate url parameter <b>&tag=<i>vrednost</i></b> (zahtevano samo pri poljubnih plačilih) s komentarjem vašega plačila.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=Ta stran potrjuje, da je bilo vaše plačilo sprejeto. Hvala.
-YourPaymentHasNotBeenRecorded=Vaše plačilo ni bilo sprejeto in prenos je bil preklican. Hvala.
 AccountParameter=Parametri računa
 UsageParameter=Parametri uporabe
 InformationToFindParameters=Pomoč pri iskanju informacij računa %s
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index c608f9330e7..bca375e3470 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 83966174d90..882311e759f 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Balanca e llogarisё
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=Mundësi
 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
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 1133be3ff08..48c1c425808 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=E padisponueshme ku Ajax është i çaktivizuar
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScrip i caktivizuar
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Serveri
 Database=Database
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang
index e954be676d7..ba2c787dd1a 100644
--- a/htdocs/langs/sq_AL/agenda.lang
+++ b/htdocs/langs/sq_AL/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index e5729066e4d..6acce654593 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Emri i Bankës
 FinancialAccount=Llogari
 BankAccount=Llogari bankare
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-BIC=BIC/SWIFT number
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Statement
 AccountStatements=Account statements
 LastAccountStatements=Last account statements
 IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Supplier payment
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index a8594c8ece6..3000a7ae4c6 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Payment amount
-ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
index c700a664b11..8fa37bcd430 100644
--- a/htdocs/langs/sq_AL/cashdesk.lang
+++ b/htdocs/langs/sq_AL/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index e274f65e0ef..7f53aa7d165 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=New payment
-Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 68db165215d..b5a9d70cb70 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/sq_AL/holiday.lang b/htdocs/langs/sq_AL/holiday.lang
index 11916fff46f..2d73625d611 100644
--- a/htdocs/langs/sq_AL/holiday.lang
+++ b/htdocs/langs/sq_AL/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index d54adca438d..4164fdb1e11 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
 Email=Email
 NoEMail=No email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Metoda
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index f15d085c5d1..08ae75a6abc 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=Members
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=Late
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Fshi
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/sq_AL/modulebuilder.lang b/htdocs/langs/sq_AL/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/sq_AL/modulebuilder.lang
+++ b/htdocs/langs/sq_AL/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/sq_AL/paybox.lang b/htdocs/langs/sq_AL/paybox.lang
index 44aa1c17238..dd5ffe0c6c4 100644
--- a/htdocs/langs/sq_AL/paybox.lang
+++ b/htdocs/langs/sq_AL/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Pёr tu plotёsuar
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Do payment
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Tjetri
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/sq_AL/paypal.lang b/htdocs/langs/sq_AL/paypal.lang
index 2ef2abb4029..1549c16d01d 100644
--- a/htdocs/langs/sq_AL/paypal.lang
+++ b/htdocs/langs/sq_AL/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Versioni Curl SSL
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 5bdeecc8e39..45afef4e9dc 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index fd04028c8bc..b064f742e9a 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
diff --git a/htdocs/langs/sq_AL/stripe.lang b/htdocs/langs/sq_AL/stripe.lang
index c2969b25a3a..3db7c0cf2ee 100644
--- a/htdocs/langs/sq_AL/stripe.lang
+++ b/htdocs/langs/sq_AL/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Mёnyra e pagesёs
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=Pёr tu plotёsuar
 YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditor
 PaymentCode=Payment code
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Tjetri
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
 AccountParameter=Parametrat e llogarisё
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index f416ebbc84a..b4d894f55d7 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index cb5908b8a7f..1adf3631eed 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Stanje računa
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Oznaka računa
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Izveštaj
 JournalLabel=Journal label
 NumPiece=Deo broj
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=Opcije
 OptionModeProductSell=Vrsta prodaje
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Vrsta kupovine
 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
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 7d6ccb634c4..cf4b00b3c02 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/sr_RS/agenda.lang b/htdocs/langs/sr_RS/agenda.lang
index aa7a86f302e..7f13c6e6381 100644
--- a/htdocs/langs/sr_RS/agenda.lang
+++ b/htdocs/langs/sr_RS/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Događaji za koje će Dolibarr da kreira akciju u agendi automatsk
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Ugovor %s je potvrđen
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Ponuda %s je potpisana
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index b5815363cb5..1fa32958ac5 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banka
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Ime banke
 FinancialAccount=Račun
 BankAccount=Račun u banci
 BankAccounts=Računi u banci
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Prikaži račun
 AccountRef=Finansijski račun referenca
 AccountLabel=Oznaka finansijskog računa
@@ -30,7 +30,7 @@ AllTime=Od početka
 Reconciliation=Poravnanje
 RIB=Broj bankovnog računa
 IBAN=IBAN broj
-BIC=BIC/SWIFT broj
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Izvod
 AccountStatements=Izvodi
 LastAccountStatements=Poslednji izvod
 IOMonthlyReporting=Mesečno izveštavanje
-BankAccountDomiciliation=Adresa računa
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Država računa
 BankAccountOwner=Ime vlasnika računa
 BankAccountOwnerAddress=Adresa vlasnika računa
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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
 NewBankAccount=Novi račun
 NewFinancialAccount=Nov finansijski račun
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Uplata kupca
-SupplierInvoicePayment=Refundiranje dobavaljaču
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Uplata pretplate
 WithdrawalPayment=Povraćaj uplate
 SocialContributionPayment=Uplate poreza/doprinosa
 BankTransfer=Bankovni prenos
 BankTransfers=Bankovni prenosi
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od
 TransferTo=Za
 TransferFromToDone=Prenos od  <b>%s</b> to <b>%s</b> of <b>%s</b> %s je zabeležen.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Nazad na račun
 ShowAllAccounts=Prikaži za sve račune
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Odaberi izvod iz banke povezan sa poravnanjem. Upotrebi sledeću numeričku vrednost: YYYYMM or YYYYMMDD
 EventualyAddCategory=Na kraju, definišite kategoriju u koju želite da klasifikujete izveštaje
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Ček vraćen i faktura ponovo otvorena
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index 781c5442ac4..14b1c76b888 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Refundirano
 DeletePayment=Obriši plaćanje
 ConfirmDeletePayment=Da li ste sigurni da želite da obrišete ovu uplatu?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Uplate primljene od kupaca
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Iznos za plaćanje
-ValidatePayment=Potvrdi plaćanje
 PaymentHigherThanReminderToPay=Iznos koji želite da platiteje viši od iznosa za 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Potvrdi račune automatski
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Datum još nije dospeo
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/sr_RS/cashdesk.lang b/htdocs/langs/sr_RS/cashdesk.lang
index c94df3a6747..0835c306481 100644
--- a/htdocs/langs/sr_RS/cashdesk.lang
+++ b/htdocs/langs/sr_RS/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Istorija
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index 56434ae2efb..61a8a412c17 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Porezi/doprinosi za uplatu
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Nova uplata
-Payments=Uplate
 PaymentCustomerInvoice=Uplata po računu klijenta
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Uplata poreza/doprinosa
@@ -205,7 +204,6 @@ SellsJournal=Dnevnik prodaje
 PurchasesJournal=Dnevnik nabavke
 DescSellsJournal=Dnevnik prodaje
 DescPurchasesJournal=Dnevnik nabavke
-InvoiceRef=Ref. Računa
 CodeNotDef=Nije definisano
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Rok isplate ne može biti pre datuma objekta.
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index d966404b073..528823ad92e 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/sr_RS/holiday.lang b/htdocs/langs/sr_RS/holiday.lang
index 5fd903c0361..48c82dc3365 100644
--- a/htdocs/langs/sr_RS/holiday.lang
+++ b/htdocs/langs/sr_RS/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Odobreni zahtevi za odsustva
 HolidaysValidatedBody=Vaš zahtev za odsustvo %s do %s je potvrđen.
 HolidaysRefused=Zahtev odbijen
-HolidaysRefusedBody=Vaš zahtev za odsustvo %s do %s je odbijen sa sledećim obrazloženjem :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Otkazan zahtev za odsustvo
 HolidaysCanceledBody=Vaš zahtev za odsustvo %s do %s je otkazan.
 FollowedByACounter=1: Ovaj tip odsustva treba da se prati brojačem. Brojač se povećava ručno ili automatski i kada je odsustvo potvrđeno, brojač se smanjuje. <br> 0: Ne prati se brojačem.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index e3f074d8f9d..5ca0d505bd9 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -371,6 +371,7 @@ Percentage=Procenat
 Total=Total
 SubTotal=Zbir
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Ukupno (bruto)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Pošalji email
 Email=Email
 NoEMail=Nema maila
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=Nema mobilnog telefona
@@ -671,7 +671,6 @@ Method=Metoda
 Receive=Primi
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Trenutna vrednost
 PartialWoman=Delimično
 TotalWoman=Celo
 NeverReceived=Nije primljena
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Označi kao naplaćenu
 ClassifyUnbilled=Classify unbilled
 Progress=Napredovanje
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Finansijska služba
 View=View
@@ -842,6 +842,11 @@ Exports=Izvozi
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Ostalo
 Calendar=Kalendar
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/sr_RS/members.lang b/htdocs/langs/sr_RS/members.lang
index 653e83ffbe7..cc05a236ff0 100644
--- a/htdocs/langs/sr_RS/members.lang
+++ b/htdocs/langs/sr_RS/members.lang
@@ -6,7 +6,7 @@ Member=Član
 Members=Članovi
 ShowMember=Prikaži karticu člana
 UserNotLinkedToMember=Korisnik nije povezan sa članom
-ThirdpartyNotLinkedToMember=Subjekat nije povezan sa članom
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Karte članova
 FundationMembers=Članovi fondacije
 ListOfValidatedPublicMembers=Lista potvrđenih javnih članova
@@ -67,11 +67,11 @@ Subscriptions=Pretplate
 SubscriptionLate=Kasni
 SubscriptionNotReceived=Pretplata nije primljena
 ListOfSubscriptions=Lista pretplata
-SendCardByMail=Pošalji karticu mailom
+SendCardByMail=Send card by email
 AddMember=Kreiraj člana
 NoTypeDefinedGoToSetup=Nema definisanih tipova članova. Idite u meni "Tipovi članova"
 NewMemberType=Novi tip člana
-WelcomeEMail=Email dobrodošlice
+WelcomeEMail=Welcome email
 SubscriptionRequired=Potrebna pretplata
 DeleteType=Obriši
 VoteAllowed=Glasanje dozvoljeno
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Potvrdi člana
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=Sledeći linkovi vode ka javnim stranama koje nisu zaštićene Dolibarr pravima. Strane nisu formatirane, one su samo primer koji pokazuje kako možete izlistati bazu članova.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Javna lista članova
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Sadržaj Vaše kartice člana
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Naslov maila poslatog u okviru auto-registracije korisnika
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Mail poslat u slučaju auto-registracije gosta
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Pošiljalac automatskih mailova
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format strane naziva
 DescADHERENT_ETIQUETTE_TEXT=Tekst odštampan na karticama adresa članova
 DescADHERENT_CARD_TYPE=Format strane sa karticama
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generiši vizit karte za sve članove
 DocForOneMemberCards=Generiši vizit kartu za određenog člana
 DocForLabels=Generiši karticu adrese
 SubscriptionPayment=Uplata pretplate
-LastSubscriptionDate=Datum najnovije pretplate
-LastSubscriptionAmount=Iznos najnovije pretplate
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Statistike članova po zemlji
 MembersStatisticsByState=Statistike članova po regionu
 MembersStatisticsByTown=Statistike članova po gradu
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Ovaj ekran prikazuje statistike članova po prirodi.
 MembersByRegion=Ovaj ekran prikazuje statistike članova po regionu.
 VATToUseForSubscriptions=PDV stopa za pretplate
-NoVatOnSubscription=Pretplate bez PDV-a
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod korišćen za liniju pretplate u fakturi: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/sr_RS/paybox.lang b/htdocs/langs/sr_RS/paybox.lang
index f4962ccc049..96a40c17778 100644
--- a/htdocs/langs/sr_RS/paybox.lang
+++ b/htdocs/langs/sr_RS/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Popuniti
 YourEMail=Email za potvrdu uplate
 Creditor=Kreditor
 PaymentCode=Kod uplate
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Izvrši plaćanje
 YouWillBeRedirectedOnPayBox=Bićete redrektovani na sigurnu Paybox stranu kako biste uneli informacije Vaše kreditne kartice
 Continue=Dalje
 ToOfferALinkForOnlinePayment=URL za %s uplatu
-ToOfferALinkForOnlinePaymentOnOrder=URL za korisnički interfejs %s online uplate za narudžbinu klijenta
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL za korisnički interfejs %s online uplate za račun klijenta
 ToOfferALinkForOnlinePaymentOnContractLine=URL za korisnički interfejs %s online uplate za liniju ugovora
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL za korisnički interfejs %s online uplate za slobodan iznos
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL za korisnički interfejs %s online uplate za korisničku pretplatu
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Takođe možete dodati url parametar <b>&tag=<i>value</i></b> na bilo koji od ovih URL-ova (samo za slobodne uplate) kako biste uneli svoj sopstveni komentar za uplatu.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Ova strana potvrđuje da je Vaša uplata registrovana. Hvala.
@@ -33,7 +33,8 @@ VendorName=Ime prodavca
 CSSUrlForPaymentForm=CSS url za formu za plaćanje
 NewPayboxPaymentReceived=Nova Paybox uplata je primljena
 NewPayboxPaymentFailed=Pokušak nove Paybox uplate nije uspeo
-PAYBOX_PAYONLINE_SENDEMAIL=EMail obaveštenja nakon uplate (uspele ili neuspele)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Vrednost PBX SITE
 PAYBOX_PBX_RANG=Vrednost PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Vrednost PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/sr_RS/paypal.lang b/htdocs/langs/sr_RS/paypal.lang
index 31aeb6a6858..e80e5e1aec7 100644
--- a/htdocs/langs/sr_RS/paypal.lang
+++ b/htdocs/langs/sr_RS/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Podešavanja modula PayPal
-PaypalDesc=Ovaj modul omogućava uplatu preko <a href="http://www.paypal.com" target="_blank">PayPal</a>-a od strane klijenata. Može biti korisna za besplatne uplate ili za uplate vezane za određene Dolibarr objekte (račun, narudžbina, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Uplati putem PayPal-a
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Test/sandbox mod
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL verzija
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Ponudi "integralno" plaćanje (kreditna kartca + PayPal) ili samo "PayPal"
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integralno
 PaypalModeOnlyPaypal=Samo PayPal
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=Ovo je ID transakcije: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Ubaci URL PayPal uplate prilikom slanja dokumenta putem mail-a
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Email obaveštenja nakon uplate (uspešne ili ne)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Povratni URL posle plaćanja
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Kratka poruka greške
 ErrorCode=Kod greške
 ErrorSeverityCode=Kod ozbiljnosti greške
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 98b1cac8e79..6cadd6b3787 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -260,7 +260,7 @@ AddVariable=Dodaj promenljivu
 AddUpdater=Dodaj ažuriranje
 GlobalVariables=Globalne promenljive
 VariableToUpdate=Promenljiva za ažuriranje
-GlobalVariableUpdaters=Ažuriranje globalnih promenljivih
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Čita JSON podatke sa naznačenog URL-a, VALUE označava lokaciju vrednosti,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index 68baf4a64e0..b5cef16aac1 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Provedeno vreme
 TimeSpentByYou=Vreme koje ste Vi proveli
 TimeSpentByUser=Vreme koje je korisnik proveo
 TimesSpent=Provedeno vreme
-RefTask=Ref. zadataka
-LabelTask=Naziv zadatka
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Vreme provedeno na zadacima
 TaskTimeUser=Korisnik
 TaskTimeNote=Beleška
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 71ec16a45b2..cc4e983de30 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -18,9 +18,9 @@ DefaultForProduct=Standard för produkter
 CantSuggest=Kan inte föreslå
 AccountancySetupDoneFromAccountancyMenu=De flesta inställningarna för bokföringen görs från menyn %s
 ConfigAccountingExpert=Konfiguration av modulen redovisningsexpert
-Journalization=Journalisering
-Journaux=Journaler
-JournalFinancial=Finansiella journaler
+Journalization=Bokföring
+Journaux=Loggböcker
+JournalFinancial=Finansiella loggböcker
 BackToChartofaccounts=Avkastning kontoplan
 Chartofaccounts=Kontoplan
 CurrentDedicatedAccountingAccount=Nuvarande dedikerat konto
@@ -31,9 +31,9 @@ OverviewOfAmountOfLinesBound=Översikt över antalet linjer som redan är koppla
 OtherInfo=Övrig information
 DeleteCptCategory=Ta bort redovisningskontot från gruppen
 ConfirmDeleteCptCategory=Är du säker på att du vill ta bort det här kontot konto från kontokoncernen?
-JournalizationInLedgerStatus=Status för journalisering
-AlreadyInGeneralLedger=Redan journaliserad i ledgers
-NotYetInGeneralLedger=Ännu inte journaliserad i ledgers
+JournalizationInLedgerStatus=Status för bokföring
+AlreadyInGeneralLedger=Redan bokförd i huvudboken
+NotYetInGeneralLedger=Ännu inte infört i huvudboken
 GroupIsEmptyCheckSetup=Gruppen är tom, kontrollera inställningen av den personliga redovisningsgruppen
 DetailByAccount=Visa detaljer efter konto
 AccountWithNonZeroValues=Konton med icke-nollvärden
@@ -53,10 +53,10 @@ MainAccountForSubscriptionPaymentNotDefined=Huvudkonton för abonnemangsbetalnin
 AccountancyArea=Redovisningsområde
 AccountancyAreaDescIntro=Användningen av bokföringsmodulen görs i flera steg:
 AccountancyAreaDescActionOnce=Följande åtgärder utförs vanligtvis en gång bara, eller en gång per år ...
-AccountancyAreaDescActionOnceBis=Nästa steg bör göras för att spara dig tid i framtiden genom att föreslå dig rätt standardbokföringskonto när du gör journaliseringen (skrivning i journaler och huvudbok)
+AccountancyAreaDescActionOnceBis=Nästa steg bör göras för att spara dig tid i framtiden genom att föreslå dig rätt standardbokföringskonto när du gör bokföringen (skrivning i sloggboker och huvudbok)
 AccountancyAreaDescActionFreq=Följande åtgärder utförs vanligtvis varje månad, vecka eller dag för mycket stora företag ...
 
-AccountancyAreaDescJournalSetup=STEG %s: Skapa eller kolla innehållet i din journallista från menyn %s
+AccountancyAreaDescJournalSetup=STEG %s: Skapa eller kolla innehållet i din loggboklista från menyn %s
 AccountancyAreaDescChartModel=STEG %s: Skapa en modell av kontoöversikt från menyn %s
 AccountancyAreaDescChart=STEG %s: Skapa eller kolla innehållet i ditt kontokonto från menyn %s
 
@@ -69,31 +69,31 @@ AccountancyAreaDescDonation=STEG %s: Definiera standardbokföringskonto för don
 AccountancyAreaDescSubscription=STEG %s: Definiera standardbokföringskonto för medlemsabonnemang. För detta, använd menyinmatningen %s.
 AccountancyAreaDescMisc=STEG %s: Ange obligatoriskt standardkonto och standardbokföringskonto för diverse transaktioner. För detta, använd menyinmatningen %s.
 AccountancyAreaDescLoan=STEG %s: Definiera standardbokföringskonto för lån. För detta, använd menyinmatningen %s.
-AccountancyAreaDescBank=STEG %s: Definiera bokföringskonto och tidskodskod för varje bank- och finansräkning. För detta, använd menyinmatningen %s.
+AccountancyAreaDescBank=STEG %s: Definiera bokföringskonto och kontokod för varje bank- och bokföringskonto. För detta, använd menyinmatningen %s.
 AccountancyAreaDescProd=STEG %s: Definiera bokföringskonto på dina produkter / tjänster. För detta, använd menyinmatningen %s.
 
-AccountancyAreaDescBind=STEG %s: Kontrollera bindningen mellan befintliga %s linjer och bokföringskonto är klar så att applikationen kommer att kunna journalisera transaktioner i Ledger med ett klick. Fullständiga saknade bindningar. För detta, använd menyinmatningen %s.
-AccountancyAreaDescWriteRecords=STEG %s: Skriv transaktioner i Ledger. För detta, gå till menyn <strong> %s </strong>, och klicka på knappen <strong> %s </strong>.
+AccountancyAreaDescBind=STEG %s: Kontrollera bindningen mellan befintliga %s linjer och bokföringskonto är klar så att applikationen kommer att kunna bokföra transaktioner i huvudboken med ett klick. Korrigera saknade bindningar. För detta, använd menyinmatningen %s.
+AccountancyAreaDescWriteRecords=STEG %s: Skriv transaktioner i huvudboken. För detta, gå till menyn <strong> %s </strong>, och klicka på knappen <strong> %s </strong>.
 AccountancyAreaDescAnalyze=STEG %s: Lägg till eller redigera befintliga transaktioner och generera rapporter och export.
 
 AccountancyAreaDescClosePeriod=STEG %s: Stäng period så vi kan inte göra ändringar i framtiden.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Ett obligatoriskt steg i installationen var inte fullständigt (bokföringskodjournal inte definierad för alla bankkonton)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Ett obligatoriskt steg i installationen var inte fullständigt (bokföringskodsloggbok inte definierad för alla bankkonton)
 Selectchartofaccounts=Välj aktivt diagram över konton
 ChangeAndLoad=Ändra och ladda
 Addanaccount=Lägg till ett redovisningskonto
 AccountAccounting=Redovisningskonto
 AccountAccountingShort=Konto
-SubledgerAccount=Subledger konto
-SubledgerAccountLabel=Subledger konto etikett
+SubledgerAccount=Subledger account
+SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Visa bokföringskonto
-ShowAccountingJournal=Visa bokföringskalender
+ShowAccountingJournal=Visa loggböcker
 AccountAccountingSuggest=Redovisningskonto föreslås
 MenuDefaultAccounts=Standardkonton
 MenuBankAccounts=Bankkonton
 MenuVatAccounts=Vat konton
 MenuTaxAccounts=Skattekonton
-MenuExpenseReportAccounts=Expense rapport konton
+MenuExpenseReportAccounts=Utläggsrapport konton
 MenuLoanAccounts=Lån konton
 MenuProductsAccounts=Produktkonton
 MenuClosureAccounts=Avslutande konton
@@ -103,11 +103,11 @@ RegistrationInAccounting=Registrering i bokföring
 Binding=Förbindande till konton
 CustomersVentilation=Kundfaktura förbindande
 SuppliersVentilation=Leverantörsfaktura förbindande
-ExpenseReportsVentilation=Expense rapport förbindande
+ExpenseReportsVentilation=Utläggsrapport förbindande
 CreateMvts=Skapa ny transaktion
 UpdateMvts=Ändring av en transaktion
-ValidTransaction=Validera transaktionen
-WriteBookKeeping=Journalistera transaktioner i Ledger
+ValidTransaction=Bekräfta transaktionen
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Huvudbok
 AccountBalance=Kontobalans
 ObjectsRef=Källobjekt ref
@@ -143,19 +143,19 @@ ACCOUNTING_LENGTH_GACCOUNT=Längden på de allmänna bokföringskontona (Om du a
 ACCOUNTING_LENGTH_AACCOUNT=Längden på kontot för tredje partens konto (Om du anger värde till 6 här visas kontot "401" som "401000" på skärmen)
 ACCOUNTING_MANAGE_ZERO=Tillåt att hantera olika antal nollor i slutet av ett bokföringskonto. Behövs av vissa länder (som Schweiz). Om den är avstängd (standard) kan du ställa in följande två parametrar för att be programmet att lägga till virtuella nollor.
 BANK_DISABLE_DIRECT_INPUT=Inaktivera direktinspelning av transaktion i bankkonto
-ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktivera utkast till export på tidskrift
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktivera utkastexport på loggbok
 ACCOUNTANCY_COMBO_FOR_AUX=Aktivera kombinationslista för dotterkonto (kan vara långsamt om du har många tredje parter)
 
-ACCOUNTING_SELL_JOURNAL=Sell ​​tidskrift
-ACCOUNTING_PURCHASE_JOURNAL=Bara tidskrift
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Diverse tidskrift
-ACCOUNTING_EXPENSEREPORT_JOURNAL=Utgiftsjournal
-ACCOUNTING_SOCIAL_JOURNAL=Social tidskrift
-ACCOUNTING_HAS_NEW_JOURNAL=Har ny tidskrift
+ACCOUNTING_SELL_JOURNAL=Försäljningsloggbok
+ACCOUNTING_PURCHASE_JOURNAL=Inköpsloggbok
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Logg för diverse operationer
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Utgiftsloggbok
+ACCOUNTING_SOCIAL_JOURNAL=Socialloggbok
+ACCOUNTING_HAS_NEW_JOURNAL=Har ny loggbok
 
 ACCOUNTING_RESULT_PROFIT=Resultaträkningskonto (vinst)
 ACCOUNTING_RESULT_LOSS=Resultaträkningskonto (förlust)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Tidningen för stängning
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Loggbok för stängning
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Redovisningskonto övergångsöverföring
 
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Redovisningskonto för att registrera pr
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Redovisningskonto som standard för köpta produkter (används om det inte anges i produktbladet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Bokföringskonto som standard för de sålda produkterna (används om de inte anges i produktbladet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Redovisningskonto som standard för de sålda produkterna i EEG (används om det inte anges i produktbladet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Bokföringskonto som standard för de sålda produkterna som exporteras från EEG (används om det inte anges i produktbladet)
+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=Bokföringskonto som standard för de köpta tjänsterna (används om det inte anges i servicebladet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Redovisningskonto som standard för de sålda tjänsterna (används om de inte anges i servicebladet)
 
@@ -177,8 +177,9 @@ LabelAccount=Etikett konto
 LabelOperation=Etikettoperation
 Sens=Sens
 LetteringCode=Brevkod
-Codejournal=Journal
-JournalLabel=Tidskriftetikett
+Lettering=Lettering
+Codejournal=Loggbok
+JournalLabel=Loggboksetikett
 NumPiece=Stycke nummer
 TransactionNumShort=Num. transaktion
 AccountingCategory=Personliga grupper
@@ -189,15 +190,15 @@ ByPredefinedAccountGroups=Av fördefinierade grupper
 ByPersonalizedAccountGroups=Av personliga grupper
 ByYear=Per år
 NotMatch=Inte inställd
-DeleteMvt=Ta bort Ledger-linjer
+DeleteMvt=Ta bort linjer
 DelYear=År att radera
-DelJournal=Journalen att radera
-ConfirmDeleteMvt=Detta kommer att radera alla rader i Ledger för år och / eller från en specifik journal. Minst ett kriterium krävs.
-ConfirmDeleteMvtPartial=Detta kommer att radera transaktionen från Ledger (alla rader relaterade till samma transaktion kommer att raderas)
-FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense rapporter journal
-DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=Detta är en syn på posten som är bunden till ett bokföringskonto och kan spelas in i Ledger.
+DelJournal=Loggbok att radera
+ConfirmDeleteMvt=Detta kommer att radera alla rader i huvudboken för år och / eller från en specifik loggbok. Minst ett kriterium krävs.
+ConfirmDeleteMvtPartial=Detta kommer att radera transaktionen från huvudboken (alla rader relaterade till samma transaktion kommer att raderas)
+FinanceJournal=Finansloggbok
+ExpenseReportsJournal=Utläggsrapporter loggbok
+DescFinanceJournal=Finansbokföring inklusive alla typer av betalningar via bankkonto
+DescJournalOnlyBindedVisible=Detta är en syn på posten som är bunden till ett bokföringskonto och kan spelas in i huvudboken.
 VATAccountNotDefined=Konto för moms inte definierad
 ThirdpartyAccountNotDefined=Konto för tredje part har inte definierats
 ProductAccountNotDefined=Konto för produkt som inte definierats
@@ -234,7 +235,7 @@ ChangeAccount=Ändra produkt- / serviceredovisningskonto för utvalda linjer med
 Vide=-
 DescVentilSupplier=Här kan du se listan över leverantörsfakturor som är bundna eller ännu inte bundna till ett konto för produktkonton
 DescVentilDoneSupplier=Här kan du se listan över leverantörsfakturor och deras bokföringskonto
-DescVentilTodoExpenseReport=Bind expense rapport rader är inte redan bundna med ett avgiftskonton konto
+DescVentilTodoExpenseReport=Förbinda utläggsrapportsrader som inte redan är bundna med ett konto i bokföringen
 DescVentilExpenseReport=Här kan du se listan över kostnadsrapporter som är bundna (eller inte) till ett avgiftsredovisningskonto
 DescVentilExpenseReportMore=Om du ställer in bokföringskonto på typ av kostnadsrapportrader kommer applikationen att kunna göra alla bindningar mellan dina kostnadsrapporter och konton för ditt kontoplan, bara med ett klick med knappen <strong> "%s" </strong>. Om kontot inte var inställt på avgifterna eller om du fortfarande har några rader som inte är kopplade till något konto måste du göra en manuell bindning från menyn "<strong> %s </strong>".
 DescVentilDoneExpenseReport=Här kan du se listan över raderna för kostnadsrapporter och deras bokföringskonto
@@ -246,9 +247,9 @@ ErrorAccountancyCodeIsAlreadyUse=Fel, du kan inte ta bort denna redovisningskont
 MvtNotCorrectlyBalanced=Rörelsen är inte korrekt balanserad. Debit = %s | Kredit = %s
 Balancing=Balansering
 FicheVentilation=Förbindande kort
-GeneralLedgerIsWritten=Transaktioner skrivs i Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Några av transaktionerna kunde inte journaliseras. Om det inte finns något annat felmeddelande beror det troligen på att de redan var journaliserade.
-NoNewRecordSaved=Inte mer rekord för att journalisera
+GeneralLedgerIsWritten=Transaktioner skrivs i huvudboken
+GeneralLedgerSomeRecordWasNotRecorded=Några av transaktionerna kunde inte bokföras. Om det inte finns något annat felmeddelande beror det troligen på att de redan var bokförade.
+NoNewRecordSaved=Inga flera linjer att bokföra
 ListOfProductsWithoutAccountingAccount=Förteckning över produkter som inte är kopplade till något kontokonto
 ChangeBinding=Ändra bindningen
 Accounted=Redovisas i huvudbok
@@ -258,10 +259,10 @@ NotYetAccounted=Ännu inte redovisad i huvudbok
 ApplyMassCategories=Applicera masskategorier
 AddAccountFromBookKeepingWithNoCategories=Tillgängligt konto ännu inte i den personifierade gruppen
 CategoryDeleted=Kategori för bokföringskonto har tagits bort
-AccountingJournals=Bokföringsjournal
-AccountingJournal=Redovisnings journal
-NewAccountingJournal=Ny bokföringsjournal
-ShowAccoutingJournal=Visa bokföringskalender
+AccountingJournals=Bokföringsloggbok
+AccountingJournal=Bokföringsloggbok
+NewAccountingJournal=Ny bokföringsloggbok
+ShowAccoutingJournal=Visa bokföringsloggbok
 Nature=Naturen
 AccountingJournalType1=Övrig verksamhet
 AccountingJournalType2=Försäljning
@@ -270,13 +271,13 @@ AccountingJournalType4=Bank
 AccountingJournalType5=Utgiftsrapport
 AccountingJournalType8=Lager
 AccountingJournalType9=Har nya
-ErrorAccountingJournalIsAlreadyUse=Denna journalen används redan
+ErrorAccountingJournalIsAlreadyUse=Denna loggboken används redan
 AccountingAccountForSalesTaxAreDefinedInto=Obs! Bokföringskonto för försäljningsskatt definieras i menyn <b> %s </b> - <b> %s </b>
 NumberOfAccountancyEntries=Antal poster
 NumberOfAccountancyMovements=Antal rörelser
 
 ## Export
-ExportDraftJournal=Exportera utkast till journal
+ExportDraftJournal=Exportera utkast till loggbok
 Modelcsv=Modell av export
 Selectmodelcsv=Välj en modell av export
 Modelcsv_normal=Klassisk export
@@ -288,8 +289,10 @@ Modelcsv_quadratus=Exportera till Quadratus QuadraCompta
 Modelcsv_ebp=Exportera till EBP
 Modelcsv_cogilog=Exportera till Cogilog
 Modelcsv_agiris=Exportera till Agiris
+Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Exportera CSV konfigurerbar
-Modelcsv_FEC=Exportera FEC (artikel L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Diagram över konton Id
 
 ## Tools - Init accounting account on product / service
@@ -298,9 +301,13 @@ InitAccountancyDesc=Den här sidan kan användas för att initiera ett konto 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.
 Options=alternativ
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
+OptionModeProductSell=Mode försäljning
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
+OptionModeProductBuy=Mode inköp
 OptionModeProductSellDesc=Visa alla produkter med bokföringskonto för försäljning.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Visa alla produkter med bokföringskonto för inköp.
 CleanFixHistory=Ta bort bokföringskoden från rader som inte finns i kontoplaner
 CleanHistory=Återställ alla bindningar för valt år
@@ -318,11 +325,11 @@ Formula=Formel
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Några obligatoriska steg för installationen var inte färdiga, var god fyll i dem
 ErrorNoAccountingCategoryForThisCountry=Ingen redovisningskoncern tillgänglig för land %s (Se Hem - Inställning - Ordböcker)
-ErrorInvoiceContainsLinesNotYetBounded=Du försöker att journalisera några rader i fakturan <strong> %s </strong>, men några andra rader är ännu inte begränsade till bokföringskonto. Journalisering av alla fakturor för denna faktura vägras.
+ErrorInvoiceContainsLinesNotYetBounded=Du försöker att bokföra några rader i fakturan <strong> %s </strong>, men några andra rader är ännu inte förbundna till ett bokföringskonto. Bokföring av alla rader för denna faktura vägras.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Vissa rader på fakturan är inte bundna till bokföringskonto.
 ExportNotSupported=Det exporterade formatet stöds inte på den här sidan
 BookeppingLineAlreayExists=Linjer som redan finns i bokföring
-NoJournalDefined=Ingen journal definierad
+NoJournalDefined=Ingen loggbok definierad
 Binded=Förbundna rader
 ToBind=Rader att förbinda
 UseMenuToSetBindindManualy=Linjer som ännu inte är bundna, använd menyn <a href="%s"> %s </a> för att göra bindningen manuellt
@@ -330,6 +337,6 @@ UseMenuToSetBindindManualy=Linjer som ännu inte är bundna, använd menyn <a hr
 ## Import
 ImportAccountingEntries=Redovisningsposter
 
-WarningReportNotReliable=Varning, den här rapporten är inte baserad på Ledger-modulen, så den innehåller inte transaktioner modifierad manuellt i Ledger. Om din journalisering är uppdaterad är bokföringsvisningen mer exakt.
-ExpenseReportJournal=Kostnadsrapportsjournal
-InventoryJournal=Inventariejournal
+WarningReportNotReliable=Varning, den här rapporten är inte baserad på huvudboken-modulen, så den innehåller inte transaktioner modifierad manuellt i huvudboken. Om din bokföring är uppdaterad är bokföringsvisningen mer exakt.
+ExpenseReportJournal=Kostnadsrapportsloggbok
+InventoryJournal=Inventarieloggbok
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 98938fffe50..fb58a213e47 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Även om du har ett stort antal tredje parter (>
 UseSearchToSelectContactTooltip=Även om du har ett stort antal tredje parter (> 100 000), kan du öka hastigheten genom att sätta konstant CONTACT_DONOTSEARCH_ANYWHERE till 1 i Setup-> Övrigt. Sökningen kommer då att begränsas till start av strängen.
 DelaiedFullListToSelectCompany=Vänta tills en tangent trycks innan du laddar innehållet i kombinationslistan från tredje part. <br> Detta kan öka prestanda om du har ett stort antal tredje parter, men det är mindre bekvämt.
 DelaiedFullListToSelectContact=Vänta tills en tangent trycks innan du laddar innehållet i kontakt kombinationslistan. <br> Detta kan öka prestanda om du har ett stort antal kontakter, men det är mindre bekvämt)
-NumberOfKeyToSearch=NBR tecken för att utlösa Sök: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Inte tillgänglig när Ajax funktionshindrade
 AllowToSelectProjectFromOtherCompany=På tredje parts dokument kan du välja ett projekt kopplat till en annan tredje part
 JavascriptDisabled=JavaScript funktionshindrade
@@ -100,9 +102,9 @@ AntiVirusCommand= Fullständiga sökvägen till antivirus kommandot
 AntiVirusCommandExample= Exempel för ClamWin: C: \\ Program Files (x86) \\ ClamWin \\ bin \\ clamscan.exe <br> Exempel för clamav: / usr / bin / clamscan
 AntiVirusParam= Fler parametrar på kommandoraden
 AntiVirusParamExample= Exempel för ClamWin - databas = &quot;C: \\ Program Files (x86) \\ ClamWin \\ lib&quot;
-ComptaSetup=Redovisning modul setup
-UserSetup=Användarens hantering setup
-MultiCurrencySetup=Multi-valuta setup
+ComptaSetup=Redovisning modul inställning
+UserSetup=Användarens hantering inställning
+MultiCurrencySetup=Multi-valuta inställning
 MenuLimits=Gränser och noggrannhet
 MenuIdParent=Överordnade menyn ID
 DetailMenuIdParent=ID överordnade menyn (0 för en toppmenyn)
@@ -294,7 +296,7 @@ CompanyEmail=Företagets Email
 FeatureNotAvailableOnLinux=Funktionen inte finns på Unix-liknande system. Testa din sendmail program lokalt.
 SubmitTranslation=Om översättningen för detta språk inte är fullständigt eller du hittar fel kan du korrigera detta genom att redigera filer i katalogen <b> langs / %s </b> och skicka in din ändring till www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Om översättning för detta språk inte är fullständigt eller om du hittar fel kan du korrigera detta genom att redigera filer i katalogen <b> langs / %s </b> och skicka in ändrade filer på dolibarr.org/forum eller för utvecklare på github.com/Dolibarr/dolibarr.
-ModuleSetup=Modul setup
+ModuleSetup=Modul inställning
 ModulesSetup=Moduler / Programinställningar
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relationship Management (CRM)
@@ -457,7 +459,7 @@ ModuleCompanyCodeCustomerAquarium=%s följt av kundkod för kundkodskod
 ModuleCompanyCodeSupplierAquarium=%s följt av leverantörskod för en leverantörs bokföringskod
 ModuleCompanyCodePanicum=Återvänd en tom bokföringskod.
 ModuleCompanyCodeDigitaria=Bokföringskod beror på tredjepartskod. Koden består av tecknet "C" i det första läget följt av de första 5 tecknen i tredje partskoden.
-Use3StepsApproval=Som standard måste inköpsorder skapas och godkännas av 2 olika användare (ett steg / användare att skapa och ett steg / användare att godkänna. Observera att om användaren har båda tillstånd att skapa och godkänna, är ett steg / användaren tillräckligt) . Du kan fråga med det här alternativet att införa ett tredje steg / användargodkännande, om beloppet är högre än ett dedikerat värde (så 3 steg kommer att behövas: 1 = validering, 2 = första godkännande och 3 = andra godkännande om beloppet är tillräckligt). <br> Ställ in det här för att tömma om ett godkännande (2 steg) räcker, ställ det till ett mycket lågt värde (0.1) om ett andra godkännande (3 steg) alltid krävs.
+Use3StepsApproval=Som standard måste inköpsorder skapas och godkännas av 2 olika användare (ett steg / användare att skapa och ett steg / användare att godkänna. Observera att om användaren har båda tillstånd att skapa och godkänna, är ett steg / användaren tillräckligt) . Du kan fråga med det här alternativet att införa ett tredje steg / användargodkännande, om beloppet är högre än ett dedikerat värde (så 3 steg kommer att behövas: 1 = godkännande, 2 = första godkännande och 3 = andra godkännande om beloppet är tillräckligt). <br> Ställ in det här för att tömma om ett godkännande (2 steg) räcker, ställ det till ett mycket lågt värde (0.1) om ett andra godkännande (3 steg) alltid krävs.
 UseDoubleApproval=Använd ett 3 steg godkännande när beloppet (utan skatt) är högre än ...
 WarningPHPMail=VARNING: Det är ofta bättre att konfigurera utgående e-postmeddelanden för att använda din leverantörs e-postserver istället för standardinställningen. Vissa e-postleverantörer (som Yahoo) tillåter dig inte att skicka ett mail från en annan server än sin egen server. Din nuvarande inställning använder servern i programmet för att skicka e-post och inte din e-postleverantörs server, så vissa mottagare (den som är kompatibel med det restriktiva DMARC-protokollet) kommer att fråga din e-postleverantör om de kan acceptera din e-post och vissa e-postleverantörer (som Yahoo) kan svara "nej" eftersom servern inte är deras, så få av dina skickade e-postmeddelanden får inte accepteras (var försiktig med din e-postleverantörs sändningskvot). <br> Om din e-postleverantör (som Yahoo) har denna begränsning måste du ändra inställningar för e-post för att välja den andra metoden "SMTP-server" och ange SMTP-servern och referenser från din e-postleverantör.
 WarningPHPMail2=Om din e-post SMTP-leverantör behöver begränsa e-postklienten till vissa IP-adresser (mycket sällsynt), är detta e-postadressen för e-postanvändaragenten (MUA) för din ERP CRM-ansökan: <strong> %s </strong>.
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=Detta är namnet på HTML-fältet. Teknisk kunskap kr
 PageUrlForDefaultValues=Du måste ange den relativa sökvägen för sidadressen. Om du anger parametrar i URL, kommer standardvärdena att vara effektiva om alla parametrar är inställda på samma värde.
 PageUrlForDefaultValuesCreate= <br> Exempel: <br> För formuläret för att skapa en ny tredje part är det <strong> %s </strong>. <br> För URL för externa moduler installerade i anpassad katalog, inkludera inte "custom /", så använd sökvägen som <strong> mymodule / mypage.php </strong> och inte anpassad / mymodule / mypage.php. <br> Om du bara vill ha standardvärde om url har någon parameter kan du använda <strong> %s </strong>
 PageUrlForDefaultValuesList= <br> Exempel: <br> För sidan som listar tredje part är den <strong> %s </strong>. <br> För URL för externa moduler installerade i anpassad katalog, inkludera inte "custom /" så använd en sökväg som <strong> mymodule / mypagelist.php </strong> och inte anpassad / mymodule / mypagelist.php. <br> Om du bara vill ha standardvärde om url har någon parameter kan du använda <strong> %s </strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Aktivera anpassning av standardvärden
 EnableOverwriteTranslation=Aktivera användning av överskriven översättning
 GoIntoTranslationMenuToChangeThis=En översättning har hittats för nyckeln med den här koden. För att ändra detta värde måste du redigera det från Home-Setup-translation.
@@ -494,8 +497,8 @@ Module1Name=Utomstående
 Module1Desc=Företag och kontaktledning (kunder, utsikter ...)
 Module2Name=Kommersiella
 Module2Desc=Kommersiell förvaltning
-Module10Name=Accounting (simplified)
-Module10Desc=Enkla redovisningsrapporter (tidskrifter, omsättning) baserat på databasinnehåll. Använder inte någon ledgardabell.
+Module10Name=Redovisning (förenklad)
+Module10Desc=Enkla redovisningsrapporter (loggböcker, omsättning) baserat på databasinnehåll. Använder inte huvudboken.
 Module20Name=Förslag
 Module20Desc=Hantering av affärsförslag
 Module22Name=Mass Emailings
@@ -541,7 +544,7 @@ Module80Desc=Leverans och leveranshantering
 Module85Name=Banker och kontanter
 Module85Desc=Förvaltning av bank eller kontanter konton
 Module100Name=Extern webbplats
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module100Desc=Lägg till en länk till en extern hemsida som huvudmenyikon. Webbplatsen visas i en ram under toppmenyn.
 Module105Name=Mailman och Sip
 Module105Desc=Mailman eller SPIP gränssnitt för medlemmar modulen
 Module200Name=LDAP
@@ -632,7 +635,7 @@ Module50200Name=Paypal
 Module50200Desc=Erbjud kunderna en PayPal-betalningssida för PayPal (PayPal-konto eller kredit- / betalkort). Detta kan användas för att dina kunder ska kunna göra ad hoc-betalningar eller betalningar relaterade till ett specifikt Dolibarr-objekt (faktura, order etc ...)
 Module50300Name=Rand
 Module50300Desc=Erbjud kunderna en Stripe online betalningssida (kredit- / betalkort). Detta kan användas för att dina kunder ska kunna göra ad hoc-betalningar eller betalningar relaterade till ett specifikt Dolibarr-objekt (faktura, order etc ...)
-Module50400Name=Accounting (double entry)
+Module50400Name=Redovisning (dubbel inmatning)
 Module50400Desc=Redovisningshantering (dubbla poster, stöd för generella och extraordinära poster). Exportera storleken i flera andra bokföringsformat.
 Module54000Name=PrintIPP
 Module54000Desc=Direktutskrift (utan att öppna dokumenten) med koppar IPP-gränssnitt (skrivaren måste vara synlig från servern och CUPS måste installeras på servern).
@@ -648,8 +651,8 @@ Module63000Name=Resurser
 Module63000Desc=Hantera resurser (skrivare, bilar, rum, ...) för att tilldela händelser
 Permission11=Läs fakturor
 Permission12=Skapa / ändra fakturor
-Permission13=Unvalidate fakturor
-Permission14=Validera fakturor
+Permission13=Märka fakturor från bekräftat->utkast 
+Permission14=Bekräfta fakturor
 Permission15=Skicka fakturor via e-post
 Permission16=Skapa betalningar för fakturor
 Permission19=Radera fakturor
@@ -682,7 +685,7 @@ Permission78=Läs prenumerationer
 Permission79=Skapa / ändra abonnemang
 Permission81=Läs kunderna order
 Permission82=Skapa / modifiera kunder order
-Permission84=Validate kunder order
+Permission84=Bekräfta kunder order
 Permission86=Skicka kunder order
 Permission87=Stäng kunder order
 Permission88=Avbryt kunder order
@@ -694,7 +697,7 @@ Permission94=Exportera social eller skatte skatter
 Permission95=Läs rapporter
 Permission101=Läs sendings
 Permission102=Skapa / ändra sendings
-Permission104=Validate sendings
+Permission104=Bekräfta leveranser
 Permission106=Exportsend
 Permission109=Ta bort sendings
 Permission111=Läs finansiella räkenskaper
@@ -752,11 +755,11 @@ Permission214=Setup Telefoni
 Permission215=Setup leverantörer
 Permission221=Läs emailings
 Permission222=Skapa / ändra emailings (ämne, mottagare ...)
-Permission223=Validera emailings (medger sändning)
+Permission223=Bekräfta emailings (medger sändning)
 Permission229=Ta bort emailings
 Permission237=Visa mottagare och info
 Permission238=Skicka försändelserna manuellt
-Permission239=Radera utskick efter validering eller skickas
+Permission239=Radera utskick efter bekräftande eller märkning av skickad
 Permission241=Läs kategorier
 Permission242=Skapa / ändra kategorier
 Permission243=Ta bort kategorier
@@ -799,7 +802,7 @@ Permission354=Ta bort eller inaktivera grupper
 Permission358=Exportera användare
 Permission401=Läs rabatter
 Permission402=Skapa / ändra rabatter
-Permission403=Validate rabatter
+Permission403=Bekräfta rabatter
 Permission404=Ta bort rabatter
 Permission511=Läs lönesättning
 Permission512=Skapa / ändra lönesättning
@@ -832,7 +835,7 @@ Permission1004=Läs lager rörelser
 Permission1005=Skapa / ändra lager rörelser
 Permission1101=Läs leveransorder
 Permission1102=Skapa / ändra leveransorder
-Permission1104=Validate leveransorder
+Permission1104=Bekräfta leveransorder
 Permission1109=Ta bort leveransorder
 Permission1181=Läs leverantörer
 Permission1182=Läs köporder
@@ -847,7 +850,7 @@ Permission1201=Få resultat av en export
 Permission1202=Skapa / ändra en export
 Permission1231=Läs leverantörsfakturor
 Permission1232=Skapa / ändra försäljningsfakturor
-Permission1233=Validera leverantörsfakturor
+Permission1233=Bekräfta leverantörsfakturor
 Permission1234=Radera försäljningsfakturor
 Permission1235=Skicka försäljningsfakturor via e-post
 Permission1236=Exportera leverantörsfakturor, attribut och betalningar
@@ -919,7 +922,7 @@ DictionaryOrderMethods=Beställningsmetoder
 DictionarySource=Ursprung av affärsförslag / beställning
 DictionaryAccountancyCategory=Personliga grupper för rapporter
 DictionaryAccountancysystem=Modeller för kontoplan
-DictionaryAccountancyJournal=Bokföringsjournal
+DictionaryAccountancyJournal=Bokföringsloggbok
 DictionaryEMailTemplates=E-postmallar
 DictionaryUnits=Enheter
 DictionaryMeasuringUnits=Mätningsenheter
@@ -928,7 +931,7 @@ DictionaryHolidayTypes=Typer av ledighet
 DictionaryOpportunityStatus=Ledningsstatus för projekt / ledning
 DictionaryExpenseTaxCat=Kostnadsrapport - Transportkategorier
 DictionaryExpenseTaxRange=Kostnadsrapport - Räckvidd per transportkategori
-SetupSaved=Setup sparas
+SetupSaved=Inställningarna sparas
 SetupNotSaved=Inställningen är inte sparad
 BackToModuleList=Tillbaka till modullista
 BackToDictionaryList=Tillbaka till ordböcker listan
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtuell server namn
 OS=OS
 PhpWebLink=Webb-php länk
-Browser=Webbläsare
 Server=Server
 Database=Databas
 DatabaseServer=Databas värd
@@ -1003,7 +1005,7 @@ NbOfRecord=Antal poster
 Host=Server
 DriverType=Driver typ
 SummarySystem=Systeminformation sammandrag
-SummaryConst=Lista över alla Dolibarr setup parametrar
+SummaryConst=Lista över alla Dolibarr inställning parametrar
 MenuCompanySetup=Företag / Organisation
 DefaultMenuManager= Standard Menu Manager
 DefaultMenuSmartphoneManager=Smartphone menyhanteraren
@@ -1052,7 +1054,7 @@ Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Obetalda kundfaktura
 Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Väntar på bankavstämning
 Delays_MAIN_DELAY_MEMBERS=Försenad medlemsavgift
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Kontrollera insättning inte gjort
-Delays_MAIN_DELAY_EXPENSEREPORTS=Expense rapport att godkänna
+Delays_MAIN_DELAY_EXPENSEREPORTS=Utläggsrapport att godkänna
 SetupDescription1=Innan du börjar använda Dolibarr måste vissa initialparametrar definieras och moduler aktiveras / konfigureras.
 SetupDescription2=Följande två avsnitt är obligatoriska (de två första inmatningarna i inställningsmenyn):
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> Grundläggande parametrar som används för att anpassa standardbeteendet för din applikation (t.ex. för landrelaterade funktioner).
@@ -1077,14 +1079,14 @@ SystemInfoDesc=System information diverse teknisk information får du i skrivsky
 SystemAreaForAdminOnly=Det här området är endast tillgängligt för administratörsanvändare. Dolibarr användarbehörigheter kan inte ändra denna begränsning.
 CompanyFundationDesc=Redigera företagets / enhetens uppgifter. Klicka på "%s" eller "%s" knappen längst ner på sidan.
 AccountantDesc=Redigera uppgifter från din revisor / bokförare
-AccountantFileNumber=Filnummer
+AccountantFileNumber=Accountant code
 DisplayDesc=Parametrar som påverkar utseende och beteende hos Dolibarr kan ändras här.
 AvailableModules=Tillgängliga app / moduler
 ToActivateModule=För att aktivera moduler, gå på Setup-menyn (Hem-> Inställningar-> Modules).
 SessionTimeOut=Time out för session
 SessionExplanation=Detta nummer garanterar att sessionen aldrig upphör att gälla före denna fördröjning, om sessionen rengöringsmedel görs av Internal PHP-rengöringsmedel (och inget annat). Intern rengöringsprogram för PHP-session garanterar inte att sessionen upphör att gälla efter denna fördröjning. Det kommer att löpa ut efter denna fördröjning och när sessionen renare körs, så varje <b> %s / %s </b> åtkomst, men endast under åtkomst av andra sessioner (om värdet är 0, betyder det att rensning av session endast sker av en extern bearbeta). <br> Obs! På vissa servrar med en extern sessionrensningsmekanism (cron under debian, ubuntu ...) kan sessionerna förstöras efter en period som definieras av en extern inställning, oavsett vad värdet som anges här är.
 TriggersAvailable=Tillgängliga triggers
-TriggersDesc=Utlösare är filer som ändrar beteendet hos Dolibarr-arbetsflödet en gång kopierat till katalogen <b> htdocs / core / triggers </b>. De inser nya åtgärder, aktiverade på Dolibarr-evenemang (ny företagsskapande, fakturatvalidering, ...).
+TriggersDesc=Utlösare är filer som ändrar beteendet hos Dolibarr-arbetsflödet en gång kopierat till katalogen <b> htdocs / core / triggers </b>. De inser nya åtgärder, aktiverade på Dolibarr-evenemang (ny företagsskapande, fakturabekräftande, ...).
 TriggerDisabledByName=Triggers i denna fil är inaktiverade <b>av-NORUN</b> suffixet i deras namn.
 TriggerDisabledAsModuleDisabled=Triggers i denna fil är funktionshindrade modul <b>%s</b> är inaktiverad.
 TriggerAlwaysActive=Triggers i denna fil är alltid aktiva, oavsett är det aktiverade Dolibarr moduler.
@@ -1093,7 +1095,7 @@ GeneratedPasswordDesc=Välj den metod som ska användas för automatiskt generer
 DictionaryDesc=Sätt in alla referensdata. Du kan lägga till dina värden till standardvärdet.
 ConstDesc=På den här sidan kan du redigera parametrar som inte är tillgängliga på andra sidor. Dessa är mestadels reserverade parametrar för utvecklare / avancerad felsökning. För en fullständig lista över tillgängliga parametrar <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank"> se här </a>.
 MiscellaneousDesc=Alla andra säkerhetsrelaterade parametrar definieras här.
-LimitsSetup=Gränser / Precision setup
+LimitsSetup=Gränser / Precision inställning
 LimitsDesc=Du kan definiera gränser, precisioner och optimeringar som används av Dolibarr här
 MAIN_MAX_DECIMALS_UNIT=Max. decimaler för enhetspriser
 MAIN_MAX_DECIMALS_TOT=Max. decimaler för totala priser
@@ -1104,7 +1106,7 @@ TotalPriceAfterRounding=Totalpris (exkl / moms / inkl skatt) efter avrundning
 ParameterActiveForNextInputOnly=Parameter effektiv för nästa inmatning
 NoEventOrNoAuditSetup=Ingen säkerhetshändelse har loggats. Detta är normalt om Audit inte har aktiverats på sidan "Inställning - Säkerhet - Händelser".
 NoEventFoundWithCriteria=Inga säkerhetshändelser har hittats för dessa sökkriterier.
-SeeLocalSendMailSetup=Se din lokala sendmail setup
+SeeLocalSendMailSetup=Se din lokala sendmail inställning
 BackupDesc=En <b> komplett </b> backup av en Dolibarr-installation kräver två steg.
 BackupDesc2=Säkerhetskopiera innehållet i "dokument" -katalogen (<b> %s </b>) som innehåller alla uppladdade och genererade filer. Detta kommer även att innehålla alla de dumpningsfiler som genereras i steg 1.
 BackupDesc3=Säkerhetskopiera strukturen och innehållet i din databas (<b> %s </b>) till en dumpfil. För detta kan du använda följande assistent.
@@ -1203,14 +1205,14 @@ PasswordGenerationPerso=Returnera ett lösenord enligt din personligt definierad
 SetupPerso=Enligt din konfiguration
 PasswordPatternDesc=Lösenordsmönsterbeskrivning
 ##### Users setup #####
-RuleForGeneratedPasswords=Regler för att generera och validera lösenord
+RuleForGeneratedPasswords=Regler för att generera och bekräfta lösenord
 DisableForgetPasswordLinkOnLogonPage=Visa inte länken "Glömt lösenord" på sidan Inloggning
-UsersSetup=Användare modul setup
+UsersSetup=Användare modul inställning
 UserMailRequired=E-post krävs för att skapa en ny användare
 ##### HRM setup #####
 HRMSetup=Inställning av HRM-modulen
 ##### Company setup #####
-CompanySetup=Företag modul setup
+CompanySetup=Företag modul inställning
 CompanyCodeChecker=Alternativ för automatisk generering av kund / leverantörskoder
 AccountCodeManager=Alternativ för automatisk generering av kund / leverantörsräkningskod
 NotificationsDesc=E-postmeddelanden kan skickas automatiskt för vissa Dolibarr-evenemang. <br> Mottagare av anmälningar kan definieras:
@@ -1224,7 +1226,7 @@ JSOnPaimentBill=Aktivera funktionen för att fylla automatiskt betalningslinjer
 CompanyIdProfChecker=Regler för professionella id
 MustBeUnique=Måste vara unik?
 MustBeMandatory=Obligatoriskt att skapa tredje part (om momsnummer eller typ av företag definieras)?
-MustBeInvoiceMandatory=Obligatoriskt att validera fakturor?
+MustBeInvoiceMandatory=Obligatoriskt att bekräfta fakturor?
 TechnicalServicesProvided=Tekniska tjänster tillhandahålls
 #####DAV #####
 WebDAVSetupDesc=Det här är länken för åtkomst till WebDAV-katalogen. Den innehåller en "allmän" dir öppen för alla användare som känner till webbadressen (om offentlig katalogåtkomst tillåts) och en "privat" katalog som behöver ett befintligt inloggningskonto / lösenord för åtkomst.
@@ -1232,13 +1234,11 @@ WebDavServer=Root-URL för %s-servern: %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=En export länk till <b>%s</b> format finns på följande länk: %s
 ##### Invoices #####
-BillsSetup=Fakturor modul setup
+BillsSetup=Fakturor modul inställning
 BillsNumberingModule=Fakturor och kreditnotor numrering modul
 BillsPDFModules=Faktura dokument modeller
 BillsPDFModulesAccordindToInvoiceType=Faktura dokumentmodeller enligt fakturatyp
 PaymentsPDFModules=Betalningsdokumentmodeller
-CreditNote=Kreditnota
-CreditNotes=Kreditnotor
 ForceInvoiceDate=Force fakturadatum till giltighetsdatum
 SuggestedPaymentModesIfNotDefinedInInvoice=Föreslagna betalningar läge på faktura som standard om inte definierat för faktura
 SuggestPaymentByRIBOnAccount=Föreslå betalning genom uttag på konto
@@ -1249,7 +1249,7 @@ PaymentsNumberingModule=Betalningsnummereringsmodell
 SuppliersPayment=Leverantörsbetalningar
 SupplierPaymentSetup=Inställningar för leverantörsbetalningar
 ##### Proposals #####
-PropalSetup=Kommersiella förslag modul setup
+PropalSetup=Kommersiella förslag modul inställning
 ProposalsNumberingModules=Kommersiella förslag numrering moduler
 ProposalsPDFModules=Kommersiella förslag dokument modeller
 SuggestedPaymentModesIfNotDefinedInProposal=Förslag till betalningsläge på förslag som standard om det inte är definierat för förslag
@@ -1275,7 +1275,7 @@ WatermarkOnDraftOrders=Vattenstämpel på utkast till beställningar (ingen om t
 ShippableOrderIconInList=Lägg en ikon i Order lista som anger om beställningen är shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Fråga om målbankkonto för order
 ##### Interventions #####
-InterventionsSetup=Insatser modul setup
+InterventionsSetup=Insatser modul inställning
 FreeLegalTextOnInterventions=Fri text om ingripande handlingar
 FicheinterNumberingModules=Intervention numrering moduler
 TemplatePDFInterventions=Intervention kort dokument modeller
@@ -1287,11 +1287,11 @@ TemplatePDFContracts=Contract documents modeller
 FreeLegalTextOnContracts=Fritext om avtal
 WatermarkOnDraftContractCards=Vattenstämpel på kontraktsförslag (inget om de är tomma)
 ##### Members #####
-MembersSetup=Medlemmar modul setup
+MembersSetup=Medlemmar modul inställning
 MemberMainOptions=Huvudalternativ
 AdherentLoginRequired= Hantera en inloggning för varje medlem
 AdherentMailRequired=E-post krävs för att skapa en ny medlem
-MemberSendInformationByMailByDefault=Kryssruta för att skicka e-post bekräftelse till medlemmar (validering eller nya abonnemang) är aktiverat som standard
+MemberSendInformationByMailByDefault=Kryssruta för att skicka e-post bekräftelse till medlemmar (bekräftande eller nya abonnemang) är aktiverat som standard
 VisitorCanChooseItsPaymentMode=Besökare kan välja mellan tillgängliga betalningssätt
 MEMBER_REMINDER_EMAIL=Aktivera automatisk påminnelse <b> via e-post </b> av utgått prenumerationer. Obs! Modul <strong> %s </strong> måste vara aktiverad och korrekt inställd för att skicka påminnelser.
 ##### LDAP setup #####
@@ -1418,7 +1418,7 @@ LDAPFieldSidExample=Exempel: objektsidan
 LDAPFieldEndLastSubscription=Datum för teckning slut
 LDAPFieldTitle=Befattning
 LDAPFieldTitleExample=Exempel: titel
-LDAPSetupNotComplete=LDAP setup komplett inte (gå på andra flikar)
+LDAPSetupNotComplete=LDAP inställning komplett inte (gå på andra flikar)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Ingen administratör eller lösenord anges. LDAP tillgång kommer att bli anonym och i skrivskyddat läge.
 LDAPDescContact=På denna sida kan du ange LDAP-attribut namn i LDAP träd för varje data finns på Dolibarr kontakter.
 LDAPDescUsers=På denna sida kan du ange LDAP-attribut namn i LDAP träd för varje data finns på Dolibarr användare.
@@ -1454,9 +1454,9 @@ DefaultSortOrder=Standard sorteringsorder
 DefaultFocus=Standardfokusfält
 DefaultMandatory=Obligatoriska formulärfält
 ##### Products #####
-ProductSetup=Produkter modul setup
+ProductSetup=Produkter modul inställning
 ServiceSetup=Tjänster modul konfiguration
-ProductServiceSetup=Produkter och tjänster moduler setup
+ProductServiceSetup=Produkter och tjänster moduler inställning
 NumberOfProductShowInSelect=Maximalt antal produkter som ska visas i kombinationsvallista (0 = ingen gräns)
 ViewProductDescInFormAbility=Visa produktbeskrivningar i formulär (visas annars i en verktygstips)
 MergePropalProductCard=Aktivera i produkt / tjänst Bifogade fliken Filer en möjlighet att slå samman produkt PDF-dokument till förslag PDF azur om produkten / tjänsten är på förslaget
@@ -1470,7 +1470,7 @@ ProductCodeChecker= Modul för produkt kodgenerering och kontroll (produkt eller
 ProductOtherConf= Produkt / tjänst konfiguration
 IsNotADir=är inte en katalog!
 ##### Syslog #####
-SyslogSetup=Syslog-modul setup
+SyslogSetup=Syslog-modul inställning
 SyslogOutput=Logga utgång
 SyslogFacility=Facility
 SyslogLevel=Nivå
@@ -1482,10 +1482,10 @@ CompressSyslogs=Komprimering och säkerhetskopiering av felsökningsloggfiler (g
 SyslogFileNumberOfSaves=Logga säkerhetskopior
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurera rengöring schemalagt jobb för att ställa in log backupfrekvens
 ##### Donations #####
-DonationsSetup=Donation modul setup
+DonationsSetup=Donation modul inställning
 DonationsReceiptModel=Mall för donation kvitto
 ##### Barcode #####
-BarcodeSetup=Barcode setup
+BarcodeSetup=Barcode inställning
 PaperFormatModule=Skriv format modul
 BarcodeEncodeModule=Barcode kodningstypen
 CodeBarGenerator=Barcode generator
@@ -1505,12 +1505,12 @@ BarCodeNumberManager=Manager för att automatiskt definiera streckkodsnummer
 ##### Prelevements #####
 WithdrawalsSetup=Inställning av modul Debitbetalningar
 ##### ExternalRSS #####
-ExternalRSSSetup=Externa RSS import setup
+ExternalRSSSetup=Externa RSS import inställning
 NewRSS=Nytt RSS-flöde
 RSSUrl=RSS URL
 RSSUrlExample=En intressant RSS-flöde
 ##### Mailing #####
-MailingSetup=E-post modul setup
+MailingSetup=E-post modul inställning
 MailingEMailFrom=Avsändar-e-post (Från) för e-postmeddelanden som skickas via e-postmodul
 MailingEMailError=Återvänd Email (Fel till) för e-postmeddelanden med fel
 MailingDelay=Sekunder fördröjning efter sändning av nästa meddelande
@@ -1592,7 +1592,7 @@ AccountancyCode=Redovisningskod
 AccountancyCodeSell=Försäljning konto. kod
 AccountancyCodeBuy=Köpa konto. kod
 ##### Agenda #####
-AgendaSetup=Åtgärder och dagordning modul setup
+AgendaSetup=Åtgärder och dagordning modul inställning
 PasswordTogetVCalExport=Viktiga att tillåta export länk
 PastDelayVCalExport=Inte exporterar fall äldre än
 AGENDA_USE_EVENT_TYPE=Använd händelsetyper (hanteras i menyn Inställningar -> Ordböcker -> Typ av kalenderhändelser)
@@ -1605,7 +1605,7 @@ AGENDA_REMINDER_BROWSER=Aktivera händelsepåminnelse <b> på användarens webbl
 AGENDA_REMINDER_BROWSER_SOUND=Aktivera ljudanmälan
 AGENDA_SHOW_LINKED_OBJECT=Visa länkat objekt i agendan
 ##### Clicktodial #####
-ClickToDialSetup=Klicka för att Dial modul setup
+ClickToDialSetup=Klicka för att Dial modul inställning
 ClickToDialUrlDesc=Url ringde när ett klick på telefon picto är gjort. I URL kan du använda taggar <br> <b> __PHONETO__ </b> som kommer att ersättas med telefonnumret person att ringa <br> <b> __PHONEFROM__ </b> som kommer att ersättas med telefonnummer att ringa person (er) <br> <b> __LOGIN__ </b> som kommer att ersättas med clicktodial inloggning (definierad på användarkort) <br> <b> __PASS__ </b> som kommer att ersättas med clicktodial lösenord (definierat på användarkort).
 ClickToDialDesc=Denna modul gör telefonnummer till klickbara länkar. Ett klick på ikonen kommer att göra ditt telefonsamtal till numret. Detta kan användas för att ringa ett call center-system från Dolibarr som exempelvis kan ringa telefonnumret på ett SIP-system.
 ClickToDialUseTelLink=Använd bara en länk "tel:" på telefonnummer
@@ -1618,16 +1618,16 @@ CashDeskBankAccountForSell=Konto som ska användas för att ta emot kontant beta
 CashDeskBankAccountForCheque= Standardkonto som ska användas för att få betalningar med check
 CashDeskBankAccountForCB= Konto som ska användas för att ta emot kontant betalning med kreditkort
 CashDeskDoNotDecreaseStock=Inaktivera lagerminskning när en försäljning görs från försäljningsstället (om "nej", lagerminskning görs för varje försäljning som görs från POS, oberoende av alternativet i modulen Lager).
-CashDeskIdWareHouse=Tvinga och begränsa lager att använda för aktie minskning
+CashDeskIdWareHouse=Tvinga och begränsa lager att använda för lagerpostminskning
 StockDecreaseForPointOfSaleDisabled=Lagerminskning från försäljningsstället inaktiverat
 StockDecreaseForPointOfSaleDisabledbyBatch=Lagerminskning i POS är inte kompatibel med modul Serial / Lot-hantering (för närvarande aktiv) så lagerminskning är inaktiverad.
 CashDeskYouDidNotDisableStockDecease=Du inaktiverade inte lagerminskning när du gör en försäljning från försäljningsstället. Därför krävs ett lager.
 ##### Bookmark #####
-BookmarkSetup=Bokmärk modul setup
+BookmarkSetup=Bokmärk modul inställning
 BookmarkDesc=Den här modulen låter dig hantera bokmärken. Du kan också lägga till genvägar till alla Dolibarr-sidor eller externa webbplatser på din vänstra meny.
 NbOfBoomarkToShow=Maximalt antal bokmärken som visas i vänstermenyn
 ##### WebServices #####
-WebServicesSetup=WebServices modul setup
+WebServicesSetup=WebServices modul inställning
 WebServicesDesc=Genom att aktivera denna modul Dolibarr bli en webbtjänst server för att tillhandahålla diverse webbtjänster.
 WSDLCanBeDownloadedHere=WSDL-deskriptor fil som serviceses kan ladda ner här
 EndPointIs=SOAP-klienter måste skicka sina förfrågningar till Dolibarr-ändpunkten på URL
@@ -1640,16 +1640,16 @@ OnlyActiveElementsAreExposed=Endast element från aktiverade moduler utsätts
 ApiKey=Key för API
 WarningAPIExplorerDisabled=API Utforskaren har blivit inaktiverad. API-explorer är inte skyldig att tillhandahålla API-tjänster. Det är ett verktyg för utvecklare att hitta / testa REST API. Om du behöver det här verktyget, gå till installationen av modulen API REST för att aktivera det.
 ##### Bank #####
-BankSetupModule=Bank modul setup
+BankSetupModule=Bank modul inställning
 FreeLegalTextOnChequeReceipts=Fri text på check kvitton
-BankOrderShow=Visning ordning bankkonton för de länder som använder &quot;Detaljerad bank nummer&quot;
+BankOrderShow=Visningsordning bankkonton för de länder som använder "Detaljerad bank nummer"
 BankOrderGlobal=Allmänna
 BankOrderGlobalDesc=Allmänt visningsordning
 BankOrderES=Spanska
 BankOrderESDesc=Spanska visningsordning
 ChequeReceiptsNumberingModule=Kontrollera mottagningsnummereringsmodul
 ##### Multicompany #####
-MultiCompanySetup=Multi-bolag modul setup
+MultiCompanySetup=Multi-bolag modul inställning
 ##### Suppliers #####
 SuppliersSetup=Inställning av leverantörsmodul
 SuppliersCommandModel=Komplett mall för inköpsorder (logotyp ...)
@@ -1657,7 +1657,7 @@ SuppliersInvoiceModel=Komplett mall av leverantörsfaktura (logotyp ...)
 SuppliersInvoiceNumberingModel=Leverantörsfakturor nummereringsmodeller
 IfSetToYesDontForgetPermission=Om satt till ja, glöm inte att ge behörighet till grupper eller användare som tillåts för den andra godkännande
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind modul setup
+GeoIPMaxmindSetup=GeoIP Maxmind modul inställning
 PathToGeoIPMaxmindCountryDataFile=Sökväg till fil innehåller MaxMind ip till land översättning. <br> Exempel: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat
 NoteOnPathLocation=Observera att ditt ip till land datafil måste vara inne i en katalog din PHP kan läsa (Kolla din PHP open_basedir inställningar och behörigheter filsystem).
 YouCanDownloadFreeDatFileTo=Du kan ladda ner en <b>gratis demoversion</b> av Maxmind GeoIP landet filen på %s.
@@ -1665,7 +1665,7 @@ YouCanDownloadAdvancedDatFileTo=Du kan också ladda ner en mer <b>komplett versi
 TestGeoIPResult=Test av en omvandling IP -> land
 ##### Projects #####
 ProjectsNumberingModules=Projekt numrering modul
-ProjectsSetup=Projekt modul setup
+ProjectsSetup=Projekt modul inställning
 ProjectsModelModule=S rapport dokument modell
 TasksNumberingModules=Uppgifter nummermodulen
 TaskModelModule=Uppgifter rapporter dokumentmodell
@@ -1694,9 +1694,9 @@ TypePaymentDesc=0: Betalningstyp för kund, 1: Leverantörsbetalningstyp, 2: Bå
 IncludePath=Inkludera sökväg (definerad i variabel %s)
 ExpenseReportsSetup=Inställning av modulräkningar
 TemplatePDFExpenseReports=Dokumentmallar för att skapa reseräkning dokument
-ExpenseReportsIkSetup=Inställning av modul Expense Reports - Milles index
-ExpenseReportsRulesSetup=Inställning av modul Expense Reports - Regler
-ExpenseReportNumberingModules=Expense rapporteringsnummer modul
+ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
+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 *
@@ -1711,8 +1711,8 @@ SomethingMakeInstallFromWebNotPossible2=Av den anledningen är processen att upp
 InstallModuleFromWebHasBeenDisabledByFile=Installation av extern modul från ansökan har inaktiverats av administratören. Du måste be honom att ta bort <strong>filen% s</strong> för att tillåta denna funktion.
 ConfFileMustContainCustom=Installera eller bygga en extern modul från programmet måste spara modulfilerna i katalogen <strong> %s </strong>. För att få den här katalogen bearbetad av Dolibarr måste du konfigurera <strong> conf / conf.php </strong> för att lägga till 2 direktivlinjer: <br> <strong> $ dolibarr_main_url_root_alt = '/ custom'; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s / custom'; </strong>
 HighlightLinesOnMouseHover=Markera tabelllinjer när musen flytta passerar över
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+HighlightLinesColor=Markera färg på linjen när musen passerar över (använd 'ffffff' för ingen höjdpunkt)
+HighlightLinesChecked=Markera färg på linjen när den är markerad (använd 'ffffff' för ingen höjdpunkt)
 TextTitleColor=Textfärg på sidtitel
 LinkColor=Färg på länkar
 PressF5AfterChangingThis=Tryck CTRL + F5 på tangentbordet eller rensa webbläsarens cacheminne när du har ändrat det här värdet för att få det effektivt
@@ -1819,7 +1819,7 @@ ChartLoaded=Kontoplan laddad
 SocialNetworkSetup=Uppställning av modulen Sociala nätverk
 EnableFeatureFor=Aktivera funktioner för <strong> %s </strong>
 VATIsUsedIsOff=Obs! Alternativet att använda moms eller moms har ställts till <strong> Av </strong> i menyn %s - %s, så Försäljningsskatt eller moms används alltid 0 för försäljning.
-SwapSenderAndRecipientOnPDF=Byt avsändare och mottagaradress på PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Varning, funktion som endast stöds på textfält. Också en URL-parameter åtgärd = skapa eller åtgärd = redigera måste ställas in ELLER sidnamn måste sluta med "new.php" för att utlösa denna funktion.
 EmailCollector=E-post samlare
 EmailCollectorDescription=Lägg till ett schemalagt jobb och en installationssida för att skanna regelbundet e-postrutor (med IMAP-protokoll) och spela in e-postmeddelanden som tas emot i din ansökan, på rätt plats och / eller skapa några poster automatiskt (som ledningar).
@@ -1828,28 +1828,30 @@ EMailHost=Värd för e-post IMAP-server
 MailboxSourceDirectory=Postkälla källkatalog
 MailboxTargetDirectory=Målkatalogen för brevlådan
 EmailcollectorOperations=Verksamhet att göra av samlare
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Samla nu
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
-LastResult=Latest result
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
+DateLastCollectResult=Datum senaste samlingen försökt
+DateLastcollectResultOk=Datum senaste samla framgångsrikt
+LastResult=Senaste resultatet
 EmailCollectorConfirmCollectTitle=E-post samla bekräftelse
 EmailCollectorConfirmCollect=Vill du springa samlingen för den här samlaren nu?
 NoNewEmailToProcess=Ingen ny email (matchande filter) att bearbeta
 NothingProcessed=Inget gjort
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s e-postadresser kvalificerade, %s e-postmeddelanden som bearbetats framgångsrikt (för %s-post / åtgärder gjorda)
 RecordEvent=Spela in e-post händelse
 CreateLeadAndThirdParty=Skapa ledning (och tredje part om det behövs)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Skapa biljett (och tredje part om det behövs)
 CodeLastResult=Senaste resultatkoden
 NbOfEmailsInInbox=Antal e-postmeddelanden i källkatalogen
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+LoadThirdPartyFromName=Ladda tredjepartsökning på %s (endast belastning)
+LoadThirdPartyFromNameOrCreate=Ladda tredjepartsökning på %s (skapa om ej hittad)
 WithDolTrackingID=Dolibarr Tracking ID hittades
 WithoutDolTrackingID=Dolibarr Spårnings ID inte hittat
 FormatZip=Zip
 MainMenuCode=Menyinmatningskod (huvudmeny)
 ECMAutoTree=Visa automatiskt ECM-träd
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Öppettider
 OpeningHoursDesc=Ange här företagets vanliga öppettider.
 ResourceSetup=Konfiguration av resursmodulen
@@ -1877,8 +1879,15 @@ WarningValueHigherSlowsDramaticalyOutput=Varning, högre värden sänker dramati
 DebugBarModuleActivated=Modul debugbar aktiveras och saktar dramatiskt gränssnittet
 EXPORTS_SHARE_MODELS=Exportmodeller delas med alla
 ExportSetup=Inställning av modul Export
-InstanceUniqueID=Unique ID of the instance
-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/.
+InstanceUniqueID=Unikt ID för förekomsten
+SmallerThan=Mindre än
+LargerThan=Större än
+IfTrackingIDFoundEventWillBeLinked=Observera att Om ett spårnings-ID finns i inkommande e-post, kopplas händelsen automatiskt till relaterade objekt.
+WithGMailYouCanCreateADedicatedPassword=Med ett GMail-konto, om du aktiverade valet av 2 steg, rekommenderas att du skapar ett dedikerat andra lösenord för programmet istället för att använda ditt eget lösenordsord från https://myaccount.google.com/.
+IFTTTSetup=IFTTT module setup
+IFTTT_SERVICE_KEY=IFTTT Service key
+IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
+IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
+UrlForIFTTT=URL endpoint for IFTTT
+YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
+EndPointFor=End point for %s : %s
diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
index c192c88369d..d7695d5d593 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -31,42 +31,43 @@ ViewWeek=Veckovy
 ViewPerUser=Per user view
 ViewPerType=Per typvy
 AutoActions= Automatisk fyllning av dagordning
-AgendaAutoActionDesc= Här kan du definiera events som du vill ha Dolibarr till create automatically i Agenda. Om inget är checked, kommer endast manuella åtgärder att inkluderas i loggar and som visas i Agenda. Automatisk spårning av affärsåtgärder gjorda på objects (validation, status ändring) sparas inte.
+AgendaAutoActionDesc= Här kan du definiera events som du vill ha Dolibarr till create automatically i Agenda. Om inget är checked, kommer endast manuella åtgärder att inkluderas i loggar and som visas i Agenda. Automatisk spårning av affärsåtgärder gjorda på objects (bekräftelse, statusändring) sparas inte.
 AgendaSetupOtherDesc= Den här sidan innehåller alternativ för att tillåta export av dina Dolibarr events till en extern kalender (Thunderbird, Google Kalender etc ...)
 AgendaExtSitesDesc=Den här sidan gör det möjligt att deklarera externa kalendrar för att se sina evenemang i Dolibarr agenda.
 ActionsEvents=Händelser som Dolibarr kommer att skapa en talan i agenda automatiskt
-EventRemindersByEmailNotEnabled=Händelsepåminnelser av email var inte aktiverat i %s module setup.
+EventRemindersByEmailNotEnabled=Händelsepåminnelser av email var inte aktiverat i %s module inställning.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tredje part %s skapad
-ContractValidatedInDolibarr=Kontrakt %s validerade
+COMPANY_DELETEInDolibarr=Third party %s deleted
+ContractValidatedInDolibarr=Kontrakt %s bekräftades
 CONTRACT_DELETEInDolibarr=Kontrakt %s raderad
 PropalClosedSignedInDolibarr=Förslag %s undertecknade
 PropalClosedRefusedInDolibarr=Förslag %s vägrade
-PropalValidatedInDolibarr=Förslag %s validerade
-PropalClassifiedBilledInDolibarr=Förslag %s klassificerad faktureras
-InvoiceValidatedInDolibarr=Faktura %s validerade
-InvoiceValidatedInDolibarrFromPos=Faktura %s validerats från POS
+PropalValidatedInDolibarr=Förslag %s bekräftades
+PropalClassifiedBilledInDolibarr=Förslag %s märkt faktureras
+InvoiceValidatedInDolibarr=Faktura %s bekräftades
+InvoiceValidatedInDolibarrFromPos=Faktura %s bekräftats från POS
 InvoiceBackToDraftInDolibarr=Faktura %s gå tillbaka till förslaget status
 InvoiceDeleteDolibarr=Faktura %s raderas
 InvoicePaidInDolibarr=Faktura %s ändrades till betald
 InvoiceCanceledInDolibarr=Faktura %s annulleras
-MemberValidatedInDolibarr=Medlem %s validerade
+MemberValidatedInDolibarr=Medlem %s bekräftades
 MemberModifiedInDolibarr=Medlem %s modified
 MemberResiliatedInDolibarr=Medlem %s avslutad
 MemberDeletedInDolibarr=Medlem %s raderad
 MemberSubscriptionAddedInDolibarr=Prenumeration %s för medlem %s tillagd
 MemberSubscriptionModifiedInDolibarr=Prenumeration %s för medlem %s modified
 MemberSubscriptionDeletedInDolibarr=Prenumeration %s för medlem %s raderad
-ShipmentValidatedInDolibarr=Leverans %s validerad
-ShipmentClassifyClosedInDolibarr=Sändning %s klassificerad fakturerad
-ShipmentUnClassifyCloseddInDolibarr=Sändning %s klassificerad som återöppnad
+ShipmentValidatedInDolibarr=Leverans %s bekräftat
+ShipmentClassifyClosedInDolibarr=Sändning %s märkt fakturerad
+ShipmentUnClassifyCloseddInDolibarr=Sändning %s märkt som återöppnad
 ShipmentBackToDraftInDolibarr=Leverans %s gå tillbaka till utkast status
 ShipmentDeletedInDolibarr=Frakten %s raderad
 OrderCreatedInDolibarr=Order %s skapad
-OrderValidatedInDolibarr=Order %s validerade
-OrderDeliveredInDolibarr=Klassificerad order %s levererad 
+OrderValidatedInDolibarr=Order %s bekräftades
+OrderDeliveredInDolibarr=Order %s märkt levererad 
 OrderCanceledInDolibarr=Order %s avbryts
-OrderBilledInDolibarr=Klassificerad order %s fakturerad
+OrderBilledInDolibarr=Order %s märkt fakturerad
 OrderApprovedInDolibarr=Ordningens %s godkänd
 OrderRefusedInDolibarr=Order %s vägrade
 OrderBackToDraftInDolibarr=Order %s gå tillbaka till förslaget status
@@ -77,7 +78,7 @@ InvoiceSentByEMail=Kund invoice %s skickad av email
 SupplierOrderSentByEMail=Purchase order %s skickad av email
 SupplierInvoiceSentByEMail=Vendor invoice %s skickad av email
 ShippingSentByEMail=Leverans %s skickad av email
-ShippingValidated= Leverans %s validerad
+ShippingValidated= Leverans %s bekräftat
 InterventionSentByEMail=Intervention %s skickad av email
 ProposalDeleted=Förslag raderad
 OrderDeleted=Order raderad
@@ -86,7 +87,7 @@ PRODUCT_CREATEInDolibarr=Produkt %s skapad
 PRODUCT_MODIFYInDolibarr=Produkt %s modified
 PRODUCT_DELETEInDolibarr=Produkt %s raderad
 EXPENSE_REPORT_CREATEInDolibarr=Kostnadsrapport %s skapad
-EXPENSE_REPORT_VALIDATEInDolibarr=Kostnadsrapport %s validated
+EXPENSE_REPORT_VALIDATEInDolibarr=Kostnadsrapport %s bekräftat
 EXPENSE_REPORT_APPROVEInDolibarr=Kostnadsrapport %s godkänd
 EXPENSE_REPORT_DELETEInDolibarr=Kostnadsrapport %s raderad
 EXPENSE_REPORT_REFUSEDInDolibarr=Kostnadsrapport %s refused
@@ -95,7 +96,8 @@ PROJECT_MODIFYInDolibarr=Projekt %s modified
 PROJECT_DELETEInDolibarr=Projekt %s raderad
 TICKET_CREATEInDolibarr=Biljett %s skapad
 TICKET_MODIFYInDolibarr=Biljett %s modified
-TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
+TICKET_CLOSEInDolibarr=Biljett %s stängt
 TICKET_DELETEInDolibarr=Biljett %s raderad
 ##### End agenda events #####
 AgendaModelModule=Dokumentmallar för event
@@ -116,7 +118,7 @@ DefaultWorkingHours=Standard arbetstiden i dag (exempel: 9-18)
 # External Sites ical
 ExportCal=Export kalender
 ExtSites=Importera externa kalendrar
-ExtSitesEnableThisTool=Show externa kalendrar (definierad i global setup) i Agenda. Inverkar inte på externa kalendrar som definieras av users.
+ExtSitesEnableThisTool=Show externa kalendrar (definierad i global inställning) i Agenda. Inverkar inte på externa kalendrar som definieras av users.
 ExtSitesNbOfAgenda=Antal kalendrar
 AgendaExtNb=Kalender nr. %s
 ExtSiteUrlAgenda=URL att komma åt. Ical-fil
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index 838ca5ece48..d277961d233 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -110,7 +110,7 @@ TransferFrom=Från
 TransferTo=För att
 TransferFromToDone=En överföring från <b>%s</b> till <b>%s</b> av <b>%s</b> %s har registrerats.
 CheckTransmitter=Sändare
-ValidateCheckReceipt=Validera detta check-kvitto?
+ValidateCheckReceipt=Bekräfta detta check-kvitto?
 ConfirmValidateCheckReceipt=Är du säker på att du vill bekräfta detta kvitto, kommer ingen ändring att vara möjlig när det här är gjort?
 DeleteCheckReceipt=Ta bort detta kvitto?
 ConfirmDeleteCheckReceipt=Är du säker på att du vill radera detta kvitto?
@@ -139,7 +139,7 @@ ShowAllAccounts=Visa för alla konton
 FutureTransaction=Framtida transaktion. Det gick inte att förena.
 SelectChequeTransactionAndGenerate=Välj / filtrera kontroller för att inkludera i kontokortet och klicka på "Skapa".
 InputReceiptNumber=Välj kontoutdrag relaterat till förlikningen. Använd ett sorterbart numeriskt värde: YYYYMM or YYYYMMDD
-EventualyAddCategory=Så småningom, ange en kategori där för att klassificera de register
+EventualyAddCategory=Så småningom, ange en kategori då för att märka posterna
 ToConciliate=Att avstämma?
 ThenCheckLinesAndConciliate=Kontrollera sedan linjerna som finns i kontoutdraget och klicka
 DefaultRIB=Standard BAN
@@ -156,11 +156,11 @@ CheckRejectedAndInvoicesReopened=Kontrollera tillbaka och fakturor öppnas igen
 BankAccountModelModule=Dokumentmallar för bankkonton
 DocumentModelSepaMandate=Mall för SEPA-mandat. Användbar endast för europeiska länder i EEG.
 DocumentModelBan=Mall för att skriva ut en sida med BAN-information.
-NewVariousPayment=Nya diverse betalningar
-VariousPayment=Diverse betalningar
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Diverse betalningar
-ShowVariousPayment=Visa diverse betalningar
-AddVariousPayment=Lägg till diverse betalningar
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA-mandatet
 YourSEPAMandate=Ditt SEPA-mandat
 FindYourSEPAMandate=Detta är ditt SEPA-mandat för att bemyndiga vårt företag att göra direkt debitering till din bank. Returnera det undertecknat (skanna av det signerade dokumentet) eller skicka det via post till
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index d3e7227ebdd..87ba06c3f74 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -66,13 +66,15 @@ paymentInInvoiceCurrency=i faktura valuta
 PaidBack=Återbetald
 DeletePayment=Radera betalning
 ConfirmDeletePayment=Är du säker på att du vill radera denna betalning?
-ConfirmConvertToReduc=Vill du konvertera denna %s till en absolut rabatt? <br> Beloppet sparas bland alla rabatter och kan användas som rabatt för en aktuell eller en framtida faktura för denna kund.
-ConfirmConvertToReducSupplier=Vill du konvertera denna %s till en absolut rabatt? <br> Beloppet sparas bland alla rabatter och kan användas som rabatt för en aktuell eller en framtida faktura för denna leverantör.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Leverantörsbetalningar
 ReceivedPayments=Mottagna betalningar
 ReceivedCustomersPayments=Inbetalningar från kunder
 PayedSuppliersPayments=Betalningar betalade till leverantörer
-ReceivedCustomersPaymentsToValid=Mottagna kunder betalningar för att validera
+ReceivedCustomersPaymentsToValid=Mottagna kunder betalningar för att bekräfta
 PaymentsReportsForYear=Betalningar rapporter för %s
 PaymentsReports=Betalningar rapporter
 PaymentsAlreadyDone=Betalningar redan gjort
@@ -89,15 +91,14 @@ PaymentTerm=Betalningsvillkor
 PaymentConditions=Betalningsvillkor
 PaymentConditionsShort=Betalningsvillkor
 PaymentAmount=Betalningsbelopp
-ValidatePayment=Bekräfta betalning
 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=Klassificera "betalda"
-ClassifyPaidPartially=Klassificera "betalda delvis"
-ClassifyCanceled=Klassificera "övergivna"
-ClassifyClosed=Klassificera "avsluten"
-ClassifyUnBilled=Klassificera 'ofakturerade'
+ClassifyPaid=Märk "betald"
+ClassifyPaidPartially=Märk "betalda delvis"
+ClassifyCanceled=Märk "övergivna"
+ClassifyClosed=Märk "avsluten"
+ClassifyUnBilled=Märk 'ofakturerade'
 CreateBill=Skapa faktura
 CreateCreditNote=Skapa kreditnota
 AddBill=Skapa faktura eller en kredit nota
@@ -118,12 +119,12 @@ DisabledBecauseRemainderToPayIsZero=Inaktiverad pga återstående obetalt är no
 PriceBase=Prisbasbelopp
 BillStatus=Faktura status
 StatusOfGeneratedInvoices=Status för genererade fakturor
-BillStatusDraft=Utkast (måste valideras)
+BillStatusDraft=Utkast (måste bekräftas)
 BillStatusPaid=Betald
 BillStatusPaidBackOrConverted=Kreditnota återbetalning eller markerad som kredit tillgänglig
 BillStatusConverted=Betald (redo för konsumtion i slutfaktura)
 BillStatusCanceled=Övergiven
-BillStatusValidated=Validerad (måste betalas)
+BillStatusValidated=Bekräftat (måste betalas)
 BillStatusStarted=Påbörjad
 BillStatusNotPaid=Inte betalas
 BillStatusNotRefunded=Icke återbetalad
@@ -135,18 +136,18 @@ BillShortStatusPaidBackOrConverted=Återbetalas eller konverteras
 Refunded=återbetalas
 BillShortStatusConverted=Betald
 BillShortStatusCanceled=Övergiven
-BillShortStatusValidated=Validerad
+BillShortStatusValidated=Bekräftat
 BillShortStatusStarted=Började
 BillShortStatusNotPaid=Inte betalas
 BillShortStatusNotRefunded=Icke återbetalad
 BillShortStatusClosedUnpaid=Stängt
 BillShortStatusClosedPaidPartially=Betald (delvis)
-PaymentStatusToValidShort=För att validera
+PaymentStatusToValidShort=Att bekräfta
 ErrorVATIntraNotConfigured=Inom gemenskapen momsnummer ej definierat ännu
 ErrorNoPaiementModeConfigured=Ingen standardbetaltyp definierad. Gå till Inställningar för fakturamodul för att åtgärda detta.
 ErrorCreateBankAccount=Skapa ett bankkonto och gå till Inställningspanelen i Faktura-modulen för att definiera betalningstyper
 ErrorBillNotFound=Faktura %s finns inte
-ErrorInvoiceAlreadyReplaced=Fel, du försökte validera en faktura för att ersätta faktura %s. Men den här har redan ersatts av faktura %s.
+ErrorInvoiceAlreadyReplaced=Fel, du försökte bekräfta en faktura för att ersätta faktura %s. Men den här har redan ersatts av faktura %s.
 ErrorDiscountAlreadyUsed=Fel, rabatt som redan används
 ErrorInvoiceAvoirMustBeNegative=Fel, måste korrigera fakturan ett negativt belopp
 ErrorInvoiceOfThisTypeMustBePositive=Fel, skall denna typ av faktura har ett positivt belopp
@@ -174,11 +175,11 @@ CustomersDraftInvoices=Kundutkast fakturor
 SuppliersDraftInvoices=Leverantörsförslag fakturor
 Unpaid=Obetalda
 ConfirmDeleteBill=Är du säker på att du vill ta bort denna faktura?
-ConfirmValidateBill=Är du säker på att du vill validera denna faktura med referens <b> %s </b>?
+ConfirmValidateBill=Är du säker på att du vill bekräfta denna faktura med referens <b> %s </b>?
 ConfirmUnvalidateBill=Är du säker på att du vill ändra faktura <b> %s </b> till utkastsstatus?
 ConfirmClassifyPaidBill=Är du säker på att du vill ändra faktura <b> %s </b> till betalad status?
 ConfirmCancelBill=Är du säker på att du vill avbryta faktura <b> %s </b>?
-ConfirmCancelBillQuestion=Varför vill du klassificera denna faktura "övergiven"?
+ConfirmCancelBillQuestion=Varför vill du märka denna faktura "övergiven"?
 ConfirmClassifyPaidPartially=Är du säker på att du vill ändra faktura <b> %s </b> till betalad status?
 ConfirmClassifyPaidPartiallyQuestion=Denna faktura har inte betalats helt. Vad är anledningen till att denna faktura stängs?
 ConfirmClassifyPaidPartiallyReasonAvoir=Återstående obetald <b> (%s %s) </b> är en rabatt beviljad eftersom betalningen gjordes före termin. Jag regulariserar momsen med en kreditnot.
@@ -198,9 +199,9 @@ ConfirmClassifyAbandonReasonOther=Andra
 ConfirmClassifyAbandonReasonOtherDesc=Detta val kommer att användas i alla andra fall. Till exempel därför att du planerar att skapa en ersättning faktura.
 ConfirmCustomerPayment=Bekräftar du denna betalningsinmatning för <b> %s </b> %s?
 ConfirmSupplierPayment=Bekräftar du denna betalningsinmatning för <b> %s </b> %s?
-ConfirmValidatePayment=Är du säker på att du vill validera denna betalning? Ingen ändring kan göras när betalningen är validerad.
-ValidateBill=Validera faktura
-UnvalidateBill=Ovaliderade faktura
+ConfirmValidatePayment=Är du säker på att du vill bekräfta denna betalning? Ingen ändring kan göras när betalningen är bekräftat.
+ValidateBill=Bekräfta faktura
+UnvalidateBill=Märk faktura -> utkast
 NumberOfBills=Antal fakturor
 NumberOfBillsByMonth=Antal fakturor per månad
 AmountOfBills=Belopp för fakturor
@@ -246,7 +247,7 @@ DateMaxPayment=Betalning på grund av
 DateInvoice=Fakturadatum
 DatePointOfTax=Skattpunkt
 NoInvoice=Ingen faktura
-ClassifyBill=Klassificera faktura
+ClassifyBill=Märk faktura
 SupplierBillsToPay=Obetalda leverantörsfakturor
 CustomerBillsUnpaid=Obetalda kundfakturor
 NonPercuRecuperable=Icke återvinningsbara
@@ -291,8 +292,8 @@ DiscountFromCreditNote=Rabatt från kreditnota %s
 DiscountFromDeposit=Handpenninginsatser från faktura %s
 DiscountFromExcessReceived=Betalningar som överstiger faktura %s
 DiscountFromExcessPaid=Betalningar som överstiger faktura %s
-AbsoluteDiscountUse=Denna typ av krediter kan användas på fakturan innan validering
-CreditNoteDepositUse=Faktura måste valideras för att använda denna typ av krediter
+AbsoluteDiscountUse=Denna typ av krediter kan användas på fakturan innan bekräftande
+CreditNoteDepositUse=Faktura måste bekräftas för att använda denna typ av krediter
 NewGlobalDiscount=Ny fix rabatt
 NewRelativeDiscount=Nya relativa rabatt
 DiscountType=Rabatttyp
@@ -362,10 +363,11 @@ MaxPeriodNumber=Max. Antal fakturahantering
 NbOfGenerationDone=Antal fakturahantering redan gjort
 NbOfGenerationDoneShort=Antal generationer gjort
 MaxGenerationReached=Maximalt antal generationer som uppnåtts
-InvoiceAutoValidate=Validera fakturor automatiskt
+InvoiceAutoValidate=Bekräfta fakturor automatiskt
 GeneratedFromRecurringInvoice=Genererad från mall återkommande faktura %s
 DateIsNotEnough=Datum uppnått ännu inte
 InvoiceGeneratedFromTemplate=Faktura %s genererad från återkommande mallfaktura %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Varning, fakturadatumet är högre än aktuellt datum
 WarningInvoiceDateTooFarInFuture=Varning, fakturadatumet är för långt från det aktuella datumet
 ViewAvailableGlobalDiscounts=Visa lediga rabatter
@@ -470,18 +472,18 @@ UsBillingContactAsIncoiveRecipientIfExist=Använd kontakt / adress med typ "fakt
 ShowUnpaidAll=Visa alla obetalda fakturor
 ShowUnpaidLateOnly=Visa sent obetald faktura endast
 PaymentInvoiceRef=Betalning faktura %s
-ValidateInvoice=Validera faktura
+ValidateInvoice=Bekräfta faktura
 ValidateInvoices=Bekräfta fakturor
 Cash=Kontanter
 Reported=Försenad
 DisabledBecausePayments=Inte möjlig eftersom det inte finns några betalningar
-CantRemovePaymentWithOneInvoicePaid=Kan inte ta bort betalning eftersom det inte finns åtminstone på fakturan klassificeras betalt
+CantRemovePaymentWithOneInvoicePaid=Kan inte ta bort betalning eftersom det finns minst en faktura märkt som betalt
 ExpectedToPay=Förväntad utbetalning
 CantRemoveConciliatedPayment=Det går inte att ta bort avstämd betalning
 PayedByThisPayment=Betalas av denna betalning
-ClosePaidInvoicesAutomatically=Klassificera "Betald" alla standard-, betalnings- eller ersättningsfakturor helt betalade.
+ClosePaidInvoicesAutomatically=Märk "Betald" alla standard-, betalnings- eller ersättningsfakturor helt betalade.
 ClosePaidCreditNotesAutomatically=Beteckna "Betalda" alla fullständigt återbetalda kreditnotor.
-ClosePaidContributionsAutomatically=Klassificera "Betald" alla sociala eller skattemässiga avgifter helt betalade.
+ClosePaidContributionsAutomatically=Märk "Betald" alla sociala eller skattemässiga avgifter helt betalade.
 AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återbetalning kommer automatiskt att stängas med status "Betald".
 ToMakePayment=Betala
 ToMakePaymentBack=Återbetala
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
index 3503a751b2a..d2fbafb545e 100644
--- a/htdocs/langs/sv_SE/cashdesk.lang
+++ b/htdocs/langs/sv_SE/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Grupp moms enligt sats i biljetter
 AutoPrintTickets=Skriv ut biljetter automatiskt
 EnableBarOrRestaurantFeatures=Aktivera funktioner för bar eller restaurang
 ConfirmDeletionOfThisPOSSale=Bekräftar du att du har raderat den aktuella försäljningen?
+History=Historia
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 1007aeb8bda..c1db9089a98 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -6,17 +6,17 @@ OptionMode=Alternativ för bokföring
 OptionModeTrue=Alternativ Input-Output
 OptionModeVirtual=Alternativ Credits-Utdebitering
 OptionModeTrueDesc=I detta sammanhang skall omsättningen beräknas över utbetalningar (datum för betalningar). \\ NDet giltighet siffror endast kan uppnås om den bokföring granskas genom input / output på konton via fakturor.
-OptionModeVirtualDesc=I detta sammanhang skall omsättningen beräknas på fakturor (datum för godkännandet). När dessa fakturor betalas, om de har betalats eller inte, de är förtecknade i omsättning produktionen.
+OptionModeVirtualDesc=I detta sammanhang skall omsättningen beräknas på fakturor (datum för bekräftandet). När dessa fakturor betalas, om de har betalats eller inte, de är förtecknade i omsättning produktionen.
 FeatureIsSupportedInInOutModeOnly=Funktionen bara tillgänglig i PROV-FORDRINGAR bokförings-läge (Se redovisning modul konfiguration)
-VATReportBuildWithOptionDefinedInModule=Belopp som anges här beräknas enligt regler som fastställts av Skatteverket modul setup.
+VATReportBuildWithOptionDefinedInModule=Belopp som anges här beräknas enligt regler som fastställts av Skatteverket modul inställning.
 LTReportBuildWithOptionDefinedInModule=Belopp som visas här är beräknade med hjälp av regler som fastställts av bolagets inställning.
-Param=Setup
+Param=Inställningar
 RemainingAmountPayment=Återstående belopp:
 Account=Konto
 Accountparent=Moderkonto
 Accountsparent=Moderkonton
 Income=Inkomst
-Outcome=Expense
+Outcome=Utlägg
 MenuReportInOut=Intäkter / kostnader
 ReportInOut=Inkomst- och utgiftsbalans
 ReportTurnover=Omsättning fakturerad
@@ -80,7 +80,6 @@ AddSocialContribution=Lägg till social / skattemässig skatt
 ContributionsToPay=Sociala / skattemässiga skatter att betala
 AccountancyTreasuryArea=Fakturering och betalningsområde
 NewPayment=Ny betalning
-Payments=Betalningar
 PaymentCustomerInvoice=Kundfaktura betalning
 PaymentSupplierInvoice=leverantörsfaktura betalning
 PaymentSocialContribution=Sociala och skattemässiga betalningar
@@ -134,15 +133,15 @@ NoWaitingChecks=Inga kontroller väntar på insättning.
 DateChequeReceived=Kontrollera datum mottagning ingång
 NbOfCheques=Antal kontroller
 PaySocialContribution=Betala en social / skattemässig skatt
-ConfirmPaySocialContribution=Är du säker på att du vill klassificera denna sociala eller skattemässiga skatt som betalad?
+ConfirmPaySocialContribution=Är du säker på att du vill märka denna sociala eller skattemässiga skatt som betalad?
 DeleteSocialContribution=Ta bort en social eller skattemässig skattebetalning
 ConfirmDeleteSocialContribution=Är du säker på att du vill ta bort denna sociala / skattemässiga skattebetalning?
 ExportDataset_tax_1=Sociala och skattemässiga skatter och betalningar
 CalcModeVATDebt=<b>Läge% svat på redovisning engagemang% s.</b>
 CalcModeVATEngagement=<b>Läge% svat på inkomster-utgifter% s.</b>
-CalcModeDebt=Analys av kända inspelade fakturor, även om de ännu inte redovisas i huvudbok.
-CalcModeEngagement=Analys av kända registrerade betalningar, även om de ännu inte är redovisade i Ledger.
-CalcModeBookkeeping=Analys av data journaliserad i bokföringsbokföringsbordet.
+CalcModeDebt=Analys av kända inspelade fakturor, även om de ännu inte redovisas i huvudboken.
+CalcModeEngagement=Analys av kända registrerade betalningar, även om de ännu inte är redovisade i huvudboken.
+CalcModeBookkeeping=Analys av data bokförd i huvudboken.
 CalcModeLT1= <b>Läge% SRE på kundfakturor - leverantörerna fakturerar% s</b>
 CalcModeLT1Debt=<b>Läge% SRE på kundfakturor% s</b>
 CalcModeLT1Rec= <b>Läge% SRE på leverantörerna fakturerar% s</b>
@@ -153,19 +152,19 @@ AnnualSummaryDueDebtMode=Överskott av intäkter och kostnader, årliga sammanfa
 AnnualSummaryInputOutputMode=Överskott av intäkter och kostnader, årliga sammanfattande
 AnnualByCompanies=Inkomst- och utgiftsbalans, enligt fördefinierade konton
 AnnualByCompaniesDueDebtMode=Balans av intäkter och kostnader, detalj av fördefinierade grupper, läge <b> %sClaims-Debts%s </b> sa <b> Åtagandebetalning </b>.
-AnnualByCompaniesInputOutputMode=Balans av intäkter och kostnader, detalj av fördefinierade grupper, läge <b> %sIncomes-Expenses%s </b> sa <b> kontonräkning </b>.
-SeeReportInInputOutputMode=Se %sanalys av payments%s för en beräkning av faktiska betalningar som gjorts även om de ännu inte är redovisade i Ledger.
-SeeReportInDueDebtMode=Se %sanalys av fakturor%s för en beräkning baserad på kända inspelade fakturor, även om de ännu inte är redovisade i Ledger.
-SeeReportInBookkeepingMode=Se <b> %sBookeeping report%s </b> för en beräkning på <b> Bokföring Ledger tabell </b>
+AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
+SeeReportInInputOutputMode=Se %sanalys av payments%s för en beräkning av faktiska betalningar som gjorts även om de ännu inte är redovisade i huvudboken.
+SeeReportInDueDebtMode=Se %sanalys av fakturor%s för en beräkning baserad på kända inspelade fakturor, även om de ännu inte är redovisade i huvudboken.
+SeeReportInBookkeepingMode=Se <b> %sBokföringsrapport%s </b> för en beräkning på <b> Bokföring huvudboken tabell </b>
 RulesAmountWithTaxIncluded=- Belopp som visas är med alla skatter inkluderade
-RulesResultDue=- Det inkluderar utestående fakturor, utgifter, moms, donationer om de betalas eller inte. Ingår även betalda löner. <br> - Det baseras på valideringsdatum för fakturor och moms och på förfallodagen för utgifter. För löner som definieras med lönemodul används värdet för betalningen.
+RulesResultDue=- Det inkluderar utestående fakturor, utgifter, moms, donationer om de betalas eller inte. Ingår även betalda löner. <br> - Det baseras på datum för bekräftande för fakturor och moms och på förfallodagen för utgifter. För löner som definieras med lönemodul används värdet för betalningen.
 RulesResultInOut=- Det inkluderar de reala betalningarna på fakturor, utgifter, moms och löner. <br> - Det baseras på fakturadatum för fakturor, utgifter, moms och löner. Donationsdatum för donation.
-RulesCADue=- Det inkluderar kundens fakturaer om de betalas eller inte. <br> - Det baseras på valideringsdatumet för dessa fakturor. <br>
+RulesCADue=- Det inkluderar kundens fakturaer om de betalas eller inte. <br> - Det baseras på bekräftandesdatumet för dessa fakturor. <br>
 RulesCAIn=- Det inkluderar alla effektiva betalningar av fakturor som mottagits från kunder. <br> - Det är baserat på betalningsdatum för dessa fakturor <br>
-RulesCATotalSaleJournal=Den innehåller alla kreditlinjer från försäljningsjournalen.
-RulesAmountOnInOutBookkeepingRecord=Det innehåller post i din Ledger med bokföringskonto som har gruppen "EXPENSE" eller "INCOME"
-RulesResultBookkeepingPredefined=Det innehåller post i din Ledger med bokföringskonto som har gruppen "EXPENSE" eller "INCOME"
-RulesResultBookkeepingPersonalized=Det visar rekord i din Ledger med bokföringskonton <b> grupperad av personliga grupper </b>
+RulesCATotalSaleJournal=Den innehåller alla kreditlinjer från försäljningsloggboken.
+RulesAmountOnInOutBookkeepingRecord=Det innehåller post i din huvudboken med bokföringskonto som har gruppen "EXPENSE" eller "INCOME"
+RulesResultBookkeepingPredefined=Det innehåller post i din huvudboken med bokföringskonto som har gruppen "EXPENSE" eller "INCOME"
+RulesResultBookkeepingPersonalized=Det visar rekord i din huvudboken med bokföringskonton <b> grupperad av personliga grupper </b>
 SeePageForSetup=Se meny <a href="%s"> %s </a> för installation
 DepositsAreNotIncluded=- Betalningsfakturor ingår ej
 DepositsAreIncluded=- Betalningsfakturor ingår
@@ -201,11 +200,10 @@ Dispatch=Inmatningsordning
 Dispatched=Sänds
 ToDispatch=Avsändandet
 ThirdPartyMustBeEditAsCustomer=Tredje part skall definieras som en kund
-SellsJournal=Försäljning Journal
-PurchasesJournal=Inköp Journal
-DescSellsJournal=Försäljning Journal
-DescPurchasesJournal=Inköp Journal
-InvoiceRef=Faktura ref.
+SellsJournal=Försäljningsloggbok
+PurchasesJournal=Inköpsloggbok
+DescSellsJournal=Försäljningsloggbok
+DescPurchasesJournal=Inköpsloggbok
 CodeNotDef=Inte definierad
 WarningDepositsNotIncluded=Nedbetalningsfakturor ingår inte i den här versionen med denna bokföringsmodul.
 DatePaymentTermCantBeLowerThanObjectDate=Betalning sikt datum kan inte vara lägre än objektdatum.
@@ -215,7 +213,7 @@ Pcg_subtype=Pcg subtyp
 InvoiceLinesToDispatch=Faktura linjer avsändandet
 ByProductsAndServices=Efter produkt och service
 RefExt=Extern ref
-ToCreateAPredefinedInvoice=För att skapa en mallfaktura, skapa en standardfaktura, och utan att validera den, klicka på knappen "%s".
+ToCreateAPredefinedInvoice=För att skapa en mallfaktura, skapa en standardfaktura, och utan att bekräfta den, klicka på knappen "%s".
 LinkedOrder=Länk för att beställa
 Mode1=Metod 1
 Mode2=Metod 2
@@ -224,14 +222,14 @@ CalculationRuleDescSupplier=Enligt leverantören väljer du lämplig metod för
 TurnoverPerProductInCommitmentAccountingNotRelevant=Rapporten om omsättning som samlats per produkt är inte tillgänglig. Denna rapport är endast tillgänglig för fakturering av omsättning.
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Rapporten om omsättning samlad per försäljningsskattesats är inte tillgänglig. Denna rapport är endast tillgänglig för fakturering av omsättning.
 CalculationMode=Beräkning läge
-AccountancyJournal=Redovisningskodjournalen
+AccountancyJournal=Redovisningskodsloggbok
 ACCOUNTING_VAT_SOLD_ACCOUNT=Bokföringskonto som standard för moms på försäljning (används om den inte är definierad i momsordlista)
 ACCOUNTING_VAT_BUY_ACCOUNT=Bokföringskonto som standard för moms vid köp (används om det inte är definierat i inställningen för momsordlista)
 ACCOUNTING_VAT_PAY_ACCOUNT=Bokföringskonto som standard för att betala moms
 ACCOUNTING_ACCOUNT_CUSTOMER=Redovisningskonto som används för kundens tredje part
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Det dedikerade bokföringskontot som definieras på tredje partskort kommer endast att användas för Subledger-bokföring. Den här kommer att användas till huvudbokföring och som standardvärde för underledare redovisning om dedikat kundkonto konto på tredje part inte är definierat.
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Det dedikerade bokföringskontot som definieras på tredjepartskort kommer endast att användas för Subledger-bokföring. Den här kommer att användas till huvudbokföring och som standardvärde för Subledger-redovisning om en dedikerad kundkonto på tredjeparten inte är definierat.
 ACCOUNTING_ACCOUNT_SUPPLIER=Redovisningskonto som används för leverantörs tredje part
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Det dedikerade bokföringskontot som definieras på tredje partskort kommer endast att användas för Subledger-bokföring. Den här kommer att användas för Allmän Ledge och som standardvärde för Subledger-bokföring om dedikerad leverantörsredovisningskonto på tredje part inte är definierad.
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Det dedikerade bokföringskontot som definieras på tredje partskort kommer endast att användas för Subledger-bokföring. Den här kommer att användas för huvudboken och som standardvärde för Subledger-bokföring om en dedikerad leverantörsredovisningskonto på tredjeparten inte är definierad.
 ConfirmCloneTax=Bekräfta klon av en social / skattemässig skatt
 CloneTaxForNextMonth=Klona det för nästa månad
 SimpleReport=Enkel rapport
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 47e1bdc422b..8be0a0461f0 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -3,7 +3,7 @@
 # No errors
 NoErrorCommitIsDone=Inget fel
 # Errors
-ErrorButCommitIsDone=Fel hittades men vi validera trots detta
+ErrorButCommitIsDone=Fel hittades men vi bekräfta trots detta
 ErrorBadEMail=E-post %s är fel
 ErrorBadUrl=Url %s är fel
 ErrorBadValueForParamNotAString=Dåligt värde för din parameter. Det lägger till i allmänhet när översättning saknas.
@@ -47,7 +47,7 @@ ErrorFieldsRequired=Vissa obligatoriska fält inte fylls.
 ErrorSubjectIsRequired=E-postämnet krävs
 ErrorFailedToCreateDir=Misslyckades med att skapa en katalog. Kontrollera att webbservern användaren har rättigheter att skriva till Dolibarr dokument katalogen. Om parametern <b>safe_mode</b> är aktiv på PHP, kontrollera att Dolibarr php-filer äger till webbserver användare (eller grupp).
 ErrorNoMailDefinedForThisUser=Ingen post definierats för denna användare
-ErrorFeatureNeedJavascript=Denna funktion måste ha Javascript vara aktiverat för att arbeta. Ändra detta i setup - displayen.
+ErrorFeatureNeedJavascript=Denna funktion måste ha Javascript vara aktiverat för att arbeta. Ändra detta i inställning - displayen.
 ErrorTopMenuMustHaveAParentWithId0=En meny av typen &quot;Top&quot; kan inte ha en förälder meny. Sätt 0 i överordnade menyn eller välja en meny av typen &quot;Vänster&quot;.
 ErrorLeftMenuMustHaveAParentId=En meny av typen &quot;Vänster&quot; måste ha en förälder id.
 ErrorFileNotFound=Arkiv <b>%s</b> inte hittas (Bad väg, fel behörigheter eller åtkomst nekad av PHP openbasedir eller safe_mode parameter)
@@ -82,31 +82,31 @@ ErrorModuleRequireJavascript=Javascript måste inte avaktiveras att ha denna fun
 ErrorPasswordsMustMatch=Båda skrivit lösenord måste matcha varandra
 ErrorContactEMail=Ett tekniskt fel uppstod. Vänligen kontakta administratören till följande email <b> %s </b> och ge felkoden <b> %s </b> i ditt meddelande, eller lägg till en skärmkopia av den här sidan.
 ErrorWrongValueForField=Fält <b> %s </b>: '<b> %s </b>' överensstämmer inte med regexregeln <b> %s </b>
-ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
-ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
-ErrorsOnXLines=%s errors found
-ErrorFileIsInfectedWithAVirus=Antivirusprogrammet inte har kunnat validera (fil kan vara smittade av ett virus)
+ErrorFieldValueNotIn=Fält <b> %s </b>: '<b> %s </b>' är inte ett värde som finns i fält <b> %s </b> av <b> %s </b>
+ErrorFieldRefNotIn=Fält <b> %s </b>: '<b> %s </b>' är inte en <b> %s </b> existerande referens
+ErrorsOnXLines=%s hittade fel
+ErrorFileIsInfectedWithAVirus=Antivirusprogrammet inte har kunnat bekräfta (fil kan vara smittade av ett virus)
 ErrorSpecialCharNotAllowedForField=Speciella tecken är inte tillåtna för användning i fält &quot;%s&quot;
 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=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.
+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.
 ErrorBadMask=Fel på masken
 ErrorBadMaskFailedToLocatePosOfSequence=Fel, mask utan löpnummer
 ErrorBadMaskBadRazMonth=Fel, dåligt återställningsvärde
-ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorMaxNumberReachForThisMask=Maximalt antal uppnådda för denna mask
+ErrorCounterMustHaveMoreThan3Digits=Räknaren måste ha mer än 3 siffror
 ErrorSelectAtLeastOne=Error. Välj minst en post.
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorDeleteNotPossibleLineIsConsolidated=Radera inte möjligt eftersom posten är kopplad till en banktransaktion som försonas
 ErrorProdIdAlreadyExist=%s tilldelas ett annat tredje
 ErrorFailedToSendPassword=Misslyckades med att skicka lösenord
 ErrorFailedToLoadRSSFile=Inte få RSS-flöde. Försök att lägga konstant MAIN_SIMPLEXMLLOAD_DEBUG Om felmeddelanden inte ger tillräckligt med information.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden=Tillträde beviljas ej. <br> Du försöker komma åt en sida, ett område eller en funktion av en inaktiverad modul eller utan att vara i en autentiserad session eller det är inte tillåtet för din användare.
 ErrorForbidden2=Tillstånd för den här inloggningen kan definieras av din Dolibarr administratör från menyn %s-> %s.
-ErrorForbidden3=Det verkar som Dolibarr inte används genom en bestyrkt session. Ta en titt på Dolibarr setup dokumentation för att veta hur man ska hantera verifieringar (htaccess, mod_auth eller andra ...).
+ErrorForbidden3=Det verkar som Dolibarr inte används genom en bestyrkt session. Ta en titt på Dolibarr inställning dokumentation för att veta hur man ska hantera verifieringar (htaccess, mod_auth eller andra ...).
 ErrorNoImagickReadimage=Funktion imagick_readimage finns inte i denna PHP. Ingen förhandsgranskning kan vara tillgängliga. Administratörer kan inaktivera den här fliken från menyn Setup - Display.
 ErrorRecordAlreadyExists=Record finns redan
-ErrorLabelAlreadyExists=This label already exists
+ErrorLabelAlreadyExists=Denna etikett finns redan
 ErrorCantReadFile=Misslyckades med att läsa filen &quot;%s&quot;
 ErrorCantReadDir=Misslyckades att läsa katalogen &quot;%s&quot;
 ErrorBadLoginPassword=Felaktigt värde för inloggning eller lösenord
@@ -117,31 +117,31 @@ ErrorLoginDoesNotExists=Användaren med inloggning <b>%s</b> kunde inte hittas.
 ErrorLoginHasNoEmail=Denna användare har inga e-postadress. Process avbruten.
 ErrorBadValueForCode=Dåligt värde typer för kod. Försök igen med ett nytt värde ...
 ErrorBothFieldCantBeNegative=Fält %s och %s kan inte vara både negativt
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Fält <strong> %s </strong> kan inte vara negativt på denna typ av faktura. Om du vill lägga till en rabattlinje, skapa bara rabatten först med länken %s på skärmen och använd den på fakturan. Du kan också be din administratör om att ange alternativet FACTURE_ENABLE_NEGATIVE_LINES till 1 för att tillåta det gamla beteendet.
 ErrorQtyForCustomerInvoiceCantBeNegative=Kvantitet för linje i kundfakturor kan inte vara negativt
 ErrorWebServerUserHasNotPermission=Användarkonto <b>%s</b> användas för att exekvera webbserver har ingen behörighet för den
 ErrorNoActivatedBarcode=Ingen streckkod typ aktiveras
 ErrUnzipFails=Det gick inte att packa upp %s med ZipArchive
-ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
+ErrNoZipEngine=Ingen motor att zip / unzip %s fil i detta PHP
 ErrorFileMustBeADolibarrPackage=Filen %s måste vara ett Dolibarr zip-paket
-ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorModuleFileRequired=Du måste välja en Dolibarr-modulpaketfil
 ErrorPhpCurlNotInstalled=PHP CURL är inte installerat, detta är viktigt för att prata med Paypal
 ErrorFailedToAddToMailmanList=Det gick inte att lägga till post %s till Mailman listan %s eller SPIP bas
 ErrorFailedToRemoveToMailmanList=Det gick inte att ta bort posten %s till Mailman listan %s eller SPIP bas
 ErrorNewValueCantMatchOldValue=Nytt värde kan inte vara lika med gamla
 ErrorFailedToValidatePasswordReset=Det gick inte att REINIT lösenord. Kan vara reinit var redan gjort (den här länken kan bara användas en gång). Om inte, försök att starta om reinit processen.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorToConnectToMysqlCheckInstance=Anslut till databasen misslyckas. Kontrollera databaseserveren körs (till exempel med mysql / mariadb kan du starta det från kommandoraden med "sudo service mysql start").
 ErrorFailedToAddContact=Det gick inte att lägga till kontakt
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=Datumet kan inte vara större än idag
 ErrorPaymentModeDefinedToWithoutSetup=Ett betalningsläge var inställt för att skriva %s, men installationen av modulens faktura fördes inte att definiera informationen som ska visas för den här betalningsläget.
 ErrorPHPNeedModule=Fel, din PHP måste ha modul <b>%s</b> installerad för att använda den här funktionen.
 ErrorOpenIDSetupNotComplete=Du inställning för Dolibarr konfigurationsfil möjliggör OpenID autentisering, men webbadressen OpenID tjänsten definieras inte i ständig %s
 ErrorWarehouseMustDiffers=Källa och mål lager måste skiljer
 ErrorBadFormat=Dåligt format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fel, den här medlemmen är inte länkad till någon tredje part. Länk medlem till en befintlig tredje part eller skapa en ny tredje part innan du skapar prenumeration med faktura.
 ErrorThereIsSomeDeliveries=Fel, det finns några leveranser kopplade till denna sändning. Radering vägrade.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
+ErrorCantDeletePaymentReconciliated=Det går inte att ta bort en betalning som hade genererat en bankpost som försonades
+ErrorCantDeletePaymentSharedWithPayedInvoice=Det går inte att ta bort en betalning som delas av minst en faktura med status Betald
 ErrorPriceExpression1=Kan inte tilldela till konstant '%s'
 ErrorPriceExpression2=Kan inte omdefiniera inbyggd funktion %s
 ErrorPriceExpression3=Odefinierad variabel '%s' i funktionsdefinition
@@ -150,7 +150,7 @@ ErrorPriceExpression5=Oväntad '%s'
 ErrorPriceExpression6=Fel antal argument (%s givet, %s förväntades)
 ErrorPriceExpression8=Oväntad operatör '%s'
 ErrorPriceExpression9=Ett oväntat fel uppstod
-ErrorPriceExpression10=Operator '%s' lacks operand
+ErrorPriceExpression10=Operatören '%s' saknar operand
 ErrorPriceExpression11=Förväntar '%s'
 ErrorPriceExpression14=Division med noll
 ErrorPriceExpression17=Odefinierad variabel '%s'
@@ -158,86 +158,87 @@ ErrorPriceExpression19=Expression hittades inte
 ErrorPriceExpression20=Tomma uttryck
 ErrorPriceExpression21=Tomt resultat '%s'
 ErrorPriceExpression22=Negativt resultat '%s'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpression23=Okänd eller icke-inställd variabel '%s' i %s
+ErrorPriceExpression24=Variabel '%s' existerar men har inget värde
 ErrorPriceExpressionInternal=Internt fel '%s'
 ErrorPriceExpressionUnknown=Okänt fel '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Källa och mål lager måste skiljer
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
-ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
-ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
-ErrorGlobalVariableUpdater2=Missing parameter '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
-ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
-ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
-ErrorSavingChanges=An error has occurred when saving the changes
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
-ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
-ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
-ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
-ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
-ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
-ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
-ErrorNoWarehouseDefined=Error, no warehouses defined.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
-ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
-ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
-ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
-ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
-ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
-ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
-ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
-ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
-ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
-ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
-ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorTryToMakeMoveOnProductRequiringBatchData=Fel, försök att göra en lagerrörelse utan mycket / seriell information, på produkt '%s' som kräver mycket / seriell information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Alla inspelade mottagningar måste först verifieras (godkänd eller nekad) innan du får göra den här åtgärden
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Alla inspelade mottagningar måste först verifieras (godkända) innan de får göra den här åtgärden
+ErrorGlobalVariableUpdater0=HTTP-förfrågan misslyckades med felet '%s'
+ErrorGlobalVariableUpdater1=Ogiltigt JSON-format '%s'
+ErrorGlobalVariableUpdater2=Saknad parameter '%s'
+ErrorGlobalVariableUpdater3=De begärda uppgifterna hittades inte i resultatet
+ErrorGlobalVariableUpdater4=SOAP-klienten misslyckades med felet '%s'
+ErrorGlobalVariableUpdater5=Ingen global variabel vald
+ErrorFieldMustBeANumeric=Fält <b> %s </b> måste vara ett numeriskt värde
+ErrorMandatoryParametersNotProvided=Obligatoriska parametrar som inte tillhandahålls
+ErrorOppStatusRequiredIfAmount=Du anger en beräknad summa för den här ledningen. Så du måste också ange statusen.
+ErrorFailedToLoadModuleDescriptorForXXX=Misslyckades att ladda moduldoktorarklass för %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Dålig definition av menyfältet i modulbeskrivaren (dåligt värde för nyckelfk_menu)
+ErrorSavingChanges=Ett fel har uppstått när ändringarna sparas
+ErrorWarehouseRequiredIntoShipmentLine=Lager krävs på linjen att skicka
+ErrorFileMustHaveFormat=Filen måste ha format %s
+ErrorSupplierCountryIsNotDefined=Land för den här försäljaren är inte definierad. Korrigera detta först.
+ErrorsThirdpartyMerge=Misslyckades att slå samman de två dokumenten. Förfrågan avbruten.
+ErrorStockIsNotEnoughToAddProductOnOrder=Lager är inte tillräckligt för produkt %s för att lägga till det i en ny order.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Lager är inte tillräckligt för produkt %s för att lägga till det i en ny faktura.
+ErrorStockIsNotEnoughToAddProductOnShipment=Lager är inte tillräckligt för produkten %s för att lägga till den i en ny leverans.
+ErrorStockIsNotEnoughToAddProductOnProposal=Lager räcker inte för produkt %s för att lägga till det i ett nytt förslag.
+ErrorFailedToLoadLoginFileForMode=Misslyckades med att få inloggningsnyckeln för läge '%s'.
+ErrorModuleNotFound=Filen av modulen kunde inte hittas.
+ErrorFieldAccountNotDefinedForBankLine=Värde för bokföringskonto ej definierat för källlinjens id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Värde för bokföringskonto ej definierat för faktura id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Värde för bokföringskonto inte definierat för linjen (%s)
+ErrorBankStatementNameMustFollowRegex=Fel, kontoutdragsnamn måste följa följande syntaxregel %s
+ErrorPhpMailDelivery=Kontrollera att du inte använder ett för stort antal mottagare och att ditt e-postinnehåll inte liknar ett skräppost. Be också din administratör att kontrollera brandvägg och serverns loggfiler för en mer fullständig information.
+ErrorUserNotAssignedToTask=Användaren måste tilldelas uppgiften för att kunna ange tidskrävande.
+ErrorTaskAlreadyAssigned=Uppgift som redan tilldelats användaren
+ErrorModuleFileSeemsToHaveAWrongFormat=Modulpaketet verkar ha fel format.
+ErrorFilenameDosNotMatchDolibarrPackageRules=Namnet på modulpaketet (<strong> %s </strong>) matchar inte förväntat namnsyntax: <strong> %s </strong>
+ErrorDuplicateTrigger=Fel, duplicera utlösarens namn %s. Redan laddad från %s.
+ErrorNoWarehouseDefined=Fel, inga lager definierade.
+ErrorBadLinkSourceSetButBadValueForRef=Länken du använder är inte giltig. En "källa" för betalning definieras, men värdet för "ref" är inte giltigt.
+ErrorTooManyErrorsProcessStopped=För många fel. Processen stoppades.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Massbekräftande är inte möjlig när alternativet för att öka / minska lagret är inställt på denna åtgärd (du måste bekräfta en efter en så att du kan definiera lagret för att öka / minska)
+ErrorObjectMustHaveStatusDraftToBeValidated=Objekt %s måste ha status "Draft" som ska bekräftas.
+ErrorObjectMustHaveLinesToBeValidated=Objekt %s måste ha linjer som ska bekräftas.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Endast bekräftades fakturor kan skickas med massåtgärden "Skicka via e-post".
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=Du måste välja om artikeln är en fördefinierad produkt eller ej
+ErrorDiscountLargerThanRemainToPaySplitItBefore=Den rabatt du försöker att tillämpa är större än förblir att betala. Dela rabatten i 2 mindre rabatter före.
+ErrorFileNotFoundWithSharedLink=Filen hittades inte. Det kan hända att dela nyckeln ändrades eller filen togs bort nyligen.
+ErrorProductBarCodeAlreadyExists=Produktens streckkod %s finns redan på en annan produktreferens.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Observera också att det är inte möjligt att använda en virtuell produkt för automatisk ökning / minskning av underprodukt när minst en underprodukt (eller delprodukt av underprodukter) behöver ett serienummer / lotnummer.
+ErrorDescRequiredForFreeProductLines=Beskrivning är obligatorisk för linjer med fri produkt
+ErrorAPageWithThisNameOrAliasAlreadyExists=Sidan / behållaren <strong> %s </strong> har samma namn eller alternativ alias som den du försöker använda
+ErrorDuringChartLoad=Fel vid inmatning av kontoplan. Om några konton inte laddades, kan du fortfarande skriva in dem manuellt.
+ErrorBadSyntaxForParamKeyForContent=Dålig syntax för param keyforcontent. Måste ha ett värde som börjar med %s eller %s
+ErrorVariableKeyForContentMustBeSet=Fel, konstanten med namnet %s (med textinnehåll som ska visas) eller %s (med extern webbadress för att visa) måste ställas in.
+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
-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
+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
 WarningSafeModeOnCheckExecDir=Varning, PHP alternativ <b>safe_mode</b> är på så kommando måste stoppas in i en katalog som deklarerats av php parameter <b>safe_mode_exec_dir.</b>
 WarningBookmarkAlreadyExists=Ett bokmärke med denna avdelning eller detta mål (URL) finns redan.
 WarningPassIsEmpty=Varning, är databasen lösenord tom. Detta är ett säkerhetshål. Du bör lägga till ett lösenord till din databas och ändra din conf.php fil som återspeglar detta.
 WarningConfFileMustBeReadOnly=Varning, konfigurationsfilen <b>(htdocs / conf / conf.php)</b> kan din skrivas över av den webbserver. Detta är ett allvarligt säkerhetshål. Ändra behörigheter på fil för att vara i skrivskyddat läge för operativsystem som användare som används av webbservern. Om du använder Windows och FAT format för din disk, måste du veta att det här filsystemet inte är möjligt att lägga till behörigheter för filen, så kan inte vara helt säker.
 WarningsOnXLines=Varningar om <b>%s</b> källrader
-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).
+WarningNoDocumentModelActivated=Ingen modell, för dokumentgenerering, har aktiverats. En modell kommer att väljas som standard tills du kontrollerar din modulinställning.
+WarningLockFileDoesNotExists=Varning när installationen är klar måste du inaktivera installations- / migreringsverktygen genom att lägga till en fil <b> install.lock </b> i katalogen <b> %s </b>. Att undanröja skapandet av den här filen är en allvarlig säkerhetsrisk.
+WarningUntilDirRemoved=Alla säkerhetsvarningar (visas endast av administrativa användare) kommer att förbli aktiva så länge som sårbarheten är närvarande (eller den konstanta MAIN_REMOVE_INSTALL_WARNING läggs till i Setup-> Other Setup).
 WarningCloseAlways=Varning, är stängning göras även om beloppet varierar mellan källa och mål element. Aktivera den här funktionen med försiktighet.
 WarningUsingThisBoxSlowDown=Varning, använder denna ruta bromsa allvarligt alla sidor som visar lådan.
 WarningClickToDialUserSetupNotComplete=Inställning av ClickToDial informationen för ditt användarkonto är inte fullständiga (se fliken ClickToDial på din användarkortet).
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature inaktiveras när display inställning är optimerad för blinda personer eller textbaserade webbläsare.
 WarningPaymentDateLowerThanInvoiceDate=Betalningsdag (%s) är tidigare än fakturadatum (%s) för faktura %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
-WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
-WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
-WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
-WarningProjectClosed=Project is closed. You must re-open it first.
+WarningTooManyDataPleaseUseMoreFilters=För många data (mer än %s linjer). Vänligen använd fler filter eller sätt konstanten %s till en högre gräns.
+WarningSomeLinesWithNullHourlyRate=En del gånger registrerades av vissa användare medan deras timpris inte definierades. Ett värde på 0 %s per timme användes men det kan leda till felaktig värdering av tiden.
+WarningYourLoginWasModifiedPleaseLogin=Din inloggning har ändrats. För säkerhetsändamål måste du logga in med din nya inloggning innan nästa åtgärd.
+WarningAnEntryAlreadyExistForTransKey=Det finns redan en post för översättningsnyckeln för det här språket
+WarningNumberOfRecipientIsRestrictedInMassAction=Varning, antalet olika mottagare är begränsat till <b> %s </b> vid användning av massåtgärder på listor
+WarningDateOfLineMustBeInExpenseReportRange=Varning, datumet för raden ligger inte inom kostnadsberäkningsområdet
+WarningProjectClosed=Projektet är stängt. Du måste öppna den först igen.
diff --git a/htdocs/langs/sv_SE/holiday.lang b/htdocs/langs/sv_SE/holiday.lang
index 6febb5c4d71..440418c2705 100644
--- a/htdocs/langs/sv_SE/holiday.lang
+++ b/htdocs/langs/sv_SE/holiday.lang
@@ -4,7 +4,7 @@ Holidays=Lämna
 CPTitreMenu=Lämna
 MenuReportMonth=Månatlig rapport
 MenuAddCP=Ny ledighetsansökan
-NotActiveModCP=You must enable the module Leave to view this page.
+NotActiveModCP=Du måste aktivera modulen Lämna för att se den här sidan.
 AddCP=Gör en förfrågan ledighet
 DateDebCP=Startdatum
 DateFinCP=Slutdatum
@@ -15,18 +15,18 @@ ApprovedCP=Godkänd
 CancelCP=Annullerad
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leave
-LeaveId=Leave ID
-ReviewedByCP=Will be approved by
-UserForApprovalID=User for approval ID
-UserForApprovalFirstname=First name of approval user
-UserForApprovalLastname=Last name of approval user
-UserForApprovalLogin=Login of approval user
+ListeCP=Förteckning över ledighet
+LeaveId=Lämna ID
+ReviewedByCP=Kommer att godkännas av
+UserForApprovalID=Användare för godkännande-ID
+UserForApprovalFirstname=Förnamn för godkännande användare
+UserForApprovalLastname=Efternamn för godkännandeanvändare
+UserForApprovalLogin=Inloggning av godkännande användaren
 DescCP=Beskrivning
 SendRequestCP=Skapa permission begäran
 DelayToRequestCP=Lämna begäran måste göras <b>minst %s dag (ar) </b> före dem.
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+MenuConfCP=Lönebalans
+SoldeCPUser=Lånebalansen är <b> %s </b> dagar.
 ErrorEndDateCP=Du måste välja ett slutdatum senare än startdatum.
 ErrorSQLCreateCP=Ett SQL-fel uppstod under skapandet:
 ErrorIDFicheCP=Ett fel har uppstått, inte existerar begäran ledighet.
@@ -35,14 +35,14 @@ ErrorUserViewCP=Du har inte behörighet att läsa denna ledighet begäran.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Begäran från
 TitreRequestCP=Lämna begäran
-TypeOfLeaveId=Type of leave ID
-TypeOfLeaveCode=Type of leave code
-TypeOfLeaveLabel=Type of leave label
+TypeOfLeaveId=Typ av ledighet ID
+TypeOfLeaveCode=Typ av ledighetskod
+TypeOfLeaveLabel=Typ av lämnad etikett
 NbUseDaysCP=Antal dagars semester konsumeras
-NbUseDaysCPShort=Days consumed
-NbUseDaysCPShortInMonth=Days consumed in month
-DateStartInMonth=Start date in month
-DateEndInMonth=End date in month
+NbUseDaysCPShort=Dagar konsumeras
+NbUseDaysCPShortInMonth=Dagar konsumeras i månaden
+DateStartInMonth=Startdatum i månaden
+DateEndInMonth=Slutdatum i månaden
 EditCP=Redigera
 DeleteCP=Ta bort
 ActionRefuseCP=Vägra
@@ -71,7 +71,7 @@ DateRefusCP=Datum för avslag
 DateCancelCP=Datum för annullering
 DefineEventUserCP=Tilldela en exceptionell ledighet för en användare
 addEventToUserCP=Tilldela ledighet
-NotTheAssignedApprover=You are not the assigned approver
+NotTheAssignedApprover=Du är inte den tilldelade godkännaren
 MotifCP=Reason
 UserCP=Användare
 ErrorAddEventToUserCP=Ett fel uppstod när den exceptionella ledighet.
@@ -85,45 +85,46 @@ NewSoldeCP=New Balance
 alreadyCPexist=En begäran ledigheten har redan gjorts på denna period.
 FirstDayOfHoliday=Första dagen på semestern
 LastDayOfHoliday=Sista dagen på semestern
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
+BoxTitleLastLeaveRequests=Senaste %s ändrade lämnar förfrågningar
 HolidaysMonthlyUpdate=Månads uppdatering
 ManualUpdate=Manuell uppdatering
 HolidaysCancelation=Lämna begäran Spärr
-EmployeeLastname=Employee last name
-EmployeeFirstname=Employee first name
-TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
-LastHolidays=Latest %s leave requests
-AllHolidays=All leave requests
-HalfDay=Half day
-NotTheAssignedApprover=You are not the assigned approver
-LEAVE_PAID=Paid vacation
-LEAVE_SICK=Sick leave
-LEAVE_OTHER=Other leave
-LEAVE_PAID_FR=Paid vacation
+EmployeeLastname=Medarbetare efternamn
+EmployeeFirstname=Medarbetare förnamn
+TypeWasDisabledOrRemoved=Avlastnings typ (id %s) var inaktiverad eller borttagen
+LastHolidays=Senaste %s lämnar förfrågningar
+AllHolidays=Alla lämnar förfrågningar
+HalfDay=Halv dag
+NotTheAssignedApprover=Du är inte den tilldelade godkännaren
+LEAVE_PAID=Betald semester
+LEAVE_SICK=Sjukskriven
+LEAVE_OTHER=Annan ledighet
+LEAVE_PAID_FR=Betald semester
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+LastUpdateCP=Senaste automatiska uppdateringen av ledighetstilldelning
+MonthOfLastMonthlyUpdate=Månad för senaste automatiska uppdateringen av ledighetstilldelning
 UpdateConfCPOK=Uppdaterats.
 Module27130Name= Hantering av ledighet förfrågningar
 Module27130Desc= Hantering av ledighet förfrågningar
 ErrorMailNotSend=Ett fel uppstod när du skickar e-post:
 NoticePeriod=Uppsägningstid
 #Messages
-HolidaysToValidate=Validera ledighets förfrågningar
-HolidaysToValidateBody=Nedan finns en ledighet begäran om att validera
+HolidaysToValidate=Bekräfta ledighets förfrågningar
+HolidaysToValidateBody=Nedan finns en ledighet begäran om att bekräfta
 HolidaysToValidateDelay=Denna ledighet begäran kommer att ske inom en period på mindre än %s dagar.
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
-HolidaysValidated=Validerade ledighets förfrågningar
-HolidaysValidatedBody=Din ledighets begäran om %s till %s har validerats.
+HolidaysToValidateAlertSolde=Användaren som gjorde denna begäran om förfrågan har inte tillräckligt med lediga dagar.
+HolidaysValidated=Bekräftade ledighets förfrågningar
+HolidaysValidatedBody=Din ledighets begäran om %s till %s har bekräftats.
 HolidaysRefused=Begäran nekades
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
+HolidaysRefusedBody=Din begäran om förflyttning för %s till %s har blivit nekad av följande orsak:
 HolidaysCanceled=Annulleras leaved begäran
 HolidaysCanceledBody=Din ledighet begäran om %s till %s har avbrutits.
-FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
-NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Holiday
-HolidaysNumberingModules=Leave requests numbering models
-TemplatePDFHolidays=Template for leave requests PDF
-FreeLegalTextOnHolidays=Free text on PDF
-WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+FollowedByACounter=1: Denna typ av ledighet måste följas av en räknare. Räknaren ökas manuellt eller automatiskt och när en förfrågningsbegäran är validerad minskas räknaren. <br> 0: Ej följd av en räknare.
+NoLeaveWithCounterDefined=Det finns inga lämna typer som måste följas av en räknare
+GoIntoDictionaryHolidayTypes=Gå in i <strong> Hem - Inställning - Ordböcker - Typ av tjänst </strong> för att konfigurera olika typer av löv.
+HolidaySetup=Inställning av modul Holiday
+HolidaysNumberingModules=Lämna begäran nummereringsmodeller
+TemplatePDFHolidays=Mall för lämningsförfrågningar PDF
+FreeLegalTextOnHolidays=Gratis text på PDF
+WatermarkOnDraftHolidayCards=Vattenstämplar på utkastsförfrågningar
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index e47c9fdae30..a18d6220a4a 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parameter %s inte definierad
 ErrorUnknown=Okänt fel
 ErrorSQL=SQL-fel
 ErrorLogoFileNotFound=Logo fil '%s' hittades inte
-ErrorGoToGlobalSetup=Gå till "Company / Organization" setup för att åtgärda det här
+ErrorGoToGlobalSetup=Gå till "Company / Organization" inställning för att åtgärda det här
 ErrorGoToModuleSetup=Gå till modul inställningarna för att åtgärda detta
 ErrorFailedToSendMail=Det gick inte att skicka e-post (avsändare = %s, mottagare = %s)
 ErrorFileNotUploaded=Filen har inte laddats upp. Kontrollera att storleken inte överskrider högsta tillåtna, att det finns plats på disken och att det inte redan finns en fil med samma namn i den här katalogen.
@@ -162,10 +162,10 @@ Resiliate=Avsluta
 Cancel=Avbryt
 Modify=Ändra
 Edit=Redigera
-Validate=Validera
-ValidateAndApprove=Godkänn och godkänn
-ToValidate=Att validera
-NotValidated=Ej validerad
+Validate=Bekräfta
+ValidateAndApprove=Godkänn och bekräft
+ToValidate=Att bekräfta
+NotValidated=Ej bekräftat
 Save=Spara
 SaveAs=Spara som
 TestConnection=Testa anslutning
@@ -259,7 +259,7 @@ DateCreationShort=Creat. datum
 DateModification=Ändringsdatum
 DateModificationShort=Ändr. datum
 DateLastModification=Senaste ändringsdatum
-DateValidation=Attestdatum
+DateValidation=Bekräftelsesdatum
 DateClosing=Sista dag
 DateDue=Förfallodag
 DateValue=Valuteringsdag
@@ -271,12 +271,12 @@ DateRequest=Begär datum
 DateProcess=Process datum
 DateBuild=Rapportera byggdatum
 DatePayment=Datum för betalning
-DateApprove=Godkännande datum
-DateApprove2=Godkännande datum (andra godkännande)
+DateApprove=Godkännandedatum
+DateApprove2=Godkännandedatum (andra godkännande)
 RegistrationDate=Registrerings datum
 UserCreation=Skapande användare
 UserModification=Modifieringsanvändare
-UserValidation=Valideringsanvändare
+UserValidation=Bekräftelsesanvändare
 UserCreationShort=Creat. användare
 UserModificationShort=Modif. användare
 UserValidationShort=Giltig. användare
@@ -371,6 +371,7 @@ Percentage=Procent
 Total=Summa
 SubTotal=Delsumma
 TotalHTShort=Totalt (exkl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Totalt (exkl. I valuta)
 TotalTTCShort=Summa (inkl. moms)
 TotalHT=Totalt (exkl. Skatt)
@@ -402,7 +403,7 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Additionnal cents
+LT1GC=Extra cent
 VATRate=Mervärdesskattesats
 VATCode=Skattesatsskod
 VATNPR=Skattesats NPR
@@ -491,7 +492,7 @@ Reportings=Rapportering
 Draft=Utkast
 Drafts=Utkast
 StatusInterInvoiced=faktureras
-Validated=Validerad
+Validated=Bekräftat
 Opened=Öppen
 OpenAll=Öppna alla)
 ClosedAll=Stängt (Alla)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Skicka bekräftelsemail
 SendMail=Skicka e-post
 Email=epost
 NoEMail=Ingen e-post
-Email=epost
 AlreadyRead=Redan läst
 NotRead=Inte läst
 NoMobilePhone=Ingen mobiltelefon
@@ -671,7 +671,6 @@ Method=Metod
 Receive=Ta emot
 CompleteOrNoMoreReceptionExpected=Komplet eller inget mer förväntat
 ExpectedValue=Förväntat värde
-CurrentValue=Aktuellt värde
 PartialWoman=Partiell
 TotalWoman=Totalt
 NeverReceived=Aldrig fick
@@ -688,7 +687,7 @@ MenuECM=Dokument
 MenuAWStats=AWStats
 MenuMembers=Medlemmar
 MenuAgendaGoogle=Google dagordning
-ThisLimitIsDefinedInSetup=Dolibarr gräns (meny hem-setup-säkerhet): %s Kb, PHP gräns: %s Kb
+ThisLimitIsDefinedInSetup=Dolibarr gräns (meny hem-inställning-säkerhet): %s Kb, PHP gräns: %s Kb
 NoFileFound=Inga dokument har sparats i denhär katalogen
 CurrentUserLanguage=Nuvarande språk
 CurrentTheme=Nuvarande tema
@@ -732,7 +731,7 @@ NotSupported=Stöds inte
 RequiredField=Obligatoriskt fält
 Result=Resultat
 ToTest=Test
-ValidateBefore=Kortet måste valideras innan du använder den här funktionen
+ValidateBefore=Kortet måste bekräftas innan du använder den här funktionen
 Visibility=Synlighet
 Totalizable=Totalizable
 TotalizableDesc=Det här fältet kan totaliseras i listan
@@ -831,9 +830,10 @@ ShowTempMassFilesArea=Visa område med filer som byggts av massåtgärder
 ConfirmMassDeletion=Bulk Ta bort bekräftelse
 ConfirmMassDeletionQuestion=Är du säker på att du vill ta bort %s markerade poster?
 RelatedObjects=Relaterade objekt
-ClassifyBilled=Klassificera billed
-ClassifyUnbilled=Klassificera unbilled
+ClassifyBilled=Märk fakturerad
+ClassifyUnbilled=Märk ofakturerad
 Progress=Framsteg
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=Se
@@ -842,6 +842,11 @@ Exports=Export
 ExportFilteredList=Exportera filtrerad lista
 ExportList=Exportera listan
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Diverse
 Calendar=Kalender
 GroupBy=Grupp av...
@@ -854,7 +859,7 @@ Download=Ladda ner
 DownloadDocument=Hämta dokument
 ActualizeCurrency=Uppdatera valutakurs
 Fiscalyear=Räkenskapsåret
-ModuleBuilder=Modulbyggare
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Ange valuta
 BulkActions=Massåtgärder
 ClickToShowHelp=Klicka för att visa verktygstipshjälp
@@ -942,7 +947,7 @@ SearchIntoContracts=Kontrakt
 SearchIntoCustomerShipments=Kundförsändelser
 SearchIntoExpenseReports=Räkningar
 SearchIntoLeaves=Lämna
-SearchIntoTickets=Tickets
+SearchIntoTickets=biljetter
 CommentLink=Kommentarer
 NbComments=Antal kommentarer
 CommentPage=Kommentarer utrymme
@@ -967,6 +972,10 @@ YouAreCurrentlyInSandboxMode=Du befinner dig för närvarande i %s "sandbox" -l
 Inventory=Lager
 AnalyticCode=Analytisk kod
 TMenuMRP=MRP
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
+ShowMoreInfos=Visa mer info
+NoFilesUploadedYet=Var god ladda upp ett dokument först
+SeePrivateNote=Se privat notering
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index 08948710865..a71a15fc6b1 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -9,7 +9,7 @@ UserNotLinkedToMember=Användare länkade inte till en medlem
 ThirdpartyNotLinkedToMember=Tredje part inte kopplad till en medlem
 MembersTickets=Medlemmar biljetter
 FundationMembers=Stiftelsemedlemmar
-ListOfValidatedPublicMembers=Förteckning över validerade, offentliga medlemmar
+ListOfValidatedPublicMembers=Förteckning över bekräftades, offentliga medlemmar
 ErrorThisMemberIsNotPublic=Denna medlem är inte offentlig
 ErrorMemberIsAlreadyLinkedToThisThirdParty=En annan ledamot (namn: <b>%s,</b> login: <b>%s)</b> är redan kopplad till en tredje part <b>%s.</b> Ta bort denna länk först, eftersom en tredje part inte kan kopplas till endast en ledamot (och vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Av säkerhetsskäl måste du beviljas behörighet att redigera alla användare att kunna koppla en medlem till en användare som inte är din.
@@ -17,14 +17,14 @@ SetLinkToUser=Koppla till en Dolibarr användare
 SetLinkToThirdParty=Koppla till en Dolibarr tredje part
 MembersCards=Medlemmars visitkort
 MembersList=Förteckning över medlemmar
-MembersListToValid=Förteckning över förslag till medlemmar (att valideras)
+MembersListToValid=Förteckning över förslag till medlemmar (att bekräftas)
 MembersListValid=Förteckning över giltiga medlemmar
 MembersListUpToDate=Förteckning över giltiga medlemmar med aktuell prenumeration
 MembersListNotUpToDate=Förteckning över giltiga ledamöter med abonnemang föråldrad
 MembersListResiliated=Förteckning över avslutade medlemmar
 MembersListQualified=Förteckning över kvalificerade ledamöter
 MenuMembersToValidate=Förslag medlemmar
-MenuMembersValidated=Validerad medlemmar
+MenuMembersValidated=Bekräftat medlemmar
 MenuMembersUpToDate=Hittills medlemmar
 MenuMembersNotUpToDate=Föråldrad medlemmar
 MenuMembersResiliated=Avslutade medlemmar
@@ -39,10 +39,10 @@ MemberType=Medlem typ
 MemberTypeId=Medlem typ id
 MemberTypeLabel=Medlem etikett
 MembersTypes=Medlemmar typer
-MemberStatusDraft=Utkast (måste valideras)
+MemberStatusDraft=Utkast (måste bekräftas)
 MemberStatusDraftShort=Utkast
-MemberStatusActive=Validerad (väntar prenumeration)
-MemberStatusActiveShort=Validerade
+MemberStatusActive=Bekräftat (väntar prenumeration)
+MemberStatusActiveShort=Bekräftade
 MemberStatusActiveLate=Prenumerationen löpte ut
 MemberStatusActiveLateShort=Utgångna
 MemberStatusPaid=Prenumeration aktuell
@@ -54,7 +54,7 @@ MembersStatusResiliated=Avslutade medlemmar
 NewCotisation=Nya bidrag
 PaymentSubscription=Nya bidrag betalning
 SubscriptionEndDate=Prenumeration slutdatum
-MembersTypeSetup=Medlemmar typ setup
+MembersTypeSetup=Medlemmar typ inställning
 MemberTypeModified=Medlemstyp ändrad
 DeleteAMemberType=Ta bort en medlemstyp
 ConfirmDeleteMemberType=Är du säker på att du vill radera den här medlemstypen?
@@ -86,8 +86,8 @@ ConfirmDeleteMember=Är du säker på att du vill radera den här medlemmen (rad
 DeleteSubscription=Ta bort en prenumeration
 ConfirmDeleteSubscription=Är du säker på att du vill radera den här prenumerationen?
 Filehtpasswd=htpasswd fil
-ValidateMember=Validate en medlem
-ConfirmValidateMember=Är du säker på att du vill validera den här medlemmen?
+ValidateMember=Bekräfta en medlem
+ConfirmValidateMember=Är du säker på att du vill bekräfta den här medlemmen?
 FollowingLinksArePublic=Följande länkar är öppna sidor som inte skyddas av något Dolibarr-tillstånd. De är inte formaterade sidor, som ett exempel som visar hur man listar medlemmarnas databas.
 PublicMemberList=Offentliga medlemslista
 BlankSubscriptionForm=Offentlig självprenumerationsblankett
@@ -109,27 +109,27 @@ ShowSubscription=Visa prenumeration
 # Label of email templates
 SendingAnEMailToMember=Skickar informationsmail till medlem
 SendingEmailOnAutoSubscription=Skickar e-post vid automatisk registrering
-SendingEmailOnMemberValidation=Skickar e-post vid validering av nya medlemmar
+SendingEmailOnMemberValidation=Skickar e-post vid bekräftande av nya medlemmar
 SendingEmailOnNewSubscription=Skickar e-post på ny prenumeration
 SendingReminderForExpiredSubscription=Skickar påminnelse för utgående abonnemang
 SendingEmailOnCancelation=Skickar e-post vid avbokning
 # Topic of email templates
 YourMembershipRequestWasReceived=Ditt medlemskap har tagits emot.
-YourMembershipWasValidated=Ditt medlemskap validerades
+YourMembershipWasValidated=Ditt medlemskap bekräftades
 YourSubscriptionWasRecorded=Din nya prenumeration registrerades
 SubscriptionReminderEmail=Anmälan om abonnemang
 YourMembershipWasCanceled=Ditt medlemskap avbröts
 CardContent=Innehållet i ditt medlemskort
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=Vi vill meddela dig att din medlemsförfrågan har mottagits. <br> <br>
-ThisIsContentOfYourMembershipWasValidated=Vi vill meddela att ditt medlemskap validerades med följande information: <br> <br>
+ThisIsContentOfYourMembershipWasValidated=Vi vill meddela att ditt medlemskap bekräftades med följande information: <br> <br>
 ThisIsContentOfYourSubscriptionWasRecorded=Vi vill meddela dig att din nya prenumeration har spelats in. <br> <br>
 ThisIsContentOfSubscriptionReminderEmail=Vi vill meddela att din prenumeration är på väg att upphöra eller har gått ut (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Vi hoppas att du kommer att förnya det. <br> <br>
 ThisIsContentOfYourCard=Detta är en sammanfattning av den information vi har om dig. Kontakta oss om något är felaktigt. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Ämnet av meddelandemeddelandet mottaget vid automatisk inskription av en gäst
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Innehållet i meddelandemeddelandet mottaget vid automatisk inskription av en gäst
 DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=E-postmall för att använda för att skicka e-post till en medlem på medlems autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-postmall för att använda för att skicka e-post till en medlem om medlemvalidering
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-postmall för att använda för att skicka e-post till en medlem om medlemsbekräftande
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=E-postmall för att skicka e-post till en medlem om ny abonnemangsinspelning
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-postmall för att skicka e-postpåminnelse när prenumerationen är på väg att gå ut
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-postmall för att använda för att skicka e-post till en medlem om medlemsavbeställning
@@ -152,9 +152,9 @@ MoreActionBankViaInvoice=Skapa en faktura och en betalning på bankkonto
 MoreActionInvoiceOnly=Skapa en faktura utan betalning
 LinkToGeneratedPages=Generera besökskort
 LinkToGeneratedPagesDesc=Den här skärmen kan du skapa PDF-filer med visitkort för alla dina medlemmar eller en viss medlem.
-DocForAllMembersCards=Generera visitkort för alla medlemmar (Format för utgång faktiskt setup: <b>%s)</b>
-DocForOneMemberCards=Generera visitkort för en viss medlem (Format för utgång faktiskt setup: <b>%s)</b>
-DocForLabels=Generera adress ark (Format för utgång faktiskt setup: <b>%s)</b>
+DocForAllMembersCards=Generera visitkort för alla medlemmar (Format för utgång faktiskt inställning: <b>%s)</b>
+DocForOneMemberCards=Generera visitkort för en viss medlem (Format för utgång faktiskt inställning: <b>%s)</b>
+DocForLabels=Generera adress ark (Format för utgång faktiskt inställning: <b>%s)</b>
 SubscriptionPayment=Teckning betalning
 LastSubscriptionDate=Datum för senaste prenumerationsbetalning
 LastSubscriptionAmount=Antal senaste prenumeration
@@ -163,7 +163,7 @@ MembersStatisticsByState=Medlemmar statistik från stat / provins
 MembersStatisticsByTown=Medlemmar statistik per kommun
 MembersStatisticsByRegion=Medlemsstatistik på region
 NbOfMembers=Antal medlemmar
-NoValidatedMemberYet=Inga godkända medlemmar hittades
+NoValidatedMemberYet=Inga bekräftada medlemmar hittades
 MembersByCountryDesc=Denna skärm visar statistik om medlemmar med länder. Grafisk beror dock på Google online grafen service och är tillgänglig endast om en Internet-anslutning fungerar.
 MembersByStateDesc=Denna skärm visar dig statistik över ledamöter av stat / län / Canton.
 MembersByTownDesc=Denna skärm visar statistik om medlemmar med stan.
@@ -197,3 +197,4 @@ SendReminderForExpiredSubscriptionTitle=Skicka påminnelse via e-post för utgå
 SendReminderForExpiredSubscription=Skicka påminnelse via e-post till medlemmar när prenumerationen är på väg att gå ut (parametern är antal dagar före abonnemangets slutändning. Det kan vara en lista över dagar separerade av ett semikolon, till exempel '10; 5; 0; -5 ')
 MembershipPaid=Medlemskap som betalats för nuvarande period (till %s)
 YouMayFindYourInvoiceInThisEmail=Du kan hitta din faktura bifogad till det här e-postmeddelandet
+XMembersClosed=%s member(s) closed
diff --git a/htdocs/langs/sv_SE/modulebuilder.lang b/htdocs/langs/sv_SE/modulebuilder.lang
index eda5de60ad4..aff8012e371 100644
--- a/htdocs/langs/sv_SE/modulebuilder.lang
+++ b/htdocs/langs/sv_SE/modulebuilder.lang
@@ -1,112 +1,119 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
-EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
-ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
-ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
-ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
-NewModule=New module
-NewObject=New object
-ModuleKey=Module key
-ObjectKey=Object key
-ModuleInitialized=Module initialized
-FilesForObjectInitialized=Files for new object '%s' initialized
-FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
-ModuleBuilderDescdescription=Enter here all general information that describe your module.
-ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
-ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
-ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
-ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
-ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
-ModuleBuilderDeschooks=This tab is dedicated to hooks.
-ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
-ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
-DangerZone=Danger zone
-BuildPackage=Build package
-BuildDocumentation=Build documentation
-ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
-DescriptionLong=Long description
-EditorName=Name of editor
-EditorUrl=URL of editor
-DescriptorFile=Descriptor file of module
-ClassFile=File for PHP DAO CRUD class
-ApiClassFile=File for PHP API class
-PageForList=PHP page for list of record
-PageForCreateEditView=PHP page to create/edit/view a record
-PageForAgendaTab=PHP page for event tab
-PageForDocumentTab=PHP page for document tab
-PageForNoteTab=PHP page for note tab
-PathToModulePackage=Path to zip of module/application package
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
-SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
-FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
-RegenerateMissingFiles=Generate missing files
-SpecificationFile=File of documentation
-LanguageFile=File for language
-ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
-NotNull=Not NULL
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
-SearchAll=Used for 'search all'
-DatabaseIndex=Database index
-FileAlreadyExists=File %s already exists
-TriggersFile=File for triggers code
-HooksFile=File for hooks code
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+EnterNameOfModuleDesc=Ange namnet på modulen / programmet för att skapa utan mellanslag. Använd stor bokstav för att skilja ord (till exempel: MyModule, EcommerceForShop, SyncWithMySystem ...)
+EnterNameOfObjectDesc=Ange namnet på objektet som ska skapas utan mellanslag. Använd stor bokstav för att skilja ord (till exempel: MyObject, Student, Lärare ...). CRUD klassfilen, men även API-filen, kommer sidor att lista / lägga till / redigera / ta bort objekt och SQL-filer genereras.
+ModuleBuilderDesc2=Vägen där moduler genereras / redigeras (första katalogen för externa moduler definierad i %s): <strong> %s </strong>
+ModuleBuilderDesc3=Genererade / redigerbara moduler hittades: <strong> %s </strong>
+ModuleBuilderDesc4=En modul detekteras som "redigerbar" när filen <strong> %s </strong> existerar i root av modulkatalogen
+NewModule=Ny modul
+NewObject=Nytt objekt
+ModuleKey=Modulnyckel
+ObjectKey=Objektnyckel
+ModuleInitialized=Modul initialiserad
+FilesForObjectInitialized=Filer för nytt objekt '%s' initialiserades
+FilesForObjectUpdated=Filer för objekt '%s' uppdaterad (.sql-filer och .class.php-fil)
+ModuleBuilderDescdescription=Skriv här all generell information som beskriver din modul.
+ModuleBuilderDescspecifications=Du kan ange en detaljerad beskrivning av specifikationerna för din modul som inte redan är strukturerad i andra flikar. Så du har inom räckhåll alla regler att utveckla. Även denna textinnehåll kommer att inkluderas i den genererade dokumentationen (se senaste fliken). Du kan använda Markdown-format, men det rekommenderas att använda Asciidoc-format (jämförelse mellan .md och .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Definiera här de objekt du vill hantera med din modul. En CRUD DAO-klass, SQL-filer, sida för att lista över objekt, skapa / redigera / visa en post och ett API kommer att genereras.
+ModuleBuilderDescmenus=Den här fliken är avsedd att definiera menyposter som tillhandahålls av din modul.
+ModuleBuilderDescpermissions=Den här fliken är avsedd att definiera de nya behörigheterna du vill ge med din modul.
+ModuleBuilderDesctriggers=Detta är utsikten över utlösare som tillhandahålls av din modul. Om du vill inkludera kod som körs när en utlösad företagshändelse startas, redigera bara den här filen.
+ModuleBuilderDeschooks=Den här fliken är avsedd för krokar.
+ModuleBuilderDescwidgets=Den här fliken är avsedd att hantera / bygga widgets.
+ModuleBuilderDescbuildpackage=Du kan generera här en "färdig att distribuera" paketfil (en normaliserad .zip-fil) av din modul och en "färdig att distribuera" dokumentationsfil. Klicka bara på knappen för att bygga paketet eller dokumentationsfilen.
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+DangerZone=Farozon
+BuildPackage=Bygg paketet
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Bygg dokumentation
+ModuleIsNotActive=Den här modulen är inte aktiverad än. Gå till %s för att göra det levande eller klicka här:
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
+DescriptionLong=Lång beskrivning
+EditorName=Namn på redaktör
+EditorUrl=URL för redaktör
+DescriptorFile=Beskrivningsfil av modulen
+ClassFile=Fil för PHP DAO CRUD klass
+ApiClassFile=Fil för PHP API-klass
+PageForList=PHP-sida för lista över posten
+PageForCreateEditView=PHP-sida för att skapa / redigera / visa en post
+PageForAgendaTab=PHP-sida för händelsefliken
+PageForDocumentTab=PHP-sida för dokumentfliken
+PageForNoteTab=PHP-sida för fliken Not
+PathToModulePackage=Vägen till zip på modulen / applikationspaketet
+PathToModuleDocumentation=Ban till fil med modul / ansökningsdokumentation (%s)
+SpaceOrSpecialCharAreNotAllowed=Mellanslag eller specialtecken är inte tillåtna.
+FileNotYetGenerated=Filen är ännu inte genererad
+RegenerateClassAndSql=Force update of .class and .sql files
+RegenerateMissingFiles=Generera saknade filer
+SpecificationFile=Dokumentationsfil
+LanguageFile=Fil för språk
+ObjectProperties=Object Properties
+ConfirmDeleteProperty=Är du säker på att du vill ta bort egenskapen <strong> %s </strong>? Detta kommer att ändra kod i PHP-klassen men även ta bort kolumn från tabelldefinition av objekt.
+NotNull=Inte NULL
+NotNullDesc=1 = Ange databas till NOT NULL. -1 = Tillåt nullvärden och tvinga värdet till NULL om det är tomt ('' eller 0).
+SearchAll=Används för "sök alla"
+DatabaseIndex=Databasindex
+FileAlreadyExists=Filen %s existerar redan
+TriggersFile=Fil för utlösningskod
+HooksFile=Fil för krokar kod
 ArrayOfKeyValues=Array of key-val
-ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
-ReadmeFile=Readme file
-ChangeLog=ChangeLog file
-TestClassFile=File for PHP Unit Test class
-SqlFile=Sql file
-PageForLib=File for PHP libraries
-SqlFileExtraFields=Sql file for complementary attributes
-SqlFileKey=Sql file for keys
-AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
-UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-IsAMeasure=Is a measure
-DirScanned=Directory scanned
-NoTrigger=No trigger
-NoWidget=No widget
-GoToApiExplorer=Go to API explorer
-ListOfMenusEntries=List of menu entries
-ListOfPermissionsDefined=List of defined permissions
-SeeExamples=See examples here
-EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example: preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
-IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
-SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
-SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
-LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
-HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
-TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
-SeeIDsInUse=See IDs in use in your installation
-SeeReservedIDsRangeHere=See range of reserved IDs
-ToolkitForDevelopers=Toolkit for Dolibarr developers
-TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
-SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
-AddLanguageFile=Add language file
-YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
-TableDoesNotExists=The table %s does not exists
-TableDropped=Table %s deleted
-InitStructureFromExistingTable=Build the structure array string of an existing table
-UseAboutPage=Disable the about page
-UseDocFolder=Disable the documentation folder
-UseSpecificReadme=Use a specific ReadMe
-RealPathOfModule=Real path of module
-ContentCantBeEmpty=Content of file can't be empty
-WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
-CLIDesc=You can generate here some command line scripts you want to provide with your module.
-CLIFile=CLI File
-NoCLIFile=No CLI files
-UseSpecificEditorName = Use a specific editor name
-UseSpecificEditorURL = Use a specific editor URL
-UseSpecificFamily = Use a specific family
-UseSpecificAuthor = Use a specific author
-UseSpecificVersion = Use a specific initial version
+ArrayOfKeyValuesDesc=Array av nycklar och värden om fältet är en kombinationslista med fasta värden
+WidgetFile=Widget-fil
+ReadmeFile=Readme-filen
+ChangeLog=ChangeLog-fil
+TestClassFile=Fil för PHP Unit Test-klass
+SqlFile=SQL-fil
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
+SqlFileExtraFields=SQL-fil för kompletterande attribut
+SqlFileKey=Sql-fil för nycklar
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+AnObjectAlreadyExistWithThisNameAndDiffCase=Ett objekt finns redan med detta namn och ett annat fall
+UseAsciiDocFormat=Du kan använda Markdown-format, men det rekommenderas att använda Asciidoc-format (omparison mellan .md och .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Är en åtgärd
+DirScanned=Directory skannad
+NoTrigger=Ingen utlösare
+NoWidget=Ingen widget
+GoToApiExplorer=Gå till API-explorer
+ListOfMenusEntries=Lista över menyuppgifter
+ListOfPermissionsDefined=Lista över definierade behörigheter
+SeeExamples=Se exempel här
+EnabledDesc=Villkor att ha detta fält aktivt (Exempel: 1 eller $ conf-> global-> MYMODULE_MYOPTION)
+VisibleDesc=Är fältet synligt? (Exempel: 0 = Aldrig synlig, 1 = Synlig på lista och skapa / uppdatera / visa formulär, 2 = Synlig endast på lista, 3 = Synlig på skapa / uppdatera / visa endast formulär (inte lista), 4 = Synlig på lista och uppdatera / visa endast formulär (inte skapa). Använda ett negativt värde betyder att fältet inte visas som standard på listan men kan väljas för visning). Det kan vara ett uttryck, till exempel: preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1
+IsAMeasureDesc=Kan värdet av fält ackumuleras för att få en total i listan? (Exempel: 1 eller 0)
+SearchAllDesc=Är fältet används för att göra en sökning från snabbsökningsverktyget? (Exempel: 1 eller 0)
+SpecDefDesc=Ange här all dokumentation du vill ge med din modul som inte redan är definierad av andra flikar. Du kan använda .md eller bättre, den rika .asciidoc-syntaxen.
+LanguageDefDesc=Skriv in i dessa filer, all nyckel och översättning för varje språkfil.
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
+HooksDefDesc=Definiera i egenskapen <b> modul_parts ['krokar'] </b> i modulbeskrivningen, kontexten av krokar som du vill hantera (kontextlista kan hittas med en sökning på '<b> initHooks (</b>' i kärnkoden). <br> Redigera krokfilen för att lägga till kod för dina anslutna funktioner (krokbara funktioner kan hittas genom en sökning på '<b> executeHooks </b>' i kärnkod).
+TriggerDefDesc=Definiera i utlösningsfilen koden du vill utföra för varje företagshändelse som körts.
+SeeIDsInUse=Se ID-er som används i din installation
+SeeReservedIDsRangeHere=Se utbud av reserverade ID-skivor
+ToolkitForDevelopers=Verktygssats för Dolibarr-utvecklare
+TryToUseTheModuleBuilder=Om du har kunskap om SQL och PHP kan du använda guiden för inbyggd modulbyggare. <br> Aktivera modulen <strong> %s </strong> och använd guiden genom att klicka på <span class="fa fa-bug"> </span> högst upp till höger. <br> Varning: Detta är en avancerad utvecklingsfunktion, gör <b> inte </b> experiment på din produktionsplats!
+SeeTopRightMenu=Se <span class="fa fa-bug"> </span> längst upp till höger
+AddLanguageFile=Lägg till språkfil
+YouCanUseTranslationKey=Här kan du använda en nyckel som är översättningsnyckeln i språkfilen (se fliken "Språk")
+DropTableIfEmpty=(Ta bort tabellen om den är tom)
+TableDoesNotExists=Tabellen %s existerar inte
+TableDropped=Tabell %s utgår
+InitStructureFromExistingTable=Bygg strukturen array-strängen i en befintlig tabell
+UseAboutPage=Inaktivera den aktuella sidan
+UseDocFolder=Inaktivera dokumentationsmappen
+UseSpecificReadme=Använd en specifik ReadMe
+RealPathOfModule=Verklig väg för modulen
+ContentCantBeEmpty=Innehållet i filen kan inte vara tomt
+WidgetDesc=Du kan skapa och redigera de widgets som kommer att läggas in med din modul.
+CLIDesc=Du kan generera här några kommandoradsskript du vill ge med din modul.
+CLIFile=CLI-fil
+NoCLIFile=Inga CLI-filer
+UseSpecificEditorName = Använd ett visst redigeringsnamn
+UseSpecificEditorURL = Använd en specifik redigeringsadress
+UseSpecificFamily = Använd en specifik familj
+UseSpecificAuthor = Använd en specifik författare
+UseSpecificVersion = Använd en specifik första version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/sv_SE/paybox.lang b/htdocs/langs/sv_SE/paybox.lang
index 69aa2893d25..d715f84c844 100644
--- a/htdocs/langs/sv_SE/paybox.lang
+++ b/htdocs/langs/sv_SE/paybox.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=PayBox modul setup
+PayBoxSetup=PayBox modul inställning
 PayBoxDesc=Denna modul erbjuder sidor för att möjliggöra betalning på <a href="http://www.paybox.com" target="_blank">Paybox</a> av kunder. Detta kan användas för en kostnadsfri betalning eller en betalning på en viss Dolibarr objekt (faktura, order, ...)
 FollowingUrlAreAvailableToMakePayments=Följande webbadresser finns att erbjuda en sida till en kund att göra en förskottsbetalning Dolibarr objekt
 PaymentForm=Inbetalningskort
@@ -10,7 +10,7 @@ ToComplete=För att komplettera
 YourEMail=E-post för betalning bekräftelse
 Creditor=Borgenär
 PaymentCode=Betalning kod
-PayBoxDoPayment=Betala med kredit eller betalkort (betalningslåda)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Gör betalning
 YouWillBeRedirectedOnPayBox=Du kommer att omdirigeras på säkrade Paybox sida för att mata dig kreditkortsinformation
 Continue=Nästa
@@ -22,7 +22,7 @@ ToOfferALinkForOnlinePaymentOnFreeAmount=URL för att erbjuda en %s online grän
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL för att erbjuda en %s online gränssnitt betalning användare för en medlem prenumeration
 ToOfferALinkForOnlinePaymentOnDonation=URL för att erbjuda en %s online betalning, användargränssnitt för betalning av donation
 YouCanAddTagOnUrl=Du kan också lägga till url parameter <b>&tag = <i>värde</i></b> för någon av dessa URL (krävs endast för gratis betalning) för att lägga till din egen kommentar tagg betalning.
-SetupPayBoxToHavePaymentCreatedAutomatically=Konfigurera din lön med url <b> %s </b> för att ha betalning skapad automatiskt när validerad av Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Konfigurera din lön med url <b> %s </b> för att ha betalning skapad automatiskt när bekräftat av Paybox.
 YourPaymentHasBeenRecorded=Den här sidan bekräftar att din betalning har registrerats. Tack.
 YourPaymentHasNotBeenRecorded=Din betalning har INTE registrerats och transaktionen har annullerats. Tack.
 AccountParameter=Tagen parametrar
@@ -37,3 +37,4 @@ PAYBOX_PAYONLINE_SENDEMAIL=E-postmeddelande efter betalningsförsök (framgång
 PAYBOX_PBX_SITE=Värde för PBX SITE
 PAYBOX_PBX_RANG=Värde för PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Värde för PBX-ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/sv_SE/paypal.lang b/htdocs/langs/sv_SE/paypal.lang
index 63483ce674a..7371edf5798 100644
--- a/htdocs/langs/sv_SE/paypal.lang
+++ b/htdocs/langs/sv_SE/paypal.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal-modul installation
 PaypalDesc=Denna modul tillåter betalning av kunder via <a href="http://www.paypal.com" target="_blank"> PayPal </a>. Detta kan användas för en ad hoc-betalning eller för en betalning relaterad till ett Dolibarr-objekt (faktura, order, ...)
-PaypalOrCBDoPayment=Betal med PayPal (Kreditkort eller PayPal)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
 PaypalDoPayment=Betala med PayPal
 PAYPAL_API_SANDBOX=Läge test / sandlåda
 PAYPAL_API_USER=API användarnamn
@@ -14,12 +14,11 @@ PaypalModeOnlyPaypal=PayPal endast
 ONLINE_PAYMENT_CSS_URL=Valfri URL för CSS-stilarket på betalningssidan för online
 ThisIsTransactionId=Detta är id transaktion: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Inkludera PayPal-betalningsadressen när du skickar ett dokument via e-post
-YouAreCurrentlyInSandboxMode=Du befinner dig för närvarande i %s "sandbox" -läget
 NewOnlinePaymentReceived=Ny online betalning mottagen
 NewOnlinePaymentFailed=Ny onlinebetalning försökte men misslyckades
 ONLINE_PAYMENT_SENDEMAIL=E-postadress för meddelanden efter varje betalningsförsök (för framgång och misslyckande)
 ReturnURLAfterPayment=Återgå URL efter betalning
-ValidationOfOnlinePaymentFailed=Validering av online betalning misslyckades
+ValidationOfOnlinePaymentFailed=Bekräftelse av online betalning misslyckades
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Betalningsbekräftelse sidan kallades av betalningssystemet returnerade ett fel
 SetExpressCheckoutAPICallFailed=SetExpressCheckout API-samtal misslyckades.
 DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API-samtal misslyckades.
@@ -32,4 +31,6 @@ PaypalLiveEnabled=PayPal "live" -läge aktiverat (annars test / sandbox-läge)
 PaypalImportPayment=Importera PayPal-betalningar
 PostActionAfterPayment=Posta åtgärder efter betalningar
 ARollbackWasPerformedOnPostActions=En återuppringning utfördes på alla Post-åtgärder. Du måste fylla i posthandlingar manuellt om det behövs.
-ValidationOfPaymentFailed=Valideringen av betalningen har misslyckats
+ValidationOfPaymentFailed=Bekräftandet av betalningen har misslyckats
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 4bb82f85405..4af84e3ef1b 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -250,7 +250,7 @@ PriceExpressionEditorHelp5=Tillgängliga globala värden:
 PriceMode=Prisläge
 PriceNumeric=Nummer
 DefaultPrice=Standardpris
-ComposedProductIncDecStock=Öka / minska aktien vid föräldraändring
+ComposedProductIncDecStock=Öka / minska lagerposten vid föräldraändring
 ComposedProduct=Barnprodukter
 MinSupplierPrice=Lägsta köpkurs
 MinCustomerPrice=Lägsta försäljningspris
@@ -260,7 +260,7 @@ AddVariable=Lägg till variabel
 AddUpdater=Lägg till Updater
 GlobalVariables=Globala variabler
 VariableToUpdate=Variabel för uppdatering
-GlobalVariableUpdaters=Globala variabla uppdateringar
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parsar JSON-data från den angivna webbadressen, VALUE specificerar platsen för relevant värde,
 GlobalVariableUpdaterHelpFormat0=Formatera för begäran {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Produktblad
 ServiceSheet=Serviceblad
 PossibleValues=Möjliga värden
 GoOnMenuToCreateVairants=Gå på menyn %s - %s för att förbereda attributvarianter (som färger, storlek, ...)
-UseProductFournDesc=Använd leverantörsbeskrivningar av produkter i leverantörsdokument
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Leverantörsbeskrivning för produkten
 #Attributes
 VariantAttributes=Variant attribut
@@ -338,4 +338,5 @@ CloneDestinationReference=Referensproduktreferens
 ErrorCopyProductCombinations=Ett fel uppstod när du kopierade varianterna
 ErrorDestinationProductNotFound=Destination produkt hittades inte
 ErrorProductCombinationNotFound=Produktvariant inte hittat
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ActionAvailableOnVariantProductOnly=Åtgärd endast tillgänglig på varianter av produkt
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 01dea7864d6..bdba6e72f88 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Tid som tillbringas
 TimeSpentByYou=Tid spenderad av dig
 TimeSpentByUser=Tid spenderad av användaren
 TimesSpent=Tid
-RefTask=Ref. uppgift
-LabelTask=Label uppgift
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Tid som ägnas åt uppgifter
 TaskTimeUser=Användare
 TaskTimeNote=Anmärkning
@@ -56,7 +57,7 @@ WorkloadNotDefined=Arbetsbelastning inte definierad
 NewTimeSpent=Tid
 MyTimeSpent=Min tid
 BillTime=Räkna ut tiden
-BillTimeShort=Bill tid
+BillTimeShort=Fakt. tid
 TimeToBill=Tid inte fakturerad
 TimeBilled=Tid fakturerad
 Tasks=Uppgifter
@@ -88,48 +89,48 @@ ListInvoicesAssociatedProject=Förteckning över kundfakturor relaterade till pr
 ListPredefinedInvoicesAssociatedProject=Förteckning över kundmallfakturor relaterade till projektet
 ListSupplierOrdersAssociatedProject=Förteckning över inköpsorder relaterade till projektet
 ListSupplierInvoicesAssociatedProject=Förteckning över leverantörsfakturor relaterade till projektet
-ListContractAssociatedProject=List of contracts related to the project
-ListShippingAssociatedProject=List of shippings related to the project
-ListFichinterAssociatedProject=List of interventions related to the project
-ListExpenseReportsAssociatedProject=List of expense reports related to the project
-ListDonationsAssociatedProject=List of donations related to the project
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
-ListSalariesAssociatedProject=List of payments of salaries related to the project
-ListActionsAssociatedProject=List of events related to the project
-ListTaskTimeUserProject=List of time consumed on tasks of project
-ListTaskTimeForTask=List of time consumed on task
-ActivityOnProjectToday=Activity on project today
-ActivityOnProjectYesterday=Activity on project yesterday
+ListContractAssociatedProject=Förteckning över kontrakt relaterade till projektet
+ListShippingAssociatedProject=Förteckning över frakt relaterade till projektet
+ListFichinterAssociatedProject=Förteckning över interventioner relaterade till projektet
+ListExpenseReportsAssociatedProject=Förteckning över kostnadsrapporter relaterade till projektet
+ListDonationsAssociatedProject=Förteckning över donationer relaterade till projektet
+ListVariousPaymentsAssociatedProject=Förteckning över diverse betalningar relaterade till projektet
+ListSalariesAssociatedProject=Förteckning över betalningar av löner relaterade till projektet
+ListActionsAssociatedProject=Förteckning över händelser relaterade till projektet
+ListTaskTimeUserProject=Förteckning över tid som konsumeras på projektets uppgifter
+ListTaskTimeForTask=Lista över tid förbrukad på uppgift
+ActivityOnProjectToday=Aktivitet på projektet idag
+ActivityOnProjectYesterday=Aktivitet på projektet igår
 ActivityOnProjectThisWeek=Aktivitet på projekt den här veckan
 ActivityOnProjectThisMonth=Aktivitet på projekt denna månad
 ActivityOnProjectThisYear=Aktivitet på projekt i år
 ChildOfProjectTask=Barn av projekt / uppdrag
-ChildOfTask=Child of task
-TaskHasChild=Task has child
+ChildOfTask=Barn av uppgift
+TaskHasChild=Uppgiften har barn
 NotOwnerOfProject=Inte ägaren av denna privata projekt
 AffectedTo=Påverkas i
 CantRemoveProject=Projektet kan inte tas bort eftersom den refereras till av något annat föremål (faktura, order eller annat). Se Referer fliken.
-ValidateProject=Validate projet
-ConfirmValidateProject=Are you sure you want to validate this project?
+ValidateProject=Bekräfta projet
+ConfirmValidateProject=Är du säker på att du vill bekräfta detta projekt?
 CloseAProject=Stäng projekt
-ConfirmCloseAProject=Are you sure you want to close this project?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ConfirmCloseAProject=Är du säker på att du vill stänga detta projekt?
+AlsoCloseAProject=Stäng också projektet (håll det öppet om du fortfarande behöver följa produktionsuppgifterna på den)
 ReOpenAProject=Öppna projekt
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ConfirmReOpenAProject=Är du säker på att du vill öppna det här projektet igen?
 ProjectContact=Kontakter av projekt
-TaskContact=Task contacts
+TaskContact=Uppgiftskontakter
 ActionsOnProject=Åtgärder för projektet
 YouAreNotContactOfProject=Du är inte en kontakt på denna privata projekt
-UserIsNotContactOfProject=User is not a contact of this private project
+UserIsNotContactOfProject=Användaren är inte kontakt med det här privata projektet
 DeleteATimeSpent=Ta bort tid
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+ConfirmDeleteATimeSpent=Är du säker på att du vill radera den här tiden?
 DoNotShowMyTasksOnly=Se även uppgifter som inte tilldelats mig
 ShowMyTasksOnly=Visa bara aktiviteter för mig
-TaskRessourceLinks=Contacts of task
+TaskRessourceLinks=Kontakter av uppgift
 ProjectsDedicatedToThisThirdParty=Projekt som arbetat med denna tredje part
 NoTasks=Inga uppgifter för detta projekt
 LinkedToAnotherCompany=Kopplat till annan tredje part
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+TaskIsNotAssignedToUser=Uppgift som inte tilldelats användaren. Använd knappen '<strong> %s </strong>' för att tilldela uppgiften nu.
 ErrorTimeSpentIsEmpty=Tid är tom
 ThisWillAlsoRemoveTasks=Denna åtgärd kommer också att ta bort alla aktiviteter av projekt <b>(%s</b> uppgifter på för tillfället) och alla ingångar för nedlagd tid.
 IfNeedToUseOtherObjectKeepEmpty=Om vissa objekt (faktura, order, ...), som tillhör en annan tredje part, måste kopplas till projektet för att skapa, hålla denna tomt för att få projektet att flera tredje part.
@@ -138,26 +139,26 @@ CloneContacts=Klon kontakter
 CloneNotes=Klon anteckningar
 CloneProjectFiles=Klon projekt fogade filer
 CloneTaskFiles=Klon uppgift(er) anslöt filer (om uppgiften(s) klonad)
-CloneMoveDate=Update project/tasks dates from now?
-ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task dates according to new project start date
+CloneMoveDate=Uppdatera projekt / uppgifter från och med nu?
+ConfirmCloneProject=Är du säker på att klona det här projektet?
+ProjectReportDate=Ändra uppgiftsdatum enligt nytt projekt startdatum
 ErrorShiftTaskDate=Omöjligt att flytta datum på uppgiften enligt nytt projekt startdatum
 ProjectsAndTasksLines=Projekt och uppdrag
 ProjectCreatedInDolibarr=Projekt %s skapad
-ProjectValidatedInDolibarr=Project %s validated
+ProjectValidatedInDolibarr=Projekt %s bekräftat
 ProjectModifiedInDolibarr=Projekt %s modified
 TaskCreatedInDolibarr=Uppgift %s skapad
 TaskModifiedInDolibarr=Uppgift %s modifierade
 TaskDeletedInDolibarr=Uppgift %s raderad
-OpportunityStatus=Lead status
-OpportunityStatusShort=Lead status
-OpportunityProbability=Lead probability
-OpportunityProbabilityShort=Lead probab.
-OpportunityAmount=Lead amount
-OpportunityAmountShort=Lead amount
-OpportunityAmountAverageShort=Average lead amount
-OpportunityAmountWeigthedShort=Weighted lead amount
-WonLostExcluded=Won/Lost excluded
+OpportunityStatus=Ledningsstatus
+OpportunityStatusShort=Ledningsstatus
+OpportunityProbability=Ledsannolikhet
+OpportunityProbabilityShort=Bly probab.
+OpportunityAmount=Blybelopp
+OpportunityAmountShort=Blybelopp
+OpportunityAmountAverageShort=Genomsnittlig blybelopp
+OpportunityAmountWeigthedShort=Viktad blybelopp
+WonLostExcluded=Vunnit / borttaget exkluderat
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Projektledare
 TypeContact_project_external_PROJECTLEADER=Projektledare
@@ -170,76 +171,76 @@ TypeContact_project_task_external_TASKCONTRIBUTOR=Bidragsgivare
 SelectElement=Välj elementet
 AddElement=Länk till inslag
 # Documents models
-DocumentModelBeluga=Project document template for linked objects overview
-DocumentModelBaleine=Project document template for tasks
-DocumentModelTimeSpent=Project report template for time spent
+DocumentModelBeluga=Projektdokumentmall för översikt över länkade objekt
+DocumentModelBaleine=Projektdokumentmall för uppgifter
+DocumentModelTimeSpent=Projektrapportmallen för den tid som spenderas
 PlannedWorkload=Planerad arbetsbelastning
-PlannedWorkloadShort=Workload
+PlannedWorkloadShort=Arbetsbelastning
 ProjectReferers=Relaterade saker
-ProjectMustBeValidatedFirst=Projekt måste valideras först
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputDetail=Input detail
-TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
-ProjectsWithThisUserAsContact=Projects with this user as contact
-TasksWithThisUserAsContact=Tasks assigned to this user
-ResourceNotAssignedToProject=Not assigned to project
-ResourceNotAssignedToTheTask=Not assigned to the task
-NoUserAssignedToTheProject=No users assigned to this project
-TimeSpentBy=Time spent by
-TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
-AssignTaskToUser=Assign task to %s
-SelectTaskToAssign=Select task to assign...
-AssignTask=Assign
-ProjectOverview=Overview
-ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
-ProjectNbProjectByMonth=No. of created projects by month
-ProjectNbTaskByMonth=No. of created tasks by month
-ProjectOppAmountOfProjectsByMonth=Amount of leads by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
-TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
-IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
-OpenedProjectsByThirdparties=Open projects by third parties
-OnlyOpportunitiesShort=Only leads
-OpenedOpportunitiesShort=Open leads
-NotOpenedOpportunitiesShort=Not an open lead
-NotAnOpportunityShort=Not a lead
-OpportunityTotalAmount=Total amount of leads
-OpportunityPonderatedAmount=Weighted amount of leads
-OpportunityPonderatedAmountDesc=Leads amount weighted with probability
-OppStatusPROSP=Prospection
-OppStatusQUAL=Qualification
+ProjectMustBeValidatedFirst=Projekt måste bekräftas först
+FirstAddRessourceToAllocateTime=Tilldela en användarresurs till uppgift för att allokera tid
+InputPerDay=Ingång per dag
+InputPerWeek=Ingång per vecka
+InputDetail=Inmatningsdetalj
+TimeAlreadyRecorded=Det här är den tid som redan spelats in för den här uppgiften / dag och användare %s
+ProjectsWithThisUserAsContact=Projekt med denna användare som kontakt
+TasksWithThisUserAsContact=Uppgifter som tilldelats den här användaren
+ResourceNotAssignedToProject=Ej tilldelat till projekt
+ResourceNotAssignedToTheTask=Ej tilldelad uppgiften
+NoUserAssignedToTheProject=Inga användare tilldelade detta projekt
+TimeSpentBy=Tid spenderad av
+TasksAssignedTo=Uppgifter som är tilldelade till
+AssignTaskToMe=Tilldela uppgift åt mig
+AssignTaskToUser=Tilldela uppgiften till %s
+SelectTaskToAssign=Välj uppgift att tilldela ...
+AssignTask=Tilldela
+ProjectOverview=Översikt
+ManageTasks=Använd projekt för att följa upp uppgifter och / eller rapportera tid (tidtabeller)
+ManageOpportunitiesStatus=Använd projekt för att följa ledningar / möjligheter
+ProjectNbProjectByMonth=Antal skapade projekt per månad
+ProjectNbTaskByMonth=Antal skapade uppgifter per månad
+ProjectOppAmountOfProjectsByMonth=Antalet leder per månad
+ProjectWeightedOppAmountOfProjectsByMonth=Viktad mängd ledningar per månad
+ProjectOpenedProjectByOppStatus=Öppna projekt / ledning med blystatus
+ProjectsStatistics=Statistik över projekt / ledningar
+TasksStatistics=Statistik över projekt / ledningsuppgifter
+TaskAssignedToEnterTime=Uppgift som tilldelats. Det är möjligt att ange tid på denna uppgift.
+IdTaskTime=Id uppgiftstid
+YouCanCompleteRef=Om du vill slutföra referensnumret med något suffix rekommenderas det att lägga till ett - tecken för att skilja det, så den automatiska numreringen fungerar fortfarande korrekt för nästa projekt. Till exempel %s-MYSUFFIX
+OpenedProjectsByThirdparties=Öppna projekt av tredje part
+OnlyOpportunitiesShort=Endast leder
+OpenedOpportunitiesShort=Öppna ledningar
+NotOpenedOpportunitiesShort=Inte en öppen ledning
+NotAnOpportunityShort=Inte en ledning
+OpportunityTotalAmount=Totalt antal ledningar
+OpportunityPonderatedAmount=Viktad mängd ledare
+OpportunityPonderatedAmountDesc=Ledningar beloppas viktat med sannolikhet
+OppStatusPROSP=prospektering
+OppStatusQUAL=Kompetens
 OppStatusPROPO=Förslag
-OppStatusNEGO=Negociation
+OppStatusNEGO=förhandling
 OppStatusPENDING=Avvaktande
-OppStatusWON=Won
-OppStatusLOST=Lost
+OppStatusWON=Vann
+OppStatusLOST=Förlorat
 Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
-LatestProjects=Latest %s projects
-LatestModifiedProjects=Latest %s modified projects
-OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+AllowToLinkFromOtherCompany=Tillåt att länka projektet från annat företag <br> <br> <u> Stödda värden: </u> <br> - Håll tom: Kan länka alla projekt av företaget (standard) <br> - "all": Kan länka alla projekt, även projekt från andra företag <br> - En lista över tredjeparts-ID separerade med kommatecken: kan länka alla projekt av dessa tredje partier (Exempel: 123,4795,53) <br>
+LatestProjects=Senaste %s projekten
+LatestModifiedProjects=Senaste %s modifierade projekten
+OtherFilteredTasks=Andra filtrerade uppgifter
+NoAssignedTasks=Inga tilldelade uppgifter hittades (tilldela projekt / uppgifter till den nuvarande användaren från den övre väljrutan för att ange tid på det)
+ThirdPartyRequiredToGenerateInvoice=En tredje part måste definieras på projekt för att kunna fakturera det.
 # Comments trans
-AllowCommentOnTask=Allow user comments on tasks
-AllowCommentOnProject=Allow user comments on projects
-DontHavePermissionForCloseProject=You do not have permissions to close the project %s
-DontHaveTheValidateStatus=The project %s must be open to be closed
-RecordsClosed=%s project(s) closed
-SendProjectRef=Information project %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
-NewTaskRefSuggested=Task ref already used, a new task ref is required
-TimeSpentInvoiced=Time spent billed
+AllowCommentOnTask=Tillåt användar kommentarer på uppgifter
+AllowCommentOnProject=Tillåt användar kommentarer på projekt
+DontHavePermissionForCloseProject=Du har inte behörigheter att stänga projektet %s
+DontHaveTheValidateStatus=Projektet %s måste vara öppet för att stängas
+RecordsClosed=%s projekt (er) stängt
+SendProjectRef=Informationsprojekt %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Modul "Löner" måste vara aktiverat för att definiera arbetstimmar per timme för att få tiden spenderad valoriserad
+NewTaskRefSuggested=Uppgiftsreferens redan används, en ny uppgiftsreferens krävs
+TimeSpentInvoiced=Tid förbrukad fakturerad
 TimeSpentForInvoice=Tid
-OneLinePerUser=One line per user
-ServiceToUseOnLines=Service to use on lines
-InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+OneLinePerUser=En rad per användare
+ServiceToUseOnLines=Service att använda på linjer
+InvoiceGeneratedFromTimeSpent=Faktura %s har genererats från tid till projekt
+ProjectBillTimeDescription=Kontrollera om du anger tidtabell för projektuppgifter OCH du planerar att generera faktura (er) från tidtabellen för att debitera kunden för projektet (kontrollera inte om du planerar att skapa en faktura som inte är baserad på angivna tidtabeller).
diff --git a/htdocs/langs/sv_SE/stripe.lang b/htdocs/langs/sv_SE/stripe.lang
index 79ecf17de37..9213cb8b250 100644
--- a/htdocs/langs/sv_SE/stripe.lang
+++ b/htdocs/langs/sv_SE/stripe.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
-StripeOrCBDoPayment=Pay with credit card or Stripe
+StripeSetup=Stripe modul inställning
+StripeDesc=Erbjud kunderna en Stripe online betalningssida för betalningar med kredit- / bankkort via <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Detta kan användas för att dina kunder ska kunna göra ad hoc-betalningar eller för betalningar relaterade till ett visst Dolibarr-objekt (faktura, order, ...)
+StripeOrCBDoPayment=Betala med kreditkort eller Stripe
 FollowingUrlAreAvailableToMakePayments=Följande webbadresser finns att erbjuda en sida till en kund att göra en förskottsbetalning Dolibarr objekt
 PaymentForm=Inbetalningskort
 WelcomeOnPaymentPage=Välkommen till vår online betalningstjänst
@@ -9,11 +9,11 @@ ThisScreenAllowsYouToPay=Denna skärm tillåter dig att göra en online-betalnin
 ThisIsInformationOnPayment=Detta är information om betalning för att göra
 ToComplete=För att komplettera
 YourEMail=E-post för betalning bekräftelse
-STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+STRIPE_PAYONLINE_SENDEMAIL=E-postmeddelande efter ett betalningsförsök (framgång eller misslyckande)
 Creditor=Borgenär
 PaymentCode=Betalning kod
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
-YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=Du kommer att omdirigeras på en säker Stripe-sida för att mata in kreditkortsinformation
 Continue=Nästa
 ToOfferALinkForOnlinePayment=URL för %s betalning
 ToOfferALinkForOnlinePaymentOnOrder=URL för att erbjuda ett %s online betalningsgränssnitt för en orderorder
@@ -22,44 +22,46 @@ ToOfferALinkForOnlinePaymentOnContractLine=URL för att erbjuda en %s online gr
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL för att erbjuda en %s online gränssnitt betalning användare för en fri belopp
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL för att erbjuda en %s online gränssnitt betalning användare för en medlem prenumeration
 YouCanAddTagOnUrl=Du kan också lägga till url parameter <b>&tag = <i>värde</i></b> för någon av dessa URL (krävs endast för gratis betalning) för att lägga till din egen kommentar tagg betalning.
-SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+SetupStripeToHavePaymentCreatedAutomatically=Ställ in din Stripe med url <b> %s </b> för att få betalning skapad automatiskt när bekräftat av Stripe.
 AccountParameter=Tagen parametrar
 UsageParameter=Användning parametrar
 InformationToFindParameters=Hjälp att hitta din %s kontoinformation
-STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+STRIPE_CGI_URL_V2=Url av Stripe CGI-modul för betalning
 VendorName=Namn på leverantör
 CSSUrlForPaymentForm=CSS-formatmall URL för inbetalningskort
-NewStripePaymentReceived=New Stripe payment received
-NewStripePaymentFailed=New Stripe payment tried but failed
-STRIPE_TEST_SECRET_KEY=Secret test key
-STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
-STRIPE_LIVE_SECRET_KEY=Secret live key
-STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
-StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
-StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+NewStripePaymentReceived=Ny Stripbetalning mottagen
+NewStripePaymentFailed=Ny Stripbetalning försökte men misslyckades
+STRIPE_TEST_SECRET_KEY=Hemlig testnyckel
+STRIPE_TEST_PUBLISHABLE_KEY=Publicerbar testnyckel
+STRIPE_TEST_WEBHOOK_KEY=Webhook testnyckel
+STRIPE_LIVE_SECRET_KEY=Hemlig levande nyckel
+STRIPE_LIVE_PUBLISHABLE_KEY=Publicerbar levande nyckel
+STRIPE_LIVE_WEBHOOK_KEY=Webhook levande nyckel
+ONLINE_PAYMENT_WAREHOUSE=Lager som ska användas för lagerminskning när online betalning görs <br> (TODO När alternativet att minska lagret görs på en fakturahandling och online betalning genererar fakturaen?)
+StripeLiveEnabled=Stripe live enabled (annars test / sandbox-läge)
+StripeImportPayment=Importera Stripe betalningar
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
-OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
-OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
-BankAccountForBankTransfer=Bank account for fund payouts
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca _...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca _...)
+BankAccountForBankTransfer=Bankkonto för utbetalningar
+StripeAccount=Stripe konto
+StripeChargeList=Lista över Stripe avgifter
+StripeTransactionList=Lista över Stripe-transaktioner
+StripeCustomerId=Stripe kund id
+StripePaymentModes=Stripe betalningssätt
+LocalID=Lokalt ID
 StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+NameOnCard=namn på kort
+CardNumber=Kortnummer
+ExpiryDate=Utgångsdatum
 CVN=CVN
-DeleteACard=Delete Card
-ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
-CreateCustomerOnStripe=Create customer on Stripe
-CreateCardOnStripe=Create card on Stripe
-ShowInStripe=Show in Stripe
-StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
-StripePayoutList=List of Stripe payouts
+DeleteACard=Radera kort
+ConfirmDeleteCard=Är du säker på att du vill radera detta kredit- eller betalkort?
+CreateCustomerOnStripe=Skapa kund på Stripe
+CreateCardOnStripe=Skapa kort på Stripe
+ShowInStripe=Visa i Stripe
+StripeUserAccountForActions=Användarkonto som ska användas för e-postnotifiering av vissa Stripe-händelser (Stripe-utbetalningar)
+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)
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index 2cd3a49ef1c..79c01a8b4aa 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -95,4 +95,9 @@ InternalURLOfPage=Intern webbadress
 ThisPageIsTranslationOf=Den här sidan / behållaren är en översättning av
 ThisPageHasTranslationPages=Den här sidan / behållaren har översättning
 NoWebSiteCreateOneFirst=Ingen hemsida har skapats än. Skapa en första.
-GoTo=Go to
+GoTo=Gå till
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index ccba0841767..daa5b4ef413 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index a36d63c7373..e8a5dda7efb 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/sw_SW/agenda.lang b/htdocs/langs/sw_SW/agenda.lang
index b928554b328..30c2a3d4038 100644
--- a/htdocs/langs/sw_SW/agenda.lang
+++ b/htdocs/langs/sw_SW/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index 5bc061f31f3..cb39150b627 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-BIC=BIC/SWIFT number
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Statement
 AccountStatements=Account statements
 LastAccountStatements=Last account statements
 IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Supplier payment
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index 0934b4c1e46..c9d46e4ffff 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Payment amount
-ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/sw_SW/cashdesk.lang b/htdocs/langs/sw_SW/cashdesk.lang
index 5138fe80be3..006097b7e82 100644
--- a/htdocs/langs/sw_SW/cashdesk.lang
+++ b/htdocs/langs/sw_SW/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 83b931731df..3f175b8b782 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=New payment
-Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 68db165215d..b5a9d70cb70 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/sw_SW/holiday.lang b/htdocs/langs/sw_SW/holiday.lang
index 951af61f273..9aafa73550e 100644
--- a/htdocs/langs/sw_SW/holiday.lang
+++ b/htdocs/langs/sw_SW/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index c739f8d5624..6efbe942032 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
 Email=Email
 NoEMail=No email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
index b29477e346d..9517568846c 100644
--- a/htdocs/langs/sw_SW/members.lang
+++ b/htdocs/langs/sw_SW/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=Members
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=Late
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/sw_SW/paybox.lang b/htdocs/langs/sw_SW/paybox.lang
index 0d35ac440fa..d5e4fd9ba55 100644
--- a/htdocs/langs/sw_SW/paybox.lang
+++ b/htdocs/langs/sw_SW/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Do payment
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/sw_SW/paypal.lang b/htdocs/langs/sw_SW/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/sw_SW/paypal.lang
+++ b/htdocs/langs/sw_SW/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 841b4a604d3..402779cb00f 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index b0c1113b0ec..76bd0ce597d 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 6ca0bb1f878..49afe5a1c3f 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=บัญชีฉลาก
 LabelOperation=Label operation
 Sens=ซองส์
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=วารสาร
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index aede44fe8fe..5e29578df8b 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=นอกจากนี้ถ้าคุณม
 UseSearchToSelectContactTooltip=นอกจากนี้ถ้าคุณมีจำนวนมากของบุคคลที่สาม (> 100 000) คุณสามารถเพิ่มความเร็วโดยการตั้งค่า CONTACT_DONOTSEARCH_ANYWHERE คงเป็น 1 ใน Setup-> อื่น ๆ ค้นหาแล้วจะถูก จำกัด ในการเริ่มต้นของสตริง
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr ของตัวละครที่จะเรียกการค้นหา:% s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=ไม่สามารถใช้ได้เมื่ออาแจ็กซ์ปิดการใช้งาน
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=ปิดใช้งาน JavaScript
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=พอร์ต
 VirtualServerName=ชื่อเซิร์ฟเวอร์เสมือนจริง
 OS=ระบบปฏิบัติการ
 PhpWebLink=การเชื่อมโยงเว็บ Php
-Browser=เบราว์เซอร์
 Server=เซิร์ฟเวอร์
 Database=ฐานข้อมูล
 DatabaseServer=โฮสต์ฐานข้อมูล
@@ -1077,7 +1079,7 @@ SystemInfoDesc=ข้อมูลระบบข้อมูลทางด้
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=เพื่อเปิดใช้งานโมดูลไปในพื้นที่การติดตั้ง (หน้าแรก> Setup-> โมดูล)
@@ -1237,8 +1239,6 @@ BillsNumberingModule=ใบแจ้งหนี้และบันทึก
 BillsPDFModules=รูปแบบเอกสารใบแจ้งหนี้
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=ใบลดหนี้
-CreditNotes=บันทึกเครดิต
 ForceInvoiceDate=วันที่ใบแจ้งหนี้กองทัพวันที่ตรวจสอบ
 SuggestedPaymentModesIfNotDefinedInInvoice=โหมดการชำระเงินในใบแจ้งหนี้ที่แนะนำโดยค่าเริ่มต้นหากไม่ได้กำหนดไว้สำหรับใบแจ้งหนี้
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=ไปรษณีย์
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang
index b2085b8d7c6..dcdcc20bf88 100644
--- a/htdocs/langs/th_TH/agenda.lang
+++ b/htdocs/langs/th_TH/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=กิจกรรมสำหรับ Dolibarr ซึ่งจ
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=สัญญา% ผ่านการตรวจสอบ
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=ข้อเสนอ% s ลงนาม
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index e3ae16cdab9..dba838ca5e5 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=ธนาคาร
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=ชื่อธนาคาร
 FinancialAccount=บัญชี
 BankAccount=บัญชีเงินฝาก
 BankAccounts=บัญชีเงินฝากธนาคาร
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=แสดงบัญชี
 AccountRef=อ้างอิงบัญชีการเงิน
 AccountLabel=ป้ายชื่อบัญชีการเงิน
@@ -30,7 +30,7 @@ AllTime=จากจุดเริ่มต้น
 Reconciliation=การประนีประนอม
 RIB=หมายเลขบัญชีธนาคาร
 IBAN=IBAN จำนวน
-BIC=BIC / จำนวน SWIFT
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=คำแถลง
 AccountStatements=งบบัญชี
 LastAccountStatements=ใบแจ้งยอดบัญชีล่าสุด
 IOMonthlyReporting=รายงานรายเดือน
-BankAccountDomiciliation=ที่อยู่บัญชี
+BankAccountDomiciliation=Bank address
 BankAccountCountry=ประเทศบัญชี
 BankAccountOwner=ชื่อเจ้าของบัญชี
 BankAccountOwnerAddress=ที่อยู่เจ้าของบัญชี
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=สร้างบัญชี
 NewBankAccount=บัญชีใหม่
 NewFinancialAccount=บัญชีทางการเงินใหม่
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=การชำระเงินของลูกค้า
-SupplierInvoicePayment=การชำระเงินผู้ผลิต
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=การชำระเงินการสมัครสมาชิก
 WithdrawalPayment=การชำระเงินการถอนเงิน
 SocialContributionPayment=สังคม / ชำระภาษีการคลัง
 BankTransfer=โอนเงินผ่านธนาคาร
 BankTransfers=ธนาคารโอน
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=จาก
 TransferTo=ไปยัง
 TransferFromToDone=<b>การถ่ายโอนจาก% s% s% s%</b> s ได้รับการบันทึก
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=กลับไปที่บัญชี
 ShowAllAccounts=แสดงสำหรับบัญชีทั้งหมด
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=เลือกบัญชีธนาคารที่เกี่ยวข้องกับการเจรจาต่อรอง ใช้ค่าตัวเลขจัดเรียง: YYYYMM หรือ YYYYMMDD
 EventualyAddCategory=ในที่สุดระบุหมวดหมู่ในการที่จะจำแนกบันทึก
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 769d63cb686..b1eaa9aec89 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=จ่ายคืน
 DeletePayment=ลบการชำระเงิน
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=การชำระเงินที่ได้รับ
 ReceivedCustomersPayments=การชำระเงินที่ได้รับจากลูกค้า
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=จำนวนเงินที่ชำระ
-ValidatePayment=ตรวจสอบการชำระเงิน
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
index f890595cb8b..571571abd1e 100644
--- a/htdocs/langs/th_TH/cashdesk.lang
+++ b/htdocs/langs/th_TH/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=ประวัติศาสตร์
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 032ca29ce00..675fddaa40f 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=สังคม / ภาษีการคลังที่จะต้องจ่าย
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=การชำระเงินใหม่
-Payments=วิธีการชำระเงิน
 PaymentCustomerInvoice=การชำระเงินตามใบแจ้งหนี้ของลูกค้า
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=สังคม / ชำระภาษีการคลัง
@@ -205,7 +204,6 @@ SellsJournal=วารสารการขาย
 PurchasesJournal=วารสารการสั่งซื้อสินค้า
 DescSellsJournal=วารสารการขาย
 DescPurchasesJournal=วารสารการสั่งซื้อสินค้า
-InvoiceRef=อ้างอิงใบแจ้งหนี้
 CodeNotDef=ไม่กำหนด
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=ในระยะวันที่ชำระเงินไม่สามารถจะต่ำกว่าวันที่วัตถุ
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index f0cb0db6be9..66063d8262a 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/th_TH/holiday.lang b/htdocs/langs/th_TH/holiday.lang
index b46071244b8..db34cd76755 100644
--- a/htdocs/langs/th_TH/holiday.lang
+++ b/htdocs/langs/th_TH/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=การตรวจสอบการร้องขอลา
 HolidaysValidatedBody=คำขอลาสำหรับ% s% s ได้รับการตรวจสอบ
 HolidaysRefused=ขอปฏิเสธ
-HolidaysRefusedBody=คำขอลาสำหรับ% s% s ได้รับการปฏิเสธด้วยเหตุผลต่อไปนี้:
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=ยกเลิกคำขอใบ
 HolidaysCanceledBody=คำขอลาสำหรับ% s% s ได้ถูกยกเลิก
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 0ad02336cfb..1b5fa626326 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -371,6 +371,7 @@ Percentage=ร้อยละ
 Total=ทั้งหมด
 SubTotal=ไม่ทั้งหมด
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=รวม (รวมภาษี).
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=ส่งอีเมล
 Email=อีเมล์
 NoEMail=ไม่มีอีเมล
-Email=อีเมล์
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=ไม่มีโทรศัพท์มือถือ
@@ -671,7 +671,6 @@ Method=วิธี
 Receive=ได้รับ
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=มูลค่าปัจจุบัน
 PartialWoman=เป็นบางส่วน
 TotalWoman=ทั้งหมด
 NeverReceived=ไม่เคยได้รับ
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=แบ่งประเภทเรียกเก็บเงิน
 ClassifyUnbilled=Classify unbilled
 Progress=ความคืบหน้า
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=สำนักงานกลับ
 View=View
@@ -842,6 +842,11 @@ Exports=การส่งออก
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=ตัวเลือกการส่งออก
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=เบ็ดเตล็ด
 Calendar=ปฏิทิน
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=ปีงบประมาณ
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index ed7fece3dab..ee30645427f 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -6,7 +6,7 @@ Member=สมาชิก
 Members=สมาชิก
 ShowMember=แสดงบัตรสมาชิก
 UserNotLinkedToMember=ผู้ใช้ไม่ได้เชื่อมโยงไปยังสมาชิก
-ThirdpartyNotLinkedToMember=บุคคลที่สามไม่ได้เชื่อมโยงไปยังสมาชิก
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=บัตรสมาชิก
 FundationMembers=สมาชิกมูลนิธิ
 ListOfValidatedPublicMembers=ตรวจสอบรายชื่อของสมาชิกในที่สาธารณะ
@@ -67,11 +67,11 @@ Subscriptions=การสมัครเป็นสมาชิก
 SubscriptionLate=สาย
 SubscriptionNotReceived=ไม่เคยได้รับการจองซื้อ
 ListOfSubscriptions=รายชื่อของการสมัคร
-SendCardByMail=ส่งบัตรทางอีเมล์
+SendCardByMail=Send card by email
 AddMember=สร้างสมาชิก
 NoTypeDefinedGoToSetup=ประเภทสมาชิกไม่มีกำหนด ไปที่เมนู "สมาชิกประเภท"
 NewMemberType=ประเภทสมาชิกใหม่
-WelcomeEMail=ยินดีต้อนรับอีเมล
+WelcomeEMail=Welcome email
 SubscriptionRequired=ต้องสมัครสมาชิก
 DeleteType=ลบ
 VoteAllowed=โหวตที่ได้รับอนุญาต
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=ไฟล์ htpasswd
 ValidateMember=ตรวจสอบสมาชิก
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=การเชื่อมโยงต่อไปนี้เป็นหน้าเปิดไม่ได้รับการคุ้มครองโดยได้รับอนุญาตใด ๆ Dolibarr พวกเขาจะไม่หน้าจัดรูปแบบให้เป็นตัวอย่างแสดงให้เห็นว่าในรายการฐานข้อมูลสมาชิก
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=รายชื่อสมาชิกสาธารณะ
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=เนื้อหาของบัตรสมาชิกขอ
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=เรื่องของ e-mail ที่ได้รับในกรณีที่มีการจารึกอัตโนมัติของผู้เข้าพัก
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail ที่ได้รับในกรณีที่มีการจารึกอัตโนมัติของผู้เข้าพัก
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=ส่งอีเมลสำหรับอีเมลอัตโนมัติ
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=รูปแบบของหน้าป้าย
 DescADHERENT_ETIQUETTE_TEXT=ข้อความที่พิมพ์อยู่บนแผ่นสมาชิก
 DescADHERENT_CARD_TYPE=รูปแบบของหน้าไพ่
@@ -156,8 +156,8 @@ DocForAllMembersCards=สร้างนามบัตรสำหรับส
 DocForOneMemberCards=สร้างนามบัตรของสมาชิกโดยเฉพาะอย่างยิ่ง
 DocForLabels=สร้างแผ่นอยู่
 SubscriptionPayment=การชำระเงินการสมัครสมาชิก
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=สถิติสมาชิกตามประเทศ
 MembersStatisticsByState=สถิติสมาชิกโดยรัฐ / จังหวัด
 MembersStatisticsByTown=สถิติสมาชิกโดยเมือง
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับสมาชิกโดยธรรมชาติ
 MembersByRegion=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับสมาชิกตามภูมิภาค
 VATToUseForSubscriptions=อัตราภาษีมูลค่าเพิ่มที่จะใช้สำหรับการสมัครสมาชิก
-NoVatOnSubscription=ไม่มี TVA สำหรับการสมัครสมาชิก
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=ผลิตภัณฑ์ที่ใช้สำหรับสายการสมัครสมาชิกเข้าไปในใบแจ้งหนี้:% s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/th_TH/modulebuilder.lang b/htdocs/langs/th_TH/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/th_TH/modulebuilder.lang
+++ b/htdocs/langs/th_TH/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/th_TH/paybox.lang b/htdocs/langs/th_TH/paybox.lang
index 3c36ccf09b3..486ecac5aa1 100644
--- a/htdocs/langs/th_TH/paybox.lang
+++ b/htdocs/langs/th_TH/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=ให้เสร็จสมบูรณ์
 YourEMail=ส่งอีเมล์ถึงจะได้รับการยืนยันการชำระเงิน
 Creditor=เจ้าหนี้
 PaymentCode=รหัสการชำระเงิน
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=การชำระเงินทำ
 YouWillBeRedirectedOnPayBox=คุณจะถูกเปลี่ยนเส้นทางในหน้า Paybox การรักษาความปลอดภัยในการป้อนข้อมูลบัตรเครดิต
 Continue=ถัดไป
 ToOfferALinkForOnlinePayment=สำหรับการชำระเงิน URL% s
-ToOfferALinkForOnlinePaymentOnOrder=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์ s% สำหรับการสั่งซื้อของลูกค้า
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์% s สำหรับใบแจ้งหนี้ลูกค้า
 ToOfferALinkForOnlinePaymentOnContractLine=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์% s สำหรับสายสัญญา
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์ s% สำหรับจำนวนเงินที่ฟรี
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์% s สำหรับการสมัครสมาชิก
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=นอกจากนี้คุณยังสามารถเพิ่มพารามิเตอร์ URL <b>และแท็ก = <i>ค่าใด</i></b> ๆ ของ URL เหล่านั้น (ที่จำเป็นเท่านั้นสำหรับการชำระเงินฟรี) เพื่อเพิ่มแท็กความคิดเห็นการชำระเงินของคุณเอง
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=หน้านี้ยืนยันว่าชำระเงินของคุณได้รับการบันทึก ขอบคุณ
@@ -33,7 +33,8 @@ VendorName=ชื่อของผู้ขาย
 CSSUrlForPaymentForm=รูปแบบ CSS url ของแผ่นสำหรับรูปแบบการชำระเงิน
 NewPayboxPaymentReceived=การชำระเงิน Paybox ใหม่ที่ได้รับ
 NewPayboxPaymentFailed=การชำระเงิน Paybox ใหม่พยายาม แต่ล้มเหลว
-PAYBOX_PAYONLINE_SENDEMAIL=อีเมลเตือนหลังจากการชำระเงิน (ความสำเร็จหรือความล้มเหลว)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=ราคาเว็บไซต์ PBX
 PAYBOX_PBX_RANG=ราคา PBX รัง
 PAYBOX_PBX_IDENTIFIANT=ราคา PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/th_TH/paypal.lang b/htdocs/langs/th_TH/paypal.lang
index 757d7cd72b5..4a5335eec9a 100644
--- a/htdocs/langs/th_TH/paypal.lang
+++ b/htdocs/langs/th_TH/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal การติดตั้งโมดูล
-PaypalDesc=หน้าเสนอโมดูลนี้จะอนุญาตให้มีการชำระเงินใน <a href="http://www.paypal.com" target="_blank">PayPal</a> โดยลูกค้า นี้สามารถใช้สำหรับการชำระเงินฟรีหรือการชำระเงินบนวัตถุโดยเฉพาะอย่างยิ่ง Dolibarr (ใบแจ้งหนี้การสั่งซื้อ ... )
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=ชำระเงินด้วย PayPal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=การทดสอบ Mode / ทราย
 PAYPAL_API_USER=ชื่อผู้ใช้ API
 PAYPAL_API_PASSWORD=รหัสผ่าน API
 PAYPAL_API_SIGNATURE=ลายเซ็น API
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=การชำระเงินที่เสนอซื้อ "หนึ่ง" (บัตรเครดิต Paypal +) หรือ "Paypal" เท่านั้น
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=สำคัญ
 PaypalModeOnlyPaypal=PayPal เท่านั้น
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=<b>นี่คือรหัสของรายการ:% s</b>
-PAYPAL_ADD_PAYMENT_URL=เพิ่ม URL ของการชำระเงิน Paypal เมื่อคุณส่งเอกสารทางไปรษณีย์
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=อีเมลเตือนหลังจากการชำระเงิน (ประสบความสำเร็จหรือไม่)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=URL ที่กลับมาหลังจากการชำระเงิน
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 95f260fa2d6..6794219d028 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=ตัวแปรทั่วโลก
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=อัพเดทตัวแปรทั่วโลก
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=ข้อมูล JSON
 GlobalVariableUpdaterHelp0=แยกวิเคราะห์ข้อมูล JSON จาก URL ที่ระบุมูลค่าระบุตำแหน่งของค่าที่เกี่ยวข้อง
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index fd510bbc33d..29b2b33d0ed 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=เวลาที่ใช้
 TimeSpentByYou=เวลาที่ใช้โดยคุณ
 TimeSpentByUser=เวลาที่ใช้โดยผู้ใช้
 TimesSpent=เวลาที่ใช้
-RefTask=อ้าง งาน
-LabelTask=งานป้าย
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=เวลาที่ใช้ในงาน
 TaskTimeUser=ผู้ใช้งาน
 TaskTimeNote=บันทึก
diff --git a/htdocs/langs/th_TH/stripe.lang b/htdocs/langs/th_TH/stripe.lang
index 800bc913724..c0a5acea926 100644
--- a/htdocs/langs/th_TH/stripe.lang
+++ b/htdocs/langs/th_TH/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=URL ต่อไปนี้จะพร้อมที่จะให้หน้าให้กับลูกค้าที่จะทำให้การชำระเงินบนวัตถุ Dolibarr
 PaymentForm=รูปแบบการชำระเงิน
-WelcomeOnPaymentPage=ยินดีต้อนรับในการให้บริการการชำระเงินออนไลน์ของเรา
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=หน้าจอนี้จะช่วยให้คุณสามารถชำระเงินออนไลน์ไปยัง% s
 ThisIsInformationOnPayment=นี้เป็นข้อมูลเกี่ยวกับการชำระเงินที่จะทำ
 ToComplete=ให้เสร็จสมบูรณ์
 YourEMail=ส่งอีเมล์ถึงจะได้รับการยืนยันการชำระเงิน
-STRIPE_PAYONLINE_SENDEMAIL=อีเมลเตือนหลังจากการชำระเงิน (ประสบความสำเร็จหรือไม่)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=เจ้าหนี้
 PaymentCode=รหัสการชำระเงิน
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=ถัดไป
 ToOfferALinkForOnlinePayment=สำหรับการชำระเงิน URL% s
-ToOfferALinkForOnlinePaymentOnOrder=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์ s% สำหรับการสั่งซื้อของลูกค้า
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์% s สำหรับใบแจ้งหนี้ลูกค้า
 ToOfferALinkForOnlinePaymentOnContractLine=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์% s สำหรับสายสัญญา
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์ s% สำหรับจำนวนเงินที่ฟรี
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์% s สำหรับการสมัครสมาชิก
 YouCanAddTagOnUrl=นอกจากนี้คุณยังสามารถเพิ่มพารามิเตอร์ URL <b>และแท็ก = <i>ค่าใด</i></b> ๆ ของ URL เหล่านั้น (ที่จำเป็นเท่านั้นสำหรับการชำระเงินฟรี) เพื่อเพิ่มแท็กความคิดเห็นการชำระเงินของคุณเอง
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=หน้านี้ยืนยันว่าชำระเงินของคุณได้รับการบันทึก ขอบคุณ
-YourPaymentHasNotBeenRecorded=ชำระเงินที่คุณยังไม่ได้รับการบันทึกไว้และได้รับการยกเลิกการทำธุรกรรม ขอบคุณ
 AccountParameter=พารามิเตอร์บัญชี
 UsageParameter=พารามิเตอร์การใช้งาน
 InformationToFindParameters=ช่วยในการหาข้อมูลเกี่ยวกับบัญชีของคุณ s%
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index 921403c7d03..a6ec5d08d6b 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 45ad2777ed3..46871361086 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -33,7 +33,7 @@ DeleteCptCategory=Muhasebe hesabını gruptan kaldırın
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Günlükleme durumu
 AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+NotYetInGeneralLedger=Henüz büyük defterde muhasebeleştirilmedi
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Hesaba göre detayları göster
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -106,8 +106,8 @@ SuppliersVentilation=Tedarikçi faturası bağlama
 ExpenseReportsVentilation=Gider raporu bağlama
 CreateMvts=Yeni işlem oluştur
 UpdateMvts=İşlemi değiştir
-ValidTransaction=Validate transaction
-WriteBookKeeping=İşlemleri Büyük Deftere kaydet
+ValidTransaction=İşlemi doğrula
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Büyük Defter
 AccountBalance=Hesap bakiyesi
 ObjectsRef=Source object ref
@@ -115,8 +115,8 @@ CAHTF=Total purchase vendor before tax
 TotalExpenseReport=Toplam gider raporu
 InvoiceLines=Bağlanacak fatura satırları
 InvoiceLinesDone=Bağlı fatura satırları
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
+ExpenseReportLines=Bağlanacak gider raporu satırları
+ExpenseReportLinesDone=Bağlanmış gider raporları satırları
 IntoAccount=Satırı muhasebe hesabına bağla
 
 
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Satınalınan ürünler için varsayılan muhasebe hesabı (ürün kartlarında tanımlanmışsa)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Satılan ürünler için varsayılan muhasebe hesabı (ürün kartlarında tanımlanmışsa)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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=Satınalınan hizmetler için varsayılan muhasebe hesabı (ürün kartlarında tanımlanmışsa)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Satılan hizmetler için varsayılan muhasebe kodu (hizmet sayfasında tanımlanmamışsa)
 
@@ -177,6 +177,7 @@ LabelAccount=Hesap etiketi
 LabelOperation=Label operation
 Sens=Sens (borsa haberleri yayınlama günlüğü)
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Günlük
 JournalLabel=Journal label
 NumPiece=Parça sayısı
@@ -198,23 +199,23 @@ FinanceJournal=Finance journal
 ExpenseReportsJournal=Gider raporları günlüğü
 DescFinanceJournal=Banka hesabından yapılan tüm ödeme türlerini içeren finans günlüğü
 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
+VATAccountNotDefined=KDV için hesap tanımlı değil
+ThirdpartyAccountNotDefined=Üçüncü parti için hesap tanımlı değil
+ProductAccountNotDefined=Ürün için hesap tanımlı değil
 FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
+BankAccountNotDefined=Banka için hesap tanımlı değil
 CustomerInvoicePayment=Müşteri faturası ödemesi
-ThirdPartyAccount=Third-party account
+ThirdPartyAccount=Üçüncü parti hesabı
 NewAccountingMvt=Yeni İşlem
 NumMvts=İşlem hareket sayısı
 ListeMvts=Hareketler Listesi
 ErrorDebitCredit=Borç ve Alacak aynı anda bir değere sahip olamaz
 AddCompteFromBK=Gruba muhasebe hesapları ekle
-ReportThirdParty=List third-party account
+ReportThirdParty=Üçüncü taraf hesabını listele
 DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
 ListAccounts=Muhasebe hesapları listesi
-UnknownAccountForThirdparty=Unknown third-party account. We will use %s
-UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
+UnknownAccountForThirdparty=Bilinmeyen üçüncü parti hesabı. %s kullanacağız
+UnknownAccountForThirdpartyBlocking=Bilinmeyen üçüncü parti hesabı. Engelleme hatası
 ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
@@ -245,7 +246,7 @@ AutomaticBindingDone=Otomatik bağlama bitti
 ErrorAccountancyCodeIsAlreadyUse=Hata, kullanıldığı için bu muhasebe hesabını silemezsiniz
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 Balancing=Balancing
-FicheVentilation=Binding card
+FicheVentilation=Bağlama kartı
 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
@@ -272,7 +273,7 @@ AccountingJournalType8=Envanter
 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
+NumberOfAccountancyEntries=Girişlerin sayısı
 NumberOfAccountancyMovements=Number of movements
 
 ## Export
@@ -285,11 +286,13 @@ 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_ebp=EBP için dışa aktarım
 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Hesap planı Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=Seçenekler
 OptionModeProductSell=Satış modu
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Satınalma modu
 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
@@ -328,7 +335,7 @@ ToBind=Bağlanacak satırlar
 UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
 
 ## Import
-ImportAccountingEntries=Accounting entries
+ImportAccountingEntries=Muhasebe girişleri
 
 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
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index f6d9efb464f..cc32bd22d77 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -9,7 +9,7 @@ VersionExperimental=Deneysel
 VersionDevelopment=Geliştirme
 VersionUnknown=Bilinmeyen
 VersionRecommanded=Önerilen
-FileCheck=Fileset Integrity Checks
+FileCheck=Dosya Gurubu Bütünlük Kontrolleri
 FileCheckDesc=Bu araç, dosyaların bütünlüğünü ve uygulamanızın kurulumunu kontrol ederek her dosyayı resmi olanla karşılaştırabilmenizi sağlar. Bazı kurulum sabitlerinin değeri de kontrol edilebilir. Bu aracı herhangi bir dosyanın değiştirilip değiştirilmediğini belirlemek için kullanabilirsiniz (örneğin, bir bilgisayar korsanı tarafından).
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
 FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
@@ -32,7 +32,7 @@ PurgeSessions=Oturum Temizleme
 ConfirmPurgeSessions=Tüm oturumları gerçekten temizlemek istiyor musunuz? Bu işlem (kendiniz hariç), tüm kullanıcıların bağlantılarını kesecektir.
 NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
 LockNewSessions=Yeni bağlantıları kilitle
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself? Only user <b>%s</b> will be able to connect after that.
+ConfirmLockNewSessions=Herhangi bir yeni Dolibar bağlantısını kendinize kısıtlamak istediğinizden emin misiniz? Bundan sonra sadece <b>%s</b> kullanıcısı bağlanabilecektir.
 UnlockNewSessions=Bağlantı kilidini kaldır
 YourSession=Oturumunuz
 Sessions=Kullanıcılar Oturumları
@@ -54,8 +54,8 @@ SetupArea=Ayarlar
 UploadNewTemplate=Yeni şablon(lar) yükleyin
 FormToTestFileUploadForm=Dosya yükleme deneme formu (ayarlara göre)
 IfModuleEnabled=Not: yalnızca <b>%s</b> modülü etkinleştirildiğinde evet etkilidir.
-RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
+RemoveLock=<b>%s</b> dosyası mevcutsa, Güncelleme/Yükleme aracının kullanımına izin vermek için kaldırın veya yeniden adlandırın.
+RestoreLock=Güncelleme/Yükleme aracının daha sonraki kullanımlarına engel olmak için <b>%s</b> dosyasını, sadece okuma iznine sahip olacak şekilde, geri yükleyin.
 SecuritySetup=Güvenlik ayarları
 SecurityFilesDesc=Burada dosya yükleme konusunda güvenlikle ilgili seçenekleri tanımlayın.
 ErrorModuleRequirePHPVersion=Hata, bu modül %s veya daha yüksek PHP sürümü gerektirir.
@@ -66,12 +66,14 @@ Dictionary=Sözlükler
 ErrorReservedTypeSystemSystemAuto='system' ve 'systemauto' değerleri tür için ayrılmıştır. 'kullanıcı'yı kendi kayıtlarınıza eklemek için değer olarak kullanabilirsiniz
 ErrorCodeCantContainZero=Kod 0 değerini içeremez
 DisableJavascript=Javascript ve Ajax fonksiyonlarını engelle
-DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=Not: Test veya hata ayıklama amaçlıdır. Görme engelli kişiler veya metin tarayıcılara yönelik optimizasyon için kullanıcı profilinde yer alan ayarları kullanmayı tercih edebilirsiniz.
 UseSearchToSelectCompanyTooltip=Ayrıca çok fazla sayıda üçüncü partiniz varsa (>100 000), Kurulum->Diğer den COMPANY_DONOTSEARCH_ANYWHERE değişmezini 1 e ayarlayarak hızı arttırabilirsiniz. Sonra arama dizenin başlamasıyla sınırlı olacaktır.
 UseSearchToSelectContactTooltip=Ayrıca çok fazla sayıda üçüncü partiniz varsa (>100 000), Kurulum->Diğer den CONTACT_DONOTSEARCH_ANYWHERE değişmezini 1 e ayarlayarak hızı arttırabilirsiniz. Sonra arama dizenin başlamasıyla sınırlı olacaktır.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Aramayı başlatacak karakter sayısı: %s
+NumberOfKeyToSearch=Aramayı tetikleyecek karakter sayısı: %s
+NumberOfBytes=Bayt Sayısı
+SearchString=Arama dizisi
 NotAvailableWhenAjaxDisabled=Ajax devre dışı olduğunda kullanılamaz
 AllowToSelectProjectFromOtherCompany=Bir üçüncü parti belgesinde, başka bir üçüncü partiye bağlantılı bir proje seçilebilir
 JavascriptDisabled=JavaScript devre dışı
@@ -92,7 +94,7 @@ NextValueForInvoices=Sonraki değer (faturalar)
 NextValueForCreditNotes=Sonraki değer (iade faturaları)
 NextValueForDeposit=Sonraki değer (peşinat)
 NextValueForReplacements=Sonraki değer (yenileme)
-MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+MustBeLowerThanPHPLimit=Not: Mevcut <b>PHP yapılandırmanız</b> yükleme için maksimum dosya boyutunu, buradaki parametrenin değeri ne olursa olsun <b>%s</b> %s olarak sınırlandırıyor
 NoMaxSizeByPHPLimit=Not: PHP yapılandırmanızda hiç sınır ayarlanmamış
 MaxSizeForUploadedFiles=Yüklenen dosyalar için ençok boyut (herhangi bir yüklemeye izin vermemek için 0 a ayarlayın)
 UseCaptchaCode=Oturum açma sayfasında grafiksel kod (CAPTCHA) kullan
@@ -136,20 +138,20 @@ AllWidgetsWereEnabled=Mevcut olan tüm ekran etiketleri etkinleştirildi
 PositionByDefault=Varsayılan sıra
 Position=Durum
 MenusDesc=Menü yöneticisi iki menü çubuğunun içeriğini ayarlar (yatay ve dikey).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenusEditorDesc=Menü düzenleyicisi, özel menü girişlerini tanımlamanızı sağlar. Kararsızlığa ve kalıcı olarak erişilemeyen menü girişlerine imkan vermemek için bunu dikkatlice kullanın.<br>Bazı modüller menü girişleri ekler (genellikle <b>Hepsi</b> menüsünde). Bu girişlerin bazılarını yanlışlıkla kaldırırsanız, modülü devre dışı bırakarak ve tekrar etkinleştirerek yanlışlıkla kaldırdığınız girişleri geri yükleyebilirsiniz.
 MenuForUsers=Kullanıcı menüsü
 LangFile=.lang dosyası
-Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+Language_en_US_es_MX_etc=Dil (tr_TR, en_US, ...)
 System=Sistem
 SystemInfo=Sistem bilgileri
 SystemToolsArea=Sistem araçları alanı
-SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+SystemToolsAreaDesc=Bu alan yönetim işlevlerini sunar. İstenilen özelliği seçmek için menüyü kullanın.
 Purge=Temizleme
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Syslog modülü için tanımlı <b>%s</b>dahil olmak üzere günlük dosyalarını sil (bilgi kaybetme riskiniz yoktur)
+PurgeAreaDesc=Bu sayfa Dolibarr tarafından oluşturulan veya depolanan tüm dosyaları silmenizi sağlar (<b>%s</b> dizinindeki geçici veya tüm dosyalar). Bu özelliğin kullanılması normalde gerekli değildir. Bu araç, Dolibarr yazılımı web sunucusu tarafından oluşturulan dosyaların silinmesine izin vermeyen bir sağlayıcı tarafından barındırılan kullanıcılar için geçici bir çözüm olarak sunulur.
+PurgeDeleteLogFile=Syslog modülü için tanımlı <b>%s</b> dahil olmak üzere günlük dosyalarını sil (bilgi kaybetme riskiniz yoktur)
 PurgeDeleteTemporaryFiles=Tüm geçici dosyaları sil (bilgi kaybetme riskiniz yoktur)
 PurgeDeleteTemporaryFilesShort=Geçici dosyaları sil
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeDeleteAllFilesInDocumentsDir=<b>%s</b> dizinindeki bütün dosyaları sil.<br>Bu işlem, öğelerle (üçüncü partiler, faturalar, v.s.) ilgili oluşturulan tüm dosyaları, ECM modülüne yüklenen dosyaları, veritabanı yedekleme dökümlerini ve geçici dosyaları silecektir.
 PurgeRunNow=Şimdi temizle
 PurgeNothingToDelete=Silinecek dizin ya da dosya yok.
 PurgeNDirectoriesDeleted=<b>%s</b> dosya veya dizin silindi.
@@ -197,23 +199,23 @@ BoxesDesc=Ekran Etiketleri, bazı sayfaları özelleştirmek için ekleyebilece
 OnlyActiveElementsAreShown=Yalnızca <ahref="modules.php">etkinleştirilmiş modüllerin</a> öğeleri gösterilmiştir.
 ModulesDesc=Modüller/Uygulamalar, hangi özelliklerin yazılımda mevcut olduğunu belirler. Bazı modüller, modülü etkinleştirdikten sonra kullanıcılara izin verilmesini gerektirir. Açma/kapama butonuna (modül satırının sonunda yer alır) tıklayarak ilgili modülü etkinleştirebilir veya devre dışı bırakabilirsiniz.
 ModulesMarketPlaceDesc=Internette dış web sitelerinde indirmek için daha çok modül bulabilirsiniz...
-ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
+ModulesDeployDesc=Dosya sisteminizdeki izinler imkan veriyorsa harici bir modül kurmak için bu aracı kullanabilirsiniz. Modül daha sonra <strong>%s</strong> sekmede görünecektir.
 ModulesMarketPlaces=Dış uygulama/modül bul
 ModulesDevelopYourModule=Kendi uygulamanızı/modüllerinizi geliştirin
-ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
+ModulesDevelopDesc=Ayrıca kendi modülünüzü geliştirebilir veya sizin için geliştirecek bir partner bulabilirsiniz.
 DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
 NewModule=Yeni
 FreeModule=Free
 CompatibleUpTo=%ssürümü ile uyumlu 
-NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
+NotCompatible=Bu modül Dolibarr'ınızla uyumlu görünmüyor %s (Min %s - Maks %s).
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
-SeeInMarkerPlace=See in Market place
+SeeInMarkerPlace=Market place alanına bakın
 Updated=Güncellendi
 Nouveauté=Novelty
 AchatTelechargement=Satın Al / Yükle
-GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
+GoModuleSetupArea=Yeni bir modül almak/yüklemek için, <a href="%s">%s</a> Modül ayar alanına gidin.
 DoliStoreDesc=DoliStore, Dolibarr ERP/CRM dış modülleri için resmi pazar yeri
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module.
+DoliPartnersDesc=Özel olarak geliştirilmiş modüller veya özellikler sağlayan şirketlerin listesi.<br>Not: Dolibarr açık kaynaklı bir uygulama olduğu için PHP programlamada deneyimli <i>herkes</i> bir modül geliştirebilir.
 WebSiteDesc=Daha fazla eklenti modülleri (ana yazılımda bulunmayan) için harici web siteleri
 DevelopYourModuleDesc=Kendi modülünüzü geliştirmek için bazı çözümler...
 URL=Bağlantı
@@ -227,11 +229,11 @@ Required=Gerekli
 UsedOnlyWithTypeOption=Bazı gündem seçeneği tarafından kullanılan
 Security=Güvenlik
 Passwords=Parolalar
-DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
-MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+DoNotStoreClearPassword=Veritabanında depolanan parolaları şifrele (Düz metin olarak DEĞİL). Bu seçeneği aktif hale getirmeniz şiddetle tavsiye edilir.
+MainDbPasswordFileConfEncrypted=conf.php içinde depolanan veritabanı parolasını şifreleyin. Bu seçeneği aktif hale getirmeniz şiddetle tavsiye edilir.
 InstrucToEncodePass=Parolayı <b>conf.php</b> dosyasına kodlamak için <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b> satırını değiştirin
 InstrucToClearPass=Parolayı <b>conf.php</b> dosyasına kodlamak (temiz) için <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b> satırını değiştirin
-ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
+ProtectAndEncryptPdfFiles=Oluşturulan PDF dosyalarını koruyun. Toplu PDF oluşturulmasını bozduğu için bu ÖNERİLMEZ.
 ProtectAndEncryptPdfFilesDesc=Bir PDF belgesinin korunması dosyanın herhangi bir PDF tarayıcısında okunmasını ve yazdırılmasını sağlar. Bundan düzenleme ve kopyalama yapmak olanaksızdır. Bu özelliği kulanmanın çalışmayan genel kümülatif pdf oluşturduğuna dikkat edin.
 Feature=Özellik
 DolibarrLicense=Lisans
@@ -244,7 +246,7 @@ OfficialMarketPlace=Dış modüller/eklentiler için resmi Pazar yeri
 OfficialWebHostingService=Önerilen web barındırma servisleri (bulut barındırma)
 ReferencedPreferredPartners=Tercihli Ortaklar
 OtherResources=Diğer kaynaklar
-ExternalResources=External Resources
+ExternalResources=Dış Kaynaklar
 SocialNetworks=Sosyal Ağlar
 ForDocumentationSeeWiki=Kullanıcıların ve geliştiricilerin belgeleri (Doc, FAQs…), <br>Dolibarr Wiki ye bir göz atın:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Herhangi bir başka soru/yardım için Dolibarr forumunu kullanabilirsiniz:<br><b><a href="%s" target="_blank">%s</a></b>
@@ -261,21 +263,21 @@ SpaceY=Space Y
 FontSize=Yazı boyutu
 Content=İçerik
 NoticePeriod=Bildirim dönemi
-NewByMonth=New by month
+NewByMonth=Aya göre yeni
 Emails=E-postalar
 EMailsSetup=E-posta kurulumları
 EMailsDesc=Bu sayfa, e-posta gönderimi için varsayılan PHP parametrelerinizin üzerine yazma imkanı verir. Unix/Linux OS sistemindeki çoğu durumda PHP kurulumu doğrudur ve bu parametreler gereksizdir.
-EmailSenderProfiles=Emails sender profiles
+EmailSenderProfiles=E-posta gönderici profilleri
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Portu (php.ini içinde varsayılan değer: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Sunucusu (php.ini içinde varsayılan değer: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Portu (Unix benzeri sistemlerdeki PHP'de tanımlanmamış)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Sunucusu (Unix benzeri sistemlerdeki PHP'de tanımlanmamış)
 MAIN_MAIL_EMAIL_FROM=Otomatik e-postalar için gönderen E-Posta adresi (php.ini içindeki varsayılan değer: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
-MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
+MAIN_MAIL_ERRORS_TO=Geri dönen hatalı mailler için kullanılacak e-posta adresi (gönderilen maillerdeki 'Hatalar-buraya' alanı)
+MAIN_MAIL_AUTOCOPY_TO= Gönderilen tüm maillerin kopyasının (Bcc) gönderileceği e-posta adresi
 MAIN_DISABLE_ALL_MAILS=Tüm e-posta gönderimini devre dışı bırak (test veya demo kullanımı için)
 MAIN_MAIL_FORCE_SENDTO=Tüm e-mailleri şu adreslere gönder (gerçek alıcıların yerine, test amaçlı)
-MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employee users with email into allowed recipient list
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=İzin verilen alıcı listesine e-postası mevcut olan personel kullanıcılar ekleyin
 MAIN_MAIL_SENDMODE=E-posta gönderme yöntemi
 MAIN_MAIL_SMTPS_ID=SMTP ID (gönderme sunucusu kimlik doğrulama gerektiriyorsa)
 MAIN_MAIL_SMTPS_PW=SMTP Şifresi (gönderme sunucusu kimlik doğrulama gerektiriyorsa)
@@ -290,15 +292,15 @@ MAIN_SMS_SENDMODE=SMS göndermek için kullanılacak yöntem
 MAIN_MAIL_SMS_FROM=SMS gönderimi için varsayılan gönderici telefon numarası
 MAIN_MAIL_DEFAULT_FROMTYPE=Manuel gönderim için varsayılan gönderici e-posta adresi (Kullanıcı e-postası veya Şirket e-postası)
 UserEmail=Kullanıcı email adresi
-CompanyEmail=Company Email
+CompanyEmail=Şirket e-posta adresi
 FeatureNotAvailableOnLinux=Unix gibi sistemlerde bu özellik yoktur.
-SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslation=Bu dilin çevirisi tamamlanmamışsa veya hatalar görüyorsanız, <b>langs/%s</b> dizindeki dosyalarını düzenleyerek bu hataları düzeltebilir ve değişikliklerinizi www.transifex.com/dolibarr-association/dolibarr/ adresine gönderebilirsiniz.
 SubmitTranslationENUS=Bu dil için çeviri tamamlanmamışsa ya da hatalar buluyorsanız, bunları <b>langs/%s</b> dizininde düzeltebilir ve değişikliklerinizi dolibarr.org/forum adresine veya geliştiriciler için github.com/Dolibarr/dolibarr adresine gönderebilirsiniz.
 ModuleSetup=Modül kurulumu
 ModulesSetup=Modül/Uygulama kurulumu
 ModuleFamilyBase=Sistem
-ModuleFamilyCrm=Customer Relationship Management (CRM)
-ModuleFamilySrm=Vendor Relationship Management (VRM)
+ModuleFamilyCrm=Müşteri İlişkileri Yönetimi (CRM)
+ModuleFamilySrm=Tedarikçi İlişkileri Yönetimi (SRM)
 ModuleFamilyProducts=Ürün Yönetimi (PM)
 ModuleFamilyHr=İnsan Kaynakları Yönetimi (İK)
 ModuleFamilyProjects=Projeler/Ortak çalışma
@@ -307,7 +309,7 @@ ModuleFamilyTechnic=Çoklu-Modül araçları
 ModuleFamilyExperimental=Deneysel modüller
 ModuleFamilyFinancial=Mali Modüller (Muhasebe/Hazine)
 ModuleFamilyECM=Elektronik İçerik Yönetimi (ECM)
-ModuleFamilyPortal=Websites and other frontal application
+ModuleFamilyPortal=Web siteleri ve diğer ön plan uygulamalar
 ModuleFamilyInterface=Dış sistemli arayüzler
 MenuHandlers=Menü işlemcileri
 MenuAdmin=Menü düzenleyici
@@ -316,16 +318,16 @@ ThisIsProcessToFollow=Yükseltme prosedürü:
 ThisIsAlternativeProcessToFollow=Bu, elle işlem uygulamak için alternatif bir kurulumdur:
 StepNb=Adım %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
-DownloadPackageFromWebSite=Download package (for example from the official web site %s).
-UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+DownloadPackageFromWebSite=Paketi indir (örneğin resmi web sitesinden %s).
+UnpackPackageInDolibarrRoot=Paketlenmiş dosyaları Dolibarr sunucu dizininizde açın/çıkarın: <b>%s</b>
+UnpackPackageInModulesRoot=Harici bir modülü almak/kurmak için sıkıştırılmış dosyaları harici modüller için ayrılmış olan sunucu dizininde açın/çıkarın: <br><b>%s</b>
 SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
 NotExistsDirect=Alternatif kök dizin varolan bir dizine tanımlanmamış.<br>
 InfDirAlt=Sürüm 3 ten beri bir alternatif kök dizin tanımlanabiliyor. Bu sizin ayrılmış bir dizine, eklentiler ve özel şablonlar depolamanızı sağlar.<br>Yalnızca Dolibarr kökünde bir dizin oluşturun (örn. özel).<br>
 InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=Alternatif olarak, modül .zip dosya paketini yükleyebilirsiniz:
 CurrentVersion=Dolibarr geçerli sürümü
-CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+CallUpdatePage=Veritabanı yapısını ve verileri güncelleyen sayfaya gidin: %s.
 LastStableVersion=Son kararlı sürüm
 LastActivationDate=En son aktivasyon tarihi
 LastActivationAuthor=En son aktivasyon yazarı
@@ -349,11 +351,11 @@ ErrorCantUseRazIfNoYearInMask=Hata, {yy} ya da {yyyy} dizisi maske olarak tanım
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Hata, eğer {yy}{mm} ya da {yyyy}{mm} dizisi maske olarak tanımlanmamışsa @ seçeneği kullanılamaz.
 UMask=Unix/Linux/BSD dosya sisteminde yeni dosyalar için Umask parametresi.
 UMaskExplanation=Bu parametre Dolibarr tarafından sunucuda oluşturulan dosyaların izinlerini varsayılan olarak tanımlamanıza (örneğin yükleme sırasında) izin verir.<br>Bu sekizli değer olmalıdır (örneğin, 0666 herkes için okuma ve yazma anlamına gelir).<br>Bu parametre Windows sunucusunda kullanılmaz.
-SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
+SeeWikiForAllTeam=Katkıda bulunanlar ve kuruluşlarının bir listesi için Wiki sayfasına göz atın
 UseACacheDelay= Saniye olarak önbellek aktarması tepki gecikmesi (hiç önbellek yoksa 0 ya da boş)
 DisableLinkToHelpCenter=oturum açma sayfasında "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
 DisableLinkToHelp=Çevrimiçi yardım bağlantısını gizle "<b>%s</b>"
-AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
+AddCRIfTooLong=Otomatik metin kaydırma özelliği olmadığı çok uzun metinlerdeki taşmalar belgeler üzerinde gösterilmeyecektir. Lütfen gerekirse metin alanına satır başı ekleyin.
 ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
 MinLength=Enaz uzunluk
 LanguageFilesCachedIntoShmopSharedMemory=.lang dosyaları paylaşılan hafızaya yüklendi.
@@ -366,7 +368,7 @@ ExampleOfDirectoriesForModelGen=Sözdizimi örnekleri:<br>c:\\mydir<br>/home/myd
 FollowingSubstitutionKeysCanBeUsed=<br>Odt belge şablonlarının nasıl oluşturulacağını öğrenmek için o dizinlere kaydetmeden önce, wiki belgelerini okuyun:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Ad/Soyad konumu
-DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+DescWeather=Gecikmiş eylem sayısı aşağıdaki değerlere ulaştığında gösterge panelinde aşağıdaki resimler gösterilecektir:
 KeyForWebServicesAccess=Web Hizmetleri kullanmak için anahtar (webhizmetlerindeki "dolibarrkey" parametresi)
 TestSubmitForm=Test formu girişi
 ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
@@ -376,7 +378,7 @@ ResponseTimeout=Tepki zaman aşımı
 SmsTestMessage=__ARAYANTEL__ den __ARANANTEL__ e test mesajı
 ModuleMustBeEnabledFirst=Bu özelliğe gereksinim duyarsanız öne <b>%s</b> modülünü etkinleştirmelisiniz.
 SecurityToken=URL leri güvenli kılmak için anahtar
-NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+NoSmsEngine=Sitemde hiç bir SMS gönderme yöneticisi mevcut değil. Standart Dolibarr sürümü ile bir SMS gönderme yöneticisi yüklü gelmez, çünkü bunlar bir dış sağlayıcıya bağlıdır. Yine de şu adresten birkaç tane bulabilirsiniz: %s
 PDF=PDF
 PDFDesc=PDF oluşturma için global seçenekler.
 PDFAddressForging=Adres kutuları için kurallar
@@ -438,17 +440,17 @@ DefaultLink=Varsayılan bağlantı
 SetAsDefault=Varsayılan olarak ayarla
 ValueOverwrittenByUserSetup=Uyarı, bu değer kullanıcıya özel kurulum ile üzerine yazılabilir (her kullanıcı kendine ait clicktodial url ayarlayabilir)
 ExternalModule=Dış modül - %s dizinine kurulmuştur
-BarcodeInitForthird-parties=Mass barcode init for third-parties
+BarcodeInitForthird-parties=Üçüncü partiler için toplu barkod girişi
 BarcodeInitForProductsOrServices=Ürünler ve hizmetler için toplu barkod başlatma ve sıfırlama
 CurrentlyNWithoutBarCode=Şu anda, bazı <strong>%s</strong> kayıtlarınızda <strong>%s</strong> %s tanımlı barkod bulunmamaktadır.
 InitEmptyBarCode=Sonraki %s boş kayıt için ilk değer
 EraseAllCurrentBarCode=Geçerli bütün barkod değerlerini sil
 ConfirmEraseAllCurrentBarCode=Geçerli bütün barkod değerlerini silmek istediğinizden emin misiniz?
 AllBarcodeReset=Tüm barkod değerleri silinmiştir
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
+NoBarcodeNumberingTemplateDefined=Barkod modülünün kurulumunda hiçbir barkod numaralandırma şablonu etkinleştirilmemiş.
 EnableFileCache=Dosya önbelliğini etkinleştir
 ShowDetailsInPDFPageFoot=Sayfa alt bilgisi bölümüne; şirket adresi veya müdür isimleri gibi (profesyonel kimlikler, şirket sermayesi ve Vergi numarasına ilave olarak) daha fazla ayrıntı ekleyin.
-NoDetails=No additional details in footer
+NoDetails=Sayfa altığında ilave bilgi yok
 DisplayCompanyInfo=Firma adresini göster
 DisplayCompanyManagers=Yönetici isimlerini göster
 DisplayCompanyInfoAndManagers=Firma adresini ve yönetici isimlerini göster
@@ -457,24 +459,25 @@ ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer ac
 ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third-party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third-party code.
-Use3StepsApproval=Varsayılan olarak, Satın Alma Siparişlerinin 2 farklı kullanıcı tarafından oluşturulması ve onaylanması gerekir (bir adım/kullanıcı oluşturacak ve bir adım/kullanıcı onaylayacak. Kullanıcının hem oluşturma hem de onaylama izni varsa, bir adım/kullanıcı yeterli olacaktır). Miktar belirli bir değerin üzerindeyse bu seçenekle üçüncü bir adım/kullanıcı onayı vermeyi isteyebilirsiniz (böylece 3 adım zorunlu olacaktır: 1=doğrulama, 2=ilk onay ve 3=miktar yeterli ise ikinci onay).<br>Tek onay (2 adım) yeterli ise bunu boş olarak ayarlayın, ikinci bir onay (3 adım) her zaman gerekiyorsa çok düşük bir değere ayarlayın (0.1).
+Use3StepsApproval=Varsayılan olarak, Tedarikçi Siparişlerinin 2 farklı kullanıcı tarafından oluşturulması ve onaylanması gerekir (bir adım/kullanıcı oluşturacak ve bir adım/kullanıcı onaylayacak. Kullanıcının hem oluşturma hem de onaylama izni varsa, bir adım/kullanıcı yeterli olacaktır). Miktar belirli bir değerin üzerindeyse bu seçenekle üçüncü bir adım/kullanıcı onayı vermeyi isteyebilirsiniz (böylece 3 adım zorunlu olacaktır: 1=doğrulama, 2=ilk onay ve 3=miktar yeterli ise ikinci onay).<br>Tek onay (2 adım) yeterli ise bunu boş olarak ayarlayın, ikinci bir onay (3 adım) her zaman gerekiyorsa çok düşük bir değere ayarlayın (0.1).
 UseDoubleApproval=Tutar (vergi öncesi) bu tutardan yüksekse 3 aşamalı bir onaylama kullanın...
 WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Açıklamayı görmek için tıkla
 DependsOn=This module needs the module(s)
 RequiredBy=Bu modül, modül (ler) için zorunludur
-TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
-PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+TheKeyIsTheNameOfHtmlField=Bu, HTML alanının adıdır. Bir alanın anahtar adını almak için HTML sayfasının içeriğini okumada teknik bilgiye ihtiyaç vardır.
+PageUrlForDefaultValues=Sayfa URL’sinin göreceli yolunu girmelisiniz. Parametreleri URL'ye dahil ederseniz, tüm parametrelerin aynı değere ayarlanması durumunda varsayılan değerler etkili olacaktır.
+PageUrlForDefaultValuesCreate=<br>Örnek:<br>Yeni bir üçüncü parti oluşturma formu kullanacaksak bu değer <strong>%s</strong> şeklindedir.<br>Özel dizinde kurulmuş olan harici modüllerin URL'ne "custom/" eklemeyin,  yani custom/mymodule/mypage.php yerine <strong>mymodule/mypage.php</strong> gibi bir yol kullanın.<br>Url bazı parametreler içeriyorsa ve sadece varsayılan değeri istiyorsanız <strong>%s</strong> kullanabilirsiniz.
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-EnableDefaultValues=Enable customization of default values
+AlsoDefaultValuesAreEffectiveForActionCreate=Form oluşturmak için varsayılan değerlerin üzerine yazma işleminin sadece doğru bir şekilde tasarlanmış sayfalarda çalışacağını unutmayın (action=create veya presend... parametresi ile)
+EnableDefaultValues=Varsayılan değerlerin kişiselleştirilmesini etkinleştir
 EnableOverwriteTranslation=Üzerine yazılabilir çeviri kullanımını etkinleştir
-GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
-WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+GoIntoTranslationMenuToChangeThis=Bu kodlu anahtar için bir çeviri bulundu. Bu değeri değiştirmek için onu Giriş-Ayarlar-Çeviri bölümünde düzenlemelisiniz.
+WarningSettingSortOrder=Uyarı: Varsayılan bir sıralama düzeni ayarlamak, eğer alan bilinmeyen bir alan ise liste sayfasına giderken teknik bir hataya neden olabilir. Böyle bir hatayla karşılaşırsanız varsayılan sıralama düzenini kaldırmak için bu sayfaya geri dönün ve önceki davranışı geri yükleyin.
 Field=Alan
 ProductDocumentTemplates=Ürün belgesi oluşturmak için belge şablonları
-FreeLegalTextOnExpenseReports=Gider raporlarında ücretsiz yasal metni
+FreeLegalTextOnExpenseReports=Gider raporları üzerindeki yasal bilgileri içeren serbest metin
 WatermarkOnDraftExpenseReports=Taslak gider raporlarındaki filigran
 AttachMainDocByDefault=Ana belgeyi varsayılan olarak e-postaya eklemek istiyorsanız bunu 1 olarak ayarlayın (uygunsa)
 FilesAttachedToEmail=Dosya ekle
@@ -494,7 +497,7 @@ Module1Name=Üçüncü Partiler
 Module1Desc=Şirket ve kişilerin yönetimi (müşteriler, adaylar)
 Module2Name=Ticaret
 Module2Desc=Ticaret yönetimi
-Module10Name=Accounting (simplified)
+Module10Name=Muhasebe (basitleştirilmiş)
 Module10Desc=Veritabanı içeriğine dayalı basit muhasebe raporları (günlükler, ciro). Herhangi defter tablosunu kullanmaz.
 Module20Name=Teklifler
 Module20Desc=Teklif yönetimi
@@ -502,12 +505,12 @@ Module22Name=Toplu E-Postalamalar
 Module22Desc=Toplu e-postaları yönet
 Module23Name=Enerji
 Module23Desc=Enerji tüketimlerinin izlenmesi
-Module25Name=Sales Orders
-Module25Desc=Sales order management
+Module25Name=Müşteri Siparişleri
+Module25Desc=Müşteri siparişi yönetimi
 Module30Name=Faturalar
 Module30Desc=Müşteriler için fatura ve alacak dekontlarının yönetimi. Tedarikçiler için fatura ve alacak dekontlarının yönetimi
 Module40Name=Tedarikçiler
-Module40Desc=Vendors and purchase management (purchase orders and billing)
+Module40Desc=Tedarikçiler ve satın alma yönetimi (tedarikçi siparişleri ve faturalandırma)
 Module42Name=Hata Ayıklama Günlükleri
 Module42Desc=Günlükleme araçları (dosya, syslog, ...). Bu gibi günlükler teknik/hata ayıklama amaçları içindir.
 Module49Name=Düzenleyiciler
@@ -519,14 +522,14 @@ Module51Desc=Toplu normal postalamaların yönetimi
 Module52Name=Stoklar
 Module52Desc=Stok yönetimi (sadece ürünler için)
 Module53Name=Hizmetler
-Module53Desc=Management of Services
+Module53Desc=Hizmet Yönetimi
 Module54Name=Sözleşmeler/Abonelikler
 Module54Desc=Sözleşmelerin yönetimi (hizmetler veya yinelenen abonelikler)
 Module55Name=Barkodlar
 Module55Desc=Barkod yönetimi
 Module56Name=Telefon
 Module56Desc=Telefon entegrasyonu
-Module57Name=Bank Direct Debit payments
+Module57Name=Banka Otomatik Ödemeleri
 Module57Desc=Otomatik Ödeme talimatlarının yönetimi. Avrupa ülkeleri için SEPA dosyası üretimini içerir.
 Module58Name=TıklaAra
 Module58Desc=TıklaAra entegrasyonu
@@ -537,8 +540,8 @@ Module70Desc=Müdahale yönetimi
 Module75Name=Giderler ve gezi harcamaları
 Module75Desc=Gider ve gezi harcamaları yönetimi
 Module80Name=Sevkiyatlar
-Module80Desc=Shipments and delivery note management
-Module85Name=Banks & Cash
+Module80Desc=Sevkiyat ve teslimat notu yönetimi
+Module85Name=Banka & Kasa
 Module85Desc=Banka veya kasa yönetimi
 Module100Name=Dış Site
 Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
@@ -555,14 +558,14 @@ Module250Desc=Tool to import data into Dolibarr (with assistants)
 Module310Name=Üyeler
 Module310Desc=Dernek üyeleri yönetimi
 Module320Name=RSS Besleme
-Module320Desc=Add a RSS feed to Dolibarr pages
-Module330Name=Bookmarks & Shortcuts
+Module320Desc=Dolibarr sayfalarına RSS beslemesi ekle
+Module330Name=Yer İmleri & Kısayollar
 Module330Desc=Sıklıkla gittiğiniz dahili veya harici sayfalara kısayollar oluşturun, her zaman erişilebilir hale getirin
 Module400Name=Projects or Leads
 Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Web Takvimi
 Module410Desc=WebT akvimi entegrasyonu
-Module500Name=Taxes & Special Expenses
+Module500Name=Vergiler & Özel Giderler
 Module500Desc=Diğer giderlerin yönetimi (satış vergileri, sosyal veya mali vergiler, temettüler, ...)
 Module510Name=Ücretler
 Module510Desc=Çalışan ödemelerini kaydedin ve takip edin
@@ -575,14 +578,14 @@ Module610Name=Ürün Değişkenleri
 Module610Desc=Ürün değişkenlerinin oluşturulması (renk, ebat v.b.)
 Module700Name=Bağışlar
 Module700Desc=Bağış yönetimi
-Module770Name=Expense Reports
-Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
+Module770Name=Gider Raporları
+Module770Desc=Gider raporu taleplerini yönetin (nakliye, yemek, ...)
+Module1120Name=Tedarikçi Teklifleri
 Module1120Desc=Tedarikçi teklifi ve fiyatları talep edin
 Module1200Name=Mantis
 Module1200Desc=Mantis entegrasyonu
 Module1520Name=Belge Oluşturma
-Module1520Desc=Mass email document generation
+Module1520Desc=Toplu e-posta belgesi oluşturma
 Module1780Name=Etiketler/Kategoriler
 Module1780Desc=Etiket/kategori oluştur (ürünler, müşteriler, tedarikçiler, kişiler ya da üyeler)
 Module2000Name=FCKdüzenleyici (FCKeditor)
@@ -616,10 +619,10 @@ Module6000Name=İş akışı
 Module6000Desc=İş akışı yönetimi (otomatik nesne oluşturma ve/veya otomatik durum değişikliği)
 Module10000Name=Websiteleri
 Module10000Desc=Create websites (public) with a WYSIWYG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
-Module20000Name=Leave Request Management
-Module20000Desc=Define and track employee leave requests
-Module39000Name=Product Lots
-Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
+Module20000Name=İzin İstekleri Yönetimi
+Module20000Desc=Çalışan izni isteklerini tanımlayın ve izleyin
+Module39000Name=Ürün Lotları
+Module39000Desc=Ürünler için lot numarası, seri numarası, son tüketim ve son satış tarihi yönetimi
 Module40000Name=Çoklu parabirim
 Module40000Desc=Fiyat ve belgelerde alternatif para birimlerini kullanın
 Module50000Name=PayBox
@@ -632,12 +635,12 @@ Module50200Name=Paypal
 Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
-Module50400Name=Accounting (double entry)
+Module50400Name=Muhasebe (çift giriş)
 Module50400Desc=Muhasebe yönetimi (çift girişler, genel ve yardımcı defterleri destekleme). Defteri, diğer birçok muhasebe yazılımı formatında dışa aktarın.
 Module54000Name=IPP Yazdır
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module54000Desc=Cups IPP arabirimini kullanarak belgeleri açmadan doğrudan yazdırma (Yazıcının sunucudan görünür olması ve CUPS'un sunucuda yüklü olması gerekir).
 Module55000Name=Anket, Araştırma ya da Oylama
-Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module55000Desc=Çevrimiçi anketler, yoklamalar veya oylamalar oluşturun (Doodle, Studs, RDVz vs. gibi)
 Module59000Name=Kar Oranları
 Module59000Desc=Kar Oranı yönetimi modülü
 Module60000Name=Komisyonlar
@@ -645,7 +648,7 @@ Module60000Desc=Komisyon yönetimi modülü
 Module62000Name=Uluslararası Ticaret Terimleri
 Module62000Desc=Uluslararası Ticaret Terimleri'ni yönetmek için özellikler ekleyin
 Module63000Name=Kaynaklar
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Module63000Desc=Etkinliklere tahsis etmek için kaynakları (yazıcılar, arabalar, odalar, ...) yönetin
 Permission11=Müşteri faturalarını oku
 Permission12=Müşteri faturaları oluştur/düzenle
 Permission13=Müşteri faturalarının doğrulamasını kaldır
@@ -703,7 +706,7 @@ Permission113=Mali hesapları ayarla (kategoriler oluştur, yönet)
 Permission114=Uzlaştırma işlemleri
 Permission115=İşlemleri ve hesap tablolarını dışaaktar
 Permission116=Hesaplar arasında aktarım
-Permission117=Manage checks dispatching
+Permission117=Çek dağıtımını yönet
 Permission121=Kullanıcıya bağlı üçüncü partileri oku
 Permission122=Kullanıcıya bağlı üçüncü parti oluştur/değiştir
 Permission125=Kullanıcıya bağlı üçüncü partileri sil
@@ -713,10 +716,10 @@ Permission142=Create/modify all projects and tasks (also private projects for wh
 Permission144=Bütün proje ve görevleri sil (aynı zamanda ilgilisi olmadığım özel projeleri de)
 Permission146=Sağlayıcıları oku
 Permission147=İstatistikleri oku
-Permission151=Ödeme talimatlarını oku
-Permission152=Ödeme talimatı isteği oluştur/değiştir
-Permission153=Ödeme talimatı emirleri gönder/ilet 
-Permission154=Record Credits/Rejections of direct debit payment orders
+Permission151=Otomatik ödeme talimatlarını oku
+Permission152=Otomatik ödeme talimatı oluştur/değiştir
+Permission153=Otomatik ödeme talimatı gönder/ilet
+Permission154=Otomatik ödeme talimatlarının Kredilendirmesini/Reddedilmesini kaydet
 Permission161=Sözleşme/abonelik oku
 Permission162=Sözleşme/abonelik oluştur/değiştir
 Permission163=Bir sözleşmeye ait bir hizmet/abonelik etkinleştir
@@ -729,14 +732,14 @@ Permission173=Gezi ve gider sil
 Permission174=Bütün gezi ve giderleri oku
 Permission178=Gezi ve gider dışaaktar
 Permission180=Tedarikçi oku
-Permission181=Read purchase orders
-Permission182=Create/modify purchase orders
-Permission183=Validate purchase orders
-Permission184=Approve purchase orders
-Permission185=Order or cancel purchase orders
+Permission181=Tedarikçi siparişlerini oku
+Permission182=Tedarikçi siparişleri oluştur/değiştir
+Permission183=Tedarikçi siparişlerini doğrula
+Permission184=Tedarikçi siparişlerini onayla
+Permission185=Tedarikçi siparişlerini sipariş edin veya iptal edin
 Permission186=Receive purchase orders
-Permission187=Close purchase orders
-Permission188=Cancel purchase orders
+Permission187=Tedarikçi siparişlerini kapatın
+Permission188=Tedarikçi siparişlerini iptal edin
 Permission192=Satır oluştur
 Permission193=Satır iptal et
 Permission194=Bant genişliği satırlarını okuyun
@@ -779,10 +782,10 @@ Permission283=Kişi sil
 Permission286=Kişi dışaaktar
 Permission291=Tarife oku
 Permission292=Tarife izinlerini kur
-Permission293=Modify customer's tariffs
-Permission300=Read barcodes
-Permission301=Create/modify barcodes
-Permission302=Delete barcodes
+Permission293=Müşterinin tarifelerini değiştirin
+Permission300=Barkodları oku
+Permission301=Barkod oluştur/değiştir
+Permission302=Barkodları sil
 Permission311=Hizmet oku
 Permission312=Sözleşmeye hizmet/abonelik ata
 Permission331=Yerimi oku
@@ -801,9 +804,9 @@ Permission401=İndirim oku
 Permission402=İndirim oluştur/değiştir
 Permission403=İndirim doğrula
 Permission404=İndirim sil
-Permission511=Read payments of salaries
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
+Permission511=Maaş ödemelerini okuyun
+Permission512=Maaş ödemeleri oluşturun/değiştirin
+Permission514=Maaş ödemelerini silin
 Permission517=Ücretleri çıkart
 Permission520=Borçları oku
 Permission522=Borç oluştur/değiştir
@@ -835,27 +838,27 @@ Permission1102=Teslimat emri oluştur/değiştir
 Permission1104=Teslimat emri doğrula
 Permission1109=Teslim emri sil
 Permission1181=Tedarikçi oku
-Permission1182=Read purchase orders
-Permission1183=Create/modify purchase orders
-Permission1184=Validate purchase orders
-Permission1185=Approve purchase orders
-Permission1186=Order purchase orders
-Permission1187=Acknowledge receipt of purchase orders
-Permission1188=Delete purchase orders
-Permission1190=Approve (second approval) purchase orders
+Permission1182=Tedarikçi siparişlerini oku
+Permission1183=Tedarikçi siparişleri oluştur/değiştir
+Permission1184=Tedarikçi siparişlerini doğrula
+Permission1185=Tedarikçi siparişlerini onayla
+Permission1186=Tedarikçi siparişlerini sipariş et
+Permission1187=Tedarikçi siparişlerinin onay makbuzu
+Permission1188=Tedarikçi siparişlerini sil
+Permission1190=Tedarikçi siparişlerini onayla (ikinci onay)
 Permission1201=Bir dışaaktarma sonucu al
 Permission1202=Dışaaktarma oluştur/değiştir
-Permission1231=Read vendor invoices
-Permission1232=Create/modify vendor invoices
-Permission1233=Validate vendor invoices
-Permission1234=Delete vendor invoices
-Permission1235=Send vendor invoices by email
-Permission1236=Export vendor invoices, attributes and payments
-Permission1237=Export purchase orders and their details
+Permission1231=Tedarikçi faturalarını oku
+Permission1232=Tedarikçi faturaları oluştur/değiştir
+Permission1233=Tedarikçi faturalarını doğrula
+Permission1234=Tedarikçi faturalarını sil
+Permission1235=Tedarikçi faturalarını e-postayla gönder
+Permission1236=Tedarikçi faturalarını, nitelikleri ve ödemeleri dışa aktar
+Permission1237=Tedarikçi siparişlerini ve detaylarını dışa aktar
 Permission1251=Dış verilerin veritabanına toplu olarak alınmasını çalıştır (veri yükle)
 Permission1321=Müşteri faturalarını, özniteliklerin ve ödemelerini dışaaktar
 Permission1322=Ödenmiş bir faturayı yeniden aç
-Permission1421=Export sales orders and attributes
+Permission1421=Müşteri siparişleri ve niteliklerini dışa aktar
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=İzin isteği sil
@@ -879,7 +882,7 @@ Permission2503=Belge gönder ya da sil
 Permission2515=Belge dizinlerini kur
 Permission2801=Okuma modunda FTP istemcisi kullan (yalnızca tara ve indir)
 Permission2802=Yazma modunda FTP istemcisi kullan (sil ya da dosya yükle)
-Permission50101=Use Point of Sale
+Permission50101=Satış Noktası Kullan
 Permission50201=Işlemleri oku
 Permission50202=İçeaktarma işlemleri
 Permission54001=Yazdır
@@ -892,63 +895,63 @@ Permission63001=Kaynak oku
 Permission63002=Kaynak oluştur/düzenle
 Permission63003=Kaynak sil
 Permission63004=Gündem etkinliklerine kaynak bağlantıla
-DictionaryCompanyType=Third-party types
-DictionaryCompanyJuridicalType=Third-party legal entities
+DictionaryCompanyType=Üçüncü parti türleri
+DictionaryCompanyJuridicalType=Üçüncü partilerin yasal formları
 DictionaryProspectLevel=Potansiyel aday
-DictionaryCanton=States/Provinces
+DictionaryCanton=İller Listesi
 DictionaryRegion=Bölgeler
 DictionaryCountry=Ülkeler
 DictionaryCurrency=Para birimleri
-DictionaryCivility=Title of civility
+DictionaryCivility=Mesleki ünvanlar
 DictionaryActions=Gündem etkinlik türleri
-DictionarySocialContributions=Types of social or fiscal taxes
+DictionarySocialContributions=Sosyal veya mali vergi türleri
 DictionaryVAT=KDV Oranları veya Satış Vergisi Oranları
 DictionaryRevenueStamp=Damga vergisi tutarları
-DictionaryPaymentConditions=Payment Terms
-DictionaryPaymentModes=Payment Modes
+DictionaryPaymentConditions=Ödeme Koşulları
+DictionaryPaymentModes=Ödeme Türleri
 DictionaryTypeContact=Kişi/Adres türleri
-DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryTypeOfContainer=Web sitesi - Web sitesi sayfalarının/kapsayıcılarının türü
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Kağıt biçimleri
-DictionaryFormatCards=Card formats
+DictionaryFormatCards=Kart formatları
 DictionaryFees=Gider raporu - Gider raporu satırlarının türleri
 DictionarySendingMethods=Nakliye yöntemleri
-DictionaryStaff=Number of Employees
+DictionaryStaff=Çalışan Sayısı
 DictionaryAvailability=Teslimat süresi
 DictionaryOrderMethods=Sipariş yöntemleri
 DictionarySource=Teklifin/siparişin kökeni
-DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancyCategory=Raporlar için kişiselleştirilmiş gruplar
 DictionaryAccountancysystem=Hesap planı modelleri
 DictionaryAccountancyJournal=Muhasebe günlükleri
-DictionaryEMailTemplates=Email Templates
+DictionaryEMailTemplates=E-posta Şablonları
 DictionaryUnits=Birimler
-DictionaryMeasuringUnits=Measuring Units
+DictionaryMeasuringUnits=Ölçü Birimleri
 DictionaryProspectStatus=Aday durumu
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=İzin türleri
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Gider raporu - Ulaşım kategorileri
-DictionaryExpenseTaxRange=Gider raporu - Ulaştırma kategorisine göre menzil
+DictionaryExpenseTaxRange=Gider raporu - Ulaşım kategorisine göre menzil
 SetupSaved=Kurulum kaydedildi
 SetupNotSaved=Kurulum kaydedilmedi
-BackToModuleList=Back to Module list
-BackToDictionaryList=Back to Dictionaries list
+BackToModuleList=Modül listesine dön
+BackToDictionaryList=Sözlük listesine dön
 TypeOfRevenueStamp=Damga vergisi türü
-VATManagement=Sales Tax Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
-VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
+VATManagement=Satış Vergisi Yönetimi
+VATIsUsedDesc=Potansiyel müşteriler, faturalar, siparişler vb. oluştururken KDV oranı varsayılan olarak aktif standart kuralı izler:<br>Eğer satıcı taraf vergiye tabi değilse KDV oranı 0 olacaktır. Kuralın sonu.<br>Eğer satıcı ve alıcının ülkesi aynı ise (satıcı ülkesi=alıcı ülkesi), KDV oranı varsayılan olarak ürünün satıcı ülkesindeki KDV oranına eşittir. Kuralın sonu.<br>Hem satıcı hem de alıcı taraf Avrupa Topluluğu'nda yer alıyorsa ve mallar taşımayla ilgili (taşıma, nakliye, havayolu) ürünler ise varsayılan KDV 0 olacaktır. Bu kural satıcının ülkesine bağlıdır - lütfen muhasebecinize danışın. KDV alıcı tarafından satıcıya değil, ülkesindeki gümrük idaresine ödenmelidir. Kuralın sonu.<br>Hem satıcı hem de alıcı taraf Avrupa Topluluğu'nda yer alıyorsa ve alıcı taraf bir şirket değil ise (kayıtlı bir Topluluk içi Vergi numarasına sahip), KDV oranı varsayılan olarak satıcının ülkesinin KDV oranına eşit olacaktır. Kuralın sonu.<br>Hem satıcı hem de alıcı taraf Avrupa Topluluğu'nda yer alıyorsa ve alıcı taraf bir şirketse (kayıtlı bir Topluluk içi Vergi numarasına sahip), KDV oranı varsayılan olarak 0 olacaktır. Kuralın sonu.<br>Bunların dışındaki durumlarda KDV oranı için önerilen varsayılan değer 0'dır. Kuralın sonu.
+VATIsNotUsedDesc=Dernekler, şahıslar veya küçük şirketler söz konusu olduğunda varsayılan olarak önerilen KDV oranı 0 olacaktır.
 VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
 VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
 ##### Local Taxes #####
 LTRate=Oran
 LocalTax1IsNotUsed=İkinci vergiyi kullanma
-LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1IsUsedDesc=İkinci bir vergi türü kullanın (birinci dışında)
+LocalTax1IsNotUsedDesc=Başka bir vergi türü kullanma (birinci dışında)
 LocalTax1Management=İkinci vergi türü
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=Üçüncü vergi türü
-LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2IsUsedDesc=Üçüncü bir vergi türü kullanın (birinci dışında)
+LocalTax2IsNotUsedDesc=Başka bir vergi türü kullanma (birinci dışında)
 LocalTax2Management=Üçüncü vergi türü
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
@@ -971,7 +974,7 @@ CalcLocaltax3=Satışlar
 CalcLocaltax3Desc=Yerel Vergi raporları satışların yerel vergileri toplamıdır
 LabelUsedByDefault=Hiçbir çeviri kodu bulunmuyorsa varsayılan olarak kullanılan etiket
 LabelOnDocuments=Belgeler üzerindeki etiket
-LabelOrTranslationKey=Label or translation key
+LabelOrTranslationKey=Etiket veya çeviri anahtarı
 ValueOfConstantKey=Sabit değer
 NbOfDays=Gün sayısı
 AtEndOfMonth=Ay sonunda
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Sanal sunucu adı
 OS=OS
 PhpWebLink=Web-Php bağlantısı
-Browser=Tarayıcı
 Server=Sunucu
 Database=Veritabanı
 DatabaseServer=Ana bilgisayar veritabanı
@@ -1017,11 +1019,11 @@ MessageLogin=Oturum açma sayfası mesajı
 LoginPage=Oturum açma sayfası
 BackgroundImageLogin=Arka plan görüntüsü
 PermanentLeftSearchForm=Sol menüdeki sabit arama formu
-DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+DefaultLanguage=Varsayılan dil
+EnableMultilangInterface=Çoklu dil desteğini etkinleştir
 EnableShowLogo=Logoyu sol menüde göster
 CompanyInfo=Şirket/Kuruluş
-CompanyIds=Şirket/Kuruluş kimlikleri
+CompanyIds=Şirket/Kuruluş kimlik bilgileri
 CompanyName=Adı
 CompanyAddress=Adresi
 CompanyZip=Posta Kodu
@@ -1036,28 +1038,28 @@ OwnerOfBankAccount=Banka hesabı sahibi %s
 BankModuleNotActive=Banka hesapları modülü etkin değil
 ShowBugTrackLink=Bu bağlantıyı göster "<strong>%s</strong>"
 Alerts=Uyarılar
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
-DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
-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=Dolibarr yazılımını kullanmaya başlamadan önce bazı başlangıç parametreleri tanımlanmalı, gerekli modüller etkinleştirilip ve yapılandırılmalıdır.
-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.
-SetupDescription5=Other Setup menu entries manage optional parameters.
+DelaysOfToleranceBeforeWarning=Bir uyarı işaretini görüntülemeden önceki ek mühlet:
+DelaysOfToleranceDesc=Gecikmiş öğe için ekranda %s şeklinde bir uyarı simgesi gösterilmeden önceki mühleti ayarlayın.
+Delays_MAIN_DELAY_ACTIONS_TODO=Tamamlanmamış planlı etkinlikler (gündem etkinlikleri)
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Proje zamanında kapanmadı
+Delays_MAIN_DELAY_TASKS_TODO=Planlanan görev (proje görevleri) tamamlanmadı
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=İşlenmemiş siparişler
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=İşlenmemiş tedarikçi siparişleri
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Kapatılmamış teklifler
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Faturalanmamış teklifler
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Etkinleştirilecek hizmet
+Delays_MAIN_DELAY_RUNNING_SERVICES=Süresi dolmuş hizmet
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Ödenmemiş tedarikçi faturası
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Ödenmemiş müşteri faturası
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Bekleyen banka mutabakatı
+Delays_MAIN_DELAY_MEMBERS=Gecikmiş üyelik ücreti
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Yapılmayan çek ödemesi
+Delays_MAIN_DELAY_EXPENSEREPORTS=Onaylanacak gider raporu
+SetupDescription1=Dolibarr yazılımını kullanmaya başlamadan önce bazı başlangıç parametreleri tanımlanmalı, gerekli modüller etkinleştirilip/yapılandırılmalıdır. 
+SetupDescription2=Aşağıdaki iki bölümün kurulumu zorunludur (Ayarlar menüsündeki ilk iki kayıt)
+SetupDescription3=<a href="%s">%s -> %s</a><br>Uygulamanızın varsayılan davranışını özelleştirmek için kullanılan temel parametreler (örneğin ülkeyle ilişkili özellikler).
+SetupDescription4=<a href="%s">%s -> %s</a><br>Bu yazılım, tamamı hemen hemen bağımsız olan birçok modül ve uygulamanın paket halidir. İhtiyaçlarınıza uygun olan modüller etkinleştirilmiş ve yapılandırılmış olmalıdır. Bir modülün etkinleştirilmesi ile yeni öğe ve seçenekler menülere eklenir. 
+SetupDescription5=Ayarlar menüsündeki diğer girişler isteğe bağlı parametreleri yönetmenizi sağlar.
 LogEvents=Güvenlik denetimi etkinlikleri
 Audit=Denetim
 InfoDolibarr=Dolibarr Bilgileri
@@ -1071,15 +1073,15 @@ BrowserName=Tarayıcı adı
 BrowserOS=Tarayıcı OS
 ListOfSecurityEvents=Dolibarr güvenlik etkinlikleri listesi
 SecurityEventsPurged=Güvenlik etkinlikleri temizlendi
-LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
+LogEventDesc=Belirli güvenlik olayları için günlüğe kaydetmeyi etkinleştirin. Yöneticiler <b>%s - %s</b> menüsünden günlüğü görebilir. Uyarı: Bu özellik veritabanında büyük miktarda veri üretebilir.
 AreaForAdminOnly=Kurulum parametreleri sadece <b>yönetici olan kullanıcılar</b> tarafından ayarlanabilir.
 SystemInfoDesc=Sistem bilgileri sadece okuma modunda ve yöneticiler için görüntülenen çeşitli teknik bilgilerdir.
-SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
+SystemAreaForAdminOnly=Bu alan yalnızca yönetici kullanıcılar tarafından kullanılabilir. Dolibarr kullanıcı izinleri bu kısıtlamayı değiştiremez.
 CompanyFundationDesc=Şirketin/varlığın bilgilerini düzenleyin. Sayfanın sonunda yer alan "%s" veya "%s" butonuna tıklayın.
 AccountantDesc=Muhasebecinizin veya şirket hesabınızı tutanların ayrıntılarını düzenleyin
-AccountantFileNumber=Dosya numarası
-DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
-AvailableModules=Mevcut uygulama/modüller
+AccountantFileNumber=Muhasebeci kodu
+DisplayDesc=Dolibarr'ın görünümünü ve davranışını etkileyen parametreler buradan özelleştirilebilir.
+AvailableModules=Mevcut uygulamalar/modüller
 ToActivateModule=Modülleri etkinleştirmek için, ayarlar alanına gidin (Giriş->Ayarlar>Modüller).
 SessionTimeOut=Oturum için zaman aşımı
 SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
@@ -1089,20 +1091,20 @@ TriggerDisabledByName=Bu dosyadaki tetikleyiciler adlarındaki <b>-NORUN</b> son
 TriggerDisabledAsModuleDisabled=Bu dosyadaki tetikleyiciler <b>%s</b> modülü devre dışı bırakıldığında devre dışı kalır.
 TriggerAlwaysActive=Bu dosyadaki tetikleyiciler, etkin Dolibarr modülleri ne olursa olsun her zaman etkindir.
 TriggerActiveAsModuleActive=Bu dosyadaki tetikleyiciler <b>%s</b> modülü etkinleştirildiğinde etkin olur.
-GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+GeneratedPasswordDesc=Otomatik olarak oluşturulan şifreler için kullanılacak yöntemi seçin.
 DictionaryDesc=Bütün referans verisini ekleyin. Değerlerinizi varsayılana ekleyebilirsiniz.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting. For a full list of the parameters available <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">see here</a>.
+ConstDesc=Bu sayfa, diğer sayfalarda bulunmayan parametreleri düzenlemenizi (üzerine yazmanızı) sağlar. Bunlar çoğunlukla geliştiriciler veya gelişmiş sorun giderme için ayrılmış parametrelerdir. Mevcut parametrelerin tam listesi için <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">burada bakın</a>.
 MiscellaneousDesc=Burada güvenlik ile ilgili diğer tüm parametreler tanımlanır.
 LimitsSetup=Sınırlar/Doğruluk kurulumu
 LimitsDesc=Dolibarr tarafından kullanılan limitleri, hassasiyetleri ve iyileştirmeleri buradan tanımlayabilirsiniz
 MAIN_MAX_DECIMALS_UNIT=Birim fiyatlar için maksimum ondalık
 MAIN_MAX_DECIMALS_TOT=Toplam fiyatlar için maksimum ondalık
 MAIN_MAX_DECIMALS_SHOWN=<b>Ekranda gösterilen</b> fiyatlar için maksimum ondalık. Kesilen fiyata eklenmiş olarak "<b>...</b>" görmek istiyorsanız bu parametreden sonra üç nokta <b>...</b> ekleyin (ör: "2...")
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+MAIN_ROUNDING_RULE_TOT=Yuvarlama oranı basamağı (Yuvarlamanın 10 tabanından farklı değerde gerçekleştirildiği ülkeler içindir. Örneğin yuvarlama 0.05'lik basamaklarla gerçekleştirilecekse 0.05 koyun)
 UnitPriceOfProduct=Bir ürünün net birim fiyatı
-TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+TotalPriceAfterRounding=Yuvarlama sonrası toplam fiyat (KDV hariç/KDV tutarı/KDV dahil)
 ParameterActiveForNextInputOnly=Yalnız sonraki giriş için etkili Parametre
-NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
+NoEventOrNoAuditSetup=Hiçbir güvenlik etkinliği kayıt edilmedi. Eğer "Ayarlar - Güvenlik - Denetim" sayfasında Denetim etkinleştirilmemişse bu normal bir durumdur.
 NoEventFoundWithCriteria=Bu arama kriterleri için hiçbir güvenlik etkinliği bulunamadı
 SeeLocalSendMailSetup=Yerel postagönder kurulumunuza bakın
 BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
@@ -1122,8 +1124,8 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 YouMustRunCommandFromCommandLineAfterLoginToUser=Bu komutu <b>%s</b> kullanıcısı ile bir kabuğa giriş yaptıktan sonra komut satırından çalıştırabilir ya da parolayı <b>%s</b> elde etmek için komut satırının sonuna –W seçeneğini ekleyebilirsiniz.
 YourPHPDoesNotHaveSSLSupport=SSL fonksiyonları PHP nizde mevcut değildir
 DownloadMoreSkins=Daha fazla kaplama indirin
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
-ShowProfIdInAddress=Show professional id with addresses
+SimpleNumRefModelDesc=Referans numarasını %syyaa-nnnn formatına döndürür, burada yy kısmı yıl, aa kısmı ay ve nnnn kısmı ise sıfırlamasız ardışık sayı serisidir.
+ShowProfIdInAddress=Adreslerle profesyonel kimliği göster
 ShowVATIntaInAddress=Adreslerde Vergi numarasını gizle
 TranslationUncomplete=Kısmi çeviri
 MAIN_DISABLE_METEO=Meteolojik görünümü devre dışı bırak
@@ -1133,14 +1135,14 @@ MeteoPercentageMod=Yüzde modu
 MeteoPercentageModEnabled=Yüzde modu etkin
 MeteoUseMod=%s kullanmak için tıklayın
 TestLoginToAPI=API  oturum açma denemesi
-ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
+ProxyDesc=Dolibarr’ın bazı özellikleri internet erişimi gerektirir. Burada, gerekirse bir proxy sunucusu üzerinden erişim gibi internet bağlantı parametrelerini tanımlayın.
 ExternalAccess=Harici/İnternet Erişimi
-MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
+MAIN_PROXY_USE=Bir proxy sunucusu kullanın (Aksi halde erişim doğrudan internete)
 MAIN_PROXY_HOST=Proxy sunucusu: Ad/Adres
 MAIN_PROXY_PORT=Proxy sunucusu: Bağlantı noktası
-MAIN_PROXY_USER=Proxy server: Login/User
-MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+MAIN_PROXY_USER=Proxy sunucusu: Oturum açma/Kullanıcı
+MAIN_PROXY_PASS=Proxy sunucusu: Şifre
+DefineHereComplementaryAttributes=%s için dahil edilmek istediğiniz ilave/özel nitelikleri buradan tanımlayabilirsiniz
 ExtraFields=Tamamlayıcı öznitelikler
 ExtraFieldsLines=Tamamlayıcı öznitelikler (satırlar)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1165,7 +1167,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Çeviri ayarları
 TranslationKeySearch=Çeviri anahtarı veya dizesi ara
 TranslationOverwriteKey=Çeviri dizesinin üzerine yaz
-TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
+TranslationDesc=Ekran dili nasıl ayarlanır:<br>* Varsayılan/Her kullanıcı için genel ayar: Menüden <strong>Giriş -> Ayarlar -> Ekran</strong>yolunu takip edin.<br>Her kullanıcı için ayrı ayrı ayar: Ekranın üstünde yer alan kullanıcı adına tıklayın ve kullanıcı kartındaki <strong>Kullanıcı Ekranı Ayarları</strong> sekmesinde gerekli değişiklikleri yapın.
 TranslationOverwriteDesc=Ayrıca aşağıdaki tabloyu doldurarak dizeleri geçersiz kılabilirsiniz. Dilinizi "%s" açılır tablosundan seçin, anahtar dizeyi "%s" içine ekleyin ve yeni çevirinizi de "%s" içine ekleyin.
 TranslationOverwriteDesc2=Çevirmek istediğiniz kelime veya kelime dizisinin hangi anahtarı kullandığını bulmak için diğer sekmeyi (Çeviri anahtarı veya dizesi ara) kullanabilirsiniz.
 TranslationString=Çeviri dizesi
@@ -1173,20 +1175,20 @@ CurrentTranslationString=Geçerli çeviri dizesi
 WarningAtLeastKeyOrTranslationRequired=En azından anahtar veya çeviri dizesi için bir arama kriteri gereklidir
 NewTranslationStringToShow=Gösterilecek yeni çeviri dizesi
 OriginalValueWas=Orijinal çevirinin üzerine yazılır. Orijinal değerler şu şekildeydi: <br><br>%s
-TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
+TransKeyWithoutOriginalValue=Herhangi bir dil dosyasında mevcut olmayan '<strong>%s</strong>' çeviri anahtarı için yeni bir çeviri zorlaması gerçekleştirdiniz.
 TotalNumberOfActivatedModules=Etkinleştirilmiş uygulama/modüller: <b>%s</b>/<b>%s</b>
 YouMustEnableOneModule=Enaz 1 modül etkinleştirmelisiniz
 ClassNotFoundIntoPathWarning=Class %s PHP yolunda bulunamadı
 YesInSummer=Yazın evet
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
+OnlyFollowingModulesAreOpenedToExternalUsers=Not: İzinler verildiği takdirde yalnızca şu modüller dış kullanıcılar tarafından kullanılabilir (bu tür kullanıcıların izinleri ne olursa olsun):<br>
 SuhosinSessionEncrypt=Oturum depolaması Suhosin tarafından şifrelendi
 ConditionIsCurrently=Koşul şu anda %s durumunda
-YouUseBestDriver=You use driver %s which is the best driver currently available.
-YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
+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.
 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.
-BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
+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.
@@ -1203,8 +1205,8 @@ PasswordGenerationPerso=Kişisel tanımlanmış yapılandırmanıza göre bir pa
 SetupPerso=Yapılandırmanıza göre
 PasswordPatternDesc=Parola modeli açıklaması
 ##### Users setup #####
-RuleForGeneratedPasswords=Rules to generate and validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+RuleForGeneratedPasswords=Parola oluşturma ve doğrulama kuralları
+DisableForgetPasswordLinkOnLogonPage=Oturum açma sayfasında “Parola mı unutuldu?” bağlantısını gösterme
 UsersSetup=Kullanıcılar modülü kurulumu
 UserMailRequired=Yeni bir kullanıcı oluşturmak için e-posta gerekli
 ##### HRM setup #####
@@ -1213,22 +1215,22 @@ HRMSetup=İK modülü ayarları
 CompanySetup=Firmalar modülü kurulumu
 CompanyCodeChecker=Müşteri/tedarikçi kodlarının otomatik olarak üretilmesi için seçenekler
 AccountCodeManager=Müşteri/tedarikçi muhasebe kodlarının otomatik olarak üretilmesi için seçenekler
-NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
-NotificationsDescUser=* per user, one user at a time.
+NotificationsDesc=Bazı Dolibar etkinlikleri için e-posta bildirimleri otomatik olarak gönderilebilir. <br>Bildirimlerin alıcıları şu şekilde tanımlanabilir:
+NotificationsDescUser=* kullanıcı başına, her seferde bir kullanıcı.
 NotificationsDescContact=* üçüncü parti kişisi başına (müşteri veya tedarikçiler), her seferinde bir üçüncü parti kişisi.
-NotificationsDescGlobal=* or by setting global email addresses in this setup page.
+NotificationsDescGlobal=* veya bu kurulum sayfasında genel e-posta adreslerini ayarlayarak.
 ModelModules=Belge Şablonları
 DocumentModelOdt=OpenDocument şablonlarından belgeler oluşturun (LibreOffice, OpenOffice, KOffice, TextEdit,.... yazılımlarından ODT / .ODS dosyaları)
 WatermarkOnDraft=Taslak belge üzerinde filigran
 JSOnPaimentBill=Ödeme formunda ödeme satırlarını otomatik doldurma özelliğini etkinleştir
 CompanyIdProfChecker=Profesyonel Kimlikler için Kurallar
 MustBeUnique=Eşsiz olmalıdır?
-MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
+MustBeMandatory=Üçüncü parti oluşturmak için zorunlu mu (Vergi numarası veya şirket türü tanımlıysa)?
 MustBeInvoiceMandatory=Faturaları doğrulamak zorunludur ?
 TechnicalServicesProvided=Sağlanan teknik hizmetler
 #####DAV #####
 WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
-WebDavServer=Root URL of %s server: %s
+WebDavServer=%s sunucusunun kök URL'si: %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>%s</b> biçimine göndermek için gerekli bağlantıyı aşağıdaki bağlantıdan bulabilirsiniz:%s
 ##### Invoices #####
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Fatura ve iade faturaları numaralandırma modülü
 BillsPDFModules=Fatura belgesi modelleri
 BillsPDFModulesAccordindToInvoiceType=Fatura türüne göre fatura döküman modelleri
 PaymentsPDFModules=Ödeme belge modelleri
-CreditNote=İade faturası
-CreditNotes=İade faturaları
 ForceInvoiceDate=Fatura tarihini fatura doğrulama tarihine zorla
 SuggestedPaymentModesIfNotDefinedInInvoice=Varsayılan olarak faturada tanımlanmamışsa önerilen ödeme biçimi
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1246,8 +1246,8 @@ SuggestPaymentByChequeToAddress=Suggest payment by check to
 FreeLegalTextOnInvoices=Faturada serbest metin
 WatermarkOnDraftInvoices=Taslak faturalarda filigran (boşsa yoktur)
 PaymentsNumberingModule=Ödeme numaralandırma modeli
-SuppliersPayment=Vendor payments
-SupplierPaymentSetup=Vendor payments setup
+SuppliersPayment=Tedarikçi ödemeleri
+SupplierPaymentSetup=Tedarikçi ödemesi ayarları
 ##### Proposals #####
 PropalSetup=Teklif modülü kurulumu
 ProposalsNumberingModules=Teklif numaralandırma modülü
@@ -1267,7 +1267,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Sipariş için Kaynak Depo iste
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
-OrdersSetup=Sales Orders management setup
+OrdersSetup=Müşteri Siparişleri yönetim ayarları
 OrdersNumberingModules=Sipariş numaralandırma modülü
 OrdersModelModule=Sipariş belgesi modelleri
 FreeLegalTextOnOrders=Siparişte serbest metin
@@ -1290,10 +1290,10 @@ WatermarkOnDraftContractCards=Taslak sözleşmeler üzerinde filigran (boşsa yo
 MembersSetup=Üye modülü kurulumu
 MemberMainOptions=Ana seçenekler
 AdherentLoginRequired= Her üye için bir Kullanıcı adı yürütün
-AdherentMailRequired=Email required to create a new member
+AdherentMailRequired=Yeni bir üye oluşturmak için e-posta gereklidir
 MemberSendInformationByMailByDefault=Üyelere onay epostası (doğrulama ya da yeni abonelik) göndermek için onay kutusu varsayılan olarak açıktır
-VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
-MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+VisitorCanChooseItsPaymentMode=Ziyaretçi kişi mevcut ödeme türlerinden birini seçebilir
+MEMBER_REMINDER_EMAIL=Süresi dolmuş abonelikler için <b>mail yoluyla</b> otomatik hatırlatıcıyı etkinleştir. Not: Hatırlatıcıyı gönderebilmek için <strong>%s</strong> modülü etkinleştirilmiş ve doğru bir şekilde yapılandırılmış olmalıdır.
 ##### LDAP setup #####
 LDAPSetup=LDAP Kurulumu
 LDAPGlobalParameters=Genel parametreler
@@ -1315,7 +1315,7 @@ LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
 LDAPPrimaryServer=Birincil sunucu
 LDAPSecondaryServer=İkincil sunucu
 LDAPServerPort=Sunucusu bağlantı noktası
-LDAPServerPortExample=Default port: 389
+LDAPServerPortExample=Varsayılan port: 389
 LDAPServerProtocolVersion=Protokol sürümü
 LDAPServerUseTLS=TLS
 LDAPServerUseTLSExample=LDAP sunucusu TLS
@@ -1335,7 +1335,7 @@ LDAPDnContactActive=Kişilerin senkronizasyonu
 LDAPDnContactActiveExample=Etkinleştirilenlerin/etkinleştirilmeyen senkronizasyonu
 LDAPDnMemberActive=Üyeleri senkronizasyonu
 LDAPDnMemberActiveExample=Etkin/etkin olmayan senkronizasyonu
-LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActive=Üye türlerinin senkronizasyonu
 LDAPDnMemberTypeActiveExample=Etkin/etkin olmayan senkronizasyonu
 LDAPContactDn=Dolibarr kişilerinin DN si
 LDAPContactDnExample=Komple DN (örn: ou = rehber, dc = toplum, DC = com)
@@ -1358,7 +1358,7 @@ LDAPTestSynchroContact=Test kişinin senkronizasyon
 LDAPTestSynchroUser=Test kullanıcının senkronizasyon
 LDAPTestSynchroGroup=Test grubun senkronizasyon
 LDAPTestSynchroMember=Test üyenin senkronizasyon
-LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSynchroMemberType=Test üyesi türü senkronizasyonu
 LDAPTestSearch= LDAP arama testi
 LDAPSynchroOK=Senkronizasyon testi başarılı
 LDAPSynchroKO=Başarısız senkronizasyon testi
@@ -1372,49 +1372,49 @@ LDAPSetupForVersion2=LDAP sunucusu sürüm 2 için yapılandırılmış
 LDAPDolibarrMapping=Dolibarr Eşleme
 LDAPLdapMapping=LDAP Eşleme
 LDAPFieldLoginUnix=Oturum aç (Unix)
-LDAPFieldLoginExample=Example: uid
+LDAPFieldLoginExample=Örnek: uid
 LDAPFilterConnection=Arama süzgeçi
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
 LDAPFieldLoginSamba=Oturum aç (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldLoginSambaExample=Örnek: samaccountname
 LDAPFieldFullname=İlk Adı
-LDAPFieldFullnameExample=Example: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
+LDAPFieldFullnameExample=Örnek: cn
+LDAPFieldPasswordNotCrypted=Parola şifrelenmemiş
+LDAPFieldPasswordCrypted=Parola şifrelenmiş
+LDAPFieldPasswordExample=Örnek: userPassword
+LDAPFieldCommonNameExample=Örnek: cn
 LDAPFieldName=Adı
-LDAPFieldNameExample=Example: sn
+LDAPFieldNameExample=Örnek: sn
 LDAPFieldFirstName=Adı
-LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldFirstNameExample=Örnek: givenName
 LDAPFieldMail=Eposta adresi
-LDAPFieldMailExample=Example: mail
+LDAPFieldMailExample=Örnek: mail
 LDAPFieldPhone=İş telefon numarası
-LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldPhoneExample=Örnek: telephonenumber
 LDAPFieldHomePhone=Kişisel telefon numarası
-LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldHomePhoneExample=Örnek: homephone
 LDAPFieldMobile=Cep telefonu
-LDAPFieldMobileExample=Example: mobile
+LDAPFieldMobileExample=Örnek: mobile
 LDAPFieldFax=Faks numarası
-LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldFaxExample=Örnek: facsimiletelephonenumber
 LDAPFieldAddress=Cadde
-LDAPFieldAddressExample=Example: street
+LDAPFieldAddressExample=Örnek: street
 LDAPFieldZip=Posta Kodu
-LDAPFieldZipExample=Example: postalcode
+LDAPFieldZipExample=Örnek: postalcode
 LDAPFieldTown=İlçe
-LDAPFieldTownExample=Example: l
+LDAPFieldTownExample=Örnek: l
 LDAPFieldCountry=Ülke
 LDAPFieldDescription=Açıklamalar
-LDAPFieldDescriptionExample=Example: description
+LDAPFieldDescriptionExample=Örnek: description
 LDAPFieldNotePublic=Genel Not
-LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldNotePublicExample=Örnek: publicnote
 LDAPFieldGroupMembers= Grup üyeleri
-LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldGroupMembersExample= Örnek: uniqueMember
 LDAPFieldBirthdate=Doğum Günü
 LDAPFieldCompany=Firma
-LDAPFieldCompanyExample=Example: o
+LDAPFieldCompanyExample=Örnek: o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Example: objectsid
+LDAPFieldSidExample=Örnek: objectsid
 LDAPFieldEndLastSubscription=Abonelik tarihi sonu
 LDAPFieldTitle=İş pozisyonu
 LDAPFieldTitleExample=Örnek: unvan
@@ -1429,7 +1429,7 @@ LDAPDescValues=Örnek değerler aşağıdaki yüklü şemalarla <b> OpenLDAP </
 ForANonAnonymousAccess=Bir kimlik doğrulamalı giriş için (örneğin bir yazma girişi)
 PerfDolibarr=Performans ayar/optimizasyon raporu
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Yüklü değil, bu nedenle sunucunuzun yavaşlamasına neden olmaz.
 ApplicativeCache=\t\nUygulamalı önbellek
 MemcachedNotAvailable=Uygulanabilir önbellek bulunamadı. Performansı Memcached önbellek sunucusu ve bu önbellek sunucusunu kullanabilecek bir modül kurarak arttırabilirsiniz.<br>Daha fazla bilgiyi buradan <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>bulabilirsiniz. Bu tür önbellek sunucusunu çok fazla web barındırıcısının sağlamadığını unutmayın.
 MemcachedModuleAvailableButNotSetup=Uygulamalı önbellek için memcached modülü bulundu ama modülün kurulumu tamamlanmamış.
@@ -1447,8 +1447,8 @@ CacheByClient=Tarayıcı önbelleği
 CompressionOfResources=HTTP yanıtlarının sıkıştırılması
 CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Böyle bir otomatik algılama mevcut tarayıcılar için olası değildir
-DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
-DefaultCreateForm=Default values (to use on forms)
+DefaultValuesDesc=Burada, yeni bir kayıt oluştururken kullanmak istediğiniz varsayılan değeri ve/veya kayıtlarınızı listelediğinizde varsayılan filtreleme veya sıralama düzenini tanımlayabilirsiniz.
+DefaultCreateForm=Varsayılan değerler (formlarda kullanmak için)
 DefaultSearchFilters=Varsayılan arama filtreleri
 DefaultSortOrder=Varsayılan sıralama düzenleri
 DefaultFocus=Varsayılan odak alanları
@@ -1503,7 +1503,7 @@ GenbarcodeLocation=Bar kodu oluşturma komut satırı aracı (bazı bar kodu tü
 BarcodeInternalEngine=İç motor
 BarCodeNumberManager=Barkod sayılarını otomatik olarak tanımlayacak yönetici
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct Debit payments
+WithdrawalsSetup=Otomatik Ödemeler modülünün kurulumu
 ##### ExternalRSS #####
 ExternalRSSSetup=Dışardan RSS alma kurulumu
 NewRSS=Yeni RSS beslemesi
@@ -1511,15 +1511,15 @@ RSSUrl=RSS URL
 RSSUrlExample=İlginç bir RSS beslemesi
 ##### Mailing #####
 MailingSetup=E-postalama modülü kurulumu
-MailingEMailFrom=Sender email (From) for emails sent by emailing module
-MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingEMailFrom=E-Postalama modülü tarafından gönderilen e-postalar için gönderici e-posta adresi (gönderen)
+MailingEMailError=Hatalı e-postalar için iade e-postası (Hatalar-kime)
 MailingDelay=Sonraki mesajı göndermek için beklenecek saniyeler
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+NotificationSetup=Eposta Bildirimi modülü ayarları
+NotificationEMailFrom=Bildirimler modülü tarafından gönderilen e-postalar için gönderici e-posta (gönderen)
 FixedEmailTarget=Alıcı
 ##### Sendings #####
-SendingsSetup=Shipping module setup
+SendingsSetup=Sevkiyat modülü ayarları
 SendingsReceiptModel=Makbuz gönderme modeli
 SendingsNumberingModules=Gönderi numaralandırma modülü
 SendingsAbility=Müşteri teslimatlarında sevkiyat tablolarını destekler
@@ -1563,7 +1563,7 @@ DetailRight=Yetkisiz gri menüleri gösterme koşulu
 DetailLangs=Etiket kodu çevirisi için Lang dosya adı
 DetailUser=İç/dış/tümü
 Target=Hedef
-DetailTarget=Target for links (_blank top opens a new window)
+DetailTarget=Bağlantılar için hedef (_blank üst yeni bir pencere açar)
 DetailLevel=Düzey (-1: Üst menü, 0: başlık menüsü, >0 menü ve alt menü)
 ModifMenu=Menü değiştir
 DeleteMenu=Menü girişi sil
@@ -1611,9 +1611,9 @@ ClickToDialDesc=This module makea phone numbers clickable links. A click on the
 ClickToDialUseTelLink=Telefon numaraları üzerinde yalnızca bir "tel:" linki kullan
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Point of Sale
-CashDeskSetup=Point of Sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDesk=Satış Noktası
+CashDeskSetup=Satış Noktası modülü ayarları
+CashDeskThirdPartyForSell=Satışlar için kullanılacak varsayılan genel üçüncü parti
 CashDeskBankAccountForSell=Nakit ödemeleri almak için kullanılan varsayılan hesap
 CashDeskBankAccountForCheque= Default account to use to receive payments by check
 CashDeskBankAccountForCB= Nakit ödemeleri kredi kartıyla almak için kullanılan varsayılan hesap
@@ -1624,7 +1624,7 @@ StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatib
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
 ##### Bookmark #####
 BookmarkSetup=Yerimi modülü kurulumu
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
+BookmarkDesc=Bu modül yer imlerini yönetmenize olanak sağlar. Ayrıca, sol taraftaki menünüzde herhangi bir Dolibarr sayfasına veya harici web sitelerine kısayollar ekleyebilirsiniz.
 NbOfBoomarkToShow=Sol menüde gösterilecek ençok yerimi sayısı
 ##### WebServices #####
 WebServicesSetup=WebHizmetleri modülü kurulumu
@@ -1641,20 +1641,20 @@ ApiKey=API için anahtar
 WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Banka modülü kurulumu
-FreeLegalTextOnChequeReceipts=Free text on check receipts
+FreeLegalTextOnChequeReceipts=Çek makbuzlarının üzerindeki serbest metin
 BankOrderShow="Ayrıntılı banka numarası" kullanan ülkeler için banka hesapları görüntüleme sırası
 BankOrderGlobal=Genel
 BankOrderGlobalDesc=Genel görüntüleme sırası
 BankOrderES=İspanyolca
 BankOrderESDesc=İspanyolca görüntüleme sırası
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+ChequeReceiptsNumberingModule=Çek Makbuzları Numaralandırma Modülü
 ##### Multicompany #####
 MultiCompanySetup=Çoklu şirket modülü kurulumu
 ##### Suppliers #####
-SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Satınalma siparişinin tam şablonu (logo...)
+SuppliersSetup=Tedarikçi modülü ayarları
+SuppliersCommandModel=Tedarikçi siparişinin tam şablonu (logo...)
 SuppliersInvoiceModel=Tedarikçi faturasının eksiksiz şablonu (logo...)
-SuppliersInvoiceNumberingModel=Vendor invoices numbering models
+SuppliersInvoiceNumberingModel=Tedarikçi faturaları numaralandırma modelleri
 IfSetToYesDontForgetPermission=Evet olarak ayarlıysa, ikinci onayı sağlayacak grup ve kullanıcılara izin sağlamayı unutmayın
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind modülü kurulumu
@@ -1694,9 +1694,9 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Yolu içerir (%s değişlende tanımlanır)
 ExpenseReportsSetup=Gider Raporları modülü Ayarları
 TemplatePDFExpenseReports=Gider raporu belgesi oluşturmak için belge şablonları
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
-ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
-ExpenseReportNumberingModules=Expense reports numbering module
+ExpenseReportsIkSetup=Gider Raporları modülü ayarları - Milles index
+ExpenseReportsRulesSetup=Gider Raporları modülü ayarları - 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*
@@ -1711,8 +1711,8 @@ SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade desc
 InstallModuleFromWebHasBeenDisabledByFile=Dış modülün uygulama içerisinden kurulumu yöneticiniz tarafından engellenmiştir. Bu özelliğe izin verilmesi için ondan <strong>%s</strong> dosyasını kaldırmasını istemelisiniz.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Tablo satırlarını fare üzerine geldiğinde vurgula
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+HighlightLinesColor=Fare üzerinden geçerken satırı vurgulama rengi (vurgulama rengi istemiyorsanız 'ffffff' kullanın)
+HighlightLinesChecked=Bir satır işaretlendiğinde bu satırı vurgulama rengi (vurgulama rengi istemiyorsanız 'ffffff' kullanın)
 TextTitleColor=Sayfa başlığının metin rengi
 LinkColor=Bağlantıların rengi
 PressF5AfterChangingThis=Bu değeri değiştirdikten sonra geçerli olabilmesi için klavyede CTRL+F5 tuşlarına basın veya tarayıcınızın önbelleğini temizleyin
@@ -1746,12 +1746,12 @@ ExpectedChecksum=Beklenen Sağlama
 CurrentChecksum=Geçerli Sağlama
 ForcedConstants=Gerekli sabit değerler
 MailToSendProposal=Müşteri teklifleri
-MailToSendOrder=Sales orders
+MailToSendOrder=Müşteri siparişleri
 MailToSendInvoice=Müşteri faturaları
 MailToSendShipment=Sevkiyatlar
 MailToSendIntervention=Müdahaleler
 MailToSendSupplierRequestForQuotation=Teklif talebi
-MailToSendSupplierOrder=Satın alma siparişleri
+MailToSendSupplierOrder=Tedarikçi siparişleri
 MailToSendSupplierInvoice=Tedarikçi faturaları
 MailToSendContract=Sözleşmeler
 MailToThirdparty=Üçüncü partiler
@@ -1762,7 +1762,7 @@ ByDefaultInList=Liste görünümünde varsayılana göre göster
 YouUseLastStableVersion=En son kararlı sürümü kullanıyorsunuz
 TitleExampleForMajorRelease=Bu ana sürümü duyurmak için kullanabileceğiniz mesaj örneği (web sitenizde rahatça kullanabilirsiniz)
 TitleExampleForMaintenanceRelease=Bu bakım sürümü duyurmak için kullanabileceğiniz mesaj örneği (web sitenizde rahatça kullanabilirsiniz)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s kullanıma hazır. Versiyon %s, hem kullanıcılar hem de geliştiriciler için bir çok yeni özelliğe sahip majör bir sürümdür. Bu sürümü https://www.dolibarr.org portalının indirme alanından indirebilirsiniz (alt dizin Kararlı sürümler). Değişikliklerin tam listesini <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> bölümünde inceleyebilirsiniz.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Ürün belgeleri için şablonlar
@@ -1804,7 +1804,7 @@ MAIN_PDF_MARGIN_LEFT=PDF'deki sol boşluk
 MAIN_PDF_MARGIN_RIGHT=PDF'deki sağ boşluk
 MAIN_PDF_MARGIN_TOP=PDF'deki üst boşluk
 MAIN_PDF_MARGIN_BOTTOM=PDF'deki alt kenar boşluğu
-NothingToSetup=There is no specific setup required for this module.
+NothingToSetup=Bu modül için gerekli özel bir kurulum yok.
 SetToYesIfGroupIsComputationOfOtherGroups=Eğer bu grup diğer grupların bir hesaplaması ise bunu evet olarak ayarlayın
 EnterCalculationRuleIfPreviousFieldIsYes=Önceki alan Evet olarak ayarlanmışsa hesaplama kuralı girin (Örneğin 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Birçok dil varyantı bulundu
@@ -1819,8 +1819,8 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Sosyal Ağlar modülünün kurulumu
 EnableFeatureFor=<strong>%s</strong> için özellikleri etkinleştir
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=PDF üzerindeki gönderen ve alıcı adreslerinin yerini birbiriyle değiştir
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
+FeatureSupportedOnTextFieldsOnly=Uyarı: Bu özellik yalnızca metin alanlarında desteklenir. Bu özelliği tetiklemek için ayrıca bir URL parametresi action=create ya da action=edit ayarlanmalı VEYA sayfa adı 'new.php' ile bitmelidir.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -1828,18 +1828,20 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Şimdi topla
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
-LastResult=Latest result
+LastResult=En son sonuç
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
-NothingProcessed=Nothing done
+NothingProcessed=Hiçbir şey yapılmadı
 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)
+CreateTicketAndThirdParty=Destek bildirimi (ve gerekliyse üçüncü parti) oluştur
 CodeLastResult=En son sonuç kodu
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
@@ -1848,9 +1850,9 @@ WithDolTrackingID=Dolibarr İzleme Kimliği bulundu
 WithoutDolTrackingID=Dolibarr İzleme Kimliği bulunamadı
 FormatZip=Posta Kodu
 MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-OpeningHours=Opening hours
+ECMAutoTree=Otomatik ECM ağacını göster
+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.
+OpeningHours=Açılış saatleri
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
@@ -1859,26 +1861,33 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Modül sıfırlamayı onayla
 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=Simplify interface for blind person
+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.
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
-DefaultCustomerType=Default thirdparty type for "New customer" creation form
+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.
 RootCategoryForProductsToSell=Root category of products to sell
 RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
-DebugBar=Debug Bar
-DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
-DebugBarSetup=DebugBar Setup
-GeneralOptions=General Options
+DebugBar=Hata Ayıklama Çubuğu
+DebugBarDesc=Hata ayıklamayı basitleştirmek için bir çok araç ile gelen araç çubuğu
+DebugBarSetup=Hata Ayıklama Çubuğu Kurulumu
+GeneralOptions=Genel Seçenekler
 LogsLinesNumber=Number of lines to show on logs tab
-UseDebugBar=Use the debug bar
+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=Module debugbar is activated and slows dramaticaly the interface
-EXPORTS_SHARE_MODELS=Export models are share with everybody
-ExportSetup=Setup of module Export
+DebugBarModuleActivated=Hata Ayıklama Çubuğu Modülü etkinleştirildi ve arayüzü önemli ölçüde yavaşlatıyor
+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
 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
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index 86b1ece2f36..84846f58d53 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Dolibarr'ın otomatik olarak gündemde bir etkinlik oluşturacağ
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Üçüncü parti %s oluşturuldu
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Doğrulanan firma %s
 CONTRACT_DELETEInDolibarr=Sözleşme %s silindi
 PropalClosedSignedInDolibarr=İmzalan teklif %s
@@ -71,32 +72,33 @@ OrderApprovedInDolibarr=%s Siparişi onayladı
 OrderRefusedInDolibarr=Reddedilen teklif %s
 OrderBackToDraftInDolibarr=%s Siparişini taslak durumuna geri götür
 ProposalSentByEMail=Commercial proposal %s sent by email
-ContractSentByEMail=Contract %s sent by email
-OrderSentByEMail=Sales order %s sent by email
-InvoiceSentByEMail=Customer invoice %s sent by email
+ContractSentByEMail=%s sözleşmesi e-posta ile gönderildi
+OrderSentByEMail=Müşteri siparişi %s e-posta ile gönderildi
+InvoiceSentByEMail=Müşteri faturası %s e-posta ile gönderildi
 SupplierOrderSentByEMail=Purchase order %s sent by email
 SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
 ShippingSentByEMail=Shipment %s sent by email
 ShippingValidated= Sevkiyat %s doğrulandı
-InterventionSentByEMail=Intervention %s sent by email
+InterventionSentByEMail=%s müdahalesi e-posta ile gönderildi
 ProposalDeleted=Teklif silindi
 OrderDeleted=Sipariş silindi
 InvoiceDeleted=Fatura silindi
 PRODUCT_CREATEInDolibarr=Ürün %s oluşturuldu
 PRODUCT_MODIFYInDolibarr=Ürün %s değiştirildi
 PRODUCT_DELETEInDolibarr=Ürün %s silindi
-EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
+EXPENSE_REPORT_CREATEInDolibarr=%s gider raporu oluşturuldu
 EXPENSE_REPORT_VALIDATEInDolibarr=Gider raporu %s doğrulandı
-EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
-EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
+EXPENSE_REPORT_APPROVEInDolibarr=%s gider raporu onaylı
+EXPENSE_REPORT_DELETEInDolibarr=%s gider raporu silindi
 EXPENSE_REPORT_REFUSEDInDolibarr=Gider raporu %s reddedildi
 PROJECT_CREATEInDolibarr=%s projesi oluşturuldu
 PROJECT_MODIFYInDolibarr=Proje %s değiştirildi
 PROJECT_DELETEInDolibarr=Proje %s silindi
-TICKET_CREATEInDolibarr=Ticket %s created
-TICKET_MODIFYInDolibarr=Ticket %s modified
-TICKET_CLOSEInDolibarr=Ticket %s closed
-TICKET_DELETEInDolibarr=Ticket %s deleted
+TICKET_CREATEInDolibarr=Destek bildirimi %s oluşturuldu
+TICKET_MODIFYInDolibarr=Destek bildirimi %s değiştirildi
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
+TICKET_CLOSEInDolibarr=Destek bildirimi %s kapatıldı
+TICKET_DELETEInDolibarr=Destek bildirimi %s silindi
 ##### End agenda events #####
 AgendaModelModule=Etkinlik için belge şablonları
 DateActionStart=Başlama tarihi
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index 4b83891c4a7..f7fb3a97cf4 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -7,7 +7,7 @@ BankName=Banka adı
 FinancialAccount=Hesap
 BankAccount=Banka hesabı
 BankAccounts=Banka hesapları
-BankAccountsAndGateways=Banka | Ağ Geçitleri
+BankAccountsAndGateways=Banka hesapları | Ağ geçitleri
 ShowAccount=Hesabı Göster
 AccountRef=Ticari hesap ref
 AccountLabel=Ticari hesap adı
@@ -30,7 +30,7 @@ AllTime=Başlangıç
 Reconciliation=Uzlaşma
 RIB=Banka Hesap Numarası
 IBAN=IBAN numarası
-BIC=BIC/SWIFT numarası
+BIC=BIC/SWIFT kodu
 SwiftValid=BIC/SWIFT geçerli
 SwiftVNotalid=BIC/SWIFT geçerli değil
 IbanValid=BAN geçerli
@@ -42,11 +42,11 @@ AccountStatementShort=Özet
 AccountStatements=Hesap özetleri
 LastAccountStatements=Son hesap özetleri
 IOMonthlyReporting=Aylık raporlama
-BankAccountDomiciliation=Hesap adresi
+BankAccountDomiciliation=Banka adresi
 BankAccountCountry=Hesap ülkesi
 BankAccountOwner=Hesap sahibi adı
 BankAccountOwnerAddress=Hesap sahibi adresi
-RIBControlError=Değerlerin bütünlük kontrolü başarısız. Bu da, bu hesap numarasının bilgilerinin eksik veya yanlış olduğu anlamına gelir (ülke, numaralar ve IBAN kontrol edin).
+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=Hesap oluştur
 NewBankAccount=Yeni hesap
 NewFinancialAccount=Yeni ticari hesap
@@ -105,7 +105,7 @@ SocialContributionPayment=Sosyal/mali vergi ödemesi
 BankTransfer=Banka havalesi
 BankTransfers=Banka havaleleri
 MenuBankInternalTransfer=İç aktarım
-TransferDesc=Bir hesaptan başka bir hesaba transfer sırasında Dolibarr iki kayıt yazacaktır (kaynak hesaba borç ve hedef hesaba kredi). Bu işlem için aynı tutar (işaret hariç), etiket ve tarih kullanılacaktır.
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Kimden
 TransferTo=Kime
 TransferFromToDone=<b>%s</b> den <b>%s</b> nin <b>%s</b> %s ne bir transfer kaydedildi.
@@ -136,7 +136,7 @@ BankTransactionLine=Banka girişi
 AllAccounts=Tüm banka ve kasa hesapları
 BackToAccount=Hesaba geri dön
 ShowAllAccounts=Tüm hesaplar için göster
-FutureTransaction=Gelecekteki işlem. Hiçbir şekilde uzlaştırılamaz.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Çek mevduat makbuzuna dahil etmek için çekleri seç/filtrele ve "Oluştur" butonuna tıkla.
 InputReceiptNumber=Uzlaştırma ile ilişkili banka hesap özetini seç. Sıralanabilir bir sayısal değer kullan: YYYYMM ya da YYYYMMDD
 EventualyAddCategory=Sonunda, kayıtları sınıflandırmak için bir kategori belirtin
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Çek döndü ve fatura yeniden açık yapıldı
 BankAccountModelModule=Banka hesapları için belge şablonları
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=BAN bilgisini içeren bir sayfayı yazdırmak için şablon
-NewVariousPayment=Yeni çeşitli ödemeler
-VariousPayment=Çeşitli ödemeler
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Çeşitli ödemeler
-ShowVariousPayment=Çeşitli ödemeleri göster
-AddVariousPayment=Çeşitli ödemeler ekle
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Çeşitli ödeme ekle
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 1f138c4f3f8..e5c5e957014 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -6,11 +6,11 @@ BillsCustomer=Müşteri faturası
 BillsSuppliers=Tedarikçi faturaları
 BillsCustomersUnpaid=Ödenmemiş müşteri faturaları
 BillsCustomersUnpaidForCompany=%s için ödenmemiş müşteri faturaları
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsSuppliersUnpaid=Ödenmemiş tedarikçi faturaları
+BillsSuppliersUnpaidForCompany=%s için ödenmemiş tedarikçi faturaları
 BillsLate=Geç ödemeler
 BillsStatistics=Müşteri faturaları istatistikleri
-BillsStatisticsSuppliers=Vendors invoices statistics
+BillsStatisticsSuppliers=Tedarikçi faturaları istatistikleri
 DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
 DisabledBecauseNotLastInvoice=Fatura silinebilir olmadığı için devre dışı. Bazı faturalar bundan sonra kaydedildi ve sayaçta boşluklar oluşturacaktır.
 DisabledBecauseNotErasable=Silinemediği için devre dışı bırakıldı
@@ -41,7 +41,7 @@ CorrectionInvoice=Fatura düzeltme
 UsedByInvoice=%s Faturasını ödeme için kullan
 ConsumedBy=Tarafından tüketilen
 NotConsumed=Tüketilmemiş
-NoReplacableInvoice=No replaceable invoices
+NoReplacableInvoice=Değiştirilebilir fatura yok
 NoInvoiceToCorrect=Düzeltilecek fatura yok
 InvoiceHasAvoir=Was source of one or several credit notes
 CardBill=Fatura kartı
@@ -54,7 +54,7 @@ InvoiceCustomer=Müşteri faturası
 CustomerInvoice=Müşteri faturası
 CustomersInvoices=Müşteri faturaları
 SupplierInvoice=Tedarikçi faturası
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Tedarikçi faturaları
 SupplierBill=Tedarikçi faturası
 SupplierBills=tedarikçi faturaları
 Payment=Ödeme
@@ -66,30 +66,31 @@ paymentInInvoiceCurrency=fatura para biriminde
 PaidBack=Geri ödenen
 DeletePayment=Ödeme sil
 ConfirmDeletePayment=Bu ödemeyi silmek istediğinizden emin misiniz?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
-SupplierPayments=Vendor payments
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+SupplierPayments=Tedarikçi ödemeleri
 ReceivedPayments=Alınan ödemeler
 ReceivedCustomersPayments=Müşterilerden alınan ödemeler
-PayedSuppliersPayments=Payments paid to vendors
+PayedSuppliersPayments=Tedarikçilere yapılan ödemeler
 ReceivedCustomersPaymentsToValid=Müşterilerden alınan doğrulanacak ödemeler
 PaymentsReportsForYear=%s ilişkin ödeme raporları
 PaymentsReports=Ödeme raporları
 PaymentsAlreadyDone=Halihazırda yapılmış ödemeler
 PaymentsBackAlreadyDone=Zaten yapılmış geri ödemeler
 PaymentRule=Ödeme kuralı
-PaymentMode=Payment Type
+PaymentMode=Ödeme Türü
 PaymentTypeDC=Banka/Kredi Kartı
 PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
-PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
+IdPaymentMode=Ödeme Türü (id)
+CodePaymentMode=Ödeme Türü (kod)
+LabelPaymentMode=Ödeme Türü (etiket)
+PaymentModeShort=Ödeme Türü
+PaymentTerm=Ödeme Şartı
+PaymentConditions=Ödeme Koşulları
+PaymentConditionsShort=Ödeme Koşulları
 PaymentAmount=Ödeme tutarı
-ValidatePayment=Ödeme doğrula
 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.
@@ -104,14 +105,14 @@ AddBill=Fatura ya da iade faturası oluştur
 AddToDraftInvoices=Taslak fatura ekle
 DeleteBill=Fatura sil
 SearchACustomerInvoice=Müşteri faturası ara
-SearchASupplierInvoice=Search for a vendor invoice
+SearchASupplierInvoice=Tedarikçi faturası ara
 CancelBill=Fatura iptal et
 SendRemindByMail=Hatırlatılmayı E-posta ile gönder
 DoPayment=Ödeme girin
 DoPaymentBack=Para iadesi girin
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
+ConvertToReduc=Kullanılabilir kredi olarak işaretle
+ConvertExcessReceivedToReduc=Fazla alınan miktarı mevcut krediye dönüştürün
+ConvertExcessPaidToReduc=Fazla ödenen miktarı mevcut indirime dönüştürün
 EnterPaymentReceivedFromCustomer=Müşteriden alınan ödeme girin
 EnterPaymentDueToCustomer=Müşteri nedeniyle ödeme yap
 DisabledBecauseRemainderToPayIsZero=Ödenmemiş kalan sıfır olduğundan devre dışı
@@ -163,15 +164,15 @@ NewBill=Yeni fatura
 LastBills=En son %s fatura
 LatestTemplateInvoices=En son %s şablon fatura
 LatestCustomerTemplateInvoices=En son %s müşteri şablon faturası
-LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LatestSupplierTemplateInvoices=En son %s tedarikçi şablon faturası
 LastCustomersBills=En yeni %s müşteri faturaları 
-LastSuppliersBills=Latest %s vendor invoices
+LastSuppliersBills=En son %s tedarikçi faturası
 AllBills=Tüm faturalar
 AllCustomerTemplateInvoices=Tüm şablon faturaları
 OtherBills=Diğer faturalar
 DraftBills=Taslak faturalar
 CustomersDraftInvoices=Müşteri taslak faturaları
-SuppliersDraftInvoices=Vendor draft invoices
+SuppliersDraftInvoices=Tedarikçi taslak faturaları
 Unpaid=Ödenmemiş
 ConfirmDeleteBill=Bu faturayı silmek istediğinizden emin misiniz?
 ConfirmValidateBill=<b>%s</b> referanslı bu faturayı doğrulamak istediğiniz emin misiniz?
@@ -180,7 +181,7 @@ ConfirmClassifyPaidBill=<b>%s</b> faturasının durumunu ödenmiş olarak deği
 ConfirmCancelBill=<b>%s</b> faturasını iptal etmek istediğinizden emin misiniz?
 ConfirmCancelBillQuestion=Neden bu faturayı ‘vazgeçilmiş’ olarak sınıflandırmak istiyorsunuz?
 ConfirmClassifyPaidPartially=<b>%s</b> faturasının durumunu ödenmiş olarak değiştirmek istediğinizden emin misiniz?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
+ConfirmClassifyPaidPartiallyQuestion=Bu fatura tamamen ödenmedi. Bu faturayı kapatmanın nedeni nedir?
 ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Kalan ödenmemiş tutar <b>(%s %s)</b> ödeme vadesinden önce ödendiğinden bir indirim olarak verilmiştir. Burada KDV sini kaybetmeyi kabul ediyorum.
@@ -201,10 +202,10 @@ ConfirmSupplierPayment=Bu ödeme girişini <b>%s </ b>%s için onaylıyor musunu
 ConfirmValidatePayment=Bu ödemeyi doğrulamak istediğinizden emin misiniz? Ödeme doğrulandıktan sonra hiçbir değişiklik yapılamaz.
 ValidateBill=Fatura doğrula
 UnvalidateBill=Faturadan doğrulamayı kaldır
-NumberOfBills=No. of invoices
+NumberOfBills=Fatura sayısı
 NumberOfBillsByMonth=Aylık fatura sayısı
 AmountOfBills=Faturaların tutarı
-AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsHT=Fatura tutarı (vergisiz net)
 AmountOfBillsByMonthHT=Aylık fatura tutarı (vergisiz net)
 ShowSocialContribution=Sosyal/mali vergi göster
 ShowBill=Fatura göster
@@ -247,11 +248,11 @@ DateInvoice=Fatura tarihi
 DatePointOfTax=Vergi noktası
 NoInvoice=Fatura yok
 ClassifyBill=Fatura sınıflandır
-SupplierBillsToPay=Unpaid vendor invoices
+SupplierBillsToPay=Ödenmemiş tedarikçi faturaları
 CustomerBillsUnpaid=Ödenmemiş müşteri faturaları
 NonPercuRecuperable=Kurtarılamaz
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
+SetConditions=Ödeme Koşullarını Ayarla
+SetMode=Ödeme Türünü Ayarla
 SetRevenuStamp=Damga pulu ayarı
 Billed=Faturalanmış
 RecurringInvoices=Yinelenen faturalar
@@ -268,9 +269,9 @@ ExportDataset_invoice_1=Müşteri faturaları ve fatura detayları
 ExportDataset_invoice_2=Müşteri faturaları ve ödemeleri
 ProformaBill=Proforma Fatura:
 Reduction=Kesinti
-ReductionShort=Disc.
+ReductionShort=İnd.
 Reductions=Kesintiler
-ReductionsShort=Disc.
+ReductionsShort=İnd.
 Discounts=İndirimler
 AddDiscount=İndirim oluştur
 AddRelativeDiscount=Göreceli indirim oluştur
@@ -299,8 +300,8 @@ DiscountType=İndirim türü
 NoteReason=Not/Nedeni
 ReasonDiscount=Neden
 DiscountOfferedBy=Veren
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
+DiscountStillRemaining=Mevcut indirim veya krediler
+DiscountAlreadyCounted=Önceden harcanan indirim veya krediler
 CustomerDiscounts=Müşteri indirimleri
 SupplierDiscounts=Tedarikçi indirimleri
 BillAddress=Fatura adresi
@@ -325,7 +326,7 @@ InvoiceNotChecked=Seçilen yok fatura
 ConfirmCloneInvoice=<b>%s</b> faturasını kopyalamak istediğinizden emin misiniz?
 DisabledBecauseReplacedInvoice=Eylem engellendi, çünkü fatura değiştirilmiştir
 DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
-NbOfPayments=No. of payments
+NbOfPayments=Ödeme sayısı
 SplitDiscount=İndirimi ikiye böl
 ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
 TypeAmountOfEachNewDiscount=Input amount for each of two parts:
@@ -334,7 +335,7 @@ ConfirmRemoveDiscount=Bu indirimi kaldırmak istediğinizden emin misiniz?
 RelatedBill=İlgili fatura
 RelatedBills=İlgili faturalar
 RelatedCustomerInvoices=İlgili müşteri faturaları
-RelatedSupplierInvoices=Related vendor invoices
+RelatedSupplierInvoices=İlgili tedarikçi faturaları
 LatestRelatedBill=Son ilgili fatura
 WarningBillExist=Uyarı, bir veya daha fazla fatura zaten mevcut
 MergingPDFTool=Birleştirme PDF aracı
@@ -366,7 +367,8 @@ InvoiceAutoValidate=Faturaları otomatik olarak doğrula
 GeneratedFromRecurringInvoice=Şablondan oluşturulan yinelenen fatura %s
 DateIsNotEnough=Henüz tarihe ulaşılmadı
 InvoiceGeneratedFromTemplate=Fatura %s yinelenen fatura şablonundan %s oluşturuldu
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+GeneratedFromTemplate=Generated from template invoice %s
+WarningInvoiceDateInFuture=Uyarı: fatura tarihi şu anki tarihten daha yüksek
 WarningInvoiceDateTooFarInFuture=Uyarı, fatura tarihi şu anki tarihten çok uzak
 ViewAvailableGlobalDiscounts=Mevcut indirimleri görüntüle
 # PaymentConditions
@@ -395,7 +397,7 @@ PaymentConditionShort14D=14 gün
 PaymentCondition14D=14 gün
 PaymentConditionShort14DENDMONTH=14 days of month-end
 PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount
+FixAmount=Sabit tutar
 VarAmount=Değişken tutar (%% top.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
 # PaymentType
@@ -419,14 +421,14 @@ PaymentTypeFAC=Faktör
 PaymentTypeShortFAC=Faktör
 BankDetails=Banka ayrıntıları
 BankCode=Banka kodu
-DeskCode=Branch code
+DeskCode=Şube kodu
 BankAccountNumber=Hesap numarası
 BankAccountNumberKey=Checksum
 Residence=Adresi
-IBANNumber=IBAN account number
+IBANNumber=IBAN numarası
 IBAN=IBAN
 BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT code
+BICNumber=BIC/SWIFT kodu
 ExtraInfos=Ek bilgiler
 RegulatedOn=Buna göre düzenlenmiş
 ChequeNumber=Çek No
@@ -440,7 +442,7 @@ PhoneNumber=Tel
 FullPhoneNumber=Telefon
 TeleFax=Faks
 PrettyLittleSentence=Maliye İdaresi tarafından onaylı bir muhasebe kurumu üyesi olarak adıma verilen çeklerdeki ödeme tutarını kabul ediniz.
-IntracommunityVATNumber=Intra-Community VAT ID
+IntracommunityVATNumber=Topluluk İçi Vergi Numarası
 PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
 PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
 SendTo=kime
@@ -477,7 +479,7 @@ Reported=Gecikmiş
 DisabledBecausePayments=Bazı ödemeler olduğundan dolayı mümkün değil
 CantRemovePaymentWithOneInvoicePaid=En az bir fatura ödenmiş olarak sınıflandırıldığı için ödemeyi silemezsiniz
 ExpectedToPay=Beklenen ödeme
-CantRemoveConciliatedPayment=Can't remove reconciled payment
+CantRemoveConciliatedPayment=Uzlaştırılan ödeme kaldırılamıyor
 PayedByThisPayment=Bu ödeme ile ödenmiş
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down-payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Tamamı ödenmiş iade faturalarını "Ödendi" olarak sınıflandır.
@@ -505,7 +507,7 @@ TypeContact_facture_external_SHIPPING=Müşteri sevkiyat ilgilisi
 TypeContact_facture_external_SERVICE=Müşteri hizmeti ilgilisi
 TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
 TypeContact_invoice_supplier_external_BILLING=Tedarikçi faturası kişisi
-TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_invoice_supplier_external_SHIPPING=Tedarikçi sevkiyat yetkilisi
 TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 # Situation invoices
 InvoiceFirstSituationAsk=İlk hakediş faturası
@@ -541,7 +543,7 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Fatura şablonunu sil
 ConfirmDeleteRepeatableInvoice=Şablon faturasını silmek istediğinizden emin misiniz?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s fatura oluşturuldu
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Belge dosyası üretme
 AutogenerateDoc=Auto generate document file
diff --git a/htdocs/langs/tr_TR/bookmarks.lang b/htdocs/langs/tr_TR/bookmarks.lang
index d7c2489d8a8..80ac62fd7f5 100644
--- a/htdocs/langs/tr_TR/bookmarks.lang
+++ b/htdocs/langs/tr_TR/bookmarks.lang
@@ -6,15 +6,15 @@ ListOfBookmarks=Yer imi listesi
 EditBookmarks=Yer imlerini listele/düzenle
 NewBookmark=Yeni yer imi
 ShowBookmark=Yer imine bakın
-OpenANewWindow=Yeni bir pencere açılsın
-ReplaceWindow=Geçerli pencerede görüntülensin
-BookmarkTargetNewWindowShort=Yeni pencerede
-BookmarkTargetReplaceWindowShort=Geçerli pencerede
-BookmarkTitle=Yer imi başlığı
+OpenANewWindow=Yeni bir sekme aç
+ReplaceWindow=Geçerli sekmeyi değiştir
+BookmarkTargetNewWindowShort=Yeni sekme
+BookmarkTargetReplaceWindowShort=Mevcut sekme
+BookmarkTitle=Yer imi adı
 UrlOrLink=İnternet Adresi
 BehaviourOnClick=Bir yer imi URL'si seçildiğindeki davranış
 CreateBookmark=Yer imi ekleyin
-SetHereATitleForLink=Yer iminin başlığını yazın
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Dış http ya da bağıl Dolibarr İnternet adresi kullanın
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Bağlantılı sayfanın yeni bir pencerede açılıp açılmayacağını seçin
+SetHereATitleForLink=Yer imi için bir ad belirleyin
+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=Yer imi yönetimi
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index 124816a668b..e1cbf7d97e0 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLoginInformation=Giriş bilgileri
-BoxLastRssInfos=RSS Information
+BoxLastRssInfos=RSS Bilgisi
 BoxLastProducts=Son %s Ürün/Hizmet
 BoxProductsAlertStock=Ürünler için stok uyarısı
 BoxLastProductsInContract=Sözleşmeli son %s ürün/hizmet
-BoxLastSupplierBills=Latest Vendor invoices
-BoxLastCustomerBills=Latest Customer invoices
+BoxLastSupplierBills=En son tedarikçi faturaları
+BoxLastCustomerBills=En son müşteri faturaları
 BoxOldestUnpaidCustomerBills=En eski ödenmemiş müşteri faturaları
-BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
+BoxOldestUnpaidSupplierBills=Ödenmemiş en eski tedarikçi faturaları
 BoxLastProposals=Son teklifler
 BoxLastProspects=Son değiştirilen adaylar
 BoxLastCustomers=Son değiştirilen müşteriler
 BoxLastSuppliers=Son değiştirilen tedarikçiler
-BoxLastCustomerOrders=Latest sales orders
+BoxLastCustomerOrders=En son müşteri siparişleri
 BoxLastActions=Son eylemler
 BoxLastContracts=Son sözleşmeler
 BoxLastContacts=Son kişiler/adresler
@@ -23,19 +23,19 @@ BoxTitleLastRssInfos=Son %s haber, gönderen %s
 BoxTitleLastProducts=Ürünler/Hizmetler: değiştirilen son %s
 BoxTitleProductsAlertStock=Ürünler: stok uyarısı
 BoxTitleLastSuppliers=Kaydedilen son %s tedarikçi
-BoxTitleLastModifiedSuppliers=Vendors: last %s modified
-BoxTitleLastModifiedCustomers=Customers: last %s modified
+BoxTitleLastModifiedSuppliers=Tedarikçiler: değiştirilen son %s
+BoxTitleLastModifiedCustomers=Müşteriler: değiştirilen son %s
 BoxTitleLastCustomersOrProspects=Son %s müşteri veya aday
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
-BoxTitleLastModifiedProspects=Prospects: last %s modified
+BoxTitleLastCustomerBills=En son %s müşteri faturası
+BoxTitleLastSupplierBills=En son %s tedarikçi faturası
+BoxTitleLastModifiedProspects=Adaylar: değiştirilen son %s
 BoxTitleLastModifiedMembers=Son %s üye
 BoxTitleLastFicheInter=Değiştirilen son %s müdahale
 BoxTitleOldestUnpaidCustomerBills=Müşteri Faturaları: ödenmemiş en eski %s
-BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
-BoxTitleCurrentAccounts=Open Accounts: balances
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
-BoxMyLastBookmarks=Bookmarks: latest %s
+BoxTitleOldestUnpaidSupplierBills=Tedarikçi Faturaları: ödenmemiş en eski %s
+BoxTitleCurrentAccounts=Açık Hesaplar: bakiyeler
+BoxTitleLastModifiedContacts=Kişiler/Adresler: değiştirilen son %s
+BoxMyLastBookmarks=Yer imleri: en son %s
 BoxOldestExpiredServices=Süresi dolmuş en eski etkin hizmetler
 BoxLastExpiredServices=Etkin hizmet süresi dolmuş son %s kişi
 BoxTitleLastActionsToDo=Yapılacak son %s eylem
@@ -52,31 +52,31 @@ ClickToAdd=Eklemek için buraya tıklayın.
 NoRecordedCustomers=Kayıtlı müşteri yok
 NoRecordedContacts=Kayıtlı kişi yok
 NoActionsToDo=Yapılacak eylem yok
-NoRecordedOrders=No recorded sales orders
+NoRecordedOrders=Kayıtlı müşteri siparişi yok
 NoRecordedProposals=Kayıtlı teklif yok
 NoRecordedInvoices=Kayıtlı hiçbir müşteri faturası bulunmuyor
 NoUnpaidCustomerBills=Ödenmemiş hiçbir müşteri faturası bulunmuyor
-NoUnpaidSupplierBills=No unpaid vendor invoices
-NoModifiedSupplierBills=No recorded vendor invoices
+NoUnpaidSupplierBills=Ödenmemiş tedarikçi faturası yok
+NoModifiedSupplierBills=Kayıtlı tedarikçi faturası yok
 NoRecordedProducts=Kayıtlı ürün/hizmet yok
 NoRecordedProspects=Kayıtlı aday yok
 NoContractedProducts=Sözleşmeli ürün/hizmet yok
 NoRecordedContracts=Kayıtlı sözleşme yok
 NoRecordedInterventions=Kayıtlı müdahale yok
-BoxLatestSupplierOrders=Latest purchase orders
-NoSupplierOrder=No recorded purchase order
-BoxCustomersInvoicesPerMonth=Aylık Müşteri Faturaları
-BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
-BoxCustomersOrdersPerMonth=Sales Orders per month
-BoxSuppliersOrdersPerMonth=Vendor Orders per month
+BoxLatestSupplierOrders=En son tedarikçi siparişleri
+NoSupplierOrder=Kayıtlı tedarikçi siparişi yok
+BoxCustomersInvoicesPerMonth=Aylık müşteri faturaları
+BoxSuppliersInvoicesPerMonth=Aylık tedarikçi faturaları
+BoxCustomersOrdersPerMonth=Aylık müşteri siparişleri
+BoxSuppliersOrdersPerMonth=Aylık tedarikçi siparişleri
 BoxProposalsPerMonth=Aylık teklifler
 NoTooLowStockProducts=Düşük stok limitinin altında ürün yok
 BoxProductDistribution=Ürün/Hizmet Dağılımı
 ForObject=On %s
-BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
-BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
-BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
-BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
+BoxTitleLastModifiedSupplierBills=Tedarikçi Faturaları:  değiştirilen son %s
+BoxTitleLatestModifiedSupplierOrders=Tedarikçi Siparişleri: değiştirilen son %s
+BoxTitleLastModifiedCustomerBills=Müşteri Faturaları: değiştirilen son %s
+BoxTitleLastModifiedCustomerOrders=Müşteri Siparişleri: son değiştirilen %s
 BoxTitleLastModifiedPropals=Değiştirilen son %s teklif
 ForCustomersInvoices=Müşteri faturaları
 ForCustomersOrders=Müşteri siparişleri
@@ -84,4 +84,4 @@ ForProposals=Teklifler
 LastXMonthRolling=Devreden son %s ay
 ChooseBoxToAdd=Kontrol panelinize kutu ekleyin
 BoxAdded=Widget gösterge tablonuza eklendi
-BoxTitleUserBirthdaysOfMonth=Birthdays of this month
+BoxTitleUserBirthdaysOfMonth=Bu ayın doğum günleri
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
index cbcea24fc8e..0165b009bab 100644
--- a/htdocs/langs/tr_TR/cashdesk.lang
+++ b/htdocs/langs/tr_TR/cashdesk.lang
@@ -32,7 +32,7 @@ DeleteArticle=Bu malı kaldırmak için tıkla
 FilterRefOrLabelOrBC=Ara (Ref/Etiket)
 UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Fiş Yazıcısı
-PointOfSale=Point of Sale
+PointOfSale=Satış Noktası
 PointOfSaleShort=POS
 CloseBill=Close Bill
 Floors=Floors
@@ -55,10 +55,16 @@ Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
 TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+OrderNotes=Sipariş Notları
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets
-AutoPrintTickets=Automatically print tickets
+AutoPrintTickets=Destek bildirimlerini otomatik olarak yazdır
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Geçmiş
+ValidateAndClose=Doğrula ve kapat
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index e73a0c19877..f2b04bf28ab 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -10,7 +10,7 @@ modify=değiştir
 Classify=Sınıflandır
 CategoriesArea=Etiketler/Kategoriler alanı
 ProductsCategoriesArea=Ürün/Hizmet etiketleri/kategorileri alanı
-SuppliersCategoriesArea=Vendors tags/categories area
+SuppliersCategoriesArea=Tedarikçi etiketleri/kategorileri alanı
 CustomersCategoriesArea=Müşteri etiketleri/kategorileri alanı
 MembersCategoriesArea=Üyeler etiketleri/kategorileri alanı
 ContactsCategoriesArea=Kişi etiketleri/kategorileri alanı
@@ -32,7 +32,7 @@ WasAddedSuccessfully=<b>%s</b> başarıyla eklendi.
 ObjectAlreadyLinkedToCategory=Öğe zaten bu etiketle/kategoriyle ilişkilendirilmiş
 ProductIsInCategories=Ürün/hizmet aşağıdaki etiketlere/kategorilere bağlantılandı
 CompanyIsInCustomersCategories=Bu üçüncü parti aşağıdaki müşteri/beklenti etiketlerine/kategorilerine bağlantılandı
-CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
+CompanyIsInSuppliersCategories=Bu üçüncü parti aşağıdaki tedarikçi etiketlerine/kategorilerine bağlantılandı
 MemberIsInCategories=Bu üye aşağıdaki üye etiketlerine/kategorilerine bağlantılandı
 ContactIsInCategories=Bu kişi aşağıdaki kişi etiketlerine/kategorilerine bağlantılı
 ProductHasNoCategory=Bu ürün/hizmet hiçbir etikette/kategoride yoktur
@@ -48,11 +48,11 @@ ContentsNotVisibleByAllShort=İçerik herkes tarafından görülemez
 DeleteCategory=Etiket/kategori sil
 ConfirmDeleteCategory=Bu etiketi/kategoriyi silmek istediğinizden emin misiniz?
 NoCategoriesDefined=Tanımlı etiket/kategori yok
-SuppliersCategoryShort=Vendors tag/category
+SuppliersCategoryShort=Tedarikçi etiketi/kategorisi
 CustomersCategoryShort=Müşteri etiketi/kategorisi
 ProductsCategoryShort=Ürün etiketi/kategorisi
 MembersCategoryShort=Üye etiketi/kategorisi
-SuppliersCategoriesShort=Vendors tags/categories
+SuppliersCategoriesShort=Tedarikçi etiketleri/kategorileri
 CustomersCategoriesShort=Müşteri etiketleri/kategorileri
 ProspectsCategoriesShort=Beklenti etiketleri/kategorileri
 CustomersProspectsCategoriesShort=Müşteri/Aday etiketleri/kategorileri
@@ -63,14 +63,14 @@ AccountsCategoriesShort=Hesap etiketleri/kategorileri
 ProjectsCategoriesShort=Proje etiketi/kategorisi
 UsersCategoriesShort=Kullanıcı etiketleri/kategorileri
 ThisCategoryHasNoProduct=Bu kategori herhangi bir ürün içermiyor.
-ThisCategoryHasNoSupplier=This category does not contain any vendor.
+ThisCategoryHasNoSupplier=Bu kategori hiçbir tedarikçi içermiyor.
 ThisCategoryHasNoCustomer=Bu kategori herhangi bir müşteri içermiyor.
 ThisCategoryHasNoMember=Bu kategori herhangi bir üye içermiyor.
 ThisCategoryHasNoContact=Bu kategori herhangi bir kişi içermiyor.
 ThisCategoryHasNoAccount=Bu kategori hiçbir hesap içermiyor.
 ThisCategoryHasNoProject=Bu kategori herhangi bir proje içermiyor.
 CategId=Etiket/kategori kimliği
-CatSupList=List of vendor tags/categories
+CatSupList=Tedarikçi etiketleri/kategorileri listesi
 CatCusList=Müşteri/beklenti etiketleri/kategorileri listesi
 CatProdList=Ürün etiketleri/kategorileri listesi
 CatMemberList=Üye etiketleri/kategorileri listesi
@@ -83,7 +83,7 @@ DeleteFromCat=Etiketlerden/kategorilerden kaldır
 ExtraFieldsCategories=Tamamlayıcı öznitelikler
 CategoriesSetup=Etiket/kategori ayarları
 CategorieRecursiv=Otomatik ana etiketli/kategorili bağlantı
-CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
+CategorieRecursivHelp=Bu seçenek aktifse, alt bir kategoriye ürün eklediğinizde bu ürün aynı zamanda üst kategoriye de eklenecektir.
 AddProductServiceIntoCategory=Aşağıdaki ürünü/hizmeti ekle
 ShowCategory=Etiketi/kategoriyi göster
 ByDefaultInList=B listede varsayılana göre
diff --git a/htdocs/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang
index 7b5448ecec3..c022d8c44de 100644
--- a/htdocs/langs/tr_TR/commercial.lang
+++ b/htdocs/langs/tr_TR/commercial.lang
@@ -18,7 +18,7 @@ TaskRDVWith=%s ile toplantı
 ShowTask=Görev göster
 ShowAction=Etkinlik göster
 ActionsReport=Etkinlik raporu
-ThirdPartiesOfSaleRepresentative=Satış temsilcisi olan üçüncü kişiler
+ThirdPartiesOfSaleRepresentative=Satış temsilcisi olan üçüncü partiler
 SaleRepresentativesOfThirdParty=Üçüncü parti satış temsilcileri
 SalesRepresentative=Satış temsilcisi
 SalesRepresentatives=Satış temsilcileri
@@ -52,16 +52,16 @@ ActionAC_TEL=Telefon çağrısı
 ActionAC_FAX=Faks gönder
 ActionAC_PROP=Teklifi postayla gönder
 ActionAC_EMAIL=Eposta gönder
-ActionAC_EMAIL_IN=Reception of Email
+ActionAC_EMAIL_IN=E-postaların Alınması
 ActionAC_RDV=Toplantılar
 ActionAC_INT=Siteden müdahale
 ActionAC_FAC=Müşteri faturasını postayla gönder gönder
 ActionAC_REL=Müşteri faturasını postayla gönder (anımsatma)
 ActionAC_CLO=Kapat
 ActionAC_EMAILING=Toplu eposta gönder
-ActionAC_COM=Müşteri siparişini postayla gönder
+ActionAC_COM=Müşteri siparişini e-posta ile gönder
 ActionAC_SHIP=Sevkiyatı postayla gönder
-ActionAC_SUP_ORD=Satınalma siparişini e-posta ile gönder
+ActionAC_SUP_ORD=Tedarikçi siparişini e-posta ile gönder
 ActionAC_SUP_INV=Tedarikçi faturasını e-posta ile gönder
 ActionAC_OTH=Diğer
 ActionAC_OTH_AUTO=Otomatikman eklenen etkinlikler
@@ -77,4 +77,4 @@ WelcomeOnOnlineSignaturePage=%s'dan ticari teklifleri kabul etme sayfasına hoş
 ThisScreenAllowsYouToSignDocFrom=Bu ekran, bir teklifi kabul etmenize ve imzalamanıza veya reddetmenize olanak sağlar.
 ThisIsInformationOnDocumentToSign=Bu, kabul veya reddedilecek belge hakkında bilgidir
 SignatureProposalRef=Ticari teklifin imzası %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+FeatureOnlineSignDisabled=Çevrimiçi imzalama özelliği devre dışı bırakıldı veya belge bu özellik etkinleştirilmeden önce oluşturuldu
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 41e4705ed55..47b0b61c86f 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -20,26 +20,26 @@ IdThirdParty=Üçüncü parti kimliği
 IdCompany=Firma kimliği
 IdContact=Kişi kimliği
 Contacts=Kişiler/Adresler
-ThirdPartyContacts=Third-party contacts
-ThirdPartyContact=Third-party contact/address
+ThirdPartyContacts=Üçüncü parti kişileri
+ThirdPartyContact=Üçüncü parti kisi/adresi
 Company=Firma
 CompanyName=Firma adı
 AliasNames=Rumuz (ticari isim, marka ismi, ...)
-AliasNameShort=Alias Name
+AliasNameShort=Rumuz
 Companies=Firmalar
 CountryIsInEEC=Ülke, Avrupa Ekonomik Topluluğu içindedir
-PriceFormatInCurrentLanguage=Price format in current language
-ThirdPartyName=Third-party name
-ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
+PriceFormatInCurrentLanguage=Kullanılan dil ve para biriminde fiyat görüntüleme biçimi
+ThirdPartyName=Üçüncü parti adı
+ThirdPartyEmail=Üçüncü parti e-postası
+ThirdParty=Üçüncü Parti
+ThirdParties=Üçüncü Partiler
 ThirdPartyProspects=Adaylar
 ThirdPartyProspectsStats=Adaylar
 ThirdPartyCustomers=Müşteriler
 ThirdPartyCustomersStats=Müşteriler
 ThirdPartyCustomersWithIdProf12=Müşteriler %s veya %s ile
 ThirdPartySuppliers=Tedarikçiler
-ThirdPartyType=Third-party type
+ThirdPartyType=Üçüncü parti türü
 Individual=Özel şahıs
 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=Ana firma
@@ -53,12 +53,12 @@ Lastname=Soyadı
 Firstname=İlk Adı
 PostOrFunction=İş pozisyonu
 UserTitle=Unvan
-NatureOfThirdParty=Nature of Third party
+NatureOfThirdParty=Üçüncü partinin yapısı
 Address=Adresi
 State=Eyaleti/İli
 StateShort=Durum
 Region=Bölgesi
-Region-State=Region - State
+Region-State=Bölge - Eyalet
 Country=Ülkesi
 CountryCode=Ülke kodu
 CountryId=Ülke kimliği
@@ -70,19 +70,19 @@ Chat=Sohbet
 PhonePro=İş Telefonu
 PhonePerso=Kişi. telefonu
 PhoneMobile=Mobil
-No_Email=Refuse bulk emailings
+No_Email=Toplu e-postaları reddet
 Fax=Faks
 Zip=Posta Kodu
 Town=İlçesi
 Web=Web
 Poste= Durumu
-DefaultLang=Language default
+DefaultLang=Varsayılan dil
 VATIsUsed=KDV kullanılır
 VATIsUsedWhenSelling=Üçüncü partinin kendi müşterilerine fatura keserken satış vergisi kullanıp kullanmadığını burada tanımlayabilirsiniz.
 VATIsNotUsed=KDV kullanılmaz
-CopyAddressFromSoc=Copy address from third-party details
+CopyAddressFromSoc=Adresi üçüncü parti bilgilerinden kopyala
 ThirdpartyNotCustomerNotSupplierSoNoRef=Üçüncü parti ne müşteri ne de tedarikçidir, mevcut referans nesneler yok
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Üçüncü parti ne müşteri ne de tedarikçidir, indirim mevcut değildir
 PaymentBankAccount=Ödeme banka hesabı
 OverAllProposals=Teklifler
 OverAllOrders=Siparişler
@@ -257,8 +257,8 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT ID
-VATIntraShort=VAT ID
+VATIntra=Vergi Numarası
+VATIntraShort=Vergi Numarası
 VATIntraSyntaxIsValid=Sözdizimi geçerli
 VATReturn=KDV iadesi
 ProspectCustomer=Aday/Müşteri
@@ -271,15 +271,15 @@ CustomerRelativeDiscountShort=Göreceli indirim
 CustomerAbsoluteDiscountShort=Mutlak indirim
 CompanyHasRelativeDiscount=Bu müşterinin varsayılan bir <b>%s%%</b> indirimi var
 CompanyHasNoRelativeDiscount=Bu müşterinin varsayılan hiçbir göreceli indirimi yok
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+HasRelativeDiscountFromSupplier=Bu tedarikçiden varsayılan olarak <b>%s%%</b> indiriminiz var
+HasNoRelativeDiscountFromSupplier=Bu tedarikçiden varsayılan olarak göreceli bir indiriminiz yok
 CompanyHasAbsoluteDiscount=Bu müşteri <b>%s</b>%s için indirimlere sahip (kredi notları veya peşinatlar)
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Bu müşterinin <b>%s</b>%s için indirimleri mevcut (ticari, peşinatlar)
 CompanyHasCreditNote=Bu müşterinin hala <b>%s</b> %s için iade faturaları var
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
-HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
-HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
+HasNoAbsoluteDiscountFromSupplier=Bu tedarikçiden hiçbir indirim krediniz yok
+HasAbsoluteDiscountFromSupplier=Bu tedarikçiden <b>%s</b> %s için indirimleriniz (alacak dekontu, peşinatlar) var
+HasDownPaymentOrCommercialDiscountFromSupplier=Bu tedarikçiden <b>%s</b> %s için indirimleriniz (ticari, peşinatlar) var
+HasCreditNoteFromSupplier=Bu tedarikçiden <b>%s</b> %s için alacak dekontunuz var
 CompanyHasNoAbsoluteDiscount=Bu müşterinin hiçbir indirim alacağı yoktur
 CustomerAbsoluteDiscountAllUsers=Mutlak müşteri indirimleri (tüm kullanıcılar tarafından verilen)
 CustomerAbsoluteDiscountMy=Mutlak müşteri indirimleri (sizin tarafınızdan verilen)
@@ -337,14 +337,14 @@ MyContacts=Kişilerim
 Capital=Sermaye
 CapitalOf=Sermaye %s
 EditCompany=Firma düzenle
-ThisUserIsNot=This user is not a prospect, customer nor vendor
+ThisUserIsNot=Bu kullanıcı bir aday, müşteri veya tedarikçi değildir
 VATIntraCheck=Denetle
-VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+VATIntraCheckDesc=Bu Vergi Numarası ülke önekini içermelidir. <b>%s</b> linki, Dolibarr sunucusundan internet erişimi gerektiren Avrupa KDV kontrol hizmetini (VIES) kullanır.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
+VATIntraCheckableOnEUSite=Avrupa Komisyonu web sitesinden topluluk içi Vergi Numarasını kontrol edin
 VATIntraManualCheck=Avrupa Komisyonu'nun <a href="%s" target="_blank">%s</a> web adresinden de manuel olarak kontrol edebilirsiniz
 ErrorVATCheckMS_UNAVAILABLE=Denetlemiyor. Denetim hizmeti üye ülke (%s) tarafından sağlanmıyor.
-NorProspectNorCustomer=Not prospect, nor customer
+NorProspectNorCustomer=Ne aday ne de müşteri
 JuridicalStatus=Tüzel Kişilik Türü
 Staff=Çalışanlar
 ProspectLevelShort=Potansiyel
@@ -367,7 +367,7 @@ TE_MEDIUM=Orta firma
 TE_ADMIN=Resmi kurum
 TE_SMALL=Küçük firma
 TE_RETAIL=Perakendeci
-TE_WHOLE=Wholesaler
+TE_WHOLE=Toptancı
 TE_PRIVATE=Özel şahıs
 TE_OTHER=Diğer
 StatusProspect-1=Görüşülecek
@@ -386,14 +386,14 @@ ExportCardToFormat=Biçimlenip dışaaktarılacak kart
 ContactNotLinkedToCompany=Kişi herhangi bir üçüncü partiye bağlı değil
 DolibarrLogin=Dolibarr kullanıcı adı
 NoDolibarrAccess=Dolibarr erişimi yok
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
+ExportDataset_company_1=Üçüncü Partiler (şirketler/dernekler/şahıslar) ve özellikleri
 ExportDataset_company_2=Kişiler ve özellikleri
-ImportDataset_company_1=Third-parties and their properties
-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)
-PriceLevel=Price Level
-PriceLevelLabels=Price Level Labels
+ImportDataset_company_1=Üçüncü Partiler ve özellikleri
+ImportDataset_company_2=Üçücü parti ilave kişileri/adresleri ve nitelikleri
+ImportDataset_company_3=Üçüncü Partilerin Banka hesapları
+ImportDataset_company_4=Üçücü parti satış temsilcileri (satış temsilcilerini/kullanıcıları şirketlere atayın)
+PriceLevel=Fiyat Seviyesi
+PriceLevelLabels=Fiyat Seviyesi Etiketleri
 DeliveryAddress=Teslimat adresi
 AddAddress=Adres ekle
 SupplierCategory=Tedarikçi kategorisi
@@ -431,11 +431,11 @@ SaleRepresentativeLogin=Satış temsilcisinin kullanıcı adı
 SaleRepresentativeFirstname=Satış temsilcisinin adı
 SaleRepresentativeLastname=Satış temsilcisinin soyadı
 ErrorThirdpartiesMerge=Üçüncü partiler silinirken bir hata oluştu. Lütfen günlüğü denetleyin. Değişiklikler geri alındı.
-NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
+NewCustomerSupplierCodeProposed=Müşteri veya Tedarikçi kodu zaten kullanılmış, yeni bir kod önerilir
 #Imports
-PaymentTypeCustomer=Payment Type - Customer
-PaymentTermsCustomer=Payment Terms - Customer
-PaymentTypeSupplier=Payment Type - Vendor
-PaymentTermsSupplier=Payment Term - Vendor
-MulticurrencyUsed=Use Multicurrency
+PaymentTypeCustomer=Ödeme Türü - Müşteri
+PaymentTermsCustomer=Ödeme Koşulları - Müşteri
+PaymentTypeSupplier=Ödeme Türü - Tedarikçi
+PaymentTermsSupplier=Ödeme Koşulları - Tedarikçi
+MulticurrencyUsed=Çoklu Para Birimi Kullan
 MulticurrencyCurrency=Para birimi
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 4692e579dc1..a2b3869a1b8 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -11,7 +11,7 @@ FeatureIsSupportedInInOutModeOnly=Özellik yalnızca ALACAKLAR-BORÇLAR muhasebe
 VATReportBuildWithOptionDefinedInModule=Burada gösterilen tutarlar vergi modülü kurulumu tarafından tanımlanan kurallar kullanılarak hesaplanır.
 LTReportBuildWithOptionDefinedInModule=Burada gösterilen tutarlar Firma ayarları tarafından tanımlanan kurallar kullanılarak hesaplanır.
 Param=Ayarlar
-RemainingAmountPayment=Amount payment remaining:
+RemainingAmountPayment=Kalan ödeme tutarı:
 Account=Hesap
 Accountparent=Ana hesap
 Accountsparent=Ana hesaplar
@@ -25,7 +25,7 @@ PaymentsNotLinkedToInvoice=Herhangi bir faturaya bağlı olmayan ödemeler, herh
 PaymentsNotLinkedToUser=Herhangi bir kullanıcıya bağlı olmayan ödemeler
 Profit=Kar
 AccountingResult=Muhasebe sonucu
-BalanceBefore=Balance (before)
+BalanceBefore=Bakiye (önce)
 Balance=Bakiye
 Debit=Borç
 Credit=Alacak
@@ -80,9 +80,8 @@ AddSocialContribution=Sosyal/mali vergi ekle
 ContributionsToPay=Ödenecek sosyal/mali vergiler
 AccountancyTreasuryArea=Faturalama ve ödeme alanı
 NewPayment=Yeni ödeme
-Payments=Ödemeler
 PaymentCustomerInvoice=Müşteri fatura ödemesi
-PaymentSupplierInvoice=vendor invoice payment
+PaymentSupplierInvoice=Tedarikçi faturası ödemesi
 PaymentSocialContribution=Sosyal/mali vergi ödemesi
 PaymentVat=KDV ödeme
 ListPayment=Ödemeler listesi
@@ -113,7 +112,7 @@ ShowVatPayment=KDV ödemesi göster
 TotalToPay=Ödenecek toplam
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Müşteri muhasebe kodu
-SupplierAccountancyCode=vendor accounting code
+SupplierAccountancyCode=tedarikçi muhasebe kodu
 CustomerAccountancyCodeShort=Müşt. hesap kodu
 SupplierAccountancyCodeShort=Ted. hesap kodu
 AccountNumber=Hesap numarası
@@ -132,7 +131,7 @@ NewCheckDeposit=Yeni çek hesabı
 NewCheckDepositOn=Bu hesap için makbuz oluştur: %s
 NoWaitingChecks=Para yatırılmayı bekleyen çek yok.
 DateChequeReceived=Çek giriş tarihi
-NbOfCheques=No. of checks
+NbOfCheques=Çek sayısı
 PaySocialContribution=Bir sosyal/mali vergi öde
 ConfirmPaySocialContribution=Bu sosyal ya da mali vergiyi ödendi olarak sınıflandırmak istediğinizden emin misiniz?
 DeleteSocialContribution=Bir sosyal ya da mali vergi ödemesi sil
@@ -205,7 +204,6 @@ SellsJournal=Satış Günlüğü
 PurchasesJournal=Alış Günlüğü
 DescSellsJournal=Satış Günlüğü
 DescPurchasesJournal=Alış Günlüğü
-InvoiceRef=Fatura ref.
 CodeNotDef=Tanımlanmamış
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Ödeme koşulu tarihi nesnenin tarihinden düşük olamaz.
@@ -242,7 +240,7 @@ SameCountryCustomersWithVAT=Yerli müşteri raporu
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Kendi firmanızın ülke koduyla aynı olan KDV sinin ilk iki harfine dayanan
 LinkedFichinter=Bir müdahaleye bağlan
 ImportDataset_tax_contrib=Sosyal/mali vergiler
-ImportDataset_tax_vat=Vat payments
+ImportDataset_tax_vat=KDV ödemeleri
 ErrorBankAccountNotFound=Hata: Banka hesabı bulunamadı
 FiscalPeriod=Muhasebe dönemi
 ListSocialContributionAssociatedProject=Projeyle ilişkili sosyal katkıların listesi
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index 5ea3af2b33c..edb5df20f91 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -6,16 +6,16 @@ Permission23102 = Planlı iş oluştur/güncelle
 Permission23103 = Planlı iş sil
 Permission23104 = Planlı iş yürüt
 # Admin
-CronSetup= Planlı iş yönetimi ayarları
+CronSetup=Planlı iş yönetimi ayarları
 URLToLaunchCronJobs=Nitelikli cron işlerini kontrol etmek ve başlatmak için URL
 OrToLaunchASpecificJob=Ya da özel bir işi denetlemek ve başlatmak için
 KeyForCronAccess=Cron işlerini başlatacak URL için güvenlik anahtarı
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+FileToLaunchCronJobs=Nitelikli cron işlerini kontrol etmek ve başlatmak için komut satırı
 CronExplainHowToRunUnix=Unix ortamında komut satırını her 5 dakikada bir çalıştırmak için kron sekmesi girişini kullanmalısınız
-CronExplainHowToRunWin=Mikrosot (tm) Windows ortamında komut satırını her 5 dakikada bir çalıştırmak için Planlanmış görev araçlarını kullanmalısınız
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Sınıf %s hiçbir %s yöntemi içermiyor
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronJobProfiles=Önceden tanımlanmış cron görevi profillerinin listesi
 # Menu
 EnabledAndDisabled=Etkin ve engelli
 # Page list
@@ -42,8 +42,8 @@ CronModule=Modül
 CronNoJobs=Kayıtlı iş yok
 CronPriority=Öncelik
 CronLabel=Açıklama
-CronNbRun=Başlatma sayısı
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Her
 JobFinished=İş başlatıldı ve bitirildi
 #Page card
@@ -61,11 +61,11 @@ CronStatusInactiveBtn=Engelle
 CronTaskInactive=Bu iş devre dışı
 CronId=Kimlik
 CronClassFile=Sınıfıyla beraber dosya adı
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple 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 exemple 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>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+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=Yürütülecek sistem komut satırı.
 CronCreateJob=Yeni Planlı İş oluştur
 CronFrom=Gönderen
@@ -79,5 +79,5 @@ CronCannotLoadObject=Class file %s was loaded, but object %s was not found into
 UseMenuModuleToolsToAddCronJobs=Planlı işleri görmek ve düzenlemek için "Giriş - Yönetici Ayarları - Planlı işler" menüsüne git.
 JobDisabled=İş engellendi
 MakeLocalDatabaseDumpShort=Yerel veritabanı yedeklemesi
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Dikkat: Performans amaçlı olarak etkinleştirilmiş işlerin bir sonraki yürütme tarihi ne olursa olsun, işleriniz çalıştırılmadan önce maksimum %s saat ertelenebilir.
diff --git a/htdocs/langs/tr_TR/deliveries.lang b/htdocs/langs/tr_TR/deliveries.lang
index 0e0f288b0b0..fed7a630225 100644
--- a/htdocs/langs/tr_TR/deliveries.lang
+++ b/htdocs/langs/tr_TR/deliveries.lang
@@ -21,10 +21,11 @@ StatusDeliveryValidated=Alındı
 NameAndSignature=Adı ve İmzası:
 ToAndDate=Teslim alan ___________________________________ Tarih _____ / _____ /__________
 GoodStatusDeclaration=Yukarıdaki malzemeleri iyi durumda teslim aldım,
-Deliverer=Teslim eden :
+Deliverer=Dağıtıcı:
 Sender=Gönderen
 Recipient=Alıcı
 ErrorStockIsNotEnough=Yeterli stok yok
 Shippable=Sevkedilebilir
 NonShippable=Sevkedilemez
 ShowReceiving=Teslimat Fişini göster
+NonExistentOrder=Mevcut olmayan sipariş
diff --git a/htdocs/langs/tr_TR/dict.lang b/htdocs/langs/tr_TR/dict.lang
index 9d9666c4b43..6d614c0f19a 100644
--- a/htdocs/langs/tr_TR/dict.lang
+++ b/htdocs/langs/tr_TR/dict.lang
@@ -290,7 +290,7 @@ CurrencyXOF=CFA Frangı BCEAO
 CurrencySingXOF=CFA Frangı BCEAO
 CurrencyXPF=CFP Frangı
 CurrencySingXPF=CFP Frangı
-CurrencyCentEUR=cents
+CurrencyCentEUR=kuruş
 CurrencyCentSingEUR=cent
 CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
diff --git a/htdocs/langs/tr_TR/ecm.lang b/htdocs/langs/tr_TR/ecm.lang
index a314155e5f2..3a2d834581a 100644
--- a/htdocs/langs/tr_TR/ecm.lang
+++ b/htdocs/langs/tr_TR/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=No. of documents in directory
+ECMNbOfDocs=Dizindeki belge sayısı
 ECMSection=Dizin
 ECMSectionManual=Manuel dizin
 ECMSectionAuto=Otomatik dizin
@@ -15,10 +15,10 @@ ECMNbOfSubDir=Alt-dizin sayısı
 ECMNbOfFilesInSubDir=Alt dizilerdeki dosya sayısı
 ECMCreationUser=Oluşturan
 ECMArea=DMS/ECM alanı
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMAreaDesc=DMS/ECM (Belge Yönetim Sistemi / Elektronik İçerik Yönetimi) alanı, Dolibarr'daki her türlü belgenin hızlı bir şekilde kaydedilmesine, paylaşılmasına ve aranmasına imkan sağlar.
 ECMAreaDesc2=* Otomatik dizinler, bir öğenin kartından belge eklenirken otomatikman doldurulur.<br> * Manuel dizinler, belirli bir öğeye bağlı olmayan belgelerin saklanması için kullanılabilir.
 ECMSectionWasRemoved=<b>%s</b>Dizini silindi.
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSectionWasCreated=<b>%s</b> dizini oluşturuldu.
 ECMSearchByKeywords=Anahtar kelimelere göre ara
 ECMSearchByEntity=Nesneye göre ara
 ECMSectionOfDocuments=Belgelerin dizinleri
@@ -35,7 +35,7 @@ ECMDocsByUsers=Kullanıcılara bağlantılı belgeler
 ECMDocsByInterventions=Müdahalelere bağlantılı belgeler
 ECMDocsByExpenseReports=Gider raporlarına bağlı dokümanlar
 ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBySupplierProposals=Documents linked to vendor proposals
 ECMNoDirectoryYet=Hiçbir dizin oluşturulmadı
 ShowECMSection=Dizini göster
 DeleteSection=Dizini kaldır
@@ -49,4 +49,4 @@ DirNotSynchronizedSyncFirst=This directory seems to be created or modified outsi
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=Dizin bulunamadı
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+FileNotYetIndexedInDatabase=Dosya henüz veritabanında dizine eklenmedi (tekrar yüklemeyi deneyin)
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index e5512a8d386..599a8ad7a02 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -4,14 +4,14 @@
 NoErrorCommitIsDone=Hata yok, taahüt ediyoruz
 # Errors
 ErrorButCommitIsDone=Hatalar bulundu, buna rağmen doğruluyoruz
-ErrorBadEMail=Email %s is wrong
+ErrorBadEMail=%s e-postası yanlış
 ErrorBadUrl=URL %s yanlış
 ErrorBadValueForParamNotAString=Parametreniz için hatalı değer. Genellikle çeviri eksik olduğunda eklenir.
 ErrorLoginAlreadyExists=%s kullanıcı adı zaten var.
 ErrorGroupAlreadyExists=%s Grubu zaten var.
 ErrorRecordNotFound=Kayıt bulunamadı.
 ErrorFailToCopyFile='<b>%s</b>' dosyası '<b>%s</b>' içine kopyalanamadı.
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir='<b>%s</b>' dizini '<b>%s</b>' içine kopyalanamadı.
 ErrorFailToRenameFile='<b>%s</b>' dosyasının adı '<b>%s</b>' olarak değiştirilemedi.
 ErrorFailToDeleteFile='<b>%s</b>' dosyası kaldırılamadı
 ErrorFailToCreateFile='<b>%s</b>' dosyası oluşturulamadı
@@ -23,14 +23,14 @@ ErrorFailToGenerateFile=Dosya '<b>%s</b>' oluşturulamadı.
 ErrorThisContactIsAlreadyDefinedAsThisType=Bu kişi zaten bu tür için kişi olarak tanımlıdır.
 ErrorCashAccountAcceptsOnlyCashMoney=Bu banka hesabı kasa hesabı lduğundan yalnızca nakit ödemeleri kabul eder.
 ErrorFromToAccountsMustDiffers=Kaynak ve hedef banka hesapları farklı olmalıdır.
-ErrorBadThirdPartyName=Bad value for third-party name
+ErrorBadThirdPartyName=Üçüncü parti adı için hatalı değer
 ErrorProdIdIsMandatory=Bu %s zorunludur
 ErrorBadCustomerCodeSyntax=Hatalı müşteri kodu
 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.
 ErrorCustomerCodeRequired=Müşteri kodu gereklidir
-ErrorBarCodeRequired=Barcode required
+ErrorBarCodeRequired=Barkod gerekli
 ErrorCustomerCodeAlreadyUsed=Müşteri kodu zaten kullanılmış
-ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorBarCodeAlreadyUsed=Barkod zaten kullanıldı
 ErrorPrefixRequired=Önek gerekli
 ErrorBadSupplierCodeSyntax=Tedarikçi kodu için yanlış sözdizimi
 ErrorSupplierCodeRequired=Tedarikçi kodu gereklidir
@@ -75,7 +75,7 @@ ErrorLDAPMakeManualTest=A. Ldif dosyası %s dizininde oluşturuldu. Hatalar hakk
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Oluşturulması için kullanılan referans zaten var.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some child records.
+ErrorRecordHasChildren=Kayıt bazı alt kayıtlar içerdiği için silinemedi
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
 ErrorModuleRequireJavascript=Bu özelliğin çalışması için Javascript engellenmiş olmamalıdır. Etkinleştirmek/engellemek için Giriş->Kurulum->Ekran menüsüne gidin.
@@ -84,7 +84,7 @@ ErrorContactEMail=A technical error occured. Please, contact administrator to fo
 ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
 ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
 ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
-ErrorsOnXLines=%s errors found
+ErrorsOnXLines=%s hata bulundu
 ErrorFileIsInfectedWithAVirus=Virüs koruma programı dosyayı doğrulayamıyor (dosyaya bir virüs bulaşmış olabilir)
 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.
@@ -94,7 +94,7 @@ ErrorModuleSetupNotComplete=Modül ayarı tamamlanmamış gibi görünüyor. Tam
 ErrorBadMask=Maskede hata
 ErrorBadMaskFailedToLocatePosOfSequence=Hata, sıra numarasız  maske
 ErrorBadMaskBadRazMonth=Hata, kötü sıfırlama değeri
-ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
+ErrorMaxNumberReachForThisMask=Bu maske için maksimum sayıya ulaşıldı
 ErrorCounterMustHaveMoreThan3Digits=Sayaçta 3 ten fazla basamak olmalı
 ErrorSelectAtLeastOne=Hata. En az bir giriş seçin.
 ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
@@ -106,7 +106,7 @@ ErrorForbidden2=Bu oturum açma için izin Dolibarr yöneticiniz tarafından %s-
 ErrorForbidden3=Dolibarr bir kimlik doğrulama oturumu üzerinden kullanılmamış gibi görünüyor. Kimlik doğrulama nasıl yönetileceğini öğrenmek Dolibarr kurulum belgelerine bir göz atın (htaccess, mod_auth veya diğer ...).
 ErrorNoImagickReadimage=Bu PHP Class Imagick yok. Önizleme kullanılır olmayabilir. Yöneticiler Kurulum - Ekran menüsünde bu sekmeyi devre dışı bırakabilir.
 ErrorRecordAlreadyExists=Kayıt zaten var
-ErrorLabelAlreadyExists=This label already exists
+ErrorLabelAlreadyExists=Bu etiket zaten var
 ErrorCantReadFile=Dosya '%s' okunamadı
 ErrorCantReadDir=Dizin '%s' okunamadı
 ErrorBadLoginPassword=Kullanıcı adı veya parola için hatalı değer
@@ -159,7 +159,7 @@ ErrorPriceExpression20=Boş ifade
 ErrorPriceExpression21=Boş sonuç '%s'
 ErrorPriceExpression22=Eksi sonuç '%s'
 ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpression24='%s'  değişkeni var ancak değere sahip değil
 ErrorPriceExpressionInternal=İç hata '%s'
 ErrorPriceExpressionUnknown=Bilinmeyen hata '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Kaynak ve hedef depolar farklı olmalı
@@ -196,18 +196,18 @@ ErrorPhpMailDelivery=Check that you don't use a too high number of recipients an
 ErrorUserNotAssignedToTask=Karcanan zamanı girebilmek için kullanıcı göreve atanmalıdır.
 ErrorTaskAlreadyAssigned=Görev zaten kullanıcıya atandı
 ErrorModuleFileSeemsToHaveAWrongFormat=Modül paketi yanlış bir formata sahip gibi görünüyor.
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=Modül paketinin adı (<strong>%s</strong>) olması gereken isim sözdizimi ile eşleşmiyor: <strong>%s</strong>
 ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
 ErrorNoWarehouseDefined=Hata, hiçbir depo tanımlanmadı.
 ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
 ErrorTooManyErrorsProcessStopped=Çok fazla hata var. İşlem durduruldu.
 ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
-ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
+ErrorObjectMustHaveStatusDraftToBeValidated=%s nesnesinin onaylanabilmesi için "Taslak" durumunda olmalıdır.
+ErrorObjectMustHaveLinesToBeValidated=%s nesnesinin onaylanabilmesi için satırlara sahip olması gerekir.
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
 ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
-ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
+ErrorFileNotFoundWithSharedLink=Dosya bulunamadı. Paylaşım anahtarı değiştirilmiş veya dosya yakın bir zamanda kaldırılmış olabilir.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
@@ -217,9 +217,10 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 WarningPasswordSetWithNoAccount=Bu üye için bir parola ayarlıdır. Ancak, hiçbir kullanıcı hesabı oluşturulmamıştır. Yani bu şifre saklanır ama Dolibarr'a giriş için kullanılamaz. Dış bir modül/arayüz tarafından kullanılıyor olabilir, ama bir üye için ne bir kullanıcı adı ne de parola tanımlamanız gerekmiyorsa "Her üye için bir kullanıcı adı yönet" seçeneğini devre dışı bırakabilirsiniz. Bir kullanıcı adı yönetmeniz gerekiyorsa ama herhangi bir parolaya gereksinim duymuyorsanız bu uyarıyı engellemek için bu alanı boş bırakabilirsiniz. Not: Eğer bir üye bir kullanıcıya bağlıysa kullanıcı adı olarak eposta adresi de kullanılabilir.
-WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
+WarningMandatorySetupNotComplete=Zorunlu parametreleri ayarlamak için buraya tıklayın
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
 WarningSafeModeOnCheckExecDir=Uyarı, PHP seçeneği <b>güvenli_mode</b> açıktır, böylece komut php parametresi <b>güvenli_mode_exec_dir</b> tarafından bildirilen bir dizine saklanabilir.
 WarningBookmarkAlreadyExists=Bu konulu ya da bu hedefli (URL) bir yerimi zaten var.
diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang
index f7f8e8717bd..724a0184d29 100644
--- a/htdocs/langs/tr_TR/exports.lang
+++ b/htdocs/langs/tr_TR/exports.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - exports
 ExportsArea=Dışaaktarımlar
-ImportArea=Import
+ImportArea=İçe aktar
 NewExport=Yeni Dışa Aktarma
 NewImport=Yeni İçe Aktarma
 ExportableDatas=Dışaaktarılabilir veri kümesi
@@ -10,14 +10,14 @@ SelectImportDataSet=İçeaktarmak istediğiniz veri kümesini seçin...
 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=Kaynak dosyadaki alanlar içeaktarılamadı
-SaveExportModel=Save your selections as an export profile/template (for reuse).
-SaveImportModel=Save this import profile (for reuse) ...
+SaveExportModel=Seçimlerinizi bir dışa aktarma profili/şablonu olarak kaydedin (tekrar kullanım için).
+SaveImportModel=Bu içe aktarım profilini kaydet (tekrar kullanım için) ...
 ExportModelName=Dışaaktarma profili adı
-ExportModelSaved=Export profile saved as <b>%s</b>.
+ExportModelSaved=Dışa aktarım profili <b>%s</b> olarak kaydedildi.
 ExportableFields=Dışaaktarılabilir alanlar
 ExportedFields=Dışaaktarılan alanlar
 ImportModelName=İçeaktarma profili adı
-ImportModelSaved=Import profile saved as <b>%s</b>.
+ImportModelSaved=İçe aktarım profili <b>%s</b> olarak kaydedildi.
 DatasetToExport=Dışaaktarılacak veri kümesi
 DatasetToImport=Veri kümesine içeaktarılacak dosya
 ChooseFieldsOrdersAndTitle=Alan sırasını seçin...
@@ -31,7 +31,7 @@ FormatedImport=İçe Aktarma Yardımcısı
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
 FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
 FormatedExport=Dışa Aktarma Yardımcısı
-FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
+FormatedExportDesc1=Bu araçlar, süreçte teknik bilgi gerek duymadan size yardımcı olmak için bir asistan kullanarak kişiselleştirilmiş verinin dışa aktarımına olanak sağlar.
 FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
 FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
 Sheet=Sayfa
@@ -44,7 +44,7 @@ LineDescription=Satır açıklaması
 LineUnitPrice=Satırın birim fiyat
 LineVATRate=Satırın KDV oranı
 LineQty=Satırın miktarı
-LineTotalHT=Satırın vergi hariç tutarı
+LineTotalHT=Amount excl. tax for line
 LineTotalTTC=Satırın vergi dahil tutarı
 LineTotalVAT=Satırın KDV tutarı
 TypeOfLineServiceOrProduct=Satır türü (0 = ürün, 1 = hizmet)
@@ -68,8 +68,8 @@ FieldsTarget=Hedeflenen alanlar
 FieldTarget=Hedeflenen alan
 FieldSource=Kaynak alan
 NbOfSourceLines=Kaynak dosyadaki satır sayısı
-NowClickToTestTheImport=Check the import setup you defined (check if you must omit the header lines, 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
+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=İçe Aktarma Simülasyonunu Çalıştır
 FieldNeedSource=Bu alanlar kaynak dosyadan bir veri gerektirir
 SomeMandatoryFieldHaveNoSource=Veri dosyasında, bazı zorunlu alanların kaynağı yok
 InformationOnSourceFile=Kaynak dosya bilgileri
@@ -78,7 +78,7 @@ SelectAtLeastOneField=En az bir kaynak alanı dışaaktarılacak alanlar bölüm
 SelectFormat=Bu içeaktarma dosya biçimini seçin
 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=All data will be loaded with the following import id: <b>%s</b> to enable a search on this set of data in case of discovering problems in the future.
+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.
@@ -109,14 +109,14 @@ Separator=Alan Ayırıcı
 Enclosure=String Delimiter
 SpecialCode=Özel kod
 ExportStringFilter=%% metinde bir ya da fazla karakterin değiştirilmesine izin verir
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : bir yıılık yıl/ay/gün süzgeçi<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : yıllar arası yıllar/aylar/günler süzgeçi<br> > YYYY, > YYYYMM, > YYYYMMDD : izleyen tüm yıllar için yıılar/aylar/günler süzgeçi<br> < YYYY, < YYYYMM, < YYYYMMDD : bütün önceki yıllar/aylar/günler süzgeçi
+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=Tek bir değere göre NNNNN filtreler<br>Bir dizi değer üzerinden NNNNN+NNNNN filtreler<br>Daha düşük değerlere göre < NNNNN filtreler<br>Daha düşük değerlere göre > NNNNN filtreler
 ImportFromLine=İçeaktarımın başladığı satır numarası
 EndAtLineNb=Satır numarası sonu
-ImportFromToLine=Limit range (from - to) eg. to omit header line
-SetThisValueTo2ToExcludeFirstLine=Örneğin, İlk 2 satırı dışarıda tutmak için bu değeri 3 e ayarlayın
-KeepEmptyToGoToEndOfFile=Dosya sonuna gitmek için bu alanı boş bırakın
-SelectPrimaryColumnsForUpdateAttempt=Güncelleme girişimi için birincil anahtar olarak kullanmak üzere sütun(lar) seçin
+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=Bu tür bir içe aktarma için güncelleme desteklenmiyor (yalnızca ekleme)
 NoUpdateAttempt=Hiçbir güncelleme girişimi gerçekleşmedi, yalnızca ekleme
 ImportDataset_user_1=Kullanıcılar (çalışanlar veya değil) ve mülkler
diff --git a/htdocs/langs/tr_TR/ftp.lang b/htdocs/langs/tr_TR/ftp.lang
index b260d127d80..4d6777af0d8 100644
--- a/htdocs/langs/tr_TR/ftp.lang
+++ b/htdocs/langs/tr_TR/ftp.lang
@@ -2,13 +2,13 @@
 FTPClientSetup=FTP İstemcisi modülü kurulumu
 NewFTPClient=Yeni bir FTP bağlantısı ayarı
 FTPArea=FTP Alanı
-FTPAreaDesc=Bu ekranda bir FTP sunucusu görünümünün içeriği gösterilir
-SetupOfFTPClientModuleNotComplete=FTP istemcisi modülünün kurulumu tamamlanmaış gibi görünüyor
+FTPAreaDesc=Bu ekran bir FTP sunucusunun görünümünü sergiler.
+SetupOfFTPClientModuleNotComplete=FTP istemci modülünün kurulumu eksik görünüyor
 FTPFeatureNotSupportedByYourPHP=PHP niz FTP fonksiyonlarını desteklemiyor
 FailedToConnectToFTPServer=FTP sunucusuna bağlanamadı (sunucu %s, port %s)
 FailedToConnectToFTPServerWithCredentials=Tanımlı kullanıcı/parola ile FTP sunucusunda oturum açılamadı
 FTPFailedToRemoveFile=<b>%s</b> Dosyası kaldırılamadı.
-FTPFailedToRemoveDir=<b>%s</b> Dizini kaldırılamadı (İzinleri o dizinin boş olduğunu denetleyin).
+FTPFailedToRemoveDir=<b>%s</b> dizini kaldırılamadı: izinleri kontrol edin ve dizinin boş olduğundan emin olun.
 FTPPassiveMode=Pasif mod
-ChooseAFTPEntryIntoMenu=Menüden FTP girişi seç...
+ChooseAFTPEntryIntoMenu=Menüden bir FTP sitesi seçin...
 FailedToGetFile=%s dosyaları alınamadı
diff --git a/htdocs/langs/tr_TR/help.lang b/htdocs/langs/tr_TR/help.lang
index 54e22a67922..39b53283e43 100644
--- a/htdocs/langs/tr_TR/help.lang
+++ b/htdocs/langs/tr_TR/help.lang
@@ -4,7 +4,7 @@ EMailSupport=E-posta desteği
 RemoteControlSupport=Çevrimiçi gerçek zamanlı/uzaktan destek
 OtherSupport=Diğer destek
 ToSeeListOfAvailableRessources=İletişim için/mevcut kaynaklara bakın:
-HelpCenter=Yardım merkezi
+HelpCenter=Yardım Merkezi
 DolibarrHelpCenter=Dolibarr Yardım ve Destek Merkezi
 ToGoBackToDolibarr=Aksi takdirde, <a href="%s">Dolibarr'ı kullanmaya devam etmek için buraya tıklayın</a>.
 TypeOfSupport=Destek türü
@@ -16,8 +16,8 @@ Efficiency=Verim
 TypeHelpOnly=Yalnızca yardım
 TypeHelpDev=Yardım+Geliştirme
 TypeHelpDevForm=Yardım + Geliştirme + Eğitim
-BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
+BackToHelpCenter=Aksi takdirde, <a href="%s">Yardım Merkezi ana sayfasına geri dönün</a>.
+LinkToGoldMember=Dolibar tarafından diliniz için (%s) önceden belirlenmiş eğitmenlerden birini onların Widget'lerine tıklayarak arayabilirsiniz (durum ve maksimum fiyat otomatik olarak güncellenir):
 PossibleLanguages=Desteklenen diller
-SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Dolibarr projesine yardımcı olun, vakfa abone olun
 SeeOfficalSupport=Kendi dilinizde Dolibarr desteği için: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang
index 4d3beabd170..bbb245d964a 100644
--- a/htdocs/langs/tr_TR/holiday.lang
+++ b/htdocs/langs/tr_TR/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=IK
-Holidays=Leave
-CPTitreMenu=Leave
+Holidays=İzinler
+CPTitreMenu=İzinler
 MenuReportMonth=Aylık özet
 MenuAddCP=Yeni izin isteği
-NotActiveModCP=You must enable the module Leave to view this page.
+NotActiveModCP=Bu sayfayı görüntülemek için İzin modülünü etkinleştirmelisiniz.
 AddCP=Bir izin isteği yap
 DateDebCP=Başlama tarihi
 DateFinCP=Bitiş tarihi
@@ -15,8 +15,8 @@ ApprovedCP=Onaylandı
 CancelCP=İptal edildi
 RefuseCP=Reddedildi
 ValidatorCP=Onaylayan
-ListeCP=List of leave
-LeaveId=Leave ID
+ListeCP=İzin Listesi
+LeaveId=İzin Kimliği
 ReviewedByCP=Şunun tarafından onaylanacak
 UserForApprovalID=User for approval ID
 UserForApprovalFirstname=First name of approval user
@@ -35,11 +35,11 @@ ErrorUserViewCP=İzin isteklerini okumak için yetkiniz yok.
 InfosWorkflowCP=Bilgi işakışı
 RequestByCP=İsteyen
 TitreRequestCP=İzin isteği
-TypeOfLeaveId=Type of leave ID
-TypeOfLeaveCode=Type of leave code
-TypeOfLeaveLabel=Type of leave label
+TypeOfLeaveId=İzin Kimlik türü
+TypeOfLeaveCode=İzin kod türü
+TypeOfLeaveLabel=İzin etiketi türü
 NbUseDaysCP=Tüketilen tatil gün sayısı
-NbUseDaysCPShort=Days consumed
+NbUseDaysCPShort=Tüketilen gün
 NbUseDaysCPShortInMonth=Days consumed in month
 DateStartInMonth=Start date in month
 DateEndInMonth=End date in month
@@ -71,7 +71,7 @@ DateRefusCP=Ret tarihi
 DateCancelCP=İptal tarihi
 DefineEventUserCP=Bir kullanıcı için özel izin tahsis et
 addEventToUserCP=İzin Tahsisi
-NotTheAssignedApprover=You are not the assigned approver
+NotTheAssignedApprover=Atanmış onaylayıcı siz değilsiniz
 MotifCP=Neden
 UserCP=Kullanıcı
 ErrorAddEventToUserCP=Özel izin eklenirken hata oluştu.
@@ -92,17 +92,17 @@ HolidaysCancelation=İzin isteği iptali
 EmployeeLastname=Çalışanın soyadı
 EmployeeFirstname=Çalışanın ilk adı
 TypeWasDisabledOrRemoved=Ayrılma türü (id %s) devre dışı bırakıldı veya kaldırıldı
-LastHolidays=Latest %s leave requests
-AllHolidays=All leave requests
+LastHolidays=En son %s izin isteği
+AllHolidays=Tüm izin istekleri
 HalfDay=Yarım gün
-NotTheAssignedApprover=You are not the assigned approver
+NotTheAssignedApprover=Atanmış onaylayıcı siz değilsiniz
 LEAVE_PAID=Paid vacation
-LEAVE_SICK=Sick leave
-LEAVE_OTHER=Other leave
+LEAVE_SICK=Hastalık izni
+LEAVE_OTHER=Diğer izin
 LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+LastUpdateCP=İzin dağıtımının en son otomatik güncelleme
+MonthOfLastMonthlyUpdate=İzin dağıtımının en son otomatik güncelleme ayı
 UpdateConfCPOK=Güncelleme başarılı
 Module27130Name= İzin istekleri yönetimi
 Module27130Desc= İzin istekleri yönetimi
@@ -112,18 +112,19 @@ NoticePeriod=Bildirim dönemi
 HolidaysToValidate=İzin isteği doğrula
 HolidaysToValidateBody=Doğrulanacak izin isteği aşağıdadır
 HolidaysToValidateDelay=Bu izin isteği %s günden kısa bir sürede gerçekleşecektir.
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysToValidateAlertSolde=Bu izin talebini gerçekleştiren kullanıcının yeterli mevcut günü yok.
 HolidaysValidated=Doğrulanmış izin istekleri
 HolidaysValidatedBody=İzin isteğiniz %s - %s arası doğrulanmıştır.
 HolidaysRefused=İstek reddedildi
-HolidaysRefusedBody=%s - %s arası izin isteğiniz aşağıdaki nedenden dolayı reddedilmiştir:
+HolidaysRefusedBody=%s - %s için izin talebiniz aşağıdaki nedenden dolayı reddedildi:
 HolidaysCanceled=İptal edilen izin istekleri
 HolidaysCanceledBody=%s - %s arası izin isteğiniz iptal edilmiştir.
 FollowedByACounter=1: Bu türdeki bir izin isteği bir sayaçla izlenmelidir. Bu sayaç elle ya da otomatik olarak arttırılır ve bir izin isteği doğrulandığında sayaç azaltılır.<br>0: Bir sayaçla izlenmez.
 NoLeaveWithCounterDefined=Bir sayaçla izlenmek üzere tanımlanan hiç izin isteği yok.
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Holiday
-HolidaysNumberingModules=Leave requests numbering models
-TemplatePDFHolidays=Template for leave requests PDF
+GoIntoDictionaryHolidayTypes=Farklı izin türlerini ayarlamak için <strong>Giriş - Ayarlar - Sözlükler - İzin türleri</strong> bölümüne gidin
+HolidaySetup=Tatil modülü ayarları
+HolidaysNumberingModules=İzin istekleri numaralandırma modelleri
+TemplatePDFHolidays=İzin istek PDF'leri için taslaklar
 FreeLegalTextOnHolidays=PDF'deki serbest metin
-WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+WatermarkOnDraftHolidayCards=Taslak izin isteklerindeki filigranlar
+HolidaysToApprove=Onaylanacak izinler
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index 0cb2dc5188c..b36e186f454 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -12,9 +12,9 @@ PHPSupportSessions=Bu PHP oturumları destekliyor.
 PHPSupportPOSTGETOk=Bu PHP GÖNDER ve AL değişkenlerini destekliyor.
 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.
+PHPSupportCurl=Bu PHP, Curl'u destekliyor.
 PHPSupportUTF8=Bu PHP, UTF8 işlevlerini destekliyor.
-PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportIntl=Bu PHP, Intl fonksiyonlarını destekliyor.
 PHPMemoryOK=PHP nizin ençok oturum belleği <b>%s</b> olarak ayarlanmış. Bu yeterli olacaktır.
 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=Daha detaylı bir test için buraya tıklayın
@@ -22,7 +22,7 @@ ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions.
 ErrorPHPDoesNotSupportGD=PHP kurulumunuz GD grafiksel fonksiyonları desteklemiyor. Hiçbir grafik mevcut olmayacak.
 ErrorPHPDoesNotSupportCurl=PHP kurulumunuz Curl. desteklemiyor
 ErrorPHPDoesNotSupportUTF8=PHP kurulumunuz UTF8 işlevlerini desteklemiyor. Dolibarr düzgün çalışamaz. Dolibarr'ı yüklemeden önce bunu çözün.
-ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupportIntl=PHP kurulumunuz Intl fonksiyonlarını desteklemiyor.
 ErrorDirDoesNotExists=%s Dizini yoktur.
 ErrorGoBackAndCorrectParameters=Geri gidin ve parametreleri kontrol edin/düzeltin.
 ErrorWrongValueForParameter=Parametresi '%s' için yanlış değer yazmış olabilirsiniz'.
@@ -144,7 +144,7 @@ KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the v
 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
+NothingToDelete=Temizlenecek/silinecek hiçbir şey yok
 NothingToDo=Yapacak bir şey yok
 #########
 # upgrade
@@ -205,8 +205,8 @@ MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Modülü yeniden yükle %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide unavailable options
+ShowNotAvailableOptions=Kullanılamayan seçenekleri göster
+HideNotAvailableOptions=Kullanılamayan seçenekleri gizle
 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>
diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang
index 6c67a667290..3f677350980 100644
--- a/htdocs/langs/tr_TR/interventions.lang
+++ b/htdocs/langs/tr_TR/interventions.lang
@@ -4,7 +4,7 @@ Interventions=Müdahaleler
 InterventionCard=Müdahale kartı
 NewIntervention=Yeni müdahale
 AddIntervention=Müdahale oluştur
-ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ChangeIntoRepeatableIntervention=Tekrarlanabilir müdahaleye dönüştür
 ListOfInterventions=Müdahaleler listesi
 ActionsOnFicheInter=Müdahale eylemleri
 LastInterventions=Son %s müdahale
@@ -20,8 +20,8 @@ ConfirmValidateIntervention=Bu müdahaleyi <b>%s</b> adıyla doğrulamak istedi
 ConfirmModifyIntervention=Bu müdahaleyi değiştirmek istediğinizden emin misiniz?
 ConfirmDeleteInterventionLine=Bu müdahale satırını silmek istediğinizden emin misiniz?
 ConfirmCloneIntervention=Bu müdahaleyi kopyalamak istediğinizden emin misiniz?
-NameAndSignatureOfInternalContact=Name and signature of intervening:
-NameAndSignatureOfExternalContact=Name and signature of customer:
+NameAndSignatureOfInternalContact=Müdahalenin adı ve imzası:
+NameAndSignatureOfExternalContact=Müşterinin adı ve imzası:
 DocumentModelStandard=Müdahaleler için standart belge modeli
 InterventionCardsAndInterventionLines=Müdahalelere ait müdahaleler ve satırları
 InterventionClassifyBilled=Sınıflandırma "Faturalandı" 
@@ -29,13 +29,13 @@ InterventionClassifyUnBilled=Sınıflandırma "Faturalanmadı"
 InterventionClassifyDone="Bitti" olarak sınıflandır
 StatusInterInvoiced=Faturalanmış
 SendInterventionRef=%s müdahalesinin sunulması
-SendInterventionByMail=Send intervention by email
+SendInterventionByMail=Müdahaleyi e-posta ile gönder
 InterventionCreatedInDolibarr=Oluşturulan müdahale %s
 InterventionValidatedInDolibarr=Doğrulanan müdahale %s
 InterventionModifiedInDolibarr=Değiştirilen müdahale %s
 InterventionClassifiedBilledInDolibarr=Faturalandı olarak ayarlanan müdahale %s
 InterventionClassifiedUnbilledInDolibarr=Faturalanmadı olarak ayarlanan müdahale %s
-InterventionSentByEMail=Intervention %s sent by email
+InterventionSentByEMail=%s müdahalesi e-posta ile gönderildi
 InterventionDeletedInDolibarr=Silinen müdahale %s
 InterventionsArea=Müdahaleler alanı
 DraftFichinter=Taslak müdahale
@@ -47,11 +47,11 @@ TypeContact_fichinter_external_CUSTOMER=Müşteri izleme yetkilisi
 PrintProductsOnFichinter=Müdahale kartında "ürün" türü (yalnızca hizmetleri değil) satırını da yazdır.
 PrintProductsOnFichinterDetails=Siparişlerden oluşturulan müdahaleler
 UseServicesDurationOnFichinter=Siparişlerden oluşturulan müdahaleler için hizmet sürelerini kullan
-UseDurationOnFichinter=Hides the duration field for intervention records
-UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
+UseDurationOnFichinter=Müdahale kayıtları için süre alanını gizler
+UseDateWithoutHourOnFichinter=Müdahale kayıtları için tarih alanının saat ve dakikasını gizler
 InterventionStatistics=Müdahale istatistikleri
-NbOfinterventions=No. of intervention cards
-NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
+NbOfinterventions=Müdahale kartlarının sayısı
+NumberOfInterventionsByMonth=Aya göre müdahale kartlarının sayısı (doğrulama tarihi)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
 ##### Exports #####
 InterId=Müdahale kimliği
diff --git a/htdocs/langs/tr_TR/ldap.lang b/htdocs/langs/tr_TR/ldap.lang
index 1494328d504..c0aaf267f0d 100644
--- a/htdocs/langs/tr_TR/ldap.lang
+++ b/htdocs/langs/tr_TR/ldap.lang
@@ -5,7 +5,7 @@ LDAPInformationsForThisContact=Bu kişi için LDAP veritabanındaki bilgi
 LDAPInformationsForThisUser=Bu kullanıcı için LDAP veritabanındaki bilgi
 LDAPInformationsForThisGroup=Bu grup için LDAP veritabanındaki bilgi
 LDAPInformationsForThisMember=Bu üye için LDAP veritabanındaki bilgi
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPInformationsForThisMemberType=Bu üye türü için LDAP veritabanındaki bilgiler
 LDAPAttributes=LDAP öznitelikleri
 LDAPCard=LDAP kartı
 LDAPRecordNotFound=Kayıt LDAP veritabanında bulunamadı
@@ -16,12 +16,12 @@ LDAPFieldFirstSubscriptionAmount=İlk abonelik tutarı
 LDAPFieldLastSubscriptionDate=Son abonelik tarihi
 LDAPFieldLastSubscriptionAmount=Son abonelik miktarı
 LDAPFieldSkype=Skype kimliği
-LDAPFieldSkypeExample=Örnek: skypeAdı
+LDAPFieldSkypeExample=Örnek: skypeName
 UserSynchronized=Kullanıcı senkronize edildi
 GroupSynchronized=Grup senkronize edildi
 MemberSynchronized=Üye senkronize edildi
-MemberTypeSynchronized=Member type synchronized
+MemberTypeSynchronized=Üye türü senkronize edildi
 ContactSynchronized=Kişi senkronize edildi
 ForceSynchronize=Dolibarr -> LDAP senkronizyona zorla
 ErrorFailedToReadLDAP=LDAP veritabanı okunamadı. LDAP modülü kurulumunu ve veritabanı erişilebilirliğini denetleyin.
-PasswordOfUserInLDAP=Password of user in LDAP
+PasswordOfUserInLDAP=LDAP'de kullanıcının şifresi
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index f9d982b1f11..a03253398dc 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -15,10 +15,12 @@ MailToUsers=To user(s)
 MailCC=Kopyala
 MailToCCUsers=Copy to users(s)
 MailCCC=Önbelleğe kopyala
-MailTopic=Email topic
+MailTopic=E-posta konusu
 MailText=Mesaj
 MailFile=Ekli dosyalar
 MailMessage=Mesaj gövdesinde yazı kullanıldı.
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Eposta göster
 ListOfEMailings=Eposta Listesi
 NewMailing=Yeni Eposta
@@ -57,7 +59,7 @@ YouCanAddYourOwnPredefindedListHere=Eposta seçim modülünüzü oluşturmak iç
 EMailTestSubstitutionReplacedByGenericValues=Test modunu kullanırken, yedek değişkenler genel değerleriyle değiştirilir
 MailingAddFile=Bu dosyayı ekle
 NoAttachedFiles=Ekli dosya yok
-BadEMail=Bad value for Email
+BadEMail=E-posta için hatalı değer
 ConfirmCloneEMailing=Bu e-postayı kopyalamak istediğinizden emin misiniz?
 CloneContent=Mesajı klonla
 CloneReceivers=Alıcıları klonla
@@ -65,9 +67,9 @@ DateLastSend=Enson gönderim tarihi
 DateSending=Gönderme tarihi
 SentTo=<b>%s</b> ye gönderilen
 MailingStatusRead=Okundu
-YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
-ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
-EMailSentToNRecipients=Email sent to %s recipients.
+YourMailUnsubcribeOK=E-posta adresiniz <b>%s</b> başarılı bir şekilde mail gönderim listemizden çıkarıldı
+ActivateCheckReadKey="Okuma Alındısı" ve "Abonelik İptali" özelliği için kullanılan URL şifrelemesinde kullanılacak anahtar
+EMailSentToNRecipients=E-posta %s alıcıya gönderildi.
 EMailSentForNElements=Email sent for %s elements.
 XTargetsAdded=<b>%s</b> alıcılar listesine eklendi
 OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
@@ -79,8 +81,8 @@ ResultOfMailSending=Result of mass Email sending
 NbSelected=No. selected
 NbIgnored=No. ignored
 NbSent=No. sent
-SentXXXmessages=%s message(s) sent.
-ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
+SentXXXmessages=%s mesaj gönderildi.
+ConfirmUnvalidateEmailing=<b>%s</b> e-postasını taslak durumuna değiştirmek istediğinizden emin misiniz?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
 MailingModuleDescContactsByCategory=Kategorilere göre kişiler
@@ -113,12 +115,12 @@ ToAddRecipientsChooseHere=Listeden seçerek alıcıları ekle
 NbOfEMailingsReceived=Alınan toplu Epostalar
 NbOfEMailingsSend=Toplu eposta gönderildi
 IdRecord=Kimlik kayıtı
-DeliveryReceipt=Delivery Ack.
+DeliveryReceipt=Teslimat Onayı
 YouCanUseCommaSeparatorForSeveralRecipients=Birçok alıcı belirtmek için <b>virgül</b> ayırıcısını kullanabilirsiniz.
 TagCheckMail=Eposta açılışlarını izle
 TagUnsubscribe=Aboneliğini kaldır bağlantısı
-TagSignature=Signature of sending user
-EMailRecipient=Recipient Email
+TagSignature=Gönderen kullanıcının imzası
+EMailRecipient=Alıcı E-postası
 TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Gönderilen eposta yok. Hatalı gönderici ya da alıcı epostası. Kullanıcı profilini doğrula.
 # Module Notifications
@@ -152,7 +154,7 @@ AddAll=Hepsini ekle
 RemoveAll=Hepsini sil
 ItemsCount=Öğe(ler)
 AdvTgtNameTemplate=Süzgeç adı
-AdvTgtAddContact=Add emails according to criteria
+AdvTgtAddContact=Kritere göre e-postalar ekle
 AdvTgtLoadFilter=Süzgeç yükle
 AdvTgtDeleteFilter=Süzgeç sil
 AdvTgtSaveFilter=Süzgeç kaydet
@@ -165,4 +167,4 @@ InGoingEmailSetup=Gelen e-posta kurulumu
 OutGoingEmailSetupForEmailing=Giden e-posta kurulumu (toplu e-posta için)
 DefaultOutgoingEmailSetup=Varsayılan giden e-posta kurulumu
 Information=Bilgi
-ContactsWithThirdpartyFilter=Contacts with third-party filter
+ContactsWithThirdpartyFilter=Üçüncü parti filtreli kişiler
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index f4f276fbe49..0b950ba7a95 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -51,20 +51,20 @@ ErrorFileNotUploaded=Dosya gönderilemedi. Boyutun izin verilen ençok dosya boy
 ErrorInternalErrorDetected=Hata algılandı
 ErrorWrongHostParameter=Yanlış ana parametre
 ErrorYourCountryIsNotDefined=Ülkeniz tanımlı değil. Giriş-Ayarlar-Düzenle kısmına git ve formu yeniden gönder.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
+ErrorRecordIsUsedByChild=Bu kayıt silinemedi. Bu kayıt en az bir alt kayıt tarafından kullanılıyor.
 ErrorWrongValue=Yanlış değer
 ErrorWrongValueForParameterX=Parametresi %s için yanlış değer
 ErrorNoRequestInError=Hatalı istek yok
-ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
+ErrorServiceUnavailableTryLater=Hizmet şu anda kullanılamıyor. Daha sonra tekrar deneyin.
 ErrorDuplicateField=Benzersiz bir alanda yinelenen değer
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
+ErrorSomeErrorWereFoundRollbackIsDone=Bazı hatalar bulundu. Değişiklikler geri alındı.
+ErrorConfigParameterNotDefined=<b>%s</b> parametresi Dolibarr yapılandırma dosyası <b>conf.php</b>'de tanımlanmadı.
 ErrorCantLoadUserFromDolibarrDatabase=Dolibarr veritabanında kullanıcı <b>%s</b> bulunamadı.
 ErrorNoVATRateDefinedForSellerCountry=Hata, ülke '%s' için herhangi bir KDV oranı tanımlanmamış.
 ErrorNoSocialContributionForSellerCountry=Hata, '%s' ülkesi için sosyal/mali vergi tipi tanımlanmamış.
 ErrorFailedToSaveFile=Hata, dosya kaydedilemedi.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
-MaxNbOfRecordPerPage=Max. number of records per page
+ErrorCannotAddThisParentWarehouse=Zaten mevcut bir deponun alt deposu olan bir üst depo eklemeye çalışıyorsunuz
+MaxNbOfRecordPerPage=Sayfa başına maksimum kayıt sayısı
 NotAuthorized=Bunu yapmak için yetkiniz yok.
 SetDate=Ayar tarihi
 SelectDate=Bir tarih seç
@@ -86,7 +86,7 @@ GoToWikiHelpPage=Çevrimiçi yardım oku (Internet erişimi gerekir)
 GoToHelpPage=Yardım oku
 RecordSaved=Kayıt kaydedildi
 RecordDeleted=Kayıt silindi
-RecordGenerated=Record generated
+RecordGenerated=Kayıt oluşturuldu
 LevelOfFeature=Özellik düzeyleri
 NotDefined=Tanımlanmamış
 DolibarrInHttpAuthenticationSoPasswordUseless=Yapılandırma dosyası <b>conf.php</b> içindeki Dolibarr kimlik doğrulama biçimi <b>%s</b> durumuna ayarlanmıştır.<br>Bu demektir ki; veritabanı parolası Dolibarr dışıdır, yani bu alanı değiştirmek hiçbir etki yaratmaz.
@@ -96,8 +96,8 @@ PasswordForgotten=Parola mı unutuldu?
 NoAccount=Hesap yok mu?
 SeeAbove=Yukarı bak
 HomeArea=Giriş
-LastConnexion=Last login
-PreviousConnexion=Previous login
+LastConnexion=Son oturum açma
+PreviousConnexion=Önceki oturum açma
 PreviousValue=Önceki değer
 ConnectedOnMultiCompany=Çevreye bağlanmış
 ConnectedSince=Bağlantı başlangıcı
@@ -108,8 +108,8 @@ RequestLastAccessInError=Son veritabanı erişim isteği hatası
 ReturnCodeLastAccessInError=Son veritabanı erişim isteği hata kodunu göster
 InformationLastAccessInError=Son veritabanı erişim isteği hatası bilgisi
 DolibarrHasDetectedError=Dolibarr teknik bir hata algıladı
-YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+YouCanSetOptionDolibarrMainProdToZero=Daha fazla bilgi almak için log dosyasını okuyabilir veya $dolibarr_main_prod seçeneğini '0' olarak ayarlayabilirsiniz.
+InformationToHelpDiagnose=Bu bilgi sorun tespiti amaçları için yararlı olabilir (bu tür bildirimleri kapatmak için $dolibarr_main_prod seçeneğini '1' olarak ayarlayabilirsiniz)
 MoreInformation=Daha fazla bilgi
 TechnicalInformation=Teknik bilgi
 TechnicalID=Teknik Kimlik
@@ -119,7 +119,7 @@ PrecisionUnitIsLimitedToXDecimals=Dolibarr birim fiyatlar için hassasiyeti <b>%
 DoTest=Deneme
 ToFilter=Süzgeç
 NoFilter=Süzgeç yok
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+WarningYouHaveAtLeastOneTaskLate=Uyarı: Tolerans süresini aşan en az bir öğeniz var.
 yes=evet
 Yes=Evet
 no=hayır
@@ -155,7 +155,7 @@ Update=Güncelle
 Close=Kapat
 CloseBox=Kontrol panelinizden ekran etiketini kaldırın
 Confirm=Onayla
-ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
+ConfirmSendCardByMail=Bu kartın içeriğini e-posta ile <b>%s</b> adresine gerçekten göndermek istiyor musunuz?
 Delete=Sil
 Remove=Kaldır
 Resiliate=Sonlandır
@@ -170,7 +170,7 @@ Save=Kaydet
 SaveAs=Farklı kaydet
 TestConnection=Deneme bağlantısı
 ToClone=Klonla
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Çoğaltmak istediğiniz verileri seçin:
 NoCloneOptionsSpecified=Klonlanacak hiçbir veri tanımlanmamış.
 Of=ile ilgili
 Go=Git
@@ -185,7 +185,7 @@ Valid=Geçerli
 Approve=Onayla
 Disapprove=Onaylama
 ReOpen=Yeniden aç
-Upload=Upload
+Upload=Yükle
 ToLink=Bağlantı
 Select=Seç
 Choose=Seç
@@ -202,7 +202,7 @@ Password=Parola
 PasswordRetype=Parolanızı yeniden yazın
 NoteSomeFeaturesAreDisabled=Bu demoda bir çok özelliğin/modülün engelli olduğuna dikkat edin.
 Name=Adı
-NameSlashCompany=Name / Company
+NameSlashCompany=İsim / Şirket
 Person=Kişi
 Parameter=Parametre
 Parameters=Parametreler
@@ -337,8 +337,8 @@ DefaultValues=Varsayılan değerler/filtreler/sıralama
 Price=Fiyat
 PriceCurrency=Fiyat (para birimi)
 UnitPrice=Birim fiyat
-UnitPriceHT=Unit price (excl.)
-UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceHT=Birim fiyat (KDV hariç)
+UnitPriceHTCurrency=Birim fiyat (KDV hariç) (para birimi)
 UnitPriceTTC=Birim fiyat
 PriceU=B.F.
 PriceUHT=B.F. (net)
@@ -346,17 +346,17 @@ PriceUHTCurrency=B.F (para birimi)
 PriceUTTC=B.F. (vergi dahil)
 Amount=Tutar
 AmountInvoice=Fatura tutarı
-AmountInvoiced=Amount invoiced
+AmountInvoiced=Faturalandırılmış tutar
 AmountPayment=Ödeme tutarı
-AmountHTShort=Amount (excl.)
+AmountHTShort=Tutar (KDV hariç)
 AmountTTCShort=Tutar (KDV dahil)
-AmountHT=Amount (excl. tax)
+AmountHT=Tutar (KDV hariç)
 AmountTTC=Miktarı (KDV dahil)
 AmountVAT=KDV tutarı
 MulticurrencyAlreadyPaid=Zaten ödenmiş, orijinal para birimi
 MulticurrencyRemainderToPay=Ödemeye devam edin, orijinal para birimi
 MulticurrencyPaymentAmount=Ödeme tutarı, orijinal para birimi
-MulticurrencyAmountHT=Amount (excl. tax), original currency
+MulticurrencyAmountHT=Tutar (KDV hariç), ilk para birimi
 MulticurrencyAmountTTC=Tutar (vergi dahil), ilk para birimi
 MulticurrencyAmountVAT=Toplam vergi, ilk para birimi
 AmountLT1=Vergi 2 tutarı
@@ -370,47 +370,48 @@ PriceQtyMinHTCurrency=En düşük miktar fiyatı (KDV hariç) (para birimi)
 Percentage=Yüzde
 Total=Toplam
 SubTotal=Aratoplam
-TotalHTShort=Total (excl.)
-TotalHTShortCurrency=Total (excl. in currency)
+TotalHTShort=Toplam (KDV hariç)
+TotalHT100Short=Toplam 100 %%(KDV hariç)
+TotalHTShortCurrency=Toplam (KDV hariç, para biriminde)
 TotalTTCShort=Toplam (KDV dahil)
-TotalHT=Total (excl. tax)
-TotalHTforthispage=Total (excl. tax) for this page
+TotalHT=Toplam (KDV hariç)
+TotalHTforthispage=Bu sayfa için Toplam (KDV hariç)
 Totalforthispage=Bu sayfa toplamı
 TotalTTC=Toplam (KDV dahil)
 TotalTTCToYourCredit=Alacağınız için toplam (KDV dahil)
 TotalVAT=Toplam KDV
-TotalVATIN=Total IGST
+TotalVATIN=Toplam IGST
 TotalLT1=Vergi 2 toplamı
 TotalLT2=Vergi 3 toplamı
 TotalLT1ES=Toplam RE
 TotalLT2ES=Toplam IRPF
-TotalLT1IN=Total CGST
-TotalLT2IN=Total SGST
-HT=Excl. tax
+TotalLT1IN=Toplam CGST
+TotalLT2IN=Toplam SGST
+HT=KDV hariç
 TTC=KDV dahil
 INCVATONLY=KDV Dahil
 INCT=Tüm vergiler dahil
 VAT=KDV
 VATIN=IGST
 VATs=Satış vergisi
-VATINs=IGST taxes
-LT1=Sales tax 2
-LT1Type=Sales tax 2 type
-LT2=Sales tax 3
-LT2Type=Sales tax 3 type
+VATINs=IGST vergileri
+LT1=Satış vergisi 2
+LT1Type=Satış vergisi 2 türü
+LT2=Satış vergisi 3
+LT2Type=Satış vergisi 3 türü
 LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Additionnal cents
+LT1GC=İlave kuruş
 VATRate=KDV Oranı
 VATCode=Vergi Oranı kodu
-VATNPR=Tax Rate NPR
-DefaultTaxRate=Varsayılan vergi oranı
+VATNPR=KDV Oranı NPR
+DefaultTaxRate=Varsayılan KDV oranı
 Average=Ortalama
 Sum=Toplam
 Delta=Değişim oranı
-RemainToPay=Remain to pay
+RemainToPay=Kalan ödeme
 Module=Modül/Uygulama
 Modules=Modüller/Uygulamalar
 Option=Seçenek
@@ -435,20 +436,20 @@ ActionNotApplicable=Uygulanamaz
 ActionRunningNotStarted=Başlayacak
 ActionRunningShort=Devam etmekte
 ActionDoneShort=Bitti
-ActionUncomplete=Incomplete
+ActionUncomplete=Tamamlanmamış
 LatestLinkedEvents=Bununla bağlantılı son %s etkinlik
 CompanyFoundation=Şirket/Kuruluş
 Accountant=Muhasebeci
 ContactsForCompany=Bu üçüncü partinin kişileri
 ContactsAddressesForCompany=Bu üçüncü partinin kişleri/adresleri
 AddressesForCompany=Bu üçüncü partinin adresleri
-ActionsOnCompany=Events for this third party
+ActionsOnCompany=Bu üçüncü taraf için etkinlikler
 ActionsOnContact=Bu kişi/adres için etkinlikler
 ActionsOnMember=Bu üye hakkındaki etkinlikler
 ActionsOnProduct=Bu ürünle ilgili etkinlikler
 NActionsLate=%s son
 ToDo=Yapılacaklar
-Completed=Completed
+Completed=Tamamlanmış
 Running=Devam etmekte
 RequestAlreadyDone=İstek zaten kayıtlı
 Filter=Süzgeç
@@ -462,7 +463,7 @@ Duration=Süre
 TotalDuration=Toplam süre
 Summary=Özet
 DolibarrStateBoard=Veritabanı İstatistikleri
-DolibarrWorkBoard=Open Items
+DolibarrWorkBoard=Bekleyen İşlemler
 NoOpenedElementToProcess=İşlenecek hiçbir açık öğe yok
 Available=Mevcut
 NotYetAvailable=Henüz mevcut değil
@@ -490,11 +491,11 @@ Reporting=Raporlama
 Reportings=Raporlama
 Draft=Taslak
 Drafts=Taslaklar
-StatusInterInvoiced=Invoiced
+StatusInterInvoiced=Faturalanmış
 Validated=Doğrulanmış
 Opened=Açık
-OpenAll=Open (All)
-ClosedAll=Closed (All)
+OpenAll=Açık (Tümü)
+ClosedAll=Kapalı (Tümü)
 New=Yeni
 Discount=İndirim
 Unknown=Bilinmeyen
@@ -505,7 +506,7 @@ Received=Alınan
 Paid=Ödenen
 Topic=Konu
 ByCompanies=Üçüncü partilere göre
-ByUsers=By user
+ByUsers=Kullanıcılara göre
 Links=Bağlantılar
 Link=Bağlantı
 Rejects=Kusurlular
@@ -517,15 +518,15 @@ NoneF=Hiçbiri
 NoneOrSeveral=Yok veya Birkaç
 Late=Son
 LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
-NoItemLate=No late item
+NoItemLate=Gecikmiş öğe yok
 Photo=Resim
 Photos=Resimler
 AddPhoto=Resim ekle
 DeletePicture=Resim sil
 ConfirmDeletePicture=Resim silmeyi onayla
 Login=Oturum açma
-LoginEmail=Login (email)
-LoginOrEmail=Login or Email
+LoginEmail=Giriş (e-posta)
+LoginOrEmail=Oturum açma adı veya E-posta
 CurrentLogin=Geçerli kullanıcı
 EnterLoginDetail=Giriş bilgilerini giriniz
 January=Ocak
@@ -564,18 +565,18 @@ MonthShort09=Eyl
 MonthShort10=Eki
 MonthShort11=Kas
 MonthShort12=Ara
-MonthVeryShort01=J
-MonthVeryShort02=Cu
-MonthVeryShort03=Pt
-MonthVeryShort04=A
-MonthVeryShort05=Pt
-MonthVeryShort06=J
-MonthVeryShort07=J
-MonthVeryShort08=A
-MonthVeryShort09=Pa
-MonthVeryShort10=O
-MonthVeryShort11=N
-MonthVeryShort12=D
+MonthVeryShort01=Oc
+MonthVeryShort02=Şu
+MonthVeryShort03=Ma
+MonthVeryShort04=Ni
+MonthVeryShort05=Ma
+MonthVeryShort06=Ha
+MonthVeryShort07=Te
+MonthVeryShort08=Ağ
+MonthVeryShort09=Ey
+MonthVeryShort10=Ek
+MonthVeryShort11=Ka
+MonthVeryShort12=Ar
 AttachedFiles=Ekli dosya ve belgeler
 JoinMainDoc=Join main document
 DateFormatYYYYMM=YYYY-AA
@@ -636,15 +637,14 @@ FeatureNotYetSupported=Özellik henüz desteklenmiyor
 CloseWindow=Pencereyi kapat
 Response=Yanıt
 Priority=Öncelik
-SendByMail=Send by email
+SendByMail=E-posta ile gönder
 MailSentBy=E-posta ile gönderildi
 TextUsedInTheMessageBody=Mesaj gövdesinde yazı kullanıldı.
 SendAcknowledgementByMail=Onay epostası gönder
 SendMail=E-posta gönder
 Email=Eposta
 NoEMail=E-posta yok
-Email=Eposta
-AlreadyRead=Already read
+AlreadyRead=Zaten okundu
 NotRead=Okunmayan
 NoMobilePhone=Cep telefonu yok
 Owner=Sahibi
@@ -658,9 +658,9 @@ ValueIsValid=Değer geçerlidir
 ValueIsNotValid=Değer geçerli değildir
 RecordCreatedSuccessfully=Kayıt başarıyla oluşturuldu
 RecordModifiedSuccessfully=Kayıt başarıyla değiştirildi
-RecordsModified=%s record(s) modified
-RecordsDeleted=%s record(s) deleted
-RecordsGenerated=%s record(s) generated
+RecordsModified=%s kayıt değiştirildi
+RecordsDeleted=%s kayıt silindi
+RecordsGenerated=%s kayıt oluşturuldu
 AutomaticCode=Otomatik kod
 FeatureDisabled=Özellik devre dışı
 MoveBox=Ekran etiketini taşı
@@ -671,14 +671,13 @@ Method=Yöntem
 Receive=Al
 CompleteOrNoMoreReceptionExpected=Tamamlandı ya da yapılacak başka şey yok
 ExpectedValue=Beklenen Değer
-CurrentValue=Geçerli değer
 PartialWoman=Kısmi
 TotalWoman=Toplam
 NeverReceived=Hiç alınmadı
 Canceled=Vazgeçildi
 YouCanChangeValuesForThisListFromDictionarySetup=Bu listenin değerlerini Kurulum - Sözlükler menüsünden değiştirebilirsiniz
 YouCanChangeValuesForThisListFrom=Bu listenin değerlerini %s menüsünden değiştirebilirsiniz
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
+YouCanSetDefaultValueInModuleSetup=Modül ayarlarında yeni bir kayıt oluştururken kullanılan varsayılan değeri ayarlayabilirsiniz
 Color=Renk
 Documents=Bağlı dosyalar
 Documents2=Belgeler
@@ -710,15 +709,15 @@ Notes=Notlar
 AddNewLine=Yeni satır ekle
 AddFile=Dosya ekle
 FreeZone=Önceden tanımlanmış bir ürün/hizmet değil
-FreeLineOfType=Free-text item, type:
+FreeLineOfType=Serbest metin öğesi, tür:
 CloneMainAttributes=Nesneyi ana öznitelikleri ile klonla
-ReGeneratePDF=Re-generate PDF
+ReGeneratePDF=PDF'yi yeniden oluştur
 PDFMerge=PDF Birleştir
 Merge=Birleştir
 DocumentModelStandardPDF=Standart PDF şablonu
 PrintContentArea=Yazdırılıcak Sayfanın ana içerik alanını göster
 MenuManager=Menu yöneticisi
-WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
+WarningYouAreInMaintenanceMode=Uyarı: Bakım modundasınız: bu uygulamayı kullanma iznine sadece <b>%s</b> sahiptir.
 CoreErrorTitle=Sistem hatası
 CoreErrorMessage=Üzgünüz, bir hata oluştu. Günlükleri kontrol etmek için sistem yöneticinize başvurun veya daha fazla bilgi almak için $dolibarr_main_prod=1 devre dışı bırakın.
 CreditCard=Kredi kartı
@@ -726,7 +725,7 @@ ValidatePayment=Ödeme doğrula
 CreditOrDebitCard=Kredi veya banka kartı
 FieldsWithAreMandatory=<b>%s</b> olan alanları zorunludur
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
-AccordingToGeoIPDatabase=(according to GeoIP conversion)
+AccordingToGeoIPDatabase=(GeoIP dönüşümüne göre)
 Line=Satır
 NotSupported=Desteklenmez
 RequiredField=Gerekli alan
@@ -734,8 +733,8 @@ Result=Sonuç
 ToTest=Denem
 ValidateBefore=Bu özelliği kullanmadan önce kart doğrulanmalıdır
 Visibility=Görünürlük
-Totalizable=Totalizable
-TotalizableDesc=This field is totalizable in list
+Totalizable=Toplanabilir
+TotalizableDesc=Bu alan listede toplanabilir
 Private=Özel
 Hidden=Gizli
 Resources=Kaynaklar
@@ -755,15 +754,15 @@ LinkToProposal=Teklife bağlantıla
 LinkToOrder=Siparişe bağlantıla
 LinkToInvoice=Faturaya bağlantıla
 LinkToTemplateInvoice=Şablon faturasına bağlantı
-LinkToSupplierOrder=Link to purchase order
-LinkToSupplierProposal=Link to vendor proposal
-LinkToSupplierInvoice=Link to vendor invoice
+LinkToSupplierOrder=Tedarikçi siparişine bağlantıla
+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
 CreateDraft=Taslak oluştur
 SetToDraft=Taslağa geri dön
 ClickToEdit=Düzenlemek için tıklayın
-ClickToRefresh=Click to refresh
+ClickToRefresh=Yenilemek için tıklayın
 EditWithEditor=CKEditor ile düzenle
 EditWithTextEditor=Metin düzenleyicisiyle düzenle
 EditHTMLSource=HTML Kaynağını Düzenle
@@ -808,7 +807,7 @@ PrintFile=%s Dosyasını Yazdır
 ShowTransaction=Girişi banka hesabında göster
 ShowIntervention=Müdahale göster
 ShowContract=Sözleşmeye bakın
-GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
+GoIntoSetupToChangeLogo=Logoyu değiştirmek için Giriş - Ayarlar - Şirket/Kuruluş bölümüne, gizlemek için ise Giriş - Ayarlar - Ekran bölümüne gidin.
 Deny=Ret
 Denied=Reddedildi
 ListOf=%s listesi
@@ -828,12 +827,13 @@ TooManyRecordForMassAction=Toplu işlem için çok sayıda kayıt seçilmiş. Bu
 NoRecordSelected=Seçilen kayıt yok
 MassFilesArea=Toplu işlemler tarafından yapılan dosyalar için alan
 ShowTempMassFilesArea=Toplu işlemler tarafından yapılan dosyalar alanını göster
-ConfirmMassDeletion=Bulk Delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+ConfirmMassDeletion=Toplu Silme onayı
+ConfirmMassDeletionQuestion=Seçilen %s kaydı silmek istediğinizden emin misiniz?
 RelatedObjects=İlgili Nesneler
 ClassifyBilled=Faturalandı olarak sınıflandır
 ClassifyUnbilled=Faturalandırılmamış olarak sınıflandır
 Progress=İlerleme
+ProgressShort=Progr.
 FrontOffice=Ön ofis
 BackOffice=Arka ofis
 View=İzle
@@ -842,6 +842,11 @@ Exports=Dışaaktarımlar
 ExportFilteredList=Dışaaktarılan süzülmüş liste
 ExportList=Dışaaktarım listesi
 ExportOptions=Dışaaktarma seçenekleri
+IncludeDocsAlreadyExported=Zaten dışa aktarılan dosyaları dahil et
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Çeşitli
 Calendar=Takvim
 GroupBy=Gruplandır...
@@ -854,7 +859,7 @@ Download=İndir
 DownloadDocument=Belgeyi indir
 ActualizeCurrency=Para birimini güncelle
 Fiscalyear=Mali yıl
-ModuleBuilder=Module Builder
+ModuleBuilder=Modül ve Uygulama Oluşturucu
 SetMultiCurrencyCode=Para birimini ayarla
 BulkActions=Toplu eylemler
 ClickToShowHelp=Araç ipucu yardımını göstermek için tıklayın
@@ -933,19 +938,19 @@ SearchIntoProjects=Projeler
 SearchIntoTasks=Görevler
 SearchIntoCustomerInvoices=Müşteri faturaları
 SearchIntoSupplierInvoices=Tedarikçi faturaları
-SearchIntoCustomerOrders=Sales orders
-SearchIntoSupplierOrders=Satın alma siparişleri
+SearchIntoCustomerOrders=Müşteri siparişleri
+SearchIntoSupplierOrders=Tedarikçi siparişleri
 SearchIntoCustomerProposals=Müşteri teklifleri
 SearchIntoSupplierProposals=Tedarikçi teklifleri
 SearchIntoInterventions=Müdahaleler
 SearchIntoContracts=Sözleşmeler
 SearchIntoCustomerShipments=Müşteri sevkiyatları
 SearchIntoExpenseReports=Gider raporları
-SearchIntoLeaves=Leave
-SearchIntoTickets=Bilet
+SearchIntoLeaves=İzin
+SearchIntoTickets=Destek Bildirimleri
 CommentLink=Açıklamalar
 NbComments=Yorum sayısı
-CommentPage=Comments space
+CommentPage=Yorumlar alanı
 CommentAdded=Yorum eklendi
 CommentDeleted=Yorum silindi
 Everybody=Herkes
@@ -965,8 +970,12 @@ FileSharedViaALink=Dosya bir bağlantı üzerinden paylaşıldı
 SelectAThirdPartyFirst=Önce bir üçüncü parti seçin...
 YouAreCurrentlyInSandboxMode=Şu anda %s "sandbox" modundasınız
 Inventory=Envanter
-AnalyticCode=Analytic code
+AnalyticCode=Analitik kod
 TMenuMRP=MRP
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
+ShowMoreInfos=Daha Fazla Bilgi Göster
+NoFilesUploadedYet=Lütfen önce bir döküman yükleyin
+SeePrivateNote=Özel nota bakın
+PaymentInformation=Ödeme bilgileri
+ValidFrom=Şu tarihten itibaren geçerli
+ValidUntil=Şu tarihe kadar geçerli
+NoRecordedUsers=Kullanıcı yok
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index 8916a7e9ca2..b85bc4a52d3 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -6,8 +6,8 @@ Member=Üye
 Members=Üyeler
 ShowMember=Üye kartı göster
 UserNotLinkedToMember=Kullanıcı herhangi bir üyeye bağlı değil
-ThirdpartyNotLinkedToMember=Üçüncü parti bir üyeye bağlantılı değil
-MembersTickets=Üye Biletleri
+ThirdpartyNotLinkedToMember=Üçüncü parti bir üyeye bağlı değil
+MembersTickets=Üyelerin Destek Bildirimleri
 FundationMembers=Dernek üyeleri
 ListOfValidatedPublicMembers=Doğrulanmış genel üyelerin listesi
 ErrorThisMemberIsNotPublic=Bu üye genel değil
@@ -67,11 +67,11 @@ Subscriptions=Abonelikler
 SubscriptionLate=Son
 SubscriptionNotReceived=Abonelik hiç alınmadı
 ListOfSubscriptions=Abonelikler listesi
-SendCardByMail=Kartı Eposta ile gönder
+SendCardByMail=Kartı e-posta ile gönder
 AddMember=Üye oluştur
 NoTypeDefinedGoToSetup=Hiçbir üyelik türü tanımlanmamıştır. Kurulum  - Üye türlerine git
 NewMemberType=Yeni üye türü
-WelcomeEMail=Hoşgeldiniz e-postası
+WelcomeEMail=Hoşgeldin e-postası
 SubscriptionRequired=Abonelik gerekli
 DeleteType=Sil
 VoteAllowed=Oylamaya izin verildi
@@ -88,9 +88,9 @@ ConfirmDeleteSubscription=Bu aboneliği silmek istediğinizden emin misiniz?
 Filehtpasswd=htpasswd dosyası
 ValidateMember=Bir üye doğrula
 ConfirmValidateMember=Bu üyeyi doğrulamak istediğinizden emin misiniz?
-FollowingLinksArePublic=Aşağıdaki bağlantılar açık sayfalar olup herhangi bir Dolibarr izni ile korunmamaktadır. Onlar biçimlendirilmiş sayfalar olmayıp üye veritabanının nasıl listelendiğine örnek olarak verilmiştir.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Genel üye listesi
-BlankSubscriptionForm=Public self-subscription form
+BlankSubscriptionForm=Genel kendi kendine abonelik formu
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
 EnablePublicSubscriptionForm=Enable the public website with self-subscription form
 ForceMemberType=Üye türünü zorla
@@ -107,16 +107,16 @@ SubscriptionNotRecorded=Üyelik kaydedilmedi
 AddSubscription=Abonelik oluştur
 ShowSubscription=Abonelik göster
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
-SendingEmailOnCancelation=Sending email on cancelation
+SendingAnEMailToMember=Üyeye bilgi e-postası gönderimi
+SendingEmailOnAutoSubscription=Otomatik kayıt aşamasında e-posta gönderimi
+SendingEmailOnMemberValidation=Yeni üye doğrulama aşamasında e-posta gönderimi
+SendingEmailOnNewSubscription=Yeni abonelik aşamasında e-posta gönderimi
+SendingReminderForExpiredSubscription=Süresi dolmuş abonelikler için hatırlatıcı e-posta gönderimi
+SendingEmailOnCancelation=Abonelik iptali aşamasında e-posta gönderimi
 # Topic of email templates
 YourMembershipRequestWasReceived=Üyeliğiniz alındı.
 YourMembershipWasValidated=Üyeliğiniz doğrulandı
-YourSubscriptionWasRecorded=Your new subscription was recorded
+YourSubscriptionWasRecorded=Yeni aboneliğiniz kaydedildi
 SubscriptionReminderEmail=Abonelik hatırlatma
 YourMembershipWasCanceled=Üyeliğiniz iptal edildi
 CardContent=Üye kartınızın içeriği
@@ -124,16 +124,16 @@ CardContent=Üye kartınızın içeriği
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Bir ziyaretçinin oto-kayıt yapması durumunda alınacak e-postanın konusu
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Bir ziyaretçinin oto-kayıt yapması durumunda alınacak e-posta
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Otomatik epostalar için Eposta gönderen
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Otomatik üyelik aboneliği sürecinde aboneye e-posta gönderimi için kullanılacak e-posta şablonu
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Üyelik doğrulama sürecinde aboneye e-posta gönderimi için kullanılacak e-posta şablonu
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Yeni abonelik kaydı sürecinde aboneye e-posta gönderimi için kullanılacak e-posta şablonu
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Abonelik süresi dolmak üzereyken e-posta hatırlatıcısı göndermek için kullanılacak e-posta şablonu
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Üyelik iptali sürecinde aboneye e-posta gönderimi için kullanılacak e-posta şablonu
+DescADHERENT_MAIL_FROM=Otomatik e-postalar için gönderen e-posta adresi
 DescADHERENT_ETIQUETTE_TYPE=Etiket sayfası biçimi
 DescADHERENT_ETIQUETTE_TEXT=Üye adres sayfalarına yazılan metin
 DescADHERENT_CARD_TYPE=Kart sayfası biçimi
@@ -156,8 +156,8 @@ DocForAllMembersCards=Bütün üyeler için kartvizit oluştur (Çıkış format
 DocForOneMemberCards=Belirli bir üye için kartvizit oluştur (Çıkış formatı için gerçek ayar : <b>%s</b>)
 DocForLabels=Adres çizelgeleri oluştur (Çıkış formatı için gerçek ayar : <b>%s</b>)
 SubscriptionPayment=Abonelik ödemesi
-LastSubscriptionDate=Son abonelik tarihi
-LastSubscriptionAmount=Son abonelik miktarı
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=En son abonelik miktarı
 MembersStatisticsByCountries=Ülkeye göre üye istatistikleri
 MembersStatisticsByState=Eyalete/ile göre üyelik istatistikleri
 MembersStatisticsByTown=İlçelere göre üyelik istatistikleri
@@ -183,16 +183,18 @@ DefaultAmount=Varsayılan abonelik tutarı
 CanEditAmount=Ziyaretçi kendi abonelik tutarını seçebeilir/düzenleyebilir
 MEMBER_NEWFORM_PAYONLINE=Entegre çevrimiçi ödeme sayfasına atla
 ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
+MembersStatisticsByProperties=Yapısına göre üye istatistikleri
 MembersByNature=Bu ekran doğaya göre üye istatistiklerini gösterir.
 MembersByRegion=Bu ekran bölgeye göre üye istatistiklerini gösterir.
 VATToUseForSubscriptions=Abonelikler için kullanılacak KDV oranı
-NoVatOnSubscription=Abonelikler için KDV yok
-MEMBER_PAYONLINE_SENDEMAIL=Dolibarr bir abonelik için doğrulanmış bir ödemenin onayını aldığında uyarı epostası olarak kullanılacak eposta (Örneğin: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Faturada abonelik kalemi olarak kullanılan ürün: %s
 NameOrCompany=İsim veya şirket
 SubscriptionRecorded=Abonelik kaydedildi
-NoEmailSentToMember=No email sent to member
+NoEmailSentToMember=Üyeye e-posta gönderilmedi
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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=Faturanızı bu e-postanın ekinde bulabilirsiniz
+XMembersClosed=%s üye kapatıldı
diff --git a/htdocs/langs/tr_TR/modulebuilder.lang b/htdocs/langs/tr_TR/modulebuilder.lang
index 28a1a365a4e..fc585020146 100644
--- a/htdocs/langs/tr_TR/modulebuilder.lang
+++ b/htdocs/langs/tr_TR/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -11,7 +11,7 @@ ModuleKey=Modül anahtarı
 ObjectKey=Nesne anahtarı
 ModuleInitialized=Module initialized
 FilesForObjectInitialized=Yeni nesne '%s' için dosyalar başlatıldı
-FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
+FilesForObjectUpdated='%s' nesnesi için dosyalar güncellendi (.sql dosyaları ve .class.php dosyası)
 ModuleBuilderDescdescription=Modülünüzü tanımlayan tüm genel bilgileri buraya girin
 ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
 ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
@@ -19,15 +19,16 @@ ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by
 ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
 ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
-ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescwidgets=Bu sekme ekran etiketlerini yönetmek/oluşturmak için sunulmuştur.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Tehlikeli bölge
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Dökümantasyon oluşturun
-ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsNotActive=Bu modül henüz aktif değil. Aktifleştirmek için %s bölümüne gidin veya buraya tıklayın:
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Uzun açıklama
 EditorName=Editörün adı
 EditorUrl=Editörün URL'si
@@ -35,20 +36,21 @@ DescriptorFile=Modülün tanımlayıcı dosyası
 ClassFile=PHP DAO CRUD sınıfı için dosya
 ApiClassFile=PHP API sınıfı için dosya
 PageForList=Kayıt listesi için PHP sayfası
-PageForCreateEditView=PHP page to create/edit/view a record
+PageForCreateEditView=Bir kaydı oluşturmak/düzenlemek/görüntülemek için PHP sayfası
 PageForAgendaTab=Etkinlik sekmesi için PHP sayfası
 PageForDocumentTab=Belge sekmesi için PHP sayfası
 PageForNoteTab=Not sekmesi için PHP sayfası
 PathToModulePackage=Path to zip of module/application package
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
-SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
+PathToModuleDocumentation=Modül/uygulama dökümantasyon dosyasına yol (%s)
+SpaceOrSpecialCharAreNotAllowed=Boşluklara veya özel karakterlere izin verilmez.
 FileNotYetGenerated=Dosya henüz oluşturulmadı
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Eksik dosyaları oluştur
-SpecificationFile=File of documentation
+SpecificationFile=Dökümantasyon dosyası
 LanguageFile=Dil için dosya
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
-NotNull=Not NULL
+NotNull=BOŞ değil
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll='Tümünü ara' için kullanılır
 DatabaseIndex=Veritabanı dizini
@@ -57,44 +59,48 @@ TriggersFile=File for triggers code
 HooksFile=File for hooks code
 ArrayOfKeyValues=Array of key-val
 ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
+WidgetFile=Ekran etiket dosyası
 ReadmeFile=Benioku dosyası
 ChangeLog=ChangeLog dosyası
 TestClassFile=PHP Unit Test sınıfı için dosya
 SqlFile=Sql dosyası
-PageForLib=PHP kütüphaneleri için dosya
+PageForLib=PHP kütüphanesi için dosya
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Tamamlayıcı nitelikler için Sql dosyası
 SqlFileKey=Anahtarlar için Sql dosyası
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
 DirScanned=Taranan dizin
 NoTrigger=No trigger
-NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+NoWidget=Ekran etiketi yok
+GoToApiExplorer=API gezginine git
 ListOfMenusEntries=Menü kayıtlarının listesi
 ListOfPermissionsDefined=Tanımlanan izinlerin listesi
 SeeExamples=Burada örneklere bakın
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example: preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
+VisibleDesc=Alan görünür mü? (Örnekler: 0=Asla görünür değil, 1=Liste ve oluşturma/güncelleme/görüntüleme formlarında görünür, 2=Sadece listede görünür, 3=Sadece oluşturma/güncelleme/görüntüleme formlarında görünür (listede görünmez), 4=Liste ve güncelleme/görüntüleme formlarında görünür (oluşturma formunda görünmez). Negatif bir değer kullanmak alanın varsayılan olarak listede görünmeyeceği fakat görüntülemek için seçilebileceği anlamına gelir). Bu, preg_match('/public/', $_SERVER['PHP_SELF'])?0:1 şeklinde bir ifade olabilir.
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Modülünüz tarafından sunulan menüleri burada tanımlayın
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
 SeeReservedIDsRangeHere=See range of reserved IDs
-ToolkitForDevelopers=Toolkit for Dolibarr developers
-TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
-SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
+ToolkitForDevelopers=Dolibarr geliştiricileri için araç seti
+TryToUseTheModuleBuilder=Eğer SQL ve PHP hakkında bilginiz varsa, yerel modül oluşturucu sihirbazını kullanabilirsiniz.<br><strong>%s</strong> modülünü etkinleştirin ve sağ üst menüde yer alan <span class="fa fa-bug"></span> simgesine tıklayarak sihirbazı kullanın.<br>Uyarı: Bu gelişmiş bir geliştirici özelliğidir, bu nedenle aktif kullandığınız siteniz üzerinde deneme <b>yapmayın</b>!
+SeeTopRightMenu=Sağ üst menüde yer alan <span class="fa fa-bug"></span> simgesine bakın
 AddLanguageFile=Dil dosyası ekle
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
-TableDoesNotExists=The table %s does not exists
-TableDropped=Table %s deleted
+DropTableIfEmpty=(Boşsa tabloyu sil)
+TableDoesNotExists=%s tablosu mevcut değil
+TableDropped=%s tablosu silindi
 InitStructureFromExistingTable=Build the structure array string of an existing table
 UseAboutPage=Hakkında sayfasını devre dışı bırak
 UseDocFolder=Dökümantasyon klasörünü devre dışı bırak
@@ -103,10 +109,11 @@ RealPathOfModule=Modülün gerçek yolu
 ContentCantBeEmpty=Content of file can't be empty
 WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
 CLIDesc=You can generate here some command line scripts you want to provide with your module.
-CLIFile=CLI File
+CLIFile=CLI Dosyası
 NoCLIFile=No CLI files
 UseSpecificEditorName = Use a specific editor name
 UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=Önce modül/uygulama etkinleştirilmelidir
diff --git a/htdocs/langs/tr_TR/multicurrency.lang b/htdocs/langs/tr_TR/multicurrency.lang
index 886c1657bc0..2b9f4ef076e 100644
--- a/htdocs/langs/tr_TR/multicurrency.lang
+++ b/htdocs/langs/tr_TR/multicurrency.lang
@@ -4,17 +4,17 @@ ErrorAddRateFail=Eklenen fiyat hatası
 ErrorAddCurrencyFail=Eklenen para birimi hatası
 ErrorDeleteCurrencyFail=Hata silme başarısız
 multicurrency_syncronize_error=Senkronizasyon hatası: %s
-MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Bilinen en son fiyatı kullanmak yerine döviz kurunu bulmak için belgenin tarihini kullanın
-multicurrency_useOriginTx=Bir nesne başka birinden oluşturulduğunda, kaynak nesnenin orijinal oranını koruyun (aksi takdirde bilinen en yeni oranı kullanın)
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Döviz kurunu bulmak için, bilinen en son fiyatı kullanmak yerine belgenin tarihini kullanın
+multicurrency_useOriginTx=Bir nesne başka birinden oluşturulduğunda, orijinal oranı kaynak nesneden alın (aksi takdirde bilinen en yeni oranı kullanın)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=Bu işlevi kullanmak için web sitelerinde bir hesap oluşturmalısınız<br><b>API anahtarınızı</b> edinin<br />Eğer ücretsiz bir hesap kullanırsanız <b>para birimi kaynağını</b> değiştiremezsiniz (Varsayılan ABD Doları)<br />Fakat ana para biriminiz ABD Doları değilse, ana para birimini zorlamak için <b>alternatif para birimi kaynağını</b> kullanabilirsiniz<br /><br />Her ay için 1000 senkronizasyona sınırlandırılırsınız
+CurrencyLayerAccount_help_to_synchronize=Bu işlevi kullanmak için %s web sitesinde bir hesap oluşturmanız gerekir. <br><b>API anahtarınızı</b> edinin.<br>Eğer ücretsiz bir hesap kullanırsanız <b>kaynak para birimini</b> değiştiremezsiniz (Varsayılan ABD Doları'dır). <br>Ana para biriminiz ABD Doları değilse, uygulama bunu otomatik olarak yeniden hesaplayacaktır.<br><br>Ücretsiz hesapta her ay için 250 senkronizasyon ile sınırlandırılırsınız.
 multicurrency_appId=API anahtarı
-multicurrency_appCurrencySource=Para birimi kaynağı
-multicurrency_alternateCurrencySource=Alternatif para birimi kaynağı
+multicurrency_appCurrencySource=Kaynak para birimi
+multicurrency_alternateCurrencySource=Alternatif kaynak para birimi
 CurrenciesUsed=Kullanılan para birimleri
-CurrenciesUsed_help_to_add=<b>Teklifleriniz</b>, <b>siparişleriniz</b> vb. gibi işlemlerde kullanmanız gereken farklı para birimlerini ve oranları ekleyin
+CurrenciesUsed_help_to_add=<b>Tekliflerinizde</b>, <b>siparişilerinizde</b> v.b. kullanmanız gereken farklı para birimleri ve oranlar ekleyin.
 rate=oran
 MulticurrencyReceived=Alınan, orijinal para birimi
 MulticurrencyRemainderToTake=Kalan tutar, orijinal para birimi
 MulticurrencyPaymentAmount=Ödeme tutarı, orijinal para birimi
-AmountToOthercurrency=Amount To (in currency of receiving account)
+AmountToOthercurrency=Tutar (alıcı hesabının para biriminde)
diff --git a/htdocs/langs/tr_TR/oauth.lang b/htdocs/langs/tr_TR/oauth.lang
index d51609c0731..ef138752759 100644
--- a/htdocs/langs/tr_TR/oauth.lang
+++ b/htdocs/langs/tr_TR/oauth.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=Oauth Yapılandırma
-OAuthServices=OAuth services
+ConfigOAuth=OAuth Yapılandırması
+OAuthServices=OAuth Hizmetleri
 ManualTokenGeneration=Manual token generation
-TokenManager=Token manager
+TokenManager=Token Manager
 IsTokenGenerated=Is token generated ?
 NoAccessToken=Yerel veritabanına kayıtlı erişim belirteçi yok
 HasAccessToken=Bir belirteç oluşturuldu ve yerel veritabanına kaydedildi
@@ -11,8 +11,8 @@ ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %
 TokenDeleted=Belirteç silindi
 RequestAccess=Erişim ve kaydedilecek yeni bir belirteç alma isteği/yenilemesi için buraya tıklayın
 DeleteAccess=Belirteçi silmek için burayı tıkla
-UseTheFollowingUrlAsRedirectURI=OAuth sağlayıcınız üzerinde kimlik oluştururken Yönlendirme URI olarak aşağıdaki URL'yi kullanın:
-ListOfSupportedOauthProviders=OAuth2 sağlayıcınız tarafınıdan verilen kimlik bilgilerini burada girin. Burada yalnızca desteklenen OAuth2 sağlayıcılar görünür. Bu ayarlar OAuth2 kimlik doğrulaması gerektiren diğer modüller tarafından da kullanılabilir.
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
+ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
 OAuthSetupForLogin=Page to generate an OAuth token
 SeePreviousTab=Önceki sekmeye bakın
 OAuthIDSecret=OAuth ID and Secret
@@ -20,11 +20,11 @@ TOKEN_REFRESH=Belirteç Yenilemesi Mevcuttur
 TOKEN_EXPIRED=Token expired
 TOKEN_EXPIRE_AT=Belirteç sonlanması
 TOKEN_DELETE=Kayıtlı belrteçi sil
-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
+OAUTH_GOOGLE_NAME=OAuth Google hizmeti
+OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Go to <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 hizmeti
+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">Bu sayfaya gidin</a> ve sonra OAuth kimlik bilgileri oluşturmak için "Yeni bir uygulama kaydet" linkine gidin
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index 975dd072e62..a686f2702d2 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Müşteri siparişleri alanı
-SuppliersOrdersArea=Satın alma siparişleri alanı
+SuppliersOrdersArea=Tedarikçi siparişleri alanı
 OrderCard=Sipariş kartı
 OrderId=Sipariş Kimliği
 Order=Sipariş
@@ -13,18 +13,18 @@ OrderToProcess=İşlenecek sipariş
 NewOrder=Yeni sipariş
 ToOrder=Sipariş yap
 MakeOrder=Sipariş yap
-SupplierOrder=Satın alma emri
-SuppliersOrders=Satın alma siparişleri
-SuppliersOrdersRunning=Mevcut satın alma siparişleri
-CustomerOrder=Sales Order
-CustomersOrders=Sales Orders
-CustomersOrdersRunning=Current sales orders
-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=İşlenecek satın alma siparişleri
+SupplierOrder=Tedarikçi siparişi
+SuppliersOrders=Tedarikçi siparişleri
+SuppliersOrdersRunning=Mevcut tedarikçi siparişleri
+CustomerOrder=Müşteri Siparişi
+CustomersOrders=Müşteri Siparişleri
+CustomersOrdersRunning=Mevcut müşteri siparişleri
+CustomersOrdersAndOrdersLines=Müşteri siparişleri ve sipariş detayları
+OrdersDeliveredToBill=Faturaya gönderilen müşteri siparişleri
+OrdersToBill=Teslim edilen müşteri siparişleri
+OrdersInProcess=İşlemdeki müşteri siparişleri
+OrdersToProcess=İşlenecek müşteri siparişleri
+SuppliersOrdersToProcess=İşlenecek tedarikçi siparişleri
 StatusOrderCanceledShort=İptal edilmiş
 StatusOrderDraftShort=Taslak
 StatusOrderValidatedShort=Doğrulanmış
@@ -75,17 +75,17 @@ ShowOrder=Siparişi göster
 OrdersOpened=İşlenecek siparişler
 NoDraftOrders=Taslak sipariş yok
 NoOrder=Sipariş yok
-NoSupplierOrder=Satın alma siparişi yok
-LastOrders=Latest %s sales orders
-LastCustomerOrders=Latest %s sales orders
-LastSupplierOrders=En son %s satın alma siparişi
+NoSupplierOrder=Tedarikçi siparişi yok
+LastOrders=En son %s müşteri siparişi 
+LastCustomerOrders=En son %s müşteri siparişi 
+LastSupplierOrders=En son %s tedarikçi siparişi
 LastModifiedOrders=Değiştirilen son %s sipariş
 AllOrders=Bütün siparişler
 NbOfOrders=Sipariş sayısı
 OrdersStatistics=Sipariş istatistikleri
-OrdersStatisticsSuppliers=Satın alma siparişi istatistikleri
+OrdersStatisticsSuppliers=Tedarikçi siparişi istatistikleri
 NumberOfOrdersByMonth=Aylık sipariş sayısı
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+AmountOfOrdersByMonthHT=Aylık sipariş tutarı (KDV hariç)
 ListOfOrders=Sipariş listesi
 CloseOrder=Siparişi kapat
 ConfirmCloseOrder=Bu siparişi teslim edildi olarak ayarlamak istediğinizden emin misiniz? Bir sipariş teslim edildiğinde, faturalandırıldı olarak ayarlanabilir.
@@ -97,7 +97,7 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Fatura oluştur
 ClassifyShipped=Teslim edildi sınıflandır
 DraftOrders=Taslak siparişler
-DraftSuppliersOrders=Taslak satın alma siparişleri
+DraftSuppliersOrders=Taslak tedarikçi siparişleri
 OnProcessOrders=İşlemdeki siparişler
 RefOrder=Sipariş ref.
 RefCustomerOrder=Müşterinin sipariş ref.
@@ -114,9 +114,9 @@ ConfirmCloneOrder=Bu siparişi kopyalamak istediğinizden emin misiniz <b>%s</b>
 DispatchSupplierOrder=Receiving purchase order %s
 FirstApprovalAlreadyDone=İlk onay zaten yapılmış
 SecondApprovalAlreadyDone=İkinci onaylama zaten yapılmış
-SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
-SupplierOrderClassifiedBilled=Purchase Order %s set billed
+SupplierOrderReceivedInDolibarr=%s Tedarikçi Siparişi teslim alındı %s
+SupplierOrderSubmitedInDolibarr=%s Tedarikçi Siparişi gönderildi
+SupplierOrderClassifiedBilled=%s Tedarikçi Siparişi faturalandı olarak ayarlı
 OtherOrders=Diğer siparişler
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
@@ -124,11 +124,11 @@ TypeContact_commande_internal_SHIPPING=Sevkiyat izleme temsilcisi
 TypeContact_commande_external_BILLING=Müşteri fatura yetkilisi
 TypeContact_commande_external_SHIPPING=Müşteri nakliye yetkilisi
 TypeContact_commande_external_CUSTOMER=Müşteri sipariş izleme yetkilisi
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
+TypeContact_order_supplier_internal_SALESREPFOLL=Tedarikçi siparişi izleme temsilcisi
 TypeContact_order_supplier_internal_SHIPPING=Sevkiyat izleme temsilcisi
 TypeContact_order_supplier_external_BILLING=Tedarikçi faturası kişisi
-TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
+TypeContact_order_supplier_external_SHIPPING=Tedarikçi sevkiyat yetkilisi
+TypeContact_order_supplier_external_CUSTOMER=Tedarikçi sipariş izleme yetkilisi
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=COMMANDE_SUPPLIER_ADDON değişmezi tanımlanmamış
 Error_COMMANDE_ADDON_NotDefined=Sabit COMMANDE_ADDON tanımlanmamış
 Error_OrderNotChecked=Faturalanacak seçilmiş sipariş yok
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 49a165d68c2..4db357bd56a 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -31,15 +31,15 @@ NextYearOfInvoice=Fatura tarihinden sonraki yıl
 DateNextInvoiceBeforeGen=Bir sonraki faturanın tarihi (oluşturulmadan önce)
 DateNextInvoiceAfterGen=Bir sonraki faturanın tarihi (oluşturulduktan sonra)
 
-Notify_ORDER_VALIDATE=Sales order validated
-Notify_ORDER_SENTBYMAIL=Sales order sent by mail
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
-Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
-Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
-Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+Notify_ORDER_VALIDATE=Müşteri siparişi doğrulandı
+Notify_ORDER_SENTBYMAIL=Müşteri siparişi e-posta ile gönderildi
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Tedarikçi siparişi e-posta ile gönderildi
+Notify_ORDER_SUPPLIER_VALIDATE=Tedarikçi siparişi kaydedildi
+Notify_ORDER_SUPPLIER_APPROVE=Tedarikçi siparişi onaylandı
+Notify_ORDER_SUPPLIER_REFUSE=Tedarikçi siparişi reddedildi
 Notify_PROPAL_VALIDATE=Müşteri teklifi onaylandı
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_CLOSE_SIGNED=Müşteri teklifi imzalanmış kapatıldı
+Notify_PROPAL_CLOSE_REFUSED=Müşteri teklifi reddedilmiş kapatıldı
 Notify_PROPAL_SENTBYMAIL=Teklif posta ile gönderildi
 Notify_WITHDRAW_TRANSMIT=Havale çekme
 Notify_WITHDRAW_CREDIT=Kredi çekme
@@ -48,7 +48,7 @@ Notify_COMPANY_CREATE=Üçüncü parti oluşturuldu
 Notify_COMPANY_SENTBYMAIL=Eposta üçüncü parti kartından gönderildi
 Notify_BILL_VALIDATE=Müşteri faturası onaylandı
 Notify_BILL_UNVALIDATE=Müşteri faturasından doğrulama kaldırıldı
-Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_PAYED=Müşteri faturası ödendi
 Notify_BILL_CANCEL=Müşteri faturası iptal edildi
 Notify_BILL_SENTBYMAIL=Müşteri faturası postayla gönderildi
 Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
@@ -71,7 +71,7 @@ Notify_TASK_CREATE=Görev oluşturuldu
 Notify_TASK_MODIFY=Görev bilgileri değiştirildi
 Notify_TASK_DELETE=Görev silindi
 Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
-Notify_EXPENSE_REPORT_APPROVE=Expense report approved
+Notify_EXPENSE_REPORT_APPROVE=Gider raporu onaylandı
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
 SeeModuleSetup=%s modülü ayarlarına bak
@@ -84,15 +84,15 @@ NbOfActiveNotifications=Bildirim sayısı (alıcı e-postalarının sayısı)
 PredefinedMailTest=__(Hello)__\nBu, __EMAIL__ adresine gönderilen bir test mailidir.\nİki satır bir satırbaşı ile birbirinden ayrılır.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nBu bir <b>test</b> mailidir (test kelimesi kalın olmalıdır). <br> İki satır bir satırbaşı ile birbirinden ayrılır. <br><br>__USER_SIGNATURE__
 PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find 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__
+PredefinedMailContentSendInvoice=__(Hello)__\n\n__REF__ referans numaralı faturanızı ekte bulabilirsiniz \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\n__REF__ referans numaralı faturanın kayıtlarımızda ödenmemiş olarak göründüğü hatırlatmak isteriz. Faturanın bir kopyası ekte bilginize sunulmuştur.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\n__REF__ referans numaralı fiyat teklifini ekte bulabilirsiniz \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-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__
+PredefinedMailContentSendOrder=__(Hello)__\n\n__REF__ referans numaralı siparişi ekte bulabilirsiniz\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\n__REF__ referans numaralı siparişimizi ekte bulabilirsiniz\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\n__REF__ referans numaralı faturayı ekte bulabilirsiniz\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\n__REF__ referans numaralı sevkiyatı ekte bulabilirsiniz\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\n__REF__ referans numaralı müdahaleyi ekte bulabilirsiniz\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__
@@ -179,30 +179,30 @@ DolibarrDemo=Dolibarr ERP/CRM demosu
 StatsByNumberOfUnits=Ürün/hizmet miktarının toplamı için istatistikler
 StatsByNumberOfEntities=Bahsedilen varlıkların sayısındaki istatistikler (Fatura, sipariş, ... sayısı)
 NumberOfProposals=Teklif sayısı
-NumberOfCustomerOrders=Number of sales orders
+NumberOfCustomerOrders=Müşteri siparişlerinin sayısı
 NumberOfCustomerInvoices=Müşteri faturalarının sayısı
-NumberOfSupplierProposals=Number of vendor proposals
-NumberOfSupplierOrders=Number of purchase orders
-NumberOfSupplierInvoices=Number of vendor invoices
+NumberOfSupplierProposals=Tedarikçi tekliflerinin sayısı
+NumberOfSupplierOrders=Tedarikçi siparişi sayısı
+NumberOfSupplierInvoices=Tedarikçi siparişlerinin sayısı
 NumberOfUnitsProposals=Tekliflerdeki birim sayısı
-NumberOfUnitsCustomerOrders=Number of units on sales orders
+NumberOfUnitsCustomerOrders=Müşteri siparişlerindeki birim sayısı
 NumberOfUnitsCustomerInvoices=Müşteri faturalarındaki birim sayısı
-NumberOfUnitsSupplierProposals=Number of units on vendor proposals
-NumberOfUnitsSupplierOrders=Number of units on purchase orders
+NumberOfUnitsSupplierProposals=Tedarikçi tekliflerinde yer alan birim sayısı
+NumberOfUnitsSupplierOrders=Tedarikçi siparişlerindeki birim sayısı
 NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
 EMailTextInterventionAddedContact=Yeni bir müdahale %s size atandı.
 EMailTextInterventionValidated=Müdahele %s doğrulanmıştır.
-EMailTextInvoiceValidated=Invoice %s has been validated.
+EMailTextInvoiceValidated=Fatura %s doğrulandı.
 EMailTextInvoicePayed=Invoice %s has been paid.
-EMailTextProposalValidated=Proposal %s has been validated.
-EMailTextProposalClosedSigned=Proposal %s has been closed signed.
-EMailTextOrderValidated=Order %s has been validated.
-EMailTextOrderApproved=Order %s has been approved.
+EMailTextProposalValidated=Teklif %s doğrulandı.
+EMailTextProposalClosedSigned=Teklif %s imzalı olarak kapatıldı.
+EMailTextOrderValidated=Sipariş %s doğrulandı.
+EMailTextOrderApproved=Sipariş %s onaylandı.
 EMailTextOrderValidatedBy=Order %s has been recorded by %s.
-EMailTextOrderApprovedBy=Order %s has been approved by %s.
-EMailTextOrderRefused=Order %s has been refused.
-EMailTextOrderRefusedBy=Order %s has been refused by %s.
-EMailTextExpeditionValidated=Shipping %s has been validated.
+EMailTextOrderApprovedBy=Sipariş %s, %s tarafından onaylandı.
+EMailTextOrderRefused=Sipariş %s reddedildi.
+EMailTextOrderRefusedBy=Sipariş %s, %s tarafından reddedildi.
+EMailTextExpeditionValidated=Sevkiyat %s doğrulandı.
 EMailTextExpenseReportValidated=Expense report %s has been validated.
 EMailTextExpenseReportApproved=Expense report %s has been approved.
 EMailTextHolidayValidated=Leave request %s has been validated.
@@ -268,5 +268,5 @@ WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as t
 WEBSITE_KEYWORDS=Anahtar kelimeler
 LinesToImport=Lines to import
 
-MemoryUsage=Memory usage
+MemoryUsage=Bellek kullanımı
 RequestDuration=Duration of request
diff --git a/htdocs/langs/tr_TR/paybox.lang b/htdocs/langs/tr_TR/paybox.lang
index 8a5d7be7ae3..67772741b13 100644
--- a/htdocs/langs/tr_TR/paybox.lang
+++ b/htdocs/langs/tr_TR/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=Tamamlanacak
 YourEMail=Ödeme alındısı onayı için e-posta adresi
 Creditor=Alacaklı
 PaymentCode=Ödeme kodu
-PayBoxDoPayment=Kredi veya Bankamatik Kartıyla öde (Paybox)
+PayBoxDoPayment=Paybox ile öde
 ToPay=Ödeme yap
 YouWillBeRedirectedOnPayBox=Kredi kartı bilgilerinizi girmek için güvenli Paybox sayfasına yönlendirileceksiniz
 Continue=Sonraki
 ToOfferALinkForOnlinePayment=%s Ödemesi için URL
-ToOfferALinkForOnlinePaymentOnOrder=Bir müşteri siparişi için çevrimiçi %s ödemesi kullanıcı arayüzü sunan URL
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=Bir müşteri faturası için çevrimiçi %s ödemesi kullanıcı arayüzü sunan URL
 ToOfferALinkForOnlinePaymentOnContractLine=Bir sözleşme satırı için çevrimiçi %s ödemesi kullanıcı arayüzü sunan URL
 ToOfferALinkForOnlinePaymentOnFreeAmount=Bir serbest ödeme için çevrimiçi %s ödemesi kullanıcı arayüzü sunan URL
 ToOfferALinkForOnlinePaymentOnMemberSubscription=Bir müşteri üye aboneliği çevrimiçi %s ödemesi kullanıcı arayüzü sunan URL
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=Ayrıca; o URL'lerden herhangi birine <b>&tag=<i>value</i></b> url parametresini ekleyerek kendi ödeme açıklamanızın etiketini girebilirsiniz.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Bu sayfa ödeme kaydedilmiş olduğunu onaylar. Teşekkür ederim.
@@ -33,7 +33,8 @@ VendorName=Satıcının Adı
 CSSUrlForPaymentForm=Ödeme formu için CSS stil sayfası url'si
 NewPayboxPaymentReceived=Yeni Paybox ödemesi alındı
 NewPayboxPaymentFailed=Yeni Paybox ödemesi denendi ama başarısız oldu
-PAYBOX_PAYONLINE_SENDEMAIL=Ödeme sonrası uyarı Epostası (başarılı ya da başarısız)
+PAYBOX_PAYONLINE_SENDEMAIL=Ödeme denemesinden sonra e-posta bildirimi (başarılı veya başarısız)
 PAYBOX_PBX_SITE=PBX SITE için değer
 PAYBOX_PBX_RANG=PBX Rang için değer
 PAYBOX_PBX_IDENTIFIANT=PBX ID için değer
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/tr_TR/paypal.lang b/htdocs/langs/tr_TR/paypal.lang
index 800a9202489..0974b49404a 100644
--- a/htdocs/langs/tr_TR/paypal.lang
+++ b/htdocs/langs/tr_TR/paypal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal modülü kurulumu
-PaypalDesc=This module allows payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=PayPal ile öde (Kredi Kartı veya PayPal)
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=PayPal ile Öde (Kart veya PayPal)
 PaypalDoPayment=PayPal ile öde
 PAYPAL_API_SANDBOX=Test/sandbox modu
 PAYPAL_API_USER=API kullanıcı adı
 PAYPAL_API_PASSWORD=API parolası
 PAYPAL_API_SIGNATURE=API imzası
 PAYPAL_SSLVERSION=Curl SSL Sürümü
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+PayPal) or "PayPal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Tümlev
 PaypalModeOnlyPaypal=Yalnızca PayPal
 ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=Bu işlem kimliğidir: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of PayPal payment when you send a document by mail
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=Yeni online ödeme alındı
 NewOnlinePaymentFailed=Yeni online ödeme denendi ancak başarısız oldu
-ONLINE_PAYMENT_SENDEMAIL=Bir ödemeden sonra uyarı Epostası (başarılı ya da değil)
+ONLINE_PAYMENT_SENDEMAIL=Her ödeme denemesinden sonra bildirimler için e-posta adresi (başarılı veya başarısız olan)
 ReturnURLAfterPayment=Ödemen sonra URL ye dön
 ValidationOfOnlinePaymentFailed=Online ödemenin doğrulaması başarısız oldu
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Ödeme sistemi tarafından çağrılan ödeme onay sayfası bir hata verdi
@@ -27,8 +27,10 @@ ShortErrorMessage=Kısa Hata Mesajı
 ErrorCode=Hata Kodu
 ErrorSeverityCode=Hata Önem Kodu
 OnlinePaymentSystem=Online ödeme sistemi
-PaypalLiveEnabled=PayPal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import PayPal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=PayPal ödemelerini içe aktar
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
 ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/tr_TR/printing.lang b/htdocs/langs/tr_TR/printing.lang
index 29d207327cf..97724fa6556 100644
--- a/htdocs/langs/tr_TR/printing.lang
+++ b/htdocs/langs/tr_TR/printing.lang
@@ -2,15 +2,15 @@
 Module64000Name=Doğrudan Yazdırma
 Module64000Desc=Doğrudan Yazdırma Sistemini etkinleştir
 PrintingSetup=Doğrudan Yazdırma Sistemi Ayarları
-PrintingDesc=Bu modül, çeşitli modüllerde belgeleri doğrudan yazıcıya göndermek için bir Yazdırma tuşu ekler (belge uygulamada açılmadan) 
+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=Doğrudan Yazdırma işleri
 DirectPrint=Doğrudan yazdır
 PrintingDriverDesc=Yazıcı sürücüsü değişkenlerinin ayarları
 ListDrivers=Sürücü listesi
 PrintTestDesc=Yazıcı Listesi
 FileWasSentToPrinter=%s Dosyası yazıcıya gönderilmiştir
-ViaModule=via the module
-NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+ViaModule=modül vasıtasıyla
+NoActivePrintingModuleFound=Belgeyi yazdırmak için aktif sürücü yok.  %smodül kurulumunu kontrol edin. 
 PleaseSelectaDriverfromList=Lütfen listeden bir sürücü seçin.
 PleaseConfigureDriverfromList=Listeden seçilen sürücüyü lütfen yapılandırın.
 SetupDriver=Sürücü kurulumu
@@ -19,7 +19,7 @@ UserConf=Kişi başına ayarlar
 PRINTGCP_INFO=Google OAuth API ayarları
 PRINTGCP_AUTHLINK=Kimlik doğrulama
 PRINTGCP_TOKEN_ACCESS=Google Bulut Yazdırma OAuth Belirteçi
-PrintGCPDesc=Bu sürücü belgelerin Google Bulut Yazdırma ile doğrudan bir yazıcıya gönderilmesini sağlar.
+PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
 GCP_Name=Adı
 GCP_displayName=Adı göster
 GCP_Id=Yazıcı Kimliği
@@ -27,7 +27,7 @@ GCP_OwnerName=Sahip Adı
 GCP_State=Yazıcı Durumu
 GCP_connectionStatus=Çevrimiçi Durumu
 GCP_Type=Yazıcı Türü
-PrintIPPDesc=Bu sürücü belgelerin doğrudan yazıcıya gönderilmesini sağlar. Bu işlem CUPS kurulu bir Linux sistemi gerektirir.
+PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
 PRINTIPP_HOST=Yazma sunucusu
 PRINTIPP_PORT=Port
 PRINTIPP_USER=Oturum açma
@@ -46,7 +46,9 @@ IPP_Device=Aygıt
 IPP_Media=Yazıcı ortamı
 IPP_Supported=Ortam türü
 DirectPrintingJobsDesc=Bu sayfa geçerli yazıcılar için yazdırma işlerini listeler.
-GoogleAuthNotConfigured=Google OAuth ayarları yapılmamış. OAuth modülünü etkinleştir ve bir Google ID/Secret ayarla.
+GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
 GoogleAuthConfigured=Google OAuth kimlik bilgileri OAuth modülünün kurulumunda bulundu.
 PrintingDriverDescprintgcp=Google Bulut Yazdırma yazıcı sürücüsü yapılandırma değişkenleri.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
 PrintTestDescprintgcp=Google Bulut Yazdırma Yazıcı Listesi.
+PrintTestDescprintipp=Cups için Yazıcıların Listesi
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 9cb85d9e69e..ca07c4d788f 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -16,14 +16,14 @@ Create=Oluştur
 Reference=Referans
 NewProduct=Yeni ürün
 NewService=Yeni hizmet
-ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+ProductVatMassChange=Toplu KDV Güncelleme
+ProductVatMassChangeDesc=Bu araç <b><u>TÜM</u></b> ürün ve hizmetler üzerinde belirlenen KDV oranını günceller!
 MassBarcodeInit=Toplu barkod başlatma
 MassBarcodeInitDesc=Bu sayfa, barkod tanımlanmamış nesneler üzerinde barkod başlatmak için kullanılabilir. Önce barkod modülü kurulumunun tamamlandığını denetleyin.
 ProductAccountancyBuyCode=Muhasebe kodu (satın alma)
 ProductAccountancySellCode=Muhasebe kodu (satış)
 ProductAccountancySellIntraCode=Muhasebe kodu (Topluluk içi satış)
-ProductAccountancySellExportCode=Muhasebe kodu (satış ihracatı)
+ProductAccountancySellExportCode=Muhasebe kodu (ihracat)
 ProductOrService=Ürün veya Hizmet
 ProductsAndServices=Ürünler ve Hizmetler
 ProductsOrServices=Ürünler veya hizmetler
@@ -46,7 +46,7 @@ MenuStocks=Stoklar
 Stocks=Ürünlerin stok durumu ve yeri (depo)
 Movements=Hareketler
 Sell=Sat
-Buy=Purchase
+Buy=Satın alma
 OnSell=Satılır
 OnBuy=Alınır
 NotOnSell=Satılmaz
@@ -61,17 +61,17 @@ ProductStatusNotOnBuyShort=Alınmaz
 UpdateVAT=KDV güncelle
 UpdateDefaultPrice=Varsayılan fiyatı güncelle
 UpdateLevelPrices=Her seviye için fiyatları güncelle
-AppliedPricesFrom=Applied from
+AppliedPricesFrom=Şu tarihten itibaren
 SellingPrice=Satış fiyatı
-SellingPriceHT=Selling price (excl. tax)
+SellingPriceHT=Satış fiyatı (KDV hariç)
 SellingPriceTTC=Satış Fiyatı (vergi dahil)
-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.
+SellingMinPriceTTC=Minimum Satış fiyatı (KDV dahil)
+CostPriceDescription=Bu fiyat alanı (KDV hariç), bu ürünün şirketinize ortalama olarak ne kadara mal olduğunu kaydetmek için kullanılabilir. Örneğin, ortalama alış fiyatı artı ortalama üretim ve dağıtım maliyeti şeklinde kendi kendinize hesapladığınız bir fiyat olabilir.
 CostPriceUsage=Bu değer margin hesaplama için kullanılabilir.
 SoldAmount=Satılan tutar
 PurchasedAmount=Satınalınan tutar
 NewPrice=Yeni fiyat
-MinPrice=Min. sell price
+MinPrice=Minimum satış fiyatı
 EditSellingPriceLabel=Satış fiyatı etiketini düzenle
 CantBeLessThanMinPrice=Satış fiyatı bu ürün için izin verilen en düşük fiyattan az olamaz (%s vergi hariç). Bu mesaj, çok fazla indirim yaparsanız da belirir.
 ContractStatusClosed=Kapalı
@@ -80,7 +80,7 @@ ErrorProductBadRefOrLabel=Referans veya etiket için yanlış değer.
 ErrorProductClone=Ürün ya da hizmetin klonlanmasına çalışılırken bir sorun oluştu.
 ErrorPriceCantBeLowerThanMinPrice=Hata, fiyat en düşük fiyattan daha düşük olamaz.
 Suppliers=Tedarikçiler
-SupplierRef=Vendor SKU
+SupplierRef=Tedarikçi Ürün Kodu
 ShowProduct=Ürün Göster
 ShowService=Hizmet göster
 ProductsAndServicesArea=Ürün ve Hizmet alanı
@@ -89,7 +89,7 @@ ServicesArea=Hizmet alanı
 ListOfStockMovements=Stok hareketleri listesi
 BuyingPrice=Alış Fiyat
 PriceForEachProduct=Özel fiyatlı ürünler
-SupplierCard=Vendor card
+SupplierCard=Tedarikçi kartı
 PriceRemoved=Fiyat kaldırıldı
 BarCode=Barkod
 BarcodeType=Barkod türü
@@ -124,15 +124,15 @@ ImportDataset_service_1=Hizmetler
 DeleteProductLine=Ürün hattı Sil
 ConfirmDeleteProductLine=Bu ürün hatını silmek istediğinizden emin misiniz?
 ProductSpecial=Özel
-QtyMin=Min. purchase quantity
+QtyMin=Minimum satın alma miktarı
 PriceQtyMin=En düşük miktar fiyatı
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+PriceQtyMinCurrency=Bu miktar için indirimsiz fiyat (para biriminde)
 VATRateForSupplierProduct=KDV oranı (bu tedarikçi/ürün için)
-DiscountQtyMin=Discount for this qty.
+DiscountQtyMin=Bu miktar için indirim.
 NoPriceDefinedForThisSupplier=Bu tedarikçi/ürün için tanımlanmış fiyat/miktar mevcut değil
 NoSupplierPriceDefinedForThisProduct=Bu ürün için tanımlanmış tedarikçi fiyatı/miktarı mevcut değil
 PredefinedProductsToSell=Önceden Tanımlanmış Ürün
-PredefinedServicesToSell=Predefined Service
+PredefinedServicesToSell=Öntanımlı Hizmet
 PredefinedProductsAndServicesToSell=Öntanımlı satılan ürünler/hizmetler
 PredefinedProductsToPurchase=Öntanımlı alınır ürünler
 PredefinedServicesToPurchase=Öntanımlı alınır servisler
@@ -157,9 +157,9 @@ BuyingPrices=Alış fiyatları
 CustomerPrices=Müşteri fiyatları
 SuppliersPrices=Tedarikçi fiyatları
 SuppliersPricesOfProductsOrServices=Tedarikçi fiyatları (ürün veya hizmetlerin)
-CustomCode=Gümrük/Emtia/G.T.İ.P Numarası
+CustomCode=G.T.İ.P Numarası
 CountryOrigin=Menşei ülke
-Nature=Ürün Türü (ilk malzeme/bitmiş)
+Nature=Ürün Türü (ham madde/bitmiş ürün)
 ShortLabel=Kısa etiket
 Unit=Birim
 p=b.
@@ -220,17 +220,17 @@ Quarter2=2. Çeyrek
 Quarter3=3. Çeyrek
 Quarter4=4. Çeyrek
 BarCodePrintsheet=Barkod yazdır
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+PageToGenerateBarCodeSheets=Bu araçla sayfalarca barkod etiketleri basabilirsiniz. Etiket sayfası biçiminizi, barkod türünü ve barkod değerini seçin ve sonra <b>%s</b> düğmesine tıklayın.
 NumberOfStickers=Bir sayfada yazdırılacak etiket sayısı
 PrintsheetForOneBarCode=Bir barkod için birçok etiket yazdır
 BuildPageToPrint=Yazdırılacak sayfa oluştur
 FillBarCodeTypeAndValueManually=Barkod türünü girin ve el ile değer yazın.
 FillBarCodeTypeAndValueFromProduct=Barkod türünü girin ve ürün barkodundan değer girin.
 FillBarCodeTypeAndValueFromThirdParty=Barkod türü ve üçüncü taraf barkodundan değer girin
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
-BarCodeDataForProduct=Barcode information of product %s:
-BarCodeDataForThirdparty=Barcode information of third party %s:
+DefinitionOfBarCodeForProductNotComplete=%s ürünü için barkod türü veya değerinin tanımlanması yapılmamış.
+DefinitionOfBarCodeForThirdpartyNotComplete=%s üçüncü partisi için barkod türü veya değerinin tanımlanması yapılmamış.
+BarCodeDataForProduct=%s ürününün barkod bilgisi: 
+BarCodeDataForThirdparty=%s üçüncü partisinin barkod bilgisi:
 ResetBarcodeForAllRecords=Bütün kayıtlar için barkod değeri tanımla (bu işlem halihazırda yeni değerler tanımlanmış barkod değerlerini sıfırlayacaktır)
 PriceByCustomer=Her müşteri için farklı fiyatlar
 PriceCatalogue=Her ürün/hizmet için tek bir satış fiyatı
@@ -239,13 +239,13 @@ AddCustomerPrice=Müşteriye göre fiyat ekle
 ForceUpdateChildPriceSoc=Müşterinin ortaklılarına aynı fiyatı uygula
 PriceByCustomerLog=Önceki müşteri fiyatları kayıtı
 MinimumPriceLimit=En düşük fiyat bundan düşük olamaz %s
-MinimumRecommendedPrice=Minimum recommended price is: %s
+MinimumRecommendedPrice=Önerilen en düşük fiyat: %s
 PriceExpressionEditor=Fiyat ifadesi düzenleyici
 PriceExpressionSelected=Seçili fiyat ifadesi
 PriceExpressionEditorHelp1=Fiyat ayarlaması için "fiyat = 2 + 2" ya da "2 + 2". Terimleri ayırmak için ; kullan
 PriceExpressionEditorHelp2=ExtraFields e şu gibi değişkenlerle erişebilirsiniz <b>#extrafield_myextrafieldkey#</b> ve şunlara sahip genel değişkenlerle <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp3=Hem ürün/hizmet hem de tedarikçi fiyatlarında şu değişkenler bulunmaktadır: <br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=Şu sadece ürün/hizmet fiyatında bulunmaktadır: <b>#supplier_min_price#</b><br>Şunlar ise sadece tedarikçi fiyatında bulunmaktadır: <b>#supplier_quantity# and #supplier_tva_tx#</b>
 PriceExpressionEditorHelp5=Uygun genel değerler:
 PriceMode=Fiyat biçimi
 PriceNumeric=Sayı
@@ -255,12 +255,12 @@ ComposedProduct=Alt ürün
 MinSupplierPrice=Enaz alış fiyatı
 MinCustomerPrice=Minimum satış fiyatı
 DynamicPriceConfiguration=Dinamik fiyat yapılandırması
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+DynamicPriceDesc=Müşteri veya Tedarikçi fiyatlarını hesaplamak için matematiksel formüller tanımlayabilirsiniz. Bu formüller tüm matematiksel operatörleri, bazı sabitleri ve değişkenleri kullanabilir. Burada kullanmak istediğiniz değişkenleri tanımayabilirsiniz. Eğer değişkenin otomatik olarak güncellenmesi gerekiyorsa, Dolibarr'ın bu değeri otomatik olarak güncellemesini sağlamak için harici URL tanımlayabilirsiniz.
 AddVariable=Değişken ekle
 AddUpdater=Güncellemeci ekle
 GlobalVariables=Genel değişkenler
 VariableToUpdate=Güncellenecek değişken
-GlobalVariableUpdaters=Genel değişkenler güncelleyicisi
+GlobalVariableUpdaters=Değişkenler için dış güncelleyiciler
 GlobalVariableUpdaterType0=JSON verisi
 GlobalVariableUpdaterHelp0=Belirtilen URL'den JSON verilerini ayrıştırır, DEĞER ilgili değerin yerini belirtir,
 GlobalVariableUpdaterHelpFormat0=İstek için format {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"} şeklindedir
@@ -278,7 +278,7 @@ WarningSelectOneDocument=Lütfen enaz bir belge seçin
 DefaultUnitToShow=Birim
 NbOfQtyInProposals=Teklifteki Mik
 ClinkOnALinkOfColumn=Ayrıntılı görüntüsünü almak istediğiniz %s sütunundaki bağlantıya tıklayın...
-ProductsOrServicesTranslations=Products/Services translations
+ProductsOrServicesTranslations=Ürün/Hizmet çevirileri
 TranslatedLabel=Çevrilmiş etiket
 TranslatedDescription=Çevirilmiş açıklama
 TranslatedNote=çevirilmiş notlar
@@ -294,15 +294,15 @@ ProductSheet=Ürün belgesi
 ServiceSheet=Hizmet belgesi
 PossibleValues=Olası değerler
 GoOnMenuToCreateVairants=Nitelik varyantlarını hazırlamak için (renk, boyut gibi...) %s - %smenüsüne gidin
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
-ProductSupplierDescription=Vendor description for the product
+UseProductFournDesc=Müşterilere yönelik açıklamalara ek olarak, tedarikçiler tarafından belirlenen ürün açıklamalarını tanımlamak için bir özellik ekleyin
+ProductSupplierDescription=Ürün için tedarikçi açıklaması
 #Attributes
 VariantAttributes=Değişken öznitelikleri
 ProductAttributes=Ürünler için değişken öznitelikleri
 ProductAttributeName=Değişken özniteliği %s
 ProductAttribute=Değişken özniteliği
 ProductAttributeDeleteDialog=Bu özniteliği silmek istediğinizden min misiniz? Tüm değerler silinecektir.
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
+ProductAttributeValueDeleteDialog=Bu niteliğin "%s" değerini ("%s" referanslı) silmek istediğinize emin misiniz?
 ProductCombinationDeleteDialog="<strong>%s</strong>"ürününün varyantını silmek istediğinizden emin misiniz?
 ProductCombinationAlreadyUsed=Varyantı silirken bir hata oluştu. Lütfen herhangi bir nesnede kullanılmadığını kontrol edin
 ProductCombinations=Değişkenler
@@ -332,10 +332,11 @@ NbProducts=Ürün sayısı
 ParentProduct=Ana ürün
 HideChildProducts=Değişken ürünleri sakla
 ShowChildProducts=Varyant ürünlerini göster
-NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+NoEditVariants=Ana ürün kartına gidin ve değişkenler sekmesinden değişkenin fiyata olan etkisini düzenleyin
 ConfirmCloneProductCombinations=Tüm ürün varyantlarını verilen referans ile diğer ana ürüne kopyalamak ister misiniz?
 CloneDestinationReference=Hedef ürün referansı
 ErrorCopyProductCombinations=Ürün varyasyonlarını kopyalanırken bir hata oluştu
 ErrorDestinationProductNotFound=Hedef ürün bulunamadı
 ErrorProductCombinationNotFound=Ürün değişkeni bulunamadı
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ActionAvailableOnVariantProductOnly=Eylem yalnızca ürün değişkeninde mevcuttur
+ProductsPricePerCustomer=Müşteri başına ürün fiyatları
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 1bf8c489529..a43fc30fa69 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Harcanan süre
 TimeSpentByYou=Tarafınızdan harcanan süre
 TimeSpentByUser=Kullanıcı tarafından harcanan süre
 TimesSpent=Harcanan süre
-RefTask=Görev ref.
-LabelTask=Görev etiketi
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Göreve harcanan süre
 TaskTimeUser=Kullanıcı
 TaskTimeNote=Not
@@ -83,15 +84,15 @@ GoToListOfTasks=Görevler listesine git
 GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
-ListOrdersAssociatedProject=List of sales orders related to the project
+ListOrdersAssociatedProject=Proje ile ilgili müşteri siparişlerinin listesi
 ListInvoicesAssociatedProject=Proje ile ilgili müşteri faturalarının listesi
 ListPredefinedInvoicesAssociatedProject=Proje ile ilgili müşteri şablon faturalarının listesi
-ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
+ListSupplierOrdersAssociatedProject=Proje ile ilgili tedarikçi siparişlerinin listesi
 ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
 ListContractAssociatedProject=Proje ile ilgili sözleşmelerin listesi
 ListShippingAssociatedProject=List of shippings related to the project
 ListFichinterAssociatedProject=Proje ile ilgili müdahalelerin listesi
-ListExpenseReportsAssociatedProject=List of expense reports related to the project
+ListExpenseReportsAssociatedProject=Projeyle ilgili gider raporlarının listesi
 ListDonationsAssociatedProject=List of donations related to the project
 ListVariousPaymentsAssociatedProject=Proje ile ilgili çeşitli ödemeler listesi
 ListSalariesAssociatedProject=List of payments of salaries related to the project
@@ -138,13 +139,13 @@ CloneContacts=Kişi klonla
 CloneNotes=Not klonla
 CloneProjectFiles=Birleşik proje dosyalarını kopyala
 CloneTaskFiles=Birleşik görev(ler) dosyalarını kopyala (görev(ler) kopyalanmışsa)
-CloneMoveDate=Update project/tasks dates from now?
+CloneMoveDate=Proje/görev tarihleri şu andan itibaren güncellensin mi?
 ConfirmCloneProject=Bu projeyi kopyalamak istediğinizden emin misiniz?
 ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Görev tarihini yeni proje başlama tarihine göre kaydırmak olası değil
 ProjectsAndTasksLines=Projeler ve görevler
 ProjectCreatedInDolibarr=%s projesi oluşturuldu
-ProjectValidatedInDolibarr=Project %s validated
+ProjectValidatedInDolibarr=%s projesi onaylandı
 ProjectModifiedInDolibarr=Proje %s değiştirildi
 TaskCreatedInDolibarr=%s görev oluşturuldu
 TaskModifiedInDolibarr=%s görev değiştirildi
@@ -180,7 +181,7 @@ ProjectMustBeValidatedFirst=Projeler önce doğrulanmalıdır
 FirstAddRessourceToAllocateTime=Zaman tahsisi için göreve bir kullanıcı kaynağı ilişkilendir
 InputPerDay=Günlük giriş
 InputPerWeek=Haftalık giriş
-InputDetail=Input detail
+InputDetail=Giriş detayı
 TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=İlgili olarak bu kullanıcı olan projeler
 TasksWithThisUserAsContact=Bu kullanıcıya atanmış görevler
@@ -224,13 +225,13 @@ OppStatusLOST=Kayıp
 Budget=Bütçe
 AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
 LatestProjects=Son %s proje
-LatestModifiedProjects=Latest %s modified projects
+LatestModifiedProjects=Değiştirilen son %s proje
 OtherFilteredTasks=Diğer filtrelenmiş görevler
 NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
 ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
 # Comments trans
 AllowCommentOnTask=Görevlere kullanıcı yorumlarına izin ver
-AllowCommentOnProject=Allow user comments on projects
+AllowCommentOnProject=Projelerde kullanıcı yorumlarına izin ver
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
@@ -239,7 +240,7 @@ ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to
 NewTaskRefSuggested=Task ref already used, a new task ref is required
 TimeSpentInvoiced=Time spent billed
 TimeSpentForInvoice=Harcanan süre
-OneLinePerUser=One line per user
+OneLinePerUser=Kullanıcı başına bir satır
 ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
index f26278ece1c..c5cc5b1a2d8 100644
--- a/htdocs/langs/tr_TR/propal.lang
+++ b/htdocs/langs/tr_TR/propal.lang
@@ -22,7 +22,7 @@ SearchAProposal=Teklif ara
 NoProposal=Teklif yok
 ProposalsStatistics=Teklif istatistikleri
 NumberOfProposalsByMonth=Aylara göre sayısı
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+AmountOfProposalsByMonthHT=Aylık tutar (KDV hariç)
 NbOfProposals=Teklif sayısı
 ShowPropal=Teklif göster
 PropalsDraft=Taslaklar
@@ -82,4 +82,4 @@ DefaultModelPropalCreate=Varsayılan model oluşturma
 DefaultModelPropalToBill=Bir teklifi kapatma sırasında varsayılan şablon (faturalanacak)
 DefaultModelPropalClosed=Bir teklifi kapatma sırasında varsayılan şablon (faturalanmamış)
 ProposalCustomerSignature=Yazılı kabul, firma kaşesi, tarih ve imza
-ProposalsStatisticsSuppliers=Vendor proposals statistics
+ProposalsStatisticsSuppliers=Tedarikçi teklifi istatistikleri
diff --git a/htdocs/langs/tr_TR/salaries.lang b/htdocs/langs/tr_TR/salaries.lang
index aaab59f1b7e..ee0da272fdd 100644
--- a/htdocs/langs/tr_TR/salaries.lang
+++ b/htdocs/langs/tr_TR/salaries.lang
@@ -1,18 +1,19 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Kullanıcı üçüncü tarafları için kullanılan muhasebe hesabı
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accouting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Ücret ödemeleri için varsayılan muhasebe hesabı
 Salary=Ücret
 Salaries=Ücretler
 NewSalaryPayment=Yeni ücret ödemesi
+AddSalaryPayment=Maaş ödemesi ekle
 SalaryPayment=Ücret ödemesi
 SalariesPayments=Ücret ödemeleri
 ShowSalaryPayment=Ücret ödemesi göster
 THM=Ortalama saat ücreti
 TJM=Ortalama günlük ücret
 CurrentSalary=Güncel maaş
-THMDescription=Bu değer, eğer proje modülü kullanılıyorsa kullanıcılar tarafından girilen bir projede tüketilen sürenin maliyetinin hesaplanması için kullanılır
-TJMDescription=Bu değer yalnızca bilgi amaçlı olup hiçbir hesaplamada kulanılmaz
+THMDescription=Bu değer, eğer Proje modülü kullanılıyorsa kullanıcılar tarafından girilen bir projede harcanan zamanın maliyetini hesaplamak için kullanılabilir
+TJMDescription=Bu değer şu anda yalnızca bilgi amaçlıdır ve herhangi bir hesaplama için kullanılmaz
 LastSalaries=Son %s maaş ödemeleri
 AllSalaries=Tüm maaş ödemeleri
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Maaş istatistikleri
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index 19adab408d7..e8f380be909 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -18,7 +18,7 @@ SendingCard=Sevkiyat kartı
 NewSending=Yeni sevkiyat
 CreateShipment=Sevkiyat oluştur
 QtyShipped=Sevkedilen mikt.
-QtyShippedShort=Qty ship.
+QtyShippedShort=Sevk edilen miktar
 QtyPreparedOrShipped=Hazırlanan veya gönderilen miktar
 QtyToShip=Sevk edilecek mikt.
 QtyReceived=Alınan mikt.
@@ -46,16 +46,16 @@ DateDeliveryPlanned=Teslimat için planlanan tarih
 RefDeliveryReceipt=Teslimat makbuzu referansı
 StatusReceipt=Status delivery receipt
 DateReceived=Teslim alınan tarih
-SendShippingByEMail=Sevkiyatı EPostayla gönder
+SendShippingByEMail=Sevkiyatı  e-posta ile gönder
 SendShippingRef=% Nakliyatının yapılması
 ActionsOnShipping=Sevkiyat etkinlikleri
 LinkToTrackYourPackage=Paketinizi izleyeceğiniz bağlantı
 ShipmentCreationIsDoneFromOrder=Şu an için, yeni bir sevkiyatın oluşturulması sipariş kartından yapılmıştır.
 ShipmentLine=Sevkiyat kalemi
-ProductQtyInCustomersOrdersRunning=Product quantity into open customer orders
-ProductQtyInSuppliersOrdersRunning=Açık satın alma siparişlerindeki ürün miktarı
-ProductQtyInShipmentAlreadySent=Product quantity from open customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open supplier order already received
+ProductQtyInCustomersOrdersRunning=Açık müşteri siparişlerindeki ürün miktarı
+ProductQtyInSuppliersOrdersRunning=Açık tedarikçi siparişlerindeki ürün miktarı
+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=Ağırlık/Hac.
 ValidateOrderFirstBeforeShipment=Sevkiyatları yapabilmek için önce siparişi doğrulamlısınız.
@@ -69,4 +69,4 @@ SumOfProductWeights=Ürün ağırlıkları toplamı
 
 # warehouse details
 DetailWarehouseNumber= Depo ayrıntıları
-DetailWarehouseFormat= Ağ:%s (Mik : %d)
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/tr_TR/sms.lang b/htdocs/langs/tr_TR/sms.lang
index 21badfbe3f0..9dafdd15471 100644
--- a/htdocs/langs/tr_TR/sms.lang
+++ b/htdocs/langs/tr_TR/sms.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - sms
 Sms=Sms
-SmsSetup=SMS setup
-SmsDesc=This page allows you to define global options on SMS features
+SmsSetup=SMS kurulumu
+SmsDesc=Bu sayfa SMS özellikleri için genel seçenekleri tanımlamanıza imkan sağlar
 SmsCard=SMS Kartı
 AllSms=Tüm SMS kampanyaları
 SmsTargets=Hedefler
@@ -44,7 +44,7 @@ NbOfSms=Telefon numarası sayısı
 ThisIsATestMessage=Bu bir test mesajıdır
 SendSms=SMS gönder
 SmsInfoCharRemain=Kalan karakter sayısı
-SmsInfoNumero= (uluslararası format, örn : +33899701761)
+SmsInfoNumero= (uluslararası format, örn.: +33899701761)
 DelayBeforeSending=Gönderimden önceki süre (Dakika)
 SmsNoPossibleSenderFound=Gönderen yok. SMS sağlayıcınızın ayarlarını denetleyin.
 SmsNoPossibleRecipientFound=Hedef yok. SMS sağlayıcı kurulumu kontrol edin.
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 0acac9b844e..52fb1fbdf94 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Depo kartı
 Warehouse=Depo
 Warehouses=Depolar
 ParentWarehouse=Ana depo
-NewWarehouse=Yeni depo / Stok alanı
+NewWarehouse=Yeni depo / Stok Konumu
 WarehouseEdit=Depo değiştir
 MenuNewWarehouse=Yeni depo
 WarehouseSource=Kaynak depo
@@ -24,11 +24,13 @@ Movements=Hareketler
 ErrorWarehouseRefRequired=Depo referans adı gereklidir
 ListOfWarehouses=Depo listesi
 ListOfStockMovements=Stok hareketleri listesi
-ListOfInventories=List of inventories
-MovementId=Movement ID
+ListOfInventories=Envanter listesi
+MovementId=Hareket ID'si
 StockMovementForId=Eylem ID'si %d
-ListMouvementStockProject=List of stock movements associated to project
+ListMouvementStockProject=Projeyle ilişkili stok hareketlerinin listesi
 StocksArea=Depo alanı
+AllWarehouses=Tüm depolar
+IncludeAlsoDraftOrders=Taslak siparişleri de dahil et
 Location=Konum
 LocationSummary=Kısa konum adı
 NumberOfDifferentProducts=Farklı ürün sayısı
@@ -53,34 +55,34 @@ PMPValue=Ağırlıklı ortalama fiyat
 PMPValueShort=AOF
 EnhancedValueOfWarehouses=Depolar değeri
 UserWarehouseAutoCreate=Kullanıcı oluştururken otomatik olarak bir kullanıcı deposu yarat
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independent
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Ürün stoğu ve alt ürün stoğu bağımsızdır
 QtyDispatched=Sevkedilen miktar
 QtyDispatchedShort=Dağıtılan mik
 QtyToDispatchShort=Dağıtılacak mik
 OrderDispatch=Öğe makbuzları
 RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
 RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
-DeStockOnValidateOrder=Decrease real stocks on validation of customer order
+DeStockOnBill=Müşteri faturası/alacak dekontunun doğrulanması ile ilgili gerçek stokları azalt
+DeStockOnValidateOrder=Satış siparişinin doğrulanması ile ilgili gerçek stokları azalt
 DeStockOnShipment=Sevkiyatın onaylanmasıyla gerçek stoku eksilt
 DeStockOnShipmentOnClosing=Sevkiyatın kapalı olarak sınıflandırılmasıyla gerçek stoğu eksilt
-ReStockOnBill=Increase real stocks on validation of supplier invoice/credit note
-ReStockOnValidateOrder=Increase real stocks on purchase order approval
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after supplier order receipt of goods
+ReStockOnBill=Tedarikçi faturası/alacak dekontunun doğrulanması ile ilgili gerçek stokları arttır
+ReStockOnValidateOrder=Tedarikçi siparişinin doğrulanması ile gerçek stokları arttır
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
 OrderStatusNotReadyToDispatch=Sipariş henüz yoksa veya stok deposundan gönderime izin veren bir durum varsa.
 StockDiffPhysicTeoric=Fiziki ve sanal stok arasındaki farkın açıklaması
 NoPredefinedProductToDispatch=Bu nesne için önceden tanımlanmış ürünlenyok. Yani stoktan sevk gerekli değildir.
 DispatchVerb=Dağıtım
 StockLimitShort=Uyarı sınırı
 StockLimit=Stok sınırı uyarısı
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Fiziksel stok
+StockLimitDesc=(Boş) bırakılması uyarı olmadığı anlamına gelir.<br>0 girilmesi ise stok tükenir tükenmez bir uyarı oluşturmak için kullanılabilir.
+PhysicalStock=Fiziki Stok
 RealStock=Gerçek Stok
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Fiziksel/gerçek stok, şu anda depolardaki mevcut olan stoktur.
+RealStockWillAutomaticallyWhen=Gerçek stok bu kurala göre değiştirilecektir (Stok modulünde tanımlandığı gibi):
 VirtualStock=Sanal stok
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Sanal stok, stokları etkileyen tüm açık/beklemede olan eylemlerin (teslim alınan tedarikçi siparişleri, sevk edilen müşteri siparişleri vb.) kapatılmasıyla hesaplanan mevcut stoktur
 IdWarehouse=Depo No
 DescWareHouse=Depo açıklaması
 LieuWareHouse=Depo konumlandırma
@@ -100,7 +102,7 @@ ThisWarehouseIsPersonalStock=Bu depo %s %s kişisel stoğu temsil eder
 SelectWarehouseForStockDecrease=Stok azaltılması için kullanmak üzere depo seçin
 SelectWarehouseForStockIncrease=Stok artışı için kullanılacak depo seçin
 NoStockAction=Stok işlemi yok
-DesiredStock=İstenen en uygun stok
+DesiredStock=İstenilen Stok Miktarı
 DesiredStockDesc=Bu stok tutarı tamamlama özelliği tarafından stoğu tamamlamak üzere kullanılacak
 StockToBuy=Sipariş edilecek
 Replenishment=İkmal
@@ -113,13 +115,13 @@ CurentSelectionMode=Geçerli seçim modu
 CurentlyUsingVirtualStock=Sanal stok
 CurentlyUsingPhysicalStock=Fiziksel stok
 RuleForStockReplenishment=Stok ikmal kuralı
-SelectProductWithNotNullQty=Enaz bir tane mik boş olmayan bir ürün ve tedarikçi seçin
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Yalnızca uyarılar
 WarehouseForStockDecrease=<b>%s</b> deposu stok eksiltme için kullanılacaktır
 WarehouseForStockIncrease=<b>%s</b> deposu stok arttırma için kullanılacaktır
 ForThisWarehouse=Bu depo için
-ReplenishmentStatusDesc=Bu, istenen stoktan az stoklu bütün ürünlerin bir listesidir (ya da eğer "yalnızca uyarı" onay kutusu işaretliyse uyarı seviyesinden az olanlar). Onay kutusunu kullanarak farkı tamamlamak için tedarikçi siparişleri oluşturabilirsiniz.
-ReplenishmentOrdersDesc=Bu, öntanımlı ürünleri içeren tüm açık tedarikçi siparişlerinin bir listesidir. Yalnızca öntanımlı ürünlü açık siparişler burada görünür, yani stokları etkileyen siparişler.
+ReplenishmentStatusDesc=Bu liste, stok durumu istenen stoktan daha düşük olan tüm ürünleri içerir (veya eğer "sadece uyarı" onay kutusu işaretlenmişse uyarı değerinden daha düşük olan ürünler). Onay kutusunu kullanarak farkı kapatmak için tedarikçi siparişleri oluşturabilirsiniz.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=İkmal
 NbOfProductBeforePeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) önceki miktarıdır
 NbOfProductAfterPeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) sonraki miktarıdır
@@ -133,21 +135,21 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Hareket etiketi
-TypeMovement=Type of movement
-DateMovement=Date of movement
+TypeMovement=Hareket türü
+DateMovement=Hareket tarihi
 InventoryCode=Hareket veya stok kodu
 IsInPackage=Pakette içerilir
 WarehouseAllowNegativeTransfer=Stok eksi olabilir
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferIsNotEnough=Kaynak deponuzda yeterli stok bulunmuyor ve kurulumunuz negatif stoklara izin vermiyor.
 ShowWarehouse=Depo göster
 MovementCorrectStock=Stok düzeltme yapılacak ürün %s
 MovementTransferStock=%s ürününün başka bir depoya stok aktarılması
 InventoryCodeShort=Inv./Mov. kodu
-NoPendingReceptionOnSupplierOrder=Açık tedarikçi siparişlerinde bekleyen kabul yok
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=Bu parti/seri numarası (<strong>%s</strong>) zaten var fakat farklı tüketme ya da satma tarihli bulundu (<strong>%s</strong> ama sizin girdiğiniz bu <strong>%s</strong>).
 OpenAll=Bütün işlemler için açık
 OpenInternal=Yalnızca iç eylemler için aç
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -163,7 +165,7 @@ inventoryWritePermission=Envanteri güncelle
 inventoryValidatePermission=Envanteri doğrula
 inventoryTitle=Envanter
 inventoryListTitle=Envanterler
-inventoryListEmpty=No inventory in progress
+inventoryListEmpty=Devam eden envanter yok
 inventoryCreateDelete=Envanteri Oluştur/Sil
 inventoryCreate=Yeni oluşturun
 inventoryEdit=Düzenle
@@ -172,15 +174,15 @@ inventoryDraft=Yürürlükte
 inventorySelectWarehouse=Depo seçimi
 inventoryConfirmCreate=Oluştur
 inventoryOfWarehouse=Depo için envanter: %s
-inventoryErrorQtyAdd=Error : one quantity is less than zero
-inventoryMvtStock=By inventory
+inventoryErrorQtyAdd=Hata: bir miktar sıfırdan az
+inventoryMvtStock=Envantere göre
 inventoryWarningProductAlreadyExists=Bu ürün listede zaten var
 SelectCategory=Kategori süzgeçi
 SelectFournisseur=Tedarikçi filtresi
 inventoryOnDate=Envanter
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Hiçbir son alış fiyatı mevcut değilse alış fiyatını kullan
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Stoksız ürün ekleme
@@ -190,7 +192,7 @@ LastPA=Last BP
 CurrentPA=Curent BP
 RealQty=Gerçek Miktar
 RealValue=Gerçek Değer
-RegulatedQty=Regulated Qty
+RegulatedQty=Düzenlenmiş Adet
 AddInventoryProduct=Ürünü envantere ekle
 AddProduct=Ekle
 ApplyPMP=Apply PMP
@@ -201,10 +203,10 @@ ExitEditMode=Exit edition
 inventoryDeleteLine=Satır sil
 RegulateStock=Stoğu Düzenle
 ListInventory=Liste
-StockSupportServices=Stock management supports Services
-StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+StockSupportServices=Stok yönetimi Hizmetleri destekler
+StockSupportServicesDesc=Varsayılan olarak sadece "ürün" türündeki ürünleri stoklandırabilirsiniz. Eğer Hizmetler modülü ve bu opsiyon etkinleştirilmişse "hizmet" türündeki ürünleri de stoklandırabilirsiniz.
 ReceiveProducts=Receive items
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
-StockIncrease=Stock increase
-StockDecrease=Stock decrease
+StockIncreaseAfterCorrectTransfer=Düzeltme/aktarma ile arttırın
+StockDecreaseAfterCorrectTransfer=Düzeltme/aktarma ile azaltın
+StockIncrease=Stok artışı
+StockDecrease=Stok azalması
diff --git a/htdocs/langs/tr_TR/stripe.lang b/htdocs/langs/tr_TR/stripe.lang
index 38b0bc87921..a3c26c4b346 100644
--- a/htdocs/langs/tr_TR/stripe.lang
+++ b/htdocs/langs/tr_TR/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe modülü kurulumu
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Kredi kartı veya Stripe ile ödeme yapın
 FollowingUrlAreAvailableToMakePayments=Aşağıdaki URL'ler bir müşteriye Dolibarr nesnelerine bir ödeme yapmak için bir sayfa sunmak için kullanılabilir
 PaymentForm=Ödeme Formu
@@ -9,14 +9,14 @@ ThisScreenAllowsYouToPay=Bu ekran %s için çevrimiçi bir ödeme yapmanızı sa
 ThisIsInformationOnPayment=Bu yapılacak ödeme hakkında bilgidir
 ToComplete=Tamamlanacak
 YourEMail=Ödeme alındısı onayı için e-posta adresi
-STRIPE_PAYONLINE_SENDEMAIL=Bir ödemeden sonra uyarı Epostası (başarılı ya da değil)
+STRIPE_PAYONLINE_SENDEMAIL=Bir ödeme denemesinden sonra e-posta bildirimi (başarılı veya başarısız)
 Creditor=Alacaklı
 PaymentCode=Ödeme kodu
-StripeDoPayment=Kredi Kartı veya Bankamatik Kartıyla Öde (Stripe)
+StripeDoPayment=Stripe ile Öde
 YouWillBeRedirectedOnStripe=Kredi kartı bilgilerini girmek için güvenli Stripe sayfasında yönlendirileceksiniz
 Continue=Sonraki
 ToOfferALinkForOnlinePayment=%s Ödemesi için URL
-ToOfferALinkForOnlinePaymentOnOrder=Bir müşteri siparişi için çevrimiçi %s ödemesi kullanıcı arayüzü sunan URL
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=Bir müşteri faturası için çevrimiçi %s ödemesi kullanıcı arayüzü sunan URL
 ToOfferALinkForOnlinePaymentOnContractLine=Bir sözleşme satırı için çevrimiçi %s ödemesi kullanıcı arayüzü sunan URL
 ToOfferALinkForOnlinePaymentOnFreeAmount=Bir serbest ödeme için çevrimiçi %s ödemesi kullanıcı arayüzü sunan URL
@@ -40,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe canlı etkin (aksi takdirde test/sanal alan modu)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -49,16 +49,19 @@ StripeAccount=Stripe hesabı
 StripeChargeList=List of Stripe charges
 StripeTransactionList=List of Stripe transactions
 StripeCustomerId=Stripe müşteri kimliği
-StripePaymentModes=Stripe payment modes
+StripePaymentModes=Stripe ödeme türleri
 LocalID=Local ID
 StripeID=Stripe Kimliği
-NameOnCard=Name on card
+NameOnCard=Karttaki isim
 CardNumber=Kart Numarası
-ExpiryDate=Expiry Date
+ExpiryDate=Son Kullanma Tarihi
 CVN=CVN
 DeleteACard=Kartı Sil
 ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
-StripeUserAccountForActions=User account to use for some emails notification of Stripe events (Stripe payouts)
+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)
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
index 0a9f5f5a512..517b616d391 100644
--- a/htdocs/langs/tr_TR/suppliers.lang
+++ b/htdocs/langs/tr_TR/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Tedarikçiler
 SuppliersInvoice=Tedarikçi faturası
 ShowSupplierInvoice=Tedarikçi Faturası Göster
@@ -15,7 +15,7 @@ SomeSubProductHaveNoPrices=Bazı altürünlerin fiyatı yok
 AddSupplierPrice=Alış fiyatı ekle
 ChangeSupplierPrice=Alış fiyatı değiştir
 SupplierPrices=Tedarikçi fiyatları
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Bu referanslı tedarikçi zaten bu referans ile ilişkili: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Bu tedarikçi referansı zaten bir ürünle ilişkilendirilmiş: %s
 NoRecordedSuppliers=Hiçbir tedarikçi kaydı yok
 SupplierPayment=Tedarikçi ödemesi
 SuppliersArea=Tedarikçi alanı
@@ -23,25 +23,25 @@ RefSupplierShort=Referans tedarikçi
 Availability=Uygunluğu
 ExportDataset_fournisseur_1=Tedarikçi faturaları ve fatura detayları
 ExportDataset_fournisseur_2=Tedarikçi faturaları ve ödemeleri
-ExportDataset_fournisseur_3=Satın alma siparişleri ve sipariş detayları
+ExportDataset_fournisseur_3=Tedarikçi siparişleri ve sipariş detayları
 ApproveThisOrder=Bu siparişi onayla
 ConfirmApproveThisOrder=Siparişi uygun bulmak istediğinizden emin misiniz <b>%s</b>?
 DenyingThisOrder=Bu siparişi reddet
 ConfirmDenyingThisOrder=Bu siparişi reddetmek istediğinizden emin misiniz <b>%s</b>?
 ConfirmCancelThisOrder=Bu siparişi iptal etmek istediğinizden emin misiniz <b>%s</b>?
-AddSupplierOrder=Satınalma Siparişi Oluştur
+AddSupplierOrder=Tedarikçi Siparişi Oluştur
 AddSupplierInvoice=Tedarikçi faturası oluştur
 ListOfSupplierProductForSupplier=<b>%s</b> tedarikçisi için ürün ve fiyat listesi
 SentToSuppliers=Tedarikçilere gönderilen
-ListOfSupplierOrders=Satın alma siparişlerinin listesi
-MenuOrdersSupplierToBill=Faturalanacak satın alma siparişleri
-NbDaysToDelivery=Gün olarak teslim süresi
-DescNbDaysToDelivery=Bu siparişteki en büyük teslimat gecikmesi olan ürünler
+ListOfSupplierOrders=Tedarikçi siparişlerinin listesi
+MenuOrdersSupplierToBill=Faturalanacak tedarikçi siparişleri
+NbDaysToDelivery=Teslimat gecikmesi (gün)
+DescNbDaysToDelivery=Bu siparişteki ürünlerin en uzun teslimat gecikmesi
 SupplierReputation=Tedarikçi itibarı
 DoNotOrderThisProductToThisSupplier=Sipariş verme
-NotTheGoodQualitySupplier=Hatalı kalite
+NotTheGoodQualitySupplier=Düşük kalite
 ReputationForThisProduct=İtibar
 BuyerName=Alıcı adı
 AllProductServicePrices=Tüm ürün/hizmet fiyatları
-AllProductReferencesOfSupplier=Tüm tedarikçi ürün/hizmet referansları
+AllProductReferencesOfSupplier=Bu tedarikçinin tüm ürün/hizmet referansları
 BuyingPriceNumShort=Tedarikçi fiyatları
diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
index fc99b405c1e..03783401b6c 100644
--- a/htdocs/langs/tr_TR/trips.lang
+++ b/htdocs/langs/tr_TR/trips.lang
@@ -73,7 +73,7 @@ EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
 DefaultCategoryCar=Varsayılan taşıma modu
 DefaultRangeNumber=Varsayılan aralık numarası
-UploadANewFileNow=Upload a new document now
+UploadANewFileNow=Şimdi yeni bir belge yükle
 Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
 ErrorDoubleDeclaration=Benzer bir tarih aralığı için başka bir gider raporu bildirdiniz.
 AucuneLigne=Bildirilen hiç gider raporu yok
@@ -124,7 +124,7 @@ expenseReportCatDisabled=Kategori devre dışı - c_exp_tax_cat sözlüğüne b
 expenseReportRangeDisabled=Aralık devre dışı - c_exp_tax_range sözlüğüne bakın
 expenseReportPrintExample=offset + (d x coef) = %s
 ExpenseReportApplyTo=Apply to
-ExpenseReportDomain=Domain to apply
+ExpenseReportDomain=Uygulanacak etki alanı
 ExpenseReportLimitOn=Limit on
 ExpenseReportDateStart=Başlama tarihi
 ExpenseReportDateEnd=Bitiş tarihi
@@ -145,7 +145,7 @@ nolimitbyEX_DAY=by day (no limitation)
 nolimitbyEX_MON=by month (no limitation)
 nolimitbyEX_YEA=by year (no limitation)
 nolimitbyEX_EXP=by line (no limitation)
-CarCategory=Category of car
+CarCategory=Otomobilin kategorisi
 ExpenseRangeOffset=Offset amount: %s
-RangeIk=Mileage range
-AttachTheNewLineToTheDocument=Attach the new line to an existing document
+RangeIk=Kilometre aralığı
+AttachTheNewLineToTheDocument=Satırı yüklenen bir belgeye ekleyin
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index ada2bcde19d..21feef75fa1 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Şifre buna değiştirildi: %s
 SubjectNewPassword=%s için yeni parolanız
 GroupRights=Grup izinleri
 UserRights=Kullanıcı izinleri
-UserGUISetup=User Display Setup
+UserGUISetup=Kullanıcı Ekranı Ayarları
 DisableUser=Engelle
 DisableAUser=Bir kullanıcıyı engelle
 DeleteUser=Sil
@@ -34,8 +34,8 @@ ListOfUsers=Kullanıcı listesi
 SuperAdministrator=Süper Yönetici
 SuperAdministratorDesc=Yöneticinin tüm hakları
 AdministratorDesc=Yönetici
-DefaultRights=Default Permissions
-DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
+DefaultRights=Varsayılan İzinler
+DefaultRightsDesc=Burada, <u>yeni</u> bir kullanıcıya otomatik olarak verilen <u>varsayılan</u> izinleri tanımlayın (mevcut kullanıcıların izinlerini değiştirmek için kullanıcının kartına gidin).
 DolibarrUsers=Dolibarr kullanıcıları
 LastName=Soyadı
 FirstName=Adı
@@ -69,8 +69,8 @@ InternalUser=İç kullanıcı
 ExportDataset_user_1=Kullanıcılar ve özellikleri
 DomainUser=Etki alanı kullanıcısı %s
 Reactivate=Yeniden etkinleştir
-CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=Bu form, şirketiniz/kuruluşunuz içinde bir iç kullanıcı oluşturmanıza olanak tanır. Bir dış kullanıcı oluşturmak için (müşteri, tedarikçi, vb ...), üçüncü parti kişi kartından 'Dolibarr Kullanıcısı Oluştur' butonunu kullanın.
+InternalExternalDesc=Bir <b>İç</b> kullanıcı, şirketinizin/kuruluşunuzun parçası olan bir kullanıcıdır.<br>Bir <b>Dış</b> kullanıcı ise, müşteri, tedarikçi veya buna benzer bir kullanıcıdır.<br><br>Her iki durumda da, verilen izinler Dolibarr üzerindeki hakları tanımlar. Bunun yanı sıra dış kullanıcı, iç kullanıcıdan farklı bir menü yöneticisine sahip olabilir (Giriş - Ayarlar - Ekran bölümüne bakın).
 PermissionInheritedFromAGroup=İzin hak tanındı çünkü bir kullanıcının grubundan intikal etti.
 Inherited=İntikal eden
 UserWillBeInternalUser=Oluşturulacak kullanıcı bir iç kullanıcı olacaktır (çünkü belirli bir üçüncü parti ile bağlantılı değildir)
@@ -107,6 +107,6 @@ DisabledInMonoUserMode=Bakım modunda devre dışıdır
 UserAccountancyCode=Kullanıcı muhasebe kodu
 UserLogoff=Kullanıcı çıktı
 UserLogged=Kullanıcı bağlandı
-DateEmployment=Employment Start Date
-DateEmploymentEnd=Employment End Date
-CantDisableYourself=You can't disable your own user record
+DateEmployment=İşe Başlama Tarihi
+DateEmploymentEnd=İşi Bırakma Tarihi
+CantDisableYourself=Kendi kullanıcı kaydınızı devre dışı bırakamazsınız
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index b3ac4fcdc6e..e57cff3a0bb 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -6,7 +6,7 @@ ConfirmDeleteWebsite=Bu web sitesini silmek istediğinizden emin misiniz? Tüm s
 WEBSITE_TYPE_CONTAINER=Sayfa/kapsayıcı türü
 WEBSITE_PAGE_EXAMPLE=Örnek olarak kullanılacak web sayfası
 WEBSITE_PAGENAME=Sayfa adı/rumuz
-WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALT=Alternatif sayfa adları/takma adlar
 WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=Dış CSS dosyası URL si
 WEBSITE_CSS_INLINE=CSS dosya içeriği (tüm sayfalarda ortak)
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=Bu sayfa/kapsayıcı'nın çevirisi mevcut
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index c0892de25dd..29da17c1e3a 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Otomatik ödeme talimatları alanı
 SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrdersPayment=Direct debit payment orders
+StandingOrdersPayment=Otomatik ödeme talimatları
 StandingOrderPayment=Otomatik ödeme talimatı
 NewStandingOrder=Yeni otomatik ödeme talimatı
 StandingOrderToProcess=İşlenecek
@@ -18,12 +18,12 @@ InvoiceWaitingWithdraw=Otomatik ödeme için bekleyen fatura
 AmountToWithdraw=Çekilecek tutar
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Açık 'Otomatik ödeme talepli' bekleyen hiçbir müşteri faturası yok. Bir talepte bulunmak için fatura kartındaki '%s' sekmesine gidin.
-ResponsibleUser=Sorumlu kullanıcı
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
-MakeWithdrawRequest=Make a direct debit payment request
+MakeWithdrawRequest=Otomatik ödeme talebi oluşturun
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Üçüncü parti banka kodu
 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>.
@@ -50,13 +50,13 @@ StatusMotif0=Belirtilmemiş
 StatusMotif1=Bakiye yetersiz
 StatusMotif2=İsteğe itiraz edildi
 StatusMotif3=No direct debit payment order
-StatusMotif4=Müşteri siparişi
+StatusMotif4=Müşteri Siparişi
 StatusMotif5=RIB kullanılamaz
 StatusMotif6=Bakiyesiz hesap
 StatusMotif7=Mahkeme kararıyla
 StatusMotif8=Başka bir nedenle
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
+CreateForSepaFRST=Otomatik ödeme dosyası oluşturun (SEPA FRST)
+CreateForSepaRCUR=Otomatik ödeme dosyası oluşturun (SEPA RCUR)
 CreateAll=Create direct debit file (all)
 CreateGuichet=Sadece ofis
 CreateBanque=Sadece banka
@@ -66,7 +66,7 @@ NotifyCredit=Kredi çekme
 NumeroNationalEmetter=Ulusal İletim Numarası
 WithBankUsingRIB=RIB kullanan banka hesapları için
 WithBankUsingBANBIC=IBAN/BIC/SWIFT kullanan banka hesapları için
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Alacak tarihi
 WithdrawalFileNotCapable=Ülkeniz %s için para çekme makbuzu oluşturulamıyor (Ülkeniz desteklenmiyor)
 ShowWithdraw=Para çekme göster
@@ -78,8 +78,8 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Durum satırlarına göre istatistkler
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
-WithdrawMode=Direct debit mode (FRST or RECUR)
+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)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
 SepaMandate=SEPA Direct Debit Mandate
@@ -87,21 +87,25 @@ SepaMandateShort=SEPA Mandate
 PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
 SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
 CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor’s Name
+CreditorName=Creditor Name
 SEPAFillForm=(B) Please complete all the fields marked *
 SEPAFormYourName=Adınız
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-SEPAFrstOrRecur=Type of payment
-ModeRECUR=Reccurent payment
-ModeFRST=One-off payment
+SEPAFormYourBAN=Banka Hesap Adınız (IBAN)
+SEPAFormYourBIC=Banka Kimlik Kodunuz (BIC)
+SEPAFrstOrRecur=Ödeme türü
+ModeRECUR=Yinelenen ödeme
+ModeFRST=Bir kerelik ödeme
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Otomatik ödeme talimatı %s oluşturuldu
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
+CreateForSepa=Otomatik ödeme dosyası oluşturun
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/tr_TR/workflow.lang b/htdocs/langs/tr_TR/workflow.lang
index d573cba2530..a4fb778786f 100644
--- a/htdocs/langs/tr_TR/workflow.lang
+++ b/htdocs/langs/tr_TR/workflow.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=İş Akışı modülü kurulumu
-WorkflowDesc=Bu modül, uygulamadaki otomatik eylemlerin davranışlarını değiştirilmek için tasarlanmıştır. Varsayılan olarak, iş akışı açıktır (işleri istediğiniz sıraya göre yapabilirsiniz). İlgilendiğiniz otomatik eylemleri etkinleştirebilirsiniz.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=Etkin modüllerde hiç iş akışı değişikliği yok.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Bir teklifin imzalanmasına istinaden otomatik olarak bir müşteri faturası oluştur (yeni fatura teklifle aynı tutara sahip olacaktır)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Bir sözleşme doğrulandıktan sonra kendiliğinden bir müşteri faturası oluştur
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Müşteri faturası doğrulandığında (ve faturanın tutarı imzalanmış olan bağlantılı teklifin toplam tutarı ile aynı ise) bağlantılı kaynak teklifi "faturalandı" olarak sınıflandır
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Tedarikçi faturası doğrulandığında (ve faturanın tutarı bağlantılı teklifin toplam tutarı ile aynı ise) bağlantılı kaynak tedarikçi teklifini "faturalandı" olarak sınıflandır
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Tedarikçi faturası doğrulandığında (ve faturanın tutarı bağlantılı siparişin toplam tutarı ile aynı ise) bağlantılı kaynak tedarikçi siparişini "faturalandı" olarak sınıflandır
 AutomaticCreation=Otomatik oluşturma
 AutomaticClassification=Otomatik sınıflandırma
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 7796c56b7d0..2052169f9ab 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index cd8371fbb20..ceb2c679946 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Кредитове авізо
-CreditNotes=Кредитове авізо
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang
index 35f876f9a19..767dcfbf3a1 100644
--- a/htdocs/langs/uk_UA/agenda.lang
+++ b/htdocs/langs/uk_UA/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index e2b66e85156..4d678f11e47 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=Номер IBAN
-BIC=Номер BIC/SWIFT
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Statement
 AccountStatements=Account statements
 LastAccountStatements=Last account statements
 IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Supplier payment
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Продавець
 TransferTo=Покупець
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index c787bb01e0c..3c30ae87f85 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Повернення платежу
 DeletePayment=Видалити платіж
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Отримані платежі
 ReceivedCustomersPayments=Платежі, отримані від покупців
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Сума платежу
-ValidatePayment=Підтвердити платіж
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/uk_UA/cashdesk.lang b/htdocs/langs/uk_UA/cashdesk.lang
index fc654fd8f64..17a4e391222 100644
--- a/htdocs/langs/uk_UA/cashdesk.lang
+++ b/htdocs/langs/uk_UA/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 220e0cd9d97..f314723d6bb 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=New payment
-Payments=Платежі
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 68db165215d..b5a9d70cb70 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/uk_UA/holiday.lang b/htdocs/langs/uk_UA/holiday.lang
index 0f12aecc9c8..82b75059f25 100644
--- a/htdocs/langs/uk_UA/holiday.lang
+++ b/htdocs/langs/uk_UA/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 7c8ed8dbe80..609709def1b 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
 Email=Email
 NoEMail=No email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
 Progress=Прогрес
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Календар
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index fc217281424..650336f6c8b 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=Members
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=Late
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/uk_UA/modulebuilder.lang b/htdocs/langs/uk_UA/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/uk_UA/modulebuilder.lang
+++ b/htdocs/langs/uk_UA/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/uk_UA/paybox.lang b/htdocs/langs/uk_UA/paybox.lang
index a65cc41e46b..f2f08b9d1d6 100644
--- a/htdocs/langs/uk_UA/paybox.lang
+++ b/htdocs/langs/uk_UA/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Вчинити платіж
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/uk_UA/paypal.lang b/htdocs/langs/uk_UA/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/uk_UA/paypal.lang
+++ b/htdocs/langs/uk_UA/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 0118ba17c86..66e62de38c9 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 64d6bcf7eb8..a4a4ae04de2 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
diff --git a/htdocs/langs/uk_UA/stripe.lang b/htdocs/langs/uk_UA/stripe.lang
index 6fa072b4c9a..7a3389f34b7 100644
--- a/htdocs/langs/uk_UA/stripe.lang
+++ b/htdocs/langs/uk_UA/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditor
 PaymentCode=Payment code
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index 599aa9aed5d..3a1c6f95d05 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index ccba0841767..daa5b4ef413 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index a36d63c7373..e8a5dda7efb 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Browser=Browser
 Server=Server
 Database=Database
 DatabaseServer=Database host
@@ -1077,7 +1079,7 @@ SystemInfoDesc=System information is miscellaneous technical information you get
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
index b928554b328..30c2a3d4038 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index 5bc061f31f3..cb39150b627 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -30,7 +30,7 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-BIC=BIC/SWIFT number
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
@@ -42,11 +42,11 @@ AccountStatementShort=Statement
 AccountStatements=Account statements
 LastAccountStatements=Last account statements
 IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -98,14 +98,14 @@ BankLineConciliated=Entry reconciled
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Supplier payment
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,7 +136,7 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index 0934b4c1e46..c9d46e4ffff 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Payment amount
-ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index 5138fe80be3..006097b7e82 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 83b931731df..3f175b8b782 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=New payment
-Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
@@ -205,7 +204,6 @@ SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 68db165215d..b5a9d70cb70 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang
index 951af61f273..9aafa73550e 100644
--- a/htdocs/langs/uz_UZ/holiday.lang
+++ b/htdocs/langs/uz_UZ/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 14ec793c83a..c9487388ab3 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -371,6 +371,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
 Email=Email
 NoEMail=No email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
 Progress=Progress
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
 View=View
@@ -842,6 +842,11 @@ Exports=Exports
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index b29477e346d..9517568846c 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -6,7 +6,7 @@ Member=Member
 Members=Members
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Members Tickets
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
@@ -67,11 +67,11 @@ Subscriptions=Subscriptions
 SubscriptionLate=Late
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Content of your member card
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -156,8 +156,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/uz_UZ/paybox.lang b/htdocs/langs/uz_UZ/paybox.lang
index 0d35ac440fa..d5e4fd9ba55 100644
--- a/htdocs/langs/uz_UZ/paybox.lang
+++ b/htdocs/langs/uz_UZ/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Do payment
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/uz_UZ/paypal.lang b/htdocs/langs/uz_UZ/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/uz_UZ/paypal.lang
+++ b/htdocs/langs/uz_UZ/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 841b4a604d3..402779cb00f 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index b0c1113b0ec..76bd0ce597d 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 592534aae35..06ff329a997 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 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_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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)
 
@@ -177,6 +177,7 @@ LabelAccount=Tài khoản Label
 LabelOperation=Label operation
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=Tạp chí
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 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
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 4823a791817..6d29d3ab5e3 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Nbr của characters để kích hoạt tìm kiếm: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Hiện không có sẵn khi Ajax bị vô hiệu
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=Vô hiệu JavaScript
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=Port
 VirtualServerName=Tên máy chủ ảo
 OS=Hệ điều hành
 PhpWebLink=Web-Php link
-Browser=Trình duyệt
 Server=Máy chủ
 Database=Cơ sở dữ liệu
 DatabaseServer=Máy chủ cơ sở dữ liệu
@@ -1077,7 +1079,7 @@ SystemInfoDesc=Hệ thống thông tin là thông tin kỹ thuật linh tinh b
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=Để kích hoạt mô-đun, đi vào Cài đặt Khu vực (Nhà-> Cài đặt-> Modules).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=Mô hình đánh số Hoá đơn và giấy báo có
 BillsPDFModules=Mô hình chứng từ hóa đơn
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=Lưu ý tín dụng
-CreditNotes=Giấy báo có
 ForceInvoiceDate=Buộc ngày hóa đơn là ngày xác nhận
 SuggestedPaymentModesIfNotDefinedInInvoice=Đề nghị chế độ thanh toán trên hoá đơn theo mặc định nếu không được xác định cho hóa đơn
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang
index 7bf0a9d12d0..57ad21370a1 100644
--- a/htdocs/langs/vi_VN/agenda.lang
+++ b/htdocs/langs/vi_VN/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Sự kiện mà Dolibarr sẽ tạo ra một hành động trong c
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=Project %s modified
 PROJECT_DELETEInDolibarr=Project %s deleted
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index 88d213e6e65..9077e99eff7 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Ngân hàng
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Tên ngân hàng
 FinancialAccount=Tài khoản
 BankAccount=Tài khoản ngân hàng
 BankAccounts=Tài khoản ngân hàng
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Hiện tài khoản
 AccountRef=Tài khoản tài chính ref
 AccountLabel=Nhãn tài khoản tài chính
@@ -30,7 +30,7 @@ AllTime=Từ đầu
 Reconciliation=Hòa giải
 RIB=Số tài khoản ngân hàng
 IBAN=Số IBAN
-BIC=Số BIC / SWIFT
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT hợp lệ
 SwiftVNotalid=BIC/SWIFT không hợp lệ
 IbanValid=BAN hợp lệ
@@ -42,11 +42,11 @@ AccountStatementShort=Sao kê
 AccountStatements=Sao kê tài khoản
 LastAccountStatements=Sao kê tài khoản mới nhất
 IOMonthlyReporting=Báo cáo hàng tháng
-BankAccountDomiciliation=Địa chỉ tài khoản
+BankAccountDomiciliation=Bank address
 BankAccountCountry=Quốc gia tài khoản
 BankAccountOwner=Tên chủ tài khoản
 BankAccountOwnerAddress=Địa chỉ chủ sở hữu tài khoản
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=Tạo tài khoản
 NewBankAccount=Tài khoản mới
 NewFinancialAccount=Tài khoản tài chính mới
@@ -98,14 +98,14 @@ BankLineConciliated=Kê khai đã đối chiếu
 Reconciled=Đã đối chiếu
 NotReconciled=Chưa đối chiếu
 CustomerInvoicePayment=Thanh toán của khách hàng
-SupplierInvoicePayment=Thanh toán của nhà cung cấp
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Thanh toán mô tả
 WithdrawalPayment=Thanh toán rút
 SocialContributionPayment=Thanh toán xã hội/ fiscal tax
 BankTransfer=Chuyển khoản ngân hàng
 BankTransfers=Chuyển khoản ngân hàng
 MenuBankInternalTransfer=Chuyển tiền nội bộ
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Từ
 TransferTo=Đến
 TransferFromToDone=Một chuyển khoản từ <b>%s</b> đến <b>%s</b> của <b>%s</b> %s đã được ghi lại.
@@ -136,7 +136,7 @@ BankTransactionLine=Kê khai ngân hàng
 AllAccounts=All bank and cash accounts
 BackToAccount=Trở lại tài khoản
 ShowAllAccounts=Hiển thị tất cả tài khoản
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Chọn bảng kê ngân hàng có quan hệ với việc đối chiếu. Sử dụng giá trị số có thể sắp xếp: YYYYMM hoặc YYYYMMDD
 EventualyAddCategory=Cuối cùng, chỉ định một danh mục trong đó để phân loại các hồ sơ
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=Séc bị trả lại và hóa đơn bị mở
 BankAccountModelModule=Mẫu tài liệu dàng cho tài khoản ngân hàng
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Mẫu để in 1 trang với thông tin BAN
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index 98310cac5e3..81329694431 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Đã trả lại
 DeletePayment=Xóa thanh toán
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=Đã nhận thanh toán
 ReceivedCustomersPayments=Thanh toán đã nhận được từ khách hàng
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=Số tiền thanh toán
-ValidatePayment=Xác nhận thanh toán
 PaymentHigherThanReminderToPay=Thanh toán cao hơn so với đề nghị trả
 HelpPaymentHigherThanReminderToPay=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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Xác nhận hóa đơn tự động
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
index a995ec76dd2..c6d0e61bdd9 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=Lịch sử
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index 718e75b140b..0c184dc499b 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Thanh toán mới
-Payments=Thanh toán
 PaymentCustomerInvoice=Thanh toán hóa đơn của khách hàng
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Thanh toán xã hội/ fiscal tax
@@ -205,7 +204,6 @@ SellsJournal=Tạp chí Kinh doanh
 PurchasesJournal=Mua Tạp chí
 DescSellsJournal=Tạp chí Kinh doanh
 DescPurchasesJournal=Mua Tạp chí
-InvoiceRef=Ref hóa đơn.
 CodeNotDef=Không xác định
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Ngày thanh toán hạn không thể thấp hơn so với ngày đối tượng.
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 5065b594f2c..dd27b05a079 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/vi_VN/holiday.lang b/htdocs/langs/vi_VN/holiday.lang
index 62016f65eb3..e1168441134 100644
--- a/htdocs/langs/vi_VN/holiday.lang
+++ b/htdocs/langs/vi_VN/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Yêu cầu xác nhận nghỉ
 HolidaysValidatedBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã được xác nhận.
 HolidaysRefused=Yêu cầu bị từ chối
-HolidaysRefusedBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã bị từ chối vì lý do sau:
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Yêu cầu hủy bỏ nghỉ phép
 HolidaysCanceledBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã được hủy bỏ.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index b11cbfd0879..773fafc037d 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -371,6 +371,7 @@ Percentage=Phần trăm
 Total=Tổng
 SubTotal=Tổng phụ
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Tổng (gồm thuế)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=Send confirmation email
 SendMail=Gửi email
 Email=Email
 NoEMail=Không có email
-Email=Email
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=No mobile phone
@@ -671,7 +671,6 @@ Method=Phương pháp
 Receive=Nhận
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Giá trị hiện tại
 PartialWoman=Một phần
 TotalWoman=Tổng
 NeverReceived=Chưa từng nhận
@@ -834,6 +833,7 @@ RelatedObjects=Related Objects
 ClassifyBilled=Xác định đã ra hóa đơn
 ClassifyUnbilled=Classify unbilled
 Progress=Tiến trình
+ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Trở lại văn phòng
 View=View
@@ -842,6 +842,11 @@ Exports=Xuất khẩu
 ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Tùy chọn xuất dữ liệu
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Linh tinh
 Calendar=Lịch
 GroupBy=Group by...
@@ -854,7 +859,7 @@ Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Năm tài chính
-ModuleBuilder=Module Builder
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index 577cc47e660..944a3874227 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -6,7 +6,7 @@ Member=Thành viên
 Members=Thành viên
 ShowMember=Hiện thẻ thành viên
 UserNotLinkedToMember=Người sử dụng không liên quan đến một thành viên
-ThirdpartyNotLinkedToMember=Bên thứ ba không liên quan đến một thành viên
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=Thành viên Vé
 FundationMembers=Thành viên sáng lập
 ListOfValidatedPublicMembers=Danh sách thành viên công khai hợp lệ
@@ -67,11 +67,11 @@ Subscriptions=Đăng ký
 SubscriptionLate=Trễ
 SubscriptionNotReceived=Mô tả không bao giờ nhận được
 ListOfSubscriptions=Danh sách đăng ký
-SendCardByMail=Gửi thẻ qua Email
+SendCardByMail=Send card by email
 AddMember=Tạo thành viên
 NoTypeDefinedGoToSetup=Không có loại thành viên được xác định. Tới menu "Thành viên loại"
 NewMemberType=Loại thành viên mới
-WelcomeEMail=Chào mừng e-mail
+WelcomeEMail=Welcome email
 SubscriptionRequired=Yêu cầu đăng ký
 DeleteType=Xóa
 VoteAllowed=Vote cho phép
@@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=tập tin htpasswd
 ValidateMember=Xác nhận thành viên
 ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=Các liên kết sau đây là các trang mở không được bảo vệ bởi bất kỳ sự cho phép Dolibarr. Họ không formated trang, cung cấp như ví dụ cho thấy làm thế nào để liệt kê các cơ sở dữ liệu thành viên.
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Danh sách thành viên công cộng
 BlankSubscriptionForm=Public self-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
@@ -124,16 +124,16 @@ CardContent=Nội dung của thẻ thành viên của bạn
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Chủ đề của e-mail nhận được trong trường hợp tự động ghi của khách
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail nhận được trong trường hợp tự động ghi của khách
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Tên người gửi thư điện tử cho email tự động
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Định dạng của trang nhãn
 DescADHERENT_ETIQUETTE_TEXT=Văn bản in trên tờ địa chỉ thành viên
 DescADHERENT_CARD_TYPE=Định dạng của trang thẻ
@@ -156,8 +156,8 @@ DocForAllMembersCards=Tạo danh thiếp cho tất cả các thành viên
 DocForOneMemberCards=Tạo danh thiếp cho một thành viên đặc biệt
 DocForLabels=Tạo tờ địa chỉ
 SubscriptionPayment=Thanh toán mô tả
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Thành viên thống kê của đất nước
 MembersStatisticsByState=Thành viên thống kê của tiểu bang / tỉnh
 MembersStatisticsByTown=Thành viên thống kê của thị trấn
@@ -187,12 +187,14 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Thuế suất thuế GTGT để sử dụng cho mô tả
-NoVatOnSubscription=Không TVA cho mô tả
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+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
diff --git a/htdocs/langs/vi_VN/modulebuilder.lang b/htdocs/langs/vi_VN/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/vi_VN/modulebuilder.lang
+++ b/htdocs/langs/vi_VN/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/vi_VN/paybox.lang b/htdocs/langs/vi_VN/paybox.lang
index 2837a47f8b4..38b335c6f88 100644
--- a/htdocs/langs/vi_VN/paybox.lang
+++ b/htdocs/langs/vi_VN/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=To complete
 YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=Thực hiện thanh toán
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Tiếp theo
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
@@ -33,7 +33,8 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/vi_VN/paypal.lang b/htdocs/langs/vi_VN/paypal.lang
index 68c5b0aefa1..5eb5f389445 100644
--- a/htdocs/langs/vi_VN/paypal.lang
+++ b/htdocs/langs/vi_VN/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Pay with Paypal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Mode test/sandbox
 PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index f3405a8fd9e..a4ef841f267 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -260,7 +260,7 @@ AddVariable=Thêm biến
 AddUpdater=Thêm nguồn cập nhật
 GlobalVariables=Biến toàn cầu
 VariableToUpdate=Biến để cập nhật
-GlobalVariableUpdaters=Cập nhật biến toàn cầu
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index 5d453e501c2..c4a4bac8898 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=Thời gian đã qua
 TimeSpentByYou=Thời gian đã qua bởi bạn
 TimeSpentByUser=Thời gian đã qua bởi người dùng
 TimesSpent=Thời gian đã qua
-RefTask=Tham chiếu tác vụ
-LabelTask=Nhãn tác vụ
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Thời gian đã qua trên tác vụ
 TaskTimeUser=Người dùng
 TaskTimeNote=Ghi chú
diff --git a/htdocs/langs/vi_VN/stripe.lang b/htdocs/langs/vi_VN/stripe.lang
index 8c2064c6b92..6c47d33cb8b 100644
--- a/htdocs/langs/vi_VN/stripe.lang
+++ b/htdocs/langs/vi_VN/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=Creditor
 PaymentCode=Payment code
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Tiếp theo
 ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index 2438cf86842..17a54210b46 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index dc6118d8608..4ebc525ef91 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=费用报告绑定
 CreateMvts=创建新交易
 UpdateMvts=修改交易
 ValidTransaction=验证交易
-WriteBookKeeping=在帐目中记录交易
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=分类帐
 AccountBalance=账目平衡
 ObjectsRef=源对象引用
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=购买产品的默认会计科目（如果未在产品说明书中定义，则使用）
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=销售产品的默认会计科目（如果未在产品说明书中定义，则使用）
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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_SERVICE_SOLD_ACCOUNT=默认情况下，已售出服务的会计科目（如果未在服务单中定义，则使用）
 
@@ -177,6 +177,7 @@ LabelAccount=标签帐户
 LabelOperation=标签操作
 Sens=SENS
 LetteringCode=刻字代码
+Lettering=Lettering
 Codejournal=日记帐
 JournalLabel=Journal label
 NumPiece=件数
@@ -288,8 +289,10 @@ 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=导出CSV可配置
-Modelcsv_FEC=Export FEC (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=会计科目表ID
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=此页面可用于设置默认帐户，用于在未设置特
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=选项
 OptionModeProductSell=销售模式
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=采购模式
 OptionModeProductSellDesc=显示所有具有销售会计帐户的产品。
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=显示所有带有会计帐户的产品。
 CleanFixHistory=将不存在于会计科目表中的行删除科目代码
 CleanHistory=重置所选年份的所有绑定
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index fdb7d46fa5b..cf26b76069e 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=此外，如果您有大量第三方（> 100 000
 UseSearchToSelectContactTooltip=此外，如果您有大量第三方（> 100 000），您可以通过在"设置"-> "其他"中将常量CONTACT_DONOTSEARCH_ANYWHERE设置为1来提高速度。然后搜索将限制为以字符串开头。
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=触发搜索的字符数量：%s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=Ajax 禁用时不可用
 AllowToSelectProjectFromOtherCompany=在合作方的文档上，可以选择链接到另一个合作方的项目
 JavascriptDisabled=禁用 JavaScript
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=端口
 VirtualServerName=虚拟服务器名称
 OS=操作系统
 PhpWebLink=Web-Php链接
-Browser=浏览器
 Server=服务器
 Database=数据库
 DatabaseServer=数据库主机
@@ -1077,7 +1079,7 @@ SystemInfoDesc=系统信息指以只读方式显示的其它技术信息，只
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=文件编号
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=可用模块
 ToActivateModule=要启用模块，请到“设定”区 (“首页”->“设定”->“模块”)。
@@ -1237,8 +1239,6 @@ BillsNumberingModule=发票与信用记录编号模块
 BillsPDFModules=发票文档模板
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=付款文件模型
-CreditNote=信用记录
-CreditNotes=信用记录
 ForceInvoiceDate=强制发票中的日期为确认日期
 SuggestedPaymentModesIfNotDefinedInInvoice=如果发票中未设置付款方式，设置一个默认值付款方式。
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=邮编
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
index e8af16f8a7e..e20a28867bc 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Dolibarr将为其自动创建一个动作的事件
 EventRemindersByEmailNotEnabled=通过电子邮件发送的事件提醒未启用到%s模块设置中。
 ##### Agenda event labels #####
 NewCompanyToDolibarr=合作方 %s 已创建
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=联系人 %s 已验证
 CONTRACT_DELETEInDolibarr=合同%s已删除
 PropalClosedSignedInDolibarr=建议 %s 已标记
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=项目%s修改
 PROJECT_DELETEInDolibarr=项目%s已删除
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index d4fde23020e..997a2507e0d 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -156,11 +156,11 @@ CheckRejectedAndInvoicesReopened=检查退回发票并重新打开发票
 BankAccountModelModule=银行账户的文档模板
 DocumentModelSepaMandate=SEPA任务模板。仅适用于欧洲经济共同体的欧洲国家。
 DocumentModelBan=用于打印具有BAN信息的页面的模板。
-NewVariousPayment=新的杂项付款
-VariousPayment=杂项付款
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=杂项付款
-ShowVariousPayment=显示杂项付款
-AddVariousPayment=添加杂项付款
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA授权
 YourSEPAMandate=您的SEPA授权
 FindYourSEPAMandate=这是您的SEPA授权，授权我们公司向您的银行直接扣款。返回签名（扫描签名文档）或通过邮件发送给
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index bd2c7aea97d..050f8cca90a 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=在发票货币
 PaidBack=已退款
 DeletePayment=删除付款
 ConfirmDeletePayment=您确定要删除此付款吗？
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=收到的付款
 ReceivedCustomersPayments=收到客户付款
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=付款金额
-ValidatePayment=确认付款
 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.
@@ -366,6 +367,7 @@ InvoiceAutoValidate=自动验证发票
 GeneratedFromRecurringInvoice=从模板重复发票%s生成
 DateIsNotEnough=尚未达到日期
 InvoiceGeneratedFromTemplate=从周期性模板发票%s生成的发票%s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=警告，发票日期高于当前日期
 WarningInvoiceDateTooFarInFuture=警告，发票日期与当前日期相差太远
 ViewAvailableGlobalDiscounts=查看可用折扣
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
index 4ab6c25ce67..cb0f4c89047 100644
--- a/htdocs/langs/zh_CN/cashdesk.lang
+++ b/htdocs/langs/zh_CN/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=历史
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index 5059bfc597d..4dd94738343 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=增加社会/财政税
 ContributionsToPay=支付社会/财政税
 AccountancyTreasuryArea=结算和付款方面
 NewPayment=新建支付
-Payments=付款
 PaymentCustomerInvoice=客户发票付款
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=社会/财政税款
@@ -205,7 +204,6 @@ SellsJournal=销售日志
 PurchasesJournal=采购日志
 DescSellsJournal=销售日志
 DescPurchasesJournal=采购日志
-InvoiceRef=发票编号。
 CodeNotDef=没有定义
 WarningDepositsNotIncluded=此会计模块不包含此版本的预付款发票。
 DatePaymentTermCantBeLowerThanObjectDate=付款期限日期不能小于对象日期。
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 9601b88e09d..6e232a35a83 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 WarningPasswordSetWithNoAccount=为此成员设置了密码。但是，未创建任何用户帐户。因此，此密码已存储，但无法用于登录Dolibarr。它可以由外部模块/接口使用，但如果您不需要为成员定义任何登录名或密码，则可以从成员模块设置中禁用“管理每个成员的登录名”选项。如果您需要管理登录但不需要任何密码，则可以将此字段保留为空以避免此警告。注意：如果成员链接到用户，则电子邮件也可用作登录。
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
diff --git a/htdocs/langs/zh_CN/holiday.lang b/htdocs/langs/zh_CN/holiday.lang
index 4c21e49d14e..dd057dc7166 100644
--- a/htdocs/langs/zh_CN/holiday.lang
+++ b/htdocs/langs/zh_CN/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=批准请假申请
 HolidaysValidatedBody=你的请假申请 %s 到 %s 已批准。
 HolidaysRefused=申请否认
-HolidaysRefusedBody=你的请假申请 %s 到 %s 被否认的原因如下 :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=已取消请假申请
 HolidaysCanceledBody=你的请假申请 %s 到 %s 已取消。
 FollowedByACounter=1：这种假期需要一个计数器。计数器手动或自动递增，当验证请假时，计数器递减。<br> 0：无计数器。
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index c38b09a5949..f7f6a58e93c 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -371,6 +371,7 @@ Percentage=百分比
 Total=总计
 SubTotal=小计
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=共计(含税)
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=发送确认邮件
 SendMail=发送电子邮件
 Email=电子邮件
 NoEMail=没有电子邮件
-Email=电子邮件
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=没有手机号码
@@ -671,7 +671,6 @@ Method=方法
 Receive=收到
 CompleteOrNoMoreReceptionExpected=完成或没有更多的预期
 ExpectedValue=期望值
-CurrentValue=当前值
 PartialWoman=局部的
 TotalWoman=总计
 NeverReceived=从未收到
@@ -834,6 +833,7 @@ RelatedObjects=关联项目
 ClassifyBilled=归为已付款
 ClassifyUnbilled=分类未开单
 Progress=进展
+ProgressShort=Progr.
 FrontOffice=前台
 BackOffice=后台
 View=查看
@@ -842,6 +842,11 @@ Exports=导出
 ExportFilteredList=导出筛选列表
 ExportList=导出清单
 ExportOptions=导出选项
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=各项设定
 Calendar=日历
 GroupBy=分组：
@@ -854,7 +859,7 @@ Download=下载
 DownloadDocument=下载文件
 ActualizeCurrency=更新货币汇率
 Fiscalyear=财务年度
-ModuleBuilder=模块工厂
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=设置货币
 BulkActions=批量行动
 ClickToShowHelp=单击以显示工具提示帮助
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index 52119219ec7..4c31e80b663 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -6,15 +6,15 @@ Member=会员
 Members=会员
 ShowMember=出示会员卡
 UserNotLinkedToMember=用户是用户，会员是会员，成员是成员，半毛钱关系都没有
-ThirdpartyNotLinkedToMember=合伙人未链接到会员
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=会员卷
 FundationMembers=基础会员
 ListOfValidatedPublicMembers=公共认证会员列表
 ErrorThisMemberIsNotPublic=该会员不公开
-ErrorMemberIsAlreadyLinkedToThisThirdParty=另一名成员 (名称： <b>%s</b> ，登陆： <b>%s</b>) 是已链接到合伙人<b>%s</b>。首先删除这个链接，因为一个合伙人不能被链接到只有一个成员(反之亦然)。
+ErrorMemberIsAlreadyLinkedToThisThirdParty=另一名成员 (名称： <b>%s</b> ，登陆： <b>%s</b>) 是已链接到合作方<b>%s</b>。首先删除这个链接，因为一个合作方不能被链接到只有一个成员(反之亦然)。
 ErrorUserPermissionAllowsToLinksToItselfOnly=出于安全原因，您必须被授予权限编辑所有用户能够连接到用户的成员是不是你的。
 SetLinkToUser=用户链接到Dolibarr
-SetLinkToThirdParty=链接到Dolibarr合伙人
+SetLinkToThirdParty=链接到Dolibarr合作方
 MembersCards=会员名片
 MembersList=会员列表
 MembersListToValid=准会员 (待验证)列表
@@ -43,23 +43,23 @@ MemberStatusDraft=草稿(需要确认)
 MemberStatusDraftShort=草稿
 MemberStatusActive=验证（等待订阅）
 MemberStatusActiveShort=已确认
-MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLate=订阅已过期
 MemberStatusActiveLateShort=过期
 MemberStatusPaid=认购最新
 MemberStatusPaidShort=截至日期
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
+MemberStatusResiliated=终止的成员
+MemberStatusResiliatedShort=终止
 MembersStatusToValid=待定会员
 MembersStatusResiliated=解雇会员
 NewCotisation=新的捐献
 PaymentSubscription=支付的新贡献
 SubscriptionEndDate=认购的结束日期
 MembersTypeSetup=会员类型设定
-MemberTypeModified=Member type modified
-DeleteAMemberType=Delete a member type
-ConfirmDeleteMemberType=Are you sure you want to delete this member type?
-MemberTypeDeleted=Member type deleted
-MemberTypeCanNotBeDeleted=Member type can not be deleted
+MemberTypeModified=会员类型已修改
+DeleteAMemberType=删除成员类型
+ConfirmDeleteMemberType=您确定要删除此成员类型吗？
+MemberTypeDeleted=会员类型已删除
+MemberTypeCanNotBeDeleted=成员类型无法删除
 NewSubscription=新的订阅
 NewSubscriptionDesc=这种形式可以让你记录你的订阅为基础的新会员。如果你想续订(如果已经是会员)，请联系，而不是通过电子邮件%s 机构董事会。
 Subscription=订阅
@@ -67,11 +67,11 @@ Subscriptions=订阅
 SubscriptionLate=逾期
 SubscriptionNotReceived=认购从未收到
 ListOfSubscriptions=订阅列表
-SendCardByMail=通过邮件发送信息卡
+SendCardByMail=Send card by email
 AddMember=创建会员
 NoTypeDefinedGoToSetup=尚未定义会员类型。请在 会员类型 菜单进行设定
 NewMemberType=新会员类型
-WelcomeEMail=欢迎电子邮件
+WelcomeEMail=Welcome email
 SubscriptionRequired=是否订阅
 DeleteType=删除
 VoteAllowed=是否允许投票
@@ -79,21 +79,21 @@ Physical=普通会员
 Moral=荣誉会员
 MorPhy=荣誉会员/普通会员
 Reenable=重新启用
-ResiliateMember=Terminate a member
-ConfirmResiliateMember=Are you sure you want to terminate this member?
+ResiliateMember=终止会员
+ConfirmResiliateMember=您确定要终止此会员吗？
 DeleteMember=删除会员
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+ConfirmDeleteMember=您确定要删除此成员吗（删除成员会删除所有订阅）？
 DeleteSubscription=删除订阅
-ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+ConfirmDeleteSubscription=您确定要删除此订阅吗？
 Filehtpasswd=htpasswd文件
 ValidateMember=验证会员
-ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=下面的链接是没有任何Dolibarr权限保护打开的网页。他们不是格式化网页，提供的例子，说明如何列出成员数据库。
+ConfirmValidateMember=您确定要验证此会员吗？
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=公共会员名录
-BlankSubscriptionForm=Public self-subscription form
-BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
-EnablePublicSubscriptionForm=Enable the public website with self-subscription form
-ForceMemberType=Force the member type
+BlankSubscriptionForm=公开自我订阅表格
+BlankSubscriptionFormDesc=Dolibarr可以为您提供公共URL /网站，以允许外部访问者要求订阅基金会。如果启用了在线支付模块，则还可以自动提供支付表格。
+EnablePublicSubscriptionForm=使用自订表单启用公共网站
+ForceMemberType=强制成员类型
 ExportDataset_member_1=会员和订阅
 ImportDataset_member_1=会员
 LastMembersModified=最近变更的 %s 位会员
@@ -103,37 +103,37 @@ Text=文本
 Int=Int型
 DateAndTime=日期和时间
 PublicMemberCard=公共会员信息
-SubscriptionNotRecorded=Subscription not recorded
+SubscriptionNotRecorded=订阅未记录
 AddSubscription=创建订阅
 ShowSubscription=显示订阅
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
-SendingEmailOnCancelation=Sending email on cancelation
+SendingAnEMailToMember=向会员发送信息电子邮件
+SendingEmailOnAutoSubscription=在自动注册时发送电子邮件
+SendingEmailOnMemberValidation=发送有关新成员验证的电子邮件
+SendingEmailOnNewSubscription=在新订阅上发送电子邮件
+SendingReminderForExpiredSubscription=发送过期订阅的提醒
+SendingEmailOnCancelation=取消发送电子邮件
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
-YourMembershipWasCanceled=Your membership was canceled
+YourMembershipRequestWasReceived=您的会员资格已收到。
+YourMembershipWasValidated=您的会员资格已经过验证
+YourSubscriptionWasRecorded=您的新订阅已被记录
+SubscriptionReminderEmail=订阅提醒
+YourMembershipWasCanceled=您的会员资格已取消
 CardContent=内容您的会员卡
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=收到的电子邮件的主题的情况下自动的嘉宾题词
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=电子邮件收到的情况下，自动的客户题词
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=自动发送邮件
+ThisIsContentOfYourMembershipRequestWasReceived=我们希望通知您收到了您的会员资格请求。<br> <br>
+ThisIsContentOfYourMembershipWasValidated=我们希望通过以下信息通知您，您的会员资格已经过验证：<br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=我们希望通知您，您的新订阅已被记录。<br> <br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=标签纸的格式
 DescADHERENT_ETIQUETTE_TEXT=文本打印会员地址表
 DescADHERENT_CARD_TYPE=名片格式
@@ -143,12 +143,12 @@ DescADHERENT_CARD_TEXT_RIGHT=名片右边文字(右对齐)
 DescADHERENT_CARD_FOOTER_TEXT=会员名片底部文字
 ShowTypeCard=显示类型'%s'
 HTPasswordExport=生成htpassword密文
-NoThirdPartyAssociatedToMember=无合伙人关联该会员
+NoThirdPartyAssociatedToMember=无合作方关联该会员
 MembersAndSubscriptions= 议员和Subscriptions
 MoreActions=补充行动记录
 MoreActionsOnSubscription=互补作用，建议默认情况下记录一项认购
-MoreActionBankDirect=Create a direct entry on bank account
-MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionBankDirect=在银行帐户上创建直接输入
+MoreActionBankViaInvoice=创建发票和银行帐户付款
 MoreActionInvoiceOnly=创建一个没有付款发票
 LinkToGeneratedPages=生成访问卡
 LinkToGeneratedPagesDesc=这个界面可让你生成所有的成员或单一会员的名片的PDF文件。
@@ -156,8 +156,8 @@ DocForAllMembersCards=为所有成员生成名片
 DocForOneMemberCards=为特定成员生成名片
 DocForLabels=生成地址表
 SubscriptionPayment=认购款项
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=按国别统计人员
 MembersStatisticsByState=成员由州/省的统计信息
 MembersStatisticsByTown=按村镇统计人员
@@ -169,8 +169,8 @@ MembersByStateDesc=此界面显示按省/市/村镇统计人员的数据。
 MembersByTownDesc=此界面显示按村镇统计人员的数据。
 MembersStatisticsDesc=选择你想读的统计...
 MenuMembersStats=统计
-LastMemberDate=Latest member date
-LatestSubscriptionDate=Latest subscription date
+LastMemberDate=最新成员日期
+LatestSubscriptionDate=最新订阅日期
 Nature=属性
 Public=信息是否公开
 NewMemberbyWeb=增加了新成员。等待批准中
@@ -182,17 +182,19 @@ TurnoverOrBudget=营业额（公司）或财政预算案（基础）
 DefaultAmount=默认订阅数
 CanEditAmount=访客是否允许编辑/选择订阅数
 MEMBER_NEWFORM_PAYONLINE=集成在线支付页面跳转
-ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
+ByProperties=自然地
+MembersStatisticsByProperties=成员统计数据
+MembersByNature=此屏幕显示成员的性质统计数据。
+MembersByRegion=此屏幕显示按地区划分的成员统计信息。
 VATToUseForSubscriptions=增值税率，用于订阅
-NoVatOnSubscription=没有增值税订阅
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=产品使用发票明细订阅列表: %s
-NameOrCompany=Name or company
-SubscriptionRecorded=Subscription recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+NameOrCompany=姓名或公司名称
+SubscriptionRecorded=订阅记录
+NoEmailSentToMember=没有电子邮件发送给会员
+EmailSentToMember=电子邮件发送给会员%s
+SendReminderForExpiredSubscriptionTitle=通过电子邮件发送过期订阅提醒
+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
diff --git a/htdocs/langs/zh_CN/modulebuilder.lang b/htdocs/langs/zh_CN/modulebuilder.lang
index 336c65c20ea..cf3450d06ae 100644
--- a/htdocs/langs/zh_CN/modulebuilder.lang
+++ b/htdocs/langs/zh_CN/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=输入要创建的模块/应用的名称，不含空格。使用大写字母分隔单词（例如：MyModule，EcommerceForShop，SyncWithMySystem ......）
 EnterNameOfObjectDesc=输入要创建的对象的名称，不包含空格。使用大写字母分隔单词（例如：MyObject，Student，Teacher ...）。将会生成包含CRUD方法的类文件，同时生成API文件，同时生成"列表/添加/编辑/删除"对象的页面和SQL文件。
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=这是模块提供的触发器视图。要包含启动
 ModuleBuilderDeschooks=此选项卡专用于挂钩。
 ModuleBuilderDescwidgets=此选项卡专用于管理/构建窗口小部件。
 ModuleBuilderDescbuildpackage=您可以在此处生成模块的“准备分发”包文件（规范化的.zip文件）和“准备分发”文档文件。只需单击按钮即可构建包或文档文件。
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=危险区
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=构建文档
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=该模块已被激活。对它的任何更改都可能会破坏当前的活动功能。
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=详细描述
 EditorName=编辑器名字
 EditorUrl=编辑器的URL
@@ -43,10 +44,11 @@ PathToModulePackage=zip /模块/应用程序包的路径
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=不允许使用空格或特殊字符。
 FileNotYetGenerated=文件尚未生成
-RegenerateClassAndSql=擦除并重新生成类和sql文件
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=生成丢失的文件
 SpecificationFile=File of documentation
 LanguageFile=语言文件
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=不是NULL
 NotNullDesc=1 =将数据库设置为NOT NULL。 -1 =如果为空（''或0），则允许空值和强制值为NULL。
@@ -62,9 +64,11 @@ ReadmeFile=自述文件
 ChangeLog=ChangeLog文件
 TestClassFile=PHP单元测试类的文件
 SqlFile=Sql文件
-PageForLib=PHP库的文件
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql文件用于附加字段
 SqlFileKey=密钥的Sql文件
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=已存在具有此名称和不同大小写的对象
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=是衡量标准
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=在此输入您要为模块提供的所有文档，这些文档尚未由其他选项卡定义。您可以使用.md或更好的.asciidoc语法。
 LanguageDefDesc=在此文件中输入每个语言文件的所有密钥和翻译。
-MenusDefDesc=在此定义模块提供的菜单（一旦定义，它们在菜单编辑器中可见%s）
-PermissionsDefDesc=在此定义模块提供的新权限（一旦定义，它们在默认权限设置中可见%s）
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=在<b> module_parts ['hooks'] </b>属性中定义，在模块描述符中，您想要管理的钩子的上下文（上下文列表可以通过搜索'<b> initHooks找到（</b>'在核心代码中。）<br>编辑钩子文件以添加钩子函数的代码（可通过在核心代码中搜索'<b> executeHooks </b>'找到可钩子函数）。
 TriggerDefDesc=在触发器文件中定义要为执行的每个业务事件执行的代码。
 SeeIDsInUse=查看安装中使用的ID
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/zh_CN/paybox.lang b/htdocs/langs/zh_CN/paybox.lang
index 212d9da6863..e85988122a8 100644
--- a/htdocs/langs/zh_CN/paybox.lang
+++ b/htdocs/langs/zh_CN/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=要完成
 YourEMail=付款确认的电子邮件
 Creditor=债权人
 PaymentCode=付款代码
-PayBoxDoPayment=使用信用卡或借记卡付款（Paybox）
+PayBoxDoPayment=Pay with Paybox
 ToPay=执行付款
 YouWillBeRedirectedOnPayBox=您将被重定向担保Paybox页，输入您的信用卡信息
 Continue=下一个
 ToOfferALinkForOnlinePayment=网址为%s支付
-ToOfferALinkForOnlinePaymentOnOrder=网址提供一个命令%s网上支付的用户界面
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=网址提供发票一%s在线支付的用户界面
 ToOfferALinkForOnlinePaymentOnContractLine=网址提供了一个合同线%s在线支付的用户界面
 ToOfferALinkForOnlinePaymentOnFreeAmount=网址提供一个免费的网上支付金额%s用户界面
 ToOfferALinkForOnlinePaymentOnMemberSubscription=网址为会员提供订阅%s在线支付的用户界面
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=本页面确认您的付款已记录。谢谢。
@@ -33,7 +33,8 @@ VendorName=供应商名称
 CSSUrlForPaymentForm=付款方式的CSS样式表的URL
 NewPayboxPaymentReceived=新建收款钱箱
 NewPayboxPaymentFailed=尝试新建收款钱箱失败
-PAYBOX_PAYONLINE_SENDEMAIL=电子邮件提醒后付款（成功或失败）
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=PBX SITE参数值
 PAYBOX_PBX_RANG=PBX Rang参数值
 PAYBOX_PBX_IDENTIFIANT=PBX ID参数值
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/zh_CN/paypal.lang b/htdocs/langs/zh_CN/paypal.lang
index 4390b91f4a6..596f40f636e 100644
--- a/htdocs/langs/zh_CN/paypal.lang
+++ b/htdocs/langs/zh_CN/paypal.lang
@@ -1,34 +1,36 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=贝宝模块的设置
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=用PayPal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=测试/沙箱模式
 PAYPAL_API_USER=API的用户名
 PAYPAL_API_PASSWORD=API密码
 PAYPAL_API_SIGNATURE=API签名
 PAYPAL_SSLVERSION=Curl SSL 版本
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=优惠“不可分割的”支付（信用卡+贝宝）或“贝宝”只
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=积分
 PaypalModeOnlyPaypal=支付宝
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=这是交易编号<b>：%s</b>
-PAYPAL_ADD_PAYMENT_URL=当你邮寄一份文件，添加URL Paypal付款
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
-NewOnlinePaymentReceived=New online payment received
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=电子邮件提醒后付款（成功与否）
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
+NewOnlinePaymentReceived=收到新的在线支付
+NewOnlinePaymentFailed=新的在线支付尝试但失败了
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=付款后返回网页地址
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
-SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
-DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
+ValidationOfOnlinePaymentFailed=验证在线支付失败
+PaymentSystemConfirmPaymentPageWasCalledButFailed=支付系统调用支付确认页面返回错误
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API调用失败。
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API调用失败。
+DetailedErrorMessage=详细的错误消息
 ShortErrorMessage=简短错误信息
 ErrorCode=错误代码
-ErrorSeverityCode=Error Severity Code
-OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ErrorSeverityCode=错误严重性代码
+OnlinePaymentSystem=在线支付系统
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
+PostActionAfterPayment=付款后发布操作
+ARollbackWasPerformedOnPostActions=对所有Post操作执行了回滚。如果必要，您必须手动完成后期操作。
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index c66b44b0448..f4c4d733c74 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -260,7 +260,7 @@ AddVariable=添加变量
 AddUpdater=添加更新
 GlobalVariables=全局变量
 VariableToUpdate=变量到更新
-GlobalVariableUpdaters=全局变量更新
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON数据
 GlobalVariableUpdaterHelp0=从指定的URL解析JSON数据，VALUE指定相关值的位置，
 GlobalVariableUpdaterHelpFormat0=请求格式{“URL”：“http://example.com/urlofjson”，“VALUE”：“array1，array2，targetvalue”}
@@ -294,7 +294,7 @@ ProductSheet=产品表
 ServiceSheet=服务单
 PossibleValues=可能的值
 GoOnMenuToCreateVairants=继续菜单%s  -  %s准备属性变体（如颜色，大小......）
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=变体属性
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=复制产品变体时出错
 ErrorDestinationProductNotFound=找不到目的地产品
 ErrorProductCombinationNotFound=未找到产品变体
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index 04b800327ef..09d38d11c10 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=花费的时间
 TimeSpentByYou=你花费的时间
 TimeSpentByUser=用户花费时间
 TimesSpent=所花费的时间
-RefTask=任务编号
-LabelTask=标签任务
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=任务花费时间
 TaskTimeUser=用户
 TaskTimeNote=备注
diff --git a/htdocs/langs/zh_CN/stripe.lang b/htdocs/langs/zh_CN/stripe.lang
index 0f0247fdfbe..d239c1fb8bd 100644
--- a/htdocs/langs/zh_CN/stripe.lang
+++ b/htdocs/langs/zh_CN/stripe.lang
@@ -1,65 +1,67 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
-StripeOrCBDoPayment=Pay with credit card or Stripe
+StripeSetup=Stripe模块设置
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=使用信用卡或Stripe付款
 FollowingUrlAreAvailableToMakePayments=以下网址可提供给客户的网页上，能够作出Dolibarr支付对象
 PaymentForm=付款方式
-WelcomeOnPaymentPage=欢迎您来到我们的在线支付服务
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=这个屏幕允许你进行网上支付%s。
 ThisIsInformationOnPayment=这是在做付款信息
 ToComplete=要完成
 YourEMail=付款确认的电子邮件
-STRIPE_PAYONLINE_SENDEMAIL=电子邮件提醒后付款（成功与否）
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=债权人
 PaymentCode=付款代码
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
-YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=您将被重定向到受保护的Stripe页面以输入您的信用卡信息
 Continue=下一个
 ToOfferALinkForOnlinePayment=网址为%s支付
-ToOfferALinkForOnlinePaymentOnOrder=网址提供一个命令%s网上支付的用户界面
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=网址提供发票一%s在线支付的用户界面
 ToOfferALinkForOnlinePaymentOnContractLine=网址提供了一个合同线%s在线支付的用户界面
 ToOfferALinkForOnlinePaymentOnFreeAmount=网址提供一个免费的网上支付金额%s用户界面
 ToOfferALinkForOnlinePaymentOnMemberSubscription=网址为会员提供订阅%s在线支付的用户界面
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=本页面确认您的付款已记录。谢谢。
-YourPaymentHasNotBeenRecorded=您的付款并没有被记录和交易已取消。谢谢。
+SetupStripeToHavePaymentCreatedAutomatically=使用网址<b> %s </b>设置Stripe，以便在Stripe验证时自动创建付款。
 AccountParameter=帐户参数
 UsageParameter=使用参数
 InformationToFindParameters=帮助，找到你的%s帐户信息
-STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+STRIPE_CGI_URL_V2=Stripe CGI模块的URL用于付款
 VendorName=供应商名称
 CSSUrlForPaymentForm=付款方式的CSS样式表的URL
-NewStripePaymentReceived=New Stripe payment received
-NewStripePaymentFailed=New Stripe payment tried but failed
-STRIPE_TEST_SECRET_KEY=Secret test key
-STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
-STRIPE_LIVE_SECRET_KEY=Secret live key
-STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
-StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
-StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
-StripeGateways=Stripe gateways
-OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
-OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
-BankAccountForBankTransfer=Bank account for fund payouts
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
+NewStripePaymentReceived=收到新Stripe付款
+NewStripePaymentFailed=新Stripe付款尝试但失败了
+STRIPE_TEST_SECRET_KEY=秘密测试密钥
+STRIPE_TEST_PUBLISHABLE_KEY=可发布的测试密钥
+STRIPE_TEST_WEBHOOK_KEY=Webhook测试密钥
+STRIPE_LIVE_SECRET_KEY=秘密活钥匙
+STRIPE_LIVE_PUBLISHABLE_KEY=可发布的现场钥匙
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live键
+ONLINE_PAYMENT_WAREHOUSE=在线支付完成时用于库存减少的库存<br>（TODO当对发票上的操作减少库存的选项并且在线支付自己生成发票？）
+StripeLiveEnabled=Stripe live enabled（否则为test / sandbox模式）
+StripeImportPayment=导入Stripe付款
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+StripeGateways=Stripe网关
+OAUTH_STRIPE_TEST_ID=Stripe连接客户端ID（ca _...）
+OAUTH_STRIPE_LIVE_ID=Stripe连接客户端ID（ca _...）
+BankAccountForBankTransfer=基金支付的银行账户
+StripeAccount=Stripe帐户
+StripeChargeList=Stripe费用清单
+StripeTransactionList=Stripe事务列表
+StripeCustomerId=Stripe客户ID
+StripePaymentModes=Stripe支付模式
+LocalID=本地ID
 StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+NameOnCard=卡片上的名字
+CardNumber=卡号
+ExpiryDate=到期日
 CVN=CVN
-DeleteACard=Delete Card
-ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
-CreateCustomerOnStripe=Create customer on Stripe
-CreateCardOnStripe=Create card on Stripe
-ShowInStripe=Show in Stripe
+DeleteACard=删除卡
+ConfirmDeleteCard=您确定要删除此信用卡或借记卡吗？
+CreateCustomerOnStripe=在Stripe上创建客户
+CreateCardOnStripe=在Stripe上创建卡片
+ShowInStripe=在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)
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index befae4c5855..7226bc67409 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index fd24a829aee..95b6868ae2f 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -107,7 +107,7 @@ ExpenseReportsVentilation=費用報表的關聯
 CreateMvts=建立新的交易
 UpdateMvts=交易的修改
 ValidTransaction=驗證交易
-WriteBookKeeping=在總帳中記錄交易
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=總帳
 AccountBalance=項目餘額
 ObjectsRef=參考的來源物件
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=預設已購產品的會計項目(如果在產品頁沒有定義時使用)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=預設已售產品的會計項目(如果在產品頁沒有定義時使用)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (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_SERVICE_SOLD_ACCOUNT=服務收入預設會計項目(若沒在服務頁中定義時使用)
 
@@ -177,6 +177,7 @@ LabelAccount=標籤會計項目
 LabelOperation=標籤操作
 Sens=Sens
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=日記簿
 JournalLabel=Journal label
 NumPiece=件數
@@ -288,8 +289,10 @@ 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 (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=會計項目表ID
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=當沒有設定特定會計項目時，此頁面可設定預
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=選項
 OptionModeProductSell=銷售模式
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=採購模式
 OptionModeProductSellDesc=顯示銷售產品的會計項目
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=顯示採購所有產品的會計項目
 CleanFixHistory=移除會計代號將不再出現在會計項目表中。
 CleanHistory=針對選定年度重設全部關聯性
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 6347ded725c..6f650158058 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=另外您若有大量合作方 (> 100,000), 您
 UseSearchToSelectContactTooltip=另外您若有大量合作方 (> 100,000), 您可在 " 設定 -> 其他" 中設定常數 CONTACT_DONOTSEARCH_ANYWHERE 為 1 以增加速度。蒐尋則只限在字串的開頭。
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=需要 %s 個字元進行搜尋
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=當 Ajax 不啓動時，此停用。
 AllowToSelectProjectFromOtherCompany=在合作方的文件上，可選擇已結專案到另外合作方。
 JavascriptDisabled=JavaScript 不啓動
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=連接埠
 VirtualServerName=虛擬服務器名稱
 OS=作業系統
 PhpWebLink=網路PHP的連線
-Browser=瀏覽器
 Server=服務器
 Database=資料庫
 DatabaseServer=資料庫主機
@@ -1055,7 +1057,7 @@ 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).
+SetupDescription3=<a href="%s">%s -> %s</a><br>應用軟體中預設行為，其基本參數是可以客製化的(例如：與國家相關的功能)。
 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.
 SetupDescription5=Other Setup menu entries manage optional parameters.
 LogEvents=安全稽核事件
@@ -1077,7 +1079,7 @@ SystemInfoDesc=僅供具有系統管理員以唯讀及可見模式取得系統
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=編輯公司/項目的資訊。點選在頁面下方的 "%s" 或 "%s" 按鈕。
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=檔案數
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=可用的程式/模組
 ToActivateModule=為啟動模組則到設定區（首頁 -> 設定 -> 模組）。
@@ -1237,8 +1239,6 @@ BillsNumberingModule=發票及貸方通知單編號模組
 BillsPDFModules=發票文件模組
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=付款文件模式
-CreditNote=貸方通知單
-CreditNotes=貸方通知單
 ForceInvoiceDate=強制使用驗證日期為發票(invoice)日期
 SuggestedPaymentModesIfNotDefinedInInvoice=如果在發票上沒有定義付款方式，則其預設值。
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=載入會計項目表
 SocialNetworkSetup=設定社交網路模組
 EnableFeatureFor=針對 <strong>%s</strong> 啓用功能
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=郵遞區號
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ 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
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index 510c9f5eccc..d4261630b4b 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Dolibarr 會在待辦中自動建立行動的事件
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=合作方 %s 已建立
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=合約 %s 已驗證
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=提案/建議書 %s 已簽署
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=專案 %s 已修改
 PROJECT_DELETEInDolibarr=專案 %s 已刪除
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 56076960df8..9e8e378a066 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=銀行
-MenuBankCash=銀行 | 現金
+MenuBankCash=Banks | Cash
 MenuVariousPayment=雜項付款
 MenuNewVariousPayment=新的雜項付款
 BankName=銀行名稱
 FinancialAccount=帳戶
 BankAccount=銀行帳戶
-BankAccounts=各式銀行帳戶
-BankAccountsAndGateways=銀行 | 入口
+BankAccounts=銀行帳戶
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=顯示金額
 AccountRef=金融帳戶參考值
 AccountLabel=金融帳戶標籤
 CashAccount=現金帳戶
-CashAccounts=各式現金帳戶
-CurrentAccounts=目前各式帳戶
-SavingAccounts=各式儲蓄帳戶
+CashAccounts=現金帳戶
+CurrentAccounts=目前帳戶
+SavingAccounts=儲蓄帳戶
 ErrorBankLabelAlreadyExists=金融帳戶標籤已存在
 BankBalance=餘額
 BankBalanceBefore=餘額前
@@ -26,27 +26,27 @@ EndBankBalance=期末餘額
 CurrentBalance=目前餘額
 FutureBalance=未來餘額
 ShowAllTimeBalance=從一開始顯示餘額
-AllTime=From start
+AllTime=從哪開始
 Reconciliation=調節
 RIB=銀行帳戶的號碼
 IBAN=IBAN 號碼
-BIC=BIC/SWIFT 的號碼
+BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT 有效
 SwiftVNotalid=BIC/SWIFT 無效
 IbanValid=BAN 有效
 IbanNotValid=BAN 無效
-StandingOrders=Direct Debit orders
-StandingOrder=Direct debit order
+StandingOrders=直接扣款
+StandingOrder=直接扣款
 AccountStatement=帳戶報表
 AccountStatementShort=報表
-AccountStatements=各式帳戶報表
+AccountStatements=帳戶報表
 LastAccountStatements=最近帳戶報表
 IOMonthlyReporting=每月報告
-BankAccountDomiciliation=帳戶地址
+BankAccountDomiciliation=Bank address
 BankAccountCountry=帳戶的國家
 BankAccountOwner=帳戶持有人姓名
 BankAccountOwnerAddress=帳戶持有人地址
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+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=建立帳戶
 NewBankAccount=新帳戶
 NewFinancialAccount=新的金融帳戶
@@ -82,8 +82,8 @@ IncludeClosedAccount=包括已結束帳戶
 OnlyOpenedAccount=僅開放的各式帳戶
 AccountToCredit=要貸方的帳戶
 AccountToDebit=要借方的帳戶
-DisableConciliation=此帳戶禁用調節功能
-ConciliationDisabled=調節功能禁用
+DisableConciliation=此帳戶停用調節功能
+ConciliationDisabled=調節功能停用
 LinkedToAConciliatedTransaction=連結到調節項目
 StatusAccountOpened=開放
 StatusAccountClosed=已結束
@@ -98,14 +98,14 @@ BankLineConciliated=項目已調節
 Reconciled=已調節
 NotReconciled=未調節
 CustomerInvoicePayment=客戶付款
-SupplierInvoicePayment=供應商付款
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=訂閱付款
 WithdrawalPayment=提款支付
 SocialContributionPayment=社會/財務稅負繳款單
 BankTransfer=銀行轉帳
 BankTransfers=銀行轉帳
 MenuBankInternalTransfer=內部轉帳
-TransferDesc=從某一帳戶轉到另一帳戶時，Dolibarr 會寫成成兩筆記錄(來源帳戶是貸方，目標帳戶是借方)。此交易有相同金額、標籤、日期。
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=從
 TransferTo=至
 TransferFromToDone=從<b>%s</b>到<b>%s</b>的<b>%s</b>%s轉帳已記錄。
@@ -136,32 +136,34 @@ BankTransactionLine=銀行項目
 AllAccounts=所有銀行及現金帳戶
 BackToAccount=回到帳戶
 ShowAllAccounts=顯示所有帳戶
-FutureTransaction=未來的交易。不可調節。
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate="選擇/篩選器"支票包含在支票存款的收據並點擊“建立”。
 InputReceiptNumber=選擇要調節的銀行對帳單。使用可排序的數值： YYYYMM 或 YYYYMMDD
-EventualyAddCategory=Eventually, specify a category in which to classify the records
+EventualyAddCategory=最後，指定記錄的類別進行分類
 ToConciliate=調節嗎？
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
+ThenCheckLinesAndConciliate=然後，在銀行對帳單中檢查目前行數及點擊
 DefaultRIB=預設 BAN
 AllRIB=全部 BAN
 LabelRIB=BAN 標籤
 NoBANRecord=沒有 BAN 記錄
 DeleteARib=刪除 BAN 記錄
 ConfirmDeleteRib=您確定要刪除此 BAN 記錄
-RejectCheck=Check returned
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
-RejectCheckDate=Date the check was returned
-CheckRejected=Check returned
-CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=新的雜項付款
-VariousPayment=雜項付款
+RejectCheck=支票退回
+ConfirmRejectCheck=您確定要將此支票標記為已拒絕嗎？
+RejectCheckDate=退回支票的日期
+CheckRejected=支票退回
+CheckRejectedAndInvoicesReopened=支票退回並重新開啟發票
+BankAccountModelModule=銀行帳戶的文件範例/本
+DocumentModelSepaMandate=歐洲統一支付區要求的範例/本。僅適用於歐洲經濟共同體的歐洲國家。
+DocumentModelBan=列印有BAN資訊的範例/本。
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=雜項付款
-ShowVariousPayment=顯示雜項付款
-AddVariousPayment=新增雜項付款
-SEPAMandate=SEPA mandate
-YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
+SEPAMandate=歐洲統一支付區要求
+YourSEPAMandate=您的歐洲統一支付區要求
+FindYourSEPAMandate=這是認證我們公司的歐洲統一支付區要求可直接從您的銀行扣款。返回簽名檔（掃描簽名文件）或用郵件發送給
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index d41aab3d6d9..9733329db6b 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -66,8 +66,10 @@ paymentInInvoiceCurrency=發票的幣別
 PaidBack=返回款項
 DeletePayment=刪除付款
 ConfirmDeletePayment=您確定要刪除此付款？
-ConfirmConvertToReduc=您想轉換成此%s絕對折扣嗎客戶？ <br>該金額將保存於所有折扣中，並可用作此客戶的目前或未來發票的折扣。
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Vendor payments
 ReceivedPayments=收到的付款
 ReceivedCustomersPayments=從客戶收到的付款
@@ -89,7 +91,6 @@ PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
 PaymentAmount=付款金額
-ValidatePayment=驗證付款
 PaymentHigherThanReminderToPay=付款支付更高的比提醒
 HelpPaymentHigherThanReminderToPay=注意，一張或多張帳單的付款金額高於未付金額。<br>編輯您的輸入，否則請確認並考慮為每張超額支付的發票建立貸方通知單。
 HelpPaymentHigherThanReminderToPaySupplier=注意，一張或多張帳單的付款金額高於未付金額。<br>編輯您的輸入，否則請確認並考慮為每張超額支付的發票建立貸方通知單。
@@ -366,6 +367,7 @@ InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=日期尚未到
 InvoiceGeneratedFromTemplate=從重複性發票範本%s產生發票%s
+GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=警告，發票日期大於目前日期
 WarningInvoiceDateTooFarInFuture=警告，發票日期遠大於目前日期
 ViewAvailableGlobalDiscounts=檢視可用折扣
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index 0f0bed24fee..3dd8a9cf311 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -62,3 +62,9 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+History=歷史紀錄
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index eaced385394..406c2b9ad08 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -80,7 +80,6 @@ AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=新的支付
-Payments=付款
 PaymentCustomerInvoice=客戶付款發票
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=社會/財務稅負繳款單
@@ -205,7 +204,6 @@ SellsJournal=銷售雜誌
 PurchasesJournal=購買雜誌
 DescSellsJournal=銷售雜誌
 DescPurchasesJournal=購買雜誌
-InvoiceRef=發票編號。
 CodeNotDef=沒有定義
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 7f2ac14d789..5c767727593 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -217,6 +217,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 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
 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
diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
index 7c3418d2f28..997b40eb104 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -116,7 +116,7 @@ HolidaysToValidateAlertSolde=The user who made this leave request does not have
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
@@ -127,3 +127,4 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 5fc221eacc2..3786469cafd 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -371,6 +371,7 @@ Percentage=百分比
 Total=總計
 SubTotal=小計
 TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=總計（含稅）
 TotalHT=Total (excl. tax)
@@ -643,7 +644,6 @@ SendAcknowledgementByMail=傳送確認電子郵件
 SendMail=傳送電子郵件
 Email=電子郵件
 NoEMail=沒有電子郵件
-Email=電子郵件
 AlreadyRead=Already read
 NotRead=Not read
 NoMobilePhone=沒有手機
@@ -671,7 +671,6 @@ Method=方法
 Receive=收到
 CompleteOrNoMoreReceptionExpected=完成或沒有更多的預期
 ExpectedValue=期望值
-CurrentValue=當前值
 PartialWoman=部分
 TotalWoman=全部
 NeverReceived=從未收到
@@ -834,6 +833,7 @@ RelatedObjects=相關物件
 ClassifyBilled=分類計費
 ClassifyUnbilled=分類未開單
 Progress=進展
+ProgressShort=Progr.
 FrontOffice=前面辦公室
 BackOffice=回到辦公室
 View=檢視
@@ -842,6 +842,11 @@ Exports=各式匯出
 ExportFilteredList=匯出篩選的明細表
 ExportList=匯出明細表
 ExportOptions=匯出選項
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=雜項
 Calendar=日曆
 GroupBy=群組依...
@@ -854,7 +859,7 @@ Download=下載
 DownloadDocument=下載文件
 ActualizeCurrency=更新匯率
 Fiscalyear=會計年度
-ModuleBuilder=模組建立者
+ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=設定幣別
 BulkActions=大量動作
 ClickToShowHelp=點一下顯示工具提示
@@ -970,3 +975,7 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index f4bbd3d9c1b..35505032a19 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -6,7 +6,7 @@ Member=成員
 Members=Members
 ShowMember=出示會員卡
 UserNotLinkedToMember=用戶成員沒有聯系
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
 MembersTickets=成員的機票
 FundationMembers=基金會成員
 ListOfValidatedPublicMembers=驗證市民名單
@@ -67,11 +67,11 @@ Subscriptions=訂閱
 SubscriptionLate=晚
 SubscriptionNotReceived=認購從未收到
 ListOfSubscriptions=訂閱名單
-SendCardByMail=發送卡
+SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=任何成員類型定義。前往設置 - 會員類型
 NewMemberType=新會員類型
-WelcomeEMail=歡迎電子郵件
+WelcomeEMail=Welcome email
 SubscriptionRequired=認購要求
 DeleteType=刪除
 VoteAllowed=允許投票
@@ -124,16 +124,16 @@ CardContent=內容您的會員卡
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or is already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=發件人的電子郵件自動電子郵件
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=標簽的格式頁
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=卡的格式頁
@@ -156,8 +156,8 @@ DocForAllMembersCards=成員（名片格式生成所有輸出實際上設置<b>
 DocForOneMemberCards=設置<b>：%s</b>生成名片輸出實際上是一個特定的成員（格式）
 DocForLabels=生成報告表（格式輸出實際上設置<b>：%s）</b>
 SubscriptionPayment=認購款項
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=成員由國家統計
 MembersStatisticsByState=成員由州/省的統計信息
 MembersStatisticsByTown=成員由鎮統計
@@ -187,7 +187,7 @@ MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
+NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
 NameOrCompany=Name or company
 SubscriptionRecorded=Subscription recorded
@@ -195,3 +195,6 @@ NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
 SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. 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
diff --git a/htdocs/langs/zh_TW/modulebuilder.lang b/htdocs/langs/zh_TW/modulebuilder.lang
index eda5de60ad4..0afcfb9b0d0 100644
--- a/htdocs/langs/zh_TW/modulebuilder.lang
+++ b/htdocs/langs/zh_TW/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module.<br>Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -21,13 +21,14 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted!
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
 DangerZone=Danger zone
 BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
 EditorUrl=URL of editor
@@ -43,10 +44,11 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Erase and regenerate class and sql files
+RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
+ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
@@ -62,9 +64,11 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP libraries
+PageForLib=File for PHP library
+PageForObjLib=File for PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -81,8 +85,10 @@ IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Ex
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
+MenusDefDesc=Define here the menus provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
@@ -110,3 +116,4 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
diff --git a/htdocs/langs/zh_TW/paybox.lang b/htdocs/langs/zh_TW/paybox.lang
index f2b92bd4087..fe4a0fe54b6 100644
--- a/htdocs/langs/zh_TW/paybox.lang
+++ b/htdocs/langs/zh_TW/paybox.lang
@@ -10,17 +10,17 @@ ToComplete=要完成
 YourEMail=付款確認的電子郵件
 Creditor=債權人
 PaymentCode=付款代碼
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pay with Paybox
 ToPay=不要付款
 YouWillBeRedirectedOnPayBox=您將被重定向擔保Paybox頁，輸入您的信用卡信息
 Continue=未來
 ToOfferALinkForOnlinePayment=網址為%s支付
-ToOfferALinkForOnlinePaymentOnOrder=網址提供一個命令%s網上支付的用戶界面
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=網址提供發票一%s在線支付的用戶界面
 ToOfferALinkForOnlinePaymentOnContractLine=網址提供了一個合同線%s在線支付的用戶界面
 ToOfferALinkForOnlinePaymentOnFreeAmount=網址提供一個免費的網上支付金額%s用戶界面
 ToOfferALinkForOnlinePaymentOnMemberSubscription=網址為會員提供訂閱%s在線支付的用戶界面
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment, user interface for payment of donation
 YouCanAddTagOnUrl=您還可以添加<b>標簽=</b> url參數<b>及<i>價值</i></b>的任何網址（只需要支付免費）添加自己的註釋標記付款。
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=本頁面確認您的付款已記錄。謝謝。
@@ -33,7 +33,8 @@ VendorName=供應商名稱
 CSSUrlForPaymentForm=付款方式的CSS樣式表的URL
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/zh_TW/paypal.lang b/htdocs/langs/zh_TW/paypal.lang
index 71e430a2993..3dce92149e3 100644
--- a/htdocs/langs/zh_TW/paypal.lang
+++ b/htdocs/langs/zh_TW/paypal.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=貝寶模塊的設置
-PaypalDesc=該模塊提供的網頁，允許<a href="http://www.paypal.com" target="_blank">對貝</a>寶支付客戶的。這可以使用一個免費的付款或支付上一個特定的Dolibarr對象（發票，訂單，... ...）
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=用PayPal
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=測試/沙箱模式
 PAYPAL_API_USER=API的用戶名
 PAYPAL_API_PASSWORD=API密碼
 PAYPAL_API_SIGNATURE=API簽名
 PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=優惠“不可分割的”支付（信用卡+貝寶）或“貝寶”只
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
 ThisIsTransactionId=這是交易編號<b>：%s</b>
-PAYPAL_ADD_PAYMENT_URL=當你郵寄一份文件，添加URL Paypal付款
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Return URL after payment
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
@@ -28,7 +27,10 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 99cc16cbe36..182fd2b6339 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -260,7 +260,7 @@ AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaters=External updaters for variables
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -294,7 +294,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Use vendor descriptions of products in vendor documents
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
 #Attributes
 VariantAttributes=Variant attributes
@@ -339,3 +339,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index bdac82e4602..c36a6b044f6 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -45,8 +45,9 @@ TimeSpent=花費的時間
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=所花費的時間
-RefTask=參考的任務
-LabelTask=標簽任務
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=用戶
 TaskTimeNote=註解
diff --git a/htdocs/langs/zh_TW/stripe.lang b/htdocs/langs/zh_TW/stripe.lang
index ca989766167..a390881159f 100644
--- a/htdocs/langs/zh_TW/stripe.lang
+++ b/htdocs/langs/zh_TW/stripe.lang
@@ -1,30 +1,28 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=以下網址可提供給客戶的網頁上，能夠作出Dolibarr支付對象
 PaymentForm=付款方式
-WelcomeOnPaymentPage=歡迎您來到我們的在線支付服務
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=這個屏幕允許你進行網上支付%s。
 ThisIsInformationOnPayment=這是在做付款信息
 ToComplete=要完成
 YourEMail=付款確認的電子郵件
-STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
 Creditor=債權人
 PaymentCode=付款代碼
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pay with Stripe
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=未來
 ToOfferALinkForOnlinePayment=網址為%s支付
-ToOfferALinkForOnlinePaymentOnOrder=網址提供一個命令%s網上支付的用戶界面
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
 ToOfferALinkForOnlinePaymentOnInvoice=網址提供發票一%s在線支付的用戶界面
 ToOfferALinkForOnlinePaymentOnContractLine=網址提供了一個合同線%s在線支付的用戶界面
 ToOfferALinkForOnlinePaymentOnFreeAmount=網址提供一個免費的網上支付金額%s用戶界面
 ToOfferALinkForOnlinePaymentOnMemberSubscription=網址為會員提供訂閱%s在線支付的用戶界面
 YouCanAddTagOnUrl=您還可以添加<b>標簽=</b> url參數<b>及<i>價值</i></b>的任何網址（只需要支付免費）添加自己的註釋標記付款。
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-YourPaymentHasBeenRecorded=本頁面確認您的付款已記錄。謝謝。
-YourPaymentHasNotBeenRecorded=您的付款並沒有被記錄和交易已取消。謝謝。
 AccountParameter=帳戶參數
 UsageParameter=使用參數
 InformationToFindParameters=幫助，找到你的%s帳戶信息
@@ -42,7 +40,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -63,3 +61,7 @@ ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 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)
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index 862018289dc..a7fdef907cc 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -96,3 +96,8 @@ ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
 GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 1d00718401b..2e42d42acaa 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -68,7 +68,7 @@ a.butActionNew>span.fa-list-alt, a.butActionNew>span.fa-list-alt:hover,
 span.butActionNew>span.fa-list-alt, span.butActionNew>span.fa-list-alt:hover,
 a.butActionNewRefused>span.fa-list-alt, a.butActionNewRefused>span.fa-list-alt:hover,
 span.butActionNewRefused>span.fa-list-alt, span.butActionNewRefused>span.fa-list-alt:hover {
-	padding-left: 6px; font-size: 1.5em; border: none; box-shadow: none; webkit-box-shadow: none;
+	padding-<?php echo $left; ?>: 6px; font-size: 1.5em; border: none; box-shadow: none; webkit-box-shadow: none;
 }
 
 .butAction:hover   {
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index b20db935154..7b6dcaad245 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -51,7 +51,7 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 .tmenu .dropdown-menu, .login_block .dropdown-menu {
     position: absolute;
     right: 0;
-    left: auto;
+    <?php echo $left; ?>: auto;
     line-height:1.3em;
 }
 .tmenu .dropdown-menu, .login_block  .dropdown-menu .user-body {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 9061595dd1d..cd448ff854e 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -552,13 +552,13 @@ select.flat.selectlimit {
 	margin-right: 10px !important;
 }
 .marginleftonly {
-	margin-left: 10px !important;
+	margin-<?php echo $left; ?>: 10px !important;
 }
 .marginleftonlyshort {
-	margin-left: 4px !important;
+	margin-<?php echo $left; ?>: 4px !important;
 }
 .nomarginleft {
-	margin-left: 0px !important;
+	margin-<?php echo $left; ?>: 0px !important;
 }
 .margintoponly {
 	margin-top: 10px !important;
@@ -911,7 +911,7 @@ select.selectarrowonleft option {
 	}
 
 	div.divphotoref {
-		padding-right: 5px;
+		padding-<?php echo $right; ?>: 5px;
 	    padding-bottom: 5px;
 	}
     img.photoref, div.photoref {
@@ -1008,7 +1008,7 @@ td.showDragHandle {
 
 .side-nav {
 	display: table-cell;
-	border-right: 1px solid #d0d0d0;
+	border-<?php echo $right; ?>: 1px solid #d0d0d0;
 	box-shadow: 3px 0 6px -2px #eee;
 	background: rgb(<?php echo $colorbackvmenu1; ?>);
 	transition: left 0.5s ease;
@@ -1286,7 +1286,7 @@ div.heightref {
 	min-height: 80px;
 }
 div.divphotoref {
-	padding-right: 20px;
+	padding-<?php echo $right; ?>: 20px;
 }
 div.paginationref {
 	padding-bottom: 10px;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a151fdb5574..d89e1308612 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2389,7 +2389,7 @@ class User extends CommonObject
 		if ($withpictoimg)
 		{
 		  	$paddafterimage='';
-			if (abs($withpictoimg) == 1) $paddafterimage='style="margin-right: 3px;"';
+		  	if (abs($withpictoimg) == 1) $paddafterimage='style="margin-'.($langs->trans("DIRECTION")=='rtl'?'left':'right').': 3px;"';
 			// Only picto
 			if ($withpictoimg > 0) $picto='<!-- picto user --><div class="inline-block nopadding userimg'.($morecss?' '.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
 			// Picto must be a photo

From ee8ddb574431dbb6e23ecde7bf8f2cbe941e6fe9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 13:23:00 +0200
Subject: [PATCH 111/133] Fix link to fix table charset

---
 htdocs/admin/system/database-tables.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index c04c91e0e66..135efb734c2 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -21,7 +21,7 @@
 
 /**
  *	\file       htdocs/admin/system/database-tables.php
- *	\brief      Page d'infos des tables de la base
+ *	\brief      Page with information on database tables
  */
 
 require '../../main.inc.php';
@@ -134,7 +134,7 @@ else
 				print '<td align="right">'.$obj->Auto_increment.'</td>';
 				print '<td align="right">'.$obj->Check_time.'</td>';
 				print '<td align="right">'.$obj->Collation;
-				if (isset($obj->Collation) && ($obj->Collation == "utf8mb4_general_ci" || $obj->Collation == "utf8mb4_unicode_ci"))
+				if (isset($obj->Collation) && (in_array($obj->Collation, array("utf8mb4_general_ci", "utf8mb4_unicode_ci", "latin1_swedish_ci"))))
 				{
 				    print '<br><a class="reposition" href="database-tables.php?action=convertutf8&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' UTF8</a>';
 				}

From 64de57d781227abf818dff59a108ce8de4683aad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 13:28:20 +0200
Subject: [PATCH 112/133] FIX bad request

---
 htdocs/install/mysql/migration/repair.sql | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 076f1962325..51fe48dcda2 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -205,8 +205,6 @@ CREATE TABLE tmp_user as (select * from llx_user);
 UPDATE llx_user SET fk_user = NULL where fk_user NOT IN (select rowid from tmp_user);
 
 
-update llx_user set fk_user = null where fk_user not in (select rowid from llx_user);
-
 
 UPDATE llx_product SET canvas = NULL where canvas = 'default@product';
 UPDATE llx_product SET canvas = NULL where canvas = 'service@product';

From e6ea9cc448d81daefca1a00067a2dcd2b10f0551 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 14:15:10 +0200
Subject: [PATCH 113/133] Clean widget not correctly removed

---
 htdocs/install/repair.php | 73 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 71 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 143798b168b..8403bd44321 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -389,11 +389,80 @@ if ($ok && GETPOST('standard', 'alpha'))
 							{
 								$db->query($sqldelete);
 
-								print '<tr><td>Constant '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module not enabled in entity '.$obj->entity.', we delete record</td></tr>';
+								print '<tr><td>Widget '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module not enabled in entity '.$obj->entity.', we delete record</td></tr>';
 							}
 							else
 							{
-								print '<tr><td>Constant '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module not enabled in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
+								print '<tr><td>Widget '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module not enabled in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
+							}
+						}
+						else
+						{
+							//print '<tr><td>Constant '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module found in entity '.$obj->entity.', we keep record</td></tr>';
+						}
+					}
+				}
+
+				$i++;
+			}
+
+			$db->commit();
+		}
+	}
+}
+
+
+// clean box of not enabled modules
+if ($ok && GETPOST('standard', 'alpha'))
+{
+	print '<tr><td colspan="2"><br>*** Clean definition of boxes of modules not enabled</td></tr>';
+
+	$sql ="SELECT file, entity FROM ".MAIN_DB_PREFIX."boxes_def";
+	$sql.=" WHERE file like '%@%'";
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+
+		if ($num)
+		{
+			$db->begin();
+
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj=$db->fetch_object($resql);
+
+				$reg = array();
+				if (preg_match('/^(.+)@(.+)$/i', $obj->file, $reg))
+				{
+					$name=$reg[1];
+					$module=$reg[2];
+
+					$sql2 ="SELECT COUNT(*) as nb";
+					$sql2.=" FROM ".MAIN_DB_PREFIX."const as c";
+					$sql2.=" WHERE name = 'MAIN_MODULE_".strtoupper($module)."'";
+					$sql2.=" AND entity = ".$obj->entity;
+					$sql2.=" AND value <> 0";
+					$resql2 = $db->query($sql2);
+					if ($resql2)
+					{
+						$obj2 = $db->fetch_object($resql2);
+						if ($obj2 && $obj2->nb == 0)
+						{
+							// Module not found, so we canremove entry
+							$sqldelete = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def WHERE file = '".$obj->file."' AND entity = ".$obj->entity;
+
+							if (GETPOST('standard', 'alpha') == 'confirmed')
+							{
+								$db->query($sqldelete);
+
+								print '<tr><td>Constant '.$obj->file.' set in llx_boxes for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we delete record</td></tr>';
+							}
+							else
+							{
+								print '<tr><td>Constant '.$obj->file.' set in llx_boxes for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
 							}
 						}
 						else

From fdff737329f5ad9c2f95999cbc65b2e0fd3b3dcc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 14:33:04 +0200
Subject: [PATCH 114/133] Fix clean of database

---
 htdocs/install/repair.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 8403bd44321..fc9c63e4a40 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -452,17 +452,19 @@ if ($ok && GETPOST('standard', 'alpha'))
 						if ($obj2 && $obj2->nb == 0)
 						{
 							// Module not found, so we canremove entry
-							$sqldelete = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def WHERE file = '".$obj->file."' AND entity = ".$obj->entity;
+							$sqldeletea = "DELETE FROM ".MAIN_DB_PREFIX."boxes WHERE entity = ".$obj->entity." AND box_id IN (SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def WHERE file = '".$obj->file."' AND entity = ".$obj->entity.")";
+							$sqldeleteb = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def WHERE file = '".$obj->file."' AND entity = ".$obj->entity;
 
 							if (GETPOST('standard', 'alpha') == 'confirmed')
 							{
-								$db->query($sqldelete);
+								$db->query($sqldeletea);
+								$db->query($sqldeleteb);
 
-								print '<tr><td>Constant '.$obj->file.' set in llx_boxes for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we delete record</td></tr>';
+								print '<tr><td>Constant '.$obj->file.' set in boxes_def for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we delete record</td></tr>';
 							}
 							else
 							{
-								print '<tr><td>Constant '.$obj->file.' set in llx_boxes for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
+								print '<tr><td>Constant '.$obj->file.' set in boxes_def for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
 							}
 						}
 						else

From db241b22dd28165980996c09f7f3de7a92dd4133 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 14:33:04 +0200
Subject: [PATCH 115/133] Fix clean of database

---
 htdocs/install/repair.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 8403bd44321..fc9c63e4a40 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -452,17 +452,19 @@ if ($ok && GETPOST('standard', 'alpha'))
 						if ($obj2 && $obj2->nb == 0)
 						{
 							// Module not found, so we canremove entry
-							$sqldelete = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def WHERE file = '".$obj->file."' AND entity = ".$obj->entity;
+							$sqldeletea = "DELETE FROM ".MAIN_DB_PREFIX."boxes WHERE entity = ".$obj->entity." AND box_id IN (SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def WHERE file = '".$obj->file."' AND entity = ".$obj->entity.")";
+							$sqldeleteb = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def WHERE file = '".$obj->file."' AND entity = ".$obj->entity;
 
 							if (GETPOST('standard', 'alpha') == 'confirmed')
 							{
-								$db->query($sqldelete);
+								$db->query($sqldeletea);
+								$db->query($sqldeleteb);
 
-								print '<tr><td>Constant '.$obj->file.' set in llx_boxes for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we delete record</td></tr>';
+								print '<tr><td>Constant '.$obj->file.' set in boxes_def for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we delete record</td></tr>';
 							}
 							else
 							{
-								print '<tr><td>Constant '.$obj->file.' set in llx_boxes for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
+								print '<tr><td>Constant '.$obj->file.' set in boxes_def for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
 							}
 						}
 						else

From eb20df8e64b953b495527e5bfe7ea247b0814dcd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 14:47:46 +0200
Subject: [PATCH 116/133] Fix debug save of state into setup

---
 htdocs/admin/company.php                     | 22 ++++++++++++++++----
 htdocs/core/class/html.formcompany.class.php |  4 ++--
 htdocs/societe/class/societe.class.php       |  3 +--
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index c05305b6393..588383021a0 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -83,7 +83,11 @@ if ( ($action == 'update' && ! GETPOST("cancel", 'alpha'))
 		$mysoc->state_label=$tmparray['label'];
 
 		$s=$mysoc->state_id.':'.$mysoc->state_code.':'.$mysoc->state_label;
-		dolibarr_set_const($db, "MAIN_INFO_SOCIETE_STATE", $s,'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_INFO_SOCIETE_STATE", $s, 'chaine', 0, '', $conf->entity);
+	}
+	else
+	{
+		dolibarr_del_const($db, "MAIN_INFO_SOCIETE_STATE", $conf->entity);
 	}
 
     $db->begin();
@@ -385,7 +389,13 @@ if ($action == 'edit' || $action == 'updateedit')
 
 
 	print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
-	$formcompany->select_departement($conf->global->MAIN_INFO_SOCIETE_STATE, $mysoc->country_code, 'state_id');
+	$state_id=0;
+	if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE))
+	{
+		$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_STATE);
+		$state_id=$tmp[0];
+	}
+	$formcompany->select_departement($state_id, $mysoc->country_code, 'state_id');
 	print '</td></tr>'."\n";
 
 
@@ -774,8 +784,12 @@ else
 
 	if (! empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT)) print '<tr class="oddeven"><td>'.$langs->trans("Region-State").'</td><td>';
 	else print '<tr class="oddeven"><td>'.$langs->trans("State").'</td><td>';
-	if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE)) print getState($conf->global->MAIN_INFO_SOCIETE_STATE, $conf->global->MAIN_SHOW_STATE_CODE, 0, $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
-	else print '&nbsp;';
+	if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE))
+	{
+		$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_STATE);
+		$state_id=$tmp[0];
+		print getState($state_id, $conf->global->MAIN_SHOW_STATE_CODE, 0, $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
+	}
 	print '</td></tr>';
 
 
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index d1366cb8511..17643e2d69a 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -211,13 +211,13 @@ class FormCompany
      *   The key of the list is the code (there can be several entries for a given code but in this case, the country field differs).
      *   Thus the links with the departments are done on a department independently of its name.
 	 *
-	 *    @param	string	$selected        	Code state preselected (mus be state id)
+	 *    @param	int		$selected        	Code state preselected (mus be state id)
 	 *    @param    integer	$country_codeid    	Country code or id: 0=list for all countries, otherwise country code or country rowid to show
 	 *    @param    string	$htmlname			Id of department. If '', we want only the string with <option>
 	 * 	  @return	string						String with HTML select
 	 *    @see select_country()
 	 */
-	public function select_state($selected = '', $country_codeid = 0, $htmlname = 'state_id')
+	public function select_state($selected = 0, $country_codeid = 0, $htmlname = 'state_id')
 	{
         // phpcs:enable
 		global $conf,$langs,$user;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6ccf5eb4fed..5ded310683b 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3438,7 +3438,6 @@ class Societe extends CommonObject
 		$this->address=empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS;
 		$this->zip=empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP;
 		$this->town=empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN;
-		$this->state_id=empty($conf->global->MAIN_INFO_SOCIETE_STATE)?'':$conf->global->MAIN_INFO_SOCIETE_STATE;
 		$this->region_code=empty($conf->global->MAIN_INFO_SOCIETE_REGION)?'':$conf->global->MAIN_INFO_SOCIETE_REGION;
 		$this->object=empty($conf->global->MAIN_INFO_SOCIETE_OBJECT)?'':$conf->global->MAIN_INFO_SOCIETE_OBJECT;
 
@@ -3472,7 +3471,7 @@ class Societe extends CommonObject
 
 		//TODO This could be replicated for region but function `getRegion` didn't exist, so I didn't added it.
 		// We define state_id, state_code and state
-		$state_id=$state_code=$state_label='';
+		$state_id=0;$state_code=$state_label='';
 		if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE))
 		{
 			$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_STATE);

From 3f2ba2780f8020fcbbb60bff1bacd94a3c2b53f1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 18:06:14 +0200
Subject: [PATCH 117/133] Add @ignore so scrutinizer ignores duplicate
 definition of llxHeader

---
 htdocs/asterisk/wrapper.php     |  3 +++
 htdocs/document.php             |  2 ++
 htdocs/imports/emptyexample.php | 15 +++++++++++++--
 htdocs/opensurvey/fonctions.php |  2 +-
 htdocs/viewimage.php            |  2 ++
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index 75cff3a8202..22b78b421f6 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -39,6 +39,7 @@ if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
 /**
  * Empty header
  *
+ * @ignore
  * @return	void
  */
 function llxHeader()
@@ -48,9 +49,11 @@ function llxHeader()
     print '<title>Asterisk redirection from Dolibarr...</title>'."\n";
     print '</head>'."\n";
 }
+
 /**
  * Empty footer
  *
+ * @ignore
  * @return	void
  */
 function llxFooter()
diff --git a/htdocs/document.php b/htdocs/document.php
index 57897786f0d..8e86d6c3e6f 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -55,6 +55,7 @@ if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias'))
 /**
  * Header empty
  *
+ * @ignore
  * @return	void
  */
 function llxHeader()
@@ -63,6 +64,7 @@ function llxHeader()
 /**
  * Footer empty
  *
+ * @ignore
  * @return	void
  */
 function llxFooter()
diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php
index 5d70a3fc08e..619207ca6f1 100644
--- a/htdocs/imports/emptyexample.php
+++ b/htdocs/imports/emptyexample.php
@@ -21,12 +21,23 @@
  *      \brief      Show example of import file
  */
 
-// This file is a wrapper, so empty header
+/**
+ * This file is a wrapper, so empty header
+ *
+ * @ignore
+ * @return	void
+ */
 function llxHeader()
 {
     print '<html><title>Build an import example file</title><body>';
 }
-// This file is a wrapper, so empty footer
+
+/**
+ * This file is a wrapper, so empty footer
+ *
+ * @ignore
+ * @return	void
+ */
 function llxFooter()
 {
     print '</body></html>';
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index b93440f9afd..e890efbc1c9 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -122,7 +122,7 @@ function get_server_name()
 	global $dolibarr_main_url_root;
 
 	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+	//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 	$url=$urlwithouturlroot.dol_buildpath('/opensurvey/', 1);
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 4d13b182fd4..b77beb001b3 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -66,6 +66,7 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 /**
  * Header empty
  *
+ * @ignore
  * @return	void
  */
 function llxHeader()
@@ -74,6 +75,7 @@ function llxHeader()
 /**
  * Footer empty
  *
+ * @ignore
  * @return	void
  */
 function llxFooter()

From 5675e7c50e95361c18c49adc7374a0ecc31ad690 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 18:19:40 +0200
Subject: [PATCH 118/133] Clean code of deprecated method

---
 htdocs/adherents/stats/index.php                           | 4 ----
 htdocs/comm/propal/stats/index.php                         | 5 -----
 htdocs/commande/stats/index.php                            | 4 ----
 htdocs/compta/bank/annuel.php                              | 2 --
 htdocs/compta/bank/graph.php                               | 5 -----
 htdocs/compta/deplacement/stats/index.php                  | 4 ----
 htdocs/compta/facture/stats/index.php                      | 4 ----
 htdocs/compta/salaries/stats/index.php                     | 4 ----
 htdocs/core/boxes/box_graph_invoices_permonth.php          | 4 ----
 htdocs/core/boxes/box_graph_invoices_supplier_permonth.php | 4 ----
 htdocs/core/boxes/box_graph_orders_permonth.php            | 4 ----
 htdocs/core/boxes/box_graph_orders_supplier_permonth.php   | 4 ----
 htdocs/core/boxes/box_graph_product_distribution.php       | 6 ------
 htdocs/core/boxes/box_graph_propales_permonth.php          | 4 ----
 htdocs/core/class/dolgraph.class.php                       | 5 +----
 htdocs/don/stats/index.php                                 | 4 ----
 htdocs/expedition/stats/index.php                          | 4 ----
 htdocs/expedition/stats/month.php                          | 1 -
 htdocs/expensereport/stats/index.php                       | 4 ----
 htdocs/fichinter/stats/index.php                           | 4 ----
 htdocs/product/stats/card.php                              | 1 -
 htdocs/projet/stats/index.php                              | 7 +------
 htdocs/projet/tasks/stats/index.php                        | 2 --
 htdocs/reception/stats/index.php                           | 4 ----
 htdocs/reception/stats/month.php                           | 1 -
 htdocs/ticket/index.php                                    | 2 --
 htdocs/ticket/stats/index.php                              | 4 ----
 27 files changed, 2 insertions(+), 99 deletions(-)

diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 5cad21cdd71..9955466b158 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -81,7 +81,6 @@ $mesg = $px1->isGraphKo();
 if (! $mesg)
 {
     $px1->SetData($data);
-    $px1->SetPrecisionY(0);
     $i=$startyear;
     while ($i <= $endyear)
     {
@@ -96,7 +95,6 @@ if (! $mesg)
     $px1->SetYLabel($langs->trans("NbOfSubscriptions"));
     $px1->SetShading(3);
     $px1->SetHorizTickIncrement(1);
-    $px1->SetPrecisionY(0);
     $px1->mode='depth';
     $px1->SetTitle($langs->trans("NbOfSubscriptions"));
 
@@ -116,7 +114,6 @@ $mesg = $px2->isGraphKo();
 if (! $mesg)
 {
     $px2->SetData($data);
-    $px2->SetPrecisionY(0);
     $i=$startyear;
     while ($i <= $endyear)
     {
@@ -131,7 +128,6 @@ if (! $mesg)
     $px2->SetYLabel($langs->trans("AmountOfSubscriptions"));
     $px2->SetShading(3);
     $px2->SetHorizTickIncrement(1);
-    $px2->SetPrecisionY(0);
     $px2->mode='depth';
     $px2->SetTitle($langs->trans("AmountOfSubscriptions"));
 
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index aa47f1c226d..13b7b5fa2d2 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -110,7 +110,6 @@ $mesg = $px1->isGraphKo();
 if (! $mesg)
 {
     $px1->SetData($data);
-    $px1->SetPrecisionY(0);
     $i=$startyear;$legend=array();
     while ($i <= $endyear)
     {
@@ -125,7 +124,6 @@ if (! $mesg)
     $px1->SetYLabel($langs->trans("NbOfProposals"));
     $px1->SetShading(3);
     $px1->SetHorizTickIncrement(1);
-    $px1->SetPrecisionY(0);
     $px1->mode='depth';
     $px1->SetTitle($langs->trans("NumberOfProposalsByMonth"));
 
@@ -152,7 +150,6 @@ $mesg = $px2->isGraphKo();
 if (! $mesg)
 {
     $px2->SetData($data);
-    $px2->SetPrecisionY(0);
     $i=$startyear;$legend=array();
     while ($i <= $endyear)
     {
@@ -167,7 +164,6 @@ if (! $mesg)
     $px2->SetYLabel($langs->trans("AmountOfProposals"));
     $px2->SetShading(3);
     $px2->SetHorizTickIncrement(1);
-    $px2->SetPrecisionY(0);
     $px2->mode='depth';
     $px2->SetTitle($langs->trans("AmountOfProposalsByMonthHT"));
 
@@ -209,7 +205,6 @@ if (! $mesg)
     $px3->SetHeight($HEIGHT);
     $px3->SetShading(3);
     $px3->SetHorizTickIncrement(1);
-    $px3->SetPrecisionY(0);
     $px3->mode='depth';
     $px3->SetTitle($langs->trans("AmountAverage"));
 
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 81a477d07c5..1d2936263b8 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -119,7 +119,6 @@ $mesg = $px1->isGraphKo();
 if (! $mesg)
 {
     $px1->SetData($data);
-    $px1->SetPrecisionY(0);
     $i=$startyear;$legend=array();
     while ($i <= $endyear)
     {
@@ -134,7 +133,6 @@ if (! $mesg)
     $px1->SetYLabel($langs->trans("NbOfOrder"));
     $px1->SetShading(3);
     $px1->SetHorizTickIncrement(1);
-    $px1->SetPrecisionY(0);
     $px1->mode='depth';
     $px1->SetTitle($langs->trans("NumberOfOrdersByMonth"));
 
@@ -178,7 +176,6 @@ if (! $mesg)
     $px2->SetYLabel($langs->trans("AmountOfOrders"));
     $px2->SetShading(3);
     $px2->SetHorizTickIncrement(1);
-    $px2->SetPrecisionY(0);
     $px2->mode='depth';
     $px2->SetTitle($langs->trans("AmountOfOrdersByMonthHT"));
 
@@ -220,7 +217,6 @@ if (! $mesg)
     $px3->SetHeight($HEIGHT);
     $px3->SetShading(3);
     $px3->SetHorizTickIncrement(1);
-    $px3->SetPrecisionY(0);
     $px3->mode='depth';
     $px3->SetTitle($langs->trans("AmountAverage"));
 
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index c4352b3b97e..6643a9f97fb 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -384,7 +384,6 @@ else
 	$px1->setBgColor('onglet');
 	$px1->setBgColorGrid(array(255,255,255));
 	$px1->SetHorizTickIncrement(1);
-	$px1->SetPrecisionY(0);
 	$px1->draw($file, $fileurl);
 
 	$show1 = $px1->show();
@@ -471,7 +470,6 @@ else
 	$px2->setBgColor('onglet');
 	$px2->setBgColorGrid(array(255,255,255));
 	$px2->SetHorizTickIncrement(1);
-	$px2->SetPrecisionY(0);
 	$px2->draw($file, $fileurl);
 
 	$show2 = $px2->show();
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index cf355beeb77..cdd346c889f 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -252,7 +252,6 @@ else
 		$px1->setBgColor('onglet');
 		$px1->setBgColorGrid(array(255,255,255));
 		$px1->SetHorizTickIncrement(1);
-		$px1->SetPrecisionY(0);
 		$px1->draw($file, $fileurl);
 
 		$show1=$px1->show();
@@ -389,7 +388,6 @@ else
 		$px2->setBgColorGrid(array(255,255,255));
 		$px2->SetHideXGrid(true);
 		//$px2->SetHorizTickIncrement(30.41);	// 30.41 jours/mois en moyenne
-		$px2->SetPrecisionY(0);
 		$px2->draw($file, $fileurl);
 
 		$show2=$px2->show();
@@ -503,7 +501,6 @@ else
 		$px3->SetType(array('linesnopoint','linesnopoint','linesnopoint'));
 		$px3->setBgColor('onglet');
 		$px3->setBgColorGrid(array(255,255,255));
-		$px3->SetPrecisionY(0);
 		$px3->draw($file, $fileurl);
 
 		$show3=$px3->show();
@@ -633,7 +630,6 @@ else
 		$px4->setBgColor('onglet');
 		$px4->setBgColorGrid(array(255,255,255));
 		$px4->SetHorizTickIncrement(1);
-		$px4->SetPrecisionY(0);
 		$px4->draw($file, $fileurl);
 
 		$show4=$px4->show();
@@ -742,7 +738,6 @@ else
 		$px5->setBgColor('onglet');
 		$px5->setBgColorGrid(array(255,255,255));
 		$px5->SetHorizTickIncrement(1);
-		$px5->SetPrecisionY(0);
 		$px5->draw($file, $fileurl);
 
 		$show5=$px5->show();
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index 33bec241d48..830a1bc7e4c 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -107,7 +107,6 @@ $mesg = $px1->isGraphKo();
 if (! $mesg)
 {
 	$px1->SetData($data);
-	$px1->SetPrecisionY(0);
 	$i=$startyear;$legend=array();
 	while ($i <= $endyear)
 	{
@@ -121,7 +120,6 @@ if (! $mesg)
 	$px1->SetYLabel($langs->trans("Number"));
 	$px1->SetShading(3);
 	$px1->SetHorizTickIncrement(1);
-	$px1->SetPrecisionY(0);
 	$px1->mode='depth';
 	$px1->SetTitle($langs->trans("NumberByMonth"));
 
@@ -155,7 +153,6 @@ if (! $mesg)
 	$px2->SetYLabel($langs->trans("Amount"));
 	$px2->SetShading(3);
 	$px2->SetHorizTickIncrement(1);
-	$px2->SetPrecisionY(0);
 	$px2->mode='depth';
 	$px2->SetTitle($langs->trans("AmountTotal"));
 
@@ -197,7 +194,6 @@ if (! $mesg)
     $px3->SetHeight($HEIGHT);
     $px3->SetShading(3);
     $px3->SetHorizTickIncrement(1);
-    $px3->SetPrecisionY(0);
     $px3->mode='depth';
     $px3->SetTitle($langs->trans("AmountAverage"));
 
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 5d8fee98676..99abd48cb49 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -103,7 +103,6 @@ $mesg = $px1->isGraphKo();
 if (! $mesg)
 {
 	$px1->SetData($data);
-	$px1->SetPrecisionY(0);
 	$i=$startyear;$legend=array();
 	while ($i <= $endyear)
 	{
@@ -117,7 +116,6 @@ if (! $mesg)
 	$px1->SetYLabel($langs->trans("NumberOfBills"));
 	$px1->SetShading(3);
 	$px1->SetHorizTickIncrement(1);
-	$px1->SetPrecisionY(0);
 	$px1->mode='depth';
 	$px1->SetTitle($langs->trans("NumberOfBillsByMonth"));
 
@@ -152,7 +150,6 @@ if (! $mesg)
 	$px2->SetYLabel($langs->trans("AmountOfBills"));
 	$px2->SetShading(3);
 	$px2->SetHorizTickIncrement(1);
-	$px2->SetPrecisionY(0);
 	$px2->mode='depth';
 	$px2->SetTitle($langs->trans("AmountOfBillsByMonthHT"));
 
@@ -194,7 +191,6 @@ if (! $mesg)
     $px3->SetHeight($HEIGHT);
     $px3->SetShading(3);
     $px3->SetHorizTickIncrement(1);
-    $px3->SetPrecisionY(0);
     $px3->mode='depth';
     $px3->SetTitle($langs->trans("AmountAverage"));
 
diff --git a/htdocs/compta/salaries/stats/index.php b/htdocs/compta/salaries/stats/index.php
index 0c64ed5865e..d6f94427cce 100644
--- a/htdocs/compta/salaries/stats/index.php
+++ b/htdocs/compta/salaries/stats/index.php
@@ -83,7 +83,6 @@ $mesg = $px1->isGraphKo();
 if (! $mesg)
 {
 	$px1->SetData($data);
-	$px1->SetPrecisionY(0);
 	$i=$startyear;$legend=array();
 	while ($i <= $endyear)
 	{
@@ -97,7 +96,6 @@ if (! $mesg)
 	$px1->SetYLabel($langs->trans("Number"));
 	$px1->SetShading(3);
 	$px1->SetHorizTickIncrement(1);
-	$px1->SetPrecisionY(0);
 	$px1->mode='depth';
 	$px1->SetTitle($langs->trans("NumberByMonth"));
 
@@ -131,7 +129,6 @@ if (! $mesg)
 	$px2->SetYLabel($langs->trans("Amount"));
 	$px2->SetShading(3);
 	$px2->SetHorizTickIncrement(1);
-	$px2->SetPrecisionY(0);
 	$px2->mode='depth';
 	$px2->SetTitle($langs->trans("AmountTotal"));
 
@@ -163,7 +160,6 @@ if (! $mesg)
 	$px3->SetHeight($HEIGHT);
 	$px3->SetShading(3);
 	$px3->SetHorizTickIncrement(1);
-	$px3->SetPrecisionY(0);
 	$px3->mode='depth';
 	$px3->SetTitle($langs->trans("AmountAverage"));
 
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 4323661370c..4ece2eae661 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -143,7 +143,6 @@ class box_graph_invoices_permonth extends ModeleBoxes
 
 				    $px1->SetData($data1);
 					unset($data1);
-					$px1->SetPrecisionY(0);
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
@@ -157,7 +156,6 @@ class box_graph_invoices_permonth extends ModeleBoxes
 					$px1->SetYLabel($langs->trans("NumberOfBills"));
 					$px1->SetShading(3);
 					$px1->SetHorizTickIncrement(1);
-					$px1->SetPrecisionY(0);
 					$px1->SetCssPrefix("cssboxes");
 					$px1->mode='depth';
 					$px1->SetTitle($langs->trans("NumberOfBillsByMonth"));
@@ -183,7 +181,6 @@ class box_graph_invoices_permonth extends ModeleBoxes
 
 					$px2->SetData($data2);
 					unset($data2);
-					$px2->SetPrecisionY(0);
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
@@ -197,7 +194,6 @@ class box_graph_invoices_permonth extends ModeleBoxes
 					$px2->SetYLabel($langs->trans("AmountOfBillsHT"));
 					$px2->SetShading(3);
 					$px2->SetHorizTickIncrement(1);
-					$px2->SetPrecisionY(0);
 					$px2->SetCssPrefix("cssboxes");
 					$px2->mode='depth';
 					$px2->SetTitle($langs->trans("AmountOfBillsByMonthHT"));
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index bba5185c94a..4e7849ab048 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -140,7 +140,6 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 
 				    $px1->SetData($data1);
 					unset($data1);
-					$px1->SetPrecisionY(0);
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
@@ -154,7 +153,6 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 					$px1->SetYLabel($langs->trans("NumberOfBills"));
 					$px1->SetShading(3);
 					$px1->SetHorizTickIncrement(1);
-					$px1->SetPrecisionY(0);
 					$px1->SetCssPrefix("cssboxes");
 					$px1->mode='depth';
 					$px1->SetTitle($langs->trans("NumberOfBillsByMonth"));
@@ -180,7 +178,6 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 
 					$px2->SetData($data2);
 					unset($data2);
-					$px2->SetPrecisionY(0);
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
@@ -194,7 +191,6 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 					$px2->SetYLabel($langs->trans("AmountOfBillsHT"));
 					$px2->SetShading(3);
 					$px2->SetHorizTickIncrement(1);
-					$px2->SetPrecisionY(0);
 					$px2->SetCssPrefix("cssboxes");
 					$px2->mode='depth';
 					$px2->SetTitle($langs->trans("AmountOfBillsByMonthHT"));
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index b06558393aa..3ba42cc6d0a 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -141,7 +141,6 @@ class box_graph_orders_permonth extends ModeleBoxes
 				{
 					$px1->SetData($data1);
 					unset($data1);
-					$px1->SetPrecisionY(0);
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
@@ -155,7 +154,6 @@ class box_graph_orders_permonth extends ModeleBoxes
 					$px1->SetYLabel($langs->trans("NumberOfOrders"));
 					$px1->SetShading(3);
 					$px1->SetHorizTickIncrement(1);
-					$px1->SetPrecisionY(0);
 					$px1->SetCssPrefix("cssboxes");
 					$px1->mode='depth';
 					$px1->SetTitle($langs->trans("NumberOfOrdersByMonth"));
@@ -179,7 +177,6 @@ class box_graph_orders_permonth extends ModeleBoxes
 				{
 					$px2->SetData($data2);
 					unset($data2);
-					$px2->SetPrecisionY(0);
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
@@ -193,7 +190,6 @@ class box_graph_orders_permonth extends ModeleBoxes
 					$px2->SetYLabel($langs->trans("AmountOfOrdersHT"));
 					$px2->SetShading(3);
 					$px2->SetHorizTickIncrement(1);
-					$px2->SetPrecisionY(0);
 					$px2->SetCssPrefix("cssboxes");
 					$px2->mode='depth';
 					$px2->SetTitle($langs->trans("AmountOfOrdersByMonthHT"));
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 9cb11aed7c1..6bfc47c504d 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -140,7 +140,6 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 				{
 					$px1->SetData($data1);
 					unset($data1);
-					$px1->SetPrecisionY(0);
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
@@ -154,7 +153,6 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 					$px1->SetYLabel($langs->trans("NumberOfOrders"));
 					$px1->SetShading(3);
 					$px1->SetHorizTickIncrement(1);
-					$px1->SetPrecisionY(0);
 					$px1->SetCssPrefix("cssboxes");
 					$px1->mode='depth';
 					$px1->SetTitle($langs->trans("NumberOfOrdersByMonth"));
@@ -178,7 +176,6 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 				{
 					$px2->SetData($data2);
 					unset($data2);
-					$px2->SetPrecisionY(0);
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
@@ -192,7 +189,6 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 					$px2->SetYLabel($langs->trans("AmountOfOrdersHT"));
 					$px2->SetShading(3);
 					$px2->SetHorizTickIncrement(1);
-					$px2->SetPrecisionY(0);
 					$px2->SetCssPrefix("cssboxes");
 					$px2->mode='depth';
 					$px2->SetTitle($langs->trans("AmountOfOrdersByMonthHT"));
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 0fe5c66d532..e085cd82f07 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -171,7 +171,6 @@ class box_graph_product_distribution extends ModeleBoxes
 					unset($data1);
 
 					if ($nocolor) $px1->SetDataColor(array(array(220,220,220)));
-					$px1->SetPrecisionY(0);
 					$px1->SetLegend($legend);
 					$px1->setShowLegend(0);
 					$px1->setShowPointValue($showpointvalue);
@@ -182,7 +181,6 @@ class box_graph_product_distribution extends ModeleBoxes
 					//$px1->SetYLabel($langs->trans("NumberOfBills"));
 					$px1->SetShading(3);
 					$px1->SetHorizTickIncrement(1);
-					$px1->SetPrecisionY(0);
 					$px1->SetCssPrefix("cssboxes");
 					//$px1->mode='depth';
 					$px1->SetType(array('pie'));
@@ -231,7 +229,6 @@ class box_graph_product_distribution extends ModeleBoxes
 					unset($data2);
 
 					if ($nocolor) $px2->SetDataColor(array(array(220,220,220)));
-					$px2->SetPrecisionY(0);
 					$px2->SetLegend($legend);
 					$px2->setShowLegend(0);
 					$px2->setShowPointValue($showpointvalue);
@@ -242,7 +239,6 @@ class box_graph_product_distribution extends ModeleBoxes
 					//$px2->SetYLabel($langs->trans("AmountOfBillsHT"));
 					$px2->SetShading(3);
 					$px2->SetHorizTickIncrement(1);
-					$px2->SetPrecisionY(0);
 					$px2->SetCssPrefix("cssboxes");
 					//$px2->mode='depth';
 					$px2->SetType(array('pie'));
@@ -292,7 +288,6 @@ class box_graph_product_distribution extends ModeleBoxes
 					unset($data3);
 
 					if ($nocolor) $px3->SetDataColor(array(array(220,220,220)));
-					$px3->SetPrecisionY(0);
 					$px3->SetLegend($legend);
 					$px3->setShowLegend(0);
 					$px3->setShowPointValue($showpointvalue);
@@ -303,7 +298,6 @@ class box_graph_product_distribution extends ModeleBoxes
 					//$px3->SetYLabel($langs->trans("AmountOfBillsHT"));
 					$px3->SetShading(3);
 					$px3->SetHorizTickIncrement(1);
-					$px3->SetPrecisionY(0);
 					$px3->SetCssPrefix("cssboxes");
 					//$px3->mode='depth';
 					$px3->SetType(array('pie'));
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index b21381473c2..9ced39271d0 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -141,7 +141,6 @@ class box_graph_propales_permonth extends ModeleBoxes
 					$px1->SetType($datatype1);
 					$px1->SetData($data1);
 					unset($data1);
-					$px1->SetPrecisionY(0);
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
@@ -155,7 +154,6 @@ class box_graph_propales_permonth extends ModeleBoxes
 					$px1->SetYLabel($langs->trans("NumberOfProposals"));
 					$px1->SetShading(3);
 					$px1->SetHorizTickIncrement(1);
-					$px1->SetPrecisionY(0);
 					$px1->SetCssPrefix("cssboxes");
 					$px1->mode='depth';
 					$px1->SetTitle($langs->trans("NumberOfProposalsByMonth"));
@@ -182,7 +180,6 @@ class box_graph_propales_permonth extends ModeleBoxes
 					$px2->SetType($datatype2);
 					$px2->SetData($data2);
 					unset($data2);
-					$px2->SetPrecisionY(0);
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
@@ -196,7 +193,6 @@ class box_graph_propales_permonth extends ModeleBoxes
 					$px2->SetYLabel($langs->trans("AmountOfProposalsHT"));
 					$px2->SetShading(3);
 					$px2->SetHorizTickIncrement(1);
-					$px2->SetPrecisionY(0);
 					$px2->SetCssPrefix("cssboxes");
 					$px2->mode='depth';
 					$px2->SetTitle($langs->trans("AmountOfProposalsByMonthHT"));
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 8b7bc4acf18..060baee8d21 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -61,8 +61,6 @@ class DolGraph
 	public $MinValue=0;
 	public $SetShading=0;
 
-	public $PrecisionY=-1;
-
 	public $horizTickIncrement=-1;
 	public $SetNumXTicks=-1;
 	public $labelInterval=-1;
@@ -116,7 +114,6 @@ class DolGraph
 			if (! $isgdinstalled)
 			{
 				$this->error="Error: PHP GD module is not available. It is required to build graphics.";
-				return -1;
 			}
 		}
 
@@ -142,11 +139,11 @@ class DolGraph
 	 *
 	 * @param 	float	$which_prec		Precision
 	 * @return 	boolean
+	 * @deprecated
 	 */
 	public function SetPrecisionY($which_prec)
 	{
         // phpcs:enable
-		$this->PrecisionY = $which_prec;
 		return true;
 	}
 
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 34c505cf849..0f568dbaf7b 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -86,7 +86,6 @@ $mesg = $px1->isGraphKo();
 if (! $mesg)
 {
     $px1->SetData($data);
-    $px1->SetPrecisionY(0);
     $i=$startyear;$legend=array();
     while ($i <= $endyear)
     {
@@ -101,7 +100,6 @@ if (! $mesg)
     $px1->SetYLabel($langs->trans("NbOfSendings"));
     $px1->SetShading(3);
     $px1->SetHorizTickIncrement(1);
-    $px1->SetPrecisionY(0);
     $px1->mode='depth';
     $px1->SetTitle($langs->trans("NumberOfShipmentsByMonth"));
 
@@ -142,7 +140,6 @@ if (! $mesg)
     $px2->SetYLabel($langs->trans("AmountOfShipments"));
     $px2->SetShading(3);
     $px2->SetHorizTickIncrement(1);
-    $px2->SetPrecisionY(0);
     $px2->mode='depth';
     $px2->SetTitle($langs->trans("AmountOfShipmentsByMonthHT"));
 
@@ -181,7 +178,6 @@ if (! $mesg)
     $px3->SetHeight($HEIGHT);
     $px3->SetShading(3);
     $px3->SetHorizTickIncrement(1);
-    $px3->SetPrecisionY(0);
     $px3->mode='depth';
     $px3->SetTitle($langs->trans("AmountAverage"));
 
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index 7fb7f647258..566b45a16ef 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -85,7 +85,6 @@ $mesg = $px1->isGraphKo();
 if (! $mesg)
 {
     $px1->SetData($data);
-    $px1->SetPrecisionY(0);
     $i=$startyear;$legend=array();
     while ($i <= $endyear)
     {
@@ -100,7 +99,6 @@ if (! $mesg)
     $px1->SetYLabel($langs->trans("NbOfSendings"));
     $px1->SetShading(3);
     $px1->SetHorizTickIncrement(1);
-    $px1->SetPrecisionY(0);
     $px1->mode='depth';
     $px1->SetTitle($langs->trans("NumberOfShipmentsByMonth"));
 
@@ -141,7 +139,6 @@ if (! $mesg)
     $px2->SetYLabel($langs->trans("AmountOfShipments"));
     $px2->SetShading(3);
     $px2->SetHorizTickIncrement(1);
-    $px2->SetPrecisionY(0);
     $px2->mode='depth';
     $px2->SetTitle($langs->trans("AmountOfShipmentsByMonthHT"));
 
@@ -180,7 +177,6 @@ if (! $mesg)
     $px3->SetHeight($HEIGHT);
     $px3->SetShading(3);
     $px3->SetHorizTickIncrement(1);
-    $px3->SetPrecisionY(0);
     $px3->mode='depth';
     $px3->SetTitle($langs->trans("AmountAverage"));
 
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index 5c448198980..650bb6f6338 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -61,7 +61,6 @@ if (! $mesg) {
     $px->SetYLabel($langs->trans("NbOfSendings"));
     $px->SetShading(3);
     $px->SetHorizTickIncrement(1);
-    $px->SetPrecisionY(0);
     $px->draw($filename, $fileurl);
 }
 
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index d79dd624e4f..eb3ec563481 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -91,7 +91,6 @@ $mesg = $px1->isGraphKo();
 if (! $mesg)
 {
 	$px1->SetData($data);
-	$px1->SetPrecisionY(0);
 	$i=$startyear;$legend=array();
 	while ($i <= $endyear)
 	{
@@ -105,7 +104,6 @@ if (! $mesg)
 	$px1->SetYLabel($langs->trans("Number"));
 	$px1->SetShading(3);
 	$px1->SetHorizTickIncrement(1);
-	$px1->SetPrecisionY(0);
 	$px1->mode='depth';
 	$px1->SetTitle($langs->trans("NumberByMonth"));
 
@@ -139,7 +137,6 @@ if (! $mesg)
 	$px2->SetYLabel($langs->trans("Amount"));
 	$px2->SetShading(3);
 	$px2->SetHorizTickIncrement(1);
-	$px2->SetPrecisionY(0);
 	$px2->mode='depth';
 	$px2->SetTitle($langs->trans("AmountTotal"));
 
@@ -181,7 +178,6 @@ if (! $mesg)
     $px3->SetHeight($HEIGHT);
     $px3->SetShading(3);
     $px3->SetHorizTickIncrement(1);
-    $px3->SetPrecisionY(0);
     $px3->mode='depth';
     $px3->SetTitle($langs->trans("AmountAverage"));
 
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 9b0ceb754ee..096584d8936 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -93,7 +93,6 @@ $mesg = $px1->isGraphKo();
 if (! $mesg)
 {
     $px1->SetData($data);
-    $px1->SetPrecisionY(0);
     $i=$startyear;$legend=array();
     while ($i <= $endyear)
     {
@@ -108,7 +107,6 @@ if (! $mesg)
     $px1->SetYLabel($langs->trans("NbOfIntervention"));
     $px1->SetShading(3);
     $px1->SetHorizTickIncrement(1);
-    $px1->SetPrecisionY(0);
     $px1->mode='depth';
     $px1->SetTitle($langs->trans("NumberOfInterventionsByMonth"));
 
@@ -149,7 +147,6 @@ if (! $mesg)
     $px2->SetYLabel($langs->trans("AmountOfinterventions"));
     $px2->SetShading(3);
     $px2->SetHorizTickIncrement(1);
-    $px2->SetPrecisionY(0);
     $px2->mode='depth';
     $px2->SetTitle($langs->trans("AmountOfinterventionsByMonthHT"));
 
@@ -189,7 +186,6 @@ if (! $mesg)
     $px3->SetHeight($HEIGHT);
     $px3->SetShading(3);
     $px3->SetHorizTickIncrement(1);
-    $px3->SetPrecisionY(0);
     $px3->mode='depth';
     $px3->SetTitle($langs->trans("AmountAverage"));
 
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 399cc59b7c2..62209d568df 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -336,7 +336,6 @@ if ($result || empty($id))
 					$px->SetWidth($WIDTH);
 					$px->SetHeight($HEIGHT);
 					$px->SetHorizTickIncrement(1);
-					$px->SetPrecisionY(0);
 					$px->SetShading(3);
 					//print 'x '.$key.' '.$graphfiles[$key]['file'];
 
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index cfacde6566b..02d8f641952 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -115,7 +115,6 @@ $px->SetDataColor(array (
 							220
 					)
 			));
-			$px->SetPrecisionY(0);
 			$px->SetLegend($legend);
 			$px->setShowLegend(0);
 			$px->setShowPointValue($showpointvalue);
@@ -126,7 +125,7 @@ $px->SetDataColor(array (
 			$px->SetShading(3);
 			$px->SetHorizTickIncrement(1);
 			$px->SetCssPrefix("cssboxes");
-$px->SetType(array (
+			$px->SetType(array (
 					'pie'
 			));
 			$px->SetTitle($langs->trans('OpportunitiesStatusForProjects'));
@@ -153,7 +152,6 @@ $mesg = $px1->isGraphKo();
 if (! $mesg)
 {
 	$px1->SetData($data);
-	$px1->SetPrecisionY(0);
 	$i=$startyear;$legend=array();
 	while ($i <= $endyear)
 	{
@@ -167,7 +165,6 @@ if (! $mesg)
 	$px1->SetYLabel($langs->trans("ProjectNbProject"));
 	$px1->SetShading(3);
 	$px1->SetHorizTickIncrement(1);
-	$px1->SetPrecisionY(0);
 	$px1->mode='depth';
 	$px1->SetTitle($langs->trans("ProjectNbProjectByMonth"));
 
@@ -204,7 +201,6 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		$px2->SetYLabel($langs->trans("ProjectOppAmountOfProjectsByMonth"));
 		$px2->SetShading(3);
 		$px2->SetHorizTickIncrement(1);
-		$px2->SetPrecisionY(0);
 		$px2->mode='depth';
 		$px2->SetTitle($langs->trans("ProjectOppAmountOfProjectsByMonth"));
 
@@ -241,7 +237,6 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		$px3->SetYLabel($langs->trans("ProjectWeightedOppAmountOfProjectsByMonth"));
 		$px3->SetShading(3);
 		$px3->SetHorizTickIncrement(1);
-		$px3->SetPrecisionY(0);
 		$px3->mode='depth';
 		$px3->SetTitle($langs->trans("ProjectWeightedOppAmountOfProjectsByMonth"));
 
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index 3cae0571e6a..dd13ee7680f 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -92,7 +92,6 @@ $mesg = $px1->isGraphKo();
 if (! $mesg)
 {
 	$px1->SetData($data);
-	$px1->SetPrecisionY(0);
 	$i=$startyear;$legend=array();
 	while ($i <= $endyear)
 	{
@@ -106,7 +105,6 @@ if (! $mesg)
 	$px1->SetYLabel($langs->trans("ProjectNbTask"));
 	$px1->SetShading(3);
 	$px1->SetHorizTickIncrement(1);
-	$px1->SetPrecisionY(0);
 	$px1->mode='depth';
 	$px1->SetTitle($langs->trans("ProjectNbTaskByMonth"));
 
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index cbffa3ef177..4bc98312902 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -88,7 +88,6 @@ $mesg = $px1->isGraphKo();
 if (! $mesg)
 {
     $px1->SetData($data);
-    $px1->SetPrecisionY(0);
     $i=$startyear;$legend=array();
     while ($i <= $endyear)
     {
@@ -103,7 +102,6 @@ if (! $mesg)
     $px1->SetYLabel($langs->trans("NbOfReceptions"));
     $px1->SetShading(3);
     $px1->SetHorizTickIncrement(1);
-    $px1->SetPrecisionY(0);
     $px1->mode='depth';
     $px1->SetTitle($langs->trans("NumberOfReceptionsByMonth"));
 
@@ -144,7 +142,6 @@ if (! $mesg)
     $px2->SetYLabel($langs->trans("AmountOfReceptions"));
     $px2->SetShading(3);
     $px2->SetHorizTickIncrement(1);
-    $px2->SetPrecisionY(0);
     $px2->mode='depth';
     $px2->SetTitle($langs->trans("AmountOfReceptionsByMonthHT"));
 
@@ -183,7 +180,6 @@ if (! $mesg)
     $px3->SetHeight($HEIGHT);
     $px3->SetShading(3);
     $px3->SetHorizTickIncrement(1);
-    $px3->SetPrecisionY(0);
     $px3->mode='depth';
     $px3->SetTitle($langs->trans("AmountAverage"));
 
diff --git a/htdocs/reception/stats/month.php b/htdocs/reception/stats/month.php
index 84eb9126464..f2afcfd9267 100644
--- a/htdocs/reception/stats/month.php
+++ b/htdocs/reception/stats/month.php
@@ -60,7 +60,6 @@ if (! $mesg)
     $px->SetYLabel($langs->trans("NbOfOrders"));
     $px->SetShading(3);
 	$px->SetHorizTickIncrement(1);
-	$px->SetPrecisionY(0);
     $px->draw($filename, $fileurl);
 }
 
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index d3466f40dc3..a5361ec6f59 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -231,7 +231,6 @@ if (! empty($dataseries) && count($dataseries) > 1) {
     if (!$mesg) {
         $px1->SetData($data);
         unset($data1);
-        $px1->SetPrecisionY(0);
         $i = $startyear;
         $legend = array();
         while ($i <= $endyear) {
@@ -246,7 +245,6 @@ if (! empty($dataseries) && count($dataseries) > 1) {
         $px1->SetYLabel($langs->trans("TicketStatByStatus"));
         $px1->SetShading(3);
         $px1->SetHorizTickIncrement(1);
-        $px1->SetPrecisionY(0);
         $px1->SetCssPrefix("cssboxes");
         $px1->mode = 'depth';
         //$px1->SetTitle($langs->trans("TicketStatByStatus"));
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index 3990540ab9d..775e5d522a5 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -96,7 +96,6 @@ $mesg = $px1->isGraphKo();
 if (! $mesg)
 {
     $px1->SetData($data);
-    $px1->SetPrecisionY(0);
     $i=$startyear;$legend=array();
     while ($i <= $endyear)
     {
@@ -111,7 +110,6 @@ if (! $mesg)
     $px1->SetYLabel($langs->trans("NbOfTicket"));
     $px1->SetShading(3);
     $px1->SetHorizTickIncrement(1);
-    $px1->SetPrecisionY(0);
     $px1->mode='depth';
     $px1->SetTitle($langs->trans("NumberOfTicketsByMonth"));
 
@@ -153,7 +151,6 @@ if (! $mesg)
     $px2->SetYLabel($langs->trans("AmountOfTickets"));
     $px2->SetShading(3);
     $px2->SetHorizTickIncrement(1);
-    $px2->SetPrecisionY(0);
     $px2->mode='depth';
     $px2->SetTitle($langs->trans("AmountOfTicketsByMonthHT"));
 
@@ -193,7 +190,6 @@ if (! $mesg)
     $px3->SetHeight($HEIGHT);
     $px3->SetShading(3);
     $px3->SetHorizTickIncrement(1);
-    $px3->SetPrecisionY(0);
     $px3->mode='depth';
     $px3->SetTitle($langs->trans("AmountAverage"));
 

From 662afe8a3606c5aee6a34043324198bdd99b9dab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 18:24:29 +0200
Subject: [PATCH 119/133] Fix missing global

---
 htdocs/core/class/dolgraph.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 8b7bc4acf18..d7850871ee0 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -891,6 +891,7 @@ class DolGraph
 	private function draw_jflot($file, $fileurl)
 	{
         // phpcs:enable
+		global $langs;
 
 		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',', $this->type)." this->MaxValue=".$this->MaxValue);
 

From c1f6b76a6a3dadcf90ce4ea06135df4bc1bf8c81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 18:29:24 +0200
Subject: [PATCH 120/133] Remove deprecated

---
 htdocs/install/inc.php | 23 +----------------------
 htdocs/main.inc.php    | 21 ---------------------
 2 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index eab86b07136..96348c2e272 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -253,28 +253,7 @@ foreach ($handlers as $handler)
 	if (empty($conf->loghandlers[$handler])) $conf->loghandlers[$handler]=$loghandlerinstance;
 }
 
-// Removed magic_quotes
-if (function_exists('get_magic_quotes_gpc'))	// magic_quotes_* removed in PHP 5.4
-{
-    if (get_magic_quotes_gpc())
-    {
-        // Forcing parameter setting magic_quotes_gpc and cleaning parameters
-        // (Otherwise he would have for each position, condition
-        // Reading stripslashes variable according to state get_magic_quotes_gpc).
-        // Off mode (recommended, you just do $db->escape when an insert / update.
-        function stripslashes_deep($value)
-        {
-            return (is_array($value) ? array_map('stripslashes_deep', $value) : stripslashes($value));
-        }
-        $_GET     = array_map('stripslashes_deep', $_GET);
-        $_POST    = array_map('stripslashes_deep', $_POST);
-        $_COOKIE  = array_map('stripslashes_deep', $_COOKIE);
-        $_REQUEST = array_map('stripslashes_deep', $_REQUEST);
-        @set_magic_quotes_runtime(0);
-    }
-}
-
-// Defini objet langs
+// Define object $langs
 $langs = new Translate('..', $conf);
 if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));
 else $langs->setDefaultLang('auto');
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index e551280f90f..2e9ec140bf7 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -47,27 +47,6 @@ if (! empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
 	}
 }
 
-// Removed magic_quotes
-if (function_exists('get_magic_quotes_gpc'))	// magic_quotes_* deprecated in PHP 5.0 and removed in PHP 5.5
-{
-	if (get_magic_quotes_gpc())
-	{
-		// Forcing parameter setting magic_quotes_gpc and cleaning parameters
-		// (Otherwise he would have for each position, condition
-		// Reading stripslashes variable according to state get_magic_quotes_gpc).
-		// Off mode recommended (just do $db->escape for insert / update).
-		function stripslashes_deep($value)
-		{
-			return (is_array($value) ? array_map('stripslashes_deep', $value) : stripslashes($value));
-		}
-		$_GET     = array_map('stripslashes_deep', $_GET);
-		$_POST    = array_map('stripslashes_deep', $_POST);
-		$_FILES   = array_map('stripslashes_deep', $_FILES);
-		//$_COOKIE  = array_map('stripslashes_deep', $_COOKIE); // Useless because a cookie should never be outputed on screen nor used into sql
-		@set_magic_quotes_runtime(0);
-	}
-}
-
 /**
  * Security: SQL Injection and XSS Injection (scripts) protection (Filters on GET, POST, PHP_SELF).
  *

From e456cd27d1e1d16bebbff27bcc79b594bfad5a89 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 18:42:24 +0200
Subject: [PATCH 121/133] Fix deprecated call and hide pass in debug

---
 htdocs/debugbar/class/DataCollector/DolConfigCollector.php | 1 +
 htdocs/debugbar/class/DataCollector/DolQueryCollector.php  | 4 ----
 htdocs/debugbar/class/DataCollector/DolibarrCollector.php  | 6 +++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/debugbar/class/DataCollector/DolConfigCollector.php b/htdocs/debugbar/class/DataCollector/DolConfigCollector.php
index a3fa8b84a92..65c33af013e 100644
--- a/htdocs/debugbar/class/DataCollector/DolConfigCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolConfigCollector.php
@@ -77,6 +77,7 @@ class DolConfigCollector extends ConfigCollector
 	protected function objectToArray($obj)
 	{
 	    // phpcs:enable
+	    $arr=array();
 		$_arr = is_object($obj) ? get_object_vars($obj) : $obj;
 		foreach ($_arr as $key => $val) {
 			$val = (is_array($val) || is_object($val)) ? $this->objectToArray($val) : $val;
diff --git a/htdocs/debugbar/class/DataCollector/DolQueryCollector.php b/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
index 694112bf2f1..8430cf41adf 100644
--- a/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
@@ -44,9 +44,7 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
 			$queries[] = array(
 				'sql' => $query['sql'],
 				'duration' => $query['duration'],
-				'duration_str' => $this->formatDuration($query['duration']),
 				'memory' => $query['memory_usage'],
-				'memory_str' => $this->formatBytes($query['memory_usage']),
 				'is_success' => $query['is_success'],
 				'error_code' => $query['error_code'],
 				'error_message' => $query['error_message']
@@ -62,9 +60,7 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
 			'nb_statements' => count($queries),
 			'nb_failed_statements' => $totalFailed,
 			'accumulated_duration' => $totalExecTime,
-			'accumulated_duration_str' => $this->formatDuration($totalExecTime),
 			'memory_usage' => $totalMemoryUsage,
-			'memory_usage_str' => $this->formatBytes($totalMemoryUsage),
 			'statements' => $queries
 		);
 	}
diff --git a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
index 8bcd639ec7f..b1471f415a0 100644
--- a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
@@ -66,7 +66,7 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 		$info .= $langs->trans('Currency') . ': <strong>' . $conf->currency . '</strong><br>';
 		$info .= $langs->trans('DolEntity') . ': <strong>' . $conf->entity . '</strong><br>';
 		$info .= $langs->trans('ListLimit') . ': <strong>' . ($conf->liste_limit ?: $conf->global->MAIN_SIZE_LISTE_LIMIT) . '</strong><br>';
-		$info .= $langs->trans('UploadSize') . ': <strong>' . $conf->global->MAIN_UPLOAD_DOC . '</strong>';
+		$info .= $langs->trans('MaxSizeForUploadedFiles') . ': <strong>' . $conf->global->MAIN_UPLOAD_DOC . '</strong>';
 
 		return $info;
 	}
@@ -84,9 +84,9 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 		$info .= $langs->trans('Server') . ': <strong>' . $conf->global->MAIN_MAIL_SMTP_SERVER . '</strong><br>';
 		$info .= $langs->trans('Port') . ': <strong>' . $conf->global->MAIN_MAIL_SMTP_PORT . '</strong><br>';
 		$info .= $langs->trans('ID') . ': <strong>' . $conf->global->MAIN_MAIL_SMTPS_ID . '</strong><br>';
-		$info .= $langs->trans('Pwd') . ': <strong>' . $conf->global->MAIN_MAIL_SMTPS_PW . '</strong><br>';
+		$info .= $langs->trans('Pwd') . ': <strong>' . preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW) . '</strong><br>';
 		$info .= $langs->trans('TLS/STARTTLS') . ': <strong>' . $conf->global->MAIN_MAIL_EMAIL_TLS . '</strong> / <strong>' . $conf->global->MAIN_MAIL_EMAIL_STARTTLS . '</strong><br>';
-		$info .= $langs->trans('Status') . ': <strong>' . ($conf->global->MAIN_DISABLE_ALL_MAILS ? $langs->trans('StatusDisabled') : $langs->trans('StatusEnabled')) . '</strong>';
+		$info .= $langs->trans('MAIN_DISABLE_ALL_MAILS') . ': <strong>' . ($conf->global->MAIN_DISABLE_ALL_MAILS ? $langs->trans('Yes') : $langs->trans('No')) . '</strong>';
 
 		return $info;
 	}

From 17412ce7aa206f19d595e4229ce34d4fcc51fbb1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 18:49:55 +0200
Subject: [PATCH 122/133] Try to use new scrutinizer engine

---
 .scrutinizer.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 831aa15c68a..60fea392133 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -1,4 +1,7 @@
 # .scrutinizer.yml
+build:
+    - php-scrutinizer-run
+          
 imports:
     - javascript
     - php

From 76f394cc43a108faa2f0476000501b32f832dfe9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 18:58:14 +0200
Subject: [PATCH 123/133] Fix phpcs

---
 htdocs/admin/company.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 588383021a0..6343be072d8 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -75,7 +75,7 @@ if ( ($action == 'update' && ! GETPOST("cancel", 'alpha'))
 		activateModulesRequiredByCountry($mysoc->country_code);
 	}
 
-	$tmparray=getState(GETPOST('state_id','int'), 'all', $db, $langs, 0);
+	$tmparray=getState(GETPOST('state_id', 'int'), 'all', $db, $langs, 0);
 	if (! empty($tmparray['id']))
 	{
 		$mysoc->state_id   =$tmparray['id'];
@@ -92,18 +92,18 @@ if ( ($action == 'update' && ! GETPOST("cancel", 'alpha'))
 
     $db->begin();
 
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom",'nohtml'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADDRESS", GETPOST("MAIN_INFO_SOCIETE_ADDRESS",'nohtml'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN", GETPOST("MAIN_INFO_SOCIETE_TOWN",'nohtml'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ZIP", GETPOST("MAIN_INFO_SOCIETE_ZIP",'alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_REGION", GETPOST("region_code",'alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MONNAIE", GETPOST("currency",'aZ09'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TEL", GETPOST("tel",'alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FAX", GETPOST("fax",'alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MAIL", GETPOST("mail",'alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_WEB", GETPOST("web",'alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOTE", GETPOST("note",'none'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GENCOD", GETPOST("barcode",'alpha'),'chaine',0,'',$conf->entity);
+    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom", 'nohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADDRESS", GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN", GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml'), 'chaine', 0, '' ,$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ZIP", GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_REGION", GETPOST("region_code", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MONNAIE", GETPOST("currency",'aZ09'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TEL", GETPOST("tel",'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FAX", GETPOST("fax",'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MAIL", GETPOST("mail",'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_WEB", GETPOST("web",'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOTE", GETPOST("note",'none'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GENCOD", GETPOST("barcode", 'alpha'), 'chaine', 0, '', $conf->entity);
 
 	$varforimage='logo'; $dirforimage=$conf->mycompany->dir_output.'/logos/';
 	if ($_FILES[$varforimage]["tmp_name"])
@@ -392,7 +392,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	$state_id=0;
 	if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE))
 	{
-		$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_STATE);
+		$tmp=explode(':', $conf->global->MAIN_INFO_SOCIETE_STATE);
 		$state_id=$tmp[0];
 	}
 	$formcompany->select_departement($state_id, $mysoc->country_code, 'state_id');
@@ -786,7 +786,7 @@ else
 	else print '<tr class="oddeven"><td>'.$langs->trans("State").'</td><td>';
 	if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE))
 	{
-		$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_STATE);
+		$tmp=explode(':', $conf->global->MAIN_INFO_SOCIETE_STATE);
 		$state_id=$tmp[0];
 		print getState($state_id, $conf->global->MAIN_SHOW_STATE_CODE, 0, $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
 	}

From d9f6d9f0c319e09a6fbeef176979268dc1614a82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 19:12:44 +0200
Subject: [PATCH 124/133] Code comment

---
 htdocs/debugbar/class/DataCollector/DolQueryCollector.php | 1 +
 htdocs/debugbar/class/TraceableDB.php                     | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/debugbar/class/DataCollector/DolQueryCollector.php b/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
index 8430cf41adf..03811890f43 100644
--- a/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
@@ -24,6 +24,7 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
 	{
 		global $db;
 
+		// Replace $db handler with new handler override by TraceableDB
 		$db = new TraceableDB($db);
 
 		$this->db = $db;
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 0caf6c2489f..4d34da61465 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -7,7 +7,6 @@ require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
  *
  * Used to log queries into DebugBar
  */
-
 class TraceableDB extends DoliDB
 {
 	/**

From 2854e0dae600108f5763d0e4f5b2ce7aa37d27a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 19:15:15 +0200
Subject: [PATCH 125/133] Code comment

---
 htdocs/core/db/DoliDB.class.php       | 4 ++--
 htdocs/debugbar/class/TraceableDB.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index b05f118b08b..3819e785f68 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -160,10 +160,10 @@ abstract class DoliDB implements Database
 	}
 
 	/**
-	 *	Annulation d'une transaction et retour aux anciennes valeurs
+	 *	Cancel a transaction and go back to initial data values
 	 *
 	 * 	@param	string			$log		Add more log to default log line
-	 * 	@return	resource|int         		1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
+	 * 	@return	resource|int         		1 if cancelation is ok or transaction not open, 0 if error
 	 */
     public function rollback($log = '')
 	{
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 4d34da61465..4edc39a74af 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -274,10 +274,10 @@ class TraceableDB extends DoliDB
 	}
 
 	/**
-	 * Annulation d'une transaction et retour aux anciennes valeurs
+	 *	Cancel a transaction and go back to initial data values
 	 *
-	 * @param	string $log Add more log to default log line
-	 * @return  int                1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
+	 * 	@param	string			$log		Add more log to default log line
+	 * 	@return	resource|int         		1 if cancelation is ok or transaction not open, 0 if error
 	 */
 	public function rollback($log = '')
 	{

From 71b266b5a815be97e8fed88cb6524349293c1544 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 19:20:01 +0200
Subject: [PATCH 126/133] Code comment

---
 htdocs/adherents/class/adherent.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index c1bb04d90fc..115d1fb8ab4 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2403,7 +2403,7 @@ class Adherent extends CommonObject
 		$this->country_id = 1;
 		$this->country_code = 'FR';
 		$this->country = 'France';
-		$this->morphy = 1;
+		$this->morphy = 'mor';
 		$this->email = 'specimen@specimen.com';
 		$this->skype = 'skypepseudo';
 		$this->twitter = 'twitterpseudo';

From b202c7eaa0286a8d9b1d3b0f8a53b5ecb2cd1e34 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 20:17:40 +0200
Subject: [PATCH 127/133] Fix confusion between ->childs and ->childsoncascade

---
 htdocs/asset/class/asset.class.php            |  4 +--
 htdocs/bom/class/bom.class.php                | 25 +++++++++----------
 htdocs/core/class/commonobject.class.php      | 16 +++++++++++-
 htdocs/core/class/coreobject.class.php        |  2 +-
 .../core/class/emailsenderprofile.class.php   |  4 +--
 .../class/emailcollector.class.php            |  8 ++++--
 .../class/emailcollectoraction.class.php      |  4 +--
 .../template/class/myobject.class.php         | 18 ++++++-------
 htdocs/product/class/product.class.php        |  5 +++-
 .../inventory/class/inventory.class.php       |  8 ++++--
 htdocs/projet/class/task.class.php            |  6 ++++-
 .../class/companypaymentmode.class.php        |  4 +--
 htdocs/societe/class/societe.class.php        | 10 +++++++-
 htdocs/societe/class/societeaccount.class.php |  4 +--
 14 files changed, 76 insertions(+), 42 deletions(-)

diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 8e9e31e68b2..37aeb4607c8 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -163,9 +163,9 @@ class Asset extends CommonObject
 	 */
 	//public $class_element_line = 'Assetline';
 	/**
-	 * @var array  Array of child tables (child tables to delete before deleting a record)
+	 * @var array	List of child tables. To test if we can delete object.
 	 */
-	//protected $childtables=array('assetdet');
+	//protected $childtables=array();
 	/**
 	 * @var AssetLine[]     Array of subtable lines
 	 */
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 99331de8c62..5d9f1f50cbc 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -41,12 +41,6 @@ class BOM extends CommonObject
 	 */
 	public $table_element = 'bom_bom';
 
-	/**
-	 * @var string Name of subtable if this object has sub lines
-	 */
-	public $table_element_line = 'bom_bomline';
-	public $fk_element = 'fk_bom';
-
 	/**
 	 * @var int  Does bom support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 */
@@ -134,27 +128,32 @@ class BOM extends CommonObject
 	/**
 	 * @var int    Name of subtable line
 	 */
-	//public $table_element_line = 'bomdet';
+	public $table_element_line = 'bom_bomline';
 
 	/**
 	 * @var int    Field with ID of parent key if this field has a parent
 	 */
-	//public $fk_element = 'fk_bom';
+	public $fk_element = 'fk_bom';
 
 	/**
 	 * @var int    Name of subtable class that manage subtable lines
 	 */
-	//public $class_element_line = 'BillOfMaterialsline';
+	public $class_element_line = 'BOMLine';
 
 	/**
-	 * @var array  Array of child tables (child tables to delete before deleting a record)
+	 * @var array	List of child tables. To test if we can delete object.
 	 */
-	//protected $childtables=array('bomdet');
+	//protected $childtables=array();
 
 	/**
-	 * @var BillOfMaterialsLine[]     Array of subtable lines
+	 * @var array	List of child tables. To know object to delete on cascade.
 	 */
-	//public $lines = array();
+	protected $childtablesoncascade=array('bom_bomline');
+
+	/**
+	 * @var BOMLine[]     Array of subtable lines
+	 */
+	public $lines = array();
 
 
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f989f0bb431..9c5812069b7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7490,7 +7490,7 @@ abstract class CommonObject
 
 		$this->db->begin();
 
-		if ($forcechilddeletion)
+		if ($forcechilddeletion)	// Force also delete of childtables that should lock deletion in standard case when option force is off
 		{
 			foreach($this->childtables as $table)
 			{
@@ -7518,6 +7518,20 @@ abstract class CommonObject
 			}
 		}
 
+		// Delete cascade first
+		foreach($this->childtablesoncascade as $table)
+		{
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
+			$resql = $this->db->query($sql);
+			if (! $resql)
+			{
+				$this->error=$this->db->lasterror();
+				$this->errors[]=$this->error;
+				$this->db->rollback();
+				return -1;
+			}
+		}
+
 		if (! $error) {
 			if (! $notrigger) {
 				// Call triggers
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 02a083978ef..4cd3fe1b2ed 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -175,7 +175,7 @@ class CoreObject extends CommonObject
      */
     public function fetchChild()
     {
-        if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+        if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
         {
             foreach($this->childtables as &$childTable)
             {
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index f9eeeabf4c6..c3d37d03b85 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -131,9 +131,9 @@ class EmailSenderProfile extends CommonObject
 	 */
 	//public $class_element_line = 'EmailSenderProfileline';
 	/**
-	 * @var array  Array of child tables (child tables to delete before deleting a record)
+	 * @var array	List of child tables. To test if we can delete object.
 	 */
-	//protected $childtables=array('emailsenderprofiledet');
+	//protected $childtables=array();
 	/**
 	 * @var EmailSenderProfileLine[]     Array of subtable lines
 	 */
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index ff4be06fcab..b22d7b23607 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -62,9 +62,13 @@ class EmailCollector extends CommonObject
     public $fk_element = 'fk_emailcollector';
 
     /**
-     * @var array  Array of child tables (child tables to delete before deleting a record)
+	 * @var array	List of child tables. To test if we can delete object.
      */
-    protected $childtables=array('emailcollector_emailcollectorfilter', 'emailcollector_emailcollectoraction');
+    protected $childtables=array();
+    /**
+     * @var array	List of child tables. To know object to delete on cascade.
+     */
+    protected $childtablesoncascade=array('emailcollector_emailcollectorfilter','emailcollector_emailcollectoraction');
 
 
     /**
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index ca710f99216..96f650c9fc0 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -127,9 +127,9 @@ class EmailCollectorAction extends CommonObject
     //public $class_element_line = 'EmailcollectorActionline';
 
     // /**
-    //  * @var array  Array of child tables (child tables to delete before deleting a record)
+    //	* @var array	List of child tables. To test if we can delete object.
     //  */
-    //protected $childtables=array('emailcollectoractiondet');
+    //protected $childtables=array();
 
     // /**
     //  * @var EmailcollectorActionLine[]     Array of subtable lines
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 1b4d1c7b52d..0025c00165d 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -42,12 +42,6 @@ class MyObject extends CommonObject
 	 */
 	public $table_element = 'mymodule_myobject';
 
-	/**
-	 * @var string Name of subtable if this object has sub lines
-	 */
-	//public $table_element_line = 'mymodule_myobjectline';
-	//public $fk_element = 'fk_myobject';
-
 	/**
 	 * @var int  Does myobject support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 */
@@ -171,13 +165,12 @@ class MyObject extends CommonObject
 	// END MODULEBUILDER PROPERTIES
 
 
-
 	// If this object has a subtable with lines
 
 	/**
 	 * @var int    Name of subtable line
 	 */
-	//public $table_element_line = 'myobjectdet';
+	//public $table_element_line = 'mymodule_myobjectline';
 
 	/**
 	 * @var int    Field with ID of parent key if this field has a parent
@@ -190,9 +183,14 @@ class MyObject extends CommonObject
 	//public $class_element_line = 'MyObjectline';
 
 	/**
-	 * @var array  Array of child tables (child tables to delete before deleting a record)
+	 * @var array	List of child tables. To test if we can delete object.
 	 */
-	//protected $childtables=array('myobjectdet');
+	//protected $childtables=array();
+
+	/**
+	 * @var array	List of child tables. To know object to delete on cascade.
+	 */
+	//protected $childtablesoncascade=array('mymodule_myobjectdet');
 
 	/**
 	 * @var MyObjectLine[]     Array of subtable lines
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index a5491045c16..02de9b4d47d 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -59,7 +59,10 @@ class Product extends CommonObject
      */
     public $fk_element='fk_product';
 
-    protected $childtables=array('supplier_proposaldet', 'propaldet','commandedet','facturedet','contratdet','facture_fourn_det','commande_fournisseurdet');    // To test if we can delete object
+    /**
+     * @var array	List of child tables. To test if we can delete object.
+     */
+    protected $childtables=array('supplier_proposaldet', 'propaldet', 'commandedet', 'facturedet', 'contratdet', 'facture_fourn_det', 'commande_fournisseurdet');
 
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 7f535a2eac0..62cfc476ba8 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -169,9 +169,13 @@ class Inventory extends CommonObject
 	public $class_element_line = 'Inventoryline';
 
 	/**
-	 * @var array  Array of child tables (child tables to delete before deleting a record)
+	 * @var array	List of child tables. To test if we can delete object.
 	 */
-	protected $childtables=array('inventorydet');
+	protected $childtables=array();
+	/**
+	 * @var array	List of child tables. To know object to delete on cascade.
+	 */
+	protected $childtablesoncascade=array('inventorydet');
 
 	/**
 	 * @var InventoryLine[]     Array of subtable lines
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index a5f63e32826..ce4779e1a6d 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -48,7 +48,11 @@ class Task extends CommonObject
 	public $fk_element='fk_task';
 
 	public $picto = 'task';
-	protected $childtables=array('projet_task_time');    // To test if we can delete object
+
+	/**
+	 * @var array	List of child tables. To test if we can delete object.
+	 */
+	protected $childtables=array('projet_task_time');
 
 	/**
      * @var int ID parent task
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index e3e86e2cf4a..4275d356566 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -204,9 +204,9 @@ class CompanyPaymentMode extends CommonObject
 	 */
 	//public $class_element_line = 'CompanyPaymentModeline';
 	/**
-	 * @var array  Array of child tables (child tables to delete before deleting a record)
+     * @var array	List of child tables. To test if we can delete object.
 	 */
-	//protected $childtables=array('companypaymentmodedet');
+	//protected $childtables=array();
 	/**
 	 * @var CompanyPaymentModeLine[]     Array of subtable lines
 	 */
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 2ad9a3473a4..b1d037552aa 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -59,8 +59,16 @@ class Societe extends CommonObject
 	public $fk_element='fk_soc';
 
 	public $fieldsforcombobox='nom,name_alias';
-	protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord');    // To test if we can delete object
+
+	/**
+	 * @var array	List of child tables. To test if we can delete object.
+	 */
+	protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord');
+	/**
+	 * @var array	List of child tables. To know object to delete on cascade.
+	 */
 	protected $childtablesoncascade=array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_account", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
+
 	public $picto = 'company';
 
 	/**
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index a82ad69091b..5f333da69a3 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -164,9 +164,9 @@ class SocieteAccount extends CommonObject
 	 */
 	//public $class_element_line = 'societeAccountline';
 	/**
-	 * @var array  Array of child tables (child tables to delete before deleting a record)
+     * @var array	List of child tables. To test if we can delete object.
 	 */
-	//protected $childtables=array('societe_accountdet');
+	//protected $childtables=array();
 	/**
 	 * @var societeAccountLine[]     Array of subtable lines
 	 */

From 8a9c858609413bea81f7a6fe97b171d6c573a0ce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jun 2019 20:18:55 +0200
Subject: [PATCH 128/133] Code comment

---
 htdocs/core/class/coreobject.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 4cd3fe1b2ed..41aae05d74a 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -25,6 +25,7 @@
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
+// TODO Remove this class (used in Expensereportik and ExpenseReportRule
 class CoreObject extends CommonObject
 {
     public $withChild = true;

From 8866ab556588ae1dc5406fda4fec3877f414bdf2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jun 2019 16:42:06 +0200
Subject: [PATCH 129/133] Fix missing trans

---
 htdocs/langs/en_US/admin.lang | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index c135fe86206..76631626eeb 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1919,4 +1919,6 @@ IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used b
 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
\ No newline at end of file
+EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
\ No newline at end of file

From 1c48b8be32672aa2400699eadbc6fbc3fe59dd04 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jun 2019 17:23:41 +0200
Subject: [PATCH 130/133] Fix code comment

---
 htdocs/core/class/coreobject.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 41aae05d74a..bdfe7c3c644 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -26,6 +26,9 @@
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 // TODO Remove this class (used in Expensereportik and ExpenseReportRule
+/**
+ * CoreObject
+ */
 class CoreObject extends CommonObject
 {
     public $withChild = true;

From b1530190001f7ed2416fed6d60d66d6bc993380b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jun 2019 18:08:24 +0200
Subject: [PATCH 131/133] FIX security (a user can read leave or holiday of
 other without perm.

---
 htdocs/expensereport/card.php | 14 +++++++++++++-
 htdocs/holiday/card.php       | 27 ++++++++++++++++++---------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index e623a76c87c..cc553f1e5de 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -62,6 +62,8 @@ $comments=GETPOST('comments','none');
 $fk_c_type_fees=GETPOST('fk_c_type_fees','int');
 $socid = GETPOST('socid','int')?GETPOST('socid','int'):GETPOST('socid_id','int');
 
+$childids = $user->getAllChildIds(1);
+
 // Security check
 $id=GETPOST("id",'int');
 if ($user->societe_id) $socid=$user->societe_id;
@@ -105,7 +107,17 @@ $permissionnote = $user->rights->expensereport->creer; 		// Used by the include
 $permissiondellink = $user->rights->expensereport->creer; 	// Used by the include of actions_dellink.inc.php
 $permissionedit = $user->rights->expensereport->creer; 		// Used by the include of actions_lineupdown.inc.php
 
-
+if ($object->id > 0)
+{
+    // Check current user can read this expense report
+    $canread = 0;
+    if (! empty($user->rights->expensereport->readall)) $canread=1;
+    if (! empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) $canread=1;
+    if (! $canread)
+    {
+        accessforbidden();
+    }
+}
 
 
 /*
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 288cecef75d..6de04c5aeed 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -62,6 +62,22 @@ if (! empty($user->rights->holiday->delete)) $candelete=1;
 $morefilter = 'AND employee = 1';
 if (! empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
 
+$object = new Holiday($db);
+if ($id > 0)
+{
+    $object->fetch($id);
+
+    // Check current user can read this leave request
+    $canread = 0;
+    if (! empty($user->rights->holiday->read_all)) $canread=1;
+    if (! empty($user->rights->holiday->read) && in_array($object->fk_user, $childids)) $canread=1;
+    if (! $canread)
+    {
+        accessforbidden();
+    }
+}
+
+
 
 /*
  * Actions
@@ -75,7 +91,6 @@ if (GETPOST('cancel', 'alpha'))
 // If create a request
 if ($action == 'create')
 {
-	$object = new Holiday($db);
 
     // If no right to create a request
     if (! $cancreate)
@@ -87,6 +102,8 @@ if ($action == 'create')
 
     if (! $error)
     {
+        $object = new Holiday($db);
+
     	$db->begin();
 
 	    $date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
@@ -196,7 +213,6 @@ if ($action == 'create')
 
 if ($action == 'update' && GETPOSTISSET('savevalidator') && ! empty($user->rights->holiday->approve))
 {
-    $object = new Holiday($db);
     $object->fetch($id);
 
     $object->oldcopy = dol_clone($object);
@@ -242,7 +258,6 @@ if ($action == 'update' && ! GETPOSTISSET('savevalidator'))
         exit;
     }
 
-    $object = new Holiday($db);
     $object->fetch($id);
 
 	// If under validation
@@ -326,7 +341,6 @@ if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes' && $user->rights-
 
 	$db->begin();
 
-	$object = new Holiday($db);
 	$object->fetch($id);
 
     // If this is a rough draft, approved, canceled or refused
@@ -360,7 +374,6 @@ if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes' && $user->rights-
 // Si envoi de la demande
 if ($action == 'confirm_send')
 {
-    $object = new Holiday($db);
     $object->fetch($id);
 
     // Si brouillon et créateur
@@ -463,7 +476,6 @@ if ($action == 'confirm_send')
 // Si Validation de la demande
 if ($action == 'confirm_valid')
 {
-    $object = new Holiday($db);
     $object->fetch($id);
 
     // Si statut en attente de validation et valideur = utilisateur
@@ -558,7 +570,6 @@ if ($action == 'confirm_refuse' && GETPOST('confirm','alpha') == 'yes')
 {
 	if (! empty($_POST['detail_refuse']))
     {
-        $object = new Holiday($db);
         $object->fetch($id);
 
         // Si statut en attente de validation et valideur = utilisateur
@@ -643,7 +654,6 @@ if ($action == 'confirm_draft' && GETPOST('confirm') == 'yes')
 {
 	$error = 0;
 
-    $object = new Holiday($db);
     $object->fetch($id);
 
     $oldstatus = $object->statut;
@@ -674,7 +684,6 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
 {
 	$error = 0;
 
-    $object = new Holiday($db);
     $object->fetch($id);
 
     // Si statut en attente de validation et valideur = valideur ou utilisateur, ou droits de faire pour les autres

From 2e5b4ee4e7f013bb9dd806e9c7d7f25290c1e62e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jun 2019 19:32:29 +0200
Subject: [PATCH 132/133] Fix phpcs

---
 htdocs/admin/company.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 6343be072d8..8961385c584 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -94,15 +94,15 @@ if ( ($action == 'update' && ! GETPOST("cancel", 'alpha'))
 
     dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADDRESS", GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN", GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml'), 'chaine', 0, '' ,$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN", GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ZIP", GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_REGION", GETPOST("region_code", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MONNAIE", GETPOST("currency",'aZ09'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TEL", GETPOST("tel",'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FAX", GETPOST("fax",'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MAIL", GETPOST("mail",'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_WEB", GETPOST("web",'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOTE", GETPOST("note",'none'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MONNAIE", GETPOST("currency", 'aZ09'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TEL", GETPOST("tel", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FAX", GETPOST("fax", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MAIL", GETPOST("mail", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_WEB", GETPOST("web", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOTE", GETPOST("note", 'none'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GENCOD", GETPOST("barcode", 'alpha'), 'chaine', 0, '', $conf->entity);
 
 	$varforimage='logo'; $dirforimage=$conf->mycompany->dir_output.'/logos/';

From e12fde398ae512d586b4150607b52fd04f26f7d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jun 2019 19:50:55 +0200
Subject: [PATCH 133/133] Fix phpcs

---
 htdocs/societe/class/societe.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 5187d8522a2..5d410b7c72d 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3482,7 +3482,7 @@ class Societe extends CommonObject
 		$state_id=0;$state_code=$state_label='';
 		if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE))
 		{
-			$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_STATE);
+			$tmp=explode(':', $conf->global->MAIN_INFO_SOCIETE_STATE);
 			$state_id=$tmp[0];
 			if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_STATE is "id:code:label"
 			{
@@ -3493,8 +3493,8 @@ class Societe extends CommonObject
 			{
 				dol_syslog("Your state setup use an old syntax. Reedit it using setup area.", LOG_ERR);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-				$state_code=getState($state_id,2,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
-				$state_label=getState($state_id,0,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+				$state_code=getState($state_id, 2, $this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+				$state_label=getState($state_id, 0, $this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
 			}
 		}
 		$this->state_id=$state_id;