Merge remote-tracking branch 'upstream/develop' into develop

build/debian/source/include-binaries

@@ -0,0 +1 @@
+htdocs/install/doctemplates/websites/website_template-corporate.zip

build/perl/virtualmin/dolibarr.pl

@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "7.0.0", "6.0.5", "5.0.7" );
+return ( "9.0.0", "8.0.3", "7.0.4", "6.0.8", "5.0.7" );
 }
 
 sub script_dolibarr_release
@@ -263,15 +263,16 @@ if ($upgrade) {
 	local @params = ( [ "action", "upgrade" ],
 			  [ "versionfrom", $upgrade->{'version'} ],
 			  [ "versionto", $ver ],
+			  [ "installlock", "444" ],
 			 );
 	local $p = $ver >= 3.8 ? "step5" : "etape5";
 	local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
-	# Remove the installation directory.
+	# Remove the installation directory. (deprecated)
-	local $dinstall = "$opts->{'dir'}/install";
+	# local $dinstall = "$opts->{'dir'}/install";
-	$dinstall  =~ s/\/$//;
+	# $dinstall  =~ s/\/$//;
-	$out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
+	# $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
 	
 	}
 else {
@@ -306,15 +307,18 @@ else {
 			  [ "login", "admin" ],
 			  [ "pass", $dompass ],
 			  [ "pass_verif", $dompass ],
+			  [ "installlock", "444" ],
 	 		 );
 	local $p = $ver >= 3.8 ? "step5" : "etape5";
 	local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
-	# Remove the installation directory and protect config file.
+	# Remove the installation directory (deprecated)
-	local $dinstall = "$opts->{'dir'}/install";
+	# local $dinstall = "$opts->{'dir'}/install";
-	$dinstall  =~ s/\/$//;
+	# $dinstall  =~ s/\/$//;
-	$out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
+	# $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
+	
+	# Protect config file
 	&set_permissions_as_domain_user($d, 0644, $cfile);
 	&set_permissions_as_domain_user($d, 0755, $cfiledir);
 	}
@@ -386,6 +390,8 @@ sub script_dolibarr_check_latest
 {
 local ($ver) = @_;
 local @vers = &osdn_package_versions("dolibarr",
+				$ver >= 9.0 ? "dolibarr\\-(9\\.0\\.[0-9\\.]+)\\.tgz" :
+				$ver >= 8.0 ? "dolibarr\\-(8\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 7.0 ? "dolibarr\\-(7\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 6.0 ? "dolibarr\\-(6\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 5.0 ? "dolibarr\\-(5\\.0\\.[0-9\\.]+)\\.tgz" :

htdocs/admin/bank.php

@@ -397,7 +397,7 @@ print '<br><br>';
  */
 //if (! empty($conf->global->MAIN_FEATURES_LEVEL))
 //{
-print load_fiche_titre($langs->trans("BankAccountReleveModule"), '', '');
+print load_fiche_titre($langs->trans("Other"), '', '');
 
 
 print "<table class=\"noborder\" width=\"100%\">\n";

htdocs/admin/barcode.php

@@ -63,7 +63,7 @@ if ($action == 'setcoder')
 	$resql=$db->query($sqlp);
 	if (! $resql) dol_print_error($db);
 }
-else if ($action == 'update')
+elseif ($action == 'update')
 {
 	$location = GETPOST('GENBARCODE_LOCATION','alpha');
 	$res = dolibarr_set_const($db, "GENBARCODE_LOCATION",$location,'chaine',0,'',$conf->entity);
@@ -71,17 +71,8 @@ else if ($action == 'update')
 	$res = dolibarr_set_const($db, "PRODUIT_DEFAULT_BARCODE_TYPE", $coder_id,'chaine',0,'',$conf->entity);
 	$coder_id = GETPOST('GENBARCODE_BARCODETYPE_THIRDPARTY','alpha');
 	$res = dolibarr_set_const($db, "GENBARCODE_BARCODETYPE_THIRDPARTY", $coder_id,'chaine',0,'',$conf->entity);
-}
-else if ($action == 'updateengine')
-{
-    // TODO Update engines.
-}
 
-if ($action && $action != 'setcoder' && $action != 'setModuleOptions')
+	if ($res > 0)
-{
-	if (! $res > 0) $error++;
-
- 	if (! $error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
@@ -90,6 +81,42 @@ if ($action && $action != 'setcoder' && $action != 'setModuleOptions')
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
+elseif ($action == 'updateengine')
+{
+    $sql = "SELECT rowid, coder";
+    $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+    $sql.= " WHERE entity = ".$conf->entity;
+    $sql.= " ORDER BY code";
+
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+	   $num = $db->num_rows($resql);
+	   $i = 0;
+
+	   while ($i <	$num)
+	   {
+	       $obj = $db->fetch_object($resql);
+
+	       if (GETPOST('coder'.$obj->rowid, 'alpha'))
+	       {
+	           $coder = GETPOST('coder'.$obj->rowid,'alpha');
+	           $code_id = $obj->rowid;
+
+	           $sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type";
+	           $sqlp.= " SET coder = '" . $coder."'";
+	           $sqlp.= " WHERE rowid = ". $code_id;
+	           $sqlp.= " AND entity = ".$conf->entity;
+
+	           $upsql=$db->query($sqlp);
+	           if (! $upsql) dol_print_error($db);
+	       }
+
+	       $i++;
+	   }
+    }
+}
+
 
 /*
  * View
@@ -161,9 +188,12 @@ foreach($dirbarcode as $reldir)
 print '<br>';
 print load_fiche_titre($langs->trans("BarcodeEncodeModule"),'','');
 
-//print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
+if (empty($conf->use_javascript_ajax))
-//print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+{
-//print "<input type=\"hidden\" name=\"action\" value=\"updateengine\">";
+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" id="form_engine">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="updateengine">';
+}
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -258,10 +288,9 @@ print "</table>\n";
 
 if (empty($conf->use_javascript_ajax))
 {
-    // TODO Implement code behind action updateengine
+    print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"></div>';
-    //print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"></div>';
+    print '</form>';
 }
-//print '</form>';
 
 print "<br>";
 

htdocs/admin/emailcollector_card.php

@@ -380,11 +380,24 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$sourcedir = $object->source_directory;
 	$targetdir = ($object->target_directory ? $object->target_directory : '');			// Can be '[Gmail]/Trash' or 'mytag'
 
+	$connection = null;
+	$connectstringserver = '';
+	$connectstringsource = '';
+	$connectstringtarget = '';
+	
+	if (function_exists('imap_open'))
+	{
 		$connectstringserver = $object->getConnectStringIMAP();
 		$connectstringsource = $connectstringserver.imap_utf7_encode($sourcedir);
 		$connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir);
 
 		$connection = imap_open($connectstringsource, $object->user, $object->password);
+	}
+	else
+	{
+		$morehtml .= 'IMAP functions not available on your PHP';
+	}
+	
 	if (! $connection)
 	{
 		$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
@@ -395,7 +408,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$morehtml .= imap_num_msg($connection);
 	}
 
+	if ($connection)
+	{
 		imap_close($connection);
+	}
 	
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref.'<div class="refidno">'.$morehtml.'</div>', '', 0, '', '', 0, '');
 

htdocs/admin/tools/dolibarr_export.php

@@ -517,7 +517,6 @@ print '<br>';
 <input type="hidden" name="export_type" value="server" />
 
 <fieldset><legend class="legendforfieldsetstep" style="font-size: 3em">2</legend>
-<div class="fichehalfleft">
 
 <?php
 print $langs->trans("BackupDesc2",DOL_DATA_ROOT).'<br>';
@@ -525,6 +524,13 @@ print $langs->trans("BackupDescX").'<br><br>';
 
 ?>
 
+<div id="backupfilesleft" class="fichehalfleft">
+
+<?php
+
+print load_fiche_titre($title?$title:$langs->trans("BackupDumpWizard"));
+?>
+
 <label for="zipfilename_template"> <?php echo $langs->trans("FileNameToGenerate"); ?></label><br>
 <input type="text" name="zipfilename_template" style="width: 90%"
 	id="zipfilename_template"
@@ -537,6 +543,7 @@ echo $file;
 ?>" /> <br>
 <br>
 
+
 <?php
 // Show compression choices
 print '<div class="formelementrow">';

htdocs/comm/propal/class/propal.class.php

@@ -14,6 +14,7 @@
  * Copyright (C) 2014-2015 Marcos García            <marcosgdf@gmail.com>
  * Copyright (C) 2018      Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2018      Frédéric France          <frederic.france@netlogic.fr>
+ * Copyright (C) 2018      Ferran Marcet         	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -438,6 +439,8 @@ class Propal extends CommonObject
 		global $mysoc, $conf, $langs;
 
 		dol_syslog(get_class($this)."::addline propalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type, fk_remise_except=".$fk_remise_except);
+		if ($this->statut == self::STATUS_DRAFT)
+		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			// Clean parameters
@@ -452,7 +455,9 @@ class Propal extends CommonObject
 			$pu_ht=price2num($pu_ht);
 			$pu_ht_devise=price2num($pu_ht_devise);
 			$pu_ttc=price2num($pu_ttc);
-		$txtva=price2num($txtva);               // $txtva can have format '5.0(XXX)' or '5'
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva);               // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
+			}
 			$txlocaltax1=price2num($txlocaltax1);
 			$txlocaltax2=price2num($txlocaltax2);
 			$pa_ht=price2num($pa_ht);
@@ -468,8 +473,6 @@ class Propal extends CommonObject
 			// Check parameters
 			if ($type < 0) return -1;
 
-		if ($this->statut == self::STATUS_DRAFT)
-		{
 			$this->db->begin();
 
 			$product_type=$type;

htdocs/commande/class/commande.class.php

@@ -9,8 +9,8 @@
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013      Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2016-2017 Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2018      Nicolas ZABOURI	<info@inovea-conseil.com>
+ * Copyright (C) 2016-2018 Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1312,6 +1312,8 @@ class Commande extends CommonOrder
 		$logtext.= ", date_end=$date_end, type=$type special_code=$special_code, fk_unit=$fk_unit, origin=$origin, origin_id=$origin_id, pu_ht_devise=$pu_ht_devise";
 		dol_syslog(get_class($this).$logtext, LOG_DEBUG);
 
+		if ($this->statut == self::STATUS_DRAFT)
+		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			// Clean parameters
@@ -1331,7 +1333,9 @@ class Commande extends CommonOrder
 			$pu_ht_devise=price2num($pu_ht_devise);
 			$pu_ttc=price2num($pu_ttc);
 			$pa_ht=price2num($pa_ht);
-		$txtva = price2num($txtva);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva);               // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
+			}
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
 			if ($price_base_type=='HT')
@@ -1348,8 +1352,6 @@ class Commande extends CommonOrder
 			// Check parameters
 			if ($type < 0) return -1;
 
-		if ($this->statut == self::STATUS_DRAFT)
-		{
             $this->db->begin();
 
 			$product_type=$type;

htdocs/compta/bank/bankentries_list.php

@@ -634,7 +634,7 @@ if ($resql)
 	    }
 
 		// Using BANK_REPORT_LAST_NUM_RELEVE to automatically report last num (or not)
-		if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE == 1)
+		if (! empty($conf->global->BANK_REPORT_LAST_NUM_RELEVE))
 		{
 			print '
 			    <script type="text/javascript">

htdocs/compta/bank/class/account.class.php

@@ -1471,7 +1471,7 @@ class Account extends CommonObject
 	{
 		$country_code=$this->getCountryCode();
 
-		if (in_array($country_code,array('CH','FR','ES','GA','IT','NC'))) return 1; // France, Spain, Gabon, ...
+		if (in_array($country_code,array('FR','ES','GA','IT','NC'))) return 1; // France, Spain, Gabon, ... - Not valid for CH
 		if (in_array($country_code,array('AU','BE','CA','DE','DK','GR','GB','ID','IE','IR','KR','NL','NZ','UK','US'))) return 2;      // Australia, England...
 		return 0;
 	}

htdocs/compta/facture/class/facture.class.php

@@ -2663,6 +2663,8 @@ class Facture extends CommonInvoice
 		global $mysoc, $conf, $langs;
 
 		dol_syslog(get_class($this)."::addline id=$this->id,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type, fk_unit=$fk_unit", LOG_DEBUG);
+		if (! empty($this->brouillon))
+		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			// Clean parameters
@@ -2678,23 +2680,15 @@ class Facture extends CommonInvoice
 			if (empty($fk_prev_id)) $fk_prev_id = 'null';
 			if (! isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
 
-		$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
-
-		// Clean vat code
-		$vat_src_code='';
-		if (preg_match('/\((.*)\)/', $txtva, $reg))
-		{
-		    $vat_src_code = $reg[1];
-		    $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
-		}
-
 			$remise_percent=price2num($remise_percent);
 			$qty=price2num($qty);
 			$pu_ht=price2num($pu_ht);
 			$pu_ht_devise=price2num($pu_ht_devise);
 			$pu_ttc=price2num($pu_ttc);
 			$pa_ht=price2num($pa_ht);
-		$txtva=price2num($txtva);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva);               // $txtva can have format '5.0(XXX)' or '5'
+			}
 			$txlocaltax1=price2num($txlocaltax1);
 			$txlocaltax2=price2num($txlocaltax2);
 
@@ -2710,8 +2704,6 @@ class Facture extends CommonInvoice
 			// Check parameters
 			if ($type < 0) return -1;
 
-		if (! empty($this->brouillon))
-		{
 			$this->db->begin();
 
 			$product_type=$type;
@@ -2729,6 +2721,16 @@ class Facture extends CommonInvoice
 				}
 			}
 
+			$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
+
+			// Clean vat code
+			$vat_src_code='';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+			}
+
 			// Calcul du total TTC et de la TVA pour la ligne a partir de
 			// qty, pu, remise_percent et txtva
 			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker

htdocs/contrat/class/contrat.class.php

@@ -8,9 +8,9 @@
  * Copyright (C) 2013		Christophe Battarel		<christophe.battarel@altairis.fr>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2015	Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2015-2017	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018   	Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2018	Ferran Marcet			<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1382,7 +1382,9 @@ class Contrat extends CommonObject
 			$pu_ht=price2num($pu_ht);
 			$pu_ttc=price2num($pu_ttc);
 			$pa_ht=price2num($pa_ht);
-			$txtva=price2num($txtva);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva);               // $txtva can have format '5.0(XXX)' or '5'
+			}
 			$txlocaltax1=price2num($txlocaltax1);
 			$txlocaltax2=price2num($txlocaltax2);
 			$remise_percent=price2num($remise_percent);
@@ -1407,11 +1409,6 @@ class Contrat extends CommonObject
 			// Check parameters
 			if (empty($remise_percent)) $remise_percent=0;
 
-			// Calcul du total TTC et de la TVA pour la ligne a partir de
-			// qty, pu, remise_percent et txtva
-			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
-			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
-
 			$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc);
 
 			// Clean vat code
@@ -1422,6 +1419,11 @@ class Contrat extends CommonObject
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
 			}
 
+			// Calcul du total TTC et de la TVA pour la ligne a partir de
+			// qty, pu, remise_percent et txtva
+			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+
 			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, 1,$mysoc, $localtaxes_type);
 			$total_ht  = $tabprice[0];
 			$total_tva = $tabprice[1];

htdocs/core/ajax/ajaxdirpreview.php

@@ -179,7 +179,7 @@ if ($type == 'directory')
     $sorting = (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC);
 
     // Right area. If module is defined here, we are in automatic ecm.
-    $automodules = array('company', 'invoice', 'invoice_supplier', 'propal', 'supplier_proposal', 'order', 'order_supplier', 'contract', 'product', 'tax', 'project', 'fichinter', 'user', 'expensereport');
+    $automodules = array('company', 'invoice', 'invoice_supplier', 'propal', 'supplier_proposal', 'order', 'order_supplier', 'contract', 'product', 'tax', 'project', 'fichinter', 'user', 'expensereport', 'holiday');
 
     // TODO change for multicompany sharing
     // Auto area for suppliers invoices
@@ -210,6 +210,8 @@ if ($type == 'directory')
     else if ($module == 'user') $upload_dir = $conf->user->dir_output;
     // Auto area for expense report
     else if ($module == 'expensereport') $upload_dir = $conf->expensereport->dir_output;
+	// Auto area for holiday
+    else if ($module == 'holiday') $upload_dir = $conf->holiday->dir_output;
 
     // Automatic list
     if (in_array($module, $automodules))

htdocs/core/class/conf.class.php

@@ -432,6 +432,7 @@ class Conf
 		if (empty($this->global->SOCIETE_CODECOMPTA_ADDON))		$this->global->SOCIETE_CODECOMPTA_ADDON="mod_codecompta_panicum";
 
 		if (empty($this->global->CHEQUERECEIPTS_ADDON))			$this->global->CHEQUERECEIPTS_ADDON='mod_chequereceipt_mint';
+		if (empty($conf->global->TICKETSUP_ADDON))				$this->global->TICKETSUP_ADDON='mod_ticket_simple';
 
         // Security
 		if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED='standard'; // Default password generator

htdocs/core/class/html.formbarcode.class.php

@@ -66,7 +66,7 @@ class FormBarCode
 
         $disable = '';
 
-        if ($conf->use_javascript_ajax)
+        if (!empty($conf->use_javascript_ajax))
         {
             print "\n".'<script type="text/javascript" language="javascript">';
             print 'jQuery(document).ready(function () {
@@ -87,18 +87,28 @@ class FormBarCode
             $disable = 'disabled';
         }
         
-        $select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="post" id="form'.$idForm.'">';
+        if (!empty($conf->use_javascript_ajax))
+        {
+            $select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="POST" id="form'.$idForm.'">';
             $select_encoder.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             $select_encoder.= '<input type="hidden" name="action" value="update">';
             $select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">';
-        $select_encoder.= '<select id="select'.$idForm.'" class="flat" name="coder">';
+        }
+        
+        $selectname=(!empty($conf->use_javascript_ajax)?'coder':'coder'.$code_id);
+        $select_encoder.= '<select id="select'.$idForm.'" class="flat" name="'.$selectname.'">';
         $select_encoder.= '<option value="0"'.($selected==0?' selected':'').' '.$disable.'>'.$langs->trans('Disable').'</option>';
         $select_encoder.= '<option value="-1" disabled>--------------------</option>';
         foreach($barcodelist as $key => $value)
         {
             $select_encoder.= '<option value="'.$key.'"'.($selected==$key?' selected':'').'>'.$value.'</option>';
         }
-        $select_encoder.= '</select></form>';
+        $select_encoder.= '</select>';
+        
+        if (!empty($conf->use_javascript_ajax))
+        {
+            $select_encoder.= '</form>';
+        }
 
         return $select_encoder;
     }

htdocs/core/class/html.formfile.class.php

@@ -1510,6 +1510,11 @@ class FormFile
 			include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 			$object_instance=new ExpenseReport($this->db);
 		}
+		else if ($modulepart == 'holiday')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+			$object_instance=new Holiday($this->db);
+		}
 
 		foreach($filearray as $key => $file)
 		{
@@ -1539,7 +1544,8 @@ class FormFile
 				if ($modulepart == 'project')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
 				if ($modulepart == 'fichinter')         { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
 				if ($modulepart == 'user')              { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
-				if ($modulepart == 'expensereport')     { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
+				if ($modulepart == 'expensereport')     { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+				if ($modulepart == 'holiday')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
 
 				if (! $id && ! $ref) continue;
 				$found=0;

htdocs/core/lib/company.lib.php

@@ -1286,8 +1286,8 @@ function show_actions_todo($conf,$langs,$db,$filterobj,$objcon='',$noprint=0,$ac
  * 		@param	Conf		       $conf		   Object conf
  * 		@param	Translate	       $langs		   Object langs
  * 		@param	DoliDB		       $db			   Object db
- * 		@param	mixed			   $filterobj	   Object Adherent|Societe|Project|Product|CommandeFournisseur|Dolresource
+ * 		@param	mixed			   $filterobj	   Filter on object Adherent|Societe|Project|Product|CommandeFournisseur|Dolresource|Ticket|... to list events linked to an object
- * 		@param	Contact		       $objcon		   Object contact
+ * 		@param	Contact		       $objcon		   Filter on object contact to filter events on a contact
  *      @param  int			       $noprint        Return string but does not output it
  *      @param  string		       $actioncode     Filter on actioncode
  *      @param  string             $donetodo       Filter on event 'done' or 'todo' or ''=nofilter (all).
@@ -1295,11 +1295,10 @@ function show_actions_todo($conf,$langs,$db,$filterobj,$objcon='',$noprint=0,$ac
  *      @param  string             $sortfield      Sort field
  *      @param  string             $sortorder      Sort order
  *      @return	mixed					           Return html part or void if noprint is 1
- *      TODO change function to be able to list event linked to an object.
  */
 function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=0, $actioncode='', $donetodo='done', $filters=array(), $sortfield='a.datep,a.id', $sortorder='DESC')
 {
-    global $user,$conf;
+    global $user, $conf;
     global $form;
 
     global $param;
@@ -1333,8 +1332,8 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         $sql.= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname";
         if (is_object($filterobj) && get_class($filterobj) == 'Societe')  $sql.= ", sp.lastname, sp.firstname";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql.= ", m.lastname, m.firstname";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql.= ", o.ref";
+        elseif (is_object($filterobj) && get_class($filterobj) == 'Facture') $sql.= ", o.ref";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql.= ", o.ref";
+        else $sql.= ", o.ref";
         $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";
@@ -1353,6 +1352,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql.= ", ".MAIN_DB_PREFIX."adherent as m";
         elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql.= ", ".MAIN_DB_PREFIX."product as o";
+        elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql.= ", ".MAIN_DB_PREFIX."ticket as o";
 
         $sql.= " WHERE a.entity IN (".getEntity('agenda').")";
         if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql.= " AND a.fk_soc = ".$filterobj->id;
@@ -1372,6 +1372,11 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         	$sql.= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";
         	if ($filterobj->id) $sql.= " AND a.fk_element = ".$filterobj->id;
         }
+        elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')
+        {
+        	$sql.= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";
+        	if ($filterobj->id) $sql.= " AND a.fk_element = ".$filterobj->id;
+        }
 
 	    // Work with new table actioncomm_resources and multiple contact affectation.
 	    if (is_object($objcon) && $objcon->id)

htdocs/core/lib/functions.lib.php

@@ -4816,7 +4816,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 	{
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
-		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
+		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "x.x (yy)"
 		{
 			$vatratecleaned = $reg[1];
 			$vatratecode = $reg[2];

htdocs/core/lib/pdf.lib.php

@@ -728,7 +728,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 			$cury+=3;
 		}
 
-		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN))    // Note that some countries still need bank number, BIC/IBAN not enought for them
+		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN))    // Note that some countries still need bank number, BIC/IBAN not enougth for them
 		{
 		    // Note:
 		    // bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)

htdocs/core/lib/security.lib.php

@@ -142,7 +142,7 @@ function dol_hash($chain, $type='0')
  *  If constant MAIN_SECURITY_HASH_ALGO is defined, we use this function as hashing function.
  *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt.
  *
- * 	@param 		string		$chain		String to hash
+ * 	@param 		string		$chain		String to hash (not hashed string)
  * 	@param 		string		$hash		hash to compare
  * 	@param		string		$type		Type of hash ('0':auto, '1':sha1, '2':sha1+md5, '3':md5, '4':md5 for OpenLdap, '5':sha256). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
  * 	@return		bool					True if the computed hash is the same as the given one

htdocs/core/lib/ticket.lib.php

@@ -103,7 +103,7 @@ function ticket_prepare_head($object)
 
 
     // History
-    $head[$h][0] = DOL_URL_ROOT.'/ticket/history.php?track_id=' . $object->track_id;
+    $head[$h][0] = DOL_URL_ROOT.'/ticket/agenda.php?track_id=' . $object->track_id;
     $head[$h][1] = $langs->trans('Events');
     if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
     {

htdocs/core/modules/contract/doc/pdf_strato.modules.php

@@ -447,7 +447,7 @@ class pdf_strato extends ModelePDFContract
 				if ($pagenb == 1)
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-					$this->_tab_signature($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, $outputlangs);
+					$this->tabSignature($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, $outputlangs);
 					$bottomlasttab=$this->page_hauteur - $heightforfooter - $heightforfooter + 1;
 				}
 				else

htdocs/core/modules/modSociete.class.php

@@ -265,7 +265,7 @@ class modSociete extends DolibarrModules
 			's.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode",'s.code_compta'=>"AccountancyCode",'s.code_compta_fournisseur'=>"SupplierAccountancyCode",
 			's.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'d.nom'=>'State','c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",
 			's.url'=>"Url",'s.email'=>"Email",'s.default_lang'=>"DefaultLang",'s.siren'=>"ProfId1",'s.siret'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",
-			's.idprof5'=>"ProfId5",'s.idprof6'=>"ProfId6",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_private'=>"NotePrivate",'s.note_public'=>"NotePublic",
+			's.idprof5'=>"ProfId5",'s.idprof6'=>"ProfId6",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_private'=>"NotePrivate",'s.note_public'=>"NotePublic",'s.canvas'=>"Canvas",
 			't.libelle'=>"ThirdPartyType",'ce.code'=>"Staff","cfj.libelle"=>"JuridicalStatus",'s.fk_prospectlevel'=>'ProspectLevel',
 			'st.code'=>'ProspectStatus','payterm.libelle'=>'PaymentConditions','paymode.libelle'=>'PaymentMode'
 		);
@@ -292,7 +292,7 @@ class modSociete extends DolibarrModules
 			's.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",
 			's.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",
 			's.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",
-			's.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",
+			's.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_private'=>"Text",'s.note_public'=>"Text",'s.canvas'=>"Text",'t.libelle'=>"Text",
 			'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code',
 			'st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text','u.login'=>'Text','u.firstname'=>'Text','u.lastname'=>'Text','payterm.libelle'=>'Text',
 			'paymode.libelle'=>'Text','s.entity'=>'Numeric'
@@ -390,7 +390,7 @@ class modSociete extends DolibarrModules
 			's.code_compta'=>"CustomerAccountancyCode",'s.code_compta_fournisseur'=>"SupplierAccountancyCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",
 			's.fk_departement'=>"StateId",'s.fk_pays'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.siren'=>"ProfId1",
 			's.siret'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.idprof5'=>"ProfId5",'s.idprof6'=>"ProfId6",'s.tva_intra'=>"VATIntraShort",
-			's.capital'=>"Capital",'s.note_private'=>"NotePrivate",'s.note_public'=>"NotePublic",'s.fk_typent'=>"ThirdPartyType",'s.fk_effectif'=>"Staff",
+			's.capital'=>"Capital",'s.note_private'=>"NotePrivate",'s.note_public'=>"NotePublic",'s.canvas'=>"Canvas",'s.fk_typent'=>"ThirdPartyType",'s.fk_effectif'=>"Staff",
 			"s.fk_forme_juridique"=>"JuridicalStatus",'s.fk_prospectlevel'=>'ProspectLevel','s.fk_stcomm'=>'ProspectStatus','s.default_lang'=>'DefaultLanguage',
 			's.barcode'=>'BarCode','s.datec'=>"DateCreation"
 		);
@@ -494,7 +494,7 @@ class modSociete extends DolibarrModules
 				'sr.cle_rib'=>"22",'sr.bic'=>"USHINGMMXXX",'sr.iban_prefix'=>"US00 0000 1111 22 3333 3333",'sr.domiciliation'=>"PARIS",'sr.proprio' => "Name of owner", 'sr.owner_address' => "15 paris street 75000 Paris", 'sr.default_rib' => '1 or 0'
 		);
 
-		// Import Company Salesman
+		// Import Company Sales representatives
 		$r++;
 		$this->import_code[$r]=$this->rights_class.'_'.$r;
 		$this->import_label[$r]="ImportDataset_company_4";	// Translation key

htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php

@@ -800,6 +800,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         }
         // Set societeforaction.
         if ($object->socid > 0)			$societeforaction->fetch($object->socid);
+        elseif ($object->fk_soc > 0)	$societeforaction->fetch($object->fk_soc);
 
         $projectid = isset($object->fk_project)?$object->fk_project:0;
         if ($object->element == 'project') $projectid = $object->id;
@@ -811,6 +812,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         	$elementid = $object->fk_adherent;
         	$elementtype = 'member';
         }
+        //var_dump($societeforaction);var_dump($contactforaction);exit;
 
 		// Insertion action
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

htdocs/ecm/class/ecmfiles.class.php

@@ -180,8 +180,15 @@ class EcmFiles extends CommonObject
 		if (empty($this->date_m)) $this->date_m = dol_now();
 
 		// If ref not defined
+		$ref = '';
+		if (! empty($this->ref))
+		{
+			$ref=$this->ref;
+		}
+		else {
+			include_once DOL_DOCUMENT_ROOT.'/lib/security.lib.php';
 			$ref = dol_hash($this->filepath.'/'.$this->filename, 3);
-		if (! empty($this->ref)) $ref=$this->ref;
+		}
 
 		$maxposition=0;
 		if (empty($this->position))   // Get max used

htdocs/ecm/index_auto.php

@@ -331,6 +331,7 @@ if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
 	if (! empty($conf->projet->enabled))		{ $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsByProjects")); }
 	if (! empty($conf->ficheinter->enabled))	{ $langs->load("interventions"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsByInterventions")); }
 	if (! empty($conf->expensereport->enabled))	{ $langs->load("trips"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsByExpenseReports")); }
+	if (! empty($conf->holiday->enabled))		{ $langs->load("holiday"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsByHolidays")); }
 	$rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsByUsers"));
 }
 

htdocs/expensereport/class/expensereport.class.php

@@ -2,9 +2,9 @@
 /* Copyright (C) 2011 		Dimitri Mouillard   	<dmouillard@teclib.com>
  * Copyright (C) 2015 		Laurent Destailleur 	<eldy@users.sourceforge.net>
  * Copyright (C) 2015 		Alexandre Spangaro  	<aspangaro@zendsi.com>
- * Copyright (C) 2016 Ferran Marcet       <fmarcet@2byte.es>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (c) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2016-2018 	Ferran Marcet       	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1692,10 +1692,12 @@ class ExpenseReport extends CommonObject
 	 */
 	function addline($qty=0, $up=0, $fk_c_type_fees=0, $vatrate=0, $date='', $comments='', $fk_project=0, $fk_c_exp_tax_cat=0, $type=0)
 	{
-		global $conf,$langs;
+		global $conf,$langs,$mysoc;
 
         dol_syslog(get_class($this)."::addline qty=$qty, up=$up, fk_c_type_fees=$fk_c_type_fees, vatrate=$vatrate, date=$date, fk_project=$fk_project, type=$type, comments=$comments", LOG_DEBUG);
 
+		if ($this->fk_statut == self::STATUS_DRAFT)
+		{
 			if (empty($qty)) $qty = 0;
 			if (empty($fk_c_type_fees) || $fk_c_type_fees < 0) $fk_c_type_fees = 0;
 			if (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) $fk_c_exp_tax_cat = 0;
@@ -1704,15 +1706,18 @@ class ExpenseReport extends CommonObject
 			if (empty($fk_project)) $fk_project = 0;
 
 			$qty = price2num($qty);
-		$vatrate = price2num($vatrate);
+			if (!preg_match('/\((.*)\)/', $vatrate)) {
+				$vatrate = price2num($vatrate);               // $txtva can have format '5.0(XXX)' or '5'
+			}
 			$up = price2num($up);
 
-		if ($this->fk_statut == self::STATUS_DRAFT)
-        {
 			$this->db->begin();
 
 			$this->line = new ExpenseReportLine($this->db);
 
+			$localtaxes_type=getLocalTaxesFromRate($vatrate,0,$mysoc,$this->thirdparty);
+
+			$vat_src_code = '';
 			if (preg_match('/\((.*)\)/', $vatrate, $reg))
 			{
 				$vat_src_code = $reg[1];
@@ -1721,7 +1726,8 @@ class ExpenseReport extends CommonObject
 			$vatrate = preg_replace('/\*/','',$vatrate);
 
 			$seller = '';  // seller is unknown
-			$tmp = calcul_price_total($qty, $up, 0, $vatrate, 0, 0, 0, 'TTC', 0, $type, $seller);
+
+			$tmp = calcul_price_total($qty, $up, 0, $vatrate, 0, 0, 0, 'TTC', 0, $type, $seller, $localtaxes_type);
 
 			$this->line->value_unit = $up;
 			$this->line->vatrate = price2num($vatrate);

htdocs/filefunc.inc.php

@@ -31,7 +31,7 @@
  */
 
 if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE','Dolibarr');
-if (! defined('DOL_VERSION')) define('DOL_VERSION','9.0.0-beta');		// a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (! defined('DOL_VERSION')) define('DOL_VERSION','10.0.0-alpha');		// a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (! defined('EURO')) define('EURO',chr(128));
 

htdocs/fourn/class/fournisseur.commande.class.php

@@ -10,6 +10,7 @@
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018       Ferran Marcet         	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1502,6 +1503,10 @@ class CommandeFournisseur extends CommonOrder
         $error = 0;
 
         dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $fk_prod_fourn_price, $ref_supplier, $remise_percent, $price_base_type, $pu_ttc, $type, $info_bits, $notrigger, $date_start, $date_end, $fk_unit, $pu_ht_devise, $origin, $origin_id");
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+		if ($this->statut == self::STATUS_DRAFT)
+		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			// Clean parameters
@@ -1517,7 +1522,9 @@ class CommandeFournisseur extends CommonOrder
 			$pu_ht=price2num($pu_ht);
 			$pu_ht_devise=price2num($pu_ht_devise);
 			$pu_ttc=price2num($pu_ttc);
-        $txtva = price2num($txtva);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva);               // $txtva can have format '5.0(XXX)' or '5'
+			}
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
 			if ($price_base_type=='HT')
@@ -1538,8 +1545,7 @@ class CommandeFournisseur extends CommonOrder
 			}
 			if ($type < 0) return -1;
 
-        if ($this->statut == self::STATUS_DRAFT)
+
-        {
             $this->db->begin();
 
             if ($fk_product > 0)
@@ -1605,10 +1611,9 @@ class CommandeFournisseur extends CommonOrder
                 $product_type = $type;
             }
 
-            // Calcul du total TTC et de la TVA pour la ligne a partir de
+            if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
-            // qty, pu, remise_percent et txtva
+            	$pu = 0;
-            // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+            }
-            // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
             $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc,$this->thirdparty);
 
@@ -1620,9 +1625,10 @@ class CommandeFournisseur extends CommonOrder
                 $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
             }
 
-            if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
+            // Calcul du total TTC et de la TVA pour la ligne a partir de
-                $pu = 0;
+            // qty, pu, remise_percent et txtva
-            }
+            // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+            // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
             $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx,$pu_ht_devise);
 

htdocs/fourn/class/fournisseur.facture.class.php

@@ -1564,6 +1564,8 @@ class FactureFournisseur extends CommonInvoice
     	dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit", LOG_DEBUG);
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
+		if ($this->statut == self::STATUS_DRAFT)
+		{
 			// Clean parameters
 			if (empty($remise_percent)) $remise_percent=0;
 			if (empty($qty)) $qty=0;
@@ -1574,6 +1576,15 @@ class FactureFournisseur extends CommonInvoice
 			if (empty($txlocaltax1)) $txlocaltax1=0;
 			if (empty($txlocaltax2)) $txlocaltax2=0;
 
+			$remise_percent=price2num($remise_percent);
+			$qty=price2num($qty);
+			$pu=price2num($pu);
+			$txlocaltax1=price2num($txlocaltax1);
+			$txlocaltax2=price2num($txlocaltax2);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva);               // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
+			}
+
 	        $this->db->begin();
 
 	        if ($fk_product > 0)
@@ -1639,6 +1650,9 @@ class FactureFournisseur extends CommonInvoice
 	        	$product_type = $type;
 	        }
 
+	        if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
+	        	$pu = 0;
+	        }
 
 	        $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
 
@@ -1650,16 +1664,10 @@ class FactureFournisseur extends CommonInvoice
 	        	$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
 	        }
 
-        $remise_percent=price2num($remise_percent);
+	        // Calcul du total TTC et de la TVA pour la ligne a partir de
-        $qty=price2num($qty);
+	        // qty, pu, remise_percent et txtva
-        $pu=price2num($pu);
+	        // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
-        $txtva=price2num($txtva);
+	        // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
-        $txlocaltax1=price2num($txlocaltax1);
-        $txlocaltax2=price2num($txlocaltax2);
-
-        if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
-            $pu = 0;
-        }
 
 	        $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
 	        $total_ht  = $tabprice[0];
@@ -1761,6 +1769,11 @@ class FactureFournisseur extends CommonInvoice
 				return -2;
 			}
         }
+        else
+        {
+        	return 0;
+        }
+    }
 
     /**
      * Update a line detail into database

htdocs/install/mysql/data/llx_c_action_trigger.sql

@@ -105,6 +105,9 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_VALIDATE','Project validation','Executed when a project is validated','project',141);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',143);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',164);
 -- actions not enabled by default (no constant created for that) when we enable module agenda 
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',23);

htdocs/install/mysql/migration/5.0.0-6.0.0.sql

@@ -317,6 +317,7 @@ ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN multicurrency_amount double
 
 
 ALTER TABLE llx_paiementfourn ADD COLUMN model_pdf varchar(255);
+ALTER TABLE llx_paiementfourn ADD COLUMN fk_user_modif integer AFTER fk_user_author;
 
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202);

htdocs/install/mysql/migration/7.0.0-8.0.0.sql

@@ -219,6 +219,8 @@ UPDATE llx_societe_rib set type = 'ban' where type = '' OR type IS NULL;
 -- VPGSQL8.2 ALTER TABLE llx_societe_rib ALTER COLUMN type SET NOT NULL;
    
 
+ALTER TABLE llx_ticket_msg DROP FOREIGN KEY fk_ticket_msg_fk_track_id;
+
 -- Module ticket
 CREATE TABLE llx_ticket
 (
@@ -265,17 +267,6 @@ CREATE TABLE llx_ticket_msg
 
 ALTER TABLE llx_ticket_msg ADD CONSTRAINT fk_ticket_msg_fk_track_id FOREIGN KEY (fk_track_id) REFERENCES llx_ticket (track_id);
 
-CREATE TABLE llx_ticket_logs
-(
-	rowid       integer AUTO_INCREMENT PRIMARY KEY,
-	entity		integer DEFAULT 1,
-	fk_track_id   varchar(128),
-	fk_user_create	integer,
-	datec datetime,
-	message	text
-)ENGINE=innodb;
-
-ALTER TABLE llx_ticket_logs ADD CONSTRAINT fk_ticket_logs_fk_track_id FOREIGN KEY (fk_track_id) REFERENCES llx_ticket (track_id);
 
 CREATE TABLE llx_ticket_extrafields
 (
@@ -568,3 +559,4 @@ ALTER TABLE llx_advtargetemailing ADD COLUMN type_element varchar(180) NOT NULL;
 UPDATE llx_advtargetemailing SET fk_element = fk_mailing, type_element='mailing';
 ALTER TABLE llx_advtargetemailing DROP COLUMN fk_mailing;
 
+DROP TABLE llx_ticket_logs;

htdocs/install/mysql/migration/8.0.0-9.0.0.sql

@@ -150,6 +150,9 @@ UPDATE llx_c_payment_term SET decalage = nbjour, nbjour = 0 where decalage IS NU
 UPDATE llx_holiday SET ref = rowid WHERE ref IS NULL;
 
 
+-- DROP TABLE llx_emailcollector_emailcollectorfilter;
+-- DROP TABLE llx_emailcollector_emailcollectoraction;
+-- DROP TABLE llx_emailcollector_emailcollector;
 
 CREATE TABLE llx_emailcollector_emailcollector(
         -- BEGIN MODULEBUILDER FIELDS

htdocs/install/mysql/migration/9.0.0-10.0.0.sql

@@ -0,0 +1,38 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 9.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.
+
+
+-- Missing in 9.0
+
+
+
+-- For 10.0
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',164);

htdocs/install/mysql/tables/llx_ticket_logs.key.sql

@@ -1,17 +0,0 @@
--- SQL definition for module ticket
--- Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-ALTER TABLE llx_ticket_logs ADD CONSTRAINT fk_ticket_logs_fk_track_id FOREIGN KEY (fk_track_id) REFERENCES llx_ticket (track_id);

htdocs/install/mysql/tables/llx_ticket_logs.sql

@@ -1,25 +0,0 @@
--- SQL definition for module ticket
--- Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-CREATE TABLE llx_ticket_logs
-(
-	rowid       integer AUTO_INCREMENT PRIMARY KEY,
-	entity		integer DEFAULT 1,
-	fk_track_id   varchar(128),
-	fk_user_create	integer,
-	datec datetime,
-	message	text
-)ENGINE=innodb;

htdocs/install/step5.php

@@ -57,6 +57,7 @@ $langs->loadLangs(array("admin", "install"));
 $login = GETPOST('login', 'alpha')?GETPOST('login', 'alpha'):(empty($argv[5])?'':$argv[5]);
 $pass = GETPOST('pass', 'alpha')?GETPOST('pass', 'alpha'):(empty($argv[6])?'':$argv[6]);
 $pass_verif = GETPOST('pass_verif', 'alpha')?GETPOST('pass_verif', 'alpha'):(empty($argv[7])?'':$argv[7]);
+$force_install_lockinstall = (int) (! empty($force_install_lockinstall)?$force_install_lockinstall:(GETPOST('installlock','aZ09')?GETPOST('installlock','aZ09'):(empty($argv[8])?'':$argv[8])));
 
 $success=0;
 

htdocs/install/upgrade2.php

@@ -2922,9 +2922,9 @@ function migrate_project_task_actors($db,$langs,$conf)
  * @param	Conf		$conf			Object conf
  * @param	string		$table			Table name
  * @param	int			$fk_source		Id of element source
- * @param	type		$sourcetype		Type of element source
+ * @param	string		$sourcetype		Type of element source
  * @param	int			$fk_target		Id of element target
- * @param	type		$targettype		Type of element target
+ * @param	string		$targettype		Type of element target
  * @return	void
  */
 function migrate_relationship_tables($db,$langs,$conf,$table,$fk_source,$sourcetype,$fk_target,$targettype)
@@ -4833,7 +4833,7 @@ function migrate_reload_menu($db,$langs,$conf,$versionto)
  */
 function migrate_user_photospath()
 {
-	global $conf, $db, $langs;
+	global $conf, $db, $langs, $user;
 
 	print '<tr><td colspan="4">';
 
@@ -4842,6 +4842,8 @@ function migrate_user_photospath()
 	include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 	$fuser = new User($db);
 
+	if (! is_object($user)) $user = $fuser;	// To avoid error during migration
+
 	$sql = "SELECT rowid as uid from ".MAIN_DB_PREFIX."user";	// Get list of all users
 	$resql = $db->query($sql);
 	if ($resql)
@@ -4850,16 +4852,23 @@ function migrate_user_photospath()
 		{
 			$fuser->fetch($obj->uid);
 			//echo '<hr>'.$fuser->id.' -> '.$fuser->entity;
-			$entity = (!empty($fuser->entity)) ? $fuser->entity : 1;
+			$entity = (empty($fuser->entity) ? 1 : $fuser->entity);
-			$dir = $conf->user->multidir_output[$entity];
+			if ($entity > 1) {
-			$origin = $dir .'/'. get_exdir($fuser->id,2,0,0,$fuser,'user');
+				$dir = DOL_DATA_ROOT . '/' . $entity . '/users';
-			$destin = $dir.'/'.$fuser->id;
+			} else {
+				$dir = $conf->user->multidir_output[$entity];	// $conf->user->multidir_output[] for each entity is construct by the multicompany module
+			}
 
-			$error = 0;
+			if ($dir)
+			{
+				//print "Process user id ".$fuser->id."<br>\n";
+				$origin = $dir .'/'. get_exdir($fuser->id,2,0,1,$fuser,'user');	// Use old behaviour to get x/y path
+				$destin = $dir .'/'. $fuser->id;
 
 				$origin_osencoded=dol_osencode($origin);
-			$destin_osencoded=dol_osencode($destin);
+
 				dol_mkdir($destin);
+
 				//echo '<hr>'.$origin.' -> '.$destin;
 				if (dol_is_dir($origin))
 				{
@@ -4868,7 +4877,9 @@ function migrate_user_photospath()
 			        {
 			        	while (($file = readdir($handle)) !== false)
 			    		{
-		     			if ($file != '.' && $file != '..' && is_dir($origin_osencoded.'/'.$file))
+			    			if ($file == '.' || $file == '..') continue;
+
+			     			if (dol_is_dir($origin.'/'.$file))	// it is a dir (like 'thumbs')
 			    			{
 			    				$thumbs = opendir($origin_osencoded.'/'.$file);
 			    				if (is_resource($thumbs))
@@ -4876,16 +4887,28 @@ function migrate_user_photospath()
 				     				dol_mkdir($destin.'/'.$file);
 				     				while (($thumb = readdir($thumbs)) !== false)
 					    			{
-				    				dol_move($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb);
+					    				if (! dol_is_file($destin.'/'.$file.'/'.$thumb))
+					    				{
+					    					if ($thumb == '.' || $thumb == '..') continue;
+
+					    					//print $origin.'/'.$file.'/'.$thumb.' -> '.$destin.'/'.$file.'/'.$thumb.'<br>'."\n";
+					    					print '.';
+					    					dol_copy($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb, 0, 0);
+					    					//var_dump('aaa');exit;
+					    				}
 					    			}
 									// dol_delete_dir($origin.'/'.$file);
 			        			}
 			    			}
-		    			else
+			    			else								// it is a file
 			    			{
-		    				if (dol_is_file($origin.'/'.$file) )
+			    				if (! dol_is_file($destin.'/'.$file))
 			    				{
-		    					dol_move($origin.'/'.$file, $destin.'/'.$file);
+			    					//print $origin.'/'.$file.' -> '.$destin.'/'.$file.'<br>'."\n";
+			    					print '.';
+			    					dol_copy($origin.'/'.$file, $destin.'/'.$file, 0, 0);
+			    					//var_dump('eee');exit;
+			    				}
 			    			}
 			    		}
 			        }

htdocs/langs/ar_SA/admin.lang

@@ -193,7 +193,7 @@ FeatureDisabledInDemo=الميزة معلطة في العرض التجريبي
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=فقط العناصر من <a href="%s">النماذج المفعلة </a> سوف تظهر.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=أدوات وحدات متعددة
 ModuleFamilyExperimental=نماذج تجريبية
 ModuleFamilyFinancial=الوحدات المالية (المحاسبة / الخزانة)
 ModuleFamilyECM=إدارة المحتوى في المؤسسة
-ModuleFamilyPortal=المواقع على شبكة الإنترنت وتطبيق مباشر الآخرين
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=واجهات مع الأنظمة الخارجية
 MenuHandlers=قائمة مناولي
 MenuAdmin=قائمة تحرير
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=مجموعات المستخدمين
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=شركات الاتصالات وإدارة
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=التجارية
 Module2Desc=الإدارة التجارية
 Module10Name=المحاسبة
@@ -501,7 +501,7 @@ Module23Desc=مراقبة استهلاك الطاقة
 Module25Name=طلبات الزبائن
 Module25Desc=طلبات الزبائن إدارة
 Module30Name=فواتير
-Module30Desc=ويلاحظ اعتماد الفواتير وإدارة العملاء. فواتير إدارة الموردين
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=الموردين
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=أسعار الضريبة على القيمة المضافة أو
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=شروط الدفع
 DictionaryPaymentModes=وسائل الدفع
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=ضرائب بيئية (WEEE)
 DictionaryPaperFormat=تنسيقات ورقة
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=تقارير الضرائب المحلية هي مجموعه l
 LabelUsedByDefault=العلامة التي يستخدمها التقصير إذا لم يمكن العثور على ترجمة للقانون
 LabelOnDocuments=علامة على وثائق
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=في نهاية الشهر
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=مراجعة الحسابات الأحداث الأمنية
-Audit=المراجعة
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=اسم المتصفح
 BrowserOS=متصفح OS
 ListOfSecurityEvents=قائمة الأحداث الأمنية Dolibarr
 SecurityEventsPurged=تطهير الاحداث الامنية
-LogEventDesc=هنا يمكنك تمكين قطع الأشجار لDolibarr الأحداث الأمنية. يمكن للمشرفين ثم انظر مضمونه عبر <b>نظام</b> القائمة <b>أدوات -- لمراجعة الحسابات.</b> محذرا من أن هذه الميزة يمكن أن تستهلك كمية كبيرة من البيانات في قاعدة البيانات.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=نظام المعلومات المتنوعة المعلومات التقنية تحصل في قراءة فقط وواضحة للمشرفين فقط.
 SystemAreaForAdminOnly=هذا المجال المتاح لمدير المستخدمين فقط. أيا من Dolibarr أذونات يمكن أن تقلل من هذا الحد.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=خطوة للتقريب النطاق (للبلدان ال
 UnitPriceOfProduct=صافي سعر وحدة من المنتج
 TotalPriceAfterRounding=إجمالي السعر الصافي / ضريبة القيمة المضافة / ضريبة مدفوع) بعد التقريب
 ParameterActiveForNextInputOnly=معلمة فعالة للمساهمة المقبل فقط
-NoEventOrNoAuditSetup=لا أمن الحدث وقد سجلت حتى الآن. هذا طبيعي ويمكن مراجعة الحسابات اذا لم يتم تمكين "الإعداد -- الأمن -- مراجعة" الصفحة.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=انظر الى إرسال البريد الإعداد المحلي
 BackupDesc=لتقديم دعم كامل للDolibarr ، يجب عليك :
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=سمات التكميلية (خطوط النظام)
 ExtraFieldsSupplierInvoicesLines=سمات التكميلية (خطوط الفاتورة)
 ExtraFieldsThirdParties=سمات التكميلية (مرشحين عن)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=سمات التكميلية (عضو)
 ExtraFieldsMemberType=سمات التكميلية (النوع الأعضاء)
 ExtraFieldsCustomerInvoices=سمات التكميلية (الفواتير)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=قائمة الإشعارات ثابت
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=عتبة
 BackupDumpWizard=المعالج لبناء قاعدة بيانات النسخ الاحتياطي ملف تفريغ
 SomethingMakeInstallFromWebNotPossible=تركيب وحدة خارجية غير ممكن من واجهة ويب للسبب التالي:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=الرمز البريدي
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).

htdocs/langs/ar_SA/banks.lang

@@ -7,7 +7,7 @@ BankName=اسم المصرف
 FinancialAccount=الحساب
 BankAccount=الحساب المصرفي
 BankAccounts=الحسابات المصرفية
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=عرض الحساب
 AccountRef=مرجع الحساب المالي
 AccountLabel=بطاقة الحساب المالي
@@ -46,7 +46,7 @@ BankAccountDomiciliation=عنوان الحساب
 BankAccountCountry=بلد حساب
 BankAccountOwner=اسم صاحب الحساب
 BankAccountOwnerAddress=عنوان مالك الحساب
-RIBControlError=فشل التحقق من سلامة القيم. وهذا يعني أن المعلومات الخاصة برقم الحساب هذا غير كاملة أو خاطئة (راجع البلد والأرقام و إيبان).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=إنشاء حساب
 NewBankAccount=حساب جديد
 NewFinancialAccount=حساب مالي جديد
@@ -76,6 +76,7 @@ TransactionsToConciliate=قيود للتسويات
 Conciliable=يمكن أن يتم تسويتة
 Conciliate=التسوية
 Conciliation=تسوية
+SaveStatementOnly=Save statement only
 ReconciliationLate=التسوية في وقت متأخر
 IncludeClosedAccount=وتشمل حسابات مغلقة
 OnlyOpenedAccount=الحسابات المفتوحة فقط
@@ -104,7 +105,7 @@ SocialContributionPayment=مدفوعات الضرائب الاجتماعية /
 BankTransfer=حوالة مصرفية
 BankTransfers=حوالات المصرفية
 MenuBankInternalTransfer=حوالة داخلية
-TransferDesc=التحويل من حساب إلى آخر، سوف يقوم دوليبار بكتابة سجلين (مدين في حساب المصدر و دائن في حساب الهدف، نفس المبلغ (باستثناء العلامة)، سيتم استخدام البطاقة و التاريخ لهذه المعاملة)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=من
 TransferTo=إلى
 TransferFromToDone=التحويل من <b>%s</b>إلى <b>%s</b>من <b>%s</b>%s قد تم تسجيلة.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=هل انت متأكد أنك تريد حذف هذا
 BankChecks=الشيكات المصرفية
 BankChecksToReceipt=شيكات في انتظار الإيداع
 ShowCheckReceipt=عرض إيصال إيداع شيكات
-NumberOfCheques=عدد الشيكات
+NumberOfCheques=No. of check
 DeleteTransaction=حذف المعاملة
 ConfirmDeleteTransaction=هل تريد بالتأكيد حذف هذه المعاملة؟
 ThisWillAlsoDeleteBankRecord=سيؤدي هذا أيضا إلى حذف القيد البنكي الذي تم إنشاؤه
@@ -135,8 +136,8 @@ BankTransactionLine=قيد البنك
 AllAccounts=All bank and cash accounts
 BackToAccount=عودة إلى الحساب
 ShowAllAccounts=عرض لجميع الحسابات
-FutureTransaction=المعاملة أجلة. لا يوجد فرصة للتسوية.
+FutureTransaction=Transaction in future. No way to reconcile.
-SelectChequeTransactionAndGenerate=تحديد / تصفية الشيكات ليتم تضمينها في ايصال ايداع الشيكات وانقر على  "إنشاء".
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=اختيار كشف الحساب البنكي ذات الصلة مع التسوية. استخدام قيمة رقمية للفرز: شهر سنة أو يوم شهر سنة
 EventualyAddCategory=في نهاية المطاف، حدد الفئة التي لتصنيف السجلات
 ToConciliate=للتسوية؟
@@ -153,7 +154,7 @@ RejectCheckDate=تاريخ إرجاع الشيك
 CheckRejected=تم إرجاع الشيك
 CheckRejectedAndInvoicesReopened=تم ارجاع الشيك وإعادة فتح الفواتير
 BankAccountModelModule=نماذج مستندات للحسابات البنكية
-DocumentModelSepaMandate=نموذج تفويض سيبا. مفيدة للبلدان الأوروبية في السوق الأوروبية المشتركة فقط.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=نموذج لطباعة صفحة تحتوي على معلومات BAN .
 NewVariousPayment=مدفوعات متنوعة جديدة
 VariousPayment=مدفوعات متنوعة
@@ -162,4 +163,6 @@ ShowVariousPayment=عرض الدفعات المتنوعة
 AddVariousPayment=إضافة دفعات متنوعة
 SEPAMandate=SEPA mandate
 YourSEPAMandate=تفويض سيبا الخاص بك
-FindYourSEPAMandate=هذا هو تفويض سيبا الخاصة بك لتخويل شركتنا لتقديم أمر الخصم المباشر إلى البنك الذي تتعامل معه. شكرا للعودة وقعت (فحص الوثيقة الموقعة) أو إرسالها عن طريق البريد إلى
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament

htdocs/langs/ar_SA/bills.lang

@@ -25,10 +25,10 @@ InvoiceProFormaAsk=الفاتورة الأولية
 InvoiceProFormaDesc=<b> الفاتورة المبدئية </b> عبارة عن صورة فاتورة حقيقية ولكنها لا تحتوي على قيمة للمحاسبة.
 InvoiceReplacement=استبدال الفاتورة
 InvoiceReplacementAsk=فاتورة استبدال الفاتورة
-InvoiceReplacementDesc=<b> الفاتورة البديلة</b> يتم استخدامها لإلغاء واستبدال بالكامل الفاتورة التي لا تتضمن أية دفعات عليها. <br> <br> ملاحظة: لا يمكن استبدال سوى الفواتير التي لا تتضمن أية دفعات عليها. إذا لم يتم إغلاق الفاتورة التي استبدلتها بعد، فسيتم إغلاقها تلقائيا إلى "مهمل".
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=ملاحظة ائتمانية
 InvoiceAvoirAsk=ملاحظة ائتمانية لتصحيح الفاتورة
-InvoiceAvoirDesc=<b> الملاحظة الائتمانية</b> عبارة عن فاتورة سلبية تستخدم لحل حقيقة أن الفاتورة تحتوي على مبلغ يختلف عن المبلغ المدفوع فعلا (لأن العميل دفع مبالغ كبيرة عن طريق الخطأ، أو لن يدفعوا بشكل كامل حيث أنه اعاد بعض المنتجات على سبيل المثال).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=إنشاء الائتمان ملاحظة مع خطوط من الفاتورة الأصلية
 invoiceAvoirWithPaymentRestAmount=إنشاء الائتمان ملاحظة مع المتبقية غير المسددة من الفاتورة الأصلية
 invoiceAvoirLineWithPaymentRestAmount=ملاحظة الائتمان للبقاء المبلغ غير المدفوع
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=تسديدها
 DeletePayment=حذف الدفعة
 ConfirmDeletePayment=هل انت متأكد انك ترغب في حذف هذه الدفعة؟
-ConfirmConvertToReduc=هل تريد تحويل هذا %s إلى خصم مطلق؟<br> سيتم حفظ المبلغ حتى بين جميع الخصومات، ويمكن استخدامها كخصم لفاتورة الحالية أو المستقبلية لهذا العميل.
+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 so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=مدفوعات الموردين
 ReceivedPayments=المدفوعات المستلمة
 ReceivedCustomersPayments=المدفوعات المستلمة من العملاء
-PayedSuppliersPayments=المدفوعات التي دفعت للموردين
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=تلقى مدفوعات عملاء للمصادقة
 PaymentsReportsForYear=تقارير المدفوعات لل%s
 PaymentsReports=تقارير المدفوعات
@@ -91,8 +91,8 @@ PaymentConditionsShort=شروط الدفع
 PaymentAmount=دفع مبلغ
 ValidatePayment=تحقق من الدفع
 PaymentHigherThanReminderToPay=دفع أعلى من دفع تذكرة
-HelpPaymentHigherThanReminderToPay=الاهتمام ، على دفع مبلغ واحد أو أكثر من فواتير أعلى من الراحة على الدفع. <br> تعديل الدخول ، تؤكد خلاف ذلك والتفكير في إنشاء الائتمان علما الزائدة وتلقى كل الفواتير الزائدة.
+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 rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=تصنيف 'مدفوع'
 ClassifyPaidPartially=تصنيف 'مدفوع جزئيا'
 ClassifyCanceled=تصنيف 'المهجورة'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=مغلقة (غير مدفوعة الأجر)
 BillStatusClosedPaidPartially=دفعت (جزئيا)
 BillShortStatusDraft=مسودة
 BillShortStatusPaid=دفع
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=دفع
 BillShortStatusCanceled=المهجورة
 BillShortStatusValidated=صادق
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=مغلقة
 BillShortStatusClosedPaidPartially=دفعت (جزئيا)
 PaymentStatusToValidShort=للمصادقة
-ErrorVATIntraNotConfigured=Intracommunautary رقم الضريبة على القيمة المضافة لم تحدد بعد
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=لا يعرف طريقة الدفع الافتراضية. الذهاب الى الفاتورة وحدة لتحديد هذا الإعداد.
 ErrorCreateBankAccount=إنشاء حساب مصرفي ، ثم يذهب إلى إعداد فريق من الفاتورة وحدة لتحديد طرق الدفع
 ErrorBillNotFound=فاتورة %s لا يوجد
-ErrorInvoiceAlreadyReplaced=خطأ ، في محاولة لإثبات صحة فاتورة لتحل محل الفاتورة ٪ s. ولكن هذا قد تم الاستعاضة عن فاتورة ٪ s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=خطأ الخصم المستخدمة بالفعل
 ErrorInvoiceAvoirMustBeNegative=خطأ ، والصحيح يجب أن يكون للفاتورة بمبلغ سلبي
 ErrorInvoiceOfThisTypeMustBePositive=خطأ ، وهذا النوع من فاتورة يجب أن يكون إيجابيا المبلغ
 ErrorCantCancelIfReplacementInvoiceNotValidated=خطأ ، لا يمكن إلغاء الفاتورة التي حلت محلها اخرى الفاتورة التي لا تزال في حالة مشروع
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=من
 BillTo=مشروع قانون ل
 ActionsOnBill=الإجراءات على فاتورة
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=تبقى بدون أجر <b>(%s%s) هو</b> الخصم الممنوح لأنه تم السداد قبل الأجل. I تسوية الضريبة على القيمة المضافة مع ملاحظة الائتمان.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=تبقى بدون أجر <b>(%s%s) هو</b> الخصم الممنوح لأنه تم السداد قبل الأجل. أنا أقبل أن تفقد ضريبة القيمة المضافة على هذا الخصم.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=تبقى بدون أجر <b>(%s%s) هو</b> الخصم الممنوح لأنه تم السداد قبل الأجل. I استرداد ضريبة القيمة المضافة على هذا الخصم دون مذكرة الائتمان.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=العملاء سيئة
 ConfirmClassifyPaidPartiallyReasonProductReturned=المنتجات عاد جزئيا
 ConfirmClassifyPaidPartiallyReasonOther=التخلي عن المبلغ لسبب آخر
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=هذا الخيار ممكن إذا الفاتورة تم تزويد مناسبة. (مثال «فقط الضرائب المقابلة إلى أن الأسعار قد دفعت فعلا تعطي الحقوق لخصم»)
+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=في بعض البلدان ، وهذا الخيار قد يكون ممكنا إلا إذا الفاتورة صحيحة وتتضمن المذكرة.
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=استخدام هذا الخيار إذا كان كل ما لا يتناسب مع
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=وهناك <b>سوء العميل</b> عميل التي ترفض سداد ديونه.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=ويستخدم هذا الاختيار عند الدفع ليس كاملا لأن بعض المنتجات أعيدت
-ConfirmClassifyPaidPartiallyReasonOtherDesc=استخدام هذا الخيار إذا كان كل ما لا يتناسب مع غيرها ، على سبيل المثال في الحالة التالية : <br> -- دفع ليست كاملة لأن بعض المنتجات شحنت العودة <br> -- أهم من المبلغ المطالب به لأن الخصم هو نسيان <br> في جميع الحالات ، والمبالغة في المبلغ المطالب به لا بد من تصحيحه في نظام المحاسبة عن طريق إنشاء الائتمان المذكرة.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=أخرى
 ConfirmClassifyAbandonReasonOtherDesc=هذا الخيار وسوف يستخدم في جميع الحالات الأخرى. على سبيل المثال لأنك من خطة لإقامة استبدال الفاتورة.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=التحقق من صحة الفواتير
 UnvalidateBill=Unvalidate فاتورة
-NumberOfBills=ملاحظة : من الفواتير
+NumberOfBills=No. of invoices
-NumberOfBillsByMonth=ملحوظة من الفواتير من قبل شهر
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=مبلغ الفواتير
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=كمية من الفواتير من قبل شهر (بعد خصم الضرائب)
 ShowSocialContribution=تظهر الضريبة الاجتماعية / المالية
 ShowBill=وتظهر الفاتورة
@@ -260,9 +262,9 @@ Repeatables=النماذج
 ChangeIntoRepeatableInvoice=تحويل إلى قالب فاتورة
 CreateRepeatableInvoice=إنشاء فاتورة قالب
 CreateFromRepeatableInvoice=إنشاء من قالب الفاتورة
-CustomersInvoicesAndInvoiceLines=فواتير العملاء والفواتير 'خطوط
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=العملاء والفواتير والمدفوعات
-ExportDataset_invoice_1=قائمة العملاء والفواتير والفواتير 'خطوط
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=العملاء والفواتير والمدفوعات
 ProformaBill=Proforma بيل :
 Reduction=تخفيض
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=مشروع قانون معالجة
-HelpEscompte=هذا الخصم هو الخصم الممنوح للعميل لأن الدفع قبل البعيد.
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
-HelpAbandonBadCustomer=هذا المبلغ قد تم التخلي عنها (وذكر أن العملاء سيئة العملاء) ، ويعتبر أحد exceptionnal فضفاضة.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
-HelpAbandonOther=هذا المبلغ قد تم التخلي عنها لأنها كانت خطأ (خطأ أو فاتورة العميل أي بعبارة أخرى على سبيل المثال)
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=اجتماعي / ضريبة مالية دفع معرف
 PaymentId=دفع معرف
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=لا فاتورة مختارة
 CloneInvoice=استنساخ الفاتورة
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=العمل والمعوقين بسبب الفاتورة قد استبدل
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
+DescTaxAndDividendsArea=تقدم هذا المجال ملخص لجميع المبالغ المدفوعة للنفقات الخاصة. يتم تضمين السجلات فقط مع دفع خلال السنة الثابتة هنا.
-NbOfPayments=ملاحظة : للمدفوعات
+NbOfPayments=No. of payments
 SplitDiscount=انقسام في الخصم
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
-TypeAmountOfEachNewDiscount=مقدار مساهمة كل من جزأين :
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=مجموعه جديدتين الخصم يجب أن تكون مساوية للخصم المبلغ الأصلي.
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=الفاتورة ذات الصلة
 RelatedBills=الفواتير ذات الصلة
 RelatedCustomerInvoices=فواتير العملاء ذات صلة
 RelatedSupplierInvoices=فواتير الموردين ذات صلة
 LatestRelatedBill=أحدث فاتورة ذات الصلة
-WarningBillExist=تحذير، واحد أو أكثر من فاتورة موجودة بالفعل
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=دمج أداة PDF
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=الشيكات
 PaymentTypeShortCHQ=الشيكات
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=على خط التسديد
+PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=على خط التسديد
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=مسودة
 PaymentTypeFAC=عامل
 PaymentTypeShortFAC=عامل
 BankDetails=التفاصيل المصرفية
 BankCode=رمز المصرف
-DeskCode=مدونة مكتبية
+DeskCode=Office code
 BankAccountNumber=رقم الحساب
-BankAccountNumberKey=مفتاح
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=عدد إيبان
+IBANNumber=IBAN complete account number
 IBAN=إيبان
 BIC=بيك / سويفت
 BICNumber=بيك / سويفت عدد
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=الدفع عن طريق التحويل عل
 VATIsNotUsedForInvoice=* عدم الفنية للتطبيق ضريبة القيمة المضافة 293B من المجموعة الاستشارية لاندونيسيا
 LawApplicationPart1=من خلال تطبيق القانون 80.335 من 12/05/80
 LawApplicationPart2=البضاعة تظل ملكا لل
-LawApplicationPart3=البائع إلى حين استكمال صرف
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=ثمنها.
 LimitedLiabilityCompanyCapital=SARL برأس مال
 UseLine=تطبيق
@@ -463,7 +465,7 @@ Cheques=الشيكات
 DepositId=إيداع معرف
 NbCheque=عدد الشيكات
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=فواتير العملاء استخدام عنوان الاتصال بدلا من التصدي لطرف ثالث كما المتلقية للفواتير
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=وتظهر جميع الفواتير غير المسددة
 ShowUnpaidLateOnly=وتبين في وقت متأخر من الفواتير غير المدفوعة فقط
 PaymentInvoiceRef=دفع فاتورة %s
@@ -474,21 +476,22 @@ Reported=تأخر
 DisabledBecausePayments=غير ممكن لأن هناك بعض المدفوعات
 CantRemovePaymentWithOneInvoicePaid=تصنيف لا يمكن إزالة الدفع لأنه ليس هناك على الأقل على الفاتورة سيولي
 ExpectedToPay=من المتوقع الدفع
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=سيولي هذا الدفع
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=تصنيف "مدفوع" كل الملاحظات الائتمان تدفع بالكامل مرة أخرى.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
-AllCompletelyPayedInvoiceWillBeClosed=كل فاتورة مع عدم وجود لا تزال لدفع ستغلق تلقائيا إلى &quot;فياض&quot; الوضع.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=دفع
 ToMakePaymentBack=تسديد
 ListOfYourUnpaidInvoices=قائمة الفواتير غير المسددة
 NoteListOfYourUnpaidInvoices=ملاحظة: تحتوي هذه القائمة على الفواتير الوحيدة لأطراف ثالثة ترتبط لك كممثل بيع.
 RevenueStamp=طوابع الواردات
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=نموذج فاتورة Crabe. نموذج الفاتورة كاملة (دعم الخيار الضريبة على القيمة المضافة ، والخصومات ، وشروط الدفع ، والشعار ، الخ..)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=عودة عدد مع الشكل syymm NNNN عن الفواتير القياسية و٪ syymm-NNNN لتلاحظ الائتمان حيث هو YY العام٪، مم هو الشهر وnnnn هو تسلسل مع أي انقطاع وعدم العودة إلى 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=تم حذف الفاتورة

htdocs/langs/ar_SA/cashdesk.lang

@@ -1,14 +1,14 @@
 # Language file - Source file is en_US - cashdesk
-CashDeskMenu=نقطة بيع
+CashDeskMenu=نقطة البيع
-CashDesk=نقطة بيع
+CashDesk=نقطة البيع
 CashDeskBankCash=الحساب المصرفي (نقدا)
 CashDeskBankCB=الحساب المصرفي (بطاقة)
 CashDeskBankCheque=الحساب المصرفي (شيك)
 CashDeskWarehouse=مستودع
 CashdeskShowServices=بيع الخدمات
 CashDeskProducts=المنتجات
-CashDeskStock=الأوراق المالية
+CashDeskStock=مخزون
-CashDeskOn=في
+CashDeskOn=على
 CashDeskThirdParty=طرف ثالث
 ShoppingCart=عربة التسوق
 NewSell=بيع جديد
@@ -22,7 +22,7 @@ NoArticle=لا يوجد عناصر
 Identification=التعريف
 Article=عنصر
 Difference=فرق
-TotalTicket=مجموع التذكرة
+TotalTicket=إجمالي التذكرة
 NoVAT=ليس هناك ضريبة قيمة مضافة لهذا البيع
 Change=باقي المستلم
 BankToPay=حساب الدفع
@@ -30,5 +30,15 @@ ShowCompany=عرض الشركة
 ShowStock=عرض المستودع
 DeleteArticle=انقر لإزالة هذا العنصر
 FilterRefOrLabelOrBC=بحث (المرجع / الملصق)
-UserNeedPermissionToEditStockToUsePos=لقد طلبت أن ينخفض ​​المخزون عند إنشاء الفاتورة، لذلك المستخدم التي يستخدم نقطة البيع يحتاج إلى امتلاك الصلاحيات لتعديل المخزون.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=طابعة إيصال دوليبار
+PointOfSale=نقاط البيع
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product

htdocs/langs/ar_SA/commercial.lang

@@ -52,6 +52,7 @@ ActionAC_TEL=اتصال هاتفي
 ActionAC_FAX=إرسال فاكس
 ActionAC_PROP=إرسال اقتراح
 ActionAC_EMAIL=ارسال بريد الكتروني
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=اجتماعات
 ActionAC_INT=تدخل على الموقع
 ActionAC_FAC=ارسال الفواتير
@@ -72,8 +73,8 @@ StatusProsp=احتمال وضع
 DraftPropals=صياغة مقترحات تجارية
 NoLimit=لا حدود
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled

htdocs/langs/ar_SA/dict.lang

@@ -116,7 +116,7 @@ CountryHM=واستمع وجزر ماكدونالد
 CountryVA=الكرسي الرسولي (دولة الفاتيكان)
 CountryHN=هندوراس
 CountryHK=هونج كونج
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=الهند
 CountryID=اندونيسيا
 CountryIR=إيران
@@ -131,7 +131,7 @@ CountryKI=كيريباس
 CountryKP=كوريا الشمالية
 CountryKR=كوريا الجنوبية
 CountryKW=الكويت
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=لاوس
 CountryLV=لاتفيا
 CountryLB=لبنان
@@ -160,7 +160,7 @@ CountryMD=مولدافيا
 CountryMN=منغوليا
 CountryMS=مونتسرات
 CountryMZ=موزامبيق
-CountryMM=Birmania (ميانمار)
+CountryMM=Myanmar (Burma)
 CountryNA=ناميبيا
 CountryNR=ناورو
 CountryNP=نيبال
@@ -223,7 +223,7 @@ CountryTO=تونجا
 CountryTT=ترينيداد وتوباغو
 CountryTR=تركيا
 CountryTM=تركمانستان
-CountryTC=الأتراك وجزر Cailos
+CountryTC=Turks and Caicos Islands
 CountryTV=توفالو
 CountryUG=أوغندا
 CountryUA=أوكرانيا
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=موريشيوس روبية
 CurrencySingMUR=موريشيوس روبية
 CurrencyNOK=النرويجية بالكرون
-CurrencySingNOK=الكرونة النرويجية
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=دينار
 CurrencySingTND=الدينار التونسي
 CurrencyUSD=الدولار الأمريكي
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=كلمة الفم
 DemandReasonTypeSRC_PARTNER=شريك
 DemandReasonTypeSRC_EMPLOYEE=الموظف
 DemandReasonTypeSRC_SPONSORING=رعاية
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=شكل 4A0
 PaperFormatEU2A0=شكل 2A0

htdocs/langs/ar_SA/ecm.lang

@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=ملاحظة : الوثائق في الدليل
+ECMNbOfDocs=No. of documents in directory
 ECMSection=دليل
 ECMSectionManual=دليل دليل
 ECMSectionAuto=الدليل الآلي
@@ -34,6 +34,8 @@ ECMDocsByProjects=المستندات المرتبطة بالمشاريع
 ECMDocsByUsers=وثائق مرتبطة المستخدمين
 ECMDocsByInterventions=وثائق مرتبطة بالتدخلات
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=لا الدليل
 ShowECMSection=وتظهر الدليل
 DeleteSection=إزالة الدليل
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)

htdocs/langs/ar_SA/errors.lang

@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=العميل SOAP فشلت مع الخطأ '٪ ق'
 ErrorGlobalVariableUpdater5=لا متغير عمومي مختارة
 ErrorFieldMustBeANumeric=يجب أن يكون <b>حقل٪ الصورة</b> قيمة رقمية
 ErrorMandatoryParametersNotProvided=معيار إلزامي (ق) لم تقدم
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=سيئة تعريف القائمة صفيف في الوحدة واصف (القيمة سيئة لfk_menu مفتاح)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
 WarningMandatorySetupNotComplete=لا يتم تعريف معلمات الإعداد إلزامية حتى الآن

htdocs/langs/ar_SA/help.lang

@@ -1,26 +1,23 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=منتدى / الدعم ويكي
+CommunitySupport=منتدى / ويكي الدعم
-EMailSupport=رسائل البريد الإلكتروني لدعم
+EMailSupport=دعم رسائل البريد الإلكتروني
-RemoteControlSupport=الانترنت في الوقت الحقيقي / النائية الدعم
+RemoteControlSupport=الوقت الحقيقي عبر الإنترنت / الدعم عن بعد
-OtherSupport=الدعم الأخرى
+OtherSupport=دعم آخر
-ToSeeListOfAvailableRessources=للاتصال / انظر الموارد المتاحة :
+ToSeeListOfAvailableRessources=للاتصال / الاطلاع على الموارد المتاحة:
 HelpCenter=مركز المساعدة
-DolibarrHelpCenter=Dolibarr مركز المساعدة والدعم
+DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=Otherwise, click <a href=بخلاف ذلك ، انقر <a href="%s">هنا لاستخدام Dolibarr</a>
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=مصدر الدعم
+TypeOfSupport=Type of support
 TypeSupportCommunauty=المجتمع (مجاني)
-TypeSupportCommercial=التجارية
+TypeSupportCommercial=تجاري
 TypeOfHelp=نوع
-NeedHelpCenter=Need help or support?
+NeedHelpCenter=هل تحتاج إلى مساعدة أو دعم؟
 Efficiency=الكفاءة
-TypeHelpOnly=فقط مساعدة
+TypeHelpOnly=المساعدة فقط
-TypeHelpDev=+ المساعدة على التنمية
+TypeHelpDev=مساعدة + التنمية
-TypeHelpDevForm=مساعدة التنمية + + تشكيل
+TypeHelpDevForm=Help+Development+Training
-ToGetHelpGoOnSparkAngels1=ويمكن أن توفر بعض الشركات سريعة (ما الفورية) ، وزيادة كفاءة شبكة الإنترنت عن طريق دعم السيطرة على جهاز الكمبيوتر الخاص بك. مساعدات من هذا القبيل يمكن الاطلاع على الموقع الإلكتروني <b>ل ٪</b> :
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-ToGetHelpGoOnSparkAngels3=كما يمكنك الذهاب الى قائمة المدربين كل ما هو متاح لDolibarr ، لهذا اضغط على زر
+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):
-ToGetHelpGoOnSparkAngels2=في بعض الأحيان ، لا يوجد أي شركة المتاحة في الوقت الراهن تقوم بإجراء البحث ، لذلك اعتقد تغيير فلتر للبحث عن "توافر جميع". ستتمكن من ارسال المزيد من الطلبات.
-BackToHelpCenter=Otherwise, click here to go <a href=بخلاف ذلك ، انقر هنا للذهاب <a href="%s">الى الصفحة الرئيسية لمركز المساعدة.</a>
-LinkToGoldMember=تستطيع الاتصال به من قبل المدرب مختار مسبقا لغتك Dolibarr (٪) عن طريق النقر فوق القطعة له (والحد الاعلى لسعر يتم تحديثها تلقائيا) :
 PossibleLanguages=اللغات المدعومة
-SubscribeToFoundation=مساعدة مشروع Dolibarr، الاشتراك في الجمعية
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=للحصول على الدعم Dolibarr الرسمي في لغتك: <br> <b><a href="%s" target="_blank">٪ الصورة</a></b>
+SeeOfficalSupport=للحصول على دعم رسمي من دوليبار بلغتك: <br> <b> <a href="%s" target="_blank"> %s </a></b>

htdocs/langs/ar_SA/holiday.lang

@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=أوراق
+Holidays=Leave
-CPTitreMenu=أوراق
+CPTitreMenu=Leave
 MenuReportMonth=البيان الشهري
 MenuAddCP=طلب إجازة جديدة
-NotActiveModCP=يجب تمكين أوراق حدة لمشاهدة هذه الصفحة.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=تقديم طلب إجازة
 DateDebCP=تاريخ البدء
 DateFinCP=نهاية التاريخ
@@ -15,13 +15,18 @@ ApprovedCP=وافق
 CancelCP=ألغيت
 RefuseCP=رفض
 ValidatorCP=Approbator
-ListeCP=قائمة الأوراق
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=سيتم مراجعتها من قبل
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=وصف
 SendRequestCP=إنشاء طلب إجازة
 DelayToRequestCP=يجب أن يتم ترك طلبات في <b>اليوم</b> أقل <b>ق٪ (ق)</b> من قبلهم.
-MenuConfCP=Balance of leaves
+MenuConfCP=Balance of leave
-SoldeCPUser=يترك التوازن <b>هو%s</b> أيام.
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=يجب تحديد تاريخ انتهاء أكبر من تاريخ البدء.
 ErrorSQLCreateCP=حدث خطأ SQL أثناء إنشاء:
 ErrorIDFicheCP=حدث خطأ غير موجود على طلب الإجازة.
@@ -30,7 +35,14 @@ ErrorUserViewCP=غير مصرح لك قراءة طلب إجازة هذا.
 InfosWorkflowCP=معلومات سير العمل
 RequestByCP=طلبت
 TitreRequestCP=ترك الطلب
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=عدد أيام عطلة تستهلك
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=تحرير
 DeleteCP=حذف
 ActionRefuseCP=رفض
@@ -59,6 +71,7 @@ DateRefusCP=تاريخ الرفض
 DateCancelCP=تاريخ الإلغاء
 DefineEventUserCP=تعيين إجازة استثنائية لمستخدم
 addEventToUserCP=تعيين إجازة
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=سبب
 UserCP=مستخدم
 ErrorAddEventToUserCP=حدث خطأ أثناء إضافة إجازة استثنائية.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=تم التحديث بنجاح.
 Module27130Name= إدارة طلبات الإجازة
 Module27130Desc= إدارة طلبات الإجازة
@@ -94,7 +112,7 @@ NoticePeriod=فترة إشعار
 HolidaysToValidate=التحقق من صحة طلبات الإجازة
 HolidaysToValidateBody=وفيما يلي طلب إجازة للتحقق من صحة
 HolidaysToValidateDelay=وهذا الطلب إجازة أن تتم في غضون أقل من٪ الصورة أيام.
-HolidaysToValidateAlertSolde=المستخدم الذي جعل هذا ترك reques لم يكن لديك ما يكفي من الأيام المتاحة.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=طلبات إجازة التحقق من صحة
 HolidaysValidatedBody=تم التحقق من صحة طلب إجازة لمدة٪ s إلى٪ s.
 HolidaysRefused=طلب نفى
@@ -103,4 +121,9 @@ HolidaysCanceled=إلغاء طلب الأوراق
 HolidaysCanceledBody=تم إلغاء طلب إجازة لمدة٪ s إلى٪ s.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=اذهب إلى <strong>الصفحة الرئيسية - إعداد - معاجم - نوع من الأوراق</strong> لإعداد أنواع مختلفة من الأوراق.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests

htdocs/langs/ar_SA/install.lang

@@ -2,37 +2,37 @@
 InstallEasy=فقط اتبع التعليمات خطوة بخطوة.
 MiscellaneousChecks=التحقق من الشروط الأساسية
 ConfFileExists=ملف الإعداد <b>%s</b> موجود  مسبقاً
-ConfFileDoesNotExistsAndCouldNotBeCreated=ملف الإعداد <b>%s</b> مفقود ولا يمكن إنشائه.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=يمكن إنشاء ملف الإعداد <b>%s</b>
-ConfFileIsNotWritable=لا يمكن الكتابة الى ملف الإعداد <b>%s</b>. تحقق من الصلاحيات. اذا كان هذا التنصيب هو الأول، تحقق من أن السيرفر قادر ولديه جميع صلاحيات الكتابة والقراءة خلال عملية التنصيب، مثال: (chmod 666) لمستخدمي سيرفرات يونكس.
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=ملف الإعداد <b>%s</b> قابل للكتابة.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=إعادة تحميل جميع المعلومات من ملف الإعداد.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=يدعم هذا الـ PHP ميزة الجلسات الزمنية.
 PHPSupportPOSTGETOk=يدعم هذا الـ PHP وظائف POST و GET.
-PHPSupportPOSTGETKo=من المحتمل أن نسخة الـ PHP لديك لاتدعم وظائف POST - GET. تحقق من <b>variables_order</b> في ملف php.ini
+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=يدعم اصدار الـ PHP هذا وظائف GD الرسومية.
+PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
+PHPSupportCurl=This PHP supports Curl.
-PHPSupportUTF8=يدعم هذاا الاصدار من PHP وظائف الترميز UTF8.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=تم إعداد الجلسة الزمنية للذاكرة في  PHP الى <b>%s</b> . من المفترض ان تكون كافية.
-PHPMemoryTooLow=الحد الأقصى الخاص بك PHP دورة الذاكرة ومن المقرر <b>٪ ق</b> بايت. لهذا ينبغي أن يكون منخفضا جدا. تغيير <b>php.ini</b> وضع <b>memory_limit</b> المعلم إلى ما لا يقل عن <b>٪ ق</b> بايت.
+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=اضغط هنا لمزيد من الاختبار ذو معنى
+Recheck=Click here for a more detailed test
-ErrorPHPDoesNotSupportSessions=PHP تركيب الخاص بك لا يدعم الدورات. هذه الميزة هو مطلوب لجعل العمل Dolibarr. التحقق من اتصالك PHP الإعداد.
+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=PHP تركيب الخاص بك لا يدعم وظيفة بيانية ش ج. لا الرسم البياني سيكون متاحا.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=PHP تركيب الخاص بك لا يدعم UTF8 المهام. Dolibarr لا يمكن أن تعمل بشكل صحيح. لحل هذه قبل تثبيت Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=دليل ٪ ق لا يوجد.
-ErrorGoBackAndCorrectParameters=العودة إلى الوراء وتصحيح الخطأ البارامترات.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=قد تكون لديكم مطبوعة خاطئة قيمة معلمة '٪ ق.
 ErrorFailedToCreateDatabase=فشل إنشاء قاعدة بيانات '٪ ق.
 ErrorFailedToConnectToDatabase=فشل في الاتصال بقاعدة البيانات '٪ ق.
 ErrorDatabaseVersionTooLow=إصدار قاعدة البيانات  (s%) قديمة جدا. مطلوب نسخة s% أو أعلى
 ErrorPHPVersionTooLow=PHP نسخة قديمة جدا. النسخة ٪ ق هو مطلوب.
-ErrorConnectedButDatabaseNotFound=خادم الصدد الى قاعدة البيانات ولكن النجاح في '٪ ق' لم يتم العثور عليه.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=قاعدة البيانات '٪ ق' موجود بالفعل.
-IfDatabaseNotExistsGoBackAndUncheckCreate=إذا كان لا وجود قاعدة بيانات ، والتأكد من العودة الخيار "إنشاء قاعدة بيانات".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=إذا كانت قاعدة البيانات موجود بالفعل ، من العودة وإلغاء "إنشاء قاعدة بيانات" الخيار.
-WarningBrowserTooOld=نسخة قديمة جدا من المتصفح. ننصحك جيدا بترقية متصفحك إلى نسخة حديثة عن فايرفوكس، كروم أو أوبرا
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP الإصدار
 License=الترخيص باستعمال
 ConfigurationFile=ملفات
@@ -45,22 +45,23 @@ DolibarrDatabase=قاعدة بيانات Dolibarr
 DatabaseType=قاعدة بيانات من نوع
 DriverType=سائق نوع
 Server=الخادم
-ServerAddressDescription=الملكية الفكرية في اسم أو عنوان خادم قاعدة البيانات ، وعادة 'localhost' عندما يستضيف خادم قاعدة البيانات على نفس الخادم من خدمة الويب
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=قاعدة بيانات الميناء. تبقي فارغة إذا كانت غير معروفة.
 DatabaseServer=خادم قاعدة البيانات
 DatabaseName=اسم قاعدة البيانات
-DatabasePrefix=قاعدة بيانات بادئة الجدول
+DatabasePrefix=Database table prefix
-AdminLogin=ادخل لDolibarr مدير قاعدة البيانات. تبقي فارغة إذا لم يذكر اسمه في اتصال
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
-PasswordAgain=أعد كتابة كلمة المرور مرة ثانية
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Dolibarr كلمة السر لمدير قاعدة البيانات. تبقي فارغة إذا لم يذكر اسمه في اتصال
 CreateDatabase=إنشاء قاعدة بيانات
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=قاعدة بيانات -- وصول مستخدم الكومبيوتر ذو الصلاحيات العليا
-CheckToCreateDatabase=المربع إذا كان لا وجود قاعدة بيانات ، ويجب تهيئة. <br> في هذه الحالة ، يجب عليك ملء ادخل كلمة السر لحساب المستعملين المتميزين في أسفل هذه الصفحة.
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
+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=ادخل يسمح للمستخدم لإنشاء قواعد بيانات جديدة أو المستخدمين الجدد ، وإذا كانت غير مجدية وقاعدة البيانات وقاعدة البيانات ادخل موجود بالفعل (مثل عندما كنت استضافته استضافة ويب).
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
-KeepEmptyIfNoPassword=ترك فارغا إذا لم المستخدم كلمة السر (تجنب هذا؟)
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
-SaveConfigurationFile=إنقاذ القيم
+SaveConfigurationFile=Saving parameters to
 ServerConnection=اتصال الخادم
 DatabaseCreation=إنشاء قاعدة بيانات
 CreateDatabaseObjects=إنشاء قاعدة بيانات الأجسام
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=إنشاء الخارجية مفاتيح الأرقام
 OtherKeysCreation=مفاتيح الخارجية وإنشاء الفهارس
 FunctionsCreation=إنشاء وظائف
 AdminAccountCreation=مدير ادخل إنشاء
-PleaseTypePassword=الرجاء كتابة كلمة المرور ، وكلمات السر فارغة لا يسمح!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=اكتب من فضلك ادخل!
+PleaseTypeALogin=Please type a login!
-PasswordsMismatch=وتختلف كلمات السر ، يرجى المحاولة مرة أخرى!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=نهاية الإعداد
 SystemIsInstalled=هذا التثبيت الكامل.
 SystemIsUpgraded=وقد تم تطوير Dolibarr بنجاح.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=عليك تكوين Dolibarr لتناسب احتياج
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=الذهاب إلى Dolibarr
 GoToSetupArea=الذهاب إلى Dolibarr (مجال الإعداد)
-MigrationNotFinished=نسخة من قاعدة البيانات الخاصة بك لا يصل تماما حتى الآن ، لذلك سيكون لديك لتشغيل عملية الترقية مرة أخرى.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=الذهاب لتحديث الصفحة مرة أخرى
 WithNoSlashAtTheEnd=بدون خفض "/" في نهاية
-DirectoryRecommendation=وrecommanded به لاستخدام دليل خارج الدليل الخاص من صفحات موقعك.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=موجود بالفعل
 DolibarrAdminLogin=ادخل Dolibarr مشرف
-AdminLoginAlreadyExists=Dolibarr حساب مشرف <b>'٪ ق'</b> موجود بالفعل.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=تحذير ، لأسباب أمنية ، بعد تثبيت أو تحديث كاملة ، يجب إزالة <b>تثبيت أو إعادة تسمية الدليل على install.lock من أجل تجنب استخدام الخبيثة.</b>
+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=لا تتوفر على هذا PHP
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=اختار الهجرة سكريبت
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=السيناريو تجهيز
 ChooseYourSetupMode=اختر طريقة الإعداد وانقر على "ابدأ"...
 FreshInstall=تركيب جديد
-FreshInstallDesc=استخدام هذا الأسلوب إذا كان هذا هو أول تركيب. إذا لم يكن هذا الوضع لا يمكن إصلاح تثبيت سابقة غير مكتملة ، ولكن إذا كنت ترغب في تحديث الإصدار الخاص بك ، اختر "ترقية" واسطة.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=ترقية
 UpgradeDesc=استخدام هذه الطريقة إذا كنت قد حلت محل القديمة Dolibarr الملفات من الملفات مع إصدار أحدث. وهذا من شأنه رفع مستوى قاعدة البيانات والبيانات.
 Start=يبدأ
 InstallNotAllowed=الإعداد غير مسموح به <b>conf.php</b> الاذونات
 YouMustCreateWithPermission=يجب إنشاء ملف ق ٪ ومجموعة الكتابة على أذونات لملقم الويب أثناء عملية التثبيت.
-CorrectProblemAndReloadPage=يرجى تحديد المشكلة والصحافة F5 لإعادة تحميل الصفحة.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=بالفعل هاجر
 DatabaseVersion=قاعدة بيانات النسخة
 ServerVersion=خادم قاعدة البيانات النسخة
 YouMustCreateItAndAllowServerToWrite=يجب إنشاء هذا الدليل ، والسماح لخادم الويب أن يكتبوا فيه.
 DBSortingCollation=طابع الفرز بغية
-YouAskDatabaseCreationSoDolibarrNeedToConnect=كنت أسأل لإنشاء قاعدة بيانات <b>٪ ق</b> ، ولكن لهذا ، Dolibarr الحاجة الى الاتصال بخادم <b>٪ ق</b> السوبر مع المستخدم أذونات <b>٪ ق.</b>
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=كنت أسأل لإنشاء قاعدة بيانات ادخل <b>٪ ق</b> ، ولكن لهذا ، Dolibarr الحاجة الى الاتصال بخادم <b>٪ ق</b> السوبر مع أذونات المستخدم <b>٪ ق.</b>
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=كما فشلت الصدد ، أو استضافة السوبر معالم المستخدم يجب أن يكون على خطأ.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphelins من اكتشاف طريقة الدفع ق ٪
 RemoveItManuallyAndPressF5ToContinue=إزالته يدويا واضغط F5 للمتابعة.
 FieldRenamed=تغيير اسم الحقل
-IfLoginDoesNotExistsCheckCreateUser=اذا ادخل لا يوجد حتى الآن ، يجب عليك التحقق من خيار "تكوين المستخدم"
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
-ErrorConnection=الخادم <b>"٪ ل"</b> اسم قاعدة بيانات <b>"٪ ل"</b> ادخل <b>"٪ ل"</b> أو كلمة سر قاعدة البيانات قد تكون خاطئة أو PHP العميل نسخة قديمة جدا ويمكن مقارنة مع قاعدة البيانات نسخة.
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=وأوصت لتثبيت اختيار النسخة <b>٪ المستندات</b> الخاصة بك من النسخة الحالية <b>ل ٪</b>
 InstallChoiceSuggested=<b>اقترح تثبيت اختيار المثبت.</b>
-MigrateIsDoneStepByStep=النسخة المستهدفة (%s) لديها فجوة من إصدارات عديدة، لذلك تثبيت المعالج سوف يعود تشير إلى الهجرة مرة القادمة سوف يتم الانتهاء من هذا واحد.
+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=تأكد من أن اسم قاعدة البيانات <b>"%s"</b> هو الصحيح.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=وإذا كان هذا الاسم هو الصحيح وأنه لا وجود قاعدة بيانات حتى الآن ، ويجب التحقق من خيار "إنشاء قاعدة بيانات".
 OpenBaseDir=بي openbasedir المعلمة
-YouAskToCreateDatabaseSoRootRequired=يمكنك التحقق من مربع "إنشاء قاعدة بيانات". لهذا ، تحتاج إلى توفير الدخول وكلمة السر من المستعملين المتميزين (الجزء السفلي من النموذج).
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=يمكنك التحقق من مربع "إنشاء قاعدة بيانات مالك". لهذا ، تحتاج إلى توفير الدخول وكلمة السر من المستعملين المتميزين (الجزء السفلي من النموذج).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=الخطوة الحالية قد تستمر لعدة دقائق. ويرد الرجاء الانتظار حتى الشاشة التالية تماما قبل الشروع في الاستمرار.
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=ترحيل الشحن لتخزين طلبات العملاء
 MigrationShippingDelivery=ترقية تخزين الشحن
 MigrationShippingDelivery2=ترقية تخزين الشحن 2
 MigrationFinished=الانتهاء من الهجرة
-LastStepDesc=<strong>الخطوة الأخيرة</strong> : تعريف المستخدم وكلمة السر هنا كنت تخطط لاستخدامها للاتصال البرمجيات. لا تفقد هذا كما هو حساب لإدارة جميع الآخرين.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=تفعيل وحدة %s
 ShowEditTechnicalParameters=انقر هنا لعرض/تحرير المعلمات المتقدمة (وضع الخبراء)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=إصدار قاعدة البيانات الخاصة بك هي%s.   يوجد بعض الخلل أدى لفقدان بعض البيانات إذا قمت بإجراء تغيير هيكلي على قاعدة البيانات الخاصة بك، مثل كان مطلوبا خلال عملية ترحيل البيانات. لن يسمح لك بترحيل البيانات حتى تقوم بترقية قاعدة البيانات الخاصة بك إلى إصدار أعلى موثوق  (قائمة الاصدارات الموثوقة : %s)
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
-KeepDefaultValuesWamp=استخدام معالج الإعداد DoliWamp ، حتى القيم المقترحة هنا بالفعل الأمثل. تغييرها إلا إذا كنت تعرف ما تفعله.
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesDeb=يمكنك استخدام معالج الإعداد Dolibarr من أوبونتو أو حزمة ديبيان ، لذلك القيم المقترحة هنا هي الأمثل بالفعل. يجب أن تكتمل إلا كلمة السر للمالك قاعدة البيانات لإنشاء. تغيير معلمات أخرى إلا إذا كنت تعرف ما تفعله.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
-KeepDefaultValuesMamp=استخدام معالج الإعداد DoliMamp ، حتى القيم المقترحة هنا بالفعل الأمثل. تغييرها إلا إذا كنت تعرف ما تفعله.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesProxmox=يمكنك استخدام معالج إعداد Dolibarr من الأجهزة الظاهرية Proxmox، بحيث يتم تحسين بالفعل القيم المقترحة هنا. تغييرها إلا إذا كنت تعرف ما تفعله.
+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 modules
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=بيانات الهجرة لأغراض تجارية اقتراحات
 MigrationInvoice=بيانات الهجرة لعملاء الفواتير
 MigrationContract=بيانات الهجرة للحصول على عقود
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=تحديث ناجحة
 MigrationUpdateFailed=فشلت عملية تحديث
 MigrationRelationshipTables=بيانات الهجرة للجداول العلاقة (%s)
 MigrationPaymentsUpdate=تصحيح بيانات الدفع
@@ -163,9 +164,9 @@ MigrationContractsUpdate=تصحيح بيانات العقد
 MigrationContractsNumberToUpdate=٪ ق العقد (ق) لتحديث
 MigrationContractsLineCreation=عقد إنشاء خط لعقد المرجع ق ٪
 MigrationContractsNothingToUpdate=لا أكثر مما ينبغي فعله
-MigrationContractsFieldDontExist=الحقل fk_facture لا وجود بعد الآن. لا يمكن تنفيذ اي شيء.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=عقد فارغ تصحيح التاريخ
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=أي عقد حتى الآن لتصحيح فارغة
 MigrationContractsEmptyCreationDatesNothingToUpdate=إنشاء أي عقد لتصحيح التاريخ
 MigrationContractsInvalidDatesUpdate=سوء قيمة العقد تصحيح التاريخ
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=تسليم تحديث
 MigrationStockDetail=تحديث قيمة المخزون من المنتجات
 MigrationMenusDetail=تحديث القوائم الديناميكية الجداول
 MigrationDeliveryAddress=تتناول آخر التطورات في تسليم شحنات
-MigrationProjectTaskActors=بيانات الهجرة لllx_projet_task_actors الجدول
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=بيانات fk_user_resp مجال الهجرة من llx_projet لllx_element_contact
 MigrationProjectTaskTime=تحديث الوقت الذي يقضيه في ثوان
 MigrationActioncommElement=تحديث البيانات على الإجراءات
 MigrationPaymentMode=بيانات الهجرة لطريقة الدفع
 MigrationCategorieAssociation=تحديث الفئات
-MigrationEvents=الترحيل من الأحداث لإضافة مالك الحدث في جدول الاحالة
+MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=إعادة تحديث الوحدات %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=عرض خيارات غير متوفرة
+ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=إخفاء خيارات غير متوفرة
+HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
+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 try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
+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 try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.

htdocs/langs/ar_SA/main.lang

@@ -437,6 +437,7 @@ ContactsForCompany=اتصالات لهذا الطرف الثالث
 ContactsAddressesForCompany=اتصالات / عناوين لهذا الطرف الثالث
 AddressesForCompany=عناوين لهذا الطرف الثالث
 ActionsOnCompany=الأحداث حول هذا الطرف الثالث
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=الأحداث عن هذا العضو
 ActionsOnProduct=Events about this product
 NActionsLate=٪ في وقت متأخر الصورة
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
+WebSite=Website
-WebSites=Web sites
+WebSites=Websites
-WebSiteAccounts=Web site accounts
+WebSiteAccounts=Website accounts
 ExpenseReport=تقرير حساب
 ExpenseReports=تقارير المصاريف
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory

htdocs/langs/ar_SA/other.lang

@@ -83,6 +83,7 @@ LinkedObject=ربط وجوه
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=العنوان
 WEBSITE_DESCRIPTION=الوصف
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import

htdocs/langs/ar_SA/paybox.lang

@@ -1,38 +1,39 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=إعداد وحدة PayBox
-PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target=هذا نموذج للسماح بعرض الصفحات على دفع <a href="http://www.paybox.com" target="_blank">Paybox</a> الواحد. هذه يمكن استخدامها لدفع حر أو لدفع مبلغ معين على وجوه Dolibarr (الفاتورة ، والنظام ،...)
+PayBoxDesc=تعرض صفحات نموذج الوحدة هذه الدفعات على <a href="http://www.paybox.com" target="_blank"> Paybox</a> من قبل العملاء. هذا يمكن استخدامها للدفع مجانا أو للدفع على عنصر دوليبار معين (الفاتورة، طلب، ...)
-FollowingUrlAreAvailableToMakePayments=فيما يلي عناوين المواقع المتاحة لعرض هذه الصفحة زبون لتسديد دفعة Dolibarr على الأجسام
+FollowingUrlAreAvailableToMakePayments=تتوفر عناوين URL التالية لتقديم صفحة إلى عميل لإجراء دفعة على عناصر دوليبار
-PaymentForm=شكل الدفع
+PaymentForm=نموذج الدفع
-WelcomeOnPaymentPage=ونحن نرحب على خدمة الدفع عبر الإنترنت
+WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=تتيح لك هذه الشاشة إجراء الدفع الإلكتروني إلى ٪ s.
+ThisScreenAllowsYouToPay=هذه الشاشة تسمح لك بإجراء الدفع عبر الإنترنت إلى %s.
-ThisIsInformationOnPayment=هذه هي المعلومات عن الدفع للقيام
+ThisIsInformationOnPayment=هذه هي معلومات عن الدفع للقيام به
 ToComplete=لإكمال
-YourEMail=البريد الالكتروني لتأكيد الدفع
+YourEMail=البريد الإلكتروني لتلقي تأكيد الدفع
-Creditor=الدائن
+Creditor=دائن
-PaymentCode=دفع رمز
+PaymentCode=رمز الدفع
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=الدفع باستخدام بطاقة الائتمان أو بطاقة السحب الآلي (Paybox)
-ToPay=هل لدفع
+ToPay=القيام بالدفع
-YouWillBeRedirectedOnPayBox=سوف يتم نقلك على تأمين Paybox لك صفحة لإدخال معلومات بطاقة الائتمان
+YouWillBeRedirectedOnPayBox=سيتم إعادة توجيهك على صفحة Paybox الأمنة لإدخال معلومات بطاقة الائتمان الخاصة بك
 Continue=التالي
-ToOfferALinkForOnlinePayment=عنوان دفع %s
+ToOfferALinkForOnlinePayment=عنوان URL للدفع %s
-ToOfferALinkForOnlinePaymentOnOrder=عنوان لتقديم المستندات ٪ الدفع الإلكتروني واجهة المستخدم للأمر
+ToOfferALinkForOnlinePaymentOnOrder=URL لتقديم واجهة مستخدم الدفع عبر الإنترنت %s لأمر العميل
-ToOfferALinkForOnlinePaymentOnInvoice=عنوان لتقديم المستندات ٪ الدفع الإلكتروني واجهة المستخدم للفاتورة
+ToOfferALinkForOnlinePaymentOnInvoice=URL لتقديم واجهة مستخدم الدفع عبر الإنترنت %s لفاتورة العميل
-ToOfferALinkForOnlinePaymentOnContractLine=عنوان لتقديم المستندات ٪ الدفع الإلكتروني واجهة المستخدم للحصول على عقد خط
+ToOfferALinkForOnlinePaymentOnContractLine=URL لتقديم %s واجهة مستخدم الدفع عبر الإنترنت لخط العقد
-ToOfferALinkForOnlinePaymentOnFreeAmount=عنوان لتقديم المستندات ٪ الدفع الإلكتروني واجهة المستخدم لمبلغ حرة
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL لتقديم واجهة مستخدم الدفع عبر الإنترنت %s مقابل مبلغ مجاني
-ToOfferALinkForOnlinePaymentOnMemberSubscription=عنوان الموقع لتقديم الدفع عبر الإنترنت %s واجهة المستخدم للاشتراك عضو
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL لتقديم %s واجهة مستخدم الدفع عبر الإنترنت للحصول على اشتراك عضو
-YouCanAddTagOnUrl=You can also add url parameter <b>&tag=يمكنك أيضا إضافة رابط المعلم <b>= & علامة</b> على أي من <i><b>قيمة</b></i> تلك عنوان (مطلوب فقط لدفع الحر) الخاصة بك لإضافة تعليق دفع الوسم.
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
-SetupPayBoxToHavePaymentCreatedAutomatically=الإعداد الخاص بك مع رابط PayBox <b>٪ ق</b> قد تنشأ تلقائيا عند دفع يصادق عليها paybox.
+YouCanAddTagOnUrl=يمكنك أيضا إضافة معلمة عنوان url <b>&tag=<i>value</i></b> إلى أي من عنوان urlهذا (مطلوب فقط للدفع المجاني) لإضافة علامة تعليق الدفع الخاصة بك.
-YourPaymentHasBeenRecorded=هذه الصفحة يؤكد أنه قد تم تسجيلها دفعتك. شكرا لك.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
-YourPaymentHasNotBeenRecorded=يمكنك دفع لم يسجل وتم إلغاء الصفقة. شكرا لك.
+YourPaymentHasBeenRecorded=تؤكد هذه الصفحة أنه قد تم تسجيل دفعتك. شكرا لكم.
-AccountParameter=حساب المعلمات
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
-UsageParameter=استخدام المعلمات
+AccountParameter=معلمات الحساب
-InformationToFindParameters=مساعدة للعثور على معلومات حسابك %s
+UsageParameter=معلمات الاستخدام
-PAYBOX_CGI_URL_V2=عزيزي من وحدة لدفع CGI Paybox
+InformationToFindParameters=مساعدة للعثور على معلومات الحساب الخاص بك %s
+PAYBOX_CGI_URL_V2=Url من Paybox CGI وحدة للدفع
 VendorName=اسم البائع
-CSSUrlForPaymentForm=عزيزي ورقة النمط المغلق للنموذج الدفع
+CSSUrlForPaymentForm=CSS style sheet url  لنموذج الدفع
-NewPayboxPaymentReceived=دفع Paybox الجديدة التي وردت
+NewPayboxPaymentReceived=تلقى الدفع Paybox الجديد
 NewPayboxPaymentFailed=دفع Paybox جديد حاول ولكنه فشل
-PAYBOX_PAYONLINE_SENDEMAIL=البريد الإلكتروني لتحذير بعد دفع (نجاح أو فشل)
+PAYBOX_PAYONLINE_SENDEMAIL=البريد الإلكتروني للانذار بعد (نجاح أو فشل) الدفع 
 PAYBOX_PBX_SITE=قيمة PBX SITE
 PAYBOX_PBX_RANG=قيمة PBX رانج
 PAYBOX_PBX_IDENTIFIANT=قيمة PBX ID

htdocs/langs/ar_SA/propal.lang

@@ -33,7 +33,7 @@ PropalStatusSigned=وقعت (لمشروع القانون)
 PropalStatusNotSigned=لم يتم التوقيع (مغلقة)
 PropalStatusBilled=فواتير
 PropalStatusDraftShort=مسودة
-PropalStatusValidatedShort=التحقق من صحة
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=مغلقة
 PropalStatusSignedShort=وقعت
 PropalStatusNotSignedShort=لم يتم التوقيع
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal ق لم يتم العثور على ٪
 AddToDraftProposals=إضافة إلى صياغة اقتراح
 NoDraftProposals=أي مشاريع اقتراحات
 CopyPropalFrom=اقتراح إنشاء التجارية عن طريق نسخ وجود اقتراح
-CreateEmptyPropal=إنشاء خاليا التجارية vierge مقترحات أو من قائمة المنتجات / الخدمات
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=تقصير مدة صلاحية اقتراح التجارية (أيام)
-UseCustomerContactAsPropalRecipientIfExist=استخدام العميل عنوان الاتصال إذا حددت بدلا من التصدي لطرف ثالث حسب الاقتراح المستفيدة معالجة
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=اقتراح استنساخ التجارية
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=اتصل العملاء اقتراح متا
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=اقتراح نموذج كامل (logo...)
+DocModelCyanDescription=اقتراح نموذج كامل (logo...)
 DefaultModelPropalCreate=إنشاء نموذج افتراضي
 DefaultModelPropalToBill=القالب الافتراضي عند إغلاق الأعمال المقترح (أن الفاتورة)
 DefaultModelPropalClosed=القالب الافتراضي عند إغلاق الأعمال المقترح (فواتير)

htdocs/langs/ar_SA/website.lang

@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=رمز
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=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>
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=قرأ
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
+WebsiteAccount=Website account
-WebsiteAccounts=Web site accounts
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation

htdocs/langs/bg_BG/admin.lang

@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature инвалиди в демо
 FeatureAvailableOnlyOnStable=Функционалност само налична на официалната стабилна версия.
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Показани са само елементи от <a href="%s">активирани модули</a>.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Можете да намерите още модули за изтегляне на външни уеб сайтове в интернет ...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Намери външно приложение/модул
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Mutli модули инструменти
 ModuleFamilyExperimental=Експериментални модули
 ModuleFamilyFinancial=Финансови Модули (Счетоводство/Каса)
 ModuleFamilyECM=Електронно Управление на Съдържанието (ECM)
-ModuleFamilyPortal=Уеб сайтове и друго фронтално приложение
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Интерфейси със външни системи.
 MenuHandlers=Меню работещи
 MenuAdmin=Menu Editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Кликнете, за да се покаже описа
 DependsOn=This module needs the module(s)
 RequiredBy=Този модул се изисква от модул (и)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Разрешете използването на персонализирани стойности по подразбиране
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Потребители и групи
 Module0Desc=Управление на потребители / служители и групи
 Module1Name=Third Parties
-Module1Desc=Фирми и управление на контакти
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Търговски
 Module2Desc=Търговско управление
 Module10Name=Счетоводство
@@ -501,7 +501,7 @@ Module23Desc=Наблюдение на консумацията на енерг
 Module25Name=Поръчки от клиенти
 Module25Desc=Управление на поръчка на клиента
 Module30Name=Фактури
-Module30Desc=Фактура и управление на кредитно известие за клиентите. Фактура за управление на доставчици
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Доставчици
 Module40Desc=Доставчици и управление на покупки (поръчки за покупка и таксуване)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Размер на данъчните печати
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Тип страници / контейнери на уебсайтове
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Етикет на документи
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=В края на месеца
 CurrentNext=Настоящ / Следваща
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Събития одит на сигурността
-Audit=Проверка
+Audit=Security events
 InfoDolibarr=За Dolibarr
 InfoBrowser=За браузъра
 InfoOS=За операционната система
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=Списък на събитията Dolibarr сигурност
 SecurityEventsPurged=Събития по сигурността прочиства
-LogEventDesc=Можете да разрешите тук сеч за събития Dolibarr сигурност. Администраторите могат да видите неговото съдържание чрез меню <b>&quot;Системни инструменти - Одит.</b> Внимание, тази функция може да се консумира голямо количество данни в база данни.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Параметрите за настройка могат да се задават само от <b> Администратори </b>.
 SystemInfoDesc=Информационна система Разни техническа информация можете да получите в режим само за четене и видими само за администратори.
 SystemAreaForAdminOnly=Тази област е достъпна само за администратори. Никой не може да промени това ограничение.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Нетен единичната цена на даден продукт
 TotalPriceAfterRounding=Обща цена (нето / с ДДС / с ДДС) след закръгляване
 ParameterActiveForNextInputOnly=Параметър ефективно само за следващия вход
-NoEventOrNoAuditSetup=Няма да се иска никакво обезпечение събитие е записано още. Това може да бъде нормално, ако одитът не е разрешена във &quot;Setup - охрана - одит&quot;.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Вижте настройка Sendmail
 BackupDesc=За да направите пълно архивно копие на Dolibarr, трябва да:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Допълнителни атрибути (линии на
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Списък на известията за потр
 ListOfNotificationsPerUserOrContact=Списък на известията по потребител * или по контакт **
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=П. код
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).

htdocs/langs/bg_BG/banks.lang

@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Банка
-MenuBankCash=Bank | Cash
+MenuBankCash=Банка | Каса
-MenuVariousPayment=Miscellaneous payments
+MenuVariousPayment=Разнородни плащания
-MenuNewVariousPayment=New Miscellaneous payment
+MenuNewVariousPayment=Ново разнородно плащане
 BankName=Име на банката
 FinancialAccount=Сметка
 BankAccount=Банкова сметка
 BankAccounts=Банкови сметки
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Показване на сметка
 AccountRef=Финансова сметка реф.
 AccountLabel=Финансова сметка етикет
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Сметка адрес
 BankAccountCountry=Профил страната
 BankAccountOwner=Името на собственика на сметката
 BankAccountOwnerAddress=Притежател на сметката адрес
-RIBControlError=Integrity проверка на ценностите се провали. Това означава, информация за номера на тази сметка не са пълни или грешно (проверете страна, номера и IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Създаване на сметка
 NewBankAccount=Нова сметка
 NewFinancialAccount=Нова финансова сметка
@@ -66,16 +66,17 @@ BankTransactionByCategories=Bank entries by categories
 BankTransactionForCategory=Bank entries for category <b>%s</b>
 RemoveFromRubrique=Премахване на връзката с категория
 RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
+ListBankTransactions=Списък на банкови записи
 IdTransaction=Transaction ID
-BankTransactions=Bank entries
+BankTransactions=Банкови записи
-BankTransaction=Bank entry
+BankTransaction=Банков запис
-ListTransactions=List entries
+ListTransactions=Списък записи
-ListTransactionsByCategory=List entries/category
+ListTransactionsByCategory=Списък записи/категории
-TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliate=Записи за равнение
 Conciliable=Може да се примири
 Conciliate=Reconcile
 Conciliation=Помирение
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Включват затворени сметки
 OnlyOpenedAccount=Само открити сметки
@@ -88,7 +89,7 @@ StatusAccountOpened=Отворен
 StatusAccountClosed=Затворен
 AccountIdShort=Номер
 LineRecord=Транзакция
-AddBankRecord=Add entry
+AddBankRecord=Добави запис
 AddBankRecordLong=Add entry manually
 Conciliated=Reconciled
 ConciliatedBy=Съгласуват от
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Банков превод
 BankTransfers=Банкови преводи
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=От
 TransferTo=За
 TransferFromToDone=Прехвърлянето от <b>%s</b> на <b>%s</b> на %s <b>%s</b> беше записано.
@@ -114,14 +115,14 @@ ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Банката проверява
-BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceipt=Чекове чакащи депозит
 ShowCheckReceipt=Покажи проверете получаване депозит
-NumberOfCheques=Nb на чек
+NumberOfCheques=No. of check
-DeleteTransaction=Delete entry
+DeleteTransaction=Изтри запис
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
+ConfirmDeleteTransaction=Сигурни ли сте че искате да изтриете този запис ? 
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+ThisWillAlsoDeleteBankRecord=Това ще изтрие генерирания банков запис
 BankMovements=Движения
-PlannedTransactions=Planned entries
+PlannedTransactions=Планирани записи
 Graph=Графики
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
@@ -131,12 +132,12 @@ PaymentNumberUpdateFailed=Плащане брой не може да бъде а
 PaymentDateUpdateSucceeded=Payment date updated successfully
 PaymentDateUpdateFailed=Дата на плащане не може да бъде актуализиран
 Transactions=Сделки
-BankTransactionLine=Bank entry
+BankTransactionLine=Банков запис
 AllAccounts=All bank and cash accounts
 BackToAccount=Обратно към сметка
 ShowAllAccounts=Покажи за всички сметки
-FutureTransaction=Транзакция в FUTUR. Няма начин за помирение.
+FutureTransaction=Transaction in future. No way to reconcile.
-SelectChequeTransactionAndGenerate=Изберете / филтрирате проверки, за да се включи в проверка за получаването на депозит и кликнете върху &quot;Създаване&quot;.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=В крайна сметка, да посочите категорията, в която да се класифицират записи
 ToConciliate=To reconcile?
@@ -144,22 +145,24 @@ ThenCheckLinesAndConciliate=След това проверете линии в
 DefaultRIB=По подразбиране BAN
 AllRIB=Всички BAN
 LabelRIB=BAN Label
-NoBANRecord=No BAN record
+NoBANRecord=Няма BAN запис
-DeleteARib=Delete BAN record
+DeleteARib=Изтри BAN запис
 ConfirmDeleteRib=Are you sure you want to delete this BAN record?
 RejectCheck=Върнат Чек
 ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
 RejectCheckDate=Дата на която чека е върнат
 CheckRejected=Върнат Чек
 CheckRejectedAndInvoicesReopened=Върнат Чек и отворена фактура
-BankAccountModelModule=Document templates for bank accounts
+BankAccountModelModule=Документ шаблон за банков акаунт
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
+DocumentModelBan=Шаблон на който да се принтира страница с BAN информация
 NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
+VariousPayment=Разнородни плащания
-VariousPayments=Miscellaneous payments
+VariousPayments=Разнородни плащания
 ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament

htdocs/langs/bg_BG/bills.lang

@@ -5,9 +5,9 @@ BillsCustomers=Клиентски фактури
 BillsCustomer=Продажна фактура
 BillsSuppliers=Фактури доставчици
 BillsCustomersUnpaid=Неплатени клиентски фактури
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsCustomersUnpaidForCompany=Неплатени клиентски фактури за %s
 BillsSuppliersUnpaid=Неплатени фактури от доставчици
-BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
+BillsSuppliersUnpaidForCompany=Неплатени фактури на доставчици за %s
 BillsLate=Забавени плащания
 BillsStatistics=Статистика за продажни фактури
 BillsStatisticsSuppliers=Статистика за доставни фактури
@@ -17,18 +17,18 @@ DisabledBecauseNotErasable=Disabled because cannot be erased
 InvoiceStandard=Стандартна фактура
 InvoiceStandardAsk=Стандартна фактура
 InvoiceStandardDesc=Тази фактурата е фактура от най-общ вид.
-InvoiceDeposit=Down payment invoice
+InvoiceDeposit=Авансова фактура
-InvoiceDepositAsk=Down payment invoice
+InvoiceDepositAsk=Авансова фактура
 InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
 InvoiceProForma=Проформа фактура
 InvoiceProFormaAsk=Проформа фактура
 InvoiceProFormaDesc=<b>Проформа фактура</b> е първообраз на една истинска фактура, но няма счетоводна стойност.
 InvoiceReplacement=Подменяща фактура
 InvoiceReplacementAsk=Фактура подменяща друга фактура
-InvoiceReplacementDesc=<b>Подменяща фактура</b> се използва, за да отмени и замени напълно фактура, по която няма плащане.<br> <br>Бележка: Само фактури без плащане могат да бъдат заменяни. Ако фактурата която се заменя, все още не е затворена, тя автоматично ще бъде затворена до 'изоставена'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Кредитно известие
 InvoiceAvoirAsk=Кредитно известие за коригиране на фактура
-InvoiceAvoirDesc=<b>Кредитно известие</b> е отрицателна фактура, използвана за решаване на факта, че фактурата е със сума, която се различава от наистина платената сума (защото клиентът е платил твърде много по грешка, или няма да се изплати напълно, тъй като е върнал някои продукти, например).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Създаване на кредитно известие с редове от оригиналната фактура
 invoiceAvoirWithPaymentRestAmount=Създаване на кредитно известие с неплатения остатък от оригиналната фактура
 invoiceAvoirLineWithPaymentRestAmount=Кредитно известие с неплатен остатък
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Платено обратно
 DeletePayment=Изтрий плащане
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+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 so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Плащания към доставчици
 ReceivedPayments=Получени плащания
 ReceivedCustomersPayments=Плащания получени от клиенти
-PayedSuppliersPayments=Плащания направени към доставчици
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Получени плащания от клиенти за валидация
 PaymentsReportsForYear=Отчети за плащания за %s
 PaymentsReports=Отчети за плащания
@@ -91,8 +91,8 @@ PaymentConditionsShort=Усл.за плащане
 PaymentAmount=Сума за плащане
 ValidatePayment=Валидирай плащане
 PaymentHigherThanReminderToPay=Плащането е по-високо от напомнянето за плащане
-HelpPaymentHigherThanReminderToPay=Внимание, сумата на плащане на една или повече сметки е по-висока, отколкото останала за плащане част. <br> Редактирайте, или потвърдете, но тогава мислете за създаване на кредитно известие от превишението по всяека надвнесена фактура.
+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 rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Класифицирай 'Платено'
 ClassifyPaidPartially=Класифицирай 'Платено частично'
 ClassifyCanceled=Класифицирай 'Изоставено'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Затворена (неплатена)
 BillStatusClosedPaidPartially=Платена (частично)
 BillShortStatusDraft=Чернова
 BillShortStatusPaid=Платена
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Платена
 BillShortStatusCanceled=Изоставена
 BillShortStatusValidated=Валидирана
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Затворена
 BillShortStatusClosedPaidPartially=Платена (частично)
 PaymentStatusToValidShort=За валидиране
-ErrorVATIntraNotConfigured=Вътрешнообщностен номер по ДДС все още не е определен
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Няма дефиниран вид на плащане по подразбиране. Отидидете на модул за настройка на фактури за да се поправи това.
 ErrorCreateBankAccount=Създайте банкова сметка и след това направете настройките в модула за настройка на фактури
 ErrorBillNotFound=Фактура %s не съществува
-ErrorInvoiceAlreadyReplaced=Грешка, опитвате се да валидирате фактура, която да замени фактура %s. Но тя вече е заменена с фактура %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Грешка, вече се използва отстъпка
 ErrorInvoiceAvoirMustBeNegative=Грешка, коригиращата фактура трябва да има отрицателна сума
 ErrorInvoiceOfThisTypeMustBePositive=Грешка, този тип фактура трябва да има положителна стойност,
 ErrorCantCancelIfReplacementInvoiceNotValidated=Грешка, не може да се анулира фактура, която е била заменена от друга фактура, която все още е в състояние на чернова
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=От
 BillTo=За
 ActionsOnBill=Действия по фактура
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Неплатеният остатък <b>(%s %s)</b> е дадена отстъпка, защото плащането е направено преди срока за плащане. Урегулирам ДДС с кредитно известие.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Неплатеният остатък <b>(%s %s)</b> е дадена отстъпка, защото плащането е направено преди срока за плащане. Приемам да се загуби ДДС по тази отстъпка.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Неплатеният остатък <b>(%s %s)</b> е дадена отстъпка, защото плащането е направено преди срока за плащане Възстановявам ДДС по тази отстъпка без кредитно известие.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Лош клиент
 ConfirmClassifyPaidPartiallyReasonProductReturned=Продукти частично върнати
 ConfirmClassifyPaidPartiallyReasonOther=Сумата е изоставена по друга причина
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Този избор е възможно, ако към фактурата е направен подходящ коментар. (Пример: «Само данъка, съответстваща на цената, която действително е платената дава права на приспадане»)
+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=В някои страни, този избор може да бъде възможен само ако фактурата съдържа правилна бележка.
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Използвайте този избор, ако всички други не са подходящи
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Лош клиентът</b> е клиент, който отказва да изплати дълга си.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Този избор се използва, когато плащането не е пълно, тъй като някои от продуктите са били върнати
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Използвайте този избор, ако всички останали не са подходящи, например в следната ситуация:<br>- Непъло плащане, тъй като някои продукти са върнати<br> - Претендираната сума е твърде важна, защото е била забравена отстъпката<br> Във всички случаи, разликата в сумата трябва да бъде коригирана в счетоводната система чрез създаване на кредитно известие.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Друг
 ConfirmClassifyAbandonReasonOtherDesc=Този избор ще бъде използван във всички останали случаи. За пример, защото имате намерение да създадете заменяща фактура.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,16 +201,17 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Валидирай фактура
 UnvalidateBill=Отвалидирай фактура
-NumberOfBills=Бр. фактури
+NumberOfBills=No. of invoices
-NumberOfBillsByMonth=Бр фактури по месец
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Сума на фактури
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Сума на фактури по месец (без данък)
 ShowSocialContribution=Покажи социален/фискален данък
 ShowBill=Покажи фактура
 ShowInvoice=Покажи фактура
 ShowInvoiceReplace=Покажи заменяща фактура
 ShowInvoiceAvoir=Покажи кредитно известие
-ShowInvoiceDeposit=Show down payment invoice
+ShowInvoiceDeposit=Покажи авансова фактура
 ShowInvoiceSituation=Show situation invoice
 ShowPayment=Покажи плащане
 AlreadyPaid=Вече е платена
@@ -260,9 +262,9 @@ Repeatables=Шаблони
 ChangeIntoRepeatableInvoice=Превърни в шаблон за фактура
 CreateRepeatableInvoice=Създай шаблон за фактура
 CreateFromRepeatableInvoice=Създай от шаблон за фактура
-CustomersInvoicesAndInvoiceLines=Продажни фактури и фактурни редове
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Продажни фактури и плащания
-ExportDataset_invoice_1=Списък с продажни фактури и фактурни редове
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Продажни фактури и плащания
 ProformaBill=Проформа фактура:
 Reduction=Намаляване
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Фактурен адрес
-HelpEscompte=Тази отстъпка е предоставена на клиента, тъй като плащането е извършено преди срока.
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
-HelpAbandonBadCustomer=Тази сума е изоставена (клиентът се оказва лош клиент) и се счита като извънредна загуба.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
-HelpAbandonOther=Тази сума е изоставена, тъй като тя е грешка (грешен клиент или фактура, заменен от друг например)
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Id за плащане на социален/фискален данък
 PaymentId=Плащане ID
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Не е избрана фактура
 CloneInvoice=Клонирай фактура
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Действието е деактивирано, тъй като фактурата е била заменена
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
+DescTaxAndDividendsArea=Тази секция представлява обобщение на всички плащания, извършени за специални разходи. Включват се само записи с плащане през фиксираната година.
-NbOfPayments=Бр. на плащанията
+NbOfPayments=No. of payments
 SplitDiscount=Раздели отстъпката на две
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
-TypeAmountOfEachNewDiscount=Размер за всяка от двете части:
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=Сумата на двете нови отстъпки трябва да е равен на оригиналната сума на отстъпка.
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Свързана фактура
 RelatedBills=Свързани фактури
 RelatedCustomerInvoices=Свързани продажни фактури
 RelatedSupplierInvoices=Свързани доставни фактури
 LatestRelatedBill=Последна свързана фактура
-WarningBillExist=Внимание, една или повече актури вече съществуват
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Инструмент за sliwane на PDF
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Чек
 PaymentTypeShortCHQ=Чек
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Плащане онлайн
+PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Онлайн
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Чернова
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Банкови данни
 BankCode=Банков код
-DeskCode=Касов код
+DeskCode=Office code
 BankAccountNumber=Номер на сметка
-BankAccountNumberKey=Ключ
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN номер
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT код
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Плащане чрез банков прев
 VATIsNotUsedForInvoice=* Неприложим ДДС, art-293BB от CGI
 LawApplicationPart1=Чрез прилагането на закон 80.335 от 12/05/80
 LawApplicationPart2=стоките остават собственост на
-LawApplicationPart3=продавача до пълното изплащане на
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=цената им.
 LimitedLiabilityCompanyCapital=SARL със столица
 UseLine=Приложи
@@ -463,7 +465,7 @@ Cheques=Чекове
 DepositId=Id депозит
 NbCheque=Брой чекове
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Използвай адрес за фактуриране на клиента, вместо адреса на контрагента като получател за фактури
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Покажи всички неплатени фактури
 ShowUnpaidLateOnly=Покажи само неплатените фактури с просрочено плащане
 PaymentInvoiceRef=Платежна фактуре %s
@@ -474,21 +476,22 @@ Reported=Закъснение
 DisabledBecausePayments=Не е възможно, тъй като има някои плащания
 CantRemovePaymentWithOneInvoicePaid=Не може да се премахне плащането, тъй като има най-малко една фактура, класифицирана като платена
 ExpectedToPay=Очаквано плащане
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Плаща от това плащане
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Класифицирай "Платени" всички кредитни известия изцяло обратно платени.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
-AllCompletelyPayedInvoiceWillBeClosed=Всички фактура без остатък за плащане, ще бъдат затворени автоматично със статус "Платени".
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Плати
 ToMakePaymentBack=Плати обратно
 ListOfYourUnpaidInvoices=Списък с неплатени фактури
 NoteListOfYourUnpaidInvoices=Бележка: Този списък съдържа само фактури за контрагенти, които са свързани като търговски представители.
 RevenueStamp=Приходен печат
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Фактурен PDF шаблон. Пълен шаблон за фактура (препоръчителен шаблон)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Върнете номер с формат %syymm-nnnn за стандартни фактури и %syymm-nnnn за кредитни известия, където уу е година, mm е месец и NNNN е последователност, без прекъсване и без 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted

htdocs/langs/bg_BG/cashdesk.lang

@@ -30,5 +30,15 @@ ShowCompany=Покажи фирмата
 ShowStock=Покажи склад
 DeleteArticle=Кликнете, за да се премахне тази статия
 FilterRefOrLabelOrBC=Търсене (Номер/Заглавие)
-UserNeedPermissionToEditStockToUsePos=Запитвате за намаляване на стоки при създаване на фактура, така че потребителя използващ ТП трябва да е с привилегии да редактира стоки.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr принтер за квитанции
+PointOfSale=Точка на продажбите
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product

htdocs/langs/bg_BG/commercial.lang

@@ -52,6 +52,7 @@ ActionAC_TEL=Телефонно обаждане
 ActionAC_FAX=Изпращане на факс
 ActionAC_PROP=Изпрати предложение по пощата
 ActionAC_EMAIL=Изпращане на имейл
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Срещи
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Изпращане на клиента фактура по пощата
@@ -72,8 +73,8 @@ StatusProsp=Prospect статус
 DraftPropals=Проектът на търговски предложения
 NoLimit=Няма лимит
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled

htdocs/langs/bg_BG/dict.lang

@@ -116,7 +116,7 @@ CountryHM=Хърд и Макдоналд
 CountryVA=Светия престол (Ватикана)
 CountryHN=Хондурас
 CountryHK=Хонконг
-CountryIS=Исландия
+CountryIS=Iceland
 CountryIN=Индия
 CountryID=Индонезия
 CountryIR=Иран
@@ -131,7 +131,7 @@ CountryKI=Кирибати
 CountryKP=Северна Корея
 CountryKR=Южна Корея
 CountryKW=Кувейт
-CountryKG=Киргизтан
+CountryKG=Kyrgyzstan
 CountryLA=Лао
 CountryLV=Латвия
 CountryLB=Ливан
@@ -160,7 +160,7 @@ CountryMD=Молдова
 CountryMN=Монголия
 CountryMS=Monserrat
 CountryMZ=Мозамбик
-CountryMM=Birmania (Мианмар)
+CountryMM=Myanmar (Burma)
 CountryNA=Намибия
 CountryNR=Науру
 CountryNP=Непал
@@ -223,7 +223,7 @@ CountryTO=Лека индийска двуколка
 CountryTT=Тринидад и Тобаго
 CountryTR=Турция
 CountryTM=Туркменистан
-CountryTC=Турците и Cailos острови
+CountryTC=Turks and Caicos Islands
 CountryTV=Тувалу
 CountryUG=Уганда
 CountryUA=Украйна
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Мавриций рупии
 CurrencySingMUR=Мавриций рупии
 CurrencyNOK=Норвежките Кронес
-CurrencySingNOK=Норвежка крона
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Тунизийски динара
 CurrencySingTND=Тунизийски динар
 CurrencyUSD=Щатски долари
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Уста на уста
 DemandReasonTypeSRC_PARTNER=Партньор
 DemandReasonTypeSRC_EMPLOYEE=Служител
 DemandReasonTypeSRC_SPONSORING=Спонсорство
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Формат 4A0
 PaperFormatEU2A0=Формат 2A0

htdocs/langs/bg_BG/ecm.lang

@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Брой на документите в директорията
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Директория
 ECMSectionManual=Ръчно създадена директория
 ECMSectionAuto=Автоматично създадена директория
@@ -34,6 +34,8 @@ ECMDocsByProjects=Документи свързани към проекти
 ECMDocsByUsers=Документи свързани към потребители
 ECMDocsByInterventions=Документи свързани към интервенции
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Не е създадена директория
 ShowECMSection=Покажи директория
 DeleteSection=Изтриване на директория
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)

htdocs/langs/bg_BG/errors.lang

@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP клиента се повреди с греш
 ErrorGlobalVariableUpdater5=Няма избрана глобална променлива
 ErrorFieldMustBeANumeric=Поле <b>%s</b> трябва да бъде числена стойност
 ErrorMandatoryParametersNotProvided=Задължителен параметър(и) не е даден
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=Парола е зададено за този член. Обаче, няма създаден потребителски акаунт. Следователно тази парола е записана, но не може да бъде използвана за влизане в Dolibarr. Може да бъде използвана от външен модул/интерфейс, но ако нямате нужда да определите нито потребителско име нито парола за член, можете да деактивирате тази опция. Ако имате нужда да управлявате потребителско име, но нямата нужда от парола, можете да оставите това поле празно, за да избегнете това предупреждение. Забележка: Имейл също може да бъде използван като потребителско име ако члена с свързан към потребител.
 WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени

htdocs/langs/bg_BG/help.lang

@@ -5,9 +5,9 @@ RemoteControlSupport=Онлайн в реално време / дистанци
 OtherSupport=Друга поддръжка
 ToSeeListOfAvailableRessources=За да се свържете/вижте наличните ресурси:
 HelpCenter=Помощен център
-DolibarrHelpCenter=Dolibarr център за помощ и поддръжка
+DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=В противен случай, щракнете <a href="%s">тук, за да използвате Dolibarr</a>
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=Източник на подкрепа
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Общност (безплатно)
 TypeSupportCommercial=Търговски
 TypeOfHelp=Тип
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Ефективност
 TypeHelpOnly=Само помощ
 TypeHelpDev=Помощ + развитие
-TypeHelpDevForm=Помощ + развитие + Формиране
+TypeHelpDevForm=Help+Development+Training
-ToGetHelpGoOnSparkAngels1=Някои компании могат да осигурят бързо (по някое време незабавно) и по-ефективни онлайн поддръжка чрез поемането на контрола на вашия компютър. Такива помощници може да се намери на уеб сайта на <b>%s:</b>
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-ToGetHelpGoOnSparkAngels3=Можете също да отидете към списъка на всички налични треньори за Dolibarr за тази цел кликнете върху бутона
+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):
-ToGetHelpGoOnSparkAngels2=Понякога, няма фирма, на разположение в момента, в който търсенето си, така че мислете за промяна на филтъра, за да търсят &quot;всичко наличност&quot;. Вие ще бъдете в състояние да изпрати повече заявки.
-BackToHelpCenter=В противен случай, натиснете тук, за да отиде <a href="%s">да помогне на центъра начална страница</a> .
-LinkToGoldMember=Можете да се обадите на треньора, предварително подбрани от Dolibarr за вашия език (%s), като щракнете върху му Widget (статус и максимална цена се актуализира автоматично):
 PossibleLanguages=Поддържани езици
-SubscribeToFoundation=Помогнете на проекта Dolibarr, като се присъедините към фондацията
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=За официална поддръжка на Dolibarr за Вашият език: <br><b><a href="%s" target="_blank">%s</a></b>

htdocs/langs/bg_BG/holiday.lang

@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=ЧР
-Holidays=Отпуски
+Holidays=Leave
-CPTitreMenu=Отпуски
+CPTitreMenu=Leave
 MenuReportMonth=Месечно извлечение
 MenuAddCP=Нова молба за отпуск
-NotActiveModCP=Трябва да активирате модула за отпуски, за да видите тази страница.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Кандидатстване за отпуск
 DateDebCP=Начална дата
 DateFinCP=Крайна дата
@@ -15,13 +15,18 @@ ApprovedCP=Утвърден
 CancelCP=Отменен
 RefuseCP=Отказ
 ValidatorCP=Утвърждаващ
-ListeCP=Списък на отпуски
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Ще бъде утвърден от
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Описание
 SendRequestCP=Създаване на молба за отпуск
 DelayToRequestCP=Молбите за отпуски трябва да бъдат направени най-малко <b>%s ден(а)</b> преди началната им дата.
-MenuConfCP=Balance of leaves
+MenuConfCP=Balance of leave
-SoldeCPUser=Баланса на отпуските е <b>%s</b> дни.
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Трябва да изберете крайната дата, по-голяма от началната дата.
 ErrorSQLCreateCP=Възникна SQL грешка по време на създаването:
 ErrorIDFicheCP=Възникна грешка, молбата за отпуск не съществува.
@@ -30,7 +35,14 @@ ErrorUserViewCP=Не сте упълномощени да четете тази
 InfosWorkflowCP=Информация Workflow
 RequestByCP=По искане на
 TitreRequestCP=Молба за отпуск
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Брой на дните на използваните отпуски
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Редактиране
 DeleteCP=Изтриване
 ActionRefuseCP=Отказване
@@ -59,6 +71,7 @@ DateRefusCP=Дата на отказ
 DateCancelCP=Дата на анулирането
 DefineEventUserCP=Присвояване изключително отпуск за потребителя
 addEventToUserCP=Присвояване напусне
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Причина
 UserCP=Потребител
 ErrorAddEventToUserCP=Възникна грешка при добавяне на изключително отпуск.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Актуализира се успешно.
 Module27130Name= Управление на молби за отпуск
 Module27130Desc= Управление на молби за отпуск
@@ -94,7 +112,7 @@ NoticePeriod=Период на известяване
 HolidaysToValidate=Валидиране на молби за отпуск
 HolidaysToValidateBody=Отдолу е молба за отпуск за валидиране
 HolidaysToValidateDelay=Тази молба за отпуск ще се случи в период от по-малко от %s дни.
-HolidaysToValidateAlertSolde=Потребителя, който е направил тази молба за отпуск няма достатъчно налични дни.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Валидирани молби за отпуск
 HolidaysValidatedBody=Вашата молба за отпуск от %s до %s е била валидирана.
 HolidaysRefused=Молбата отказана
@@ -103,4 +121,9 @@ HolidaysCanceled=Отказани молби за отпуск
 HolidaysCanceledBody=Вашата молба за отпуск от %s до %s е била отказана.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Отидете на <strong>Начало - Настройки - Речници - Тип на отпуски</strong> за настройка на различните типове на отпуски.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests

htdocs/langs/bg_BG/install.lang

@@ -2,37 +2,37 @@
 InstallEasy=Просто следвайте инструкциите стъпка по стъпка.
 MiscellaneousChecks=Предпоставки проверка
 ConfFileExists=Конфигурационния файл <b>%s</b> съществува.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Конфигурационния файл <b>%s</b> не съществува и не може да бъде създаден!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Конфигурационния файл <b>%s</b> може да бъде създаден.
-ConfFileIsNotWritable=<b>%s</b> конфигурационен файл е без права за запис. Проверете правата. При първа инсталация, вашия уеб сървър трябва да бъде настроен с права за запис в този файл по време на процеса на конфигуриране (&quot;chmod 666&quot; за пример на Unix подобна операционна система).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Конфигурационния файл <b>%s</b> е с права за писане.
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
+ConfFileMustBeAFileNotADir=Конфигурационният файл <b> %s </b> трябва да бъде файл, а не директория.
-ConfFileReload=Презареждане на цялата информация от конфигурационния файл.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=PHP поддържа сесии.
 PHPSupportPOSTGETOk=PHP поддържа променливи POST и GET.
-PHPSupportPOSTGETKo=Възможно е PHP настройките Ви да не поддържат променливи POST и / или GET. Проверете параметър <b>variables_order</b> в php.ini.
+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=PHP поддържа GD графични функции.
+PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
+PHPSupportCurl=This PHP supports Curl.
-PHPSupportUTF8=PHP поддържа UTF8 функции.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=PHP макс сесия памет е <b>%s.</b> Това трябва да бъде достатъчно.
-PHPMemoryTooLow=PHP макс сесия памет е настроен на <b>%s</b> байта. Това може да бъде прекалено ниско. Променете <b>php.ini</b> като настроите параметър <b>memory_limit</b> най-малко <b>%s</b> байта.
+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=Кликнете тук за по-значим тест
+Recheck=Click here for a more detailed test
-ErrorPHPDoesNotSupportSessions=Вашата PHP инсталация не поддържа сесии. Тази функция е нужна за правилата работа на Dolibarr. Проверете PHP настройките.
+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=Вашата PHP инсталация не поддържа графична функция GD. Графиките няма да бъдат достъпни.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Вашата PHP инсталация не поддържа UTF8 функции. Dolibarr не може да работи правилно. Преконфигурирайте преди да инсталирате Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Директорията %s не съществува.
-ErrorGoBackAndCorrectParameters=Върни се назад и коригирайте грешните параметри.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Може да сте въвели грешна стойност за параметър '%s'.
 ErrorFailedToCreateDatabase=Неуспешно създаване на базата данни '%s'.
 ErrorFailedToConnectToDatabase=Неуспешна връзка с база данни '%s'.
 ErrorDatabaseVersionTooLow=Версията на базата данни (%s) е твърде стара. Изисква се версия %s или по-нова.
 ErrorPHPVersionTooLow=Версията на PHP е твърде стара. Изисква се версия %s.
-ErrorConnectedButDatabaseNotFound=Свързването към сървъра е успешено, но базата данни '%s' не е открита.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Базата данни %s вече съществува.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Ако базата данни не съществува, върнете се назад и проверете опцията "Създаване на база данни".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Ако базата данни вече съществува, върнете се обратно и махнете отметката на "Създаване на база данни".
-WarningBrowserTooOld=Твърде стара версия на браузъра. Надстройването на браузъра ви до последната версия на Firefox, Chrome или Opera е силно препоръчително.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=Версия на PHP
 License=Лиценз за използване
 ConfigurationFile=Конфигурационен файл
@@ -45,22 +45,23 @@ DolibarrDatabase=База данни на Dolibarr
 DatabaseType=Тип на базата данни
 DriverType=Тип драйвер
 Server=Сървър
-ServerAddressDescription=Име или IP адрес на сървъра на базата данни, обикновено 'localhost', когато сървъра на базата данни се хоства на същия сървър като уеб сървъра
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Порт на сървъра на базата данни. Оставете празно ако е неизвестно.
 DatabaseServer=Сървър на базата данни
 DatabaseName=Име на базата данни
-DatabasePrefix=Префикс на таблиците
+DatabasePrefix=Database table prefix
-AdminLogin=Идентифициране на собственика на базата данни на Dolibarr.
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
-PasswordAgain=Въведете паролата отново
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Парола на собственика на базата данни на Dolibarr.
 CreateDatabase=Създаване на база данни
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Сървър на базата данни - Достъп супер потребител
-CheckToCreateDatabase=Отметнете ако базата данни не съществува и трябва да бъде създадена. <br> В този случай, трябва да попълните потребителско име/парола за профил на суперпотребител в долната част на тази страница.
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
+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=Идентифицирането на потребителя му позволява да създава нови бази данни или нови потребители, задължително ако вашата база данни или нейния собственик вече не съществуват.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
-KeepEmptyIfNoPassword=Оставете празно, ако потребителят няма парола (избягвайте това)
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
-SaveConfigurationFile=Регистрация на конфигурационния файл
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Свързване със сървъра
 DatabaseCreation=Създаване на база данни
 CreateDatabaseObjects=Създаване на обекти в базата данни
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Създаване на чужди ключове и и
 OtherKeysCreation=Създаване на чужди ключове и индекси
 FunctionsCreation=Създаване на функции
 AdminAccountCreation=Създаване на администраторски профил
-PleaseTypePassword=Моля, въведете парола, празни пароли не са позволени!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Моля, въведете име!
+PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Паролите не съвпадат, опитайте отново!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Край на настройкате
 SystemIsInstalled=Инсталирането завърши.
 SystemIsUpgraded=Dolibarr е обновен успешно.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Трябва да конфигурирате Dolibarr
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Отиди на Dolibarr
 GoToSetupArea=Отиди на Dolibarr (област за настройка)
-MigrationNotFinished=Версията на вашата база данни не е напълно актуална, така че ще трябва отново да стартирате процеса на надграждане.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Отидете отново на страницата за надграждане
 WithNoSlashAtTheEnd=Без наклонена черта "/" в края
-DirectoryRecommendation=Препоръчва се да използвате директория извън директорията на своите уеб страници.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Вече съществува
 DolibarrAdminLogin=Администраторски вход в Dolibarr
-AdminLoginAlreadyExists=Администраторския профил за Dolibarr '<b>%s</b>' вече съществува. Върнете се назад, ако искате да създадете друг.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Внимание, от съображения за сигурност, след като ведъж инсталирането или надграждането завърши, за да се избегне ново използване на инструментите за инсталиране, трябва да добавите файл наречен <b>install.lock</b> в директорията с документи на Dolibarr, за да се избегне злонамерена употреба.
+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=Не е наличено за това PHP
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Изберете скрипт за миграция
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Скрипта обработва
 ChooseYourSetupMode=Изберете режим на настройка и кликнете върху "Начало"...
 FreshInstall=Нова инсталация
-FreshInstallDesc=Използвайте този режим, ако това е вашето първо инсталиране. Ако това не е така, този режим може да поправи непълна предишна инсталация, но ако искате да надградите вашата версия, изберете режим "Надграждане".
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Надграждане
 UpgradeDesc=Използвайте този режим, ако желаете да замените старите файлове на Dolibarr с файлове от по-нова версия. Това ще обнови вашата база данни и данни.
 Start=Начало
 InstallNotAllowed=Настройката не разрешена поради правата на файла <b>conf.php</b>
 YouMustCreateWithPermission=Трябва да създадете файл %s и да настроите права за запис в него от уеб сървъра по време на процеса на инсталиране.
-CorrectProblemAndReloadPage=Моля, коригирайте проблема и натиснете F5, за да презаредите страницата.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Вече мигрирахте
 DatabaseVersion=Версия на базата данни
 ServerVersion=Версия на сървъра на базата данни
 YouMustCreateItAndAllowServerToWrite=Трябва да създадете тази директория и да позволите на уеб сървъра да записва в нея.
 DBSortingCollation=Ред за сортиране на символи
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Искате да създадете база данни <b>%s</b>, но за това Dolibarr трябва да се свърже със сървъра <b>%s</b> чрез супер потребителя <b>%s</b>.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=Искате да създадете вход за база данни <b>%s</b>, но за това Dolibarr трябва да се свърже със сървъра <b>%s</b> чрез супер потребителя <b>%s</b>.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=Тъй като свързването е неуспешно, хоста или параметрите на супер потребителя трябва да са грешни.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans плащане е открито по метода %s
 RemoveItManuallyAndPressF5ToContinue=Премахнете го ръчно и натиснете F5, за да продължите.
 FieldRenamed=Полето е преименувано
-IfLoginDoesNotExistsCheckCreateUser=Ако все още не съществува вписване, трябва да проверите опцията "Създаване на потребител"
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
-ErrorConnection=Сървър "<b>%s</b>", име на база данни "<b>%s</b>", потребител "<b>%s</b>", или парола на базата данни може да са грешни или версията на PHP клиента може да е твърде стара, сравнена с версията на базата данни.
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Препоръчителен избор е да инсталирате версия <b>%s</b> от вашата текуща версия <b>%s</b>
 InstallChoiceSuggested=<b>Избор за инсталиране, предложен от инсталатора</b>.
-MigrateIsDoneStepByStep=Целевата версия (%s) има празнина от няколко версии, така че помощника ще препоръча следваща миграция, след като тази завърши.
+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=Уверете се, че името на базата данни "<b>%s</b>" е правилно.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Ако това име е вярно и тази база данни все още не съществува, трябва да проверите опцията "Създаване на база данни".
 OpenBaseDir=Параметър PHP openbasedir
-YouAskToCreateDatabaseSoRootRequired=Отметнахте "Създаване на база данни". За тази цел, трябва да въведете потребителско име/парола на супер потребител (най-долу на формата).
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=Отметнахте "Създаване на собственик на базата данни". За тази цел, трябва да въведете потребителско име/парола на супер потребител (най-долу на формата).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Текущата стъпка може да продължи няколко минути. Моля, изчакайте докато следващия екран се покаже напълно, преди да продължите.
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Мигриране на хранилище за пратки на поръчки от клиенти
 MigrationShippingDelivery=Надграждане на хранилище на доставки
 MigrationShippingDelivery2=Надграждане на хранилище на доставки 2
 MigrationFinished=Миграцията завърши
-LastStepDesc=<strong>Последна стъпка</strong>: Определете тук потребителско име и парола, които планирате да използвате, за да се свързвате със софтуера. Не ги губете, тъй като това е профил за администриране на всички останали.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Активиране на модул %s
 ShowEditTechnicalParameters=Натиснете тук за да покажете/редактирате параметрите за напреднали (експертен режим)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Вашата база данни е с версия %s. Тя има критичен бъг, причинявайки загуба на информация ако направите структурна промяна на вашата база данни, а подобна е задължителна при миграционния процес. Поради тази причина, миграцията не е позволена, докато не обновите вашата база данни до по-нова коригирана версия (списък на познати версии с бъгове: %s)
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
-KeepDefaultValuesWamp=Вие използвате помощника за настройка на Dolibarr от DoliWamp, така че стойностите, предложени тук вече са оптимизирани. Променете ги само ако знаете какво правите.
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesDeb=Вие използвате помощника за настройка на Dolibarr от пакет за Linux (Ubuntu, Debian, Fedora ...), така че стойностите, предложени тук вече са оптимизирани. Само създаването на парола на собственика на базата данни трябва да бъде завършена. Променяйте други параметри, само ако знаете какво правите.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
-KeepDefaultValuesMamp=Вие използвате помощника за настройка на Dolibarr от DoliMamp, така че стойностите, предложени тук вече са оптимизирани. Променете ги само ако знаете какво правите.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesProxmox=Вие използвате помощника за настройка на Dolibarr от Proxmox виртуална машина, така че стойностите, предложени тук вече са оптимизирани. Променете ги само ако знаете какво правите.
+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 modules
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Миграция на данни за оферти
 MigrationInvoice=Миграция на данни за фактури за клиенти
 MigrationContract=Миграция на данни за договори
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Надграждането е успешно
 MigrationUpdateFailed=Неуспешен процес на надграждане
 MigrationRelationshipTables=Миграция на данни за свързани таблици (%s)
 MigrationPaymentsUpdate=Корекция на данни за плащане
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Корекция на данни в договор
 MigrationContractsNumberToUpdate=%s договор(и) за актуализиране
 MigrationContractsLineCreation=Създаване на ред в договор с реф. %s
 MigrationContractsNothingToUpdate=Няма повече задачи
-MigrationContractsFieldDontExist=Полето fk_facture вече не съществува. Нищо не може да се направи.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Корекция на празна дата в договор
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Няма празна дата на договор за коригиране
 MigrationContractsEmptyCreationDatesNothingToUpdate=Няма дата за създаване на договор за коригиране
 MigrationContractsInvalidDatesUpdate=Корекция на неправилни дати на договор
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Актуализация на доставката
 MigrationStockDetail=Актуализиране на наличната стойност на продукти
 MigrationMenusDetail=Актуализиране на таблици за динамични менюта
 MigrationDeliveryAddress=Актуализиране на адрес за доставка на пратки,
-MigrationProjectTaskActors=Миграция на данни за таблицата llx_projet_task_actors
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Миграция на полето fk_user_resp на llx_projet llx_element_contact
 MigrationProjectTaskTime=Актуализация на времето, прекарано в секунда
 MigrationActioncommElement=Актуализиране на данните за действия
 MigrationPaymentMode=Миграция на данни за начин на плащане
 MigrationCategorieAssociation=Миграция на категории
-MigrationEvents=Миграция на събития за добавяне на собственик на събитие в таблицата за възлагане
+MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Презареждане на модула %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Показване на недостъпните опции
+ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Скриване на недостъпните опции
+HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
+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 try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
+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 try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.

htdocs/langs/bg_BG/main.lang

@@ -437,6 +437,7 @@ ContactsForCompany=Контакти за този контрагент
 ContactsAddressesForCompany=Контакти/адреси за този контрагент
 AddressesForCompany=Адреси за този контрагент
 ActionsOnCompany=Събития за този контрагент
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Събития за този член
 ActionsOnProduct=Events about this product
 NActionsLate=%s закъснели
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Уеб Сайт
+WebSite=Website
-WebSites=Web sites
+WebSites=Уебсайтове
-WebSiteAccounts=Web site accounts
+WebSiteAccounts=Website accounts
 ExpenseReport=Доклад разходи
 ExpenseReports=Опис разходи
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory

htdocs/langs/bg_BG/other.lang

@@ -83,6 +83,7 @@ LinkedObject=Свързан обект
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Заглавие
 WEBSITE_DESCRIPTION=Описание
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import

htdocs/langs/bg_BG/paybox.lang

@@ -3,7 +3,7 @@ PayBoxSetup=Paybox модул за настройка
 PayBoxDesc=В този модул се предлагат страници, които да дават възможност за заплащане на <a href="http://www.paybox.com" target="_blank">Paybox</a> от клиентите. Това може да се използва за плащане или за плащане на даден обект Dolibarr (фактура, поръчка, ...)
 FollowingUrlAreAvailableToMakePayments=Следните интернет адреси са на разположение, за да предложи на клиента да направи плащане по Dolibarr обекти
 PaymentForm=Формуляра за плащане
-WelcomeOnPaymentPage=Добре дошли на нашия онлайн платежни услуги
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Този екран ви позволи да направите онлайн плащане на %s.
 ThisIsInformationOnPayment=Това е информация за плащане, за да се направи
 ToComplete=За да завършите
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL да предложи %s онлайн
 ToOfferALinkForOnlinePaymentOnContractLine=URL да предложи %s онлайн интерфейс ползвател на платежни за договор линия
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL да предложи %s онлайн интерфейс ползвател на платежни за безплатен сума
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL да предложи %s онлайн интерфейс ползвател на платежни за член абонамент
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Можете също да добавите URL параметър <b>и етикет = <i>стойност</i></b> на която и да е от тези URL (задължително само за безплатно плащане), за да добавите свой ​​собствен етикет за коментар на плащане.
-SetupPayBoxToHavePaymentCreatedAutomatically=Настройте Paybox с URL <b>%s</b> да има плащане създава автоматично, когато валидирани от Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Тази страница потвърждава, че плащането е било записано. Благодаря.
-YourPaymentHasNotBeenRecorded=Плащането не е записана и сделката е била анулирана. Благодаря.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Отчитат параметри
 UsageParameter=Употреба параметри
 InformationToFindParameters=Помощ &quot;, за да намерите информация за %s сметка

htdocs/langs/bg_BG/propal.lang

@@ -15,8 +15,8 @@ ValidateProp=Одобряване на търговско предложение
 AddProp=Създаване на предложение
 ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
 ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
-LastPropals=Latest %s proposals
+LastPropals=Последни %s предложения
-LastModifiedProposals=Latest %s modified proposals
+LastModifiedProposals=Последни %s промени по предложения
 AllPropals=Всички предложения
 SearchAProposal=Търсене предложение
 NoProposal=No proposal
@@ -33,10 +33,10 @@ PropalStatusSigned=Подписано (нужди фактуриране)
 PropalStatusNotSigned=Не сте (затворен)
 PropalStatusBilled=Таксува
 PropalStatusDraftShort=Проект
-PropalStatusValidatedShort=Валидирано
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Затворен
 PropalStatusSignedShort=Подписан
-PropalStatusNotSignedShort=Не сте
+PropalStatusNotSignedShort=Не е подписано
 PropalStatusBilledShort=Таксува
 PropalsToClose=Търговски предложения, за да го затворите
 PropalsToBill=Подписани търговски предложения законопроект
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s не е намерена
 AddToDraftProposals=Добавяне към черновата на предложение
 NoDraftProposals=Няма чернови на предложения
 CopyPropalFrom=Създаване на търговско предложение копиране съществуващото предложение
-CreateEmptyPropal=Създаване на празен търговски vierge предложения или от списъка на продуктите / услугите
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default търговски продължителност предложение на валидност (в дни)
-UseCustomerContactAsPropalRecipientIfExist=Използвайте адрес за контакт на клиента, ако вместо на трета страна адрес като адрес предложение получателя
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone търговско предложение
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Контакт с клиентите сле
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Цялостен модел за предложение (logo. ..)
+DocModelCyanDescription=Цялостен модел за предложение (logo. ..)
 DefaultModelPropalCreate=Създаване на модел по подразбиране
 DefaultModelPropalToBill=Шаблон по подразбиране, когато се затваря бизнес предложение (да бъде фактурирано)
 DefaultModelPropalClosed=Шаблон по подразбиране, когато се затваря бизнес предложение (не осчетоводено)

htdocs/langs/bg_BG/website.lang

@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Код
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Изтрийте уебсайт
-ConfirmDeleteWebsite=Сигурни ли сте, че искате да изтриете този уебсайт? Всички негови страници и съдържание ще бъдат премахнати.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGE_EXAMPLE=Уеб страница, която да се използва като пример
 WEBSITE_PAGENAME=Име на страницата
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=Линк към външен CSS файл
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Редактирай CSS или HTML header
+EditCss=Edit website properties
 EditMenu=Редактирай
 EditMedias=Edit medias
-EditPageMeta=Редайтирай Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Добави страница/контейнер
-HomePage=Home Page
+HomePage=Начална страница
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Преглед на вашият уебсайт %s не е наличен. Първо трябва да добавите страница.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Страницата %s все още няма съдържание, или кеш файла .tpl.php е премахнат. Редактирайте съдържанието на страницата, за да отстраните проблема.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Страница/Контейнер '%s' на уебсайта %s е изтрит
 PageAdded=Страница/Контейнер '%s' добавен
@@ -36,8 +39,8 @@ ViewPageInNewTab=Покажи страницата в нов прозорец
 SetAsHomePage=Задай като основна страница
 RealURL=Релен URL
 ViewWebsiteInProduction=Покажи уеб сайта използвайки началното URL
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=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>
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Чета
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
+WebsiteAccount=Website account
-WebsiteAccounts=Web site accounts
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation

htdocs/langs/bn_BD/admin.lang

@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Suppliers
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).

htdocs/langs/bn_BD/banks.lang

@@ -7,7 +7,7 @@ BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only opened accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
+FutureTransaction=Transaction in future. No way to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament

htdocs/langs/bn_BD/bills.lang

@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma invoice
 InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Replacement invoice
 InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+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 so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Received customers payments to validate
 PaymentsReportsForYear=Payments reports for %s
 PaymentsReports=Payments reports
@@ -91,8 +91,8 @@ PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
+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 rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Processed
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
+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 note.
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Other
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validate invoice
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
+NumberOfBills=No. of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
+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 loose.
+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 an other for example)
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
+PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bank details
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for deposit invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted

htdocs/langs/bn_BD/cashdesk.lang

@@ -30,5 +30,15 @@ ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product

htdocs/langs/bn_BD/commercial.lang

@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled

htdocs/langs/bn_BD/dict.lang

@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turkey
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraine
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0

htdocs/langs/bn_BD/ecm.lang

@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)

htdocs/langs/bn_BD/errors.lang

@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined

htdocs/langs/bn_BD/help.lang

@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
+DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=Source of support
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=Commercial
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
+TypeHelpDevForm=Help+Development+Training
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
+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):
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>

htdocs/langs/bn_BD/holiday.lang

@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
+Holidays=Leave
-CPTitreMenu=Leaves
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
@@ -15,13 +15,18 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Description
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
+MenuConfCP=Balance of leave
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Edit
 DeleteCP=Delete
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests

htdocs/langs/bn_BD/install.lang

@@ -2,37 +2,37 @@
 InstallEasy=Just follow the instructions step by step.
 MiscellaneousChecks=Prerequisites check
 ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
+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 support GD graphical functions.
+PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
+PHPSupportCurl=This PHP supports Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+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 significative test
+Recheck=Click here for a more detailed test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
+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 graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
+DatabasePrefix=Database table prefix
-AdminLogin=Login for Dolibarr database owner.
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
-PasswordAgain=Retype password a second time
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
+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=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
+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 user has no password (avoid this)
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
-SaveConfigurationFile=Save values
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Please type a login !
+PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Passwords differs, please try again !
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
+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 database name "<b>%s</b>" is correct.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
+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 modules
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
+ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide not available options
+HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
+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 try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
+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 try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.

htdocs/langs/bn_BD/main.lang

@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
+WebSite=Website
-WebSites=Web sites
+WebSites=Websites
-WebSiteAccounts=Web site accounts
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory

htdocs/langs/bn_BD/other.lang

@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import

htdocs/langs/bn_BD/paybox.lang

@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information

htdocs/langs/bn_BD/propal.lang

@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)

htdocs/langs/bn_BD/website.lang

@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=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>
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
+WebsiteAccount=Website account
-WebsiteAccounts=Web site accounts
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation

htdocs/langs/bs_BA/admin.lang

@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Korisnici i grupe
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Poslovno
 Module2Desc=Commercial management
 Module10Name=Računovodstvo
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Fakture
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Dobavljači
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Uslovi plaćanja
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Dopunski atributi (treća stranka)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Dopunski atributi (član)
 ExtraFieldsMemberType=Dopunske atributa (tip član)
 ExtraFieldsCustomerInvoices=Dopunski atributi (fakture)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).

htdocs/langs/bs_BA/banks.lang

@@ -7,7 +7,7 @@ BankName=Naziv banke
 FinancialAccount=Račun
 BankAccount=Žiro račun
 BankAccounts=Žiro računi
-BankAccountsAndGateways=Bankovni računi | Portali
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Prikaži račun
 AccountRef=Finansijski račun ref
 AccountLabel=Naziv za finansijski račun
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Adresa računa
 BankAccountCountry=Zemlja računa
 BankAccountOwner=Ime vlasnika računa
 BankAccountOwnerAddress=Adresa vlasnika računa
-RIBControlError=Provjera integriteta vrijednosti neuspješna. To znači da podaci za ovaj broj računa nisu tačni ili nepotpuni (provjerite državu, brojeve i IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Kreiraj račun
 NewBankAccount=Novi račun
 NewFinancialAccount=Novi finansijski račun
@@ -76,6 +76,7 @@ TransactionsToConciliate=Transakcije za izmirivanje
 Conciliable=Može se izmiriti
 Conciliate=Izmiriti
 Conciliation=Podmirivanje
+SaveStatementOnly=Save statement only
 ReconciliationLate=Kašnjenje s izmirivanjem
 IncludeClosedAccount=Uključiti zatvorene račune
 OnlyOpenedAccount=Samo otvoreni računi
@@ -104,7 +105,7 @@ SocialContributionPayment=Plaćanje socijalnog/fiskalnog poreza
 BankTransfer=Prenos između banaka
 BankTransfers=Prenosi između banaka
 MenuBankInternalTransfer=Interni transfer
-TransferDesc=Prebacivanje s jednog računa na drugi, Dolibarr zapisuje dva unosa (potražuje račun sa kojeg se prenosi i duguje ciljni račun. Isti iznos (osim predznaka), oznaka i datum će se koristiti za ovu transakciju)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od strane
 TransferTo=Prema
 TransferFromToDone=Transfer sa <b>%s</b> na <b>%s</b> u iznosu od <b>%s</b> %s je zapisan.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Da li ste sigurni da želite obrisati ovaj izvod od č
 BankChecks=Bankovni ček
 BankChecksToReceipt=Čekovi koji čekaju na depozit
 ShowCheckReceipt=Prikaži priznanicu depozita čeka
-NumberOfCheques=Broj čeka
+NumberOfCheques=No. of check
 DeleteTransaction=Obriši unos
 ConfirmDeleteTransaction=Da li ste sigurni da želite obrisati ovaj unos?
 ThisWillAlsoDeleteBankRecord=Ovim će se također obrisati i generisana bankovna transakcija
@@ -135,8 +136,8 @@ BankTransactionLine=Bankovna transakcija
 AllAccounts=All bank and cash accounts
 BackToAccount=Nazad na račun
 ShowAllAccounts=Pokaži za sve račune
-FutureTransaction=Transakcija u budućnosti. Ne može se izmiriti.
+FutureTransaction=Transaction in future. No way to reconcile.
-SelectChequeTransactionAndGenerate=Izaberite/filtrirajte čekove za uključivanje u priznanicu za depozit i kliknite na "Kreiraj".
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Izaberite izvod iz banke za izmirivanje. Koristite brojevne vrijednosti koje se mogu sortirati: YYYYMM ili YYYYMMDD
 EventualyAddCategory=Na kraju, navesti kategoriju u koju će se svrstati zapisi
 ToConciliate=Za izmirenje?
@@ -153,7 +154,7 @@ RejectCheckDate=Datum vraćanja čeka
 CheckRejected=Ček vraćen
 CheckRejectedAndInvoicesReopened=Ček vraćen i fakture ponovno otvorene
 BankAccountModelModule=Šabloni dokumenata za bankovne račune
-DocumentModelSepaMandate=Šablon za SEPA mandat. Koristan je samo za evropske zemlje članice EU.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Šablon za štampanje stranice sa BAN podacima.
 NewVariousPayment=Novo ostalo plaćanje
 VariousPayment=Razna plaćanja
@@ -162,4 +163,6 @@ ShowVariousPayment=Pokaži ostala plaćanja
 AddVariousPayment=Dodaj ostala plaćanja
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Vaš SEPA mandat
-FindYourSEPAMandate=Ovo je vaš SEPA mandat za potvrđivanje vaše kompanije za izradu zahtjeva za direktno plaćanje vašoj banci. Vratite banci potpisan (skeniran potpisan dokument) ili ga pošaljite poštom
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament

htdocs/langs/bs_BA/bills.lang

@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Predračun
 InvoiceProFormaDesc=<b>Predračun</b> izgleda isto kao račun, ali nema računovodstvene vrijednosti.
 InvoiceReplacement=Zamjenska faktura
 InvoiceReplacementAsk=Zamjenska faktura za fakturu
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Knjižna obavijest
 InvoiceAvoirAsk=Knjižna obavijest za korekciju računa
-InvoiceAvoirDesc=<b>Knjižna obavijest</b> je negativni račun, koji se koristi za rješavanje činjenice da računa ima iznos različit od iznosa koji je zaista plaćen (jer je kupac platio greškom više, ili neće da plati ostatak jer je vratio neke robe naprimjer).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=u valuti faktura
 PaidBack=Uplaćeno nazad
 DeletePayment=Obriši uplatu
 ConfirmDeletePayment=Da li ste sigurni da želite obrisati ovu uplatu?
-ConfirmConvertToReduc=Da li želite ovo %s pretvoriti u apsolutni popust ?<br>Iznos će biti spremljen među sve popuste i može se koristiti kao poput za trenutnu ili neke buduće fakture za ovog kupca.
+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 so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Uplate dobavljača
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Primljene uplate od kupaca
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Primljene uplate od kupaca za potvrditi
 PaymentsReportsForYear=Izvještaji o uplatama za %s
 PaymentsReports=Izvještaji o uplatama
@@ -91,8 +91,8 @@ PaymentConditionsShort=Uslovi plaćanja
 PaymentAmount=Iznos plaćanja
 ValidatePayment=Potvrditi uplatu
 PaymentHigherThanReminderToPay=Uplata viša od zaostalog duga
-HelpPaymentHigherThanReminderToPay=Upozorenje, plaćanje iznosa jedne ili više faktura je veće od ostatka duga. <br> Izmijenite vaš unos, u suprotnom potvrdite i napravite knjižnu obavijest za višak primljen za svaku više plaćenu fakturu.
+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 rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Označi kao 'Plaćeno'
 ClassifyPaidPartially=Označi kao 'Djelimično plaćeno'
 ClassifyCanceled=Označi kao 'Otkazano'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Zaključeno (neplaćeno)
 BillStatusClosedPaidPartially=Plaćeno (djelimično)
 BillShortStatusDraft=Uzorak
 BillShortStatusPaid=Plaćeno
-BillShortStatusPaidBackOrConverted=Refundirano ili preplaćeno
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Plaćeno
 BillShortStatusCanceled=Otkazano
 BillShortStatusValidated=Potvrđeno
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Nije vraćeno
 BillShortStatusClosedUnpaid=Zaključeno
 BillShortStatusClosedPaidPartially=Plaćeno (djelimično)
 PaymentStatusToValidShort=Za potvrdu
-ErrorVATIntraNotConfigured=PDV broj nije definisan
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Nema definisanog načina plaćanja. Idite u postavke modula faktura da popravite ovo.
 ErrorCreateBankAccount=Napravite bankovni račun, zatim idite u panel postavki modula računa za definiranje načina plaćanja
 ErrorBillNotFound=Faktura %s ne postoji
-ErrorInvoiceAlreadyReplaced=Greška, pokušavate odobriti fakturu za zamjenu fakture %s. Ali je ona već zamijenjena fakturom %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Greška, popust se već koristi
 ErrorInvoiceAvoirMustBeNegative=Greška, na popravljenem računu mora biti negativni iznos
 ErrorInvoiceOfThisTypeMustBePositive=Greška, ovaj tip fakture mora imati pozitivnu količinu
 ErrorCantCancelIfReplacementInvoiceNotValidated=Greška, ne možete poništiti fakturu koju je zamijenila druga faktura a koja je još u statusu nacrta
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Od
 BillTo=Račun za
 ActionsOnBill=Aktivnosti na fakturi
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=Ova faktura nije potpuno plaćena. Koji su razlozi da zatvorite ovu fakturu?
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac
 ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvodi djelimično vraćeni
 ConfirmClassifyPaidPartiallyReasonOther=Iznos otkazan zbog drugog razloga
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Ovaj izbor je moguć ako faktura sadrži odgovarajući komentar. (Primjer «Imate pravo na odbitak, samo ako je plaćen porez koji odgovara cijeni»)
+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=U nekim državama je ovaj izbor moguć samo ako faktura sadrži ispravne bilješke
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Koristiti ovaj izbor samo ako nije drugi nije zadovoljavajući
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Loš kupac</b> je kupac koji je odbija platiti svoj dug.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ovaj izbor se koristi kada uplata nije završena zbog povrata nekih proizvoda
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Koristite ovaj izbor ako bilo koji drugi ne odgovara, naprimjer u sljedećoj situaciji:<br>- plaćanje nije izvršeno jer su neki proizvodi vraćeni<br>- iznos je bio reklamiran, jer nije obračunat popust<br>U svim slučajevima, iznos koji je reklamiran mora biti ispravljen u računovodstvenom sistemu kreiranjem knjižne obavijesti.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Ostalo
 ConfirmClassifyAbandonReasonOtherDesc=Ovaj izbor se koristi u svim drugih slučajevima. Naprimjer, zbog toga sto planiranje kreirati zamjensku fakturu.
 ConfirmCustomerPayment=Da li odobravate unos ovo plaćanja za <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Da li odobravate unos ovo plaćanja za <b>%s</b> %s?
 ConfirmValidatePayment=Da li ste sigurni da želite odobriti ovo plaćanje? Poslije toga neće biti moguće izmjene ovog plaćanja.
 ValidateBill=Potvrdi fakturu
 UnvalidateBill=Otkaži potvrdu fakture
-NumberOfBills=Broj faktura
+NumberOfBills=No. of invoices
-NumberOfBillsByMonth=Broj faktura po mjesecu
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Iznos faktura
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Iznos faktura po mjesecu (bez PDV-a)
 ShowSocialContribution=Pokaži doprinose i poreze
 ShowBill=Prikaži fakturu
@@ -260,9 +262,9 @@ Repeatables=Šabloni
 ChangeIntoRepeatableInvoice=Pretvori u šablonsku fakturu
 CreateRepeatableInvoice=Napravi šablonsku fakturu
 CreateFromRepeatableInvoice=Napravi od šablonske fakture
-CustomersInvoicesAndInvoiceLines=Fakture kupaca i tekstovi faktura
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Faktura kupaca i uplate
-ExportDataset_invoice_1=Lista faktura kupaca i tekstovi faktura
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Faktura kupaca i uplate
 ProformaBill=Predračun:
 Reduction=Snižavanje
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Adresa fakture
-HelpEscompte=Ovaj popust je odobren za kupca jer je isplata izvršena prije roka.
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
-HelpAbandonBadCustomer=Ovaj iznos je otkazan (kupac je loš kupac) i smatra se kao potencijalni gubitak.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
-HelpAbandonOther=Ovaj iznos je otkazan jer je došlo do greške (naprimjer pogrešan kupac ili faktura zamijenjena sa nekom drugom)
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=ID uplate
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Nijedna faktura nije odabrana
 CloneInvoice=Kloniraj fakturu
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Akcija onemogućena jer faktura je zamijenjena
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
-NbOfPayments=Broj uplate
+NbOfPayments=No. of payments
 SplitDiscount=Razdvoji popust na dva
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
-TypeAmountOfEachNewDiscount=Unesi iznos za svaki od dva dijela:
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=Ukupno za dva nova popusta mora biti jednako iznosu originalnog popusta.
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Povezana faktura
 RelatedBills=Povezane fakture
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Povezane fakture dobavljača
 LatestRelatedBill=Posljednje povezane fakture
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Ček
 PaymentTypeShortCHQ=Ček
 PaymentTypeTIP=Akreditiv (Akreditivno pismo)
 PaymentTypeShortTIP=Plaćanje akreditivom
-PaymentTypeVAD=Elektronska uplata
+PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Elektronska uplata
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Povlačenje banke
 PaymentTypeShortTRA=Nacrt
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Podaci o banki
 BankCode=Kod banke
-DeskCode=Kod blagajne
+DeskCode=Office code
 BankAccountNumber=Kod računa
-BankAccountNumberKey=Ključ
+BankAccountNumberKey=Check digits
 Residence=Nalog za plaćanje
-IBANNumber=IBAN broj
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT broj
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Plaćanje transferom na žiro računu
 VATIsNotUsedForInvoice=* Nije primjenjiv PDV art-293B CGI
 LawApplicationPart1=Primjenom zakon 80.335 of 12/05/80
 LawApplicationPart2=roba ostaju vlasništvo od 
-LawApplicationPart3=prodavač do potpunog unovčavanja
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=njihove vrijednosti.
 LimitedLiabilityCompanyCapital=d.o.o. s kapitalom
 UseLine=Primijeniti
@@ -463,7 +465,7 @@ Cheques=Čekovi
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=Ova %s je konvertirana u %s
-UsBillingContactAsIncoiveRecipientIfExist=Za pošiljanje računa uporabi naslov kontakta za račune pri kupcu namesto naslova partnerja
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Prikaži sve neplaćene fakture
 ShowUnpaidLateOnly=Prikaži samo zakašnjele neplaćene fakture
 PaymentInvoiceRef=Faktura za plaćanje %s
@@ -474,21 +476,22 @@ Reported=Odgođeno
 DisabledBecausePayments=Nije moguće jer ima nekoliko uplata
 CantRemovePaymentWithOneInvoicePaid=Ne može se obrisati uplata jer ima bar jedna faktura klasifikovana kao plaćena
 ExpectedToPay=Očekivano plaćanje
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Plaćeno ovom uplatom
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
-AllCompletelyPayedInvoiceWillBeClosed=Sve fakture bez preostalog iznosa za uplatu će atuomatski biti zatvorene uz status "Plaćeno".
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Platiti
 ToMakePaymentBack=Povrat uplate
 ListOfYourUnpaidInvoices=Lista neplaćenih faktura
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Carinski pečat
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Predloga računa Crabe. Predloga kompletnega računa (Podpora PDV opcije, popusti, pogoji plačila, logo, itd...)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=PDF šablon Crevette za račune. Kompletan šablon za situiranje privremenih situacija
 TerreNumRefModelDesc1=Predlaga številko v formatu %syymm-nnnn za standardne račune in %syymm-nnnn za dobropise kjer je yy leto, mm mesec in nnnn zaporedna broj brez presledkov in večja od 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Red prethodno fakturisanog ne može biti veće ili jedn
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Obriši šablon fakture
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Faktura obrisana

htdocs/langs/bs_BA/cashdesk.lang

@@ -30,5 +30,15 @@ ShowCompany=Prikaži kompaniju
 ShowStock=Prikaži skladište
 DeleteArticle=Klikni da uklonis ovaj proizvod
 FilterRefOrLabelOrBC=Traži (Ref/Oznaku)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Prodajna mjesta
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product

htdocs/langs/bs_BA/commercial.lang

@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=Status mogućeg klijenta
 DraftPropals=Nacrti poslovnih prijedloga
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled

htdocs/langs/bs_BA/dict.lang

@@ -116,7 +116,7 @@ CountryHM=Čuo Island i McDonald
 CountryVA=Sveta Stolica (Vatikan State)
 CountryHN=Honduras
 CountryHK=Hongkong
-CountryIS=Island
+CountryIS=Iceland
 CountryIN=Indija
 CountryID=Indonezija
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Severna Koreja
 CountryKR=Južna Koreja
 CountryKW=Kuvajt
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Letonija
 CountryLB=Liban
@@ -160,7 +160,7 @@ CountryMD=Moldavija
 CountryMN=Mongolija
 CountryMS=Monserrat
 CountryMZ=Mozambik
-CountryMM=Birma (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibija
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad i Tobago
 CountryTR=Turska
 CountryTM=Turkmenistan
-CountryTC=Turci i Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukrajina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauricijke rupije
 CurrencySingMUR=Mauricijska rupija
 CurrencyNOK=Norveške krune
-CurrencySingNOK=Norveška kruna
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tuniski dinari
 CurrencySingTND=Tuniski dinar
 CurrencyUSD=Američki dolari
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Riječ usta
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Zaposlenik
 DemandReasonTypeSRC_SPONSORING=Pokroviteljstvo
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0

htdocs/langs/bs_BA/ecm.lang

@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Broj dokumenata u direktoriju
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Direktorij
 ECMSectionManual=Ručni direktorij
 ECMSectionAuto=Automatski direktorij
@@ -34,6 +34,8 @@ ECMDocsByProjects=Dokumenti vezani za projekte
 ECMDocsByUsers=Dokumenti povezani s korisnicima
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Nema kreiranih direktorija
 ShowECMSection=Prikaži direktorij
 DeleteSection=Ukloni direktorij
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)

htdocs/langs/bs_BA/errors.lang

@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined

htdocs/langs/bs_BA/help.lang

@@ -5,9 +5,9 @@ RemoteControlSupport=Online uživo / daljinska podrška
 OtherSupport=Druge podrške
 ToSeeListOfAvailableRessources=Za kontaktirati/vidjeti dosupne resurse:
 HelpCenter=Centar za pomoć
-DolibarrHelpCenter=Dolibarr pomoć u centri za podršku
+DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=U suprotnom, klikni <a href="%s">ovdje za korištenje Dolibarr</a>
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=Izvorna podrška
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Zajednica (besplatno)
 TypeSupportCommercial=Poslovno
 TypeOfHelp=Tip
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efikasnost
 TypeHelpOnly=Samo pomoć
 TypeHelpDev=Pomoć + razvoj
-TypeHelpDevForm=Pomoć + razvoj + formiranje
+TypeHelpDevForm=Help+Development+Training
-ToGetHelpGoOnSparkAngels1=Neke kompanije mogu omogućiti brzu (nekada i trenutnu) i efikasniju online podršku tako što preuzmu kontrolu nad vašim računarom. Takvu pomoć možete naći na <b>%s</b> web sajtu:
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-ToGetHelpGoOnSparkAngels3=Također možete otići na listu svih dostupnik trenera za Dolibarr, za ovo kliknite na dugme
+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):
-ToGetHelpGoOnSparkAngels2=Ponekad, nema dostupnih kompanija kada tražite, zato razmislite da promijenite filter da tražite "Sva dostupnost". Moći ćete poslati više zahtjeva.
-BackToHelpCenter=U suprotnom, kliknite ovdje <a href="%s">da idete nazad na centralnu početnu stranicu</a>.
-LinkToGoldMember=Možete pozvati jednog od unaprijed izabranih Dolibarr trenera za vas jezik (%s) klikom na Widget (statusi i maksimalne cijene su automatski ažurirani)
 PossibleLanguages=Podržani jezici
-SubscribeToFoundation=Pomozite dolibar projekti, pretplatite se fondaciji
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Za oficijelnu Dolibarr podršku za vaš jezik: <br><b><a href="%s" target="_blank">%s</a></b>

htdocs/langs/bs_BA/holiday.lang

@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Kadrovska služba
-Holidays=Odlasci
+Holidays=Leave
-CPTitreMenu=Odlasci
+CPTitreMenu=Leave
 MenuReportMonth=Mjesečni izvještaj
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Datum početka
 DateFinCP=Datum završetka
@@ -15,13 +15,18 @@ ApprovedCP=Odobren
 CancelCP=Otkazan
 RefuseCP=Odbijen
 ValidatorCP=Osoba koja odobrava
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Opis
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
+MenuConfCP=Balance of leave
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Datum završetka mora biti poslije datuma početka.
 ErrorSQLCreateCP=Desila se SQL greška prilikom kreiranja:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Workflow informacija
 RequestByCP=Zahtjev poslao
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Izmjena
 DeleteCP=Obrisati
 ActionRefuseCP=Odbij
@@ -59,6 +71,7 @@ DateRefusCP=Datum odbijanja
 DateCancelCP=Datum poništavanja
 DefineEventUserCP=Dodijeli izuzetno odsustvo za korisnika
 addEventToUserCP=Dodijeli odsustvo
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Razlog
 UserCP=Korisnik
 ErrorAddEventToUserCP=Došlo je do greške prilikom dodavanja izuzetnog odsustva.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Uspješno ažuriranje.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests

htdocs/langs/bs_BA/install.lang

@@ -2,37 +2,37 @@
 InstallEasy=Pratite instrukcije korak po korak.
 MiscellaneousChecks=Provjera preduvjeta
 ConfFileExists=Konfiguracijska datoteka<b>%s</b> postoji.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Konfiguracijska datoteka <b>%s</b> ne postoji i ne može biti napravljena !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Konfiguracijska datoteka <b>%s</b> se može napraviti.
-ConfFileIsNotWritable=Po konfiguracijskoj datoteci <b>%s</b> se ne može pisati. Provjerite dozvole. Za prvu instalaciju, vaš web server mora dopustiti pisanje u ovu datoteku tokom procesa konfiguracije ("chmod 666" naprimjer na OS poput Unixa).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Konfiguracijska datoteka <b>%s</b> je slobodna za pisanje.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Napuni sve informacije iz konfiguracijske datoteke.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Ovaj PHP podržava sesije.
 PHPSupportPOSTGETOk=Ovaj PHP podržava varijable POST i GET.
-PHPSupportPOSTGETKo=Moguće je da vaše PHP postavke ne podržavaju varijable POST i/ili GET. Provjerite vaš parametar <b>variables_order</b> u php.ini.
+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=Ovaj PHP podržava GD grafičke funkcije.
+PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
+PHPSupportCurl=This PHP supports Curl.
-PHPSupportUTF8=Ovaj PHP podržava UTF8 funkcije.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Vaša maksimalna memorija za PHP  sesiju je postavljena na <b>%s</b>. To bi trebalo biti dovoljno.
-PHPMemoryTooLow=Vaša maks. PHP memorija sesije postavljena je na <b>%s</b> bajta. To je isuviše malo. Promijenite vaš <b>php.ini</b> da parametar <b>memory_limit</b> ima najmanje <b>%s</b> bajta.
+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=Kliknite ovdje za više značajan test
+Recheck=Click here for a more detailed test
-ErrorPHPDoesNotSupportSessions=Vaša PHP instalacija ne podržava sesije. Ova osobina je neophodna da bi Dolibarr uopće radio. Provjerite vašu PHP instalaciju.
+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=Vaša PHP instalacija ne podržava grafičku funkciju GD. Neće biti dostupni grafikoni.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Direktorij %s ne postoji.
-ErrorGoBackAndCorrectParameters=Vratite se nazad i ispravite pogrešne parametre.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
+DatabasePrefix=Database table prefix
-AdminLogin=Login for Dolibarr database owner.
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
-PasswordAgain=Retype password a second time
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
+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=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
+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 user has no password (avoid this)
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
-SaveConfigurationFile=Save values
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Please type a login !
+PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Passwords differs, please try again !
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
+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 database name "<b>%s</b>" is correct.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
+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 modules
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Ništa za čišćenje/brisanje
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Premještanje događaja da bi se dodao kontakt događaja u tabelu dodjeljivanja
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
+ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide not available options
+HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
+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 try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
+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 try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.

htdocs/langs/bs_BA/main.lang

@@ -437,6 +437,7 @@ ContactsForCompany=Kontakti za ovaj subjekt
 ContactsAddressesForCompany=Kontakti/adrese za ovaj subjekt
 AddressesForCompany=Adrese za ovaj subjekt
 ActionsOnCompany=Događaji o ovom subjektu
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Događaji o ovom članu
 ActionsOnProduct=Događaji o ovom proizvodu
 NActionsLate=%s kasne
@@ -847,9 +848,9 @@ ModuleBuilder=Kreator modula
 SetMultiCurrencyCode=Postavi valutu
 BulkActions=Masovne akcije
 ClickToShowHelp=Klikni za prikaz pomoći
-WebSite=Veb sajt
+WebSite=Website
-WebSites=Veb sajtovi
+WebSites=Websites
-WebSiteAccounts=Računi veb sajta
+WebSiteAccounts=Website accounts
 ExpenseReport=Izvještaj troškova
 ExpenseReports=Izvještaj o troškovima
 HR=LJR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=Datoteka dijeljena preko linka
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventar

htdocs/langs/bs_BA/other.lang

@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titula
 WEBSITE_DESCRIPTION=Opis
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Linija za uvoz