diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
index d6c45d9f249..42a70c8c1a6 100755
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -1,20 +1,20 @@
 #!/usr/bin/php
 <?php
 /* Copyright (C) 2014 by FromDual GmbH, licensed under GPL v2
- * Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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/>.
+ * Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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/>.
  *
  * -----
  *
@@ -270,8 +270,8 @@ foreach($filesToProcess as $fileToProcess)
 
 	print "Output can be found at $output.\n";
 
-	print "To rename all .delta files, you can do\n";
-	print 'for fic in `ls *.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
+	print "To rename all .delta files, you can do\n";
+	print 'for fic in `ls *.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
 }
 
 
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 736f6ef0140..938e3e172b2 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -23,6 +23,7 @@
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 
 $graphwidth=DolGraph::getDefaultGraphSizeForStats('width',700);
@@ -69,7 +70,7 @@ dol_mkdir($dir);
 
 if ($mode)
 {
-    // Define sql	
+    // Define sql
     if ($mode == 'memberbycountry')
     {
         $label=$langs->trans("Country");
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 610bf371f29..b5aed0c683e 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 $langs->load('admin');
 $langs->load('compta');
+$langs->load('accountancy');
 
 if (!$user->admin)
 accessforbidden();
@@ -153,7 +154,7 @@ foreach ($list as $key)
 	print '<tr '.$bc[$var].' class="value">';
 
 	// Param
-	$libelle = $langs->trans($key); 
+	$libelle = $langs->trans($key);
 	print '<td><label for="'.$key.'">'.$libelle.'</label></td>';
 
 	// Value
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 2abb2b5acad..6905156990b 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -182,30 +182,15 @@ else if ($action == 'setmod')
 	dolibarr_set_const($db, "CONTRACT_ADDON",$value,'chaine',0,'',$conf->entity);
 }
 
-else if ($action == 'set_CONTRACT_FREE_TEXT')
+else if ($action == 'set_other')
 {
 	$freetext= GETPOST('CONTRACT_FREE_TEXT','alpha');
-	$res = dolibarr_set_const($db, "CONTRACT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
+	$res1 = dolibarr_set_const($db, "CONTRACT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
-	if (! $res > 0) $error++;
-
- 	if (! $error)
-    {
-        setEventMessage($langs->trans("SetupSaved"));
-    }
-    else
-    {
-        setEventMessage($langs->trans("Error"),'errors');
-    }
-}
-
-else if ($action == 'set_CONTRACT_DRAFT_WATERMARK')
-{
 	$draft= GETPOST('CONTRACT_DRAFT_WATERMARK','alpha');
+	$res2 = dolibarr_set_const($db, "CONTRACT_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
 
-	$res = dolibarr_set_const($db, "CONTRACT_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
-
-	if (! $res > 0) $error++;
+	if (! $res1 > 0 || ! $res2 > 0) $error++;
 
  	if (! $error)
     {
@@ -217,6 +202,7 @@ else if ($action == 'set_CONTRACT_DRAFT_WATERMARK')
     }
 }
 
+
 /*
  * View
  */
@@ -506,44 +492,43 @@ print "<br>";
  *
  */
 
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_other">';
+
 print_titre($langs->trans("OtherOptions"));
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
-print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 $var=true;
 
 $var=! $var;
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_CONTRACT_FREE_TEXT">';
 print '<tr '.$bc[$var].'><td colspan="2">';
 print $langs->trans("FreeLegalTextOnContracts").' ('.$langs->trans("AddCRIfTooLong").')<br>';
 print '<textarea name="CONTRACT_FREE_TEXT" class="flat" cols="120">'.$conf->global->CONTRACT_FREE_TEXT.'</textarea>';
-print '</td><td align="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
+print '</td></tr>'."\n";
 print '</form>';
 
 //Use draft Watermark
 $var=!$var;
-print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print "<input type=\"hidden\" name=\"action\" value=\"set_CONTRACT_DRAFT_WATERMARK\">";
 print '<tr '.$bc[$var].'><td colspan="2">';
 print $langs->trans("WatermarkOnDraftContractCards").'<br>';
 print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
-print '</td><td align="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
-print '</form>';
+print '</td></tr>'."\n";
 
 print '</table>';
 
-print '<br>';
+print '<div class="center">';
+print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+dol_fiche_end();
 
-$db->close();
 
 llxFooter();
+
+$db->close();
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 9ce93a6bc26..df9632761dd 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -525,6 +525,13 @@ else
     print '<td><a href="'.$url.'" target="_blank">'.$url.'</a></td>';
     print '</tr>';
 
+    $var=!$var;
+    print "<tr ".$bc[$var].">\n";
+    $url='http://partners.dolibarr.org';
+    print '<td align="left"><a href="'.$url.'" target="_blank"><img border="0" width="180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png"></a></td>';
+    print '<td>'.$langs->trans("DoliPartnersDesc").'</td>';
+    print '<td><a href="'.$url.'" target="_blank">'.$url.'</a></td>';
+    print '</tr>';
 
     print "</table>\n";
 }
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index c5e7ddfabf6..6592bf281e1 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
  *
@@ -153,7 +153,7 @@ print $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT,'PRELEVEME
 print '</td></tr>';
 
 // ICS
-print '<tr class="impair"><td>'.$langs->trans("ICS").'</td>';
+print '<tr class="pair"><td>'.$langs->trans("ICS").'</td>';
 print '<td align="left">';
 print '<input type="text" name="PRELEVEMENT_ICS" value="'.$conf->global->PRELEVEMENT_ICS.'" size="9" ></td>';
 print '</td></tr>';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 5ad26b0fa38..e6523d3d4ed 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -905,7 +905,7 @@ if ($id > 0)
 	    }
 
 		// Assigned to
-		print '<tr><td class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
+		print '<tr><td class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td colspan="3">';
 		$listofuserid=array();
 		if (empty($donotclearsession))
 		{
@@ -1077,7 +1077,7 @@ if ($id > 0)
     	}
 
 		// Assigned to
-    	print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
+    	print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td colspan="3">';
 		$listofuserid=array();
 		if (empty($donotclearsession))
 		{
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 56fb713ae0c..15394c81a3a 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1142,7 +1142,7 @@ class ActionComm extends CommonObject
      */
     function initAsSpecimen()
     {
-        global $user,$langs,$conf;
+        global $user,$langs,$conf,$user;
 
         $now=dol_now();
 
@@ -1166,6 +1166,9 @@ class ActionComm extends CommonObject
         $this->transparency=1;	// 1 means opaque
         $this->priority=1;
         $this->note = 'Note';
+
+        $this->userownerid=$user->id;
+        $this->userassigned[$user->id]=array('id'=>$user->id, 'transparency'=> 1);
     }
 
 }
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 66b36e0320f..0f62552dcae 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -435,14 +435,14 @@ if ($result)
 				if($num<$limit){
 					$var=!$var;
 					print '<tr class="liste_total"><td align="left">'.$langs->trans("TotalHT").'</td>';
-					print '<td colspan="6" align="right"">'.price($total).'<td colspan="3"</td>';
+					print '<td colspan="6" align="right">'.price($total).'</td><td colspan="3"></td>';
 					print '</tr>';
 				}
 				else
 				{
 					$var=!$var;
 					print '<tr class="liste_total"><td align="left">'.$langs->trans("TotalHTforthispage").'</td>';
-					print '<td colspan="6" align="right"">'.price($total).'<td colspan="3"</td>';
+					print '<td colspan="6" align="right">'.price($total).'</td><td colspan="3"></td>';
 					print '</tr>';
 				}
 
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index 70e2be1cfd4..9339ff202ec 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -249,7 +249,7 @@ if ($resql)
         $objp = $db->fetch_object($resql);
 
         $var=!$var;
-        print "<tr ".$bc[$var].">";
+        print "<tr ".$bc[$var].">\n";
 //         print '<form method="post" action="rappro.php?account='.$_GET["account"].'">';
 //         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
@@ -261,9 +261,9 @@ if ($resql)
         // Date value
 		if (! $objp->rappro && ($user->rights->banque->modifier || $user->rights->banque->consolidate))
 		{
-			print '<td align="center" class="nowrap">';
+			print '<td align="center" class="nowrap">'."\n";
 			print '<span id="datevalue_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->dv),"day")."</span>";
-			print ' &nbsp';
+			print '&nbsp;';
 			print '<span>';
 			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;account='.$acct->id.'&amp;rowid='.$objp->rowid.'">';
 			print img_edit_remove() . "</a> ";
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index b924b059bfd..cd8ba3b06a1 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2837,6 +2837,8 @@ class Facture extends CommonInvoice
 	 */
 	function demande_prelevement($user)
 	{
+		$error=0;
+		
 		dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
 
 		if ($this->statut > 0 && $this->paye == 0)
@@ -2882,21 +2884,32 @@ class Facture extends CommonInvoice
                     $sql .= ",'".$bac->cle_rib."')";
 
                     dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
-                    if ($this->db->query($sql))
+                    $resql=$this->db->query($sql);
+                    if (! $resql)
                     {
-                        return 1;
-                    }
-                    else
-                  {
                         $this->error=$this->db->lasterror();
                         dol_syslog(get_class($this).'::demandeprelevement Erreur');
-                        return -1;
+                        $error++;
                     }
+
+        			if (! $error)
+        			{
+        				// Force payment mode of invoice to withdraw
+        				$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement');
+        				if ($payment_mode_id > 0) 
+        				{
+        					$result=$this->setPaymentMethods($payment_mode_id);
+        				}
+        			}            
+                    
+                    if ($error) return -1;
+                    return 1;
                 }
                 else
                 {
                     $this->error="A request already exists";
                     dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours');
+                    return 0;
                 }
             }
             else
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 48ca10afd2d..1b4f440b461 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -58,6 +58,7 @@ if ($id > 0 || ! empty($ref))
 	}
 }
 
+
 /*
  * Actions
  */
@@ -69,14 +70,14 @@ if ($action == "new")
         $result = $object->demande_prelevement($user);
         if ($result > 0)
         {
-            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-            exit;
+            setEventMessage($langs->trans("RecordSaved"));
         }
         else
         {
         	setEventMessage($object->error, 'errors');
         }
     }
+    $action='';
 }
 
 if ($action == "delete")
@@ -307,6 +308,31 @@ if ($object->id > 0)
 	print '</td>';
 	print '</tr>';
 
+	// Conditions de reglement
+	print '<tr><td>';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('PaymentConditionsShort');
+	print '</td>';
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($object->type != Facture::TYPE_CREDIT_NOTE)
+	{
+		if ($action == 'editconditions')
+		{
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
+		}
+		else
+		{
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
+		}
+	}
+	else
+	{
+		print '&nbsp;';
+	}
+	print '</td></tr>';
+
 	// Date payment term
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -333,32 +359,7 @@ if ($object->id > 0)
 	}
 	print '</td></tr>';
 
-	// Conditions de reglement
-	print '<tr><td>';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
-	print $langs->trans('PaymentConditionsShort');
-	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="3">';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE)
-	{
-		if ($action == 'editconditions')
-		{
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
-		}
-		else
-		{
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
-		}
-	}
-	else
-	{
-		print '&nbsp;';
-	}
-	print '</td></tr>';
-
-	// Mode de reglement
+	// Payment mode
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
@@ -376,6 +377,26 @@ if ($object->id > 0)
 	}
 	print '</td></tr>';
 
+	// Bank Account
+	print '<tr><td class="nowrap">';
+	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+	print $langs->trans('BankAccount');
+	print '<td>';
+	if (($action != 'editbankaccount') && $user->rights->commande->creer && ! empty($object->brouillon))
+	    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($action == 'editbankaccount')
+	{
+	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+	}
+	else
+	{
+	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+	}
+	print "</td>";
+	print '</tr>';
+	
 	// Montants
 	print '<tr><td>'.$langs->trans('AmountHT').'</td>';
 	print '<td align="right" colspan="2" nowrap>'.price($object->total_ht).'</td>';
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 47ac4d1a390..5da94a28b76 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -56,7 +56,9 @@ class BonPrelevement extends CommonObject
     var $statut;    // 0-Wait, 1-Trans, 2-Done
     var $labelstatut=array();
 
+    var $invoice_in_error=array();
 
+    
     /**
      *	Constructor
      *
@@ -835,7 +837,7 @@ class BonPrelevement extends CommonObject
                             else
 							{
 								dol_syslog("Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_ERR);
-                                $facture_errors[$fac[0]]="Error on default bank number RIB/IBAN for thirdparty reported by function verif() ".$fact->socid." ".$soc->name;
+                                $this->invoice_in_error[$fac[0]]="Error on default bank number RIB/IBAN for invoice ".$fact->getNomUrl(0)." for thirdparty (reported by function verif) ".$soc->name;
                             }
                         }
                         else
@@ -1814,21 +1816,21 @@ class BonPrelevement extends CommonObject
 
         if ($mode == 1)
         {
-            if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut0').' '.$langs->trans($this->labelstatut[$statut]);
-            if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1').' '.$langs->trans($this->labelstatut[$statut]);
+            if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1').' '.$langs->trans($this->labelstatut[$statut]);
+            if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3').' '.$langs->trans($this->labelstatut[$statut]);
             if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6').' '.$langs->trans($this->labelstatut[$statut]);
         }
         if ($mode == 2)
         {
-            if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut0');
-            if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+            if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+            if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3');
             if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
         }
 
         if ($mode == 3)
         {
-            if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut0');
-            if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+            if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+            if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut3');
             if ($statut==2) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
         }
     }
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index 9c4bf96e8b3..581fb3152af 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -138,20 +138,20 @@ class LignePrelevement
 
 		if ($mode == 1)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
 			if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
 			if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut1');
 			if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
 			if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8');
 		}
 
 		if ($mode == 3)
 		{
-			if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut1');
 			if ($statut==2) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
 			if ($statut==3) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut8');
 		}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 0326e4922f1..e4cb4b65c30 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -70,6 +70,10 @@ if ($action == 'create')
     if ($result == 0)
     {
         $mesg='<div class="error">'.$langs->trans("NoInvoiceCouldBeWithdrawed").'</div>';
+        foreach($bprev->invoice_in_error as $key => $val)
+        {
+        	$mesg.=$val."<br>\n";
+        }
     }
 }
 
@@ -179,6 +183,7 @@ if ($resql)
     print '<tr class="liste_titre">';
     print '<td>'.$langs->trans("Invoice").'</td>';
     print '<td>'.$langs->trans("ThirdParty").'</td>';
+    print '<td>'.$langs->trans("RIB").'</td>';
     print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
     print '<td align="right">'.$langs->trans("DateRequest").'</td>';
     print '</tr>';
@@ -190,16 +195,22 @@ if ($resql)
         {
             $obj = $db->fetch_object($resql);
             $var=!$var;
-            print '<tr '.$bc[$var].'><td>';
+            print '<tr '.$bc[$var].'>';
+            print '<td>';
             $invoicestatic->id=$obj->rowid;
             $invoicestatic->ref=$obj->facnumber;
             print $invoicestatic->getNomUrl(1,'withdraw');
             print '</td>';
+            // Thirdparty
             print '<td>';
-            $thirdpartystatic->id=$obj->socid;
-            $thirdpartystatic->name=$obj->name;
-            print $thirdpartystatic->getNomUrl(1,'customer');
+            $thirdpartystatic->fetch($obj->socid);
+            print $thirdpartystatic->getNomUrl(1,'card');
             print '</td>';
+            // RIB
+            print '<td>';
+            print $thirdpartystatic->display_rib();
+            print '</td>';
+            // Amount
             print '<td align="right">';
             print price($obj->total_ttc,0,$langs,0,0,-1,$conf->currency);
             print '</td>';
@@ -211,7 +222,7 @@ if ($resql)
             $i++;
         }
     }
-    else print '<tr><td colspan="4">'.$langs->trans("None").'</td></tr>';
+    else print '<tr '.$bc[0].'><td colspan="5">'.$langs->trans("None").'</td></tr>';
     print "</table>";
     print "<br>\n";
 }
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 37b6c708b96..0e9174ef034 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -106,7 +106,6 @@ if ($prev_id)
 
 	/*
 	 * Stats
-	 *
 	 */
 	$ligne=new LignePrelevement($db,$user);
 
@@ -121,6 +120,8 @@ if ($prev_id)
 		$num = $db->num_rows($resql);
 		$i = 0;
 
+		print_fiche_titre($langs->trans("StatisticsByLineStatus"),'','');
+		
 		print"\n<!-- debut table -->\n";
 		print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
 		print '<tr class="liste_titre">';
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 2af8a25b003..7907a55fda0 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -134,7 +134,7 @@ if ($id)
 		print '<table class="border" width="100%">';
 
 		print '<tr><td width="20%">'.$langs->trans("WithdrawalsReceipts").'</td><td>';
-		print '<a href="card.php?id='.$lipre->bon_rowid.'">'.$lipre->bon_ref.'</a></td></tr>';
+		print $bon->getNomUrl(1).'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Status").'</td><td>'.$lipre->LibStatut($lipre->statut,1).'</td></tr>';
diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
index 1e96e9276d8..c4724824f36 100644
--- a/htdocs/compta/prelevement/lignes.php
+++ b/htdocs/compta/prelevement/lignes.php
@@ -124,8 +124,6 @@ $pagenext = $page + 1;
 
 /*
  * Liste des lignes de prelevement
- *
- *
  */
 $sql = "SELECT pl.rowid, pl.statut, pl.amount";
 $sql.= ", s.rowid as socid, s.nom as name";
@@ -175,7 +173,11 @@ if ($result)
 		print substr('000000'.$obj->rowid, -6);
 		print '</a></td>';
 
-		print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name."</a></td>\n";
+		$thirdparty=new Societe($db);
+		$thirdparty->fetch($obj->socid);
+		print '<td>';
+		print $thirdparty->getNomUrl(1);
+		print "</td>\n";
 
 		print '<td align="center">'.price($obj->amount)."</td>\n";
 
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 2c8607a9a56..c3667f8b69f 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -21,7 +21,7 @@
 /**
  *		\file       htdocs/compta/prelevement/stats.php
  *      \ingroup    prelevement
- *      \brief      Page de stats des prelevements
+ *      \brief      Page with statistics on withdrawals
  */
 
 require('../../main.inc.php');
@@ -96,7 +96,7 @@ if ($resql)
 	print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td align="right">%</td>';
 	print '<td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
 
-	$var=True;
+	$var=false;
 
 	while ($i < $num)
 	{
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index cea29c96793..e4a8c644615 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
@@ -273,7 +273,7 @@ if ($action == 'add' && $user->rights->contrat->creer)
 	                {
 	                    $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
 
-						if ($product_type == 1) { //only services	// TODO Exclude also deee
+						if ($product_type == 1 || (! empty($conf->global->CONTRACT_SUPPORT_PRODUCTS) && in_array($product_type, array(0,1)))) { 	// TODO Exclude also deee
 							// service prédéfini
 							if ($lines[$i]->fk_product > 0)
 							{
@@ -538,7 +538,7 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
 				}
 
 				$ret = $object->fetch($id); // Reload to get new records
-				
+
 				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 
@@ -847,7 +847,7 @@ $formfile = new FormFile($db);
 $objectlignestatic=new ContratLigne($db);
 
 // Load object modContract
-$module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_olive');
+$module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_serpis');
 if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php')
 {
 	$module = substr($module, 0, dol_strlen($module)-4);
@@ -1020,13 +1020,18 @@ if ($action == 'create')
 
     print "</table>\n";
 
+    print '<br><center><input type="submit" class="button" value="'.$langs->trans("Create").'"></center>';
+
     if (is_object($objectsrc))
     {
         print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
         print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
-	}
 
-    print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></div>';
+        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))
+        {
+        	print '<br>'.$langs->trans("Note").': '.$langs->trans("OnlyLinesWithTypeServiceAreUsed");
+        }
+	}
 
     print "</form>\n";
 
@@ -1043,6 +1048,8 @@ else
 
     if ($object->id > 0)
     {
+    	$object->fetch_thirdparty();
+
         $result=$object->fetch_lines();	// This also init $this->nbofserviceswait, $this->nbofservicesopened, $this->nbofservicesexpired=, $this->nbofservicesclosed
         if ($result < 0) dol_print_error($db,$object->error);
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 08bc3b4c85e..f775d02ab5a 100755
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -837,7 +837,7 @@ class Form
 	        			});
 	        		    </script>';
 					}
-										
+
 					if (count($events))		// Add management of event
 					{
 						$out.='<script type="text/javascript">
@@ -1355,7 +1355,7 @@ class Form
                 $out.= '<option value="">'.$langs->trans("None").'</option>';
             }
             $out.= '</select>';
-            
+
            	$out.= '<script type="text/javascript">
 						$(document).ready(function() {
 
@@ -1701,6 +1701,8 @@ class Form
 		$outqty=1;
 		$outdiscount=0;
 
+		$maxlengtharticle=(empty($conf->global->PRODUCT_MAX_LENGTH_COMBO)?48:$conf->global->PRODUCT_MAX_LENGTH_COMBO);
+
         $label=$objp->label;
         if (! empty($objp->label_translated)) $label=$objp->label_translated;
         if (! empty($filterkey) && $filterkey != '') $label=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$label,1);
@@ -1720,11 +1722,11 @@ class Form
 			else if ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"';
         }
         $opt.= '>';
-        $opt.= $objp->ref.' - '.dol_trunc($label,32).' - ';
+        $opt.= $objp->ref.' - '.dol_trunc($label,$maxlengtharticle).' - ';
 
         $objRef = $objp->ref;
         if (! empty($filterkey) && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$objRef,1);
-        $outval.=$objRef.' - '.dol_trunc($label,32).' - ';
+        $outval.=$objRef.' - '.dol_trunc($label,$maxlengtharticle).' - ';
 
         $found=0;
 
@@ -1770,7 +1772,7 @@ class Form
         }
 
 		// Price by quantity
-		if (!empty($objp->quantity) && $objp->quantity >= 1 && $conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)
+		if (!empty($objp->quantity) && $objp->quantity >= 1 && ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
 		{
 			$found = 1;
 			$outqty=$objp->quantity;
@@ -1896,7 +1898,7 @@ class Form
             // mode=2 means suppliers products
             $urloption=($socid > 0?'socid='.$socid.'&':'').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished;
             print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
-            print ($hidelabel?'':$langs->trans("RefOrLabel").' : ').'<input type="text" size="16" name="search_'.$htmlname.'" id="search_'.$htmlname.'">';
+            print ($hidelabel?'':$langs->trans("RefOrLabel").' : ').'<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'">';
         }
         else
         {
@@ -2004,8 +2006,8 @@ class Form
                 $outval.=$objRef;
                 if (! empty($objp->idprodfournprice)) $outval.=' ('.$objRefFourn.')';
                 $outval.=' - ';
-                $opt.=dol_trunc($objp->label,18).' - ';
-                $outval.=dol_trunc($label,18).' - ';
+                $opt.=dol_trunc($label, 72).' - ';
+                $outval.=dol_trunc($label, 72).' - ';
 
                 if (! empty($objp->idprodfournprice))
                 {
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 47325a9a345..3a0f19929f6 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -856,7 +856,7 @@ class FormFile
 			}
 			if ($nboffiles == 0)
 			{
-				print '<tr '.$bc[$var].'><td colspan="'.(empty($useinecm)?'5':'4').'">';
+				print '<tr '.$bc[false].'><td colspan="'.(empty($useinecm)?'5':'4').'">';
 				if (empty($textifempty)) print $langs->trans("NoFileFound");
 				else print $textifempty;
 				print '</td></tr>';
@@ -1044,7 +1044,7 @@ class FormFile
 
         if (count($filearray) == 0)
         {
-            print '<tr '.$bc[$var].'><td colspan="4">';
+            print '<tr '.$bc[false].'><td colspan="4">';
             if (empty($textifempty)) print $langs->trans("NoFileFound");
             else print $textifempty;
             print '</td></tr>';
@@ -1211,7 +1211,7 @@ class FormFile
         }
         if ($nboflinks == 0)
         {
-            print '<tr ' . $bc[$var] . '><td colspan="5">';
+            print '<tr ' . $bc[false] . '><td colspan="5">';
             print $langs->trans("NoLinkFound");
             print '</td></tr>';
         }
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 1ed76cddd9b..c7f953dbbfc 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -560,13 +560,13 @@ class FormOther
      *
      *		@param	string		$set_color		Pre-selected color
      *		@param	string		$prefix			Name of HTML field
-     *		@param	string		$form_name		Name of form
+     *		@param	string		$form_name		Deprecated. Not used.
      * 		@param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
      * 		@param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
      * 		@return	void
      * 		@deprecated
      */
-    function select_color($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='')
+    function select_color($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='')
     {
     	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
     }
@@ -576,13 +576,13 @@ class FormOther
      *
      *		@param	string		$set_color		Pre-selected color
      *		@param	string		$prefix			Name of HTML field
-     *		@param	string		$form_name		Name of form
+     *		@param	string		$form_name		Deprecated. Not used.
      * 		@param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
      * 		@param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
      * 		@param	string		$morecss		Add css style into input field
      * 		@return	void
      */
-    function selectColor($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='', $morecss='')
+    function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')
     {
         global $langs,$conf;
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5c0040a74b9..4c3ee24522a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1782,14 +1782,16 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
  *	@param	string	$trunc				Where to trunc: right, left, middle (size must be a 2 power), wrap
  * 	@param	string	$stringencoding		Tell what is source string encoding
  *  @param	int		$nodot				Truncation do not add ... after truncation. So it's an exact truncation.
+ *  @param  int     $display            Trunc is use to display and can be changed for small screen
  *	@return string						Truncated string
  */
-function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodot=0)
+function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodot=0, $display=0)
 {
 	global $conf;
 
 	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
-
+	// reduce for small screen
+    if ($conf->dol_optimize_smallscreen==1 && $display==1) $size = round($size/3);
 	// We go always here
 	if ($trunc == 'right')
 	{
@@ -4843,19 +4845,6 @@ function dolExplodeIntoArray($string, $delimiter = ';', $kv = '=')
 }
 
 
-/**
- *	Convert an array with RGB value into hex RGB value
- *
- *  @param	array	$arraycolor			Array
- *  @param	string	$colorifnotfound	Color code to return if entry not defined
- *  @return	string						RGB hex value (without # before). For example: FF00FF
- */
-function colorArrayToHex($arraycolor,$colorifnotfound='888888')
-{
-	if (! is_array($arraycolor)) return $colorifnotfound;
-	return dechex($arraycolor[0]).dechex($arraycolor[1]).dechex($arraycolor[2]);
-}
-
 /**
  * Set focus onto field with selector
  *
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 4702fe69e99..246af863d12 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1836,3 +1836,42 @@ function fetchObjectByElement($element_id,$element_type) {
 	}
 	return 0;
 }
+
+
+/**
+ *	Convert an array with RGB value into hex RGB value
+ *
+ *  @param	array	$arraycolor			Array
+ *  @param	string	$colorifnotfound	Color code to return if entry not defined
+ *  @return	string						RGB hex value (without # before). For example: FF00FF
+ *  @see	Make the opposite of colorStringToArray
+ */
+function colorArrayToHex($arraycolor,$colorifnotfound='888888')
+{
+	if (! is_array($arraycolor)) return $colorifnotfound;
+	return dechex($arraycolor[0]).dechex($arraycolor[1]).dechex($arraycolor[2]);
+}
+
+
+/**
+ *	Convert a string RGB value ('FFFFFF', '255,255,255') into an array RGB array(255,255,255)
+ *
+ *  @param	string	$stringcolor		String with hex (FFFFFF) or comma RGB ('255,255,255')
+ *  @param	string	$colorifnotfound	Color code to return if entry not defined
+ *  @return	string						RGB hex value (without # before). For example: FF00FF
+ *  @see	Make the opposite of colorArrayToHex
+ */
+function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
+{
+	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
+	$tmp=preg_match('/^([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
+	if (! $tmp)
+	{
+		$tmp=explode(',',$stringcolor);
+		if (count($tmp) < 3) return $colorifnotfound;
+		return $tmp;
+	}
+	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
+}
+
+
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 5fc8e16381a..b8409862d3c 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -492,7 +492,7 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
  *  @param  int			$curx            		X
  *  @param  int			$cury            		Y
  *  @param  Account		$account         		Bank account object
- *  @param  int			$onlynumber      		Output only number
+ *  @param  int			$onlynumber      		Output only number (bank+desk+key+number according to country, but without name of bank and domiciliation)
  *  @param	int			$default_font_size		Default font size
  *  @return	float                               The Y PDF position
  */
@@ -513,10 +513,14 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 
 	$outputlangs->load("banks");
 
+	// Use correct name of bank id according to country
+	$bickey="BICNumber";
+	if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
+
 	// Get format of bank account according to its country
 	$usedetailedbban=$account->useDetailedBBAN();
 
-	//$onlynumber=0; $usedetailedbban=0; // For tests
+	$onlynumber=0; $usedetailedbban=1; // For tests
 	if ($usedetailedbban)
 	{
 		$savcurx=$curx;
@@ -529,27 +533,6 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 			$cury+=3;
 		}
 
-		// Use correct name of bank id according to country
-		$ibankey="IBANNumber";
-		if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
-		if (! empty($account->iban))
-		{
-			$ibanDisplay_temp = $outputlangs->convToOutputCharset($account->iban);
-			$ibanDisplay = "";
-
-			for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++){
-				$ibanDisplay .= $ibanDisplay_temp[$i];
-				if($i%4 == 3 && $i > 0){
-					$ibanDisplay .= " ";
-				}
-			}
-
-			$pdf->SetFont('','B',$default_font_size - 3);
-			$pdf->SetXY($curx, $cury);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0);
-			$cury+=3;
-		}
-
 		if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+8);
 
 		if ($usedetailedbban == 1)
@@ -612,7 +595,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 		}
 
 		$curx=$savcurx;
-		$cury+=10;
+		$cury+=9;
 	}
 	else
 	{
@@ -629,10 +612,6 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 		if ($diffsizecontent <= 2) $cury+=1;
 	}
 
-	// Use correct name of bank id according to country
-	$bickey="BICNumber";
-	if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
-
 	$pdf->SetFont('','',$default_font_size - $diffsizecontent);
 
 	if (empty($onlynumber) && ! empty($account->domiciliation))
@@ -647,8 +626,29 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 	}
 	else if (! $usedetailedbban) $cury+=1;
 
+	// Use correct name of bank id according to country
+	$ibankey="IBANNumber";
+	if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
+	if (! empty($account->iban))
+	{
+		$ibanDisplay_temp = $outputlangs->convToOutputCharset($account->iban);
+		$ibanDisplay = "";
+
+		for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++)
+		{
+			$ibanDisplay .= $ibanDisplay_temp[$i];
+			if($i%4 == 3 && $i > 0)	$ibanDisplay .= " ";
+		}
+
+		$pdf->SetFont('','B',$default_font_size - 3);
+		$pdf->SetXY($curx, $cury);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0);
+		$cury+=3;
+	}
+
 	if (! empty($account->bic))
 	{
+		$pdf->SetFont('','B',$default_font_size - 3);
 		$pdf->SetXY($curx, $cury);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
 	}
diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index 6eb358aa99d..4dd7d0a81ae 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -49,7 +49,7 @@ class modProductBatch extends DolibarrModules
 		$this->name = preg_replace('/^mod/i','',get_class($this));
 		$this->description = "Batch number, eat-by and sell-by date management module";
 
-		$this->rights_class = 'stock';
+		$this->rights_class = 'productbatch';
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'experimental';
 		// Key used in llx_const table to save module status enabled/disabled (where dluo is value of property name of module in uppercase)
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index b0825a8cc45..6792e9356b1 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -73,7 +73,7 @@ $date_endy = dol_mktime(23, 59, 59, $_REQUEST["date_end_delymonth"], $_REQUEST["
 if ($action == 'create') {
 	if (is_array($selected) == false) {
 		$mesgs = array (
-				'<div class="error">' . $langs->trans('Error_OrderNotChecked') . '</div>' 
+				'<div class="error">' . $langs->trans('Error_OrderNotChecked') . '</div>'
 		);
 	} else {
 		$origin = GETPOST('origin');
@@ -91,11 +91,11 @@ $hookmanager->initHooks(array('orderstoinvoicesupplier'));
  */
 
 if (($action == 'create' || $action == 'add') && empty($mesgs)) {
-	
+
 	require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php';
 	if (! empty($conf->projet->enabled))
 		require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-	
+
 	$langs->load('bills');
 	$langs->load('products');
 	$langs->load('main');
@@ -103,7 +103,7 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 		$orders_id = $_GET['orders_to_invoice'];
 		$n = count($orders_id);
 		$i = 0;
-		
+
 		$originid = $orders_id[0];
 		$_GET['originid'] = $orders_id[0];
 	}
@@ -111,30 +111,30 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 		$orders_id = $_POST['orders_to_invoice'];
 		$nn = count($orders_id);
 		$ii = 0;
-		
+
 		$originid = $orders_id[0];
 		$_POST['originid'] = $orders_id[0];
 	}
-	
+
 	$projectid = GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0;
 	$lineid = GETPOST('lineid', 'int');
 	$userid = GETPOST('userid', 'int');
 	$search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref') : GETPOST('search_ref');
-	
+
 	// Security check
 	if ($user->societe_id)
 		$socid = $user->societe_id;
 	$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
-	
+
 	$usehm = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
 	$object = new FactureFournisseur($db);
-	
+
 	// Insert new invoice in database
 	if ($action == 'add' && $user->rights->fournisseur->facture->creer) {
 		$object->socid = GETPOST('socid');
 		$db->begin();
 		$error = 0;
-		
+
 		// Standard or deposit or proforma invoice
 		$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
 		if (empty($datefacture)) {
@@ -154,17 +154,17 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 			$projectid = GETPOST('projectid');
 			if ($projectid > 0)
 				$object->fk_project = $projectid;
-				
+
 				// Auto calculation of date due if not filled by user
 			if (empty($object->date_echeance))
 				$object->date_echeance = $object->calculate_date_lim_reglement();
-			
+
 			if ($_POST['origin'] && $_POST['originid']) {
 				$object->origin = $_POST['origin'];
 				$object->origin_id = $orders_id[$ii];
 				$object->linked_objects = $orders_id;
 				$id = $object->create($user);
-				
+
 				if ($id > 0) {
 					foreach ( $orders_id as $origin => $origin_id ) {
 						$origin_id = (! empty($origin_id) ? $origin_id : $object->origin_id);
@@ -180,14 +180,14 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 						$sql .= ", " . $id;
 						$sql .= ", '" . $object->element . "'";
 						$sql .= ")";
-						
+
 						if ($db->query($sql)) {
 							$db->commit();
 						} else {
 							$db->rollback();
 						}
 					}
-					
+
 					while ( $ii < $nn ) {
 						$objectsrc = new CommandeFournisseur($db);
 						dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
@@ -202,10 +202,10 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 							$num = count($lines);
 							for($i = 0; $i < $num; $i ++) {
 								$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
-								
+
 								$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
 								$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
-								
+
 								// Dates
 								// TODO mutualiser
 								$date_start = $lines[$i]->date_debut_prevue;
@@ -218,14 +218,14 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 									$date_end = $lines[$i]->date_fin_reel;
 								if ($lines[$i]->date_end)
 									$date_end = $lines[$i]->date_end;
-									
+
 									// Reset fk_parent_line for no child products and special product
 								if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
 									$fk_parent_line = 0;
 								}
 								// FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example.
 								$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->qty, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, 'HT', $product_type);
-								
+
 								if ($result > 0) {
 									$lineid = $result;
 								} else {
@@ -250,11 +250,11 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 				}
 			}
 		}
-		
+
 		// End of object creation, we show it
 		if ($id > 0 && ! $error) {
 			$db->commit();
-			header('Location: ' . DOL_URL_ROOT . '/fourn/facture/fiche.php?facid=' . $id);
+			header('Location: ' . DOL_URL_ROOT . '/fourn/facture/card.php?facid=' . $id);
 			exit();
 		} else {
 			$db->rollback();
@@ -277,10 +277,10 @@ $companystatic = new Societe($db);
 
 // Mode creation
 if ($action == 'create' && empty($mesgs)) {
-	
+
 	llxHeader();
 	print_fiche_titre($langs->trans('NewBill'));
-	
+
 	$soc = new Societe($db);
 	if ($socid)
 		$res = $soc->fetch($socid);
@@ -289,7 +289,7 @@ if ($action == 'create' && empty($mesgs)) {
 		$mode_reglement_id = $soc->mode_reglement_id;
 	}
 	$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ? - 1 : '';
-	
+
 	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
 	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 	print '<input type="hidden" name="action" value="add">';
@@ -300,21 +300,21 @@ if ($action == 'create' && empty($mesgs)) {
 	print '<input type="hidden" name="origin" value="' . GETPOST('origin') . '">';
 	print '<input type="hidden" name="originid" value="' . GETPOST('originid') . '">';
 	print '<table class="border" width="100%">';
-	
+
 	// Ref
 	print '<tr><td class="fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans('Draft') . '</td></tr>';
-	
+
 	// Ref supplier
 	print '<tr><td class="fieldrequired">' . $langs->trans('RefSupplier') . '</td><td><input name="ref_supplier" value="' . (isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : '') . '" type="text"></td>';
 	print '</tr>';
-	
+
 	// Third party
 	print '<tr><td class="fieldrequired">' . $langs->trans('Customer') . '</td><td colspan="2">';
 	print $soc->getNomUrl(1);
 	print '<input type="hidden" name="socid" value="' . $soc->id . '">';
 	print '</td>';
 	print '</tr>' . "\n";
-	
+
 	// Date invoice
 	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
 	$html->select_date('', '', '', '', '', "add", 1, 1);
@@ -330,13 +330,13 @@ if ($action == 'create' && empty($mesgs)) {
 	// Project
 	if (! empty($conf->projet->enabled)) {
 		$formproject = new FormProjets($db);
-		
+
 		$langs->load('projects');
 		print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
 		$formproject->select_projects($soc->id, $projectid, 'projectid');
 		print '</td></tr>';
 	}
-	
+
 	$objectsrc = new CommandeFournisseur($db);
 	$listoforders = array ();
 	foreach ( $selected as $sel ) {
@@ -345,30 +345,30 @@ if ($action == 'create' && empty($mesgs)) {
 			$listoforders[] = $objectsrc->ref;
 		}
 	}
-	
+
 	// Other attributes
 	$parameters = array (
 			'objectsrc' => $objectsrc,
 			'idsrc' => $listoforders,
-			'colspan' => ' colspan="3"' 
+			'colspan' => ' colspan="3"'
 	);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	                                                                                           
+
 	// Modele PDF
 	print '<tr><td>' . $langs->trans('Model') . '</td>';
 	print '<td>';
 	$liste = ModelePDFSuppliersInvoices::liste_modeles($db);
 	print $html->selectarray('model', $liste, $conf->global->INVOICE_SUPPLIER_ADDON_PDF);
 	print "</td></tr>";
-	
+
 	// Public note
 	print '<tr>';
 	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
 	print '<td valign="top" colspan="2">';
 	print '<textarea name="note_public" wrap="soft" cols="70" rows="' . ROWS_3 . '">';
-	
+
 	print $langs->trans("Orders") . ": " . implode(', ', $listoforders);
-	
+
 	print '</textarea></td></tr>';
 	// Private note
 	if (empty($user->societe_id)) {
@@ -376,22 +376,22 @@ if ($action == 'create' && empty($mesgs)) {
 		print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
 		print '<td valign="top" colspan="2">';
 		print '<textarea name="note" wrap="soft" cols="70" rows="' . ROWS_3 . '">';
-		
+
 		print '</textarea></td></tr>';
 	}
-	
+
 	print '</table>';
-	
+
 	while ( $i < $n ) {
 		print '<input type="hidden" name="orders_to_invoice[]" value="' . $orders_id[$i] . '">';
-		
+
 		$i ++;
 	}
-	
+
 	// Button "Create Draft"
 	print '<br><div class="center"><input type="submit" class="button" name="bouton" value="' . $langs->trans('CreateDraft') . '" /></div>';
 	print "</form>\n";
-	
+
 	print '</td></tr>';
 	print "</table>\n";
 }
@@ -411,7 +411,7 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 	});
 	</script>
 <?php
-	
+
 	$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,';
 	$sql .= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut';
 	$sql .= ' FROM ' . MAIN_DB_PREFIX . 'societe as s';
@@ -420,13 +420,13 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 		$sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
 	$sql .= ' WHERE c.entity = ' . $conf->entity;
 	$sql .= ' AND c.fk_soc = s.rowid';
-	
+
 	// Show orders with status validated, shipping started and delivered (well any order we can bill)
 	$sql .= " AND c.fk_statut IN (5)";
-	
+
 	// Find order that are not already invoiced
 	$sql .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')";
-	
+
 	if ($socid)
 		$sql .= ' AND s.rowid = ' . $socid;
 	if (! $user->rights->societe->client->voir && ! $socid)
@@ -437,20 +437,20 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 	if ($sall) {
 		$sql .= " AND (c.ref LIKE '%" . $db->escape($sall) . "%' OR c.note LIKE '%" . $db->escape($sall) . "%')";
 	}
-	
+
 	// Date filter
 	if ($date_start && $date_end)
 		$sql .= " AND c.date_commande >= '" . $db->idate($date_start) . "' AND c.date_commande <= '" . $db->idate($date_end) . "'";
 	if ($date_starty && $date_endy)
 		$sql .= " AND c.date_livraison >= '" . $db->idate($date_starty) . "' AND c.date_livraison <= '" . $db->idate($date_endy) . "'";
-	
+
 	if (! empty($sref_client)) {
 		$sql .= ' AND c.ref_supplier LIKE \'%' . $db->escape($sref_client) . '%\'';
 	}
 	$sql .= ' ORDER BY ' . $sortfield . ' ' . $sortorder;
 	dol_syslog('fourn/commande/ordertoinvoice.php sql=' . $sql);
 	$resql = $db->query($sql);
-	
+
 	if ($resql) {
 		if ($socid) {
 			$soc = new Societe($db);
@@ -463,14 +463,14 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 		$i = 0;
 		$period = $html->select_date($date_start, 'date_start', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_end, 'date_end', 0, 0, 1, '', 1, 0, 1);
 		$periodely = $html->select_date($date_starty, 'date_start_dely', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_endy, 'date_end_dely', 0, 0, 1, '', 1, 0, 1);
-		
+
 		if (! empty($socid)) {
 			// Company
 			$companystatic->id = $socid;
 			$companystatic->nom = $soc->nom;
 			print '<h3>' . $companystatic->getNomUrl(1, 'customer') . '</h3>';
 		}
-		
+
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print_liste_field_titre($langs->trans('Ref'), 'orderstoinvoice.php', 'c.ref', '', '&amp;socid=' . $socid, '', $sortfield, $sortorder);
@@ -480,7 +480,7 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 		print_liste_field_titre($langs->trans('Status'), '', '', '', '', 'align="right"');
 		print_liste_field_titre($langs->trans('GenerateBill'), '', '', '', '', 'align="center"');
 		print '</tr>';
-		
+
 		// Lignes des champs de filtre
 		print '<form method="get" action="orderstoinvoice.php">';
 		print '<input type="hidden" name="socid" value="' . $socid . '">';
@@ -492,48 +492,48 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 		// print '<td class="liste_titre">';
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="10" name="sref_client" value="' . $sref_client . '">';
-		
+
 		// DATE ORDER
 		print '<td class="liste_titre" align="center">';
 		print $period;
 		print '</td>';
-		
+
 		// DATE DELIVERY
 		print '<td class="liste_titre" align="center">';
 		print $periodely;
 		print '</td>';
-		
+
 		// SEARCH BUTTON
 		print '</td><td align="right" class="liste_titre">';
 		print '<input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '"  value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
-		
+
 		// ALL/NONE
 		print '<td class="liste_titre" align="center">';
 		if ($conf->use_javascript_ajax)
 			print '<a href="#" id="checkall">' . $langs->trans("All") . '</a> / <a href="#" id="checknone">' . $langs->trans("None") . '</a>';
 		print '</td>';
-		
+
 		print '</td></tr>';
 		print '</form>';
-		
+
 		print '<form name="orders2invoice" action="orderstoinvoice.php" method="GET">';
 		$var = True;
 		$generic_commande = new CommandeFournisseur($db);
-		
+
 		while ( $i < $num ) {
 			$objp = $db->fetch_object($resql);
 			$var = ! $var;
 			print '<tr ' . $bc[$var] . '>';
 			print '<td class="nowrap">';
-			
+
 			$generic_commande->id = $objp->rowid;
 			$generic_commande->ref = $objp->ref;
-			
+
 			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 			print '<td class="nobordernopadding nowrap">';
 			print $generic_commande->getNomUrl(1, $objp->fk_statut);
 			print '</td>';
-			
+
 			print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
 			$filename = dol_sanitizeFileName($objp->ref);
 			$filedir = $conf->fournisseur->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref);
@@ -541,35 +541,35 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
 			print '</td></tr></table>';
 			print '</td>';
-			
+
 			print '<td>' . $objp->ref_supplier . '</td>';
-			
+
 			// Order date
 			print '<td align="center" nowrap>';
 			print dol_print_date($db->jdate($objp->date_commande), 'day');
 			print '</td>';
-			
+
 			// Delivery date
 			print '<td align="center" nowrap>';
 			print dol_print_date($db->jdate($objp->date_livraison), 'day');
 			print '</td>';
-			
+
 			// Statut
 			print '<td align="right" class="nowrap">' . $generic_commande->LibStatut($objp->fk_statut, 5) . '</td>';
-			
+
 			// Checkbox
 			print '<td class="center">';
 			print '<input class="flat checkformerge" type="checkbox" name="orders_to_invoice[]" value="' . $objp->rowid . '">';
 			print '</td>';
-			
+
 			print '</tr>';
-			
+
 			$total = $total + $objp->price;
 			$subtotal = $subtotal + $objp->price;
 			$i ++;
 		}
 		print '</table>';
-		
+
 		/*
 		 * Boutons actions
 		*/
diff --git a/htdocs/index.php b/htdocs/index.php
index ebc6760252c..55252f6533f 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -294,15 +294,15 @@ $showweather=empty($conf->global->MAIN_DISABLE_METEO)?1:0;
 $rowspan=0;
 $dashboardlines=array();
 
-print '<table class="noborder" width="100%">';
+print '<table class="noborder" width="100%">'."\n";
 print '<tr class="liste_titre">';
-print '<th class="liste_titre"colspan="2">'.$langs->trans("DolibarrWorkBoard").'</th>';
-print '<th class="liste_titre"align="right">'.$langs->trans("Number").'</th>';
-print '<th class="liste_titre"align="right">'.$langs->trans("Late").'</th>';
+print '<th class="liste_titre" colspan="2">'.$langs->trans("DolibarrWorkBoard").'</th>';
+print '<th class="liste_titre" align="right">'.$langs->trans("Number").'</th>';
+print '<th class="liste_titre" align="right">'.$langs->trans("Late").'</th>';
 print '<th class="liste_titre">&nbsp;</th>';
-print '<th class="liste_titre"width="20">&nbsp;</th>';
+print '<th class="liste_titre" width="20">&nbsp;</th>';
 if ($showweather) print '<th class="liste_titre hideonsmartphone" width="80">&nbsp;</th>';
-print '</tr>';
+print '</tr>'."\n";
 
 
 //
@@ -317,7 +317,7 @@ if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)
     $board->load_board($user);
     $board->warning_delay=$conf->actions->warning_delay/60/60/24;
     $board->label=$langs->trans("ActionsToDo");
-    $board->url=DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&mainmenu=agenda';
+    $board->url=DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&amp;mainmenu=agenda';
     $board->img=img_object($langs->trans("Actions"),"action");
     $rowspan++;
     $dashboardlines[]=$board;
@@ -458,7 +458,7 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s
     {
         $board->warning_delay=$conf->bank->rappro->warning_delay/60/60/24;
         $board->label=$langs->trans("TransactionsToConciliate");
-        $board->url=DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&mainmenu=bank';
+        $board->url=DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank';
         $board->img=img_object($langs->trans("TransactionsToConciliate"),"payment");
         $rowspan++;
         $dashboardlines[]=$board;
@@ -475,7 +475,7 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s
     $board->load_board($user);
     $board->warning_delay=$conf->bank->cheque->warning_delay/60/60/24;
     $board->label=$langs->trans("BankChecksToReceipt");
-    $board->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=accountancy';
+    $board->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=accountancy';
     $board->img=img_object($langs->trans("BankChecksToReceipt"),"payment");
     $rowspan++;
     $dashboardlines[]=$board;
@@ -491,7 +491,7 @@ if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire && ! $use
     $board->load_board($user);
     $board->warning_delay=$conf->adherent->cotisation->warning_delay/60/60/24;
     $board->label=$langs->trans("MembersWithSubscriptionToReceive");
-    $board->url=DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&statut=1';
+    $board->url=DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut=1';
     $board->img=img_object($langs->trans("Members"),"user");
     $rowspan++;
     $dashboardlines[]=$board;
diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql
index 1c49ac293f8..9e9bfc9c26f 100644
--- a/htdocs/install/mysql/tables/llx_entrepot.sql
+++ b/htdocs/install/mysql/tables/llx_entrepot.sql
@@ -33,7 +33,7 @@ create table llx_entrepot
   fk_departement  integer,
   fk_pays         integer DEFAULT 0,
   statut          tinyint DEFAULT 1,			-- 1 open, 0 close
-  valo_pmp        float(12,4),					-- valoristaion du stock en PMP
+  valo_pmp        float(12,4),					-- PMP value for this warehouse (deprecated. No sens for a warehouse)
   fk_user_author  integer,
   import_key	  varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql
index 5d550aadb6d..99d7d27fb77 100644
--- a/htdocs/install/mysql/tables/llx_product_stock.sql
+++ b/htdocs/install/mysql/tables/llx_product_stock.sql
@@ -25,7 +25,7 @@ create table llx_product_stock
   fk_product      integer NOT NULL,
   fk_entrepot     integer NOT NULL,
   reel            real,           					-- physical stock
-  pmp             double(24,8) default 0 NOT NULL,	-- PMP value for product in this warehouse
+  pmp             double(24,8) default 0 NOT NULL,	-- PMP value for product in this warehouse (deprecated. no sens for warehouse)
   import_key      varchar(14)                  -- Import key
 )ENGINE=innodb;
 
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index a4214d4e592..e5d0499ff88 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= أضف فلتر كخيار لعرض/إخفاء الجهات الأخرى التي تقوم بنشاط حالياً أو توقفت عنه
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=فلاتر خيارات البحث
 NumberOfKeyToSearch=عدد الحروف لبدء البحث: %s
 ViewFullDateActions=أظهر التواريخ الكاملة للأحداث في الصفحة الثالثة
@@ -208,6 +210,7 @@ ModulesJobDesc=توفير وحدات تجارية بسيطة ومحددة سلف
 ModulesMarketPlaceDesc=يمكنك العثور على مزيد من وحدات للتحميل على مواقع الإنترنت الخارجية على شبكة الانترنت...
 ModulesMarketPlaces=مزيد من وحدات...
 DoliStoreDesc=DoliStore ، في السوق الرسمي لتخطيط موارد المؤسسات وحدات Dolibarr / خارجي إدارة علاقات العملاء
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=مزودي موقع ويب يمكنك البحث للعثور على المزيد من وحدات...
 URL=رابط
 BoxesAvailable=صناديق متاحة
@@ -437,14 +440,14 @@ Module52Name=الاسهم
 Module52Desc=مخزون إدارة المنتجات
 Module53Name=الخدمات
 Module53Desc=الخدمات الإدارية
-Module54Name=عقود
-Module54Desc=العقود والخدمات الإدارية
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcodes إدارة
 Module56Name=الخدمات الهاتفية
 Module56Desc=تكامل الخدمات الهاتفية
 Module57Name=أوامر دائمة
-Module57Desc=أوامر دائمة وسحب إدارة
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial التكامل
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=تغذية RSS
 Module320Desc=إضافة تغذية RSS داخل الشاشة صفحة Dolibarr
 Module330Name=العناوين
 Module330Desc=العناوين إدارة
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar التكامل
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=الفئات
 Module1780Desc=الفئات إدارة المنتجات والموردين والزبائن)
 Module2000Name=Fckeditor
 Module2000Desc=سوغ محرر
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=جدول الأعمال
@@ -503,6 +508,8 @@ Module2500Name=إدارة المحتوى الإلكتروني
 Module2500Desc=حفظ وتبادل الوثائق
 Module2600Name=WebServices
 Module2600Desc=تمكين خدمات الويب Dolibarr الملقم
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=غرفتر
 Module2700Desc=استخدام خدمة غرفتر على الانترنت (www.gravatar.com) لإظهار الصورة من المستخدمين / أعضاء (وجدت مع رسائل البريد الإلكتروني الخاصة بهم). في حاجة الى الوصول الى شبكة الانترنت
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع PayBox
 Module50100Name=نقطة البيع
@@ -527,7 +534,7 @@ Module50200Desc=وحدة لتقديم على صفحة الدفع عبر الإن
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=الإعداد المحفوظة
 BackToModuleList=العودة إلى قائمة الوحدات
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=دائم البحث عن شكل القائمة اليم
 DefaultLanguage=اللغة الافتراضية لاستخدام (شفرة اللغة)
 EnableMultilangInterface=تتيح واجهة متعددة اللغات
 EnableShowLogo=عرض الشعار على اليسار القائمة
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=النظام الخاص بك تم تحديث بنجاح
 CompanyInfo=الشركة / المؤسسة المعلومات
 CompanyIds=الشركة / المؤسسة الهويات
diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
index d732b03639c..0e6094546d3 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=أحداث عينت لـ
 ActionsDoneBy=أحداث انهيت بواسطة
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= كل أحداثي/ مهامي
 AllActions= جميع الأحداث / المهام
 ViewList=عرض قائمة
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index b67793fcf84..77ec72df825 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -15,20 +15,20 @@ ProductsCategoriesArea=منتجات / خدمات الفئات المنطقة
 SuppliersCategoriesArea=الموردين منطقة الفئات
 CustomersCategoriesArea=العملاء منطقة الفئات
 ThirdPartyCategoriesArea=أطراف ثالثة 'منطقة الفئات
-MembersCategoriesArea=أعضاء فئات المناطق
+MembersCategoriesArea=منطقة فئات الأعضاء
 ContactsCategoriesArea=Contacts categories area
 MainCats=الفئات الرئيسية
-SubCats=فرعية
-CatStatistics=احصاءات
+SubCats=الفئات الفرعية
+CatStatistics=إحصائيات
 CatList=قائمة الفئات
 AllCats=جميع الفئات
-ViewCat=وترى هذه الفئة
+ViewCat=عرض الفئة
 NewCat=إضافة فئة
 NewCategory=فئة جديدة
 ModifCat=تعديل الفئة
-CatCreated=فئة خلق
-CreateCat=خلق فئة
-CreateThisCat=تهيئة هذه الفئة
+CatCreated=تم إنشاء الفئة
+CreateCat=إنشاء فئة
+CreateThisCat=إنشاء هذه الفئة
 ValidateFields=صحة المجالات
 NoSubCat=لا فرعية.
 SubCatOf=فرعية
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index 88215629f80..a086e30b48c 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/ar_SA/contracts.lang b/htdocs/langs/ar_SA/contracts.lang
index 446ea9e2fb7..133036960c0 100644
--- a/htdocs/langs/ar_SA/contracts.lang
+++ b/htdocs/langs/ar_SA/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=قائمة تشغيل خطوط العقد
 ListOfRunningServices=لائحة ادارة الخدمات
 NotActivatedServices=لا تنشيط الخدمات) بين مصدق العقود)
 BoardNotActivatedServices=خدمات لتفعيل العقود بين مصدق
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=ق الماضي ٪ تنشيط الخدمات
 LastModifiedServices=آخر تعديل ٪ ق الخدمات
 EditServiceLine=تعديل خط الخدمات
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=ممثل مبيعات توقيع العقد
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index d25c2f5d8d0..670c99a851a 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=رمز المورد المطلوب
 ErrorSupplierCodeAlreadyUsed=الشفرة المستخدمة بالفعل مورد
 ErrorBadParameters=بارامترات سيئة
 ErrorBadValueForParameter=قيمة خاطئة &quot;%s 'ل' %s&quot; المعلمة غير صحيحة
-ErrorBadImageFormat=ملف الصورة لم تنسيق معتمد
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat='%s' قيمة له خاطئ تنسيق التاريخ
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=لم يكتب في دليل ٪ ق
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=لا يستطيع المستخدم الدخول مع <b>
 ErrorLoginHasNoEmail=هذا المستخدم ليس لديه عنوان البريد الإلكتروني. إحباط عملية.
 ErrorBadValueForCode=سيئة قيمة لرمز الحماية. حاول مرة أخرى مع القيمة الجديدة ...
 ErrorBothFieldCantBeNegative=ويمكن لحقول %s و%s لا تكون سلبية
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=<b>%s</b> تستخدم حساب مستخدم لتنفيذ خادم الويب لا يوجد لديه إذن لذلك
 ErrorNoActivatedBarcode=لا يوجد نوع الباركود تفعيلها
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index c49ccb303ac..ee9d10f88e0 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -8,7 +8,7 @@ Members=أعضاء
 MemberAccount=دخول الأعضاء
 ShowMember=وتظهر بطاقة عضو
 UserNotLinkedToMember=المستخدم لا ترتبط عضو
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=أعضاء التذاكر
 FundationMembers=أعضاء المؤسسة
 Attributs=الصفات
@@ -85,8 +85,7 @@ SubscriptionLateShort=متأخر
 SubscriptionNotReceivedShort=لم يتلق
 ListOfSubscriptions=قائمة الاشتراكات
 SendCardByMail=أرسل بطاقة
-AddMember=إضافة عضو
-MemberType=عضو نوع
+AddMember=Create member
 NoTypeDefinedGoToSetup=لا يجوز لأي عضو في أنواع محددة. الذهاب إلى الإعداد -- أنواع الأعضاء
 NewMemberType=عضو جديد من نوع
 WelcomeEMail=مرحبا بك في البريد الإلكتروني
@@ -126,12 +125,12 @@ Date=تاريخ
 DateAndTime=التاريخ والوقت
 PublicMemberCard=عضو بطاقة العامة
 MemberNotOrNoMoreExpectedToSubscribe=أو ليست عضوا في أي أكثر من المتوقع للاكتتاب
-AddSubscription=إضافة اشتراك
+AddSubscription=Create subscription
 ShowSubscription=وتظهر اكتتاب
 MemberModifiedInDolibarr=عضو في تعديل Dolibarr
 SendAnEMailToMember=البريد الإلكتروني لإرسال معلومات العضو
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=بريد إلكتروني الموضوع لautosubscription الأعضاء
 DescADHERENT_AUTOREGISTER_MAIL=البريد الإلكتروني لعضو autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=البريد الإلكتروني لعضو في موضوع المصادقة
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=موضوع البريد الإلكتروني ل
 DescADHERENT_MAIL_RESIL=البريد الإلكتروني لعضو resiliation
 DescADHERENT_MAIL_FROM=البريد الإلكتروني للمرسل البريد الإلكتروني التلقائي
 DescADHERENT_ETIQUETTE_TYPE=علامات الشكل
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=شكل بطاقات صفحة
 DescADHERENT_CARD_HEADER_TEXT=نص مطبوع على رأس عضو البطاقات
 DescADHERENT_CARD_TEXT=نص مطبوع على بطاقات الأعضاء
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=لم يرتبط بها من طرف ثالث له
 ThirdPartyDolibarr=Dolibarr طرف ثالث
 MembersAndSubscriptions= وأعضاء Subscriptions
 MoreActions=تكميلية العمل على تسجيل
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=إنشاء سجل المعاملات مباشرة على حساب
 MoreActionBankViaInvoice=إنشاء الفاتورة والدفع على حساب
 MoreActionInvoiceOnly=إنشاء فاتورة مع دفع أي مبلغ
@@ -171,6 +170,8 @@ LastSubscriptionAmount=آخر مبلغ الاشتراك
 MembersStatisticsByCountries=أعضاء إحصاءات حسب البلد
 MembersStatisticsByState=أعضاء إحصاءات الولاية / المقاطعة
 MembersStatisticsByTown=أعضاء إحصاءات بلدة
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=عدد الأعضاء
 NoValidatedMemberYet=العثور على أي أعضاء التحقق من صحة
 MembersByCountryDesc=هذه الشاشة تظهر لك إحصاءات عن أعضاء من الدول. لكن الرسم يعتمد على خدمة غوغل الرسم البياني على الإنترنت ويتوفر فقط إذا كان على اتصال بالإنترنت ويعمل.
@@ -196,9 +197,10 @@ Collectivités=المنظمات
 Particuliers=الشخصية
 Entreprises=الشركات
 DOLIBARRFOUNDATION_PAYMENT_FORM=أن يسدد الاشتراك باستخدام حوالة مصرفية، راجع صفحة <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> الدفع باستخدام بطاقة ائتمان أو باي بال، وانقر على زر في أسفل هذه الصفحة. <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 0902013f2bb..49d6fff5689 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=إذا كان المنتج هو خدمة لفترة مح
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=عدد من السعر
 MultiPriceLevelsName=سعر الفئات
-AssociatedProductsAbility=تنشيط المنتجات
-AssociatedProducts=المنتجات
-AssociatedProductsNumber=عدد المنتجات
-ParentProductsNumber=عدد من الناتج الأم
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=المنتسبون
 Translation=الترجمة
 KeywordFilter=الكلمة الرئيسية فلتر
@@ -132,7 +132,7 @@ AddDel=إضافة / حذف
 Quantity=الكمية
 NoMatchFound=العثور على أي مباراة
 ProductAssociationList=قائمة المنتجات المتعلقة / الخدمات : اسم المنتج / الخدمة (الكمية المتضررة)
-ProductParentList=قائمة من المنتجات / الخدمات مع هذا المنتج كعنصر
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=واحد من اختيار المنتج الأم الحالية المنتج
 DeleteProduct=حذف المنتجات / الخدمات
 ConfirmDeleteProduct=هل أنت متأكد من حذف هذه المنتجات / الخدمات؟
@@ -179,7 +179,7 @@ CloneProduct=استنساخ المنتجات أو الخدمات
 ConfirmCloneProduct=هل أنت متأكد من أن المنتج أو الخدمة استنساخ <b>٪ ق؟</b>
 CloneContentProduct=استنساخ جميع المعلومات الرئيسية من المنتجات / الخدمات
 ClonePricesProduct=استنساخ الرئيسية معلومات والأسعار
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=ويستخدم هذا المنتج
 NewRefForClone=المرجع. من المنتجات الجديدة / خدمة
 CustomerPrices=أسعار العملاء
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 34c6bea737f..26d051445c3 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=جديد الوقت الذي يقضيه
 MyTimeSpent=وقتي قضى
 MyTasks=مهمتي
diff --git a/htdocs/langs/ar_SA/resource.lang b/htdocs/langs/ar_SA/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/ar_SA/resource.lang
+++ b/htdocs/langs/ar_SA/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index 96323e4b1bb..5d7a45bbe66 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=الائتمان على
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=وتظهر سحب
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=ومع ذلك، إذا فاتورة واحدة على الأقل دفع انسحاب لا تتم معالجتها حتى الآن، فإنه لن يكون كما سيولي للسماح لإدارة الانسحاب قبل.
-DoStandingOrdersBeforePayments=هذه علامات تسمح لك لطلب لاستصدار أمر دائم. مرة واحدة وسيتم الانتهاء من ذلك، يمكنك كتابة دفع لإغلاق الفاتورة.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=دفع %s النظام الدائمة من قبل البنك
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 2300a4772e8..0516b22b16e 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Използвайте автоматично довъ
 ActivityStateToSelectCompany= Добавяне на филтър опция за показване / скриване на thirdparties, които в момента са в дейност или е престанала
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Използвайте автоматично довършване полета, за избор на контакт (вместо да използвте списъка от полето).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Опции на филтрите за търсене
 NumberOfKeyToSearch=NBR от знаци, за да предизвика търсене: %s
 ViewFullDateActions=Показване на пълните събития дати в третия лист
@@ -208,6 +210,7 @@ ModulesJobDesc=Бизнес модули осигуряват прост пре
 ModulesMarketPlaceDesc=Можете да намерите повече модули за изтегляне на външни уеб-сайтове в Интернет ...
 ModulesMarketPlaces=Повече модули ...
 DoliStoreDesc=DoliStore, официалният пазар за външни модули за Dolibarr ERP/CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Доставчици на уеб сайта можете да търсите да намерите повече модули ...
 URL=Връзка
 BoxesAvailable=Налични Кутии
@@ -444,7 +447,7 @@ Module55Desc=Управление на баркод
 Module56Name=Телефония
 Module56Desc=Телефония интеграция
 Module57Name=Постоянните поръчки
-Module57Desc=Постоянни нареждания и оттегляне управление
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Интеграция на ClickToDial система (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS емисия
 Module320Desc=Добавяне на RSS емисия в страниците на Dolibarr
 Module330Name=Отметки
 Module330Desc=Управление на отметки
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграция
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Категории
 Module1780Desc=Управление на категории (продукти, доставчици и клиенти)
 Module2000Name=WYSIWYG редактор
 Module2000Desc=Оставя се да редактирате някакъв текст, чрез използване на усъвършенствана редактор
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Дневен ред
@@ -503,6 +508,8 @@ Module2500Name=Електронно Управление на Съдържани
 Module2500Desc=Запазване и споделяне на документи
 Module2600Name=WebServices
 Module2600Desc=Активирайте сървъра на Dolibarr за уеб услуги
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Използвайте онлайн Gravatar услуга (www.gravatar.com), за да покаже снимка на потребители / членове с техните имейли. Нуждаете се от интернет
 Module2800Desc=FTP Клиент
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Модул предлага онлайн страница на плащане с кредитна карта с Paybox
 Module50100Name=Точка на продажбите
@@ -527,7 +534,7 @@ Module50200Desc=Модул предлага онлайн страница на 
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Полета
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup спаси
 BackToModuleList=Обратно към списъка с модули
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Постоянна форма за търсене в л
 DefaultLanguage=Език по подразбиране (код на езика)
 EnableMultilangInterface=Разрешаване на многоезичен интерфейс
 EnableShowLogo=Показване на логото в лявото меню
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Вашата система е актуализиран успешно
 CompanyInfo=Информация за фирмата/организацията
 CompanyIds=Идентичност на фирмата/организацията
diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang
index b97d5a8658d..6affd27cc53 100644
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/htdocs/langs/bg_BG/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Събития възложени на
 ActionsDoneBy=Събития извършени от
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Всички мои събития/задачи
 AllActions= Всички събития/задачи
 ViewList=Списъчен изглед
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index 9aa1fa85417..0830bcfd2d3 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Счетоводен код по подразбиране за продажба на услуги
 ACCOUNTING_VAT_ACCOUNT=Счетоводен код по подразбиране за начисляване на ДДС
 ACCOUNTING_VAT_BUY_ACCOUNT=Счетоводен код по подразбиране за плащане на ДДС
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/bg_BG/contracts.lang b/htdocs/langs/bg_BG/contracts.lang
index b78304394ed..1aa00c03e0e 100644
--- a/htdocs/langs/bg_BG/contracts.lang
+++ b/htdocs/langs/bg_BG/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Списък на линиите на движени
 ListOfRunningServices=Списък на стартираните услуги
 NotActivatedServices=Неактивни услуги (сред валидирани договори)
 BoardNotActivatedServices=Услуги за да активирате сред утвърдени договори
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Последните %s активирани услуги
 LastModifiedServices=Последните %s променени услуги
 EditServiceLine=Редактиране на сервизна линия
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Търговски представител подписване на договора
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 494b1ede1e0..f75d1b490b1 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Доставчик изисква код
 ErrorSupplierCodeAlreadyUsed=Доставчик код вече се използва
 ErrorBadParameters=Лошите параметри
 ErrorBadValueForParameter=Грешна стойност &quot;%s&quot; за параметрите неправилни &quot;%s&quot;
-ErrorBadImageFormat=Image файла не е поддържан формат
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=&quot;%s&quot; Стойност има грешна дата формат
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Неуспех при запис в директорията %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Потребителя <b>%s</b> не е намерен.
 ErrorLoginHasNoEmail=Този потребител няма имейл адрес. Процес прекратено.
 ErrorBadValueForCode=Неправилна стойност за код за сигурност. Опитайте отново с нова стойност ...
 ErrorBothFieldCantBeNegative=Полетата %s и %s не може да бъде едновременно отрицателен
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Потребителски акаунт <b>%s</b> използват за извършване на уеб сървър не разполага с разрешение за това
 ErrorNoActivatedBarcode=Не е тип баркод активира
 ErrUnzipFails=Неуспех да разархивирате %s с ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени
@@ -155,5 +174,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page
 WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
 WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningPaymentDateLowerThanInvoiceDate=Датата на плащане (%s) е по-ранна от датата на фактуриране (%s) за фактура %s.
+WarningTooManyDataPleaseUseMoreFilters=Твърде много данни. Моля, използвайте повече филтри
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index 15bb3fbe4ff..88566d73fdb 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Със закъснение
 SubscriptionNotReceivedShort=Не е получаван
 ListOfSubscriptions=Списък на членския внос
 SendCardByMail=Изпращане на карта по имейл
-AddMember=Добавяне на член
+AddMember=Create member
 NoTypeDefinedGoToSetup=Не са зададени типове членове. Отидете на менюто "Типове членове"
 NewMemberType=Нов тип член
 WelcomeEMail=E-mail за приветствие
@@ -125,7 +125,7 @@ Date=Дата
 DateAndTime=Дата и час
 PublicMemberCard=Публична карта на член
 MemberNotOrNoMoreExpectedToSubscribe=-Членка не може или не повече очаква да се абонирате
-AddSubscription=Добавяне на чл. внос
+AddSubscription=Create subscription
 ShowSubscription=Покажи чл. внос
 MemberModifiedInDolibarr=Члена е променен в Dolibarr
 SendAnEMailToMember=Изпращане на информационен имейл до член
@@ -203,3 +203,4 @@ MembersByNature=Members by nature
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 1fdf4f81644..4d6d702069e 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ако продуктът е услуга с ограни
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Категории цени
-AssociatedProductsAbility=Активиране на виртуалните продукти да се отличават
-AssociatedProducts=Виртуален продукт
-AssociatedProductsNumber=Брой на продуктите, съставящи този виртуален продукт
-ParentProductsNumber=Брой на основния виртуален продукт
-IfZeroItIsNotAVirtualProduct=Ако е 0, този продукт не е виртуален продукт
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Асоцииране
 Translation=Превод
 KeywordFilter=Филтър по ключова дума
@@ -132,7 +132,7 @@ AddDel=Добавяне/Изтриване
 Quantity=Количество
 NoMatchFound=Не са намерени съвпадения
 ProductAssociationList=Списък на продукти / услуги, свързани с: име на продукта / услугата (количество засегнати)
-ProductParentList=Списък на продукти / услуги с този продукт като компонент
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Един от избрания продукт е родител с настоящия продукт
 DeleteProduct=Изтриване на продукта/услугата
 ConfirmDeleteProduct=Сигурни ли сте, че желаете да изтриете този продукт/услуга?
@@ -179,7 +179,7 @@ CloneProduct=Клониране на продукт или услуга
 ConfirmCloneProduct=Сигурни ли сте, че желаете да клонирате продукта или услугата <b>%s?</b>?
 CloneContentProduct=Клониране на всички основни данни за продукта/услугата
 ClonePricesProduct=Клониране на основните данни и цени
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Този продукт е използван
 NewRefForClone=Реф. на нов продукт/услуга
 CustomerPrices=Цени за клиенти
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 95d094a6934..0b34f372aab 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Този възглед представя всички проекти
 Myprojects=Моите проекти
 ProjectsArea=Проекти област
 NewProject=Нов проект
-AddProject=Добави проект
+AddProject=Create project
 DeleteAProject=Изтриване на проект
 DeleteATask=Изтриване на задача
 ConfirmDeleteAProject=Сигурен ли сте, че искате да изтриете този проект?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Времето, прекарано на
 MyTimeSpent=Времето, прекарано
 MyTasks=Моите задачи
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Нова задача
-AddTask=Добавяне на задача
+AddTask=Create task
 AddDuration=Добави продължителността
 Activity=Дейност
 Activities=Задачите / дейностите
@@ -120,7 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
-UnlinkElement=Unlink element
+UnlinkElement=Прекъсни връзката към елемента
 # Documents models
 DocumentModelBaleine=Доклад за цялостния проект модел (logo. ..)
 PlannedWorkload = Planned workload
@@ -129,4 +131,4 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Свържете със средство за да определите времето
diff --git a/htdocs/langs/bg_BG/resource.lang b/htdocs/langs/bg_BG/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/bg_BG/resource.lang
+++ b/htdocs/langs/bg_BG/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index cf10ed07746..cb289ea4725 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Кредит за
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Покажи Теглене
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Въпреки това, ако фактурата не е все още най-малко една оттегляне плащане обработват, не се определя като плаща, за да се даде възможност да управляват оттеглянето им преди.
-DoStandingOrdersBeforePayments=Това разделите ви позволява да изисквате за постоянно нареждане. След като той ще бъде завършен, можете да въведете плащането, за да затворите фактура.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Плащане на постоянно нареждане %s от банката
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 39c2732ec29..954d9c60650 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
 
-Accounting=Accounting
+Accounting=Računovodstvo
 Globalparameters=Global parameters
 Chartofaccounts=Chart of accounts
 Fiscalyear=Fiscal years
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 8e1c91270ef..19cb28c82fd 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Dodaj opciju filter za prikazivanje/sakrivanje trećih stranaka koji su trenutno u aktivnosti ili su prestali
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Poslovni moduli pružaju jednostavane unparijed postavljenje post
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Upravljanje workflow-om - tokom rada
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print preko Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Postavke snimljene
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang
index 5059966f54a..1b80e817bee 100644
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/htdocs/langs/bs_BA/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Događaji dodijeljeni korisniku
 ActionsDoneBy=Događaji završeni od strane korisnika
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Svi moji događaji/zadaci
 AllActions= Svi događaji/zadaci
 ViewList=Lista
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 98aa9a4e395..3cb7124de3a 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/bs_BA/contracts.lang b/htdocs/langs/bs_BA/contracts.lang
index 272cd202ef8..4952376c86c 100644
--- a/htdocs/langs/bs_BA/contracts.lang
+++ b/htdocs/langs/bs_BA/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista stavki aktivnih ugovora
 ListOfRunningServices=Lista aktivnih usluga
 NotActivatedServices=Nekativne usluge (među potvrđenim ugovorima)
 BoardNotActivatedServices=Usluge za aktiviranje među potvrđenim ugovorima
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Zadnjih $s aktiviranih usluga
 LastModifiedServices=Zadnjih %s izmijenjenih usluga
 EditServiceLine=Izmijeni stavku usluge
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista usluga pred isticanje
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Predstavnik prodaje koji potpisuje ugovor
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index 9246a04ced9..40bca8e85fb 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 42620a9f0e4..90ab1fa6e30 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 95c53abeecf..465c2e15488 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Ovaj pregled predstavlja sve projekte i zadatke (postavke vaših koris
 Myprojects=Moji projekti
 ProjectsArea=Područje za projekte
 NewProject=Novi projekat
-AddProject=Dodaj projekat
+AddProject=Create project
 DeleteAProject=Obisati projekat
 DeleteATask=Obrisati zadatak
 ConfirmDeleteAProject=Jeste li sigurni da želite obrisati ovaj projekt?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nova provedeno vrijeme
 MyTimeSpent=Moje provedeno vrijeme
 MyTasks=Moji zadaci
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Novi zadatak
-AddTask=Dodaj zadatak
+AddTask=Create task
 AddDuration=Dodaj trajanje
 Activity=Aktivnost
 Activities=Zadaci/aktivnosti
diff --git a/htdocs/langs/bs_BA/resource.lang b/htdocs/langs/bs_BA/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/bs_BA/resource.lang
+++ b/htdocs/langs/bs_BA/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index bbc20358aeb..e4e4dce6e69 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=Ova kartica vam omogućava da zatražite trajni nalog. Kada je potpuna, možete izvršiti plaćanje za zatvaranje računa.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Plaćanje trajnog naloga %s od strane banke
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 262ca3919fc..739cd6fb23b 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Afegir un filtre en la recerca per mostrar/ocultar els tercers en actiu o que hagin deixat d'exercir
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Opcions filtres de cerca
 NumberOfKeyToSearch=Nombre de caràcters per a desencadenar la cerca: %s
 ViewFullDateActions=Veure les dades de les accions en la seva totalitat en la fitxa de tercer
@@ -208,6 +210,7 @@ ModulesJobDesc=Els mòduls específics permeten una preconfiguració simplificad
 ModulesMarketPlaceDesc=Hi ha disponbiles per a baixar en llocs externs d'Internet altres mòduls / extensions...
 ModulesMarketPlaces=Més mòduls...
 DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Llocs proveïdors a consultar per trobar més mòduls
 URL=Enllaç
 BoxesAvailable=Panells disponibles
@@ -444,7 +447,7 @@ Module55Desc=Gestió dels codis de barra
 Module56Name=Telefonia
 Module56Desc=Gestió de la telefonia
 Module57Name=Domiciliacions
-Module57Desc=Gestió de domiciliacions i reintegraments bancaris
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integració amb ClickToDial
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=Fils RSS
 Module320Desc=Addició de fils d'informació RSS en les pantalles Dolibarr
 Module330Name=Bookmarks
 Module330Desc=Gestió de bookmarks
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Interface amb el calendari webcalendar
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Gestió de categories (productes, proveïdors i clients)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permet l'edició de certes zones de text mitjançant un editor avançat
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Gestor de tasques programades
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Gestió Electrònica de Documents
 Module2500Desc=Permet administrar una base de documents
 Module2600Name=WebServices
 Module2600Desc=Activa els serveis de servidor web services de Dolibarr
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Utilitza el servei en línia de Gravatar (www.gravatar.com) per mostrar fotos dels usuaris/membres (que es troben en els seus missatges de correu electrònic). Necessita un accés a Internet
 Module2800Desc=Client FTP
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paybox
 Module50100Name=TPV
@@ -527,7 +534,7 @@ Module50200Desc=Mòdul per a proporcionar un pagament en línia amb targeta de c
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Márgenes
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Configuració desada
 BackToModuleList=Retornar llista de mòduls
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Zona de recerca permanent del menú de l'esquerra
 DefaultLanguage=Idioma per defecte a utilitzar (codi d'idioma)
 EnableMultilangInterface=Activar interface multiidioma
 EnableShowLogo=Mostra el logotip en el menú de l'esquerra
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=El seu sistema està actualitzat
 CompanyInfo=Informació de l'empresa/institució
 CompanyIds=Identificació reglamentaria
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index c66562e7c11..a9c55c4f272 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Esdeveniments assignats a
 ActionsDoneBy=Esdeveniments realitzats per
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Tots els meus esdeveniments/tasques
 AllActions= Tots els esdeveniments/tasques
 ViewList=Vista llistat
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index fc6efa906e0..098a65b11f5 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=segons el proveïdor, triar el mètode adequat per a
 TurnoverPerProductInCommitmentAccountingNotRelevant=l'Informe Facturació per producte, quan s'utilitza el mode <b>comptabilitat de caixa </b> no és rellevant. Aquest informe només està disponible quan s'utilitza el mode <b>compromís comptable</b>(consulteu la configuració del mòdul de comptabilitat).
 CalculationMode=Mode de càlcul
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index bd31f48ce5d..be202d8b593 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Llistat de línies de contractes en servei
 ListOfRunningServices=Llistat de serveis actius
 NotActivatedServices=Serveis no activats (amb els contractes validats)
 BoardNotActivatedServices=Serveis a activar amb els contractes validats
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Els %s darrers serveis activats
 LastModifiedServices=Els  %s darrers serveis modificats
 EditServiceLine=Edició línia del servei
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Llistat de serveis actius a expirar
 NoteListOfYourExpiredServices=Aquest llistat conté només els serveis de contractes de tercers dels que vostè és comercial
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Comercial signant del contracte
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 61148a83890..d841687a0c3 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Codi proveïdor obligatori
 ErrorSupplierCodeAlreadyUsed=Codi de proveïdor ja utilitzat
 ErrorBadParameters=Paràmetres incorrectes
 ErrorBadValueForParameter=Valor '%s' incorrecte per al paràmetre '%s'
-ErrorBadImageFormat=La imatge no té un format reconegut
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=El valor '%s' té un format de data no reconegut
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=No es pot escriure a la carpeta %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=El compte d'usuari de <b>%s</b> no s'ha trobat.
 ErrorLoginHasNoEmail=Aquest usuari no té e-mail. Impossible continuar.
 ErrorBadValueForCode=Valor no vàlid per al codi. Torneu a intentar-ho amb un nou valor ...
 ErrorBothFieldCantBeNegative=Els camps %s i %s no poden ser negatius
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=El compte d'execució del servidor web <b>%s</b> no disposa dels permisos per això
 ErrorNoActivatedBarcode=No hi ha activat cap tipus de codi de barres
 ErrUnzipFails=No s'ha pogut descomprimir el fitxer %s amb ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index c09107519fd..6a164471ba2 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -8,7 +8,7 @@ Members=Membres
 MemberAccount=Login membre
 ShowMember=Mostrar fitxa membre
 UserNotLinkedToMember=Usuari no vinculat a un membre
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Etiquetes membres
 FundationMembers=Membres de l'associació
 Attributs=Atributs
@@ -85,8 +85,7 @@ SubscriptionLateShort=En retard
 SubscriptionNotReceivedShort=No rebuda
 ListOfSubscriptions=Llista d'afiliacions
 SendCardByMail=Enviar fitxa per e-mail
-AddMember=Afegir membre
-MemberType=Tipus de membre
+AddMember=Create member
 NoTypeDefinedGoToSetup=Cap tipus de membre definit. Aneu a Configuració->Tipus de membres
 NewMemberType=Nou tipus de membre
 WelcomeEMail=E-mail
@@ -126,7 +125,7 @@ Date=Data
 DateAndTime=Data i hora
 PublicMemberCard=Fitxa pública membre
 MemberNotOrNoMoreExpectedToSubscribe=No sotmesa a cotització
-AddSubscription=Afegir afiliació
+AddSubscription=Create subscription
 ShowSubscription=Mostrar afiliació
 MemberModifiedInDolibarr=Membre modificat en Dolibarr
 SendAnEMailToMember=Enviar e-mail d'informació al membre (E-mail: <b>%s</b>)
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Import de l'última cotització
 MembersStatisticsByCountries=Estadístiques de membres per país
 MembersStatisticsByState=Estadístiques de membres per població
 MembersStatisticsByTown=Estadístiques de membres per població
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Nombre de membres
 NoValidatedMemberYet=Cap membre validat trobat
 MembersByCountryDesc=Aquesta pantalla presenta una estadística del nombre de membres per país. No obstant això, el gràfic utilitza el servei en línia de gràfics de Google i només és operatiu quan es troba disponible una connexió a Internet.
@@ -202,3 +203,4 @@ MembersByNature=Membres per naturalesa
 VATToUseForSubscriptions=Taxa d'IVA per les afiliacions
 NoVatOnSubscription=Sense IVA per a les afiliacions
 MEMBER_PAYONLINE_SENDEMAIL=E-Mail per advertir en cas de recepció de confirmació d'un pagament validat d'una afiliació
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/ca_ES/printipp.lang b/htdocs/langs/ca_ES/printipp.lang
index da015f80205..835e6827f12 100644
--- a/htdocs/langs/ca_ES/printipp.lang
+++ b/htdocs/langs/ca_ES/printipp.lang
@@ -1,9 +1,14 @@
 # Dolibarr language file - Source file is en_US - printipp
-PrintIPPSetup=Configuració del mòdul Impressió directa IPP
-PrintIPPDesc=Aquest mòdul permet afegir un botó d'impressió directa dels seus documents cap a la seva impressora. Es requereix un sistema Linux equipat amb Cups.
-PRINTIPP_ENABLED=Mostra el logo "Impressió directa" en els llistats de documents
-PRINTIPP_HOST=Servidor d'impressió
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
 PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Contrasenya
-NoPrinterFound=No s'ha trobat cap impressora (comprovi la seva configuració Cups)
\ No newline at end of file
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index e15f7808bb4..e8b8b6b5053 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Si el servei és de durada limitada:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Nº de preus
 MultiPriceLevelsName=Categoria de preus
-AssociatedProductsAbility=Activar productes compostos
-AssociatedProducts=Productes compostos
-AssociatedProductsNumber=Nº de productes que composen aquest producte
-ParentProductsNumber=Nº de productes que aquest producte compon
-IfZeroItIsNotAVirtualProduct=Si 0, aquest producte no és un producte virtual
-IfZeroItIsNotUsedByVirtualProduct=Si 0, aquest producte no està sent utilitzat per cap producte virtual
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Compondre
 Translation=Traducció
 KeywordFilter=Filtre per clau
@@ -132,7 +132,7 @@ AddDel=Adjuntar/Retirar
 Quantity=Quantitat
 NoMatchFound=No s'han trobat resultats
 ProductAssociationList=Llistat de productes/serveis components d'aquest producte: el nombre entre parèntesis és la quantitat afectada en aquesta composició
-ProductParentList=Llistat de productes/serveis amb aquest producte com a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Un dels productes seleccionats és pare del producte en curs
 DeleteProduct=Eliminar un producte/servei
 ConfirmDeleteProduct=Esteu segur de voler eliminar aquest producte/servei?
@@ -179,7 +179,7 @@ CloneProduct=Clonar producte/servei
 ConfirmCloneProduct=Esteu segur de voler clonar el producte o servei <b>%s</b> ?
 CloneContentProduct=Clonar només la informació general del producte/servei
 ClonePricesProduct=Clonar la informació general i els preus
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Aquest producte és utilitzat
 NewRefForClone=Ref. del nou producte/servei
 CustomerPrices=Preus clients
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 8caccc50f04..49d18cb3d36 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Aquesta vista mostra tots els projectes i tasques (les sevas autoritza
 Myprojects=Els meus projectes
 ProjectsArea=Àrea projectes
 NewProject=Nou projecte
-AddProject=Crear projecte
+AddProject=Create project
 DeleteAProject=Eliminar un projecte
 DeleteATask=Eliminar una tasca
 ConfirmDeleteAProject=Esteu segur de voler eliminar aquest projecte?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nou temps dedicat
 MyTimeSpent=El meu temps dedicat
 MyTasks=Les meves tasques
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Nova tasca
-AddTask=Afegir tasca
+AddTask=Create task
 AddDuration=Indicar durada
 Activity=Activitat
 Activities=Tasques/activitats
diff --git a/htdocs/langs/ca_ES/resource.lang b/htdocs/langs/ca_ES/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/ca_ES/resource.lang
+++ b/htdocs/langs/ca_ES/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index bf3bbac2ebb..9a4eef3a705 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Abonada el
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Veure domiciliació
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No obstant això, si la factura té pendent algun pagament per domiciliació, no serà tancada per a permetre la gestió de la domiciliació.
-DoStandingOrdersBeforePayments=Aquesta pestanya us permet realitzar una petició de domiciliació. Un cop, podeu ingressar el pagament a la factura per procedir al seu tancament.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Arxiu de la domiciliació
 SetToStatusSent=Classificar com "Arxiu enviat"
 ThisWillAlsoAddPaymentOnInvoice=Es crearan els pagaments de les factures i les classificarà com pagades
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Abonament de domiciliació %s pel banc
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index bcbc227a151..e4a6da486cf 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Přidat možnost filtru pro zobrazení / skrytí třetích stran, které jsou v současné době v činnosti nebo ji ukončili
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Nastavení vyhledávání
 NumberOfKeyToSearch=Počet charakterů nutných k spuštění hledání: %s
 ViewFullDateActions=Zobrazit rozšířené datumy události v třetím listu
@@ -208,6 +210,7 @@ ModulesJobDesc=Obchodní moduly poskytují jednoduché nastavení systému Dolib
 ModulesMarketPlaceDesc=Více modulů naleznete ke stažení na externích webových stránkách ...
 ModulesMarketPlaces=Více modulů ...
 DoliStoreDesc=DoliStore, oficiální trh pro download externích modulů Dolibarr ERP / CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Weboví poskytovatelé Dolibarr modulů ...
 URL=Odkaz
 BoxesAvailable=Boxy jsou k dispozici
@@ -444,7 +447,7 @@ Module55Desc=Barcode řízení
 Module56Name=Telefonie
 Module56Desc=Telefonie integrace
 Module57Name=Trvalé příkazy
-Module57Desc=Trvalé příkazy a abstinenční řízení
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrace ClickToDial systému (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Přidat RSS kanál uvnitř obrazovek Dolibarr
 Module330Name=Záložky
 Module330Desc=Správa záložek
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integrace
 Module500Name=Zvláštní náklady (daně, sociální příspěvky a dividendy)
@@ -495,6 +498,8 @@ Module1780Name=Kategorie
 Module1780Desc=Category management (produkty, dodavatelé a odběratelé)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Nechte upravit některé textové pole pomocí pokročilého editoru
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Plánované správu úloh
 Module2400Name=Pořad jednání
@@ -503,6 +508,8 @@ Module2500Name=Elektronický Redakční
 Module2500Desc=Uložit a sdílet dokumenty
 Module2600Name=WebServices
 Module2600Desc=Povolit Dolibarr webových služeb serveru
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Pomocí on-line služby (Gravatar www.gravatar.com) ukázat fotku uživatelů / členů (nalezen s jejich e-maily). Potřebujete přístup k internetu
 Module2800Desc=FTP klient
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modul nabídnout on-line platby kreditní kartou stránku s Paybox
 Module50100Name=Bod prodeje
@@ -527,7 +534,7 @@ Module50200Desc=Modul nabídnout on-line platby kreditní kartou stránku s Payp
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Tisk přes poháry tiskárny IPP.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Okraje
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Nastavení uloženo
 BackToModuleList=Zpět na seznam modulů
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanentní vyhledávací formulář na levém menu
 DefaultLanguage=Výchozí jazyk používat (kód jazyka)
 EnableMultilangInterface=Povolit vícejazyčné rozhraní
 EnableShowLogo=Zobrazit logo na levém menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Systém byl úspěšně aktualizován
 CompanyInfo=Společnosti / Nadace informace
 CompanyIds=Společnost / nadace identity
diff --git a/htdocs/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang
index 08e0a334726..06b4b7d4a32 100644
--- a/htdocs/langs/cs_CZ/agenda.lang
+++ b/htdocs/langs/cs_CZ/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Akce přiřazené
 ActionsDoneBy=Akce provedené
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Všechny mé akce / úkoly
 AllActions= Všechny události / úkoly
 ViewList=Zobrazení seznamu
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index 84074b96401..aa187c9880e 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=podle dodavatele zvolit vhodnou metodu použít stej
 TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat zpráva za zboží, při použití <b>hotovosti evidence</b> režim není relevantní. Tato zpráva je k dispozici pouze při použití <b>zásnubní evidence</b> režimu (viz nastavení účetního modulu).
 CalculationMode=Výpočet režim
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/cs_CZ/contracts.lang b/htdocs/langs/cs_CZ/contracts.lang
index e8a6754c08e..792ed511937 100644
--- a/htdocs/langs/cs_CZ/contracts.lang
+++ b/htdocs/langs/cs_CZ/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Seznam běžících smluv linek
 ListOfRunningServices=Seznam spuštěných služeb
 NotActivatedServices=Neaktivní služby (u ověřených smluv)
 BoardNotActivatedServices=Služby pro aktivaci u ověřených smluv
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Poslední %s aktivaci služby
 LastModifiedServices=Poslední %s upravené služby
 EditServiceLine=Upravit linka
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Seznam služeb vyprší
 NoteListOfYourExpiredServices=Tento seznam obsahuje pouze služby smluv pro třetí strany si jsou propojeny jako obchodního zástupce.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Obchodní zástupce podpisu smlouvy
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 54a9f2bcc25..57331cb59c0 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Dodavatel povinen kód
 ErrorSupplierCodeAlreadyUsed=Dodavatel kód již používán
 ErrorBadParameters=Bad parametry
 ErrorBadValueForParameter=Chybná hodnota &quot;%s&quot; pro nastavení parametrů nesprávných &quot;%s&quot;
-ErrorBadImageFormat=Obrazový soubor nemá podporovaný formát
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Hodnota &quot;%s&quot; má nesprávný formát data
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Nepodařilo se zapsat do adresáře %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Uživatel s přihlášením <b>%s</b> nebyl nalezen.
 ErrorLoginHasNoEmail=Tento uživatel nemá žádnou e-mailovou adresu. Proces přerušena.
 ErrorBadValueForCode=Bad hodnota bezpečnostního kódu. Zkuste to znovu s novou hodnotou ...
 ErrorBothFieldCantBeNegative=Pole %s a %s nemohou být negativní
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Uživatelský účet <b>%s</b> použít ke spuštění webový server nemá oprávnění pro které
 ErrorNoActivatedBarcode=Žádný čárový kód aktivován typ
 ErrUnzipFails=Nepodařilo se rozbalit %s s ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index f7f6fde39a5..d2f00c116d8 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -8,7 +8,7 @@ Members=Členové
 MemberAccount=Vstup pro členy
 ShowMember=Zobrazit členskou kartu
 UserNotLinkedToMember=Uživatel není spojena s členem
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Členové Vstupenky
 FundationMembers=Členy Nadace
 Attributs=Atributy
@@ -85,8 +85,7 @@ SubscriptionLateShort=Pozdě
 SubscriptionNotReceivedShort=Nikdy nedostal
 ListOfSubscriptions=Seznam předplatné
 SendCardByMail=Poslat kartu e-mailem
-AddMember=Přidat člena
-MemberType=Členské typ
+AddMember=Create member
 NoTypeDefinedGoToSetup=Žádný člen definovány typy. Jdi na menu &quot;Členové typy&quot;
 NewMemberType=Nový člen typu
 WelcomeEMail=Vítejte e-mail
@@ -126,7 +125,7 @@ Date=Datum
 DateAndTime=Datum a čas
 PublicMemberCard=Členské veřejné karta
 MemberNotOrNoMoreExpectedToSubscribe=Člen, který nebo ne více očekává, že k odběru
-AddSubscription=Přidat předplatné
+AddSubscription=Create subscription
 ShowSubscription=Zobrazit předplatné
 MemberModifiedInDolibarr=Člen upraven v Dolibarr
 SendAnEMailToMember=Poslat e-mail Informace o členovi
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Poslední úpisu
 MembersStatisticsByCountries=Členové Statistiky podle země
 MembersStatisticsByState=Členové statistika stát / provincie
 MembersStatisticsByTown=Členové statistika podle města
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Počet členů
 NoValidatedMemberYet=Žádné ověřené členy nalezeno
 MembersByCountryDesc=Tato obrazovka vám ukáže statistiku členů jednotlivých zemích. Grafika však závisí na Google on-line služby grafu a je k dispozici pouze v případě, je připojení k internetu funguje.
@@ -202,3 +203,4 @@ MembersByNature=Členové od přírody
 VATToUseForSubscriptions=Sazba DPH se má použít pro předplatné
 NoVatOnSubscription=Ne TVA za upsaný vlastní kapitál
 MEMBER_PAYONLINE_SENDEMAIL=E-mail upozornit při Dolibarr obdržíte potvrzení o ověřenou platby za předplatné
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/cs_CZ/printipp.lang b/htdocs/langs/cs_CZ/printipp.lang
index 7ef2cd5649d..835e6827f12 100644
--- a/htdocs/langs/cs_CZ/printipp.lang
+++ b/htdocs/langs/cs_CZ/printipp.lang
@@ -1,18 +1,14 @@
-/*
- * Language code: cs_CZ
- * Automatic generated via autotranslator.php tool
- * Generation date 2013-10-26 11:58:10
- */
-
-
-// START - Lines generated via autotranslator.php tool (2013-10-26 11:58:10).
-// Reference language: en_US -> cs_CZ
-PrintIPPSetup=Nastavení modulu Přímý tisk
-PrintIPPDesc=Ce modul Permet d'un ajouter Bouton d'dojem přímé des dokumenty vers votre imprimante. Il requiert un systeme Linux Equipe de poháry.
-PRINTIPP_ENABLED=Zobrazit Piktogram &quot;Přímý tisk&quot; do seznamu dokumentů
-PRINTIPP_HOST=Tiskový server
-PRINTIPP_PORT=Přístav
-PRINTIPP_USER=Přihlášení
-PRINTIPP_PASSWORD=Heslo
-NoPrinterFound=Žádné tiskárny nalezeny (zkontrolujte poháry Nasta)
-// STOP - Lines generated via autotranslator.php tool (2013-10-26 12:39:36).
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 7829116108a..43becba423e 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Je-li výrobek je služba s omezeným trváním:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Počet cen
 MultiPriceLevelsName=Cenová kategorie
-AssociatedProductsAbility=Aktivace virtuální produkty se vyznačují
-AssociatedProducts=Virtuální produkt
-AssociatedProductsNumber=Počet výrobků tvořících tento virtuální produkt
-ParentProductsNumber=Počet mateřské virtuální produkt
-IfZeroItIsNotAVirtualProduct=Pokud je 0, tento produkt není virtuální produkt
-IfZeroItIsNotUsedByVirtualProduct=Je-li 0, je tento výrobek není používán žádným virtuální produkt
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Asociovat
 Translation=Překlad
 KeywordFilter=Klíčové slovo filtr
@@ -132,7 +132,7 @@ AddDel=Přidat / Smazat
 Quantity=Množství
 NoMatchFound=Ne nalezena shoda
 ProductAssociationList=Seznam souvisejících produktů / služeb: název produktu / služby (množství ovlivněny)
-ProductParentList=Seznam virtuálních produktů / služeb s tímto produktem jako součást
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Jedním z vybraného produktu je rodič s aktuální produkt
 DeleteProduct=Odstranění produktu / služby
 ConfirmDeleteProduct=Jste si jisti, že chcete smazat tento výrobek / službu?
@@ -179,7 +179,7 @@ CloneProduct=Clone produkt nebo službu
 ConfirmCloneProduct=Jste si jisti, že chcete klonovat produktů nebo služeb <b>%s?</b>
 CloneContentProduct=Klon všechny hlavní informace o produktu / služby
 ClonePricesProduct=Klonovat hlavní informace a ceny
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Tento produkt se používá
 NewRefForClone=Ref. nového produktu / služby
 CustomerPrices=Prodejní ceny
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 52d88d6a4dd..434b6b86f3d 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Tento pohled zobrazuje všechny projekty a úkoly (vaše uživatelské
 Myprojects=Moje projekty
 ProjectsArea=Projekty
 NewProject=Nový projekt
-AddProject=Přidat projekt
+AddProject=Create project
 DeleteAProject=Odstranit projekt
 DeleteATask=Odstranit úkol
 ConfirmDeleteAProject=Jste si jisti, že chcete smazat tento projekt?
@@ -36,6 +36,8 @@ TaskTimeSpent=Čas strávený na úkolech
 TaskTimeUser=Uživatel
 TaskTimeNote=Poznámka
 TaskTimeDate=Datum
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nový strávený čas
 MyTimeSpent=Můj strávený čas
 MyTasks=Moje úkoly
@@ -45,7 +47,7 @@ TaskDateStart=Datum zahájení úkolu
 TaskDateEnd=Datum ukončení úkolu
 TaskDescription=Popis úkolu
 NewTask=Nový úkol
-AddTask=Přidat úkol
+AddTask=Create task
 AddDuration=Přidat trvání
 Activity=Činnost
 Activities=Úkoly / činnosti
diff --git a/htdocs/langs/cs_CZ/resource.lang b/htdocs/langs/cs_CZ/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/cs_CZ/resource.lang
+++ b/htdocs/langs/cs_CZ/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index 086bf5db2b5..09545ace787 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Kredit na
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Zobrazit Natáhněte
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Odstoupení soubor
 SetToStatusSent=Nastavte na stav &quot;odeslaný soubor&quot;
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Platba %s trvalého příkazu bankou
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index d46556e6e38..92eb78a915a 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Brug automatisk udfyldning af felter til at vælge tred
 ActivityStateToSelectCompany= Tilføj en filter mulighed for at vise / skjule thirdparties, der i øjeblikket i aktivitet eller er ophørt den
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Brug automatisk udfyldning af felter til at vælge kontakt (i stedet for at bruge en liste).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Søg filtre optioner
 NumberOfKeyToSearch=NBR af tegn til at udløse søgning: %s
 ViewFullDateActions=Vis fuld datoer aktioner i tredje ark
@@ -208,6 +210,7 @@ ModulesJobDesc=Business moduler give simple foruddefineret opsætning af Dolibar
 ModulesMarketPlaceDesc=Du kan finde flere moduler for at downloade på eksterne hjemmesider på internettet ...
 ModulesMarketPlaces=Flere moduler ...
 DoliStoreDesc=DoliStore den officielle markedsplads for Dolibarr ERP / CRM eksterne moduler
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site udbydere kan du søge at finde flere moduler ...
 URL=Link
 BoxesAvailable=Bokse til rådighed
@@ -444,7 +447,7 @@ Module55Desc=Stregkoder 'ledelse
 Module56Name=Telefoni
 Module56Desc=Telefoni integration
 Module57Name=Stående ordrer
-Module57Desc=Stående ordrer og tilbagetrækninger 'ledelse
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integration
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Tilføj RSS feed inde Dolibarr skærmen sider
 Module330Name=Bogmærker
 Module330Desc=Bogmærker 'ledelse
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Kategorier
 Module1780Desc=Kategorier 'forvaltning (produkter, leverandører og kunder)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG Editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Elektronisk Content Management
 Module2500Desc=Gemme og dele dokumenter
 Module2600Name=WebServices
 Module2600Desc=Aktiver Dolibarr webtjenester server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Brug online Gravatar service (www.gravatar.com) for at vise foto af brugere / medlemmer (fundet med deres e-mails). Har brug for en internetadgang
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PAYBOX
 Module50000Desc=Modul til at tilbyde en online betaling side med kreditkort med PAYBOX
 Module50100Name=Cash desk
@@ -527,7 +534,7 @@ Module50200Desc=Modul til at tilbyde en online betaling side med kreditkort med
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup gemt
 BackToModuleList=Tilbage til moduler liste
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Faste search form på venstre menu
 DefaultLanguage=Standard sprog til brug (sprog code)
 EnableMultilangInterface=Aktiver flersproget grænseflade
 EnableShowLogo=Vis logo på venstre menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Dit system er blevet opdateret med succes
 CompanyInfo=Company / fundament oplysninger
 CompanyIds=Company / fundament identiteter
diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang
index bafe7810175..577f4ba40ef 100644
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Aktioner påvirkes i
 ActionsDoneBy=Aktioner udført af
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Alle mine handlinger / opgaver
 AllActions= Alle les handlinger / opgaver
 ViewList=Vis liste
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index 23ddcc67510..ded8d2c0619 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Kalkulations mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/da_DK/contracts.lang b/htdocs/langs/da_DK/contracts.lang
index f46b393f678..73a7e126d9e 100644
--- a/htdocs/langs/da_DK/contracts.lang
+++ b/htdocs/langs/da_DK/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Liste over kører kontrakt linjer
 ListOfRunningServices=Liste over kører tjenester
 NotActivatedServices=Ikke aktiverede tjenester (blandt valideret kontrakter)
 BoardNotActivatedServices=Tjenester for at aktivere blandt valideret kontrakter
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Seneste %s aktiveret tjenester
 LastModifiedServices=Seneste %s modificerede tjenester
 EditServiceLine=Rediger service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Salg repræsentant, der underskriver kontrakt
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index ca87688e893..2b99a1f9166 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Leverandør kode kræves
 ErrorSupplierCodeAlreadyUsed=Leverandør koden allerede anvendes
 ErrorBadParameters=Bad parametre
 ErrorBadValueForParameter=Forkert værdi &quot;%s&quot; for parameter forkerte &quot;%s forb.
-ErrorBadImageFormat=Billede fil har ikke et understøttet format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Værdi '%s' har forkert datoformat
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Det lykkedes ikke at skrive i mappen %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Bruger med <b>login %s</b> kunne ikke findes.
 ErrorLoginHasNoEmail=Denne bruger har ingen e-mail-adresse. Processen afbrydes.
 ErrorBadValueForCode=Bad værdi former for kode. Prøv igen med en ny værdi ...
 ErrorBothFieldCantBeNegative=Fields %s og %s kan ikke være både negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Brugerkonto <b>%s</b> anvendes til at udføre web-server har ikke tilladelse til at
 ErrorNoActivatedBarcode=Ingen stregkode aktiveret typen
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index c638bb3c968..c0a8555be79 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -8,7 +8,7 @@ Members=Medlemmer
 MemberAccount=Medlem login
 ShowMember=Vis medlem kortet
 UserNotLinkedToMember=Brugeren ikke er knyttet til et medlem
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Medlemmer Billetter
 FundationMembers=Instituttets medlemmer
 Attributs=Attributter
@@ -85,8 +85,7 @@ SubscriptionLateShort=Sen
 SubscriptionNotReceivedShort=Aldrig modtaget
 ListOfSubscriptions=Liste over abonnementer
 SendCardByMail=Send kort
-AddMember=Tilføj medlem
-MemberType=Medlem type
+AddMember=Create member
 NoTypeDefinedGoToSetup=Intet medlem definerede typer. Gå til opsætning - Medlemmer typer
 NewMemberType=Nyt medlem type
 WelcomeEMail=Velkommen e-mail
@@ -126,12 +125,12 @@ Date=Dato
 DateAndTime=Dato og tid
 PublicMemberCard=Medlem offentlige kortet
 MemberNotOrNoMoreExpectedToSubscribe=Medlem ikke eller ikke længere forventes at abonnere
-AddSubscription=Tilføj abonnement
+AddSubscription=Create subscription
 ShowSubscription=Vis tegning
 MemberModifiedInDolibarr=Medlem ændret i Dolibarr
 SendAnEMailToMember=Send information email til medlem
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-mail emne til medlem autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=EMail for medlem autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=E-mail emne til medlem validering
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=E-mail emne til medlem resiliation
 DescADHERENT_MAIL_RESIL=E-mail for medlem resiliation
 DescADHERENT_MAIL_FROM=Sender e-mail for automatiske e-mails
 DescADHERENT_ETIQUETTE_TYPE=Etiketter format
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format af kort side
 DescADHERENT_CARD_HEADER_TEXT=Tekst trykt på toppen af medlem-kort
 DescADHERENT_CARD_TEXT=Tekst påtrykt medlem kort
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Nr. tredjepart forbundet til dette medlem
 ThirdPartyDolibarr=Dolibarr tredjepart
 MembersAndSubscriptions= Medlemmer og Subscriptions
 MoreActions=Supplerende aktion om kontrolapparatet
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=Opret en direkte transaktion record på grund
 MoreActionBankViaInvoice=Opret en faktura og acontobeløb
 MoreActionInvoiceOnly=Opret en faktura uden betaling
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Sidste tegningsbeløbet
 MembersStatisticsByCountries=Medlemmer statistik efter land
 MembersStatisticsByState=Medlemmer statistikker stat / provins
 MembersStatisticsByTown=Medlemmer statistikker byen
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Antal medlemmer
 NoValidatedMemberYet=Ingen validerede medlemmer fundet
 MembersByCountryDesc=Denne skærm viser dig statistikker over medlemmer af lande. Grafisk afhænger dog på Google online-graf service og er kun tilgængelig, hvis en internetforbindelse virker.
@@ -196,9 +197,10 @@ Collectivités=Organisationer
 Particuliers=Personlig
 Entreprises=Virksomheder
 DOLIBARRFOUNDATION_PAYMENT_FORM=For at gøre dit abonnement betaling med en bankoverførsel, se side <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> At betale med kreditkort eller Paypal, klik på knappen nederst på denne side. <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 332c8629569..b267137b5e1 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Hvis produktet er en tjeneste med begrænset varighed:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Antal pris
 MultiPriceLevelsName=Pris kategorier
-AssociatedProductsAbility=Aktiver tilhørende produkter
-AssociatedProducts=Tilhørende produkter
-AssociatedProductsNumber=Antallet af tilknyttede produkter
-ParentProductsNumber=Antal forælder produkt
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Oversættelse
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Tilføj / Slet
 Quantity=Mængde
 NoMatchFound=Ingen match fundet
 ProductAssociationList=Liste over relaterede produkter / tjenesteydelser: navn på produkt / tjeneste (mængde påvirkes)
-ProductParentList=Liste over produkter / services med dette produkt som en komponent
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=En af valgte produkt er moderselskab med aktuelle produkt
 DeleteProduct=Slet et produkt / service
 ConfirmDeleteProduct=Er du sikker på du vil slette dette produkt / service?
@@ -179,7 +179,7 @@ CloneProduct=Klon vare eller tjenesteydelse
 ConfirmCloneProduct=Er du sikker på at du vil klone vare eller <b>tjenesteydelse %s?</b>
 CloneContentProduct=Klon alle de vigtigste informationer af produkt / service
 ClonePricesProduct=Klon vigtigste informationer og priser
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Dette produkt er brugt
 NewRefForClone=Ref. af nye produkter / ydelser
 CustomerPrices=Kunder priser
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 1ce1b5f81bd..db358f6bdad 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Dette synspunkt præsenterer alle projekter og opgaver (din brugertill
 Myprojects=Mine projekter
 ProjectsArea=Projekter område
 NewProject=Nyt projekt
-AddProject=Tilføj projekt
+AddProject=Create project
 DeleteAProject=Slet et projekt
 DeleteATask=Slet en opgave
 ConfirmDeleteAProject=Er du sikker på du vil slette dette projekt?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Ny tid
 MyTimeSpent=Min tid
 MyTasks=Mine opgaver
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Ny opgave
-AddTask=Tilføj opgave
+AddTask=Create task
 AddDuration=Tilføj varighed
 Activity=Aktivitet
 Activities=Opgaver / aktiviteter
diff --git a/htdocs/langs/da_DK/resource.lang b/htdocs/langs/da_DK/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/da_DK/resource.lang
+++ b/htdocs/langs/da_DK/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index fb881515567..11dda452e35 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Kredit på
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Vis Træk
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hvis faktura mindst en tilbagetrækning betaling endnu ikke behandlet, vil den ikke blive angivet som betales for at tillade at styre tilbagetrækning før.
-DoStandingOrdersBeforePayments=Denne faner giver dig mulighed for at anmode om en stående ordre. Når den bliver færdig, kan du skrive betalingen for at lukke fakturaen.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Betaling af stående ordre %s af banken
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index f1168a1fce5..bf4499985bc 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Suchfeld statt Listenansicht für Partnerauswahl verwen
 ActivityStateToSelectCompany= Setzt einen Filter um Partner ein-/ausblenden, welche aktiv oder inaktiv sind.
 UseSearchToSelectContactTooltip=Wenn Sie eine große Anzahl von Kontakten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante CONTACT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 UseSearchToSelectContact=Suchfeld statt Listenansicht für Kontaktauswahl verwenden.
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Suchfilter Optionen
 NumberOfKeyToSearch=Anzahl der Buchstaben um eine Suche auszulösen: %s
 ViewFullDateActions=Zeige alle Terminaktionen in der Partneransicht
@@ -208,6 +210,7 @@ ModulesJobDesc=Die Geschäftstypenmodule erlauben eine einfache Einrichtung des
 ModulesMarketPlaceDesc=Hier finden Sie weitere Module auf externen Web-Sites
 ModulesMarketPlaces=Sie können zusätzliche Module im Web finden...
 DoliStoreDesc=DoliStore, der offizielle Marktplatz für dolibarr Module/Erweiterungen
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Website-Anbieter für Ihre Suche nach weiteren Modulen
 URL=Link
 BoxesAvailable=Verfügbare Boxen
@@ -396,7 +399,7 @@ ValueOverwrittenByUserSetup=Achtung, dieser Wert kann durch den Benutzer übersc
 ExternalModule=Externes Modul - im Verzeichnis %s installiert
 BarcodeInitForThirdparties=Alle Strichcodes für Drittanbieter initialisieren
 BarcodeInitForProductsOrServices=Alle Strichcodes für Produkte oder Services initialisieren oder zurücksetzen
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
+CurrentlyNWithoutBarCode=Zur Zeit gibt es <strong>%s</strong> Datensätze in <strong>%s</strong> ohne Barcode.
 InitEmptyBarCode=Startwert für die nächsten %s leeren Datensätze
 EraseAllCurrentBarCode=Alle aktuellen Barcode-Werte löschen
 ConfirmEraseAllCurrentBarCode=Möchten Sie wirklich alle aktuellen Barcodes löschen?
@@ -437,14 +440,14 @@ Module52Name=Produktbestände
 Module52Desc=Produktbestandsverwaltung
 Module53Name=Leistungen
 Module53Desc=Leistungs-Verwaltung
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Kontrakte/Abonnements
+Module54Desc=Kontraktverwaltung (Dienstleistungen oder sich wiederholende Abos)
 Module55Name=Barcodes
 Module55Desc=Barcode-Verwaltung
 Module56Name=Telefonie
 Module56Desc=Telefonie-Integration
 Module57Name=Daueraufträge
-Module57Desc=Daueraufträge und Retourenverwaltung (RMA)
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial-Integration
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS-Feed
 Module320Desc=RSS-Feed-Bildschirm innerhalb des Systems anzeigen
 Module330Name=Lesezeichen
 Module330Desc=Lesezeichenverwaltung
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webkalender
 Module410Desc=Webkalenderintegration
 Module500Name=Sonderausgaben (Steuern, Sozialbeiträge und Dividenden)
@@ -495,6 +498,8 @@ Module1780Name=Kategorien
 Module1780Desc=Kategorienverwaltung (Produkte, Lieferanten und Kunden)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG-Editor
+Module2200Name=Dynamische Preise
+Module2200Desc=Mathematische Ausdrücke für Preise aktivieren
 Module2300Name=Cron
 Module2300Desc=Verwaltung geplanter Aufgaben
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Inhaltsverwaltung(ECM)
 Module2500Desc=Speicherung und Verteilung von Dokumenten
 Module2600Name=WebServices
 Module2600Desc=Aktivieren Sie Verwendung von Webservices
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Verwenden Sie den online Gravatar-Dienst (www.gravatar.com) für die Anzeige von Benutzer- und Mitgliederbildern (Zuordnung über E-Mail-Adressen). Hierfür benötigen Sie eine aktive Internetverbindung
 Module2800Desc=FTP-Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Urlaubsantrags-Verwaltung
 Module20000Desc=Definieren und beobachten sie die Urlaubsanträge Ihrer Angestellten.
 Module39000Name=Produktstapel
-Module39000Desc=Batch-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum auf Produkten
+Module39000Desc=Chargen- oder Serien-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum auf Produkten
 Module50000Name=PayBox
 Module50000Desc=Über dieses Modul können Sie online Kreditkartenzahlungen entgegennehmen
 Module50100Name=Kasse
@@ -527,7 +534,7 @@ Module50200Desc=Mit diesem Modul können Sie via PayPal Online Kreditkartenzahlu
 Module50400Name=Buchhaltung (erweitert)
 Module50400Desc=Buchhaltung für Experten (doppelte Buchhaltung)
 Module54000Name=PrintIPP
-Module54000Desc=Mit Cups IPP Drucker ausdrucken.
+Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP (Drucker muss vom Server aus sichtbar sein und auf dem Server muss CUPS installiert sein)
 Module55000Name=Open Poll
 Module55000Desc=Modul um online Umfragen zu starten. (Wie Doodle, Studs, Rdvz,...)
 Module59000Name=Gewinnspannen
@@ -606,11 +613,11 @@ Permission151=Daueraufträge einsehen
 Permission152=Dauerauftragsanträge erstellen/bearbeiten
 Permission153=Dauerauftragsbelege übertragen
 Permission154=Dauerauftragsbelege kreditieren/ablehnen
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Kontrakte/Abonnements einsehen
+Permission162=Kontrakte/Abonnements erstellen/bearbeiten
+Permission163=Dienstleistungen/Abonnements in einem Vertrag aktivieren
+Permission164=Dienstleistungen/Abonnements in einem Vertrag deaktivieren
+Permission165=Kontrakt/Abonnement löschen
 Permission171=Reisen und Spesen einsehen (eigene und Untergebene)
 Permission172=Reisen und Spesen erstellen/ändern
 Permission173=Reisen und Spesen löschen
@@ -672,7 +679,7 @@ Permission300=Barcodes einsehen
 Permission301=Barcodes erstellen/bearbeiten
 Permission302=Barcodes löschen
 Permission311=Leistungen lesen
-Permission312=Assign service/subscription to contract
+Permission312=Leistung/Abonnement einem Vertrag zuordnen
 Permission331=Lesezeichen einsehen
 Permission332=Lesezeichen erstellen/bearbeiten
 Permission333=Lesezeichen löschen
@@ -702,8 +709,8 @@ Permission701=Spenden einsehen
 Permission702=Spenden erstellen/bearbeiten
 Permission703=Spenden löschen
 Permission1001=Warenbestände einsehen
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Warenlager erstellen/ändern
+Permission1003=Warenlager löschen
 Permission1004=Lagerbewegungen einsehen
 Permission1005=Lagerbewegungen erstellen/bearbeiten
 Permission1101=Lieferscheine einsehen
@@ -765,7 +772,7 @@ DictionaryCivility=Anredeformen
 DictionaryActions=Maßnahmen
 DictionarySocialContributions=Sozialbeitragstypen
 DictionaryVAT=MwSt.-Sätze
-DictionaryRevenueStamp=Amount of revenue stamps
+DictionaryRevenueStamp=Anzahl der Steuermarken
 DictionaryPaymentConditions=Zahlungsbedingungen
 DictionaryPaymentModes=Zahlungsarten
 DictionaryTypeContact=Kontaktarten
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Bestellmethoden
 DictionarySource=Quelle der Angebote/Bestellungen
 DictionaryAccountancyplan=Kontenplan
 DictionaryAccountancysystem=Kontenplan Modul
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup gespeichert
 BackToModuleList=Zurück zur Modulübersicht
 BackToDictionaryList=Zurück zur Wörterbuchübersicht
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Ständiges Suchfeld auf der linken Seite
 DefaultLanguage=Standardsprache der Anwendung (Sprachcode)
 EnableMultilangInterface=Mehrsprachigkeit aktivieren
 EnableShowLogo=Logo über dem linken Menü anzeigen
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Das System wurde erfolgreich aktualisiert
 CompanyInfo=Firmen-/Stiftungsinformationen
 CompanyIds=Firmen-/Stiftungs-IDs
@@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Generiert einen Kontierungscode %s, gefolgt von der Li
 ModuleCompanyCodePanicum=Generiert einen leeren Kontierungscode.
 ModuleCompanyCodeDigitaria=Kontierungscode hängt vom Partnercode ab. Der Code setzt sich aus dem Buchstaben 'C' und den ersten 5 Stellen des Partnercodes zusammen.
 UseNotifications=Benachrichtigungen verwenden
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
+NotificationsDesc=E-Mail-Benachrichtigungsfunktionen erlauben Ihnen den stillschweigenden Versand automatischer Benachrichtigungen zu einigen Dolibarr-Ereignissen. Ziele dafür können definiert werden:<br>* pro Partner-Kontakt (Kunden oder Lieferanten), ein Partner zur Zeit.<br>* durch das Setzen einer globalen Ziel-Mail-Adresse in den Modul-Einstellungen
 ModelModules=Dokumentvorlagenmodul
 DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt- oder .ods-Dateien für OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Wasserzeichen auf Entwurf
@@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Intervention Nummerierung Module
 TemplatePDFInterventions=Intervention Karte Dokumenten Modelle
 WatermarkOnDraftInterventionCards=Wasserzeichen auf Interventionskarte Dokumente (keins, wenn leer)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Kontrakte/Abonnements-Modul Einstellungen
 ContractsNumberingModules=Verträge Nummerierung Module
 TemplatePDFContracts=Vertragsvorlagen
 FreeLegalTextOnContracts=Freier Text auf Verträgen
@@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=Dateien vom Typ %s werden vom HTTP Server nicht komprim
 CacheByServer=Vom Server zwischengespeichert
 CacheByClient=Vom Browser zwischengespeichert
 CompressionOfResources=Komprimierung von HTTP Antworten
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=Automatische Erkennung mit den aktuellen Browsern nicht möglich
 ##### Products #####
 ProductSetup=Produktmoduleinstellungen
 ServiceSetup=Dienstleistungen Modul Setup
@@ -1415,8 +1424,8 @@ OSCommerceTestOk=Verbindung zum Server '%s' für Datenbank '%s' mit Benutzer '%s
 OSCommerceTestKo1=Verbindung zum Server '%s' erfolgreich, aber Datenbank '%s' konnte nicht erreicht werden.
 OSCommerceTestKo2=Verbindung zum Server '%s' mit dem Benutzer '%s' fehlgeschlagen.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
+StockSetup=Warenlager-Modul Einstellungen
+UserWarehouse=Persönliche Warenläger verwenden
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menü gelöscht
@@ -1482,12 +1491,12 @@ ClickToDialDesc=Dieses Modul fügt ein Symbols nach Telefonnummern ein, bei dess
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Point of Sales
 CashDeskSetup=Kassenmoduleinstellungen
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Standardpartner für Kassenverkäufe 
 CashDeskBankAccountForSell=Standard-Bargeldkonto für Kassenverkäufe (erforderlich)
 CashDeskBankAccountForCheque= Finanzkonto für Scheckeinlösungen
 CashDeskBankAccountForCB= Finanzkonto für die Einlösung von Bargeldzahlungen via Kreditkarte
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+CashDeskIdWareHouse=Lager für Entnahmen festlegen und und erzwingen
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
@@ -1552,4 +1561,4 @@ NoAmbiCaracAutoGeneration=Verwende keine mehrdeutigen Zeichen ("1", "l", "i", "|
 SalariesSetup=Setup of module salaries
 SortOrder=Sortierreihenfolge
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Kunden-Zahlungs-Typ, 1:Lieferanten-Zahlungs-Typ, 2:Sowohl Kunden- als auch Lieferanten-Zahlungs-Typ
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index 1590b3464b3..cdf2c1620ab 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Termine zugewiesen an
 ActionsDoneBy=Termine erledigt von
 ActionsForUser=Maßnahmen für Benutzer
 ActionsForUsersGroup=Maßnahmen für alle Benutzer der Gruppe
+ActionAssignedTo=Event assigned to
 AllMyActions= Alle meine Termine/Aufgaben
 AllActions= Alle Termine / Aufgaben
 ViewList=Listenansicht
@@ -44,7 +45,7 @@ AgendaExtSitesDesc=Diese Seite erlaubt Ihnen externe Kalender zu konfigurieren.
 ActionsEvents=Veranstaltungen zur automatischen Übernahme in die Agenda
 PropalValidatedInDolibarr=Angebot freigegeben
 InvoiceValidatedInDolibarr=Rechnung freigegeben
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Rechnung %s von POS validiert
 InvoiceBackToDraftInDolibarr=Rechnung %s in den Entwurf Status zurücksetzen
 InvoiceDeleteDolibarr=Rechnung %s gelöscht
 OrderValidatedInDolibarr= Bestellung %s freigegeben
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index e1d23dec501..13aa22245fc 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=Wählen Sie die geeignete Methode, um zum gleichen E
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Berechnungsmodus
 AccountancyJournal=Buchhaltungscode-Journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Dienstleistungen zu kaufen
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Dienstleistungen zu verkaufen
 ACCOUNTING_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt einzuziehen
 ACCOUNTING_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang
index bd84dd8ed7e..0027d817391 100644
--- a/htdocs/langs/de_DE/contracts.lang
+++ b/htdocs/langs/de_DE/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Vertragsübersicht
 ListOfContracts=Liste der Verträge
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Letzte %s geänderte Kontrakte
 AllContracts=Alle Verträge
 ContractCard=Vertragskarte
 ContractStatus=Vertragsstatus
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Liste der aktiven Vertragspositionen
 ListOfRunningServices=Liste aktiver Services
 NotActivatedServices=Inaktive Services (in freigegebenen Verträgen)
 BoardNotActivatedServices=Zu aktivierende Services (in freigegebenen Verträgen)
-LastContracts=Last % contracts
+LastContracts=Letzte %s Kontrakte
 LastActivatedServices=%s zuletzt aktivierte Services
 LastModifiedServices=%s zuletzt bearbeitete Services
 EditServiceLine=Service-Position bearbeiten
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Liste der Services die ablaufen
 NoteListOfYourExpiredServices=Diese Liste enthält nur Dienstleistungen an Partner, bei denen Sie als Vertreter Angegeben sind. 
 StandardContractsTemplate=Standard Vertragsschablone 
 ContactNameAndSignature=Für %s, Name und Unterschrift
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Vertragsunterzeichnung durch Vertreter
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index f63c423a33c..dddf3eb47c6 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=In Unix-Umgebungen sollte man crontab benutzen um die Ko
 CronExplainHowToRunWin=In Microsoft(tm) Windows kannst Du die Aufgabenplanung benutzen um die Kommandozeile jede Minute aufzurufen
 # Menu
 CronJobs=Geplante Jobs
-CronListActive=List of active/scheduled jobs
+CronListActive=Liste der aktiven/geplanten Jobs
 CronListInactive=Liste der deaktivierten Jobs
 # Page list
 CronDateLastRun=Letzte Ausführung
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index c509a7ce090..55b246e3c98 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Lieferanten-Nr. erforderlich
 ErrorSupplierCodeAlreadyUsed=Diese Lieferanten Nr. ist bereits vergeben.
 ErrorBadParameters=Ungültige Werte
 ErrorBadValueForParameter=Falscher Wert '%s' für falsche Parameter '%s'
-ErrorBadImageFormat=Imagedatei hat nicht ein unterstütztes Dateiformat
+ErrorBadImageFormat=Bildformat nicht unsterstützt (Ihr PHP hat keine Konvertierungsfunktion für dieses Format)
 ErrorBadDateFormat=Eintrag '%s' hat falsche Datumsformat
 ErrorWrongDate=Falsches Datum!
 ErrorFailedToWriteInDir=Fehler beim Schreiben in das Verzeichnis %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Benutzer mit Anmeldung <b>%s</b> konnte nicht gefunden w
 ErrorLoginHasNoEmail=Dieser Benutzer hat keine E-Mail-Adresse. Prozess abgebrochen.
 ErrorBadValueForCode=Unzulässiger Code-Wert. Versuchen Sie es mit einem anderen Wert erneut...
 ErrorBothFieldCantBeNegative=Die Felder %s und %s können nicht gleichzeitig negativ sein
+ErrorQtyForCustomerInvoiceCantBeNegative=Mengen in Kundenrechnungen dürfen nicht negativ sein
 ErrorWebServerUserHasNotPermission=Der Benutzerkonto <b>%s</b> wurde verwendet um auf dem Webserver etwas auszuführen, hat aber keine Rechte dafür.
 ErrorNoActivatedBarcode=Kein Barcode aktiviert
 ErrUnzipFails=Fehler beim Entpacken von %s mit ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fehler: Dieses Mitglied ist no
 ErrorThereIsSomeDeliveries=Fehler: Lieferung(en) zu dieser Sendung vorhanden. Löschen nicht möglich.
 ErrorCantDeletePaymentReconciliated=Eine Zahlung, deren Bank-Transaktion schon abgeglichen wurde, kann nicht gelöscht werden
 ErrorCantDeletePaymentSharedWithPayedInvoice=Eine Zahlung, die zu mindestens einer als bezahlt markierten Rechnung gehört, kann nicht entfernt werden
+ErrorPriceExpression1=Zur Konstanten '%s' kann nicht zugewiesen werden
+ErrorPriceExpression2=Die eingebaute Funktion '%s' kann nicht neu definiert werden
+ErrorPriceExpression3=Nicht definierte Variable '%s' in Funktionsdefinition
+ErrorPriceExpression4=Nicht erlaubtes Zeichen '%s'
+ErrorPriceExpression5='%s' unerwartet
+ErrorPriceExpression6=Falsche Anzahl Argumente (%s angegeben, %s erwartet)
+ErrorPriceExpression8=Unerwarteter operator '%s'
+ErrorPriceExpression9=Ein unerwarteter Fehler ist aufgetreten
+ErrorPriceExpression10=Operand fehlt bei Operator '%s' 
+ErrorPriceExpression11='%s' erwartet
+ErrorPriceExpression14=Division durch Null
+ErrorPriceExpression17=Nicht definierte Variable '%s
+ErrorPriceExpression19=Ausdruck nicht gefunden
+ErrorPriceExpression20=Leerer Ausdruck
+ErrorPriceExpression21=Leeres Ergebnis '%s'
+ErrorPriceExpression22=Negatives Ergebnis '%s'
+ErrorPriceExpressionInternal=Interner Fehler '%s'
+ErrorPriceExpressionUnknown=Unbekannter Fehler '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert
@@ -155,5 +174,5 @@ WarningUsingThisBoxSlowDown=Warnung: Der Einsatz dieser Box verlangsamt sämtlic
 WarningClickToDialUserSetupNotComplete=Die ClickToDial-Informationen für Ihren Benutzer sind nicht vollständig (siehe Registerkarte ClickToDial auf Ihrer Benutzerkarte).
 WarningNotRelevant=Operation für dieses Daten-Set nicht relevant
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funktion deaktiviert, wenn die Bildschirm-Ausgabe für Blinde oder Text-Browser optimiert ist.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningPaymentDateLowerThanInvoiceDate=Zahlungsdatum (%s) liegt vor dem Rechnungsdatum (%s) für Rechnung %s.
+WarningTooManyDataPleaseUseMoreFilters=Zu viele Ergebnisse. Bitte nutzen Sie mehr Filter
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 881b4946d83..8a91a8911c4 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -115,7 +115,7 @@ SentBy=Gesendet von
 MailingNeedCommand=Aus Sicherheitsgründen sollten E-Mails von der Kommandozeile aus versandt werden. Bitten Sie Ihren Server Administrator um die Ausführung des folgenden Befehls, um den Versand an alle Empfänger zu starten:
 MailingNeedCommand2=Sie können den Versand jedoch auch online starten, indem Sie den Parameter MAILING_LIMIT_SENDBYWEB auf den Wert der pro Sitzung gleichzeitig zu versendenden Mails setzen. Die entsprechenden Einstellungen finden Sie unter Übersicht-Einstellungen-Andere.
 ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Hinweis: Aus Sicherheits- und Zeitüberschreitungsgründen ist der Online-Versand von E-Mails auf <b>%s</b> Empfänger je Sitzung beschränkt.
 TargetsReset=Liste leeren
 ToClearAllRecipientsClickHere=Klicken Sie hier, um die Empfängerliste zu leeren
 ToAddRecipientsChooseHere=Fügen Sie Empfänger über die Listenauswahl hinzu
@@ -124,7 +124,7 @@ NbOfEMailingsSend=Massenmails versandt
 IdRecord=Eintrag-ID
 DeliveryReceipt=Zustellbestätigung
 YouCanUseCommaSeparatorForSeveralRecipients=Trennen Sie mehrere Empfänger mit einem <b>Komma</b>
-TagCheckMail=Track mail opening
+TagCheckMail=Öffnen der Mail verfolgen
 TagUnsubscribe=Abmelde Link
 TagSignature=Signatur des Absenders
 TagMailtoEmail=E-Mailadresses des Empfängers
@@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=%s Benachrichtigungen werden per E-Mail versandt
 AddNewNotification=Neues E-Mail-Beachrichtigungsziel aktivieren
 ListOfActiveNotifications=Liste aller aktiven E-Mail-Beachrichtigungsziele
 ListOfNotificationsDone=Liste aller versandten E-Mail Benachrichtigungen
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs=Der E-Mail-Versand wurde auf '%s' konfiguriert. Dieser Modus kann nicht für Massen-Mails verwendet werden.
+MailSendSetupIs2=Sie müssen zuerst mit einem Admin-Konto im Menü %sHome - Einstellungen - EMails%s den Parameter <strong>'%s'</strong> auf den Modus '%s' ändern. Dann können Sie die Daten des SMTP-Servers von Ihrem Internetdienstanbieter eingeben und die Masse-E-Mail-Funktion nutzen.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index 3bbcef686ed..02362bbd665 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -85,8 +85,7 @@ SubscriptionLateShort=Verspätet
 SubscriptionNotReceivedShort=Nie erhalten
 ListOfSubscriptions=Liste der Abonnements
 SendCardByMail=Karte per E-Mail versenden
-AddMember=Mitglied hinzufügen
-MemberType=Mitgliedsart
+AddMember=Mitglied erstellen
 NoTypeDefinedGoToSetup=Sie haben noch keine Mitgliedsarten definiert. Sie können dies unter Einstellungen-Mitgliedsarten vornehmen.
 NewMemberType=Neue Mitgliedsart
 WelcomeEMail=Willkommen E-Mail
@@ -126,7 +125,7 @@ Date=Datum
 DateAndTime=Datum und Uhrzeit
 PublicMemberCard=Öffentliche Mitgliedskarte
 MemberNotOrNoMoreExpectedToSubscribe=Mitglied ohne (und ohne Aussicht auf) Abonnement
-AddSubscription=Abonnement hinzufügen
+AddSubscription=Abonnement erstellen
 ShowSubscription=Zeige Abonnement
 MemberModifiedInDolibarr=Mitglied bearbeitet
 SendAnEMailToMember=Informations-E-Mail an Mitglied senden
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Mit diesem Mitglied ist kein Partner verknüpft
 ThirdPartyDolibarr=Partner
 MembersAndSubscriptions= Mitglieder und Abonnements
 MoreActions=Ergänzende Erfassungsmaßnahmen
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=Autom. einen Einzugsermächtigunsantrag zum Mitgliedskonto erstellen
 MoreActionBankViaInvoice=Autom. eine Rechnung zum Mitgliedskonto erstellen und Zahlung auf Rechnung setzen
 MoreActionInvoiceOnly=Autom. eine Rechnung (ohne Zahlung) erstellen
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Letzter Abo-Betrag
 MembersStatisticsByCountries=Mitgliederstatistik nach Ländern
 MembersStatisticsByState=Mitgliederstatistik nach Bundesländern
 MembersStatisticsByTown=Mitgliederstatistik nach Städten
+MembersStatisticsByRegion=Mitgliederstatistik nach Region
+MemberByRegion=Mitglieder nach Region
 NbOfMembers=Anzahl der Mitglieder
 NoValidatedMemberYet=Kein freizugebenden Mitglieder gefunden
 MembersByCountryDesc=Diese Form zeigt Ihnen die Mitgliederstatistik nach Ländern. Die Grafik basiert auf Googles Online-Grafik-Service ab und funktioniert nur wenn eine Internverbindung besteht.
@@ -196,9 +197,10 @@ Collectivités=Organisationen
 Particuliers=Privatpersonen
 Entreprises=Unternehmen
 DOLIBARRFOUNDATION_PAYMENT_FORM=Um Ihre Beitragszahlung mit einer Banküberweisung auszuführen, gehen Sie zur Seite: <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>Um mittels Kreditkarte zu zahlen, klicken Sie auf den Button am Seitenende.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=nach Eigenschaften
+MembersStatisticsByProperties=Mitgliederstatistik nach Eigenschaften
+MembersByNature=Members by nature
+VATToUseForSubscriptions=Mehrwertsteuersatz für Abonnements
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 3d82f643187..e222cf88f90 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -118,11 +118,11 @@ MultiPricesAbility=Mehrere Preisstufen pro Produkt/Dienstleistung
 MultiPricesNumPrices=Anzahl Preise
 MultiPriceLevelsName=Preiskategorien
 AssociatedProductsAbility=Untergeordnete Produkte aktivieren
-AssociatedProducts=Unterprodukte
+AssociatedProducts=Package product
 AssociatedProductsNumber=Anzahl der Unterprodukte
-ParentProductsNumber=Anzahl der übergeordnete Produkt
-IfZeroItIsNotAVirtualProduct=Fall 0 eingestellt ist, ist das Produkt kein Unterprodukt
-IfZeroItIsNotUsedByVirtualProduct=Fall 0 eingestellt ist, wird das Produkt von keinem Unterprodukt verwendet
+ParentProductsNumber=Anzahl der übergeordneten Produkte
+IfZeroItIsNotAVirtualProduct=Falls 0 ist das Produkt kein Unterprodukt
+IfZeroItIsNotUsedByVirtualProduct=Falls 0 wird das Produkt von keinem Unterprodukt verwendet
 EditAssociate=Verbinden
 Translation=Übersetzung
 KeywordFilter=Stichwortfilter
@@ -132,7 +132,7 @@ AddDel=Hinzufügen/Löschen
 Quantity=Stückzahl
 NoMatchFound=Kein Eintrag gefunden
 ProductAssociationList=Liste der verknüpften Produkte/Leistungen: Name des Produkts/der Leistung (Stückzahl)
-ProductParentList=Liste der Produkte / Dienstleistungen mit diesem Produkt als ein Bestandteil
+ProductParentList=Liste der Produkte / Dienstleistungen mit diesem Produkt als Bestandteil
 ErrorAssociationIsFatherOfThis=Eines der ausgewählten Produkte ist Elternteil des aktuellen Produkts
 DeleteProduct=Produkt/Dienstleistung löschen
 ConfirmDeleteProduct=Möchten Sie dieses Produkt/Leistung wirklich löschen?
@@ -144,7 +144,7 @@ ExportDataset_service_1=Dienstleistungen
 ImportDataset_produit_1=Produkte
 ImportDataset_service_1=Dienstleistungen
 DeleteProductLine=Produktlinie löschen
-ConfirmDeleteProductLine=Möchten Sie diese Produktlinie wirklich löschen?
+ConfirmDeleteProductLine=Möchten Sie diese Position wirklich löschen?
 NoProductMatching=Kein Produkt/Leistung entspricht Ihren Suchkriterien
 MatchingProducts=Passende Produkte/Leistungen
 NoStockForThisProduct=Kein Warenbestand für dieses Produkt
@@ -179,7 +179,7 @@ CloneProduct=Produkt/Leistung duplizieren
 ConfirmCloneProduct=Möchten Sie die Leistung <b>%s</b> wirklich duplizieren?
 CloneContentProduct=Allgemeine Informationen des Produkts/Leistungen duplizieren
 ClonePricesProduct=Allgemeine Informationen und Preise duplizieren
-CloneCompositionProduct=Unterprodukt/-Dienstleistung duplizieren
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Produkt in Verwendung
 NewRefForClone=Artikel-Nr. des neuen Produkts/Leistungen
 CustomerPrices=Kundenpreise
@@ -237,8 +237,13 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Preis des Kunden
 PriceCatalogue=Einzigartiger Preis pro Produkt/Dienstleistung
 PricingRule=Preisregeln
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Preis je Kunde hinzufügen
 ForceUpdateChildPriceSoc=Lege den gleichen Preis für Kunden-Tochtergesellschaften fest
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimaler Preis kann nicht kleiner als %s sein
 MinimumRecommendedPrice=Minimaler empfohlener Preis: %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Nummer
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 3569bc378b6..107b4eef252 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -36,6 +36,8 @@ TaskTimeSpent=Zeitaufwände für Aufgaben
 TaskTimeUser=Benutzer
 TaskTimeNote=Hinweis
 TaskTimeDate=Datum
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Neuer Zeitaufwand
 MyTimeSpent=Mein Zeitaufwand
 MyTasks=Meine Aufgaben
@@ -129,4 +131,4 @@ ProjectReferers=Bezugnahmen
 SearchAProject=Suchen Sie ein Projekt
 ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden
 ProjectDraft=Projekt-Entwürfe
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Eine Ressource zuordnen, um Zeit festzulegen
diff --git a/htdocs/langs/de_DE/resource.lang b/htdocs/langs/de_DE/resource.lang
index 6dd94c6cfc5..edcfcf065c8 100644
--- a/htdocs/langs/de_DE/resource.lang
+++ b/htdocs/langs/de_DE/resource.lang
@@ -20,10 +20,10 @@ ResourcesLinkedToElement=mit Element verknüpfte Ressourcen
 ShowResourcePlanning=Ressourcen-Planung zeigen
 GotoDate=Gehe zu Datum
 
-ResourceElementPage=Element resources
+ResourceElementPage=Element-Ressourcen
 ResourceCreatedWithSuccess=Ressource erfolgreich erstellt
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
+RessourceLineSuccessfullyDeleted=Ressourcen-Zeile erfolgreich gelöscht
+RessourceLineSuccessfullyUpdated=Ressourcen-Zeile erfolgreich aktualisiert
 ResourceLinkedWithSuccess=Ressource erfolgreich verknüpft
 
 TitleResourceCard=Ressourcen-Karte
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Ressource wirklich löschen?
 RessourceSuccessfullyDeleted=Ressource erfolgreich gelöscht
 DictionaryResourceType=Ressourcen-Typ
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Ressource wählen
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index f574590148e..e7f84a4c27f 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -102,7 +102,7 @@ UserDisabled=Benutzer %s deaktiviert
 UserEnabled=Benutzer %s aktiviert
 UserDeleted=Benutzer %s entfernt
 NewGroupCreated=Gruppe %s erstellt
-GroupModified=Group %s modified
+GroupModified=Gruppe %s geändert
 GroupDeleted=Gruppe %s entfernt
 ConfirmCreateContact=Möchten Sie für diesen Kontakt wirklich ein Systembenutzerkonto anlegen?
 ConfirmCreateLogin=Möchten Sie für dieses Mitglied wirklich ein Benutzerkonto erstellen?
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index 8289f34fa77..2f66393922b 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -47,7 +47,7 @@ RefusedData=Ablehnungsdatum
 RefusedReason=Ablehnungsgrund
 RefusedInvoicing=Ablehnung in Rechnung stellen
 NoInvoiceRefused=Ablehnung nicht in Rechnung stellen
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Rechnung abgelehnt (Abweisung dem Kunden berechnen)
 Status=Status
 StatusUnknown=Unbekannt
 StatusWaiting=Wartend
@@ -79,10 +79,11 @@ CreditDate=Am
 WithdrawalFileNotCapable=Abbuchungsformular für Ihr Land %s konnte nicht erstellt werden (Dieses Land wird nicht unterstützt).
 ShowWithdraw=Zeige Abbuchung
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Wenn eine Rechnung mindestens eine noch zu bearbeitende Verbuchung vorweist, kann diese nicht als bezahlt markiert werden.
-DoStandingOrdersBeforePayments=Dies erlaubt Ihnen, einen Dauerauftrag anzulegen. Sobald dieser vollständig ist, können Sie den Zahlbetrag eingeben, um die Rechnung abzuschließen.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Datei abbuchen
 SetToStatusSent=Setze in Status "Datei versandt"
 ThisWillAlsoAddPaymentOnInvoice=Dies wird auch Zahlungen auf Rechnungen erstellen und diese als bezahlt markieren
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Zahlung des Dauerauftrags %s
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index c3c355390c5..d77b366a57c 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -66,7 +66,7 @@ Lineofinvoice=Γραμμή τιμολογίου
 VentilatedinAccount=Ventilated successfully in the accounting account
 NotVentilatedinAccount=Not ventilated in the accounting account
 
-ACCOUNTING_SEPARATORCSV=Separator CSV
+ACCOUNTING_SEPARATORCSV=Διαχωριστικό CSV
 
 ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
@@ -77,9 +77,9 @@ AccountLengthDesc=Λειτουργία που επιτρέπει να υποκρ
 ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
 ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
-ACCOUNTING_SELL_JOURNAL=Sell journal
+ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
+ACCOUNTING_BANK_JOURNAL=Τραπεζικό ημερολόγιο
 ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
@@ -130,15 +130,15 @@ ErrorDebitCredit=Χρεωστικές και Πιστωτικές δεν μπο
 ReportThirdParty=Λίστα λογαριασμού Πελ./Προμ.
 DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
 
-ListAccounts=List of the accounting accounts
+ListAccounts=Λίστα των λογιστικών λογαριασμών
 
-Pcgversion=Version of the plan
+Pcgversion=Έκδοση του σχεδίου
 Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 Active=Statement
 
-NewFiscalYear=New fiscal year
+NewFiscalYear=Νέα οικονομική χρονιά
 
 DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover HT
@@ -151,7 +151,7 @@ DescVentilSupplier=Consult here the annual breakdown accounting of your invoices
 DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Αυτόματη επικύρωση
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 24c2ac930a1..14ccab0887d 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Χρησιμοποιήστε τα πεδία αυτόμ
 ActivityStateToSelectCompany= Προσθέστε μια επιλογή φίλτρου για εμφάνιση / απόκρυψη ΠΕΛ./ΠΡΟΜ. τα οποία βρίσκονται σε λειτουργία ή έχει παύσει
 UseSearchToSelectContactTooltip=Επίσης, αν έχετε ένα μεγάλο αριθμό Πελ./Προμ. (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τον καθορισμό της σταθερά COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο Setup->Other. Η αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς.
 UseSearchToSelectContact=Χρησιμοποιήστε τα πεδία αυτόματης συμπλήρωσης για να επιλέξετε την επαφή (αντί της χρήσης ενός πλαισίου λίστας).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Αναζήτηση επιλογές φίλτρων
 NumberOfKeyToSearch=Πλήθος χαρακτήρων για να ξεκινήσει η αναζήτηση: %s
 ViewFullDateActions=Εμφάνιση πλήρους χρονοδιαγράμματος γεγονότων στο φύλλο ΠΕΛ./ΠΡΟΜ.
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=Περισσότερα Αρθρώματα...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Ιστοσελίδα
 BoxesAvailable=Διαθέσιμα Πλαίσια
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Τηλεφωνία
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Σελιδοδείκτες
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Ειδικά έξοδα (φόροι, εισφορές κοινωνικής ασφάλισης, μερίσματα)
@@ -495,6 +498,8 @@ Module1780Name=Κατηγορίες
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Μενού
 Module2300Desc=Scheduled task management
 Module2400Name=Ατζέντα
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Διαχείρισης Ροών Εργασιών
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Παρτίδα προϊόντων
-Module39000Desc=Αριθμός παρτίδας, κατανάλωση μέχρι ημερομηνία και πώληση μέχρι ημερομηνία διαχείριση για τα προϊόντα
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Ενότητα για να προσφέρει μια σε απευθείας σύνδεση σελίδα πληρωμής με πιστωτική κάρτα με Paybox
 Module50100Name=Σημείο Πωλήσεων
@@ -527,7 +534,7 @@ Module50200Desc=Ενότητα για να προσφέρει μια σε απε
 Module50400Name=Λογιστική (για προχωρημένους)
 Module50400Desc=Λογιστική διαχείριση (διπλά μέρη)
 Module54000Name=PrintIPP
-Module54000Desc=Εκτύπωση μέσω Cups IPP εκτυπωτή.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Ανοικτή Ψηφοφορία
 Module55000Desc=Πρόσθετο για την δημιουργία μιας διαδικτυακής έρευνας (όπως Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Μέθοδος Παραγγελίας
 DictionarySource=Προέλευση των προτάσεων/παραγγελιών
 DictionaryAccountancyplan=Λογιστικό σχέδιο
 DictionaryAccountancysystem=Μοντέλα λογιστικού σχεδίου
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Οι ρυθμίσεις αποθηκεύτηκαν
 BackToModuleList=Πίσω στη λίστα με τα modules
 BackToDictionaryList=Επιστροφή στη λίστα λεξικών
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Προκαθορισμένη Γλώσσα (κωδ. γλώσσας)
 EnableMultilangInterface=Ενεργοποίησ πολυγλωσσικού περιβάλλοντος
 EnableShowLogo=Εμφάνιση λογότυπου στο αριστερό μενού
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Το σύστημά σας αναβαθμίστηκε επιτυχώς
 CompanyInfo=Πληροφορίες Εταιρίας/Οργανισμού
 CompanyIds=Ταυτότητες Εταιρίας/Οργανισμού
@@ -1544,12 +1553,12 @@ Opened=Ανοίξτε
 Closed=Κλείστε
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
+NbMajMin=Ελάχιστος αριθμός κεφαλαίων χαρακτήρων
+NbNumMin=Ελάχιστος αριθμός αριθμητικών χαρακτήρων
+NbSpeMin=Ελάχιστος αριθμός ειδικών χαρακτήρων
+NbIteConsecutive=Ελάχιστος αριθμός επανάληψης ίδιων χαρακτήρων
 NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
 SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+SortOrder=Σειρά ταξινόμησης
 Format=Μορφή
 TypePaymentDesc=0:Τύπος πληρωμής πελάτη, 1:Τύπος πληρωμής προμηθευτή, 2:Τύπος πληρωμής τόσο για τους πελάτες όσο και για τους προμηθευτές
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index 932a236ab4a..cf4031d8785 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Ενέργειες που ανατέθηκαν σε
 ActionsDoneBy=Ενέργειες που ολοκληρώθηκαν από
 ActionsForUser=Γεγονότα για τον χρήστη
 ActionsForUsersGroup=Γεγονότα όλων των χρηστών της ομάδας
+ActionAssignedTo=Event assigned to
 AllMyActions= Όλες οι ενέργειες/εργασίες μου
 AllActions= Όλες οι ενέργειες/εργασίες
 ViewList=Εμφάνιση Λίστας
@@ -44,7 +45,7 @@ AgendaExtSitesDesc=Αυτή η σελίδα σας επιτρέπει να ρυ
 ActionsEvents=Γεγονότα για τα οποία θα δημιουργήσουν εγγραφή στο ημερολόγιο, αυτόματα
 PropalValidatedInDolibarr=Η πρόταση %s επικυρώθηκε
 InvoiceValidatedInDolibarr=Το τιμολόγιο %s επικυρώθηκε
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Το τιμολόγιο επικυρώθηκε από το  POS
 InvoiceBackToDraftInDolibarr=Τιμολόγιο %s θα επιστρέψει στην κατάσταση του σχεδίου
 InvoiceDeleteDolibarr=Τιμολόγιο %s διαγράφεται
 OrderValidatedInDolibarr= Η παραγγελία %s επικυρώθηκε
@@ -68,9 +69,9 @@ DateActionStart= Ημερομηνία έναρξης
 DateActionEnd= Ημερομηνία λήξης
 AgendaUrlOptions1=Μπορείτε ακόμη να προσθέσετε τις ακόλουθες παραμέτρους για να φιλτράρετε τα αποτέλεσμα:
 AgendaUrlOptions2=<b>login=%s</b> για να περιορίσετε τα αποτελέσματα σε ενέργειες που δημιουργήθηκαν και έγιναν από τον χρήστη <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> να περιορίσει την παραγωγή ενεργειών που ανήκουν στον χρήστη <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> για να περιορίσετε τα αποτελέσματα σε ενέργειες που αφορούν τον χρήστη<b>%s</b>.
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> να περιορίσει την παραγωγή της σε ενέργειες που σχετίζονται με το έργο <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Εμφάνιση γενεθλίων των προσώπων επικοινωνίας
 AgendaHideBirthdayEvents=Απόκρυψη γενεθλίων των προσώπων επικοινωνίας
 Busy=Απασχολ.
@@ -87,5 +88,5 @@ ExtSiteUrlAgenda=URL για να αποκτήσετε πρόσβαση στο .i
 ExtSiteNoLabel=Χωρίς Περιγραφή
 WorkingTimeRange=Εύρος χρόνου εργασίας
 WorkingDaysRange=Εύρος ημερών εργασίας
-AddEvent=Create event
+AddEvent=Δημιουργία συμβάντος
 MyAvailability=Η διαθεσιμότητα μου
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 1c0ff4d72c9..c8a0d2af2e3 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -222,12 +222,12 @@ NonPercuRecuperable=Non-recoverable
 SetConditions=Set payment conditions
 SetMode=Set payment mode
 Billed=Τιμολογημένο
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
+RepeatableInvoice=Πρότυπο τιμολογίου
+RepeatableInvoices=Πρότυπο τιμολόγιο
+Repeatable=Πρώτυπο
+Repeatables=Πρώτυπα
+ChangeIntoRepeatableInvoice=Μετατροπή σε πρότυπο τιμολόγιο
+CreateRepeatableInvoice=Δημιουργία πρότυπο τιμολόγιο
 CreateFromRepeatableInvoice=Create from template invoice
 CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
 CustomersInvoicesAndPayments=Πληρωμές και τιμολόγια πελατών
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index 61543f9747e..c011ce85374 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -12,6 +12,7 @@ BoxLastProspects=Τελευταίες τροποποιημένες προοπτ
 BoxLastCustomers=Τελευταίοι τροποποιημένοι πελάτες
 BoxLastSuppliers=Τελευταίοι τροποποιημένοι προμηθευτές
 BoxLastCustomerOrders=Τελευταίες παραγγελίες πελατών
+BoxLastValidatedCustomerOrders=Last validated customer orders
 BoxLastBooks=Τελευταία Βιβλία
 BoxLastActions=Τελευταίες Ενέργειες
 BoxLastContracts=Τελευταία συμβόλαια
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Πλήθος πελατών
 BoxTitleLastRssInfos=Τα %s πιο πρόσφατα νέα από %s
 BoxTitleLastProducts=Τα %s πιο πρόσφατα τροποποιημένα προϊόντα/υπηρεσίες
 BoxTitleProductsAlertStock=Προειδοποίηση προϊόντων σε απόθεμα
-BoxTitleLastCustomerOrders=Οι %s πιο πρόσφατα τροποποιημένες παραγγελίες πελατών
+BoxTitleLastCustomerOrders=Last %s customer orders
+BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
 BoxTitleLastSuppliers=Οι %s πιο πρόσφατα καταχωρημένοι προμηθευτές
 BoxTitleLastCustomers=Οι %s πιο πρόσφατα καταχωρημένοι πελάτες
 BoxTitleLastModifiedSuppliers=Οι %s πιο πρόσφατα τροποποιημένοι προμηθευτές
 BoxTitleLastModifiedCustomers=Οι %s πιο πρόσφατα τροποποιημένοι πελάτες
-BoxTitleLastCustomersOrProspects=Οι %s πιο πρόσφατα τροποποιημένοι πελάτες ή προοπτικές
-BoxTitleLastPropals=Οι %s πιο πρόσφατα καταχωρημένες προσφορές
+BoxTitleLastCustomersOrProspects=Last %s customers or prospects
+BoxTitleLastPropals=Last %s proposals
+BoxTitleLastModifiedPropals=Last %s modified proposals
 BoxTitleLastCustomerBills=Τα %s πιο πρόσφατα τιμολόγια πελατών
+BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
 BoxTitleLastSupplierBills=Τα %s πιο πρόσφατα τιμολόγια προμηθευτών
-BoxTitleLastProspects=Οι %s πιο πρόσφατες προσφορές
+BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
 BoxTitleLastModifiedProspects=Οι %s πιο πρόσφατα τροποποιημένες προσφορές
 BoxTitleLastProductsInContract=Τα %s πιο πρόσφατα συμβόλαια με προϊόντα/υπηρεσίες
-BoxTitleLastModifiedMembers=Τελευταία %s τροποποίηση των μελών
+BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Τελευταία %s ενημέρωση παρέμβασης
-BoxTitleOldestUnpaidCustomerBills=Τα %s παλαιότερα απλήρωτα τιμολόγια πελατών
-BoxTitleOldestUnpaidSupplierBills=Τα %s παλαιότερα απλήρωτα τιμολόγια προμηθευτών
+BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
+BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
 BoxTitleCurrentAccounts=Άνοιξε τα υπόλοιπα των λογαριασμών
 BoxTitleSalesTurnover=Κύκλος εργασιών των πωλήσεων
 BoxTitleTotalUnpaidCustomerBills=Απλήρωτα τιμολόγια πελατών
-BoxTitleTotalUnpaidSuppliersBills=Απλήρωτα τιμολόγια προμηθευτών
+BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
 BoxTitleLastModifiedContacts=Οι  τελευταίες %s τροποποιημένες επαφές / διευθύνσεις
 BoxMyLastBookmarks=Οι %s νεότεροι σελιδοδείκτες μου
 BoxOldestExpiredServices=Παλαιότερες ενεργές υπηρεσίες που έχουν λήξει
@@ -76,7 +80,8 @@ NoContractedProducts=Δεν υπάρχουν καταχωρημένα συμβό
 NoRecordedContracts=Δεν υπάρχουν καταχωρημένα συμβόλαια
 NoRecordedInterventions=Δεν καταγράφονται παρεμβάσεις
 BoxLatestSupplierOrders=Τελευταίες παραγγελίες προμηθευτών
-BoxTitleLatestSupplierOrders=Οι %s τελευταίες παραγγελίες προμηθευτών
+BoxTitleLatestSupplierOrders=Last %s supplier orders
+BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
 NoSupplierOrder=Δεν υπάρχουν καταχωρημένες παραγγελίες προμηθευτών
 BoxCustomersInvoicesPerMonth=Τιμολόγια πελατών ανά μήνα
 BoxSuppliersInvoicesPerMonth=Τιμολόγια προμηθευτών ανά μήνα
diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
index 0ad9573f800..605097a3a19 100644
--- a/htdocs/langs/el_GR/commercial.lang
+++ b/htdocs/langs/el_GR/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Προοπτική
 Prospects=Προοπτικές
 DeleteAction=Διαγραφή Ενέργειας/Εργασίας
 NewAction=Νέα Ενέργεια/Εργασία
-AddAction=Προσθήκη Ενέργειας/Εργασίας
-AddAnAction=Προσθήκη Ενέργειας/Εργασίας
-AddActionRendezVous=Προσθήκη Συνάντησης
+AddAction=Δημιουργία συμβάντος/εργασίας
+AddAnAction=Δημιουργία συμβάντος/εργασίας
+AddActionRendezVous=Δημιουργήστε μια εκδήλωση ραντεβού
 Rendez-Vous=Συναντήσεις
 ConfirmDeleteAction=Είστε σίγουροι ότι θέλετε να διαγράψετε την ενέργεια;
 CardAction=Καρτέλα Ενέργειας
@@ -44,8 +44,8 @@ DoneActions=Ολοκληρωμένες Ενέργειες
 DoneActionsFor=Ολοκληρωμένες Ενέργειες γιά %s
 ToDoActions=Ημιτελείς Ενέργειες
 ToDoActionsFor=Ημιτελείς Ενέργειες για %s
-SendPropalRef=Αποστολή εμπορικής προσφοράς %s
-SendOrderRef=Αποστολή παραγγελίας %s
+SendPropalRef=Υποβολή των προσφορών %s
+SendOrderRef=Υποβολή της παραγγελίας %s
 StatusNotApplicable=Δεν ισχύει
 StatusActionToDo=Να γίνουν
 StatusActionDone=Ολοκληρωμένη
@@ -62,7 +62,7 @@ LastProspectContactDone=Η επικοινωνία έγινε
 DateActionPlanned=Ημερ. προγραμματισμού
 DateActionDone=Ημερ. ολοκλήρωσης
 ActionAskedBy=Η ενέργεια ζητήθηκε από
-ActionAffectedTo=Η ενέργεια αφορά τον/την
+ActionAffectedTo=Εκδήλωση που ανήκει
 ActionDoneBy=Η ενέργεια έγινε από τον/την
 ActionUserAsk=Καταγράφηκε από τον/την
 ErrorStatusCantBeZeroIfStarted=Εάν το πεδίο '<b>Date done</b>' είναι γεμάτο, η ενέργεια έχει αρχίσει (ή έχει τελειώσει), οπότε το πεδίο '<b>Status</b>' δεν μπορεί να είναι 0%%.
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 2e5b6951bc6..c9aaba74e1a 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=σύμφωνα με τον προμηθευτή, ε
 TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε <b>ταμειακής λογιστικής</b> mode is not relevant. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε <b>λογιστικής δέσμευσης</b> τρόπος (ανατρέξτε στην ενότητα Ρύθμιση της μονάδας λογιστικής).
 CalculationMode=Τρόπο υπολογισμού
 AccountancyJournal=Λογιστικος Κωδικός περιοδικό
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για αγορά των προϊόντων
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για πώληση προϊόντων
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για αγορές υπηρεσιών
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για πώληση υπηρεσιών
 ACCOUNTING_VAT_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για την είσπραξη του ΦΠΑ
 ACCOUNTING_VAT_BUY_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για την καταβολή του ΦΠΑ
 ACCOUNTING_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προεπιλογή για πελάτες
diff --git a/htdocs/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang
index 6b3e508c9af..cff09df3981 100644
--- a/htdocs/langs/el_GR/contracts.lang
+++ b/htdocs/langs/el_GR/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Περιοχή Συμβολαίων
 ListOfContracts=Λίστα Συμβολαίων
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Τελευταίες τροποποιημένες συμβάσεις %s
 AllContracts=Όλα τα συμβόλαια
 ContractCard=Κάρτέλα  Συμβολαίου
 ContractStatus=Κατάσταση συμβολαίου
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=Λίστα τρέχουσων υπηρεσιών
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Υπηρεσίες προς ενεργοποίηση σε επικυρωμένα συμβόλαια
-LastContracts=Last % contracts
+LastContracts=Τελευταίες συμβάσεις %s
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Κατάλογος Υπηρεσιών προς λήξει
 NoteListOfYourExpiredServices=Αυτή η λίστα περιέχει μόνο τις υπηρεσίες των συμβάσεων για λογαριασμό ΠΕΛ./ΠΡΟΜ. που συνδέονται ως εκπρόσωπος πώληση.
 StandardContractsTemplate=Οι πρότυπες συμβάσεις
 ContactNameAndSignature=Για %s, το όνομα και η υπογραφή:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Σύμβαση πώλησης υπογραφή εκπροσώπου
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index a9a19f31b89..4163539e47f 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=Σχετικά με το περιβάλλον Unix θα
 CronExplainHowToRunWin=Στο Microsoft (tm) των Windows environement, μπορείτε να χρησιμοποιήσετε τα εργαλεία Προγραμματισμένη εργασία ώστε να εκτελεστεί μια γραμμή εντολών κάθε λιγα λεπτά
 # Menu
 CronJobs=Προγραμματισμένες εργασίες
-CronListActive=List of active/scheduled jobs
+CronListActive=Λίστα ενεργών/προγραμματισμένων εργασιών
 CronListInactive=Λίστα με τις απενεργοποιημένες εργασίες
 # Page list
 CronDateLastRun=Τελευταία εκτέλεση
diff --git a/htdocs/langs/el_GR/deliveries.lang b/htdocs/langs/el_GR/deliveries.lang
index f4c2175888a..9fe9b52b375 100644
--- a/htdocs/langs/el_GR/deliveries.lang
+++ b/htdocs/langs/el_GR/deliveries.lang
@@ -23,4 +23,6 @@ GoodStatusDeclaration=Παραδόθηκαν τα παραπάνω σε καλή
 Deliverer=Διανομέας :
 Sender=Αποστολέας
 Recipient=Παραλήπτης
-# ErrorStockIsNotEnough=There's not enough stock
+ErrorStockIsNotEnough=Δεν υπάρχει αρκετό απόθεμα
+Shippable=Για Αποστολή
+NonShippable=Δεν αποστέλλονται
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 885dc185b8e..67f1d9a24cd 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Κωδικός προμηθευτή που απαιτ
 ErrorSupplierCodeAlreadyUsed=Κωδικός προμηθευτή που ήδη χρησιμοποιείται
 ErrorBadParameters=Λάθος παράμετρος
 ErrorBadValueForParameter=%s Λάθος τιμή για την παράμετρο λάθος %s
-ErrorBadImageFormat=Το αρχείο εικόνας δεν έχει μια μορφή που υποστηρίζεται
+ErrorBadImageFormat=Το αρχείο εικόνας δεν έχει μια υποστηριζόμενη μορφή (Η PHP σας δεν υποστηρίζει λειτουργίες για να μετατρέψετε τις εικόνες αυτής της μορφής)
 ErrorBadDateFormat=«%s« Αξία έχει λάθος μορφή ημερομηνίας
 ErrorWrongDate=Η ημερομηνία δεν είναι σωστή!
 ErrorFailedToWriteInDir=Αποτυχία εγγραφής στο %s κατάλογο
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Χρήστης με <b>%s</b> login δεν θα μπορ
 ErrorLoginHasNoEmail=Αυτός ο χρήστης δεν έχει τη διεύθυνση ηλεκτρονικού ταχυδρομείου. Επεξεργασία ματαιώθηκε.
 ErrorBadValueForCode=Κακό αξία για τον κωδικό ασφαλείας. Δοκιμάστε ξανά με νέα τιμή ...
 ErrorBothFieldCantBeNegative=Πεδία %s %s και δεν μπορεί να είναι τόσο αρνητικές όσο
+ErrorQtyForCustomerInvoiceCantBeNegative=Η ποσότητα στην γραμμή στα τιμολόγια των πελατών δεν μπορεί να είναι αρνητική
 ErrorWebServerUserHasNotPermission=Λογαριασμό χρήστη <b>%s</b> χρησιμοποιείται για την εκτέλεση του web server δεν έχει άδεια για τη συγκεκριμένη
 ErrorNoActivatedBarcode=Δεν ενεργοποιείται τύπου barcode
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Σφάλμα, το μέλος
 ErrorThereIsSomeDeliveries=Σφάλμα υπάρχουν κάποιες παραδόσεις που συνδέονται με την εν λόγω αποστολή. Η διαγραφή απορρίφθηκε.
 ErrorCantDeletePaymentReconciliated=Δεν μπορείτε να διαγράψετε μια πληρωμή με τραπεζική συναλλαγή που είχε φτάσει σε συμβιβασμό
 ErrorCantDeletePaymentSharedWithPayedInvoice=Δεν μπορείτε να διαγράψετε μια πληρωμή που σχετίζεται με ένα τουλάχιστον τιμολόγιο με καθεστώς πληρωμένο
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/el_GR/externalsite.lang b/htdocs/langs/el_GR/externalsite.lang
index 97d9a9ed48b..d9331df4fa4 100644
--- a/htdocs/langs/el_GR/externalsite.lang
+++ b/htdocs/langs/el_GR/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=Ρύθμιση συνδέσμου σε εξωτερικό website
 ExternalSiteURL=Εξωτερικές διεύθυνσης URL ιστοσελίδας
 ExternalSiteModuleNotComplete=Το Module Εξωτερικά Site δεν έχει ρυθμιστεί σωστά.
-ExampleMyMenuEntry=My menu entry
+ExampleMyMenuEntry=Καταχώρηση του μενού μου
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index 3b5743499f8..49147dc78f2 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -85,8 +85,7 @@ SubscriptionLateShort=Καθυστ.
 SubscriptionNotReceivedShort=Never received
 ListOfSubscriptions=List of subscriptions
 SendCardByMail=Send card by Email
-AddMember=Προσθήκη μέλους
-MemberType=Τύπος μέλους
+AddMember=Δημιουργία μέλους
 NoTypeDefinedGoToSetup=Νέος τύπος μέλους. Πηγαίνετε στις Ρυθμίσεις -> Τύποι μελών
 NewMemberType=Νέος τύπος μέλους
 WelcomeEMail=Welcome e-mail
@@ -126,7 +125,7 @@ Date=Date
 DateAndTime=Date and time
 PublicMemberCard=Member public card
 MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-AddSubscription=Add subscription
+AddSubscription=Δημιουργία εγγραφής
 ShowSubscription=Show subscription
 MemberModifiedInDolibarr=Member modified in Dolibarr
 SendAnEMailToMember=Send information email to member
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Τελευταία ποσό συνδρομής
 MembersStatisticsByCountries=Μέλη στατιστικές ανά χώρα
 MembersStatisticsByState=Τα μέλη στατιστικών στοιχείων από πολιτεία / επαρχία
 MembersStatisticsByTown=Τα μέλη στατιστικών στοιχείων από την πόλη
+MembersStatisticsByRegion=Στατιστικά Μελών ανά περιοχή
+MemberByRegion=Μέλη ανά περιοχή
 NbOfMembers=Αριθμός μελών
 NoValidatedMemberYet=Δεν επικυρώνονται τα μέλη βρέθηκαν
 MembersByCountryDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από τις χώρες. Graphic εξαρτάται, ωστόσο, στην υπηρεσία της Google online διάγραμμα και είναι διαθέσιμο μόνο αν μια σύνδεση στο Διαδίκτυο είναι λειτουργεί.
@@ -202,3 +203,4 @@ MembersByNature=Μέλη εκ φύσεως
 VATToUseForSubscriptions=Συντελεστή ΦΠΑ που θα χρησιμοποιηθεί για τις συνδρομές
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Στείλτε e-mail για να προειδοποιήσει όταν Dolibarr λάβετε μια επιβεβαίωση της μια επικυρωμένη πληρωμής για την εγγραφή
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Το προϊόν χρησιμοποιείται για τη γραμμή από συνδρομές στο τιμολόγιο: %s
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index bee3ae37dd9..96495ea8aea 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Μια αποστολή, υπάρχει
 DraftOrWaitingApproved=Draft or approved not yet ordered
 DraftOrWaitingShipped=Draft or validated not yet shipped
 MenuOrdersToBill=Παραγγελίες προς χρέωση
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Χρεώσιμες παραγγελίες
 SearchOrder=Εύρεση παραγγελίας
 SearchACustomerOrder=Αναζητήστε μία παραγγελία πελάτη
 ShipProduct=Ship product
diff --git a/htdocs/langs/el_GR/paybox.lang b/htdocs/langs/el_GR/paybox.lang
index f5df39595f7..54a2746121e 100644
--- a/htdocs/langs/el_GR/paybox.lang
+++ b/htdocs/langs/el_GR/paybox.lang
@@ -35,6 +35,6 @@ MessageKO=Μήνυμα για την ακύρωση σελίδα επιστρο
 NewPayboxPaymentReceived=Νέα πληρωμή Paybox που λήφθηκε
 NewPayboxPaymentFailed=Νέα πληρωμή Paybox προσπάθησαν αλλά απέτυχαν
 PAYBOX_PAYONLINE_SENDEMAIL=Στείλτε e-mail προειδοποιήσεις μετά από πληρωμή (επιτυχία ή όχι)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_PBX_SITE=Τιμή για PBX SITE
+PAYBOX_PBX_RANG=Τιμή για PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Τιμή για PBX ID
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 34449987715..bdc764a85d2 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -80,12 +80,12 @@ ContractStatusClosed=Κλειστό
 ContractStatusRunning=Ενεργό
 ContractStatusExpired=Ληγμένο
 ContractStatusOnHold=Ανενεργό
-ContractStatusToRun=To get running
+ContractStatusToRun=Για να πάρετε την εκτέλεση
 ContractNotRunning=Το Συμβόλαιο είναι Ανενεργό
 ErrorProductAlreadyExists=Ένα προϊόν με κωδικό %s υπάρχει ήδη.
 ErrorProductBadRefOrLabel=Λάθος τιμή για την αναφορά ή την ετικέτα.
 ErrorProductClone=Υπήρξε ένα πρόβλημα κατά την προσπάθεια για την κλωνοποίηση του προϊόντος ή της υπηρεσίας.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Σφάλμα η τιμή δεν μπορεί να είναι χαμηλότερη από την ελάχιστο τιμή.
 Suppliers=Προμηθευτές
 SupplierRef=Κωδ. Προμηθευτή
 ShowProduct=Εμφάνιση προϊόντων
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Εάν το προϊόν είναι μια υπηρεσί
 MultiPricesAbility=Πολλά επίπεδα των τιμών ανά προϊόν/υπηρεσία
 MultiPricesNumPrices=Αριθμός τιμής
 MultiPriceLevelsName=Κατηγορίες τιμών
-AssociatedProductsAbility=Ενεργοποίηση υποπροϊόντων
-AssociatedProducts=Υποπροϊόντα
-AssociatedProductsNumber=Πλήθος προϊόντων που συνθέτουν αυτό το προϊόν
-ParentProductsNumber=Αριθμός προϊόντος μητρικής
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Ενεργοποίηση της δυνατότητας εικονικών πακέτων
+AssociatedProducts=Πακέτο προϊόντων
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Συσχέτιση
 Translation=Μετάφραση
 KeywordFilter=Φίλτρο λέξης-κλειδιού
@@ -132,7 +132,7 @@ AddDel=Προσθήκη/Διαγραφή
 Quantity=Ποσότητα
 NoMatchFound=Δεν βρέθηκε κατάλληλη εγγραφή
 ProductAssociationList=Κατάλογος των σχετικών προϊόντων / υπηρεσιών: το όνομα του προϊόντος / υπηρεσίας (επηρεάζονται ποσότητα)
-ProductParentList=Κατάλογος των προϊόντων / υπηρεσιών με αυτό το προϊόν ως συστατικό
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Ένα από τα προϊόντα που θα επιλεγούν είναι γονέας με την τρέχουσα προϊόν
 DeleteProduct=Διαγραφή προϊόντος/υπηρεσίας
 ConfirmDeleteProduct=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το προϊόν / υπηρεσία;
@@ -179,7 +179,7 @@ CloneProduct=Κλώνοποίηση προϊόντος ή υπηρεσίας
 ConfirmCloneProduct=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσει το προϊόν ή την υπηρεσία <b>%s;</b>
 CloneContentProduct=Κλώνος όλες τις κύριες πληροφορίες του προϊόντος / υπηρεσίας
 ClonePricesProduct=Κλώνος κύριες πληροφορίες και τιμές
-CloneCompositionProduct=Εικονικός κλώνος προϊόντων/υπηρεσιών
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Μεταχειρισμένο
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Τιμές πελατών
@@ -240,5 +240,10 @@ PricingRule=Κανόνες τιμολόγησης
 AddCustomerPrice=Προσθέστε τιμή των πελατών
 ForceUpdateChildPriceSoc=Ορισμός ίδιας τιμής για τις θυγατρικές του πελάτη
 PriceByCustomerLog=Τιμή ανά πελάτη log
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
+MinimumPriceLimit=Ελάχιστη τιμή δεν μπορεί να είναι μικρότερη από %s
+MinimumRecommendedPrice=Ελάχιστη συνιστώμενη τιμή είναι: %s
+PriceExpressionEditor=Επεξεργαστής συνάρτησης τιμών
+PriceExpressionSelected=Επιλογή συνάρτησης τιμών
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Αριθμός
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index 77b4de1917c..eba1f92f7b3 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα κ
 Myprojects=Τα έργα μου
 ProjectsArea=Περιοχή Έργων
 NewProject=Νέο Έργο
-AddProject=Προσθήκη Έργου
+AddProject=Δημιουργία έργου
 DeleteAProject=Διαγραφή Έργου
 DeleteATask=Διαγραφή Εργασίας
 ConfirmDeleteAProject=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το έργο;
@@ -36,6 +36,8 @@ TaskTimeSpent=Ο χρόνος που δαπανάται σε εργασίες
 TaskTimeUser=Χρήστης
 TaskTimeNote=Σημείωση
 TaskTimeDate=Ημερομηνία
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Νέος χρόνος που δαπανάται
 MyTimeSpent=Ο χρόνος μου πέρασε
 MyTasks=Οι Εργασίες μου
@@ -45,7 +47,7 @@ TaskDateStart=Ημερομηνία έναρξης εργασιών
 TaskDateEnd=Ημερομηνία λήξης εργασιών
 TaskDescription=Περιγραφή των εργασιών
 NewTask=Νέα Εργασία
-AddTask=Προσθήκη Εργασίας
+AddTask=Δημιουργία εργασίας
 AddDuration=Προσθήκη Διάρκειας
 Activity=Δραστηριότητα
 Activities=Εργασίες/Δραστηριότητες
diff --git a/htdocs/langs/el_GR/resource.lang b/htdocs/langs/el_GR/resource.lang
index 1139926a95e..a28060f39b6 100644
--- a/htdocs/langs/el_GR/resource.lang
+++ b/htdocs/langs/el_GR/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Επιβεβαιώστε την διαγραφή αυτο
 RessourceSuccessfullyDeleted=Ο Πόρος διαγράφηκε με επιτυχία
 DictionaryResourceType=Το είδος των πόρων
 
-DictionaryEMailTemplates=Μοντέλα  των Emails
-
 SelectResource=Επιλέξτε πόρο
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index f0364df4db5..2b00a7dfb0b 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -61,8 +61,8 @@ ShipmentCreationIsDoneFromOrder=Προς το παρόν, η δημιουργί
 RelatedShippings=Σχετικές αποστολές
 ShipmentLine=Σειρά αποστολής
 CarrierList=Κατάλογος των μεταφορέων
-SendingRunning=Product from customer order already sent
-SuppliersReceiptRunning=Product from supplier order already received
+SendingRunning=Προϊόν από παραγγελία του πελάτη που έχει ήδη αποσταλεί
+SuppliersReceiptRunning=Προϊόν από παραγγελία προμηθευτή έχει ληφθεί
 
 # Sending methods
 SendingMethodCATCH=Πιάσε τον πελάτη
diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang
index c826f4f78e6..4de061f4c84 100644
--- a/htdocs/langs/el_GR/trips.lang
+++ b/htdocs/langs/el_GR/trips.lang
@@ -4,7 +4,7 @@ Trips=Ταξίδια
 TripsAndExpenses=Ταξίδια και έξοδα
 TripsAndExpensesStatistics=Στατιστικά ταξιδιών και εξόδων
 TripCard=Καρτέλα ταξιδιού
-AddTrip=Προσθήκη ταξιδιού
+AddTrip=Δημιουργία ταξιδιού
 ListOfTrips=Λίστα ταξιδιών
 ListOfFees=Λίστα φόρων
 NewTrip=Νέο ταξίδι
@@ -19,4 +19,4 @@ TF_TRIP=Ταξίδι
 ListTripsAndExpenses=Λίστα ταξιδιών και εξόδων
 ExpensesArea=Ταξίδια και έξοδα περιοχή
 SearchATripAndExpense=Αναζήτηση ένα ταξίδι και τα έξοδα
-ClassifyRefunded=Classify 'Refunded'
+ClassifyRefunded=Ταξινομήστε «επιστραφεί»
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index 318a2054c4d..68794752db8 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -102,7 +102,7 @@ UserDisabled=User %s disabled
 UserEnabled=User %s activated
 UserDeleted=User %s removed
 NewGroupCreated=Group %s created
-GroupModified=Group %s modified
+GroupModified=Ομάδα %s τροποποιημένη
 GroupDeleted=Group %s removed
 ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
 ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index 68a92beb6cf..fe1365fda56 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Πιστωτικές με
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Εμφάνιση Ανάληψη
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ωστόσο, εάν το τιμολόγιο δεν έχει τουλάχιστον μία πληρωμή απόσυρσης ακόμη σε επεξεργασία, δεν θα πρέπει να οριστεί ως καταβληθέν θα επιτρέψει εκ των προτέρων την απόσυρση από την διαχείριση.
-DoStandingOrdersBeforePayments=Αυτή η καρτέλα σας επιτρέπει να ζητήσετε μια πάγια εντολή. Από τη στιγμή που έχει ολοκληρωθεί, μπορείτε να πληκτρολογήσετε την πληρωμή για να κλείσει το τιμολόγιο.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Απόσυρση αρχείο
 SetToStatusSent=Ρυθμίστε την κατάσταση "αποστολή αρχείου"
 ThisWillAlsoAddPaymentOnInvoice=Αυτό θα ισχύει επίσης για τις πληρωμές προς τα τιμολόγια και θα τα χαρακτηρίσουν ως "Πληρωμένα"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Η πληρωμή των πάγιων %s ώστε από την τράπεζα
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0e1be94eaba..8c737eecd52 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -210,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)  
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -446,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 5781d5e3ac0..1cc01ec2e7b 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 770cb6d25bf..89a32876dc3 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index 06c05e520fa..57ba3bb15d8 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index d3fa93e1702..9847ce53524 100755
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -198,7 +198,7 @@ HelpAddThisServiceCard=This option allows you to create or clone a service if it
 CurrentProductPrice=Current price
 AlwaysUseNewPrice=Always use current price of product/service
 AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Price by quantity
+PriceByQuantity=Different prices by quantity
 PriceByQuantityRange=Quantity range
 ProductsDashboard=Products/Services summary
 UpdateOriginalProductLabel=Modify original label
@@ -234,9 +234,9 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar c
 BarCodeDataForProduct=Barcode information of product %s :
 BarCodeDataForThirdparty=Barcode information of thirdparty %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Price by customer
+PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
-PricingRule=Pricing Rules
+PricingRule=Rules for customer prices
 AddCustomerPrice=Add price by customers
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index fd4305bbd0b..7894351c01f 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications 
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 2deac3d4278..a5e4ab1fdfa 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -475,8 +475,8 @@ Module320Name=Hilos RSS
 Module320Desc=Adición de hilos de información RSS en las pantallas Dolibarr
 Module330Name=Marcadores
 Module330Desc=Gestión de marcadores
-Module400Name=Proyectos/Oportunidades
-Module400Desc=Gestión de proyectos o oportunidades. Puede asignar otros elementos (facturas, pedidos, presupuestos, intervenciones, etc.) a los proyectos
+Module400Name=Proyectos/Oportunidades/Leads
+Module400Desc=Gestión de proyectos, oportunidades o leads, Puede asignar cualquier elemento (factura, pedido, presupuesto, intervención, etc.) a un proyecto y obtener una vista transversal del proyecto
 Module410Name=Webcalendar
 Module410Desc=Interfaz con el calendario Webcalendar
 Module500Name=Gastos especiales (impuestos, gastos sociales, dividendos)
@@ -531,7 +531,7 @@ Module50200Desc=Módulo para proporcionar un pago en línea con tarjeta de créd
 Module50400Name=Contabilidad (avanzada)
 Module50400Desc=Gestión contable (doble partida)
 Module54000Name=PrintIPP
-Module54000Desc=Imprimir vía impresora Cups IPP.
+Module54000Desc=La impresión directa (sin abrir los documentos) usa el interfaz Cups IPP (La impresora debe ser visible por el servidor y CUPS debe estar instalado en el servidor)
 Module55000Name=OpenSurvey
 Module55000Desc=Módulo para realizar encuestas online (Como Doodle, Studs, Rdvz, etc.)
 Module59000Name=Márgenes
@@ -783,6 +783,7 @@ DictionaryOrderMethods=Métodos de pedido
 DictionarySource=Orígenes de presupuestos/pedidos
 DictionaryAccountancyplan=Plan contable
 DictionaryAccountancysystem=Modelos de planes contables
+DictionaryEMailTemplates=Plantillas E-Mails
 SetupSaved=Configuración guardada
 BackToModuleList=Volver a la lista de módulos
 BackToDictionaryList=Volver a la lista de diccionarios
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index feb1581d674..db154055b67 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Eventos asignados a
 ActionsDoneBy=Eventos realizados por
 ActionsForUser=Acontecimientos del usuario
 ActionsForUsersGroup=Acontecimientos de todos los usuarios del grupo
+ActionAssignedTo=Event assigned to
 AllMyActions= Todos mis eventos/tareas
 AllActions= Todos los eventos/tareas
 ViewList=Vista listado
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index ded2c3c764e..f6eaf40f12b 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=de acuerdo con el proveedor, seleccione el método a
 TurnoverPerProductInCommitmentAccountingNotRelevant=El informe de ventas por producto, cuando se utiliza en modo <b>contabilidad de caja</b> no es relevante. Este informe sólo está disponible cuando se utiliza en modo <b>contabilidad de compromiso</b> (consulte la configuración del módulo de contabilidad).
 CalculationMode=Modo de cálculo
 AccountancyJournal=Código contable diario
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Código contable por defecto para la compra de productos
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Código contable por defecto para la venta de productos
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Código contable por defecto para la compra de servicios
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Código contable por defecto para la venta de servicios
 ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IVA repercutido
 ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el IVA soportado
 ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta contable por defecto para clientes
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index 6e8cc61b5c4..c9e59a17cd6 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Listado de servicios activos a expirar
 NoteListOfYourExpiredServices=Este listado contiene solamente los servicios de contratos de terceros de los que usted es comercial
 StandardContractsTemplate=Modelo de contrato estandar 
 ContactNameAndSignature=Para %s, nombre y firma:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Comercial firmante del contrato
diff --git a/htdocs/langs/es_ES/printipp.lang b/htdocs/langs/es_ES/printipp.lang
index b1831a86789..e97bd15c596 100644
--- a/htdocs/langs/es_ES/printipp.lang
+++ b/htdocs/langs/es_ES/printipp.lang
@@ -7,3 +7,8 @@ PRINTIPP_PORT=Puerto
 PRINTIPP_USER=Usuario
 PRINTIPP_PASSWORD=Contraseña
 NoPrinterFound=No se han encontrado impresoras (Compruebe la configuración de su CUPS)
+FileWasSentToPrinter=El archivo %s ha sido enviado a la impresora
+NoDefaultPrinterDefined=No hay impresora por defecto definida
+DefaultPrinter=Impresora por defecto
+Printer=Impresora
+CupsServer=Servidor CUPS
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index dd61a420dbc..ceb6bd361e3 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -10,10 +10,11 @@ batch_number=Número Lote/Serie
 l_eatby=Fecha de caducidad
 l_sellby=Fecha límite de venta
 DetailBatchNumber=Detalles del lote/serie
-DetailBatchFormat=Caducidad: %s Límite venta: %s LOTE: %s (Stock : %d)
+DetailBatchFormat=Lote/Serie: %s - Caducidad: %s - Límite venta: %s (Stock: %d)
 printBatch=Lote: %s
 printEatby=Caducidad: %s
 printSellby=Límite venta: %s
 printQty=Cant.: %d
 AddDispatchBatchLine=Añada una línea para despacho por caducidad
 BatchDefaultNumber=Indefinido
+WhenProductBatchModuleOnOptionAreForced=Si el módulo de Lotes/Series está activado, el incremento/decremento de stock es forzado a lo último escogido y no puede editarse. Otras opciones pueden definirse si se necesita
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index da5a65ceb96..5ac8e82d6f9 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -36,6 +36,8 @@ TaskTimeSpent=Tiempo dedicado en tareas
 TaskTimeUser=Usuario
 TaskTimeNote=Nota
 TaskTimeDate=Fecha
+TasksOnOpenedProject=Tareas en proyectos abiertos
+WorkloadNotDefined=Carga de trabajo no definida
 NewTimeSpent=Nuevo  tiempo dedicado
 MyTimeSpent=Mi tiempo dedicado
 MyTasks=Mis tareas
diff --git a/htdocs/langs/es_ES/resource.lang b/htdocs/langs/es_ES/resource.lang
index 5bc252fbce3..21c3311d29a 100644
--- a/htdocs/langs/es_ES/resource.lang
+++ b/htdocs/langs/es_ES/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=¿Está seguro de querer eliminar este recurso?
 RessourceSuccessfullyDeleted=Recurso eliminado correctamente
 DictionaryResourceType=Tipo de recursos
 
-DictionaryEMailTemplates=Modelo de E-Mails
-
 SelectResource=Seleccionar recurso
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 1762411d3c8..98c4a32016d 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Abonada el
 WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para el país %s (El país no está soportado)
 ShowWithdraw=Ver domiciliación
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación, no será cerrada para permitir la gestión de la domiciliación.
-DoStandingOrdersBeforePayments=Esta pestaña le permite realizar una petición de domiciliación. Una vez terminada, puede ingresar el pago en la factura para proceder a su cierre.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Archivo de la domiciliación
 SetToStatusSent=Clasificar como "Archivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Se crearán los pagos de las facturas y las clasificará como pagadas
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Abono de domiciliación %s por el banco
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 521306c2df7..105335add8e 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Kasuta kolmandate isikute valimiseks nimekirja asemel a
 ActivityStateToSelectCompany= Lisa filter, mis võimaldab filtreerida kolmandaid isikuid nende aktiivsuse järgi. 
 UseSearchToSelectContactTooltip=Suure kolmandate isikute arvu korral (> 100 000) saab kiiruse suurendamiseks seadistada Seadistamine->Muu menüüs konstandi CONTACT_DONOTSEARCH_ANYWHERE väärtuseks 1. Sellisel juhul piirdub otsing sõne algusega.
 UseSearchToSelectContact=Kasuta kontakti valimiseks nimekirja asemel automaatsete vastete pakkumisega välju 
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Otsingufiltrite seaded
 NumberOfKeyToSearch=Sisestatud märkide arv otsingu käivitamiseks: %s
 ViewFullDateActions=Näita terve päev kestvaid sündmusi kolmandal lehel
@@ -208,6 +210,7 @@ ModulesJobDesc=Ärimoodulid pakuvad lihtsat, eelnevalt määratletud Dolibarri s
 ModulesMarketPlaceDesc=Alla laadimiseks leiad rohkem mooduleid Internetist.
 ModulesMarketPlaces=Rohkem mooduleid...
 DoliStoreDesc=DoliStore on ametlik Dolibarr ERP/CRM moodulite müümiseks kasutatav koht
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Veebimajutuse pakkujad, kust võib otsida rohkem mooduleid.
 URL=Link
 BoxesAvailable=Saadaval kastid
@@ -444,7 +447,7 @@ Module55Desc=Vöötkoodide haldamine
 Module56Name=Telefonitehnika
 Module56Desc=Telefonitehnika integratsioon
 Module57Name=Püsikorraldused
-Module57Desc=Püsikorralduste ja väljamaksete haldamine
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial süsteemiga (Asterisk jne) integreerimine
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS voog
 Module320Desc=Lisa RSS voog Dolibarri lehtedele
 Module330Name=Järjehoidjad
 Module330Desc=Järjehoidjate haldamine
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=WebCalendari integratsioon
 Module500Name=Erikulud (maksud, sotsiaalmaks, dividendid)
@@ -495,6 +498,8 @@ Module1780Name=Kategooriad
 Module1780Desc=Kategooriate haldamine (tooted, hankijad ja kliendid)
 Module2000Name=WYSIWYG toimeti
 Module2000Desc=Luba mõnede tekstialade toimetamist võimsama toimetiga
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cro
 Module2300Desc=Ajastatud tegevuste haldamine
 Module2400Name=Päevakava
@@ -503,6 +508,8 @@ Module2500Name=Dokumendihaldus
 Module2500Desc=Salvesta ja jaga dokumente
 Module2600Name=Veebiteenused
 Module2600Desc=Lülita Dolibarri veebiteenuste server sisse
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Kasuta Gravatar (www.gravatar.com) teenust, et näidata kasutajate/liikmete pilte (loodud nende e-posti aadresside põhjal). Vajab Interneti ligipääsu.
 Module2800Desc=FTP klient
@@ -517,7 +524,7 @@ Module6000Desc=Töövoo haldamine
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Moodul, mis pakub online-makse võimalust krediitkaardiga PayBoxi abil
 Module50100Name=Kassa
@@ -527,7 +534,7 @@ Module50200Desc=Moodul, mis pakub online-makse võimalust krediitkaardiga Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Trüki Cups IPP printeri abil
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Ava küsitlus
 Module55000Desc=Online küsitluste korraldamise moodul (nagu Doodle, Studs, Rdvz jms)
 Module59000Name=Marginaalid
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Tellimisviisid
 DictionarySource=Pakkumiste/tellimuste päritolu
 DictionaryAccountancyplan=Kontode graafik
 DictionaryAccountancysystem=Kontoplaani mudelid
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Seadistused salvestatud
 BackToModuleList=Tagasi moodulite nimekirja
 BackToDictionaryList=Tagasi sõnastike nimekirja
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Vasakus menüüs on alati otsingu vorm
 DefaultLanguage=Vaikimisi kasutatav keel (keele kood)
 EnableMultilangInterface=Luba mitmekeelne liides
 EnableShowLogo=Näita vasakul menüüs logo
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Süsteem on edukalt uuendatud
 CompanyInfo=Ettevõtte/ühenduse info
 CompanyIds=Ettevõtte/ühenduse andmed
diff --git a/htdocs/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang
index 33637161b33..743d827082a 100644
--- a/htdocs/langs/et_EE/agenda.lang
+++ b/htdocs/langs/et_EE/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Tegevused, mis on seotud
 ActionsDoneBy=Tegevused, mille tegi
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Kõik minu tegevused/ülesanded
 AllActions= Kõik tegevused/ülesanded
 ViewList=Nimekirja vaade
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index ef36af93d4a..4dba49aa2f3 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=vastavalt hankijale, vali sobiv meetod sama reegli r
 TurnoverPerProductInCommitmentAccountingNotRelevant=Käibearuanne toote kaupa, <b>kassapõhist raamatupidamist</b> kasutades pole režiim oluline. See aruanne on saadaval vaid <b>tekkepõhist raamatupidamist</b> kasutades (vaata raamatupidamise mooduli seadistust).
 CalculationMode=Arvutusrežiim
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/et_EE/contracts.lang b/htdocs/langs/et_EE/contracts.lang
index a141c00a1e9..cdf9a5c2b82 100644
--- a/htdocs/langs/et_EE/contracts.lang
+++ b/htdocs/langs/et_EE/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Aktiivsete lepinguridade nimekiri
 ListOfRunningServices=Aktiivsete teenuste nimekiri
 NotActivatedServices=Mitteaktiivsed teenused (kinnitatud lepingutel)
 BoardNotActivatedServices=Teenused, mida aktiveerida kinnitatud lepingutel
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Viimased %s aktiveeritud teenust
 LastModifiedServices=Viimased %s muudetud teenust
 EditServiceLine=Muuda teenuse rida
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Aeguvate teenuste nimekiri
 NoteListOfYourExpiredServices=See nimekiri sisaldab vaid nende lepingute teenuseid, millega seotud kolmandate isikute kohta oled märgitud müügiesindajaks
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Lepingu allkirjastanud müügiesindaja
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 745184c4a4a..ade13da068e 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Hankija kood on nõutud
 ErrorSupplierCodeAlreadyUsed=Hankija kood on juba kasutuses
 ErrorBadParameters=Halvad parameetrid
 ErrorBadValueForParameter=Vale väärtus '%s' parameetri jaoks ebaõige '%s'
-ErrorBadImageFormat=Pildifaili vorming ei ole toetatud
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Väärtus '%s' on vales kuupäeva vormingus
 ErrorWrongDate=Kuupäev pole korrektne!
 ErrorFailedToWriteInDir=Ei suutnud kirjutada kausta %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Kasutajanime <b>%s</b> ei leitud.
 ErrorLoginHasNoEmail=Antud kasutajal ei ole e-posti aadressi. Protsess katkestatud.
 ErrorBadValueForCode=Turvakoodi halb väärtus. Proovi uuesti...
 ErrorBothFieldCantBeNegative=Mõlemad väljad %s ja %s ei saa olla negatiivse väärtusega
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Veebiserveri käivitamiseks kasutataval kontrol <b>%s</b> ei ole selleks õigusi
 ErrorNoActivatedBarcode=Ühtki vöötkoodi tüüpi pole aktiveeritud
 ErrUnzipFails=%s lahti pakkimine ZipArchivega ebaõnnestus
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Kohustuslikud seadistusparameetrid on määratlemata
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index 69780d9c441..7eeb8340553 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Hilinenud
 SubscriptionNotReceivedShort=Pole kunagi saanud
 ListOfSubscriptions=Liikmemaksude nimekir
 SendCardByMail=Saada kaart e-postiga
-AddMember=Lisa liige
+AddMember=Create member
 NoTypeDefinedGoToSetup=Liikmetüüpe pole määratletud. Mine menüüsse "Liikmetüübid"
 NewMemberType=Uus liikmetüüp
 WelcomeEMail=E-kiri tervitamiseks
@@ -125,7 +125,7 @@ Date=Kuupäev
 DateAndTime=Kuupäev ja kellaaeg
 PublicMemberCard=Liikme avalik kaar
 MemberNotOrNoMoreExpectedToSubscribe=Ei ole liige või ei ole oodatud liikmeks astuma
-AddSubscription=Lisa liikmelisus
+AddSubscription=Create subscription
 ShowSubscription=Kuva liikmelisus
 MemberModifiedInDolibarr=Liige on Dolibarris muudetud
 SendAnEMailToMember=Saada informatsioon e-posti teel liikmele
@@ -203,3 +203,4 @@ MembersByNature=Liikmed loomuse alusel
 VATToUseForSubscriptions=Liikmemaksude jaoks kasutatav KM määr
 NoVatOnSubscription=Liikmemaksudel ei ole KM
 MEMBER_PAYONLINE_SENDEMAIL=E-posti aadress, kuhu saadetakse hoiatus, kui Dolibarr on saanud liikmemaksu tasumise kinnituse
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index e37fa0d2eb5..df8001d04b8 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Kui toode on piiratud kestusega teenus:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Hindasid
 MultiPriceLevelsName=Kategooriate hinnad
-AssociatedProductsAbility=Aktiveeri virtuaalsete toodete võimalus
-AssociatedProducts=Virtuaalne toode
-AssociatedProductsNumber=Toodete arv, millest antud virtuaalne toode koosenb
-ParentProductsNumber=Antud toodet kasutavate virtuaalsete toodete arv
-IfZeroItIsNotAVirtualProduct=Kui 0, siis ei ole tegu virtuaalse tootega
-IfZeroItIsNotUsedByVirtualProduct=Kui 0, siis ei kasuta seda toodet ükski virtuaalne toode
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Seosta
 Translation=Tõlge
 KeywordFilter=Märksõnade filter
@@ -132,7 +132,7 @@ AddDel=Lisa/kustuta
 Quantity=Kogus
 NoMatchFound=Ühtki vastet ei leitud
 ProductAssociationList=Seotud toodete/teenuste nimekiri: toote/teenuse nimi (mõjutatud kogusest)
-ProductParentList=Virtuaalsete toodete/teenuste nimekiri, mis kasutavad ühe komponendina antud toodet
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Üks valitud toodetest kasutab antud toodet
 DeleteProduct=Kustuta toode/teenus
 ConfirmDeleteProduct=Kas oled täiesti kindel, et soovid antud toote/teenuse kustutada?
@@ -179,7 +179,7 @@ CloneProduct=Klooni toode või teenus
 ConfirmCloneProduct=Kas oled täiesti kindel, et soovid kloonida toote või teenuse <b>%s</b>?
 CloneContentProduct=Klooni toote/teenuse kogu põhiline info
 ClonePricesProduct=Klooni põhiline info ja hinnad
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Seda toodet kasutatakse
 NewRefForClone=Uue toote/teenuse viide
 CustomerPrices=Klientide hinnad
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index ecb040b20a8..2cf8253da79 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=See vaade näitab kõiki projekte ja ülesandeid (sinu kasutajaõiguse
 Myprojects=Minu projektid
 ProjectsArea=Projektide ala
 NewProject=Uus projekt
-AddProject=Lisa projekt
+AddProject=Create project
 DeleteAProject=Kustuta projekt
 DeleteATask=Kustuta ülesanne
 ConfirmDeleteAProject=Kas oled kindel, et soovid selle projekti kustutada?
@@ -36,6 +36,8 @@ TaskTimeSpent=Ülesannetel kulutatud aeg
 TaskTimeUser=Kasutaja
 TaskTimeNote=Märkus
 TaskTimeDate=Kuupäev
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Aeg kulutatud uuesti
 MyTimeSpent=Minu poolt kulutatud aeg
 MyTasks=Minu ülesanded
@@ -45,7 +47,7 @@ TaskDateStart=Ülesande alguse kuupäev
 TaskDateEnd=Ülesande lõpu kuupäev
 TaskDescription=Ülesande kirjeldus
 NewTask=Uus ülesanne
-AddTask=Lisa ülesanne
+AddTask=Create task
 AddDuration=Lisa kestus
 Activity=Aktiivsus
 Activities=Ülesanded/toimingud
diff --git a/htdocs/langs/et_EE/resource.lang b/htdocs/langs/et_EE/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/et_EE/resource.lang
+++ b/htdocs/langs/et_EE/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index 91e9f23d8db..be438a477ad 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Krediteeri
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Näita väljamakset
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Juhul kui arvel on vähemalt üks töötlemata väljamakse, ei märgita seda makstuks, et lubada eelnevat väljamakse haldamist.
-DoStandingOrdersBeforePayments=See sakk võimaldab taotleda püsikorraldust. Pärast selle lõpetamist saad sisestada makse arve sulgemiseks.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Väljamaksete fail
 SetToStatusSent=Märgi staatuseks 'Fail saadetud'
 ThisWillAlsoAddPaymentOnInvoice=See rakendub ka arvetega seotud maksetele ja liigitab nad "Makstud"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Otsekorralduse makse %s panga poolt
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index af502ac5720..cbdb7bc6d98 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Bilaketa-iragazien aukerak
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=Modulu gehiago...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Esteka
 BoxesAvailable=Eskuragarri dauden kutxak
@@ -444,7 +447,7 @@ Module55Desc=Barra-kodeak kudeatzea
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS kanala
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Laster-markak
 Module330Desc=Laster-markak kudeatzea
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Web-egutegia
 Module410Desc=Web-egutegiaren integrazioa
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Kategoriak
 Module1780Desc=Kategoriak kudeatzea (produktuak, hornitzaileak eta bezeroak)
 Module2000Name=WYSIWYG editorea
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Dokumentuak gorde eta partekatu
 Module2600Name=Web-zerbitzuak
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Bezeroa
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Marjinak
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang
index 1ed4e637d14..e5470c8011a 100644
--- a/htdocs/langs/eu_ES/agenda.lang
+++ b/htdocs/langs/eu_ES/agenda.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - agenda
 IdAgenda=ID event
-Actions=Events
+Actions=Gertaerak
 ActionsArea=Events area (Actions and tasks)
 Agenda=Agenda
-Agendas=Agendas
-Calendar=Calendar
-Calendars=Calendars
+Agendas=Agendak
+Calendar=Egutegia
+Calendars=Egutegiak
 LocalAgenda=Internal calendar
 ActionsOwnedBy=Event owned by
 AffectedTo=Assigned to
 DoneBy=Done by
 Event=Event
-Events=Events
-EventsNb=Number of events
-MyEvents=My events
+Events=Gertaerak
+EventsNb=Gertaera kopurua
+MyEvents=Nire gertaerak
 OtherEvents=Other events
-ListOfActions=List of events
-Location=Location
+ListOfActions=Gertaeren zerrenda
+Location=Kokapena
 EventOnFullDay=Event on all day(s)
 SearchAnAction= Search an event/task
 MenuToDoActions=All incomplete events
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 81b7515a8b8..d20b6762937 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -56,28 +56,28 @@ SupplierBill=Supplier invoice
 SupplierBills=suppliers invoices
 Payment=Payment
 PaymentBack=Payment back
-Payments=Payments
+Payments=Ordainketak
 PaymentsBack=Payments back
 PaidBack=Paid back
-DatePayment=Payment date
-DeletePayment=Delete payment
-ConfirmDeletePayment=Are you sure you want to delete this payment ?
+DatePayment=Ordainketa data
+DeletePayment=Ordainketa ezabatu
+ConfirmDeletePayment=Ziur zaude ordainketa hay ezabatu nahi duzuna?
 ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-SupplierPayments=Suppliers payments
-ReceivedPayments=Received payments
-ReceivedCustomersPayments=Payments received from customers
+SupplierPayments=Hornitzaileei ordainketak
+ReceivedPayments=Jasotako ordainketak
+ReceivedCustomersPayments=Bezeroen jasotako ordainketak
 PayedSuppliersPayments=Payments payed to suppliers
-ReceivedCustomersPaymentsToValid=Received customers payments to validate
-PaymentsReportsForYear=Payments reports for %s
-PaymentsReports=Payments reports
-PaymentsAlreadyDone=Payments already done
+ReceivedCustomersPaymentsToValid=Balidatu beharreko bezeroen jasotako ordainketak
+PaymentsReportsForYear=%s ordainketen txostena
+PaymentsReports=Ordainketen txostena
+PaymentsAlreadyDone=Jada egindako ordainketak
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
-PaymentMode=Payment type
+PaymentMode=Ordainketa mota
 PaymentConditions=Payment term
 PaymentConditionsShort=Payment term
-PaymentAmount=Payment amount
-ValidatePayment=Validate payment
+PaymentAmount=Ordainketaren zenbatekoa
+ValidatePayment=Ordainketak balioztatu
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
@@ -93,8 +93,8 @@ DeleteBill=Delete invoice
 SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
-SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
+SendRemindByMail=Oroigarria e-postaz bidali
+DoPayment=Ordainketa egin
 DoPaymentBack=Do payment back
 ConvertToReduc=Convert into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -140,13 +140,13 @@ NewBill=New invoice
 LastBills=Last %s invoices
 LastCustomersBills=Last %s customers invoices
 LastSuppliersBills=Last %s suppliers invoices
-AllBills=All invoices
+AllBills=Faktura guztiak
 OtherBills=Other invoices
-DraftBills=Draft invoices
+DraftBills=Fakturen zirriborroak
 CustomersDraftInvoices=Customers draft invoices
 SuppliersDraftInvoices=Suppliers draft invoices
-Unpaid=Unpaid
-ConfirmDeleteBill=Are you sure you want to delete this invoice ?
+Unpaid=Ordaindu gabekoak
+ConfirmDeleteBill=Ziur zaude faktura hau ezabatu nahi duzuna?
 ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b> ?
 ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status ?
 ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid ?
@@ -157,7 +157,7 @@ ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely.
 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.
 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
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Bezero txarra
 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»)
@@ -171,21 +171,21 @@ ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other case
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s ?
 ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s ?
 ConfirmValidatePayment=Are you sure you want to validate this payment ? No change can be made once payment is validated.
-ValidateBill=Validate invoice
-UnvalidateBill=Unvalidate invoice
+ValidateBill=Faktura balioztatu
+UnvalidateBill=Faktura baliogabeta
 NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
-AmountOfBills=Amount of invoices
+AmountOfBills=Faktura kopurua
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social contribution
-ShowBill=Show invoice
-ShowInvoice=Show invoice
+ShowBill=Faktura erakutsi
+ShowInvoice=Faktura erakutsi
 ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show deposit invoice
-ShowPayment=Show payment
-File=File
-AlreadyPaid=Already paid
+ShowPayment=Ordainketa erakutsi
+File=Fitxategia
+AlreadyPaid=Jada ordainduta
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
 Abandoned=Abandoned
diff --git a/htdocs/langs/eu_ES/bookmarks.lang b/htdocs/langs/eu_ES/bookmarks.lang
index c04d25c328d..c8c45f1b49e 100644
--- a/htdocs/langs/eu_ES/bookmarks.lang
+++ b/htdocs/langs/eu_ES/bookmarks.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - marque pages
-# AddThisPageToBookmarks=Add this page to bookmarks
-# Bookmark=Bookmark
-# Bookmarks=Bookmarks
-# NewBookmark=New bookmark
-# ShowBookmark=Show bookmark
-# OpenANewWindow=Open a new window
-# ReplaceWindow=Replace current window
-# BookmarkTargetNewWindowShort=New window
-# BookmarkTargetReplaceWindowShort=Current window
-# BookmarkTitle=Bookmark title
-# UrlOrLink=URL
-# BehaviourOnClick=Behaviour when a URL is clicked
-# CreateBookmark=Create bookmark
-# SetHereATitleForLink=Set a title for the bookmark
-# UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL
-# ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window
-# BookmarksManagement=Bookmarks management
-# ListOfBookmarks=List of bookmarks
+AddThisPageToBookmarks=Orrialde hau laster-marketara gehitu
+Bookmark=Laster-marka
+Bookmarks=Laster-markak
+NewBookmark=Laster-marka berria
+ShowBookmark=Erakutsi laster-marka
+OpenANewWindow=Leiho berria irekia
+ReplaceWindow=Oraingo leihoa ordezkatu
+BookmarkTargetNewWindowShort=Leiho berria
+BookmarkTargetReplaceWindowShort=Oraingo leihoa
+BookmarkTitle=Laster-markaren izenburua
+UrlOrLink=URL
+BehaviourOnClick=Behaviour when a URL is clicked
+CreateBookmark=Laster-marka sortu
+SetHereATitleForLink=Laster-markaren izenburua ezarri
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window
+BookmarksManagement=Laster-marken kudeaketa
+ListOfBookmarks=Laster-marken zerrenda
diff --git a/htdocs/langs/eu_ES/commercial.lang b/htdocs/langs/eu_ES/commercial.lang
index e7d2de76503..b83fe1d4671 100644
--- a/htdocs/langs/eu_ES/commercial.lang
+++ b/htdocs/langs/eu_ES/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
 Prospects=Prospects
 DeleteAction=Delete an event/task
 NewAction=New event/task
-AddAction=Add event/task
-AddAnAction=Add an event/task
-AddActionRendezVous=Add a Rendez-vous event
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
 Rendez-Vous=Rendezvous
 ConfirmDeleteAction=Are you sure you want to delete this event/task ?
 CardAction=Event card
@@ -44,8 +44,8 @@ DoneActions=Completed events
 DoneActionsFor=Completed events for %s
 ToDoActions=Incomplete events
 ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Send commercial proposal %s
-SendOrderRef=Send order %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
 StatusNotApplicable=Not applicable
 StatusActionToDo=To do
 StatusActionDone=Complete
@@ -62,7 +62,7 @@ LastProspectContactDone=Contact done
 DateActionPlanned=Date event planned for
 DateActionDone=Date event done
 ActionAskedBy=Event reported by
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Event owned by
 ActionDoneBy=Event done by
 ActionUserAsk=Reported by
 ErrorStatusCantBeZeroIfStarted=If field '<b>Date done</b>' is filled, action is started (or finished), so field '<b>Status</b>' can't be 0%%.
@@ -90,7 +90,7 @@ FromTo=from %s to %s
 MargeOrder=Margins (validated orders)
 RecapAnnee=Summary of the year
 NoData=There is no data
-StatusProsp=Prospect status
+StatusProsp=Proiektuaren egoera
 DraftPropals=Draft commercial proposals
 SearchPropal=Search a commercial proposal
 CommercialDashboard=Commercial summary
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index 5580d87b517..e51242ae01b 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -233,15 +233,15 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
-VATIntra=VAT number
-VATIntraShort=VAT number
-VATIntraVeryShort=VAT
+VATIntra=BEZ zenbakia
+VATIntraShort=BEZ zenbakia
+VATIntraVeryShort=BEZ
 VATIntraSyntaxIsValid=Syntax is valid
 VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
-Customer=Customer
+Customer=Bezeroa
 CustomerDiscount=Customer Discount
 CustomerRelativeDiscount=Relative customer discount
 CustomerAbsoluteDiscount=Absolute customer discount
@@ -257,19 +257,19 @@ CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
 DefaultDiscount=Default discount
 AvailableGlobalDiscounts=Absolute discounts available
 DiscountNone=None
-Supplier=Supplier
+Supplier=Hornitzailea
 CompanyList=Company's list
-AddContact=Add contact
-AddContactAddress=Add contact/address
-EditContact=Edit contact
-EditContactAddress=Edit contact/address
-Contact=Contact
-ContactsAddresses=Contacts/Addresses
+AddContact=Kontaktua sortu
+AddContactAddress=Kontua/helbidea sortu
+EditContact=Kontaktua editatu
+EditContactAddress=Kontaktua/helbidea editatu
+Contact=Kontaktua
+ContactsAddresses=Kontaktua/helbidea
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
-AddCompany=Add company
-AddThirdParty=Add third party
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accountancy code
@@ -379,8 +379,8 @@ DeliveryAddressLabel=Delivery address label
 DeleteDeliveryAddress=Delete a delivery address
 ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
 NewDeliveryAddress=New delivery address
-AddDeliveryAddress=Add address
-AddAddress=Add address
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=No alternative delivery address defined
 SupplierCategory=Supplier category
 JuridicalStatus200=Independant
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/eu_ES/contracts.lang b/htdocs/langs/eu_ES/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/eu_ES/contracts.lang
+++ b/htdocs/langs/eu_ES/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index 195ad43c87c..85438821b7b 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/cron.lang
@@ -76,7 +76,7 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 # Info
-CronInfoPage=Information
+CronInfoPage=Informazioa
 # Common
 CronType=Task type
 CronType_method=Call method of a Dolibarr Class
diff --git a/htdocs/langs/eu_ES/dict.lang b/htdocs/langs/eu_ES/dict.lang
index a662b0f7573..a89480fcc0c 100644
--- a/htdocs/langs/eu_ES/dict.lang
+++ b/htdocs/langs/eu_ES/dict.lang
@@ -1,329 +1,327 @@
 # Dolibarr language file - Source file is en_US - dict
-# CountryFR=France
-# CountryBE=Belgium
-# CountryIT=Italy
-# CountryES=Spain
-# CountryDE=Germany
-# CountryCH=Switzerland
-# CountryGB=Great Britain
-# CountryUK=United Kingdom
-# CountryIE=Ireland
-# CountryCN=China
-# CountryTN=Tunisia
-# CountryUS=United States
-# CountryMA=Morocco
-# CountryDZ=Algeria
-# CountryCA=Canada
-# CountryTG=Togo
-# CountryGA=Gabon
-# CountryNL=Netherlands
-# CountryHU=Hungary
-# CountryRU=Russia
-# CountrySE=Sweden
-# CountryCI=Ivoiry Coast
-# CountrySN=Senegal
-# CountryAR=Argentina
-# CountryCM=Cameroon
-# CountryPT=Portugal
-# CountrySA=Saudi Arabia
-# CountryMC=Monaco
-# CountryAU=Australia
-# CountrySG=Singapore
-# CountryAF=Afghanistan
-# CountryAX=Åland Islands
-# CountryAL=Albania
-# CountryAS=American Samoa
-# CountryAD=Andorra
-# CountryAO=Angola
-# CountryAI=Anguilla
-# CountryAQ=Antarctica
-# CountryAG=Antigua and Barbuda
-# CountryAM=Armenia
-# CountryAW=Aruba
-# CountryAT=Austria
-# CountryAZ=Azerbaijan
-# CountryBS=Bahamas
-# CountryBH=Bahrain
-# CountryBD=Bangladesh
-# CountryBB=Barbados
-# CountryBY=Belarus
-# CountryBZ=Belize
-# CountryBJ=Benin
-# CountryBM=Bermuda
-# CountryBT=Bhutan
-# CountryBO=Bolivia
-# CountryBA=Bosnia and Herzegovina
-# CountryBW=Botswana
-# CountryBV=Bouvet Island
-# CountryBR=Brazil
-# CountryIO=British Indian Ocean Territory
-# CountryBN=Brunei Darussalam
-# CountryBG=Bulgaria
-# CountryBF=Burkina Faso
-# CountryBI=Burundi
-# CountryKH=Cambodia
-# CountryCV=Cape Verde
-# CountryKY=Cayman Islands
-# CountryCF=Central African Republic
-# CountryTD=Chad
-# CountryCL=Chile
-# CountryCX=Christmas Island
-# CountryCC=Cocos (Keeling) Islands
-# CountryCO=Colombia
-# CountryKM=Comoros
-# CountryCG=Congo
-# CountryCD=Congo, The Democratic Republic of the
-# CountryCK=Cook Islands
-# CountryCR=Costa Rica
-# CountryHR=Croatia
-# CountryCU=Cuba
-# CountryCY=Cyprus
-# CountryCZ=Czech Republic
-# CountryDK=Denmark
-# CountryDJ=Djibouti
-# CountryDM=Dominica
-# CountryDO=Dominican Republic
-# CountryEC=Ecuador
-# CountryEG=Egypt
-# CountrySV=El Salvador
-# CountryGQ=Equatorial Guinea
-# CountryER=Eritrea
-# CountryEE=Estonia
-# CountryET=Ethiopia
-# CountryFK=Falkland Islands
-# CountryFO=Faroe Islands
-# CountryFJ=Fiji Islands
-# CountryFI=Finland
-# CountryGF=French Guiana
-# CountryPF=French Polynesia
-# CountryTF=French Southern Territories
-# CountryGM=Gambia
-# CountryGE=Georgia
-# CountryGH=Ghana
-# CountryGI=Gibraltar
-# CountryGR=Greece
-# CountryGL=Greenland
-# CountryGD=Grenada
-# CountryGP=Guadeloupe
-# CountryGU=Guam
-# CountryGT=Guatemala
-# CountryGN=Guinea
-# CountryGW=Guinea-Bissau
-# CountryGY=Guyana
-# CountryHT=Haïti
-# CountryHM=Heard Island and McDonald
-# CountryVA=Holy See (Vatican City State)
-# CountryHN=Honduras
-# CountryHK=Hong Kong
-# CountryIS=Icelande
-# CountryIN=India
-# CountryID=Indonesia
-# CountryIR=Iran
-# CountryIQ=Iraq
-# CountryIL=Israel
-# CountryJM=Jamaica
-# CountryJP=Japan
-# CountryJO=Jordan
-# CountryKZ=Kazakhstan
-# CountryKE=Kenya
-# CountryKI=Kiribati
-# CountryKP=North Korea
-# CountryKR=South Korea
-# CountryKW=Kuwait
-# CountryKG=Kyrghyztan
-# CountryLA=Lao
-# CountryLV=Latvia
-# CountryLB=Lebanon
-# CountryLS=Lesotho
-# CountryLR=Liberia
-# CountryLY=Libyan
-# CountryLI=Liechtenstein
-# CountryLT=Lituania
-# CountryLU=Luxembourg
-# CountryMO=Macao
-# CountryMK=Macedonia, the former Yugoslav of
-# CountryMG=Madagascar
-# CountryMW=Malawi
-# CountryMY=Malaysia
-# CountryMV=Maldives
-# CountryML=Mali
-# CountryMT=Malta
-# CountryMH=Marshall Islands
-# CountryMQ=Martinique
-# CountryMR=Mauritania
-# CountryMU=Mauritius
-# CountryYT=Mayotte
-# CountryMX=Mexico
-# CountryFM=Micronesia
-# CountryMD=Moldova
-# CountryMN=Mongolia
-# CountryMS=Monserrat
-# CountryMZ=Mozambique
-# CountryMM=Birmania (Myanmar)
-# CountryNA=Namibia
-# CountryNR=Nauru
-# CountryNP=Nepal
-# CountryAN=Netherlands Antilles
-# CountryNC=New Caledonia
-# CountryNZ=New Zealand
-# CountryNI=Nicaragua
-# CountryNE=Niger
-# CountryNG=Nigeria
-# CountryNU=Niue
-# CountryNF=Norfolk Island
-# CountryMP=Northern Mariana Islands
-# CountryNO=Norway
-# CountryOM=Oman
-# CountryPK=Pakistan
-# CountryPW=Palau
-# CountryPS=Palestinian Territory, Occupied
-# CountryPA=Panama
-# CountryPG=Papua New Guinea
-# CountryPY=Paraguay
-# CountryPE=Peru
-# CountryPH=Philippines
-# CountryPN=Pitcairn Islands
-# CountryPL=Poland
-# CountryPR=Puerto Rico
-# CountryQA=Qatar
-# CountryRE=Reunion
-# CountryRO=Romania
-# CountryRW=Rwanda
-# CountrySH=Saint Helena
-# CountryKN=Saint Kitts and Nevis
-# CountryLC=Saint Lucia
-# CountryPM=Saint Pierre and Miquelon
-# CountryVC=Saint Vincent and Grenadines
-# CountryWS=Samoa
-# CountrySM=San Marino
-# CountryST=Sao Tome and Principe
-# CountryRS=Serbia
-# CountrySC=Seychelles
-# CountrySL=Sierra Leone
-# CountrySK=Slovakia
-# CountrySI=Slovenia
-# CountrySB=Solomon Islands
-# CountrySO=Somalia
-# CountryZA=South Africa
-# CountryGS=South Georgia and the South Sandwich Islands
-# CountryLK=Sri Lanka
-# CountrySD=Sudan
-# CountrySR=Suriname
-# CountrySJ=Svalbard and Jan Mayen
-# CountrySZ=Swaziland
-# CountrySY=Syrian
-# CountryTW=Taiwan
-# CountryTJ=Tajikistan
-# CountryTZ=Tanzania
-# CountryTH=Thailand
-# CountryTL=Timor-Leste
-# CountryTK=Tokelau
-# CountryTO=Tonga
-# CountryTT=Trinidad and Tobago
-# CountryTR=Turkey
-# CountryTM=Turkmenistan
-# CountryTC=Turks and Cailos Islands
-# CountryTV=Tuvalu
-# CountryUG=Uganda
-# CountryUA=Ukraine
-# CountryAE=United Arab Emirates
-# CountryUM=United States Minor Outlying Islands
-# CountryUY=Uruguay
-# CountryUZ=Uzbekistan
-# CountryVU=Vanuatu
-# CountryVE=Venezuela
-# CountryVN=Viet Nam
-# CountryVG=Virgin Islands, British
-# CountryVI=Virgin Islands, U.S.
-# CountryWF=Wallis and Futuna
-# CountryEH=Western Sahara
-# CountryYE=Yemen
-# CountryZM=Zambia
-# CountryZW=Zimbabwe
-# CountryGG=Guernsey
-# CountryIM=Isle of Man
-# CountryJE=Jersey
-# CountryME=Montenegro
-# CountryBL=Saint Barthelemy
-# CountryMF=Saint Martin
+CountryFR=Frantzia
+CountryBE=Belgika
+CountryIT=Italia
+CountryES=Espainia
+CountryDE=Alemania
+CountryCH=Suitza
+CountryGB=Britania Handia
+CountryUK=United Kingdom
+CountryIE=Irlanda
+CountryCN=Txina
+CountryTN=Tunisia
+CountryUS=Estatu Batuak
+CountryMA=Morocco
+CountryDZ=Algeria
+CountryCA=Kanada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Netherlands
+CountryHU=Hungary
+CountryRU=Errusia
+CountrySE=Suetzia
+CountryCI=Ivoiry Coast
+CountrySN=Senegal
+CountryAR=Argentina
+CountryCM=Kamerun
+CountryPT=Portugal
+CountrySA=Saudi Arabia
+CountryMC=Monaco
+CountryAU=Australia
+CountrySG=Singapore
+CountryAF=Afghanistan
+CountryAX=Åland Islands
+CountryAL=Albania
+CountryAS=American Samoa
+CountryAD=Andorra
+CountryAO=Angola
+CountryAI=Anguilla
+CountryAQ=Antarctica
+CountryAG=Antigua and Barbuda
+CountryAM=Armenia
+CountryAW=Aruba
+CountryAT=Austria
+CountryAZ=Azerbaijan
+CountryBS=Bahamas
+CountryBH=Bahrain
+CountryBD=Bangladesh
+CountryBB=Barbados
+CountryBY=Belarus
+CountryBZ=Belize
+CountryBJ=Benin
+CountryBM=Bermuda
+CountryBT=Bhutan
+CountryBO=Bolivia
+CountryBA=Bosnia and Herzegovina
+CountryBW=Botswana
+CountryBV=Bouvet Island
+CountryBR=Brasil
+CountryIO=British Indian Ocean Territory
+CountryBN=Brunei Darussalam
+CountryBG=Bulgaria
+CountryBF=Burkina Faso
+CountryBI=Burundi
+CountryKH=Cambodia
+CountryCV=Cape Verde
+CountryKY=Cayman Islands
+CountryCF=Central African Republic
+CountryTD=Chad
+CountryCL=Chile
+CountryCX=Christmas Island
+CountryCC=Cocos (Keeling) Islands
+CountryCO=Colombia
+CountryKM=Comoros
+CountryCG=Kongo
+CountryCD=Congo, The Democratic Republic of the
+CountryCK=Cook Islands
+CountryCR=Costa Rica
+CountryHR=Kroazia
+CountryCU=Kuba
+CountryCY=Cyprus
+CountryCZ=Txekiar Errepublika
+CountryDK=Denmark
+CountryDJ=Djibouti
+CountryDM=Dominica
+CountryDO=Dominican Republic
+CountryEC=Ecuador
+CountryEG=Egipto
+CountrySV=El Salvador
+CountryGQ=Equatorial Guinea
+CountryER=Eritrea
+CountryEE=Estonia
+CountryET=Ethiopia
+CountryFK=Falkland Islands
+CountryFO=Faroe Islands
+CountryFJ=Fiji Islands
+CountryFI=Finland
+CountryGF=French Guiana
+CountryPF=French Polynesia
+CountryTF=French Southern Territories
+CountryGM=Gambia
+CountryGE=Georgia
+CountryGH=Ghana
+CountryGI=Gibraltar
+CountryGR=Grezia
+CountryGL=Greenland
+CountryGD=Grenada
+CountryGP=Guadeloupe
+CountryGU=Guam
+CountryGT=Guatemala
+CountryGN=Guinea
+CountryGW=Guinea-Bissau
+CountryGY=Guyana
+CountryHT=Haiti
+CountryHM=Heard Island and McDonald
+CountryVA=Holy See (Vatican City State)
+CountryHN=Honduras
+CountryHK=Hong Kong
+CountryIS=Icelande
+CountryIN=India
+CountryID=Indonesia
+CountryIR=Iran
+CountryIQ=Irak
+CountryIL=Israel
+CountryJM=Jamaica
+CountryJP=Japan
+CountryJO=Jordan
+CountryKZ=Kazakhstan
+CountryKE=Kenia
+CountryKI=Kiribati
+CountryKP=North Korea
+CountryKR=South Korea
+CountryKW=Kuwait
+CountryKG=Kyrghyztan
+CountryLA=Lao
+CountryLV=Latvia
+CountryLB=Lebanon
+CountryLS=Lesotho
+CountryLR=Liberia
+CountryLY=Libyan
+CountryLI=Liechtenstein
+CountryLT=Lituania
+CountryLU=Luxembourg
+CountryMO=Macao
+CountryMK=Macedonia, the former Yugoslav of
+CountryMG=Madagaskar
+CountryMW=Malawi
+CountryMY=Malaysia
+CountryMV=Maldives
+CountryML=Mali
+CountryMT=Malta
+CountryMH=Marshall Islands
+CountryMQ=Martinique
+CountryMR=Mauritania
+CountryMU=Mauritius
+CountryYT=Mayotte
+CountryMX=Mexico
+CountryFM=Micronesia
+CountryMD=Moldova
+CountryMN=Mongolia
+CountryMS=Monserrat
+CountryMZ=Mozambique
+CountryMM=Birmania (Myanmar)
+CountryNA=Namibia
+CountryNR=Nauru
+CountryNP=Nepal
+CountryAN=Netherlands Antilles
+CountryNC=New Caledonia
+CountryNZ=Zelanda Berria
+CountryNI=Nikaragua
+CountryNE=Niger
+CountryNG=Nigeria
+CountryNU=Niue
+CountryNF=Norfolk Island
+CountryMP=Northern Mariana Islands
+CountryNO=Norway
+CountryOM=Oman
+CountryPK=Pakistan
+CountryPW=Palau
+CountryPS=Palestinian Territory, Occupied
+CountryPA=Panama
+CountryPG=Papua New Guinea
+CountryPY=Paraguay
+CountryPE=Peru
+CountryPH=Filipinak
+CountryPN=Pitcairn Islands
+CountryPL=Polonia
+CountryPR=Puerto Rico
+CountryQA=Qatar
+CountryRE=Reunion
+CountryRO=Romania
+CountryRW=Rwanda
+CountrySH=Saint Helena
+CountryKN=Saint Kitts and Nevis
+CountryLC=Saint Lucia
+CountryPM=Saint Pierre and Miquelon
+CountryVC=Saint Vincent and Grenadines
+CountryWS=Samoa
+CountrySM=San Marino
+CountryST=Sao Tome and Principe
+CountryRS=Serbia
+CountrySC=Seychelles
+CountrySL=Sierra Leone
+CountrySK=Slovakia
+CountrySI=Slovenia
+CountrySB=Solomon Islands
+CountrySO=Somalia
+CountryZA=Hego Afrika
+CountryGS=South Georgia and the South Sandwich Islands
+CountryLK=Sri Lanka
+CountrySD=Sudan
+CountrySR=Suriname
+CountrySJ=Svalbard and Jan Mayen
+CountrySZ=Swaziland
+CountrySY=Syrian
+CountryTW=Taiwan
+CountryTJ=Tajikistan
+CountryTZ=Tanzania
+CountryTH=Thailand
+CountryTL=Timor-Leste
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidad and Tobago
+CountryTR=Turkey
+CountryTM=Turkmenistan
+CountryTC=Turks and Cailos Islands
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukrania
+CountryAE=United Arab Emirates
+CountryUM=United States Minor Outlying Islands
+CountryUY=Uruguay
+CountryUZ=Uzbekistan
+CountryVU=Vanuatu
+CountryVE=Venezuela
+CountryVN=Viet Nam
+CountryVG=Virgin Islands, British
+CountryVI=Virgin Islands, U.S.
+CountryWF=Wallis and Futuna
+CountryEH=Western Sahara
+CountryYE=Yemen
+CountryZM=Zambia
+CountryZW=Zimbabwe
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Jersey
+CountryME=Montenegro
+CountryBL=Saint Barthelemy
+CountryMF=Saint Martin
 
 ##### Civilities #####
-# CivilityMME=Mrs.
-# CivilityMR=Mr.
-# CivilityMLE=Ms.
-# CivilityMTRE=Master
-# CivilityDR=Doctor
-
+CivilityMME=Mrs.
+CivilityMR=Jauna
+CivilityMLE=Anderea
+CivilityMTRE=Master
+CivilityDR=Doctor
 ##### Currencies #####
-# Currencyeuros=Euros
-# CurrencyAUD=AU Dollars
-# CurrencySingAUD=AU Dollar
-# CurrencyCAD=CAN Dollars
-# CurrencySingCAD=CAN Dollar
-# CurrencyCHF=Swiss Francs
-# CurrencySingCHF=Swiss Franc
-# CurrencyEUR=Euros
-# CurrencySingEUR=Euro
-# CurrencyFRF=French Francs
-# CurrencySingFRF=French Franc
-# CurrencyGBP=GB Pounds
-# CurrencySingGBP=GB Pound
-# CurrencyINR=Indian rupees
-# CurrencySingINR=Indian rupee
-# CurrencyMAD=Dirham
-# CurrencySingMAD=Dirham
-# CurrencyMGA=Ariary
-# CurrencySingMGA=Ariary
-# CurrencyMUR=Mauritius rupees
-# CurrencySingMUR=Mauritius rupee
-# CurrencyNOK=Norwegian krones
-# CurrencySingNOK=Norwegian krone
-# CurrencyTND=Tunisian dinars
-# CurrencySingTND=Tunisian dinar
-# CurrencyUSD=US Dollars
-# CurrencySingUSD=US Dollar
-# CurrencyUAH=Hryvnia
-# CurrencySingUAH=Hryvnia
-# CurrencyXAF=CFA Francs BEAC
-# CurrencySingXAF=CFA Franc BEAC
-# CurrencyXOF=CFA Francs BCEAO
-# CurrencySingXOF=CFA Franc BCEAO
-# CurrencyXPF=CFP Francs
-# CurrencySingXPF=CFP Franc
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+Currencyeuros=Euroak
+CurrencyAUD=AU dolarrak
+CurrencySingAUD=AU dolarra
+CurrencyCAD=CAN dolarrak
+CurrencySingCAD=CAN dollar
+CurrencyCHF=Suitzako frankoak
+CurrencySingCHF=Suitzako frankoa
+CurrencyEUR=Euroak
+CurrencySingEUR=Euroa
+CurrencyFRF=Frantziako frankoak
+CurrencySingFRF=Frantziako frankoa
+CurrencyGBP=GB librak
+CurrencySingGBP=GB libra
+CurrencyINR=Indian rupees
+CurrencySingINR=Indian rupee
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
+CurrencyMGA=Ariary
+CurrencySingMGA=Ariary
+CurrencyMUR=Mauritius rupees
+CurrencySingMUR=Mauritius rupee
+CurrencyNOK=Norwegian krones
+CurrencySingNOK=Norwegian krone
+CurrencyTND=Tunisian dinars
+CurrencySingTND=Tunisian dinar
+CurrencyUSD=US dolarrak
+CurrencySingUSD=US dolarra
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=CFA Francs BEAC
+CurrencySingXAF=CFA Franc BEAC
+CurrencyXOF=CFA Francs BCEAO
+CurrencySingXOF=CFA Franc BCEAO
+CurrencyXPF=CFP Francs
+CurrencySingXPF=CFP Franc
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=thousandth
 #### Input reasons #####
-# DemandReasonTypeSRC_INTE=Internet
-# DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
-# DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
-# DemandReasonTypeSRC_CAMP_PHO=Phone campaign
-# DemandReasonTypeSRC_CAMP_FAX=Fax campaign
-# DemandReasonTypeSRC_COMM=Commercial contact
-# DemandReasonTypeSRC_SHOP=Shop contact
-# DemandReasonTypeSRC_WOM=Word of mouth
-# DemandReasonTypeSRC_PARTNER=Partner
-# DemandReasonTypeSRC_EMPLOYEE=Employee
-# DemandReasonTypeSRC_SPONSORING=Sponsorship
-
+DemandReasonTypeSRC_INTE=Internet
+DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
+DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
+DemandReasonTypeSRC_CAMP_PHO=Phone campaign
+DemandReasonTypeSRC_CAMP_FAX=Fax campaign
+DemandReasonTypeSRC_COMM=Commercial contact
+DemandReasonTypeSRC_SHOP=Shop contact
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Employee
+DemandReasonTypeSRC_SPONSORING=Sponsorship
 #### Paper formats ####
-# PaperFormatEU4A0=Format 4A0
-# PaperFormatEU2A0=Format 2A0
-# PaperFormatEUA0=Format A0
-# PaperFormatEUA1=Format A1
-# PaperFormatEUA2=Format A2
-# PaperFormatEUA3=Format A3
-# PaperFormatEUA4=Format A4
-# PaperFormatEUA5=Format A5
-# PaperFormatEUA6=Format A6
-# PaperFormatUSLETTER=Format Letter US
-# PaperFormatUSLEGAL=Format Legal US
-# PaperFormatUSEXECUTIVE=Format Executive US
-# PaperFormatUSLEDGER=Format Ledger/Tabloid
-# PaperFormatCAP1=Format P1 Canada
-# PaperFormatCAP2=Format P2 Canada
-# PaperFormatCAP3=Format P3 Canada
-# PaperFormatCAP4=Format P4 Canada
-# PaperFormatCAP5=Format P5 Canada
-# PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/eu_ES/ftp.lang b/htdocs/langs/eu_ES/ftp.lang
index 6f135997201..4997aaa1306 100644
--- a/htdocs/langs/eu_ES/ftp.lang
+++ b/htdocs/langs/eu_ES/ftp.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - ftp
-# FTPClientSetup=FTP Client module setup
-# NewFTPClient=New FTP connection setup
-# FTPArea=FTP Area
-# FTPAreaDesc=This screen show you content of a FTP server view
-# SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-# FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-# FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-# FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-# FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-# FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-# FTPPassiveMode=Passive mode
+FTPClientSetup=FTP bezero modulua konfiguratu
+NewFTPClient=FTP konexio berria konfiguratu
+FTPArea=FTP Area
+FTPAreaDesc=This screen show you content of a FTP server view
+SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
+FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
+FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
+FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
+FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
+FTPPassiveMode=Passive mode
diff --git a/htdocs/langs/eu_ES/languages.lang b/htdocs/langs/eu_ES/languages.lang
index 1116e29c21c..f0a375c7f1f 100644
--- a/htdocs/langs/eu_ES/languages.lang
+++ b/htdocs/langs/eu_ES/languages.lang
@@ -4,45 +4,45 @@ Language_ar_AR=Arabic
 Language_ar_SA=Arabic
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
-Language_ca_ES=Catalan
+Language_ca_ES=Katalana
 Language_cs_CZ=Czech
 Language_da_DA=Danish
 Language_da_DK=Danish
-Language_de_DE=German
+Language_de_DE=Alemana
 Language_de_AT=German (Austria)
-Language_de_CH=German (Switzerland)
-Language_el_GR=Greek
-Language_en_AU=English (Australia)
-Language_en_GB=English (United Kingdom)
-Language_en_IN=English (India)
-Language_en_NZ=English (New Zealand)
+Language_de_CH=Alemana (Suitza)
+Language_el_GR=Greziera
+Language_en_AU=Ingelesa (Australia)
+Language_en_GB=Ingelesa (Erresuma Batua)
+Language_en_IN=Ingelesa (India)
+Language_en_NZ=Ingelesa (Zelanda Berria)
 Language_en_SA=English (Saudi Arabia)
-Language_en_US=English (United States)
+Language_en_US=Ingelesa (Estatu Batuak)
 Language_en_ZA=English (South Africa)
-Language_es_ES=Spanish
+Language_es_ES=Gaztelania
 Language_es_DO=Spanish (Dominican Republic)
-Language_es_AR=Spanish (Argentina)
+Language_es_AR=Gaztelania (Argentina)
 Language_es_CL=Spanish (Chile)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
-Language_es_PE=Spanish (Peru)
+Language_es_PE=Gaztelania (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_et_EE=Estonian
-Language_eu_ES=Basque
+Language_eu_ES=Euskera
 Language_fa_IR=Persian
 Language_fi_FI=Fins
-Language_fr_BE=French (Belgium)
-Language_fr_CA=French (Canada)
-Language_fr_CH=French (Switzerland)
-Language_fr_FR=French
+Language_fr_BE=Frantsesa (Belgika)
+Language_fr_CA=Frantsesa (Kanada)
+Language_fr_CH=Frantsea (Suitza)
+Language_fr_FR=Frantsesa
 Language_fr_NC=French (New Caledonia)
 Language_he_IL=Hebrew
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
-Language_it_IT=Italian
+Language_it_IT=Italiera
 Language_ja_JP=Japanese
 Language_ko_KR=Korean
 Language_lt_LT=Lithuanian
diff --git a/htdocs/langs/eu_ES/link.lang b/htdocs/langs/eu_ES/link.lang
index 8b1efb75ef3..50b49b036b2 100644
--- a/htdocs/langs/eu_ES/link.lang
+++ b/htdocs/langs/eu_ES/link.lang
@@ -1,8 +1,8 @@
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+LinkANewFile=Fitxategi/dokumentu berria estekatu
+LinkedFiles=Estekatutako fitxategi eta dokumentuak
+NoLinkFound=Ez dago gordetako estekarik
+LinkComplete=Fitxategia ondo estekatu da
+ErrorFileNotLinked=Ezin izan da fitxategia estekatu
+LinkRemoved=%s esteka ezabatua izan da
+ErrorFailedToDeleteLink= Ezin izan da '<b>%s</b>' esteka ezabatu
+ErrorFailedToUpdateLink= Ezin izan da '<b>%s</b>' esteka berritu
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 7a211198822..697b6e3bc97 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -16,7 +16,7 @@ MailTo=Receiver(s)
 MailCC=Copy to
 MailCCC=Cached copy to
 MailTopic=EMail topic
-MailText=Message
+MailText=Mezua
 MailFile=Attached files
 MailMessage=EMail body
 ShowEMailing=Show emailing
@@ -110,7 +110,7 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
+SendMail=e-posta bidali
 SentBy=Sent by
 MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index d51879601be..103789691ef 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -99,19 +99,19 @@ NotePublic=Note (public)
 NotePrivate=Note (private)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
 DoTest=Test
-ToFilter=Filter
+ToFilter=Iragazia
 WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
+yes=bai
+Yes=Bai
+no=ez
+No=Ez
 All=All
 Home=Home
-Help=Help
+Help=Laguntza
 OnlineHelp=Online help
-PageWiki=Wiki page
-Always=Always
-Never=Never
+PageWiki=Wiki orrialdea
+Always=Beti
+Never=Inoiz
 Under=under
 Period=Period
 PeriodEndDate=End date for period
@@ -119,29 +119,29 @@ Activate=Activate
 Activated=Activated
 Closed=Closed
 Closed2=Closed
-Enabled=Enabled
+Enabled=Gaituta
 Deprecated=Deprecated
 Disable=Disable
 Disabled=Disabled
-Add=Add
-AddLink=Add link
-Update=Update
+Add=Gehitu
+AddLink=Esteka gehitu
+Update=Berritu
 AddActionToDo=Add event to do
 AddActionDone=Add event done
-Close=Close
-Close2=Close
+Close=Itxi
+Close2=Itxi
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b> ?
-Delete=Delete
-Remove=Remove
+Delete=Ezabatu
+Remove=Kendu
 Resiliate=Resiliate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
+Cancel=Utzi
+Modify=Eraldatu
+Edit=Editatu
 Validate=Validate
 ToValidate=To validate
-Save=Save
-SaveAs=Save As
+Save=Gorde
+SaveAs=Gorde honela
 TestConnection=Test connection
 ToClone=Clone
 ConfirmClone=Choose data you want to clone :
@@ -150,10 +150,10 @@ Of=of
 Go=Go
 Run=Run
 CopyOf=Copy of
-Show=Show
+Show=Erakutsi
 ShowCardHere=Show card
-Search=Search
-SearchOf=Search
+Search=Bilatu
+SearchOf=Bilatu
 Valid=Valid
 Approve=Approve
 ReOpen=Re-Open
@@ -165,57 +165,57 @@ ChooseLangage=Please choose your language
 Resize=Resize
 Recenter=Recenter
 Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-Password=Password
+User=Erabiltzailea
+Users=Erabiltzaileak
+Group=Taldea
+Groups=Taldeak
+Password=Pasahitza
 PasswordRetype=Retype your password
 NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
+Name=Izena
+Person=Pertsona
 Parameter=Parameter
 Parameters=Parameters
-Value=Value
+Value=Balioa
 GlobalValue=Global value
 PersonalValue=Personal value
-NewValue=New value
+NewValue=Balio berria
 CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
+Code=Kodea
+Type=Mota
+Language=Hizkuntza
 MultiLanguage=Multi-language
-Note=Note
+Note=Oharra
 CurrentNote=Current note
 Title=Title
 Label=Label
 RefOrLabel=Ref. or label
 Info=Log
-Family=Family
-Description=Description
-Designation=Description
+Family=Familia
+Description=Deskribapena
+Designation=Deskribapena
 Model=Model
 DefaultModel=Default model
 Action=Event
 About=About
-Number=Number
+Number=Zenbakia
 NumberByMonth=Number by month
 AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
+Numero=Zenbakia
+Limit=Limitea
+Limits=Limiteak
 DevelopmentTeam=Development Team
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Konexia
 Setup=Setup
 Alert=Alert
-Previous=Previous
-Next=Next
+Previous=Aurrekoa
+Next=Hurrengoa
 Cards=Cards
 Card=Card
-Now=Now
-Date=Date
+Now=Orain
+Date=Data
 DateStart=Date start
 DateEnd=Date end
 DateCreation=Creation date
@@ -418,8 +418,8 @@ Paid=Paid
 Topic=Sujet
 ByCompanies=By third parties
 ByUsers=By users
-Links=Links
-Link=Link
+Links=Estekak
+Link=Esteka
 Receipts=Receipts
 Rejects=Rejects
 Preview=Preview
@@ -429,81 +429,81 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
+Photo=Irudia
+Photos=Irudiak
+AddPhoto=Irudia gehitu
 Login=Login
 CurrentLogin=Current login
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
+January=Urtarrila
+February=Otsaila
+March=Martxoa
+April=Apirila
+May=Maiatza
+June=Ekaina
+July=Uztaila
+August=Abuztua
+September=Iraila
+October=Urria
+November=Azaroa
+December=Abendua
+JanuaryMin=Urt
+FebruaryMin=Ots
 MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
+AprilMin=Api
+MayMin=Mai
+JuneMin=Eka
+JulyMin=Uzt
+AugustMin=Abu
+SeptemberMin=Ira
+OctoberMin=Urr
+NovemberMin=Aza
+DecemberMin=Abe
+Month01=Urtarrila
+Month02=Otsaila
+Month03=Martxoa
+Month04=Apirila
+Month05=Maiatza
+Month06=Ekaina
+Month07=Uztaila
+Month08=Abuztua
+Month09=Iraila
+Month10=Urria
+Month11=Azaroa
+Month12=Abendua
+MonthShort01=Urt
+MonthShort02=Ots
 MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
+MonthShort04=Api
+MonthShort05=Mai
+MonthShort06=Eka
+MonthShort07=Uzt
+MonthShort08=Abu
+MonthShort09=Ira
+MonthShort10=Urr
+MonthShort11=Aza
+MonthShort12=Abe
 AttachedFiles=Attached files and documents
 FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
+DateFormatYYYYMM=UUUU-HH
+DateFormatYYYYMMDD=UUUU-HH-EE
+DateFormatYYYYMMDDHHMM=UUUU-HH-EE OO:SS
 ReportName=Report name
 ReportPeriod=Report period
 ReportDescription=Description
-Report=Report
+Report=Txostena
 Keyword=Mot clé
 Legend=Legend
 FillTownFromZip=Fill city from zip
-Fill=Fill
+Fill=Bete
 Reset=Reset
 ShowLog=Show log
-File=File
-Files=Files
+File=Fitxategia
+Files=Fitxategiak
 NotAllowed=Not allowed
 ReadPermissionNotAllowed=Read permission not allowed
 AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
+Example=Adibidea
+Examples=Adibideak
 NoExample=No example
 FindBug=Report a bug
 NbOfThirdParties=Number of third parties
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index 9246a04ced9..40bca8e85fb 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/eu_ES/resource.lang b/htdocs/langs/eu_ES/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/eu_ES/resource.lang
+++ b/htdocs/langs/eu_ES/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/eu_ES/salaries.lang b/htdocs/langs/eu_ES/salaries.lang
index edca71a1829..31629a4ee99 100644
--- a/htdocs/langs/eu_ES/salaries.lang
+++ b/htdocs/langs/eu_ES/salaries.lang
@@ -1,8 +1,12 @@
 # Dolibarr language file - Source file is en_US - users
-Salary=Salary
-Salaries=Salaries
-Employee=Employee
-NewSalaryPayment=New salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
+Salary=Soldata
+Salaries=Soldatak
+Employee=Langilea
+NewSalaryPayment=Soldata ordainketa berria
+SalaryPayment=Soldata ordainketa
+SalariesPayments=Soldaten ordainketak
+ShowSalaryPayment=Soldataren ordainketa erakutsi
+THM=Batezbesteko orduko prezioa
+TJM=Batezbesteko eguneko prezioa
diff --git a/htdocs/langs/eu_ES/trips.lang b/htdocs/langs/eu_ES/trips.lang
index 4b0501a8346..e9d7c242e07 100644
--- a/htdocs/langs/eu_ES/trips.lang
+++ b/htdocs/langs/eu_ES/trips.lang
@@ -1,21 +1,21 @@
 # Dolibarr language file - Source file is en_US - trips
-Trip=Trip
-Trips=Trips
+Trip=Bidaia
+Trips=Bidaiak
 TripsAndExpenses=Trips and expenses
 TripsAndExpensesStatistics=Trips and expenses statistics
 TripCard=Trip card
-AddTrip=Add trip
-ListOfTrips=List of trips
+AddTrip=Bidaia sortu
+ListOfTrips=Bidaien zerrenda
 ListOfFees=List of fees
-NewTrip=New trip
-CompanyVisited=Company/foundation visited
-Kilometers=Kilometers
+NewTrip=Bidai berria
+CompanyVisited=Bisitatutako konpania/erakundea
+Kilometers=Kilometroak
 FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete trip
-ConfirmDeleteTrip=Are you sure you want to delete this trip ?
+DeleteTrip=Bidaia ezabatu
+ConfirmDeleteTrip=Ziur zaude bidai hau ezabatu nahi duzuna?
 TF_OTHER=Other
-TF_LUNCH=Lunch
-TF_TRIP=Trip
+TF_LUNCH=Bazkaria
+TF_TRIP=Bidaia
 ListTripsAndExpenses=List of trips and expenses
 ExpensesArea=Trips and expenses area
 SearchATripAndExpense=Search a trip and expense
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/eu_ES/withdrawals.lang
+++ b/htdocs/langs/eu_ES/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 542848189c1..a5889dd5197 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=استفاده از رشته های تکمیل خودک
 ActivityStateToSelectCompany= اضافه کردن یک گزینه فیلتر برای نشان دادن / پنهان کن thirdparties که در حال حاضر در فعالیت و یا تا به آن متوقف شد
 UseSearchToSelectContactTooltip=همچنین اگر شما تعداد زیادی از اشخاص ثالث (> 100 000)، شما می توانید سرعت با تنظیم CONTACT_DONOTSEARCH_ANYWHERE ثابت به 1 در راه اندازی-> دیگر افزایش دهد. جست و جو خواهد شد و سپس محدود به شروع از رشته است.
 UseSearchToSelectContact=استفاده از رشته های تکمیل خودکار را انتخاب کنید تماس با (به جای استفاده از جعبه لیست).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=جستجو فیلتر گزینه
 NumberOfKeyToSearch=اسمشو نبر از شخصیت های به ماشه جستجو:٪ s را
 ViewFullDateActions=نمایش رویدادهای تاریخ های کامل در برگه سوم
@@ -208,6 +210,7 @@ ModulesJobDesc=ماژول های کسب و کار راه اندازی از پی
 ModulesMarketPlaceDesc=شما می توانید ماژول های بیشتری برای دانلود در وب سایت های خارجی را در اینترنت پیدا کنید ...
 ModulesMarketPlaces=ماژول های بیشتر ...
 DoliStoreDesc=DoliStore، محل رسمی بازار برای ماژول های خارجی Dolibarr ERP / CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=ارائه دهندگان وب سایت شما می توانید جستجو برای پیدا کردن ماژول های بیشتر ...
 URL=پیوند
 BoxesAvailable=جعبه دسترس
@@ -444,7 +447,7 @@ Module55Desc=مدیریت بارکد
 Module56Name=تلفن
 Module56Desc=یکپارچه سازی تلفن
 Module57Name=سفارشات ایستاده
-Module57Desc=ایستاده سفارشات و مدیریت خروج
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=کلیک برای تماس
 Module58Desc=یکپارچه سازی سیستم ClickToDial (ستاره، ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=خوراک RSS
 Module320Desc=اضافه کردن خوراک RSS در داخل صفحات صفحه نمایش Dolibarr
 Module330Name=بوک مارک ها
 Module330Desc=مدیریت چوب الف
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=ادغام Webcalendar
 Module500Name=هزینه های ویژه (مالیاتی، کمک های اجتماعی، سود سهام)
@@ -495,6 +498,8 @@ Module1780Name=دسته بندی ها
 Module1780Desc=مدیریت گروه (محصولات، تامین کنندگان و مشتریان)
 Module2000Name=ویرایشگر WYSIWYG
 Module2000Desc=اجازه می دهد به ویرایش برخی از متن با استفاده از ویرایشگر پیشرفته
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=cron را
 Module2300Desc=وظیفه مدیریت برنامه ریزی
 Module2400Name=دستور کار
@@ -503,6 +508,8 @@ Module2500Name=الکترونیکی مدیریت محتوا
 Module2500Desc=ذخیره و به اشتراک اسناد
 Module2600Name=سرویس دهنده وب
 Module2600Desc=فعال کردن Dolibarr خدمات وب سرور
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar در
 Module2700Desc=استفاده از سرویس آنلاین Gravatar در (www.gravatar.com) برای نشان دادن عکس از کاربران / کاربران (که با ایمیل های خود را). نیاز به دسترسی به اینترنت
 Module2800Desc=FTP کارفرما
@@ -517,7 +524,7 @@ Module6000Desc=مدیریت گردش کار
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=خزانه
 Module50000Desc=ماژول برای ارائه یک صفحه پرداخت آنلاین از طریق کارت اعتباری با خزانه
 Module50100Name=نقطه ای از فروش
@@ -527,7 +534,7 @@ Module50200Desc=ماژول برای ارائه یک صفحه پرداخت آنل
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=چاپ از طریق جام IPP پرینتر.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=نظرسنجی گسترش
 Module55000Desc=ماژول را به نظر سنجی آنلاین (مانند دودل، خاتم کاری، Rdvz، ...)
 Module59000Name=حاشیه
@@ -779,6 +786,7 @@ DictionaryOrderMethods=مرتب سازی بر روش
 DictionarySource=منبع از پیشنهادات / سفارشات
 DictionaryAccountancyplan=نمودار حساب
 DictionaryAccountancysystem=مدل برای نمودار حساب
+DictionaryEMailTemplates=Emails templates
 SetupSaved=راه اندازی نجات داد
 BackToModuleList=بازگشت به لیست ماژول ها
 BackToDictionaryList=برگشت به فهرست واژه نامه ها
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=فرم جستجو دائمی در منوی سمت چپ
 DefaultLanguage=زبان پیش فرض برای استفاده از (زبان)
 EnableMultilangInterface=فعال کردن رابط کاربری چند زبانه
 EnableShowLogo=نمایش لوگو را در منوی سمت چپ
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=سیستم شما با موفقیت به روز رسانی شده است
 CompanyInfo=شرکت / اطلاعات پایه
 CompanyIds=هویت شرکت / بنیاد
diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang
index 01e2beb85d5..31bd6a514ab 100644
--- a/htdocs/langs/fa_IR/agenda.lang
+++ b/htdocs/langs/fa_IR/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=رویدادهای اختصاص یافته به
 ActionsDoneBy=رویدادهای انجام شده توسط
 ActionsForUser=رویدادهای ها برای کاربر
 ActionsForUsersGroup=رویدادها برای همه کاربران گروه
+ActionAssignedTo=Event assigned to
 AllMyActions= همه رویدادها من / وظایف
 AllActions= همه رویدادها / وظایف
 ViewList=مشاهده لیست
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index f7f285a021f..ecc5cfbf660 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=با توجه به منبع، انتخاب روش م
 TurnoverPerProductInCommitmentAccountingNotRelevant=گزارش گردش مالی در هر محصول، در هنگام استفاده از حالت <b>حسابداری نقدی</b> مربوط نیست. این گزارش که با استفاده از <b>تعامل</b> حالت <b>حسابداری</b> (راه اندازی ماژول حسابداری را مشاهده کنید) فقط در دسترس است.
 CalculationMode=حالت محاسبه
 AccountancyJournal=کد حسابداری مجله
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/fa_IR/contracts.lang b/htdocs/langs/fa_IR/contracts.lang
index 2192fa807e9..66101dfbec6 100644
--- a/htdocs/langs/fa_IR/contracts.lang
+++ b/htdocs/langs/fa_IR/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=فهرست در حال اجرا خطوط قرارد
 ListOfRunningServices=لیست خدمات در حال اجرا
 NotActivatedServices=خدمات غیر فعال (در قرارداد اعتبار)
 BoardNotActivatedServices=خدمات برای فعال سازی در قرارداد اعتبار
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=تاریخ و زمان آخرین٪ s به خدمات فعال
 LastModifiedServices=تاریخ و زمان آخرین٪ بازدید کنندگان خدمات اصلاح شده
 EditServiceLine=خط ویرایش خدمات
@@ -91,6 +91,7 @@ ListOfServicesToExpire=فهرست خدمات دات کام
 NoteListOfYourExpiredServices=این لیست فقط شامل خدمات قرارداد برای اشخاص ثالث به شما به عنوان یک نماینده فروش مرتبط است.
 StandardContractsTemplate=قراردادهای استاندارد قالب
 ContactNameAndSignature=برای٪ s، نام و امضا:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=نمایندگی فروش امضای قرارداد
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 12220688262..8ac54cde918 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=کد تامین کننده مورد نیاز
 ErrorSupplierCodeAlreadyUsed=کد تامین کننده در حال حاضر استفاده می شود
 ErrorBadParameters=پارامترهای بد
 ErrorBadValueForParameter=ارزش اشتباه '٪ s' را برای پارامتر نادرست '٪ s' را
-ErrorBadImageFormat=فایل تصویر است نه یک فرمت پشتیبانی
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=مقدار «٪ s 'است قالب تاریخ اشتباه
 ErrorWrongDate=تاریخ صحیح نمی باشد!
 ErrorFailedToWriteInDir=برای نوشتن در پوشه٪ s شکست خورد
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=کاربر با ورود <b>به٪ s را</b> می تو
 ErrorLoginHasNoEmail=این کاربر هیچ آدرس ایمیل. فرآیند سقط شده.
 ErrorBadValueForCode=ارزش بد برای کد امنیتی. دوباره سعی کنید با ارزش جدید ...
 ErrorBothFieldCantBeNegative=زمینه های٪ s و٪ s نمی تواند هر دو منفی
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=حساب <b>کاربری٪ s را</b> برای اجرای وب سرور بدون اجازه که
 ErrorNoActivatedBarcode=بدون بارکد از نوع فعال
 ErrUnzipFails=برای جدا کردن٪ s با ZipArchive ناموفق
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=خطا، این عضو هنو
 ErrorThereIsSomeDeliveries=خطا، برخی از زایمان مرتبط با این حمل و نقل وجود دارد. حذف خودداری کرد.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=پارامترهای راه اندازی اجباری هنوز تعریف نشده
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index 142a3e9dd00..d9b24f6e89b 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -16,7 +16,7 @@ ErrorMemberTypeNotDefined=نوع کاربران تعریف نشده
 ListOfPublicMembers=فهرست کاربران عمومی
 ListOfValidatedPublicMembers=فهرست کاربران عمومی معتبر
 ErrorThisMemberIsNotPublic=این عضو است عمومی نمی
-ErrorMemberIsAlreadyLinkedToThisThirdParty=یکی دیگر از عضو (نام و نام <b>خانوادگی:٪ S،</b> وارد <b>کنید:%s)</b> در حال حاضر به شخص <b>ثالث%s در</b> ارتباط است. حذف این لینک برای اولین بار به دلیل یک شخص ثالث می تواند تنها به یک عضو (و بالعکس) پیوند داده نمی شود.
+ErrorMemberIsAlreadyLinkedToThisThirdParty=یکی دیگر از عضو (نام و نام <b>خانوادگی:٪ S،</b> وارد <b>کنید:٪ s)</b> در حال حاضر به شخص <b>ثالث٪ s در</b> ارتباط است. حذف این لینک برای اولین بار به دلیل یک شخص ثالث می تواند تنها به یک عضو (و بالعکس) پیوند داده نمی شود.
 ErrorUserPermissionAllowsToLinksToItselfOnly=به دلایل امنیتی، شما باید مجوز اعطا شده به ویرایش تمام کاربران قادر به پیوند عضو به یک کاربر است که مال شما نیست.
 ThisIsContentOfYourCard=این جزئیات از کارت شما است
 CardContent=محتوا از کارت عضو شما
@@ -85,7 +85,7 @@ SubscriptionLateShort=دیر
 SubscriptionNotReceivedShort=هرگز دریافت
 ListOfSubscriptions=فهرست اشتراک ها
 SendCardByMail=ارسال کارت توسط ایمیل
-AddMember=اضافه کردن کاربر
+AddMember=Create member
 NoTypeDefinedGoToSetup=هیچ نوع عضو تعریف شده است. برو به منوی "انواع کاربران"
 NewMemberType=نوع عضو جدید
 WelcomeEMail=خوش آمدید ایمیل
@@ -116,7 +116,7 @@ ExportDataset_member_1=کاربران و اشتراک
 ImportDataset_member_1=کاربران
 LastMembers=عضو تاریخ و زمان آخرین٪ بازدید کنندگان
 LastMembersModified=تاریخ و زمان آخرین٪ اعضای اصلاح شده
-LastSubscriptionsModified=تاریخ و زمان آخرین%s به اشتراک اصلاح شده
+LastSubscriptionsModified=تاریخ و زمان آخرین٪ s به اشتراک اصلاح شده
 AttributeName=نام صفت
 String=رشته
 Text=متن
@@ -125,7 +125,7 @@ Date=تاریخ
 DateAndTime=تاریخ و زمان
 PublicMemberCard=کاربران کارت های عمومی
 MemberNotOrNoMoreExpectedToSubscribe=کاربران بیشتری انتظار می رود نیست و یا هیچ به اشتراک
-AddSubscription=اضافه کردن اشتراک
+AddSubscription=Create subscription
 ShowSubscription=نمایش اشتراک
 MemberModifiedInDolibarr=کاربران تغییر در Dolibarr
 SendAnEMailToMember=ارسال ایمیل به اطلاعات به عضو
@@ -149,7 +149,7 @@ DescADHERENT_CARD_TEXT_RIGHT=متن چاپ شده بر روی کارت های ع
 DescADHERENT_CARD_FOOTER_TEXT=متن چاپ شده در پایین از کارت های عضو
 GlobalConfigUsedIfNotDefined=متن تعریف شده در راه اندازی ماژول بنیاد استفاده خواهد شد اگر در اینجا تعریف نشده
 MayBeOverwrited=این متن را می توان با مقدار مشخص شده برای نوع عضو overwrited
-ShowTypeCard=نمایش نوع «%s '
+ShowTypeCard=نمایش نوع «٪ s '
 HTPasswordExport=نسل فایل htpassword
 NoThirdPartyAssociatedToMember=بدون شخص ثالث مرتبط به این کاربر
 ThirdPartyDolibarr=شخص ثالث Dolibarr
@@ -203,3 +203,4 @@ MembersByNature=کاربران از طبیعت
 VATToUseForSubscriptions=نرخ مالیات بر ارزش افزوده برای استفاده از اشتراک ها
 NoVatOnSubscription=بدون TVA برای اشتراک
 MEMBER_PAYONLINE_SENDEMAIL=ایمیل برای هشدار دادن به هنگام Dolibarr دریافت تایید از پرداخت اعتبار برای اشتراک
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 1015252b3e2..dc472f3b7c8 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=اگر محصول یک سرویس با مدت زمان م
 MultiPricesAbility=سطح بسیاری از قیمت هر محصول / خدمات
 MultiPricesNumPrices=تعداد قیمت
 MultiPriceLevelsName=مقوله های قیمت
-AssociatedProductsAbility=فعال محصولات مجازی از ویژگی های
-AssociatedProducts=محصول مجازی
-AssociatedProductsNumber=تعدادی از محصولات ساخت این محصول مجازی
-ParentProductsNumber=تعداد پدر و مادر محصول مجازی
-IfZeroItIsNotAVirtualProduct=اگر 0، این محصول یک محصول مجازی
-IfZeroItIsNotUsedByVirtualProduct=اگر 0، این محصول با هر نوع محصول مجازی استفاده نمی شود
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=وابسته
 Translation=ترجمه
 KeywordFilter=فیلتر کلمه کلیدی
@@ -132,7 +132,7 @@ AddDel=اضافه کردن / حذف
 Quantity=مقدار
 NoMatchFound=هیچ بازی یافت
 ProductAssociationList=فهرست محصولات مرتبط / خدمات: نام محصول / خدمات (مقدار تحت تاثیر قرار)
-ProductParentList=لیست محصولات مجازی / خدمات با این محصول به عنوان یک جزء
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=یکی از محصول انتخاب پدر و مادر با محصول فعلی است
 DeleteProduct=حذف یک محصول / خدمات
 ConfirmDeleteProduct=آیا مطمئن هستید که می خواهید به حذف این محصول / خدمات؟
@@ -179,7 +179,7 @@ CloneProduct=محصول کلون یا خدمات
 ConfirmCloneProduct=آیا مطمئن هستید که می خواهید به کلون کردن محصول و یا خدمات <b>از٪ s؟</b>
 CloneContentProduct=کلون تمام اطلاعات اصلی محصول / خدمات
 ClonePricesProduct=اطلاعات اصلی کلون و قیمت
-CloneCompositionProduct=کلون مجازی محصولات / خدمات
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=این محصول مورد استفاده قرار گیرد
 NewRefForClone=کد عکس. محصول جدید / خدمات
 CustomerPrices=مشتریان قیمت
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=همان قيمت تعيين شده در شرکت ها
 PriceByCustomerLog=قيمت های ورود مشتری
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 211b2834b13..841b7ab1a35 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=این دیدگاه ارائه تمام پروژه ها و وظایف
 Myprojects=پروژه های من
 ProjectsArea=منطقه پروژه ها
 NewProject=پروژه های جدید
-AddProject=اضافه کردن پروژه
+AddProject=Create project
 DeleteAProject=حذف یک پروژه
 DeleteATask=حذف کار
 ConfirmDeleteAProject=آیا مطمئن هستید که می خواهید این پروژه را حذف کنید؟
@@ -36,6 +36,8 @@ TaskTimeSpent=مدت زمان صرف شده در کارها
 TaskTimeUser=کاربر
 TaskTimeNote=یادداشت
 TaskTimeDate=تاریخ
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=زمان جدید به سر برد
 MyTimeSpent=وقت من صرف
 MyTasks=کارهای من
@@ -45,7 +47,7 @@ TaskDateStart=تاریخ شروع کار
 TaskDateEnd=تاریخ پایان کار
 TaskDescription=شرح وظیفه
 NewTask=کار جدید
-AddTask=اضافه کردن کار
+AddTask=Create task
 AddDuration=اضافه کردن مدت زمان
 Activity=فعالیت
 Activities=وظایف / فعالیت ها
diff --git a/htdocs/langs/fa_IR/resource.lang b/htdocs/langs/fa_IR/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/fa_IR/resource.lang
+++ b/htdocs/langs/fa_IR/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index 5f527bfefd6..5262a10dba1 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=در اعتباری
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=نمایش برداشت
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=با این حال، اگر فاکتور حداقل یک عقب نشینی پرداخت هنوز پردازش نشده، آن را مجموعه ای به عنوان پرداخت می شود اجازه می دهد تا مدیریت خروج قبل.
-DoStandingOrdersBeforePayments=در این تب شما اجازه می دهد به درخواست حکم ایستاده. پس از آن کامل شده است، شما می توانید پرداخت تایپ برای بستن صورتحساب.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=فایل برداشت
 SetToStatusSent=تنظیم به وضعیت "فایل ارسال شد"
 ThisWillAlsoAddPaymentOnInvoice=این نیز خواهد پرداخت به فاکتورها اعمال می شود و آنها را طبقه بندی به عنوان "پرداخت"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=پرداخت سفارش ثابت٪ توسط بانک
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 43df8c5feb8..311fd107278 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Lisää suodin näyttää / piilottaa thirdparties jotka ovat nykyisin toimintaa tai on lopettanut sen
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Hakusuodattimiani vaihtoehtoja
 NumberOfKeyToSearch=Nbr merkkien laukaista haku: %s
 ViewFullDateActions=Näytä koko päivämäärät toimia kolmannen arkin
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules antamaan yksinkertaisia ennalta asennusohjelma D
 ModulesMarketPlaceDesc=Löydät lisää moduuleja ladata Pat internetissä ...
 ModulesMarketPlaces=Lisää moduuleja ...
 DoliStoreDesc=DoliStore, virallinen markkinapaikka Dolibarr ERP / CRM ulkoisten moduulien
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web-sivuston tarjoajat voit etsiä löytää lisää moduuleja ...
 URL=Linkki
 BoxesAvailable=Laatikot saatavilla
@@ -444,7 +447,7 @@ Module55Desc=Viivakoodi hallinto
 Module56Name=Puhelimet
 Module56Desc=Puhelimet yhdentyminen
 Module57Name=Pysyvän tilaukset
-Module57Desc=Pysyvän tilauksista ja vetämiset hallinto
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial yhdentyminen
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Lisää RSS-syöte sisällä Dolibarr näytön sivuilla
 Module330Name=Kirjanmerkit
 Module330Desc=Kirjanmerkit hallinto
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar yhdentyminen
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Kategoriat
 Module1780Desc=Kategoriat hallintaa (tuotteet, tavarantoimittajat ja asiakkaat)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG-editori
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Sähköinen Content Management
 Module2500Desc=Tallentaa ja jakaa asiakirjoja
 Module2600Name=WebServices
 Module2600Desc=Ota Dolibarr verkkopalvelut palvelimen
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Käytä online Gravatar palvelu (www.gravatar.com) näyttää kuvan käyttäjät / jäsenet (löytyi niiden sähköpostit). Tarvitsetko internetyhteys
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Moduuli tarjoaa online-maksu sivun luottokortti Paybox
 Module50100Name=Kassa
@@ -527,7 +534,7 @@ Module50200Desc=Moduuli tarjoaa online-maksu-sivulla luottokortilla PayPal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup tallennettu
 BackToModuleList=Palaa moduulien luetteloon
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Pysyvä hakulomake vasemmassa valikossa
 DefaultLanguage=Oletuskieltä käyttää (kieli-koodi)
 EnableMultilangInterface=Ota monikielinen käyttöliittymä
 EnableShowLogo=Show logo vasemmalla valikossa
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Järjestelmä on päivitetty onnistuneesti
 CompanyInfo=Yritys / säätiö tiedot
 CompanyIds=Yritys / perusta identiteettien
diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang
index e5976e31938..88c4c033422 100644
--- a/htdocs/langs/fi_FI/agenda.lang
+++ b/htdocs/langs/fi_FI/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Toimet vaikuttaa
 ActionsDoneBy=Toimet tehdään
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Kaikki toimet / tehtävät
 AllActions= Toutes les actions / tehtävät
 ViewList=Näytä lista
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 81d6e4b52ba..8bcaee8c4c9 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -77,17 +77,17 @@ PaymentMode=Maksutapa
 PaymentConditions=Maksuaika
 PaymentConditionsShort=Maksuaika
 PaymentAmount=Maksusumma
-ValidatePayment=Validate payment
+ValidatePayment=Vahvista maksu
 PaymentHigherThanReminderToPay=Maksu korkeampi kuin muistutus maksaa
 HelpPaymentHigherThanReminderToPay=Huomio, maksusumman yhden tai useamman laskut on korkeampi kuin muualla maksamaan. <br> Muokkaa merkintä, muuten vahvistaa ja mieti luoda menoilmoitus sen ylittävältä osalta saatu kunkin overpaid laskut.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
-ClassifyPaid=Luokittele "maksetaan"
-ClassifyPaidPartially=Luokittele "maksetaan osittain"
+ClassifyPaid=Luokittele "Maksettu"
+ClassifyPaidPartially=Luokittele "Osittain maksettu"
 ClassifyCanceled=Luokittele "Hylätty"
 ClassifyClosed=Luokittele "Suljettu"
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Luokittele 'Laskuttamatta'
 CreateBill=Luo lasku
-AddBill=Create invoice or credit note
+AddBill=Luo lasku / hyvityslasku
 AddToDraftInvoices=Add to draft invoice
 DeleteBill=Poista lasku
 SearchACustomerInvoice=Haku asiakkaan laskussa
@@ -294,7 +294,7 @@ ConfirmRemoveDiscount=Oletko varma, että haluat poistaa tämän edullisista?
 RelatedBill=Related lasku
 RelatedBills=Related laskut
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Varoitus, yksi tai useampi lasku jo olemassa
 
 # PaymentConditions
 PaymentConditionShortRECEP=Välittömät
@@ -393,7 +393,7 @@ ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid
 AllCompletelyPayedInvoiceWillBeClosed=Kaikki lasku ilman jää maksaa automaattisesti suljettu tila &quot;maksanut&quot;.
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
+ListOfYourUnpaidInvoices=Luettelo maksamattomista laskuista
 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 thirdparty
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index 35ca76fe5a4..2d006ade127 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/fi_FI/contracts.lang b/htdocs/langs/fi_FI/contracts.lang
index 2086a0d1c27..8d44a9b256e 100644
--- a/htdocs/langs/fi_FI/contracts.lang
+++ b/htdocs/langs/fi_FI/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Luettelo käynnissä sopimuksen linjat
 ListOfRunningServices=Luettelo käynnissä olevat palvelut
 NotActivatedServices=Ei aktivoitu palvelut (muun muassa validoitava sopimukset)
 BoardNotActivatedServices=Palvelut aktivoida kesken validoitava sopimukset
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Viimeisin %s aktivoitu palvelut
 LastModifiedServices=Viimeisin %s muunnettu palvelut
 EditServiceLine=Muokkaa palvelulinja
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Myyntiedustajaasi allekirjoittamalla sopimuksen
diff --git a/htdocs/langs/fi_FI/dict.lang b/htdocs/langs/fi_FI/dict.lang
index 23ddc892605..759c36326b8 100644
--- a/htdocs/langs/fi_FI/dict.lang
+++ b/htdocs/langs/fi_FI/dict.lang
@@ -5,8 +5,8 @@ CountryIT=Italia
 CountryES=Espanja
 CountryDE=Saksa
 CountryCH=Sveitsi
-CountryGB=Ison-Britannian
-# CountryUK=United Kingdom
+CountryGB=Iso-Britannia
+CountryUK=United Kingdom
 CountryIE=Irlanti
 CountryCN=Kiina
 CountryTN=Tunisia
@@ -20,7 +20,7 @@ CountryNL=Alankomaat
 CountryHU=Unkari
 CountryRU=Venäjä
 CountrySE=Ruotsi
-CountryCI=Ivoiry Coast
+CountryCI=Norsunluurannikko
 CountrySN=Senegal
 CountryAR=Argentiina
 CountryCM=Kamerun
@@ -252,8 +252,7 @@ CivilityMME=Mrs
 CivilityMR=Mr.
 CivilityMLE=Ms
 CivilityMTRE=Mestari
-# CivilityDR=Doctor
-
+CivilityDR=Doctor
 ##### Currencies #####
 Currencyeuros=Euroa
 CurrencyAUD=Dollar AU
@@ -290,10 +289,10 @@ CurrencyXOF=CFA-frangia BCEAO
 CurrencySingXOF=CFA: n frangin BCEAO
 CurrencyXPF=YKP Francs
 CurrencySingXPF=CFP-frangi
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=thousandth
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Tietoa kampanjasta
@@ -302,28 +301,27 @@ DemandReasonTypeSRC_CAMP_PHO=Puhelin kampanja
 DemandReasonTypeSRC_CAMP_FAX=Fax kampanja
 DemandReasonTypeSRC_COMM=Kaupalliset yhteystiedot
 DemandReasonTypeSRC_SHOP=Kauppa Yhteystiedot
-# DemandReasonTypeSRC_WOM=Word of mouth
-# DemandReasonTypeSRC_PARTNER=Partner
-# DemandReasonTypeSRC_EMPLOYEE=Employee
-# DemandReasonTypeSRC_SPONSORING=Sponsorship
-
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Employee
+DemandReasonTypeSRC_SPONSORING=Sponsorship
 #### Paper formats ####
-# PaperFormatEU4A0=Format 4A0
-# PaperFormatEU2A0=Format 2A0
-# PaperFormatEUA0=Format A0
-# PaperFormatEUA1=Format A1
-# PaperFormatEUA2=Format A2
-# PaperFormatEUA3=Format A3
-# PaperFormatEUA4=Format A4
-# PaperFormatEUA5=Format A5
-# PaperFormatEUA6=Format A6
-# PaperFormatUSLETTER=Format Letter US
-# PaperFormatUSLEGAL=Format Legal US
-# PaperFormatUSEXECUTIVE=Format Executive US
-# PaperFormatUSLEDGER=Format Ledger/Tabloid
-# PaperFormatCAP1=Format P1 Canada
-# PaperFormatCAP2=Format P2 Canada
-# PaperFormatCAP3=Format P3 Canada
-# PaperFormatCAP4=Format P4 Canada
-# PaperFormatCAP5=Format P5 Canada
-# PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 09fdff1071f..f685e4443c4 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Toimittaja-koodi tarvitaan
 ErrorSupplierCodeAlreadyUsed=Toimittaja koodi jo käytössä
 ErrorBadParameters=Bad parametrit
 ErrorBadValueForParameter=Väärä arvo &quot;%s&quot; parametrien väärä &quot;%s&quot;
-ErrorBadImageFormat=Image-tiedosto ei ole tuettu formaatti
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Arvo &quot;%s&quot; on väärä päivämäärä muoto
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Epäonnistui kirjoittaa hakemistoon %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Käyttäjälle <b>sisäänkirjoittautumissivuksesi %s</b
 ErrorLoginHasNoEmail=Tämä käyttäjä ei ole sähköpostiosoitetta. Process aborted.
 ErrorBadValueForCode=Bad arvotyypeillä koodin. Yritä uudelleen uuteen arvoon ...
 ErrorBothFieldCantBeNegative=Kentät %s ja %s voi olla sekä kielteisiä
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Käyttäjätili <b>%s</b> käyttää myös toteuttaa web-palvelimella ei ole lupaa, että
 ErrorNoActivatedBarcode=Ei viivakoodin tyyppi aktivoitu
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/fi_FI/margins.lang b/htdocs/langs/fi_FI/margins.lang
index c9f0a1d0926..157c88b9941 100644
--- a/htdocs/langs/fi_FI/margins.lang
+++ b/htdocs/langs/fi_FI/margins.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - marges
 
-Margin=Margin
-Margins=Margins
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
+Margin=Kate
+Margins=Katteet
+TotalMargin=Kate yhteensä
+MarginOnProducts=Kate / Tuotteet
+MarginOnServices=Kate / Palvelut
 MarginRate=Margin rate
 MarkRate=Mark rate
 DisplayMarginRates=Display margin rates
@@ -17,8 +17,8 @@ ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
 ProductService=Tuote tai palvelu
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
+AllProducts=Kaikki tuotteet ja palvelut
+ChooseProduct/Service=Valitse tuote tai palvelu
 StartDate=Aloituspäivämäärä
 EndDate=Lopetuspäivä
 Launch=Alku
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index 7f090046839..ea028ebe4eb 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -8,7 +8,7 @@ Members=Jäsenet
 MemberAccount=Kirjaudu
 ShowMember=Näytä jäsenen kortti
 UserNotLinkedToMember=Käyttäjää ei liity jäseneksi
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Jäsenet Liput
 FundationMembers=Säätiön jäsenet
 Attributs=Määritteet
@@ -85,8 +85,7 @@ SubscriptionLateShort=Myöhäinen
 SubscriptionNotReceivedShort=Koskaan saanut
 ListOfSubscriptions=Luettelo tilaukset
 SendCardByMail=Lähetä kortti
-AddMember=Lisää jäsen
-MemberType=Jäsen tyyppi
+AddMember=Create member
 NoTypeDefinedGoToSetup=Jäsen tyypit määritelty. Go to setup - Jäsenet tyypit
 NewMemberType=Uusi jäsen tyyppi
 WelcomeEMail=Tervetuloa e-mail
@@ -126,12 +125,12 @@ Date=Päivämäärä
 DateAndTime=Päivämäärä ja kellonaika
 PublicMemberCard=Osakkeenomistajan julkinen kortti
 MemberNotOrNoMoreExpectedToSubscribe=Jäsen tai ei ole enää odotettavissa tilata
-AddSubscription=Lisää tilaus
+AddSubscription=Create subscription
 ShowSubscription=Näytä tilaus
 MemberModifiedInDolibarr=Jäsen muutettu Dolibarr
 SendAnEMailToMember=Lähetä tiedot sähköpostitse jäsen
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Viestin aihe ja jäsen autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=Sähköpostitse jäsenen autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=EMail aihe jäsen validointi
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=EMail aihe jäsen résiliation
 DescADHERENT_MAIL_RESIL=EMail jäsenen résiliation
 DescADHERENT_MAIL_FROM=Sender EMail automaattisen sähköpostit
 DescADHERENT_ETIQUETTE_TYPE=Etiketit muodossa
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Muotoile korttien sivu
 DescADHERENT_CARD_HEADER_TEXT=Teksti painettu päälle jäsen kortit
 DescADHERENT_CARD_TEXT=Teksti painettu jäsen kortit
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Kolmansista osapuolista ei näihin jäsen
 ThirdPartyDolibarr=Dolibarr kolmannen osapuolen
 MembersAndSubscriptions= Jäsenet ja Subscriptions
 MoreActions=Täydentäviä toimia tallennus
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=Luo suoraan tiliotteensa takia
 MoreActionBankViaInvoice=Luo lasku ja ennakkomaksu
 MoreActionInvoiceOnly=Luo laskun maksua
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Viime merkinnän määrästä
 MembersStatisticsByCountries=Jäsenten tilastot maittain
 MembersStatisticsByState=Jäsenten tilastot valtio / lääni
 MembersStatisticsByTown=Jäsenten tilastot kaupunki
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Jäsenmäärä
 NoValidatedMemberYet=Ei validoitu jäsenet pitivät
 MembersByCountryDesc=Tämä ruutu näyttää tilastoja jäseniä maittain. Graphic riippuu kuitenkin Googlen online-käyrä palvelu ja on käytettävissä vain, jos internet-yhteys toimii.
@@ -196,9 +197,10 @@ Collectivités=Organisaatiot
 Particuliers=Henkilökohtainen
 Entreprises=Yritykset
 DOLIBARRFOUNDATION_PAYMENT_FORM=Voit tehdä tilauksen maksun avulla pankkisiirrolla sivulla <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Voit maksaa luottokortilla tai PayPal, klikkaa painiketta sivun alalaidassa. <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index f5af02e9123..aa890f3d6fa 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Tuote ref.
-ProductLabel=Tuotemerkki
+ProductRef=Tuote nro.
+ProductLabel=Tuotenimike
 ProductServiceCard=Tuotteet / Palvelut kortti
 Products=Tuotteet
 Services=Palvelut
 Product=Tuote
-Service=Service
+Service=Palvelu
 ProductId=Tuote / palvelu id
 Create=Luo
 Reference=Viite
 NewProduct=Uusi tuote
 NewService=Uusi palvelu
 ProductCode=Tuotekoodi
-ServiceCode=Service-koodi
+ServiceCode=Palvelukoodi
 ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
@@ -22,17 +22,17 @@ ProductAccountancySellCode=Kirjanpidon koodi (myydä)
 ProductOrService=Tuote tai palvelu
 ProductsAndServices=Tuotteet ja palvelut
 ProductsOrServices=Tuotteet tai palvelut
-ProductsAndServicesOnSell=Tuotteet ja Palvelut myydä
-ProductsAndServicesNotOnSell=Tuotteet ja palvelut pois myydä
-ProductsAndServicesStatistics=Tuotteet ja palvelut tilastojen
-ProductsStatistics=Tuotteet tilastot
-ProductsOnSell=Tuotteita myyvät
-ProductsNotOnSell=Tuotteet pois myydä
+ProductsAndServicesOnSell=Myytävät Tuotteet ja Palvelut
+ProductsAndServicesNotOnSell=Ei myytävät Tuotteet ja palvelut
+ProductsAndServicesStatistics=Tuotteiden ja Palveluiden tilastot
+ProductsStatistics=Tuotteiden tilastot
+ProductsOnSell=Myytävät Tuotteet
+ProductsNotOnSell=Ei Myytävät Tuotteet
 ProductsOnSellAndOnBuy=Products not for sale nor purchase
-ServicesOnSell=Palvelut myydä
-ServicesNotOnSell=Palvelut pois myydä
+ServicesOnSell=Myytävät palvelut
+ServicesNotOnSell=Ei Myytävät Palvelut
 ServicesOnSellAndOnBuy=Services not for sale nor purchase
-InternalRef=Kertomus
+InternalRef=Sisäinen viite
 LastRecorded=Uusimmat tuotteet / palvelut myydä kirjataan
 LastRecordedProductsAndServices=Viimeisin %s kirjataan tuotteet / palvelut
 LastModifiedProductsAndServices=Viimeisin %s muunneltuja tuotteita / palveluita
@@ -42,10 +42,10 @@ LastProducts=Uusimmat tuotteet
 CardProduct0=Tuote-kortti
 CardProduct1=Palvelukortti
 CardContract=Sopimus-kortti
-Warehouse=Warehouse
+Warehouse=Varasto
 Warehouses=Varastot
-WarehouseOpened=Warehouse avattu
-WarehouseClosed=Warehouse suljettu
+WarehouseOpened=Varasto avattu
+WarehouseClosed=Varasto suljettu
 Stock=Kanta
 Stocks=Varastot
 Movement=Movement
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Jos tuote on palvelu, rajoitettu kesto:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Lukumäärä hinta
 MultiPriceLevelsName=Hintakategorioissa
-AssociatedProductsAbility=Ota niihin liittyvät tuotteet
-AssociatedProducts=Vastaavat tuotteet
-AssociatedProductsNumber=Määrä vastaavat tuotteet
-ParentProductsNumber=Lukumäärä emoyhtiön tuote
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Käännös
 KeywordFilter=Hakusanalla suodatin
@@ -132,7 +132,7 @@ AddDel=Lisää / Poista
 Quantity=Määrä
 NoMatchFound=Ei hakutuloksia löytyi
 ProductAssociationList=Luettelo niihin liittyvät tuotteet / palvelut: nimi tuotteen / palvelun (määrä vaikuta)
-ProductParentList=Luettelo tuotteista / palveluista tämän tuotteen komponentti
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Yksi valittu tuote on vanhempi nykyinen tuote
 DeleteProduct=Poista tuotteen / palvelun
 ConfirmDeleteProduct=Oletko varma, että haluat poistaa tämän tuotteen / palvelun?
@@ -179,7 +179,7 @@ CloneProduct=Klooni tuotteen tai palvelun
 ConfirmCloneProduct=Oletko varma, että haluat klooni tuotteen tai <b>palvelun %s?</b>
 CloneContentProduct=Klooni kaikki tärkeimmät tiedot tuotteen / palvelun
 ClonePricesProduct=Klooni tärkeimmät tiedot ja hinnat
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Tämä tuote on käytetty
 NewRefForClone=Ref. uuden tuotteen tai palvelun
 CustomerPrices=Asiakkaat hinnat
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index fee10556bfa..b63e1c65861 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät (käyttäjä
 Myprojects=Omat hankkeet
 ProjectsArea=Projektit alueella
 NewProject=Uusi projekti
-AddProject=Lisää hanke
+AddProject=Create project
 DeleteAProject=Poista hanke
 DeleteATask=Poista tehtävä
 ConfirmDeleteAProject=Oletko varma, että haluat poistaa tämän hankkeen?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Uusi käytetty aika
 MyTimeSpent=Oma käytetty aika
 MyTasks=Omat tehtävät
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Uusi tehtävä
-AddTask=Lisää tehtävä
+AddTask=Create task
 AddDuration=Lisää kesto
 Activity=Toiminto
 Activities=Tehtävät / toiminnot
diff --git a/htdocs/langs/fi_FI/resource.lang b/htdocs/langs/fi_FI/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/fi_FI/resource.lang
+++ b/htdocs/langs/fi_FI/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index 3e66966383b..9b24ab1f9d3 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Luottoa
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Näytä Nosta
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Kuitenkin, jos lasku on ainakin yksi poistamista määrä ei kuitenkaan ole vielä käsitelty, sitä ei voida määrittää koska maksoivat sallimaan hallita poistettaviksi.
-DoStandingOrdersBeforePayments=Tällä välilehtien avulla voit pyytää ja kestotilauksena. Kun se on valmis, voit kirjoittaa maksun sulkea laskun.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Maksaminen kestotilaus %s pankin
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index bdb6912ebe4..13c55401371 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Utilisez un champ avec auto-complétion pour choisir le
 ActivityStateToSelectCompany= Ajouter une option de filtrage lors des recherches pour afficher/masquer les tiers en exercice ou ayant cessé d'exercer
 UseSearchToSelectContactTooltip=Si vous avez un nombre important de contacts (>100 000), vous pourrez améliorer les performances en positionnant la constante CONTACT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limité au début des chaines.
 UseSearchToSelectContact=Utilisez un champ avec auto-complétion pour choisir les contacts (plutôt qu'une liste déroulante).
+DelaiedFullListToSelectCompany=Attendre que vous ayez appuyez sur une touche avant de charger le contenu de la liste les tiers (Cela peut augmenter les performances si vous avez un grand nombre de tiers)
+DelaiedFullListToSelectContact=Attendre que vous ayez appuyez sur une touche avant de charger le contenu de la liste les contacts (Cela peut augmenter les performances si vous avez un grand nombre de contacts)
 SearchFilter=Options des filtres de recherche
 NumberOfKeyToSearch=Nb carac. déclenchant recherche : %s
 ViewFullDateActions=Afficher les dates complètes des événements dans la fiche de tiers
@@ -208,6 +210,7 @@ ModulesJobDesc=Les modules métiers très spécifiques permettent une préconfig
 ModulesMarketPlaceDesc=D'autres modules/extensions sont disponibles en téléchargement sur des sites externes sur Internet...
 ModulesMarketPlaces=Plus de modules...
 DoliStoreDesc=DoliStore, la place de marché officielle des modules et extensions complémentaires pour Dolibarr ERP/CRM
+DoliPartnersDesc=Liste de quelques sociétés qui peuvent fournir/développer des modules ou fonctions sur mesure  (Remarque: Toute société Open Source connaissant le langage PHP peut fournir du développement spécifique)
 WebSiteDesc=Sites fournisseurs à consulter pour trouver plus de modules...
 URL=Lien
 BoxesAvailable=Boîtes disponibles
@@ -437,14 +440,14 @@ Module52Name=Stocks
 Module52Desc=Gestion des stocks de produits
 Module53Name=Services
 Module53Desc=Gestion des services
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Contrats/Abonnements
+Module54Desc=Gestion des contrats (services ou abonnements récurrents)
 Module55Name=Codes-barres
 Module55Desc=Gestion des codes-barres
 Module56Name=Téléphonie
 Module56Desc=Gestion de la téléphonie
 Module57Name=Prélèvements
-Module57Desc=Gestion des prélèvements et retraits bancaires
+Module57Desc=Gestion des paiements par prélèvements. Inclut également la génération du fichier de virement des paiements SEPA pour les pays européens.
 Module58Name=ClickToDial
 Module58Desc=Intégration d'un système de « ClickToDial » (Asterisk, …)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=Flux RSS
 Module320Desc=Ajout de flux d'informations RSS dans les écrans Dolibarr
 Module330Name=Marque-pages
 Module330Desc=Gestion des marque-pages
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projets/Opportunités/Affaires
+Module400Desc=Gestion des projets, opportunités ou affaires. Vous pouvez ensuite assigner tous les autres éléments (facture, commande, proposition, intervention, ...) à ces projets et avoir une vue transverse depuis cette vue projet.
 Module410Name=Webcalendar
 Module410Desc=Interface avec le calendrier Webcalendar
 Module500Name=Dépenses spéciales (taxes, charges, dividendes)
@@ -495,6 +498,8 @@ Module1780Name=Catégories
 Module1780Desc=Gestion des catégories (produits, fournisseurs, clients et adhérents)
 Module2000Name=Éditeur WYSIWYG
 Module2000Desc=Permet la saisie de certaines zones de textes grace à un éditeur avancé
+Module2200Name=Prix calculés dynamiquement
+Module2200Desc=Active l'usage d'expressions mathématiques
 Module2300Name=Travaux programmés
 Module2300Desc=Gestionnaire de travaux programmés (Cron)
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Gestion électronique de documents
 Module2500Desc=Permet de stocker et administrer une base de documents
 Module2600Name=WebServices
 Module2600Desc=Active le serveur de Web Services de Dolibarr
+Module2650Name=WebServices (client)
+Module2650Desc=Activez les Web services client (Peut être utilisé pour pousser données/requêtes vers des serveurs externes. Commandes fournisseurs prises en charge seulement pour le moment)
 Module2700Name=Gravatar
 Module2700Desc=Utilise le service en ligne Gravatar (www.gravatar.com) pour afficher les photos d'utilisateurs/membres (en fonction leur email). Besoin d'un accès Internet
 Module2800Desc=Client FTP
@@ -517,7 +524,7 @@ Module6000Desc=Gérer le Workflow
 Module20000Name=Gestion de la demande de congès
 Module20000Desc=Déclaration et suivi des congès des employés
 Module39000Name=Lot
-Module39000Desc=Gestion de numéro de lot ou date de péremption pour les produits
+Module39000Desc=Gestion des lots et numéro de série, et date de péremption sur les produits
 Module50000Name=PayBox
 Module50000Desc=Module permettant d'offrir en ligne une page de paiement par carte de crédit avec PayBox
 Module50100Name=Point de vente
@@ -527,7 +534,7 @@ Module50200Desc=Module permettant d'offrir en ligne une page de paiement par car
 Module50400Name=Comptabilité (avancée)
 Module50400Desc=Gestion de la comptabilité (doubles parties)
 Module54000Name=PrintIPP
-Module54000Desc=Impression via Cups IPP Printer.
+Module54000Desc=Impression directe (sans ouvrir les documents) en utilisant l'interface Cups IPP (l'imprimante doit être visible depuis le serveur, et CUPS doit être installé sur le serveur).
 Module55000Name=Sondages
 Module55000Desc=Module pour intégrer un sondage (comme Doodle, Studs, Rdvz, ...)
 Module59000Name=Marges
@@ -606,11 +613,11 @@ Permission151=Consulter les prélèvements
 Permission152=Créer/modifier une demande de prélèvements
 Permission153=Émettre des bons de prélèvements
 Permission154=Créditer/rejeter les bons de prélèvements
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Lire les contrats/abonnements
+Permission162=Créer/modifier les contrats/abonnements
+Permission163=Activer un service/abonnement
+Permission164=Désactiver un service/abonnements
+Permission165=Supprimer les contrats/abonnements
 Permission171=Lire les notes de frais (Les vôtres et les utilisateurs autorisés)
 Permission172=Créer/modifier les notes de frais / déplacements
 Permission173=Supprimer les notes de frais / déplacements
@@ -672,7 +679,7 @@ Permission300=Consulter les codes-barres
 Permission301=Créer/modifier les codes-barres
 Permission302=Supprimer les codes-barres
 Permission311=Consulter les services
-Permission312=Assign service/subscription to contract
+Permission312=Affecter le service/abonnement au contrat
 Permission331=Lire les marque-pages
 Permission332=Créer/modifier les marque-pages
 Permission333=Supprimer les marque-pages
@@ -702,8 +709,8 @@ Permission701=Consulter les dons
 Permission702=Créer/modifier les dons
 Permission703=Supprimer les dons
 Permission1001=Consulter les stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Créer/modifier entrepôts
+Permission1003=Supprimer entrepôts
 Permission1004=Consulter les mouvements de stocks
 Permission1005=Créer/modifier les mouvements de stocks
 Permission1101=Consulter les bons de livraison
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Méthodes de commandes
 DictionarySource=Origines des propales/commandes
 DictionaryAccountancyplan=Plan comptable
 DictionaryAccountancysystem=Modèles de plan comptable
+DictionaryEMailTemplates=Modèles des courriels
 SetupSaved=Configuration sauvegardée
 BackToModuleList=Retour liste des modules
 BackToDictionaryList=Retour liste des dictionnaires
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Zone de recherche permanente du menu de gauche
 DefaultLanguage=Langue à utiliser par défaut (code langue)
 EnableMultilangInterface=Activer l'interface multi-langue
 EnableShowLogo=Afficher le logo dans le menu gauche
+EnableHtml5=Activer Html5 (Développement - Supporté uniquement avec le thème Eldy)
 SystemSuccessfulyUpdated=Votre système a été correctement mis à jour
 CompanyInfo=Informations sur la société/institution
 CompanyIds=Identifiants règlementaires
@@ -1138,7 +1147,7 @@ AddDeliveryAddressAbility=Possibilité de sélectionner une adresse de livraison
 UseOptionLineIfNoQuantity=Une ligne de produit/service ayant une quantité nulle est considérée comme une option
 FreeLegalTextOnProposal=Mention complémentaire sur les propositions commerciales
 WatermarkOnDraftProposal=Filigrane sur les brouillons de propositions commerciales (aucun si vide)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Saisir le compte bancaire cible lors de la proposition commerciale
 ##### Orders #####
 OrdersSetup=Configuration du module Commandes
 OrdersNumberingModules=Modèles de numérotation des commandes
@@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Modèles de numérotation des fiches d'intervention
 TemplatePDFInterventions=Modèles de document des fiches d'intervention
 WatermarkOnDraftInterventionCards=Filigrane sur les brouillons des fiches d'intervention (aucun si vide)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Configuration du module Contrats/Abonnements
 ContractsNumberingModules=Modèles de numérotation des contrats
 TemplatePDFContracts=Modèles de document de contrats
 FreeLegalTextOnContracts=Mention complémentaire sur les contrats
@@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=Fichiers de type %s non compressé par le serveur HTTP
 CacheByServer=Cache par le serveur
 CacheByClient=Cache par le navigateur
 CompressionOfResources=Compression des réponses HTTP
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=Une détection automatique n'est pas possible avec le navigateur courant
 ##### Products #####
 ProductSetup=Configuration du module Produits
 ServiceSetup=Configuration du module Services
@@ -1415,9 +1424,9 @@ OSCommerceTestOk=La connexion au serveur '%s' sur la base '%s' par l'utilisateur
 OSCommerceTestKo1=La connexion au serveur '%s' a réussi mais la base '%s' n'a pu être atteinte.
 OSCommerceTestKo2=La connexion au serveur '%s' par l'utilisateur '%s' à échoué.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=Configuration du module Entrepôt
+UserWarehouse=Utiliser des emplacements/entrepôts propres à chaque utilisateur
+IfYouUsePointOfSaleCheckModule=Si vous utilisez un module Point de Vente (module POS fourni par défaut ou un autre module externe), cette configuration peut être ignoré par votre module point de vente. La plupart de modules Point de Vente sont conçus pour créer immédiatement une facture et de réduire les stocks par défaut quelles que soient les options ici. Donc, si vous avez besoin ou non d'avoir une diminution du stock lors de l'enregistrement d'une vente dans votre Point de Vente, vérifiez également la configuration de votre module POS.
 ##### Menu #####
 MenuDeleted=Menu supprimé
 TreeMenu=Arborescence des menus
@@ -1482,14 +1491,14 @@ ClickToDialDesc=Ce module permet d'ajouter la possibilité de cliquer sur les nu
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Caisse enregistreuse
 CashDeskSetup=Configuration du module Point de vente/caisse enregistreuse
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Tiers générique à utiliser par défaut pour les ventes
 CashDeskBankAccountForSell=Compte par défaut à utiliser pour l'encaissement en liquide
 CashDeskBankAccountForCheque= Compte par défaut à utiliser pour l'encaissement en chèque
 CashDeskBankAccountForCB= Compte par défaut à utiliser pour l'encaissement en carte de crédit
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Ne pas réduire le stock quand une vente est faite depuis le Point de Vente. Sinon, la réduction est faite par défaut.
+CashDeskIdWareHouse=Forcer et restreindre l'emplacement/entrepôt à utiliser pour la réduction de stock
+StockDecreaseForPointOfSaleDisabled=Réduction de stock lors de l'utilisation du Point de Vente désactivée
+CashDeskYouDidNotDisableStockDecease=Vous n'avez pas désactivé la réduction de stocks lors de la réalisation d'une vente depuis le Point de Vente. Aussi, un entrepôt/emplacement est nécessaire.
 ##### Bookmark #####
 BookmarkSetup=Configuration du module Marque-pages
 BookmarkDesc=Ce module vous permet de gérer des liens et raccourcis. Il permet aussi d'ajouter n'importe quelle page de Dolibarr ou lien web dans le menu d'accès rapide sur la gauche.
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index be2e6083aa6..bd3c25da359 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Événements affectés à
 ActionsDoneBy=Événements réalisés par
 ActionsForUser=Evénements de l'utilisateur
 ActionsForUsersGroup=Evénements de tous les utilisateurs du groupe
+ActionAssignedTo=Evénement assigné à
 AllMyActions= Tous mes événements
 AllActions= Tous les événements
 ViewList=Vue liste
@@ -44,7 +45,7 @@ AgendaExtSitesDesc=Cette page permet d'ajouter des sources de calendriers extern
 ActionsEvents=Événements pour lesquels Dolibarr doit insérer un évènement dans l'agenda en automatique.
 PropalValidatedInDolibarr=Proposition %s validée
 InvoiceValidatedInDolibarr=Facture %s validée
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Facture %s validée depuis le Point de Vente
 InvoiceBackToDraftInDolibarr=Facture %s repassée en brouillon
 InvoiceDeleteDolibarr=Facture %s supprimée
 OrderValidatedInDolibarr= Commande %s validée
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index fa1eff4b0af..24ebe5ff923 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -217,7 +217,7 @@ NoInvoice=Aucune facture
 ClassifyBill=Classer la facture
 SupplierBillsToPay=Factures fournisseurs à payer
 CustomerBillsUnpaid=Factures clients impayées
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=Les factures écrites par des procédures mecanographic sont distribuées par l'ordre en lettres
 NonPercuRecuperable=Non perçue réc.
 SetConditions=Définir conditions de règlement
 SetMode=Définir mode de règlement
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 5c826d54301..6b29fa82fec 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=Selon le mode utilisé par le fournisseur, choisisse
 TurnoverPerProductInCommitmentAccountingNotRelevant=Le chiffre d'affaire par produit, dans une comptabilité en mode <b>comptabilité de caisse</b> n'est pas définissable. Ce rapport n'est disponible qu'en mode de comptabilité dit <b>comptabilité d'engagement</b> (voir la configuration du module de comptabilité).
 CalculationMode=Mode de calcul
 AccountancyJournal=Code journal comptabilité
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Code comptable par défaut pour l'achat de produits
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Code comptable par défaut pour l'achat de services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits
 ACCOUNTING_VAT_ACCOUNT=Code comptable par défaut pour l'encaissement de TVA
 ACCOUNTING_VAT_BUY_ACCOUNT=Code comptable par défaut pour le versement de la TVA
 ACCOUNTING_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients
diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang
index 5f9a8b4427d..895e3c95cad 100644
--- a/htdocs/langs/fr_FR/contracts.lang
+++ b/htdocs/langs/fr_FR/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Espace contrats
 ListOfContracts=Liste des contrats
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Les %s derniers contrats modifiés
 AllContracts=Tous les contrats
 ContractCard=Fiche contrat
 ContractStatus=État du contrat
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Liste des lignes de contrats en service
 ListOfRunningServices=Liste des services actifs
 NotActivatedServices=Services non activés (parmi les contrats validés)
 BoardNotActivatedServices=Services à activer en contrat validé
-LastContracts=Last % contracts
+LastContracts=Les %s derniers contrats
 LastActivatedServices=Les %s derniers services activés
 LastModifiedServices=Les %s derniers services modifiés
 EditServiceLine=Edition ligne du service
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Liste des services actifs en expiration
 NoteListOfYourExpiredServices=Cette list ne contient que les contrats de services des tiers pour lesquels vous êtes liés comme représentant commercial.
 StandardContractsTemplate=Modèle standard de contrats
 ContactNameAndSignature=Pour %s, nom et signature:
+OnlyLinesWithTypeServiceAreUsed=Seules les lignes de type "Service" seront clonées
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Commercial signataire du contrat
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index e559c9e5bcd..92deeb11c20 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=Sur un environnement Unix vous pouvez utiliser 'crontab'
 CronExplainHowToRunWin=Sur un environement Microsoft(tm) Windows vous pouvez utiliser le planificateur de tâche pour lancer une commande toute les minutes
 # Menu
 CronJobs=Travaux programmés
-CronListActive=List of active/scheduled jobs
+CronListActive=Liste des travaux actifs/programmés
 CronListInactive=Liste des travaux inactifs
 # Page list
 CronDateLastRun=Dernier lancement
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 0ccafc3843c..e880dbdac8d 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -6,9 +6,9 @@ NoErrorCommitIsDone=Pas d'erreur, on valide
 Error=Erreur
 Errors=Erreurs
 ErrorButCommitIsDone=Erreurs trouvées mais on valide malgré tout
-ErrorBadEMail=e-mail %s invalide
+ErrorBadEMail=email %s invalide
 ErrorBadUrl=Url %s invalide
-ErrorLoginAlreadyExists=Le login %s existe déjà.
+ErrorLoginAlreadyExists=L'identifiant %s existe déjà.
 ErrorGroupAlreadyExists=Le groupe %s existe déjà.
 ErrorRecordNotFound=Enregistrement non trouvé.
 ErrorFailToCopyFile=Echec de la copie du fichier '<b>%s</b>' en '<b>%s</b>'.
@@ -37,15 +37,15 @@ ErrorSupplierCodeRequired=Code fournisseur obligatoire
 ErrorSupplierCodeAlreadyUsed=Code fournisseur déjà utilisé
 ErrorBadParameters=Paramètres incorrects
 ErrorBadValueForParameter=Valeur '%s' incorrecte pour le paramètre '%s'
-ErrorBadImageFormat=Cet image a un format non supporté (Votre PHP ne supporte pas les fonctions de conversion de ce format d'image).
+ErrorBadImageFormat=Cet image est dans un format non pris en charge (Votre PHP ne prend pas en charge les fonctions de conversion de ce format d'image).
 ErrorBadDateFormat=La valeur '%s' a un format de date non reconnu
 ErrorWrongDate=La date est incorrecte
 ErrorFailedToWriteInDir=Impossible d'écrire dans le répertoire %s
-ErrorFoundBadEmailInFile=Syntaxe de mail incorrecte trouvée pour %s lignes dans le fichier (exemple ligne %s avec email=%s)
+ErrorFoundBadEmailInFile=Syntaxe d'email incorrecte trouvée pour %s lignes dans le fichier (exemple ligne %s avec email=%s)
 ErrorUserCannotBeDelete=L'utilisateur ne peut pas être supprimé. Peut-être est-il associé à des éléments de Dolibarr.
 ErrorFieldsRequired=Des champs obligatoires n'ont pas été renseignés
 ErrorFailedToCreateDir=Echec à la création d'un répertoire. Vérifiez que le user du serveur Web ait bien les droits d'écriture dans les répertoires documents de Dolibarr. Si le paramètre <b>safe_mode</b> a été activé sur ce PHP, vérifiez que les fichiers php dolibarr appartiennent à l'utilisateur du serveur Web.
-ErrorNoMailDefinedForThisUser=EMail non défini pour cet utilisateur
+ErrorNoMailDefinedForThisUser=Email non défini pour cet utilisateur
 ErrorFeatureNeedJavascript=Cette fonctionnalité a besoin de javascript activé pour fonctionner. Modifiez dans configuration - affichage.
 ErrorTopMenuMustHaveAParentWithId0=Un menu de type 'Top' ne peut avoir de menu père. Mettre 0 dans l'id père ou choisir un menu de type 'Left'.
 ErrorLeftMenuMustHaveAParentId=Un menu de type 'Left' doit avoir un id de père.
@@ -99,18 +99,18 @@ ErrorFailedToSendPassword=Échec de l'envoi du mot de passe
 ErrorFailedToLoadRSSFile=Echec de la récupération du flux RSS. Ajoutez la constante MAIN_SIMPLEXMLLOAD_DEBUG si le message d'erreur n'est pas assez explicite.
 ErrorPasswordDiffers=Les mots de passe ne sont pas identiques, veuillez les saisir à nouveau
 ErrorForbidden=Accès non autorisé.<br>Vous essayez d'accéder à une page, zone ou fonction sans être au sein d'une session authentifiée ou qui n'est pas autorisée pour votre compte utilisateur.
-ErrorForbidden2=Les permissions pour ce login peuvent être attribuées par l'administrateur Dolibarr via le menu %s -> %s.
+ErrorForbidden2=Les permissions pour cet identifiant peuvent être attribuées par l'administrateur Dolibarr via le menu %s -> %s.
 ErrorForbidden3=Dolibarr ne semble pas fonctionner au sein d'une session authentifiée. Consultez la documentation d'installation de Dolibarr pour savoir comment gérer les authentifications (htaccess, mod_auth ou autre...).
 ErrorNoImagickReadimage=La classe Imagick n'est pas présente sur cette installation de PHP. L'aperçu n'est donc pas disponible. Les administrateurs peuvent désactiver cet onglet dans le menu Configuration - Affichage.
 ErrorRecordAlreadyExists=Enregistrement déjà existant
 ErrorCantReadFile=Échec de lecture du fichier '%s'
 ErrorCantReadDir=Échec de lecture du répertoire '%s'
 ErrorFailedToFindEntity=Échec de lecture de l'environnement '%s'
-ErrorBadLoginPassword=Identifiants login ou mot de passe incorrect
+ErrorBadLoginPassword=Identifiant ou mot de passe incorrect
 ErrorLoginDisabled=Votre compte est désactivé
 ErrorFailedToRunExternalCommand=Échec de l'exécution de la commande externe. Vérifiez qu'elle est disponible et exécutable par votre serveur PHP. Si le <b>Safe Mode</b> PHP est actif, vérifiez que la commande se trouve dans un répertoire défini dans le paramètre <b>safe_mode_exec_dir</b>.
 ErrorFailedToChangePassword=Échec de modification du mot de passe
-ErrorLoginDoesNotExists=Le compte utilisateur de login <b>%s</b> n'a pu être trouvé.
+ErrorLoginDoesNotExists=Le compte utilisateur identifié par <b>%s</b> n'a pu être trouvé.
 ErrorLoginHasNoEmail=Cet utilisateur n'a pas d'email. Impossible de continuer.
 ErrorBadValueForCode=Mauvaise valeur saisie pour le code. Réessayez avec une nouvelle valeur...
 ErrorBothFieldCantBeNegative=Les champs %s et %s ne peuvent être tous deux négatifs
@@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erreur, cet adhérent n'est li
 ErrorThereIsSomeDeliveries=Erreur, il y a des bordereaux de réception liées à ces expéditions. La suppression est refusée.
 ErrorCantDeletePaymentReconciliated=Impossible d'effacer un paiement qui a généré une écriture bancaire qui a été rapprochée
 ErrorCantDeletePaymentSharedWithPayedInvoice=Impossible d'effacer un paiement qui porte sur au moins une facture qui est à l'état payée.
+ErrorPriceExpression1=Ne peut assigner la constante '%s'
+ErrorPriceExpression2=Ne peut redéfinir la fonction '%s'
+ErrorPriceExpression3=Variable '%s' non définie dans la définition de fonction
+ErrorPriceExpression4=Caractère illégal '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Nombre incorrect d'arguments (%s donné,%s attendu)
+ErrorPriceExpression8=Operateur '%s' non attendu
+ErrorPriceExpression9=Une erreur inattendue s'est produite
+ErrorPriceExpression10=Il manque l'opérande à l'opérateur '%s' 
+ErrorPriceExpression11=Attendu '%s'
+ErrorPriceExpression14=Division par zéro
+ErrorPriceExpression17=Variable '%s' non définie
+ErrorPriceExpression19=Expression introuvable
+ErrorPriceExpression20=Expression vide
+ErrorPriceExpression21=Résultat '%s' vide
+ErrorPriceExpression22=Résultat négatif '%s'
+ErrorPriceExpressionInternal=Erreur interne '%s'
+ErrorPriceExpressionUnknown=Erreur inconnue '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 7316d81aebe..8cb4cdcecd1 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -115,7 +115,7 @@ SentBy=Envoyé par
 MailingNeedCommand=Pour des raisons de sécurité, les emailings fonctionnent mieux depuis la ligne de commande. Si vous en avez un, demandez à votre administrateur de lancer la commande suivante pour envoyer l'emailing à tous les destinataires :
 MailingNeedCommand2=Vous pouvez toutefois quand même les envoyer par l'interface écran en ajoutant le paramètre MAILING_LIMIT_SENDBYWEB avec la valeur du nombre maximum d'emails envoyés par session d'envoi. Pour cela, aller dans Accueil - Configuration - Divers.
 ConfirmSendingEmailing=Si vous n'en avez pas ou préferrez envoyer via votre navigateur web, confirmez simplement que vous désirez envoyer l'emailing maintenant depuis le mode web ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Remarque: L'envoi d'Emailings à partir de l'interface web se fait en plusieurs fois pour des raisons de sécurité et de timeout, <b>%s</b> bénéficiaires à la fois pour chaque session d'envoi.
 TargetsReset=Vider liste
 ToClearAllRecipientsClickHere=Pour vider la liste des destinataires de cet emailing, cliquez sur le bouton
 ToAddRecipientsChooseHere=Pour ajouter des destinataires, choisir dans les listes ci-dessous
@@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=%s notifications vont être envoyées par email
 AddNewNotification=Activer une nouvelle cible de notification email
 ListOfActiveNotifications=Liste des cibles de notifications emails actives
 ListOfNotificationsDone=Liste des notifications emails envoyées
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=La configuration d'envoi d'emails a été définir sur '%s'. Ce mode ne peut pas être utilisé pour envoyer des e-mailing en masse.
+MailSendSetupIs2=Vous devez d'abord aller, avec un compte d'administrateur, dans le menu %sAccueil - Configuration - EMails%s pour changer le paramètre <strong>'%s'</strong> pour utiliser le mode '%s'. Avec ce mode, vous pouvez accéder à la configuration du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonction d'envoi d'email en masse.
+MailSendSetupIs3=Si vous avez des questions sur la façon de configurer votre serveur SMTP, vous pouvez demander à %s.
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 3404ee5d3cb..849a6ad0245 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -5,7 +5,7 @@ MemberCard=Fiche adhérent
 SubscriptionCard=Fiche cotisation
 Member=Adhérent
 Members=Adhérents
-MemberAccount=Login adhérent
+MemberAccount=Identifiant adhérent
 ShowMember=Afficher fiche adhérent
 UserNotLinkedToMember=Utilisateur non lié à un adhérent
 ThirdpartyNotLinkedToMember=Tiers non lié à un adhérent
@@ -16,7 +16,7 @@ ErrorMemberTypeNotDefined=Le type d'adhérent n'est pas choisi
 ListOfPublicMembers=Liste des adhérents publics
 ListOfValidatedPublicMembers=Liste des adhérents publics validés
 ErrorThisMemberIsNotPublic=Cet adhérent n'est pas public
-ErrorMemberIsAlreadyLinkedToThisThirdParty=Un autre adhérent (nom: <b>%s</b>, login: <b>%s</b>) est déjà lié au tiers <b>%s</b>. Supprimer le lien existant d'abord car un tiers ne peut être lié qu'à un seul adhérent (et vice versa).
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Un autre adhérent (nom: <b>%s</b>, identifiant : <b>%s</b>) est déjà lié au tiers <b>%s</b>. Supprimer le lien existant d'abord car un tiers ne peut être lié qu'à un seul adhérent (et vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Pour des raisons de sécurité, il faut posséder les droits de modification de tous les utilisateurs pour pouvoir lier un adhérent à un utilisateur autre que vous même.
 ThisIsContentOfYourCard=Voici les détails de votre fiche
 CardContent=Contenu de votre fiche adhérent
@@ -76,7 +76,7 @@ EditMember=Édition adhérent
 SubscriptionEndDate=Date de fin adhésion
 MembersTypeSetup=Configuration des types d'adhérents
 NewSubscription=Nouvelle adhésion
-NewSubscriptionDesc=Ce formulaire permet de vous enregistrer comme nouvel adhérent de l'association. Pour un renouvellement si vous êtes déjà adhérent, contactez plutôt l'association par mail %s.
+NewSubscriptionDesc=Ce formulaire permet de vous inscrire comme nouvel adhérent de l'association. Pour un renouvellement (si vous êtes déjà adhérent), contactez plutôt l'association par email %s.
 Subscription=Adhésion/cotisation
 Subscriptions=Adhésions/cotisations
 SubscriptionLate=En retard
@@ -84,7 +84,7 @@ SubscriptionNotReceived=Cotisation non reçue
 SubscriptionLateShort=En retard
 SubscriptionNotReceivedShort=Non reçue
 ListOfSubscriptions=Liste des cotisations
-SendCardByMail=Envoyer fiche par mail
+SendCardByMail=Envoyer fiche par email
 AddMember=Créer adhérent
 NoTypeDefinedGoToSetup=Aucun type d'adhérent défini. Allez dans le menu "Types d'adhérents"
 NewMemberType=Nouveau type de membre
@@ -129,17 +129,17 @@ AddSubscription=Créer cotisation
 ShowSubscription=Afficher adhésion
 MemberModifiedInDolibarr=Adhérent modifié dans Dolibarr
 SendAnEMailToMember=Envoyer email d'information à l'adhérent
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Sujet du mail reçu en cas d'auto-inscription d'un invité
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Mail reçu en cas d'auto-inscription d'un invité
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Sujet du mail envoyé en cas d'auto-inscription d'un invité
-DescADHERENT_AUTOREGISTER_MAIL=Mail envoyé en cas d'auto-inscription d'un invité
-DescADHERENT_MAIL_VALID_SUBJECT=Sujet du mail de validation adhérent
-DescADHERENT_MAIL_VALID=Mail de validation adhérent
-DescADHERENT_MAIL_COTIS_SUBJECT=Sujet du mail de validation adhésion
-DescADHERENT_MAIL_COTIS=Mail de validation d'une adhésion
-DescADHERENT_MAIL_RESIL_SUBJECT=Sujet du mail de résiliation
-DescADHERENT_MAIL_RESIL=Mail de résiliation
-DescADHERENT_MAIL_FROM=Mail émetteur pour les mails automatiques
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Sujet de l'email reçu en cas d'auto-inscription d'un invité
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Email reçu en cas d'auto-inscription d'un invité
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Sujet de l'email envoyé en cas d'auto-inscription d'un invité
+DescADHERENT_AUTOREGISTER_MAIL=Email envoyé en cas d'auto-inscription d'un invité
+DescADHERENT_MAIL_VALID_SUBJECT=Sujet de l'email de validation adhérent
+DescADHERENT_MAIL_VALID=Email de validation adhérent
+DescADHERENT_MAIL_COTIS_SUBJECT=Sujet de l'email de validation adhésion
+DescADHERENT_MAIL_COTIS=Email de validation d'une adhésion
+DescADHERENT_MAIL_RESIL_SUBJECT=Sujet de l'email de résiliation
+DescADHERENT_MAIL_RESIL=Email de résiliation
+DescADHERENT_MAIL_FROM=Email émetteur pour les mails automatiques
 DescADHERENT_ETIQUETTE_TYPE=Format pages étiquettes
 DescADHERENT_ETIQUETTE_TEXT=Texte imprimé sur les planches d'adresses adhérent
 DescADHERENT_CARD_TYPE=Format pages cartes d'adhérent
@@ -203,3 +203,4 @@ MembersByNature=Adhérents par nature
 VATToUseForSubscriptions=Taux de TVA pour les adhésions
 NoVatOnSubscription=Pas de TVA sur les adhésions
 MEMBER_PAYONLINE_SENDEMAIL=Email à avertir en cas de retour de paiement validé pour une cotisation
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produit utilisé pour la ligne d'abonnement dans la facture: %s
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 1abf48003b9..2b5cfa336ab 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Une expédition existe
 DraftOrWaitingApproved=Brouillon ou approuvée pas encore commandée
 DraftOrWaitingShipped=Brouillon ou validée pas encore expédiée
 MenuOrdersToBill=Commandes délivrées
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Commandes facturables
 SearchOrder=Rechercher une commande
 SearchACustomerOrder=Rechercher une commande client
 ShipProduct=Expédier produit
diff --git a/htdocs/langs/fr_FR/printipp.lang b/htdocs/langs/fr_FR/printipp.lang
index 3680b42bb87..13e24fc7408 100644
--- a/htdocs/langs/fr_FR/printipp.lang
+++ b/htdocs/langs/fr_FR/printipp.lang
@@ -1,9 +1,14 @@
 # Dolibarr language file - Source file is en_US - printipp
-PrintIPPSetup=Configuration du module Impression direct IPP
-PrintIPPDesc=Ce module permet d'ajouter un bouton d'impression direct des documents vers votre imprimante. Il requiert un systeme Linux équipé de Cups.
-PRINTIPP_ENABLED=Affiche le logo "Impression directe" sur les listes de documents
-PRINTIPP_HOST=Serveur impression
+PrintIPPSetup=Réglages du module Direct Print
+PrintIPPDesc=Ce module ajoute un bouton Imprimer afin d'envoyer directement les documents à une imprimante. Un système Linux installé avec CUPS est nécessaire.
+PRINTIPP_ENABLED=Afficher l'icône « Impression directe » dans les listes de documents
+PRINTIPP_HOST=Serveur d'impression
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
+PRINTIPP_USER=Identifiant
 PRINTIPP_PASSWORD=Mot de passe
-NoPrinterFound=Aucune imprimante trouvée (vérifiez votre configuration Cups)
\ No newline at end of file
+NoPrinterFound=Aucune imprimante trouvée (vérifiez votre configuration CUPS)
+FileWasSentToPrinter=Le fichier %s a été envoyé à l'imprimante
+NoDefaultPrinterDefined=Il n'y a pas d'imprimante définie par défaut
+DefaultPrinter=Imprimante par défaut
+Printer=Imprimante
+CupsServer=Serveur CUPS
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 83f37508b8d..6871657b6a3 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -1,19 +1,20 @@
-# ProductBATCH language file - fr_FR - ProductBATCH
-CHARSET= UTF-8
-ProductStatusOnBatch= Gérer
-ProductStatusNotOnBatch= Non gérer
-ProductStatusOnBatchShort= Gérer
-ProductStatusNotOnBatchShort= Non gérer
-Batch=Lot
-atleast1batchfield= DLC ou DLUO ou Numéro de lot
-batch_number= Numéro de lot
-l_eatby= DLC
-l_sellby= DLUO
-DetailBatchNumber= Détails des lots
-DetailBatchFormat= Lot/Serie: %s - C:%s - UO: %s (Qté : %d)
-printBatch= Lot: %s
-printEatby= DLC: %s
-printSellby= DLUO: %s
-printQty= Qté: %d
-AddDispatchBatchLine=Ajouter une ligne de dispatch
-BatchDefaultNumber= Indéfini
\ No newline at end of file
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Gestion des lots/séries
+ProductStatusOnBatch=Géré
+ProductStatusNotOnBatch=Non géré
+ProductStatusOnBatchShort=Géré
+ProductStatusNotOnBatchShort=Non géré
+Batch=Lot/Série
+atleast1batchfield=Date de péremption ou numéro de lot/série
+batch_number=Lot/Numéro de série
+l_eatby=Date limite de consommation
+l_sellby=Date de péremption
+DetailBatchNumber=Détails Lot/Série
+DetailBatchFormat=Lot/Série: %s - E:%s - S: %s (Qty : %d)
+printBatch=Lot/Série: %s
+printEatby=Limite de consommation : %s
+printSellby=Péremption : %s
+printQty=Qté: %d
+AddDispatchBatchLine=Ajouter une ligne pour la répartition par durée de conservation
+BatchDefaultNumber=Non défini
+WhenProductBatchModuleOnOptionAreForced=Quand le module Lot/Série est activé, le mode incrémentation/décrémentation des stocks est forcé sur le dernier choix et ne peut pas être édité. D'autres options peuvent être définies comme vous le voulez.
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 58dcbb0844e..a1af422e24b 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -118,7 +118,7 @@ MultiPricesAbility=Plusieurs niveaux de prix par produit/service
 MultiPricesNumPrices=Nombre de prix
 MultiPriceLevelsName=Catégorie de prix
 AssociatedProductsAbility=Prise en charge des produits virtuels/packs
-AssociatedProducts=Produit virtual/package
+AssociatedProducts=Produit virtuel/package
 AssociatedProductsNumber=Nbre de sous-produits constituant ce produit virtuel/package
 ParentProductsNumber=Nbre de produits virtuels/packages parent
 IfZeroItIsNotAVirtualProduct=Si 0, ce produit n'est pas un produit virtuel/package
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Définir le même prix sur les filiales des clients
 PriceByCustomerLog=Trace des prix par clients
 MinimumPriceLimit=Le prix minimum ne peut être inférieur à %s
 MinimumRecommendedPrice=Prix minimum recommandé : %s
+PriceExpressionEditor=Éditeur d'expression de prix
+PriceExpressionSelected=Expression de prix sélectionnée
+PriceExpressionEditorHelp=« price = 2 + 2 » ou « 2 + 2 » afin de positionner le prix<br>Les champs personnalisés sont des variables de la forme « #options_macléchampperso# * 2 »<br>Il y a des variables spéciales telles que « #quantity# » et « #tva_tx# »<br>Utiliser « ; » pour séparer les expressions.
+PriceMode=Mode de tarification
+PriceNumeric=Nombre
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 7148ae0c1c0..29a11afec29 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -36,6 +36,8 @@ TaskTimeSpent=Temps consommé sur les tâches
 TaskTimeUser=Utilisateur
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tâches sur projets ouverts
+WorkloadNotDefined=Charge de travail non définie
 NewTimeSpent=Nouveau consommé
 MyTimeSpent=Mon consommé
 MyTasks=Mes tâches
diff --git a/htdocs/langs/fr_FR/resource.lang b/htdocs/langs/fr_FR/resource.lang
index c7fb29d3372..3ae29d4d0b6 100644
--- a/htdocs/langs/fr_FR/resource.lang
+++ b/htdocs/langs/fr_FR/resource.lang
@@ -22,8 +22,8 @@ GotoDate=Aller à un date
 
 ResourceElementPage=Ressources
 ResourceCreatedWithSuccess=Ressource créée avec succès
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
+RessourceLineSuccessfullyDeleted=Ligne de ressource supprimée
+RessourceLineSuccessfullyUpdated=Ligne de ressource mise à jour avec succès
 ResourceLinkedWithSuccess=Ressource liée avec succès
 
 TitleResourceCard=Fiche ressource
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirmer la suppression de cette ressource ?
 RessourceSuccessfullyDeleted=Ressource supprimée avec succès
 DictionaryResourceType=Type de ressource
 
-DictionaryEMailTemplates=Modèles d'emails
-
 SelectResource=Sélectionner ressource
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 5aaa2672627..6b0f7772e37 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -102,7 +102,7 @@ UserDisabled=Désactivation utilisateur %s
 UserEnabled=Activation utilisateur %s
 UserDeleted=Suppression utilisateur %s
 NewGroupCreated=Création groupe %s
-GroupModified=Group %s modified
+GroupModified=Groupe %s modifié
 GroupDeleted=Suppression groupe %s
 ConfirmCreateContact=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce contact ?
 ConfirmCreateLogin=Êtes-vous sûr de vouloir créer un compte Dolibarr pour cet adhérent ?
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index a8d290c25fa..d19c4909b4e 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -11,7 +11,7 @@ Withdrawal=Retrait
 WithdrawalsReceipts=Bons de prélèvements
 WithdrawalReceipt=Bon de prélèvement
 WithdrawalReceiptShort=Bon
-LastWithdrawalReceipts=Les %s derniers bons de traitement
+LastWithdrawalReceipts=Les %s derniers bons de prélèvements
 WithdrawedBills=Factures prélevées
 WithdrawalsLines=Lignes de prélèvements
 RequestStandingOrderToTreat=Demandes de prélèvements à traiter
@@ -47,7 +47,7 @@ RefusedData=Date du rejet
 RefusedReason=Motif du rejet
 RefusedInvoicing=Facturation du rejet
 NoInvoiceRefused=Ne pas facturer le rejet
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Facture refusée (Charges de rejet imputable au client) 
 Status=État
 StatusUnknown=Inconnu
 StatusWaiting=En attente
@@ -79,10 +79,11 @@ CreditDate=Crédité le
 WithdrawalFileNotCapable=Impossible de générer le fichier de reçu des prélèvement pour votre pays %s (Votre pays n'est pas supporté)
 ShowWithdraw=Voir prélèvement
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Toutefois, si la facture a au moins un paiement par prélèvement non traité, elle ne le sera pas afin de permettre la gestion du prélèvement d'abord.
-DoStandingOrdersBeforePayments=Cet onglet permet de faire une demande de prélèvement bancaire. Une fois réalisé, vous pourrez saisir le paiement sur la facture pour la clôturer.
+DoStandingOrdersBeforePayments=Cet onglet vous permet de demander un ordre de virement. Une fois réalisé, allez dans le menu par la Banque -> Virements pour générer l'ordre. Lorsque l'ordre de virement est clos, le paiement sur la facture sera automatiquement enregistrée, et la facture fermée si le reste à payer est nul.
 WithdrawalFile=Fichier de prélèvement
 SetToStatusSent=Mettre au statut "Fichier envoyé"
 ThisWillAlsoAddPaymentOnInvoice=Ceci créera également les paiements sur les factures et les classera payées
+StatisticsByLineStatus=Statistiques par statut des lignes
 
 ### Notifications
 InfoCreditSubject=Crédit prélèvement %s à la banque
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index d43027916e7..d04253ac0d9 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= הוספת אפשרות סינון להראות / להסתיר thirdparties שהם כיום בפעילות או חדל זה
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=מסננים אפשרויות חיפוש
 NumberOfKeyToSearch=NBR של תווים כדי להפעיל חיפוש: %s
 ViewFullDateActions=הצג מלאים תאריכים לאירועים גיליון 3
@@ -208,6 +210,7 @@ ModulesJobDesc=מודולים עסקיים לספק התקנה מוגדרת מר
 ModulesMarketPlaceDesc=תוכל למצוא רכיבים נוספים כדי להוריד באתרי אינטרנט חיצוניים באינטרנט ...
 ModulesMarketPlaces=מודולים נוספים ...
 DoliStoreDesc=DoliStore, במקום השוק הרשמי של מודולים Dolibarr ERP / CRM חיצוניות
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=אתר ספקי האינטרנט שבהם אתה יכול לחפש למצוא מודולים נוספים ...
 URL=קשר
 BoxesAvailable=הזמינות תיבות
@@ -444,7 +447,7 @@ Module55Desc=ברקוד של ההנהלה
 Module56Name=טלפוניה
 Module56Desc=שילוב טלפוניה
 Module57Name=הוראות קבע
-Module57Desc=הוראות קבע וניהול של נסיגה
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=שילוב של מערכת ClickToDial (כוכבית, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=עדכוני RSS
 Module320Desc=הוסף עדכון RSS בתוך דפי Dolibarr מסך
 Module330Name=הסימניות
 Module330Desc=הפוך ההנהלה
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=לוח השנה
 Module410Desc=שילוב לוח השנה
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=קטגוריות
 Module1780Desc=Categorie ההנהלה (מוצרים, ספקים ולקוחות)
 Module2000Name=עורך WYSIWYG
 Module2000Desc=אפשר לערוך כמה אזור הטקסט באמצעות עורך מתקדם
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=סדר היום
@@ -503,6 +508,8 @@ Module2500Name=תוכן אלקטרוני ניהול
 Module2500Desc=לשמור ולשתף מסמכים
 Module2600Name=WebServices
 Module2600Desc=אפשר האינטרנט Dolibarr שירותי שרת
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=השתמש באינטרנט בשירות Gravatar (www.gravatar.com) להראות תמונה של משתמשים / חברים (נמצא עם מיילים שלהם). צריך גישה לאינטרנט
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=מודול להציע בדף התשלום באינטרנט באמצעות כרטיס אשראי עם PayBox
 Module50100Name=נקודת מכירות
@@ -527,7 +534,7 @@ Module50200Desc=מודול להציע בדף התשלום באינטרנט בא
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=הגדרת הציל
 BackToModuleList=חזרה לרשימת מודולים
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=חפש בצורה קבועה בתפריט השמאלי
 DefaultLanguage=ברירת המחדל של השפה להשתמש (קוד שפה)
 EnableMultilangInterface=אפשר ממשק רב לשוני
 EnableShowLogo=הצג את הלוגו בתפריט השמאלי
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=המערכת עודכנה בהצלחה
 CompanyInfo=החברה / בסיס מידע
 CompanyIds=החברה / קרן זהויות
diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang
index 9dac68e1252..38507100e11 100644
--- a/htdocs/langs/he_IL/agenda.lang
+++ b/htdocs/langs/he_IL/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index b0b9b337ac4..e962d4de7ce 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/he_IL/contracts.lang b/htdocs/langs/he_IL/contracts.lang
index 3181cfe4836..52c05d495ad 100644
--- a/htdocs/langs/he_IL/contracts.lang
+++ b/htdocs/langs/he_IL/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index b1319786708..ee28fcb125c 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
 Members=משתמשים
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
 ImportDataset_member_1=משתמשים
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index a87d7bc3003..6cc95b19193 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 481a006cb7a..a235a0df787 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/he_IL/resource.lang b/htdocs/langs/he_IL/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/he_IL/resource.lang
+++ b/htdocs/langs/he_IL/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
index 1bf0cf1f42d..42b6ed1e19c 100644
--- a/htdocs/langs/he_IL/withdrawals.lang
+++ b/htdocs/langs/he_IL/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 3cc430078af..a9ded699060 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
index f7775cea7e7..508164a1448 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Događaj dodjeljen
 ActionsDoneBy=Događaji završeni od strane korisnika
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Svi moji događaji/zadaci
 AllActions= Svi događaji/zadaci
 ViewList=Lista
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/hr_HR/contracts.lang b/htdocs/langs/hr_HR/contracts.lang
index d8a68e60e86..26ec3f1e5a4 100644
--- a/htdocs/langs/hr_HR/contracts.lang
+++ b/htdocs/langs/hr_HR/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista otvorenih stavki ugovora
 ListOfRunningServices=Lista usluga koje se odvijaju
 NotActivatedServices=Neaktivne usluge(među ovjerenim ugovorima)
 BoardNotActivatedServices=Usluge za aktivaciju među ovjerenim ugovorima
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Zadnje %s aktivne usluge
 LastModifiedServices=Zadnje %s modificirane usluge
 EditServiceLine=Uredi liniju usluge
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista usluga koja ističe
 NoteListOfYourExpiredServices=Ova lista sadrži samo usluge kontakata treće strane sa kojima ste linkani kao prodajni predstavnik
 StandardContractsTemplate=Predložak uobičajenog ugovora
 ContactNameAndSignature=Za %s, ime i potpis
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Predstavnik trgovca potpisuje ugovor
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 9246a04ced9..40bca8e85fb 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index e22304f8b38..765c7e211a2 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ako je proizvod usluga ograničenog trajanja:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Broj cijena
 MultiPriceLevelsName=Grupe cijena
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtualni proizvod
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=Ako je 0, ovaj proizvod nije virtualnni proizvod
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Pridruži
 Translation=Prijevod
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Dodaj/izbriši
 Quantity=Količina
 NoMatchFound=Ništa slično nije pronađeno
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index e1c66b34417..2f9a63d5319 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=Moji projekti
 ProjectsArea=Projects area
 NewProject=Novi projekt
-AddProject=Dodaj projekt
+AddProject=Create project
 DeleteAProject=Izbriši projekt
 DeleteATask=Izbriši zadatak
 ConfirmDeleteAProject=Jeste li sigurni da želite izbrisati ovaj projekt?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/hr_HR/resource.lang b/htdocs/langs/hr_HR/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/hr_HR/resource.lang
+++ b/htdocs/langs/hr_HR/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 61ccfb87d49..b5757284f28 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Hozzáadása lehetőséget, hogy a szűrő / elrejtése thirdparties, amelyek jelenleg a tevékenység megszűnt, vagy azt
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Keresés szűrők lehetőségek
 NumberOfKeyToSearch=NBR karakterek kiváltó keresés: %s
 ViewFullDateActions=Mutasd a teljes időpontok események a harmadik lapra
@@ -208,6 +210,7 @@ ModulesJobDesc=Üzleti modulok olyan egyszerű, előre definiált beállítás a
 ModulesMarketPlaceDesc=Még több modult letölteni a külső internetes oldalak az interneten ...
 ModulesMarketPlaces=További modulok ...
 DoliStoreDesc=DoliStore, a hivatalos piaci hely Dolibarr ERP / CRM külső modulok
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site szolgáltatók kereshet, így több modult ...
 URL=Link
 BoxesAvailable=Dobozok elérhető
@@ -444,7 +447,7 @@ Module55Desc=Vonalkód vezetése
 Module56Name=Telefonálás
 Module56Desc=Telephony Integration
 Module57Name=Állandó megbízás
-Module57Desc=Állandó megbízások visszavonása és vezetése
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrációja ClickToDial rendszer (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed belül Dolibarr képernyőre
 Module330Name=Könyvjelzők
 Module330Desc=Bookmark vezetése
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integráció
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Kategóriák
 Module1780Desc=Kategóriában vezetősége (termékek, szállítók és vevők)
 Module2000Name=WYSIWYG szerkesztő
 Module2000Desc=Hagyjuk szerkeszteni egy szöveget terület egy fejlett szerkesztő
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Napirend
@@ -503,6 +508,8 @@ Module2500Name=Elektronikus Content Management
 Module2500Desc=Mentés és dokumentumok megosztása
 Module2600Name=WebServices
 Module2600Desc=Engedélyezze a Dolibarr web szerver szolgáltatás
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Használja online szolgáltatást Gravatar (www.gravatar.com), hogy fotó a felhasználók / tagok (találtak a levelek). Szüksége van egy internet-hozzáférési
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modult kínál online fizetési oldalra bankkártyáját Paybox
 Module50100Name=Értékesítési
@@ -527,7 +534,7 @@ Module50200Desc=Modult kínál online fizetési oldalra hitelkártya Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Beállítás mentett
 BackToModuleList=Visszalép a modulok listáját
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Állandó keresési űrlapot baloldali menüben
 DefaultLanguage=Alapértelmezett nyelv használatát (nyelv kód)
 EnableMultilangInterface=Engedélyezze a többnyelvű interfész
 EnableShowLogo=Mutasd logo a bal menüben
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=A rendszer már sikeresen frissítve
 CompanyInfo=Cég / alapítvány adatai
 CompanyIds=Cég / alapítvány identitások
diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang
index 3a6a949b9c6..45bc191ced2 100644
--- a/htdocs/langs/hu_HU/agenda.lang
+++ b/htdocs/langs/hu_HU/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Eseményeket befolyásolhatja
 ActionsDoneBy=Actions done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Az én cselekvéseim/feladataim
 AllActions= Az összes cselekvés/feladat
 ViewList=Lista megtekintése
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index cc6dabc7a18..91d9d5fe9b7 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/hu_HU/contracts.lang b/htdocs/langs/hu_HU/contracts.lang
index b22dcf89dc7..df24822ebb1 100644
--- a/htdocs/langs/hu_HU/contracts.lang
+++ b/htdocs/langs/hu_HU/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Futó szerződések listája
 ListOfRunningServices=Futó szolgáltatások listája
 NotActivatedServices=Inaktív szolgáltatások (a hitelesített szerződések között)
 BoardNotActivatedServices=Hitelesített szerződésekhez tartozó aktiválandó szolgáltatások
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Utolós %s aktivált szolgáltatás
 LastModifiedServices=Utolsó %s módosított szolgáltatás
 EditServiceLine=Szolgáltatás sor szerkesztése
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Értékesítési képviselő a szerződés aláírásakor
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 21b3252c7df..e79edfa3418 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Szállító kód szükséges
 ErrorSupplierCodeAlreadyUsed=Szállító kód már használatban
 ErrorBadParameters=Hibás paraméterek
 ErrorBadValueForParameter=Rossz érték &quot;%s&quot; helytelen paraméter &quot;%s&quot;
-ErrorBadImageFormat=Kép fájl formátuma nem támogatott
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Érték &quot;%s&quot; rossz a dátum formátumát
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Nem sikerült írni a könyvtárban %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Felhasználó bejelentkezési <b>%s</b> nem található.
 ErrorLoginHasNoEmail=Ennek a felhasználónak nincs e-mail címre. Folyamat megszakítva.
 ErrorBadValueForCode=Rossz érték a biztonsági kódot. Próbálja újra, az új érték ...
 ErrorBothFieldCantBeNegative=Fields %s %s és nem lehet egyszerre negatív
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Felhasználói fiók <b>%s</b> végrehajtására használnak web szerver nincs engedélye az adott
 ErrorNoActivatedBarcode=Nem vonalkód típus aktivált
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index cff1a2c4e8f..bdac075a8b4 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -8,7 +8,7 @@ Members=Tagok
 MemberAccount=Belépés
 ShowMember=Mutasd tagja kártya
 UserNotLinkedToMember=A felhasználó nem kapcsolódik egy tagja
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Tagok Jegyek
 FundationMembers=Alapítvány tagjai
 Attributs=Attribútumok
@@ -85,8 +85,7 @@ SubscriptionLateShort=Késő
 SubscriptionNotReceivedShort=Soha nem kapott
 ListOfSubscriptions=Előfizetések listája
 SendCardByMail=Elküldöm e-mailben
-AddMember=Add tagja
-MemberType=Tagság típusa
+AddMember=Create member
 NoTypeDefinedGoToSetup=Nem tagja típust nem definiál. Lépjen be a Setup - Tagok típusok
 NewMemberType=Új tag írja
 WelcomeEMail=Üdvözöljük az e-mail
@@ -126,12 +125,12 @@ Date=Dátum
 DateAndTime=Dátum és idő
 PublicMemberCard=Tagállamban közvélemény-kártya
 MemberNotOrNoMoreExpectedToSubscribe=Nem vagy tag többé várhatóan feliratkozáshoz
-AddSubscription=Add előfizetés
+AddSubscription=Create subscription
 ShowSubscription=Mutasd előfizetés
 MemberModifiedInDolibarr=Tagja módosított Dolibarr
 SendAnEMailToMember=Küldés e-mailben tájékoztatást tagja
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-mail tárgya a tagállamok autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=E-mail szolgáltatás tagja autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=E-mail tárgya a tagállamok hitelesítési
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=E-mail tárgya a tagállamok resiliation
 DescADHERENT_MAIL_RESIL=E-mail szolgáltatás tagja resiliation
 DescADHERENT_MAIL_FROM=Feladó e-mail címet automatikus e-maileket
 DescADHERENT_ETIQUETTE_TYPE=Oldal formátuma címkék
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Formátuma kártyák oldal
 DescADHERENT_CARD_HEADER_TEXT=Nyomtatott szöveg tetején tag kártyák
 DescADHERENT_CARD_TEXT=Nyomtatott szöveg tagja kártyák (igazítsa a bal)
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Harmadik félnek nem társult a tag
 ThirdPartyDolibarr=Dolibarr harmadik fél
 MembersAndSubscriptions= A tagok és Subscriptions
 MoreActions=Kiegészítő fellépés a felvételi
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=Hozzon létre egy közvetlen tranzakciós rekord miatt
 MoreActionBankViaInvoice=Hozzon létre egy számlát és előleg
 MoreActionInvoiceOnly=Hozzon létre egy számlát nem kell fizetni
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Utolsó előfizetés összege
 MembersStatisticsByCountries=Tagok statisztikája ország
 MembersStatisticsByState=Tagok statisztikája állam / tartomány
 MembersStatisticsByTown=Tagok statisztikája város
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Tagok száma
 NoValidatedMemberYet=Nem hitelesített tagok található
 MembersByCountryDesc=Ez a képernyő megmutatja statisztikát tagok országokban. Grafikus függ azonban a Google online grafikon szolgáltatást és csak akkor elérhető, ha az internet kapcsolat működik.
@@ -196,9 +197,10 @@ Collectivités=Szervezetek
 Particuliers=Személyes
 Entreprises=Cégek
 DOLIBARRFOUNDATION_PAYMENT_FORM=Ahhoz, hogy az előfizetés befizetését a banki átutalást, lásd <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Fizetni hitelkártyával vagy PayPal, kattintson gombra a lap alján. <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 12fca359dda..bdcddfabdcf 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ha a termék vagy szolgáltatás időkorlátos:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Árak száma
 MultiPriceLevelsName=Ár kategóriák
-AssociatedProductsAbility=Aktiválja a kapcsolódó termékeket
-AssociatedProducts=Kapcsolódó termékek
-AssociatedProductsNumber=Kapcsolódó termékek száma
-ParentProductsNumber=Számos szülő termék
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Kapcsolás
 Translation=Fordítás
 KeywordFilter=Kulcsszó szűrés
@@ -132,7 +132,7 @@ AddDel=Hozzáadás/Törlés
 Quantity=Mennyiség
 NoMatchFound=Nincs találat
 ProductAssociationList=Vonatkozó szolgáltatások/termékek listája: Termék/szolgáltatás neve (mennyiség érintett)
-ProductParentList=Jegyzéke termékek / szolgáltatások ezzel a termékkel, mint egy komponens
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Az egyik kiválaszott termék szülője az aktuális terméknek
 DeleteProduct=Termék/szolgáltatás törlése
 ConfirmDeleteProduct=Biztos törölni akarja ezt a terméket/szolgáltatást?
@@ -179,7 +179,7 @@ CloneProduct=Termék vagy szolgáltatás klónozása
 ConfirmCloneProduct=Biztos, hogy klónozni akarja ezt a szolgáltatást: <b>%s</b> ?
 CloneContentProduct=A termék/szolgáltatás minden fő információjának a klónozása
 ClonePricesProduct=Fő információk és árak klónozása
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Ez a termék használatban van
 NewRefForClone=Új termék/szolgáltatás ref#.
 CustomerPrices=Fogyasztói árának
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 535514cb225..7db1eb84ad1 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Ez a nézet minden projektet tartalmaz.
 Myprojects=Projektjeim
 ProjectsArea=Projektek terület
 NewProject=Új projekt
-AddProject=Projekt hozzáadása
+AddProject=Create project
 DeleteAProject=Projekt törlése
 DeleteATask=Feladat törlése
 ConfirmDeleteAProject=Biztos törölni akarja ezt a projektet?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Új eltöltött idő
 MyTimeSpent=Az én eltöltött időm
 MyTasks=Feladataim
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Új feladat
-AddTask=Feladat hozzáadása
+AddTask=Create task
 AddDuration=Időtartam hozzáadása
 Activity=Aktivitás
 Activities=Feladatok/aktivitások
diff --git a/htdocs/langs/hu_HU/resource.lang b/htdocs/langs/hu_HU/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/hu_HU/resource.lang
+++ b/htdocs/langs/hu_HU/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index 08145016926..48ef1688bc0 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Hitelt
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Mutasd Kifizetés
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Azonban, ha számlát legalább egy fizetési visszavonása még nem feldolgozott, akkor nem kell beállítani, hogy fizetni kell kezelni visszavonása előtt.
-DoStandingOrdersBeforePayments=Ez a lap lehetővé teszi, hogy kérje a fennálló rendelés. Amint kész lesz, akkor írja be a fizetési zárja be a számlát.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Kifizetése érdekében állt a bank által %s
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index c8fa072f8b1..dd797a93449 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -18,37 +18,37 @@ Selectmodelcsv=Pilih satu model Ekspor
 Modelcsv_normal=Ekspor Klasik
 Modelcsv_CEGID=Export towards CEGID Expert
 BackToChartofaccounts=Akun pembalik
-Back=Retur
+Back=Kembali
 
-Definechartofaccounts=Jelaskan satu akun
-Selectchartofaccounts=Pilih satu akun
+Definechartofaccounts=Menetapkan bagan akun
+Selectchartofaccounts=Pilih bagan akun
 Validate=Validasi
 Addanaccount=Tambahkan sebuah akun akuntansi
 AccountAccounting=Akun akuntansi
-Ventilation=Breakdown
-ToDispatch=To dispatch
-Dispatched=Dispatched
+Ventilation=Perincian
+ToDispatch=Untuk Pengiriman
+Dispatched=Dikirim
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
-TradeMargin=Margin Usaha
+CustomersVentilation=Perincian pelanggan
+SuppliersVentilation=Perincian pemasok
+TradeMargin=Margin Perdagangan
 Reports=Laporan
 ByCustomerInvoice=Berdasarkan invoice langganan
 ByMonth=Bulanan
 NewAccount=Akun akuntansi baru
-Update=Update
+Update=Membarui
 List=Daftar
 Create=Buat
-UpdateAccount=Modifikasi satu akun akuntansi
+UpdateAccount=Modifikasi akun akuntansi
 UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
-Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+WriteBookKeeping=Mencatat akun di buku besar
+Bookkeeping=Buku besar
+AccountBalanceByMonth=Saldo per bulan
 
-AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
-Line=Line
+AccountingVentilation=Perincian Akunting
+AccountingVentilationSupplier=Perincian Akunting Pemasok
+AccountingVentilationCustomer=Perincian Akunting Pelanggan
+Line=Baris
 
 CAHTF=Total purchase supplier HT
 InvoiceLines=Lines of invoice to be ventilated
@@ -56,17 +56,17 @@ InvoiceLinesDone=Ventilated lines of invoice
 IntoAccount=In the accounting account
 
 Ventilate=Ventilate
-VentilationAuto=Automatic breakdown
+VentilationAuto=Perincian Otomatis
 
-Processing=Processing
-EndProcessing=The end of processing
+Processing=Pengolahan
+EndProcessing=Akhir dari pengolahan
 AnyLineVentilate=Any lines to ventilate
-SelectedLines=Selected lines
+SelectedLines=Baris yg dipilih
 Lineofinvoice=Line of invoice
 VentilatedinAccount=Ventilated successfully in the accounting account
 NotVentilatedinAccount=Not ventilated in the accounting account
 
-ACCOUNTING_SEPARATORCSV=Separator CSV
+ACCOUNTING_SEPARATORCSV=pembatas CSV
 
 ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
@@ -78,7 +78,7 @@ ACCOUNTING_LENGTH_GACCOUNT=Panjang akun umum
 ACCOUNTING_LENGTH_AACCOUNT=Panjang akun pihak ketiga
 
 ACCOUNTING_SELL_JOURNAL=Jurnal Penjualan
-ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembayaran
+ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembelian
 ACCOUNTING_BANK_JOURNAL=Jurnal Bank
 ACCOUNTING_CASH_JOURNAL=Jurnal Kas
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Jurnal lain-lain
@@ -101,36 +101,36 @@ Labelcompte=Label Akun
 Debit=Debet
 Credit=Kredit
 Amount=Jumlah
-Sens=Sens
+Sens=Sen
 Codejournal=Jurnal
 
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=Hapus catatan buku besar
 
 SellsJournal=Jurnal Penjualan
-PurchasesJournal=Jurnal Pembayaran
+PurchasesJournal=Jurnal Pembelian
 DescSellsJournal=Jurnal Penjualan
-DescPurchasesJournal=Jurnal Pembayaran
+DescPurchasesJournal=Jurnal Pembelian
 BankJournal=Jurnal Bank
-DescBankJournal=Bank journal including all the types of payments other than cash
-CashJournal=Jurnal Kas
-DescCashJournal=Cash journal including the type of payment cash
+DescBankJournal=Jurnal Bank termasuk semua tipe pembayaran kecuali tunai
+CashJournal=Jurnal Tunai
+DescCashJournal=Jurnal Tunai termasuk tipe pembayaran tunai
 
-CashPayment=Cash Payment
+CashPayment=Pembayaran Tunai
 
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
+SupplierInvoicePayment=Pembayaran Nota Pemasok
+CustomerInvoicePayment=Pembayaran Nota Pelanggan
 
 ThirdPartyAccount=Akun pihak ketiga
 
 NewAccountingMvt=New movement
 NumMvts=Number of movement
 ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+ErrorDebitCredit=Debet dan Kredit tidak boleh ada nilai di saat yg sama
 
-ReportThirdParty=List thirdparty account
+ReportThirdParty=Daftar akun pihak ketiga
 DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
 
-ListAccounts=List of the accounting accounts
+ListAccounts=Daftar akun-akun akunting
 
 Pcgversion=Version of the plan
 Pcgtype=Class of account
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 48d4ac06c66..fbbe0bd037b 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -4,7 +4,7 @@ Version=Versi
 VersionProgram=Program Versi
 VersionLastInstall=Versi instalasi awal
 VersionLastUpgrade=Versi upgrade terakhir
-VersionExperimental=Eksperimental
+VersionExperimental=Percobaan
 VersionDevelopment=Pengembangan
 VersionUnknown=Tidak diketahui
 VersionRecommanded=Direkomendasikan
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Gunakan penyelesaian-otomatis di 'field' untuk memilih
 ActivityStateToSelectCompany= Tambah pilihan penyaringan / filter untuk menunjukkan / menyembunyikan pihak-ke-tiga ( third parties ) di dalam aktifitas atau yang sedang tidak aktif saat ini
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Gunakan bidang autocompletion untuk memilih kontak (bukan menggunakan kotak daftar).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Cari filter Pilihan
 NumberOfKeyToSearch=Nbr karakter untuk memicu pencarian:% s
 ViewFullDateActions=Tampilkan tanggal penuh peristiwa dalam lembar ketiga
@@ -117,76 +119,76 @@ ModulesSpecial=Modul yang sangat spesifik
 ParameterInDolibarr=Parameter% s
 LanguageParameter=Parameter Bahasa% s
 LanguageBrowserParameter=Parameter% s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
+LocalisationDolibarrParameters=Parameter Lokalisasi
+ClientTZ=Zona Waktu Klien (Pengguna)
+ClientHour=Jam Klien (Pengguna)
+OSTZ=Zona Waktu System Operasi Server
+PHPTZ=Zona Waktu Server PHP
 PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds)
 ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds)
 DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CompanyTZ=Company Time Zone (main company)
-CompanyHour=Company Time (main company)
+CurrentHour=Jam PHP (Server)
+CompanyTZ=Zona Waktu Perusahaan (Perusahaan Utama)
+CompanyHour=Jam Perusahaan (Perusahaan Utama)
 CurrentSessionTimeOut=Current session timeout
 YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
 OSEnv=OS Environment
-Box=Box
-Boxes=Boxes
+Box=Kotak
+Boxes=Kotak-Kotak
 MaxNbOfLinesForBoxes=Max number of lines for boxes
-PositionByDefault=Default order
-Position=Position
+PositionByDefault=Pesanan Standar
+Position=Posisi
 MenusDesc=Menus managers define content of the 2 menu bars (horizontal bar and vertical bar).
 MenusEditorDesc=The menu editor allow you to define personalized entries in menus. Use it carefully to avoid making dolibarr unstable and menu entries permanently unreachable.<br>Some modules add entries in the menus (in menu <b>All</b> in most cases). If you removed some of these entries by mistake, you can restore them by disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemTools=System tools
-SystemToolsArea=System tools area
+MenuForUsers=Menu Pengguna
+LangFile=berkas .lang
+System=Sistem
+SystemInfo=Sistem Informasi
+SystemTools=Alat-alat Sistem
+SystemToolsArea=Daerah Alat-Alat Sistem
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
+Purge=Perbersihan
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFiles=Hapus semua data sementara (Tidak ada resiko data hilang)
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or file to delete.
+PurgeRunNow=Bersihkan sekarang
+PurgeNothingToDelete=Tidak ada direktori atau berkas untuk di hapus
 PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
 PurgeAuditEvents=Purge all security events
 ConfirmPurgeAuditEvents=Are you sure you want to purge all security events ? All security logs will be deleted, no other data will be removed.
-NewBackup=New backup
+NewBackup=Backup Baru
 GenerateBackup=Generate backup
 Backup=Backup
-Restore=Restore
+Restore=Mengembalikan
 RunCommandSummary=Backup has been launched with the following command
 RunCommandSummaryToLaunch=Backup can be launched with the following command
 WebServerMustHavePermissionForCommand=Your web server must have the permission to run such commands
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
+BackupResult=Hasil Backup
+BackupFileSuccessfullyCreated=Berkas backup berhasil dihasilkan
+YouCanDownloadBackupFile=Berkas yg dihasilkan siap di download
+NoBackupFileAvailable=Tidak ada berkas backup yang tersedia
+ExportMethod=Metode ekspor
+ImportMethod=Metode Impor
+ToBuildBackupFileClickHere=Untuk menghasilkan berkas backup, klik <a href="%s">disini</a>.
 ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
 ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
+FileNameToGenerate=Nama berkas yang dihasilkan
+Compression=Kompresi
 CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
 CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
 ExportCompatibility=Compatibility of generated export file
 MySqlExportParameters=MySQL export parameters
 PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
+UseTransactionnalMode=Gunakan mode transaksi
 FullPathToMysqldumpCommand=Full path to mysqldump command
 FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
+ExportOptions=Opsi Ekspor
 AddDropDatabase=Add DROP DATABASE command
 AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
+ExportStructure=Struktur
 Datas=Data
 NameColumn=Name columns
 ExtendedInsert=Extended INSERT
@@ -194,11 +196,11 @@ NoLockBeforeInsert=No lock commands around INSERT
 DelayedInsert=Delayed insert
 EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
-Yes=Yes
-No=No
+Yes=Ya
+No=Tidak
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
-Rights=Permissions
+Rights=Izin
 BoxesDesc=Boxes are screen area that show a piece of information on some pages. You can choose between showing the box or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
@@ -208,34 +210,35 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
 BoxesActivated=Boxes activated
 ActivateOn=Activate on
 ActiveOn=Activated on
-SourceFile=Source file
+SourceFile=Berkas sumber
 AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled
 AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
+Required=Diperlukan
 UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
+Security=Keamanan
+Passwords=Kata Sandi
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-DolibarrProjectLeader=Project leader
-Developpers=Developers/contributors
+Feature=Keistimewaan
+DolibarrLicense=Lisensi
+DolibarrProjectLeader=Pemimpin Proyek
+Developpers=Pembangun/Penyumbang
 OtherDeveloppers=Other developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteFr=French official web site
-OfficialWiki=Dolibarr documentation on Wiki
+OfficialWebSite=Situs resmi Dolibarr International
+OfficialWebSiteFr=Situs resmi Perancis
+OfficialWiki=Dokumentasi Dolibarr di Wiki
 OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
@@ -249,9 +252,9 @@ CurrentTopMenuHandler=Current top menu handler
 CurrentLeftMenuHandler=Current left menu handler
 CurrentMenuHandler=Current menu handler
 CurrentSmartphoneMenuHandler=Current smartphone menu handler
-MeasuringUnit=Measuring unit
-Emails=E-mails
-EMailsSetup=E-mails setup
+MeasuringUnit=Unit Pengukuran
+Emails=E-Mails
+EMailsSetup=Setup E-Mails
 EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
@@ -264,25 +267,25 @@ MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of prop
 MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
 MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
+MAIN_MAIL_SENDMODE=Metode Pengiriman EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
 MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
 MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
+MAIN_SMS_SENDMODE=Metode Pengiriman SMS
 MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
 SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on www.dolibarr.org forum.
-ModuleSetup=Module setup
-ModulesSetup=Modules setup
-ModuleFamilyBase=System
+ModuleSetup=Setup Modul
+ModulesSetup=Setup Modul-Modul
+ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilyProducts=Products Management
 ModuleFamilyHr=Human Resource Management
 ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
+ModuleFamilyOther=Lainnya
 ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
+ModuleFamilyExperimental=Modul Percobaan
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
 MenuHandlers=Menu handlers
@@ -291,16 +294,16 @@ DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=This is setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package.
+DownloadPackageFromWebSite=Download Packet
 UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
-CurrentVersion=Dolibarr current version
+YouCanSubmitFile=Pilih Modul
+CurrentVersion=Versi Dolibarr saat ini
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
-LastStableVersion=Last stable version
+LastStableVersion=Versi stabil terakhir
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
@@ -311,9 +314,9 @@ GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
+DoTestServerAvailability=Koneksi Server Test
+DoTestSend=Mencoba Mengirim
+DoTestSendHTML=Mencoba Mengirim HTML
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
@@ -326,7 +329,7 @@ AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on docu
 ModuleDisabled=Module disabled
 ModuleDisabledSoNoEvent=Module disabled so event never created
 ConfirmPurge=Are you sure you want to execute this purge ?<br>This will delete definitely all your data files with no way to restore them (ECM files, attached files...).
-MinLength=Minimum length
+MinLength=Panjang Minimum
 LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
 ExamplesWithCurrentSetup=Examples with current running setup
 ListOfDirectories=List of OpenDocument templates directories
@@ -335,14 +338,14 @@ NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directo
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Position of Name/Lastname
+FirstnameNamePosition=Posisi Nama/Nama Belakang
 DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values:
 KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
 TestSubmitForm=Input test form
 ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever is user choice. Also this menu manager specialized for smartphones does not works on all smartphone. Use another menu manager if you experience problems on yours.
 ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
+ConnectionTimeout=batas waktu Koneksi
+ResponseTimeout=Batas Waktu Balasan
 SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
 ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first before using this feature.
 SecurityToken=Key to secure URLs
@@ -354,14 +357,14 @@ HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
 HideDescOnPDF=Hide products description on generated PDF
 HideRefOnPDF=Hide products ref. on generated PDF
 HideDetailsOnPDF=Hide products lines details on generated PDF
-Library=Library
+Library=Perpustakaan
 UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
 ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
+OldVATRates=Suku VAT lama
+NewVATRates=Suku VAT baru
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
@@ -369,14 +372,14 @@ TextLong=Long text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
-Unique=Unique
+Unique=Unik
 Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
+ExtrafieldPhone = Telepon
+ExtrafieldPrice = Harga
 ExtrafieldMail = Email
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSelect = Daftar Pilihan
+ExtrafieldSelectList = Pilih dari tabel
+ExtrafieldSeparator=Pembatas
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
@@ -391,7 +394,7 @@ LinkToTestClickToDial=Enter a phone number to call to show a link to test the Cl
 RefreshPhoneLink=Refresh link
 LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
 KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
+DefaultLink=Link Standar
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
 ExternalModule=External module - Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for thirdparties
@@ -405,37 +408,37 @@ NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into bar
 NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
 
 # Modules
-Module0Name=Users & groups
+Module0Name=Pengguna & Grup
 Module0Desc=Users and groups management
-Module1Name=Third parties
+Module1Name=Pihak Ketiga
 Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
+Module2Name=Komersil
 Module2Desc=Commercial management
-Module10Name=Accounting
+Module10Name=Akunting
 Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
+Module20Name=Proposal
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energy
+Module23Name= Energi
 Module23Desc= Monitoring the consumption of energies
-Module25Name=Customer Orders
+Module25Name=Pesanan Pelanggan
 Module25Desc=Customer order management
-Module30Name=Invoices
+Module30Name=Nota
 Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
+Module40Name=Pemasok
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
 Module42Desc=Logging facilities (file, syslog, ...)
 Module49Name=Editors
 Module49Desc=Editor management
-Module50Name=Products
+Module50Name=Produk
 Module50Desc=Product management
 Module51Name=Mass mailings
 Module51Desc=Mass paper mailing management
-Module52Name=Stocks
+Module52Name=Stok
 Module52Desc=Stock management (products)
-Module53Name=Services
+Module53Name=Jasa
 Module53Desc=Service management
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or reccuring subscriptions)
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -453,11 +456,11 @@ Module70Name=Interventions
 Module70Desc=Intervention management
 Module75Name=Expense and trip notes
 Module75Desc=Expense and trip notes management
-Module80Name=Shipments
+Module80Name=Pengiriman
 Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
+Module85Name=Bank dan Kas
 Module85Desc=Management of bank or cash accounts
-Module100Name=External site
+Module100Name=Situs luar
 Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
 Module105Name=Mailman and SPIP
 Module105Desc=Mailman or SPIP interface for member module
@@ -465,36 +468,38 @@ Module200Name=LDAP
 Module200Desc=LDAP directory synchronisation
 Module210Name=PostNuke
 Module210Desc=PostNuke integration
-Module240Name=Data exports
+Module240Name=Ekspor Data
 Module240Desc=Tool to export Dolibarr datas (with assistants)
-Module250Name=Data imports
+Module250Name=Impor Data
 Module250Desc=Tool to import datas in Dolibarr  (with assistants)
-Module310Name=Members
+Module310Name=Anggota
 Module310Desc=Foundation members management
 Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
-Module600Name=Notifications
+Module600Name=Notifikasi
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
-Module700Name=Donations
+Module700Name=Sumbangan
 Module700Desc=Donation management
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
-Module1400Name=Accounting
+Module1400Name=Akunting
 Module1400Desc=Accounting management (double parties)
-Module1780Name=Categories
+Module1780Name=Kategori
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,32 +534,32 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
+Module59000Name=Margin
 Module59000Desc=Module to manage margins
-Module60000Name=Commissions
+Module60000Name=Komisi
 Module60000Desc=Module to manage commissions
 Module150010Name=Batch number, eat-by date and sell-by date
 Module150010Desc=batch number, eat-by date and sell-by date management for product
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
+Permission11=Membaca Nota Pelanggan
+Permission12=Membuat/Merubah Nota Pelanggan
 Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
+Permission14=Validasi Nota Pelanggan
+Permission15=Mengirim Nota Pelanggan Menggunakan EMail
+Permission16=Mencatat Pembayaran Untuk Nota Pelanggan
+Permission19=Menghapus Nota Pelanggan
+Permission21=Membaca Proposal Komersil
+Permission22=Membuat/Merubah Proposal Komersil
+Permission24=Validasi Proposal Komersil
+Permission25=Mengirim Proposal Komersil
+Permission26=Menutup Proposal Komersil
+Permission27=Menghapus Proposal Komersil
 Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
+Permission31=Membaca Produk
+Permission32=Membuat/Merubah produk
+Permission34=Menghapus Produk
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission41=Read projects (shared project and projects i'm contact for)
@@ -562,25 +569,25 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
+Permission71=Membaca Data Anggota
+Permission72=Membuat/Merubah Data Anggota
+Permission74=Menghapus Data Anggota
 Permission75=Setup types and attributes for members
 Permission76=Export datas
 Permission78=Read subscriptions
 Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
+Permission81=Membaca Pesanan Pelanggan
+Permission82=Membuat/Merubah Pesanan Pelanggan
+Permission84=Validasi Pesanan Pelanggan
+Permission86=Mengirim Pesanan Pelanggan
+Permission87=Menutup Pesanan Pelanggan
+Permission88=Membatalkan Pesanan Pelanggan
+Permission89=Menghapus Pesanan Pelanggan
+Permission91=Membaca Kontribusi Sosial dan VAT
+Permission92=Membuat/Merubah Kontribusi Sosial dan VAT
+Permission93=Menghapus Kontribusi Sosial dan VAT
 Permission94=Export social contributions
-Permission95=Read reports
+Permission95=Membaca Laporan
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
@@ -589,9 +596,9 @@ Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
 Permission113=Setup financiel accounts (create, manage categories)
-Permission114=Consolidate transactions
+Permission114=Konsolidasi Transaksi
 Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
+Permission116=Transfer antar akun
 Permission117=Manage cheques dispatching
 Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
@@ -616,7 +623,7 @@ Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
 Permission174=Read all trips and expenses
 Permission178=Export trips and expenses
-Permission180=Read suppliers
+Permission180=Membaca Data Pemasok
 Permission181=Read supplier orders
 Permission182=Create/modify supplier orders
 Permission183=Validate supplier orders
@@ -649,21 +656,21 @@ Permission241=Read categories
 Permission242=Create/modify categories
 Permission243=Delete categories
 Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
+Permission251=Membaca Data Pengguna Lain dan Grup
+PermissionAdvanced251=Membaca Data Pengguna Lain
+Permission252=Membaca Izin Pengguna Lain
 Permission253=Create/modify other users, groups and permisssions
 PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
-Permission255=Modify other users password
+Permission255=Merubah Kata Sandi Pengguna Lain
 Permission256=Delete or disable other users
 Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
 Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
+Permission272=Membaca Nota
+Permission273=Mengeluarkan Nota
+Permission281=Membaca Kontrak
+Permission282=Membuat/Merubah Kontrak
+Permission283=Menghapus Kontrak
 Permission286=Export contacts
 Permission291=Read tariffs
 Permission292=Set permissions on the tariffs
@@ -680,9 +687,9 @@ Permission341=Read its own permissions
 Permission342=Create/modify his own user information
 Permission343=Modify his own password
 Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
+Permission351=Membaca Data Grup
+Permission352=Membaca Izin Grup
+Permission353=Membuat/Merubah Grup
 Permission354=Delete or disable groups
 Permission358=Export users
 Permission401=Read discounts
@@ -693,24 +700,24 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
+Permission531=Membaca Jasa
+Permission532=Membuat/Merubah Jasa
+Permission534=Menghapus Jasa
 Permission536=See/manage hidden services
 Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
+Permission701=Membaca Sumbangan
+Permission702=Membuat/Merubah Sumbangan
+Permission703=Menghapus Sumbangan
+Permission1001=Membaca Stok
+Permission1002=Membuat/Merubah Gudang
+Permission1003=Menghapus Gudang
+Permission1004=Membaca pergerakan stok
 Permission1005=Create/modify stock movements
 Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
-Permission1181=Read suppliers
+Permission1181=Mambaca Pemasok
 Permission1182=Read supplier orders
 Permission1183=Create/modify supplier orders
 Permission1184=Validate supplier orders
@@ -720,11 +727,11 @@ Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
+Permission1231=Mambaca Nota Pemasok
+Permission1232=Membuat/Merubah Nota Pemasok
+Permission1233=Validasi Nota Pemasok
+Permission1234=Menghapus Nota Pemasok
+Permission1235=Mengirim Nota Pemasok Melalui Email
 Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
@@ -747,7 +754,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission50101=Use Point of sales
-Permission50201=Read transactions
+Permission50201=Membaca Data Transaksi
 Permission50202=Import transactions
 Permission54001=Print
 Permission55001=Read polls
@@ -779,8 +786,9 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
-BackToModuleList=Back to modules list
+BackToModuleList=Kembali Ke Daftar Modul
 BackToDictionaryList=Back to dictionaries list
 VATReceivedOnly=Special rate not charged
 VATManagement=VAT Management
@@ -824,9 +832,9 @@ 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
 NbOfDays=Nb of days
-AtEndOfMonth=At end of month
+AtEndOfMonth=diakhir bulan
 Offset=Offset
-AlwaysActive=Always active
+AlwaysActive=Selalu Aktif
 UpdateRequired=Your system needs to be updated. To do this, click on <a href="%s">Update now</a>.
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
@@ -837,17 +845,17 @@ DataRootServer=Data files directory
 IP=IP
 Port=Port
 VirtualServerName=Virtual server name
-AllParameters=All parameters
-OS=OS
+AllParameters=Semua Parameter
+OS=Sistem Operasi
 PhpEnv=Env
-PhpModules=Modules
+PhpModules=Modul-Modul
 PhpConf=Conf
 PhpWebLink=Web-Php link
 Pear=Pear
 PearPackages=Pear Packages
 Browser=Browser
 Server=Server
-Database=Database
+Database=Basis Data
 DatabaseServer=Database host
 DatabaseName=Database name
 DatabasePort=Database port
@@ -864,12 +872,12 @@ ConstraintsToShowOrNotEntry=Constraint to show or not the menu entry
 AllMustBeOk=All of these must be checked
 Host=Server
 DriverType=Driver type
-SummarySystem=System information summary
+SummarySystem=Ringkasan Sistem Informasi
 SummaryConst=List of all Dolibarr setup parameters
 SystemUpdate=System update
 SystemSuccessfulyUpdate=Your system has been updated successfuly
 MenuCompanySetup=Company/Foundation
-MenuNewUser=New user
+MenuNewUser=Pengguna Baru
 MenuTopManager=Top menu manager
 MenuLeftManager=Left menu manager
 MenuManager=Menu manager
@@ -882,21 +890,22 @@ Skin=Skin theme
 DefaultSkin=Default skin theme
 MaxSizeList=Max length for list
 DefaultMaxSizeList=Default max length for list
-MessageOfDay=Message of the day
+MessageOfDay=Berita Hari Ini
 MessageLogin=Login page message
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
+EnableShowLogo=Tampilkan Logo dimenu kiri
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
+CompanyName=Nama
+CompanyAddress=Alamat
+CompanyZip=Kode Pos
+CompanyTown=Kota
+CompanyCountry=Negara
+CompanyCurrency=Mata Uang
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
@@ -906,7 +915,7 @@ BankModuleNotActive=Bank accounts module not enabled
 ShowBugTrackLink=Show link "Report a bug"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
-Delays=Delays
+Delays=Penundaan
 DelayBeforeWarning=Delay before warning
 DelaysBeforeWarning=Delays before warning
 DelaysOfToleranceBeforeWarning=Tolerance delays before warning
diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang
index 05e67508b1a..369ba05b614 100644
--- a/htdocs/langs/id_ID/agenda.lang
+++ b/htdocs/langs/id_ID/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Acara ditugaskan untuk
 ActionsDoneBy=Acara yang dilakukan oleh
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Semua acara saya / tugas
 AllActions= Semua acara / tugas
 ViewList=Tampilan daftar
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 5580d87b517..15a3668333c 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - companies
-ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
+ErrorCompanyNameAlreadyExists=Nama Perusahaan %s telah terdaftar. Silahkan masukan nama lain.
 ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one.
-ErrorSetACountryFirst=Set the country first
-SelectThirdParty=Select a third party
-DeleteThirdParty=Delete a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information ?
-DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information ?
-MenuNewThirdParty=New third party
-MenuNewCompany=New company
-MenuNewCustomer=New customer
-MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+ErrorSetACountryFirst=Set Negara dulu
+SelectThirdParty=Pilih Pihak Ketiga
+DeleteThirdParty=Hapus pihak ketiga
+ConfirmDeleteCompany=Apakah anda ingin menghapus perusahaan ini bersama dengan semua informasinya?
+DeleteContact=Hapus kontak/alamat
+ConfirmDeleteContact=Apakah anda ingin menghapus kontak ini bersama dengan semua informasinya?
+MenuNewThirdParty=Pihak Ketiga Baru
+MenuNewCompany=Perusahaan Baru
+MenuNewCustomer=Pelanggan Baru
+MenuNewProspect=Prospek Baru
+MenuNewSupplier=Pemasok Baru
 MenuNewPrivateIndividual=New private individual
-MenuSocGroup=Groups
+MenuSocGroup=Grup
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 NewSocGroup=New company group
@@ -21,16 +21,16 @@ NewPrivateIndividual=New private individual (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
 ProspectionArea=Prospection area
 SocGroup=Group of companies
-IdThirdParty=Id third party
-IdCompany=Company Id
-IdContact=Contact Id
-Contacts=Contacts/Addresses
-ThirdPartyContacts=Third party contacts
+IdThirdParty=ID Pihak Ketiga
+IdCompany=ID Perusahaan
+IdContact=ID Kontak
+Contacts=Kontak/Alamat
+ThirdPartyContacts=Kontak Pihak Ketiga
 ThirdPartyContact=Third party contact/address
 StatusContactValidated=Status of contact/address
-Company=Company
-CompanyName=Company name
-Companies=Companies
+Company=Perusahaan
+CompanyName=Nama Perusahaan
+Companies=Perusahaan
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
 ThirdParty=Third party
@@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Absolute discounts available
 DiscountNone=None
 Supplier=Supplier
 CompanyList=Company's list
-AddContact=Add contact
-AddContactAddress=Add contact/address
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
@@ -268,8 +268,8 @@ ContactsAddresses=Contacts/Addresses
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
-AddCompany=Add company
-AddThirdParty=Add third party
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accountancy code
@@ -379,8 +379,8 @@ DeliveryAddressLabel=Delivery address label
 DeleteDeliveryAddress=Delete a delivery address
 ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
 NewDeliveryAddress=New delivery address
-AddDeliveryAddress=Add address
-AddAddress=Add address
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=No alternative delivery address defined
 SupplierCategory=Supplier category
 JuridicalStatus200=Independant
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/id_ID/contracts.lang b/htdocs/langs/id_ID/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/id_ID/contracts.lang
+++ b/htdocs/langs/id_ID/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang
index 5d0c83e3173..3e236cfac61 100644
--- a/htdocs/langs/id_ID/install.lang
+++ b/htdocs/langs/id_ID/install.lang
@@ -1,62 +1,62 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Just follow the instructions step by step.
-MiscellaneousChecks=Prerequisites check
-DolibarrWelcome=Welcome to Dolibarr
-ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExists=Configuration file <b>%s</b> does not exist !
-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).
+InstallEasy=Ikuti setiap langkah sesuai dengan instruksi
+MiscellaneousChecks=Peninjauan prasyarat
+DolibarrWelcome=Selamat Datang di Dolibarr
+ConfFileExists=File konfigurasi <b>%s</b> telah ada
+ConfFileDoesNotExists=File konfigurasi <b>%s</b> tidak ada
+ConfFileDoesNotExistsAndCouldNotBeCreated=File konfigurasi <b>%s</b>  tidak ada dan tidak dapat dibuat
+ConfFileCouldBeCreated=File konfigurasi <b>%s</b>  dapat dibuat
+ConfFileIsNotWritable=File konfigurasi <b>%s</b>  tidak dapat ditulis ulang. Periksa hak akses file. Untuk instalasi pertama kali, web server harus dapat menulisi file tersebut selama proses konfigurasi (sebagai contoh perintah "chmod 666" pada sistem operasi berbasis Unix").
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=memuat ulang semua informasi dari berkas konfigurasi
 PHPSupportSessions=This PHP supports sessions.
-PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
+PHPSupportPOSTGETOk=PHP ini mendukung variabel POST dan 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.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportGD=PHP ini mendukung fungsi grafik GD
+PHPSupportUTF8=PHP ini mendukung fungsi UTF8
 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.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportGD=PHP anda tidak mendukung fungsi grafik GD. Grafik tidak dapat ditampilkan
+ErrorPHPDoesNotSupportUTF8=PHP anda tidak mendukung fungsi UTF8. Dolibarr tidak dapat berfungsi semestinya. Selesaikan hal tersebut sebelum proses instalasi Dolibarr
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong 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.
-WarningPHPVersionTooLow=PHP version too old. Version %s or more is expected. This version should allow install but is not supported.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorFailedToConnectToDatabase=Gagal untuk terhubung pada basis data '%s'
+ErrorDatabaseVersionTooLow=Versi basis data (%s) terlalu lama. Dibutuhkan versi %s atau lebih
+ErrorPHPVersionTooLow=Versi PHP terlalu lama. Dibutuhkan versi %s
+WarningPHPVersionTooLow=Versi PHP terlalu lama. Disarankan untuk menggunakan versi %s atau lebih. Pada versi ini proses instalasi dapat dijalankan namun tidak didukung
+ErrorConnectedButDatabaseNotFound=Koneksi pada server sukses namun basis data '%s' tidak dapat ditemukan
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
 IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, 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.
-PHPVersion=PHP Version
-YouCanContinue=You can continue...
-PleaseBePatient=Please be patient...
-License=Using license
-ConfigurationFile=Configuration file
+WarningBrowserTooOld=Versi peramban terlalu lama. Sangat disarankan untuk pemutakhiran peramban Firefox, Chrome atau Opera  pada versi terkini.
+PHPVersion=Versi PHP
+YouCanContinue=Anda dapat melanjutkan
+PleaseBePatient=Mohon tunggu
+License=Penggunaan lisensi
+ConfigurationFile=Berkas Konfigurasi
 WebPagesDirectory=Directory where web pages are stored
 DocumentsDirectory=Directory to store uploaded and generated documents
 URLRoot=URL Root
 ForceHttps=Force secure connections (https)
 CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
-DolibarrDatabase=Dolibarr Database
-DatabaseChoice=Database choice
-DatabaseType=Database type
+DolibarrDatabase=Basis Data Dolibarr
+DatabaseChoice=Pilihan Basis Data 
+DatabaseType=Jenis Basis Data
 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
 ServerPortDescription=Database server port. Keep empty if unknown.
-DatabaseServer=Database server
-DatabaseName=Database name
+DatabaseServer=Server Database
+DatabaseName=Nama Database
 DatabasePrefix=Database prefix table
 Login=Login
 AdminLogin=Login for Dolibarr database owner.
-Password=Password
-PasswordAgain=Retype password a second time
+Password=Kata kunci
+PasswordAgain=Ketikkan ulang kata kunci
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
 CreateUser=Create owner
@@ -67,9 +67,9 @@ Experimental=(experimental)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
-ConfigurationSaving=Saving configuration file
-ServerConnection=Server connection
-DatabaseConnection=Database connection
+ConfigurationSaving=Menyimpan berkas konfigurasi
+ServerConnection=Koneksi Server
+DatabaseConnection=Koneksi Database
 DatabaseCreation=Database creation
 UserCreation=User creation
 CreateDatabaseObjects=Database objects creation
@@ -80,11 +80,11 @@ 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=Mohon ketikkan kata kunci, tidak diperbolehkan untuk mengosongkan kata kunci !
 PleaseTypeALogin=Please type a login !
 PasswordsMismatch=Passwords differs, please try again !
 SetupEnd=End of setup
-SystemIsInstalled=This installation is complete.
+SystemIsInstalled=Proses Instalasi telah selesai
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
 YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfuly.
@@ -92,10 +92,10 @@ 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.
 GoToUpgradePage=Go to upgrade page again
-Examples=Examples
+Examples=Contoh
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
-LoginAlreadyExists=Already exists
+DirectoryRecommendation=Direkomendasikan untuk menggunakan direktori diluar dari direktori halaman web anda
+LoginAlreadyExists=Telah ada
 DolibarrAdminLogin=Dolibarr admin login
 AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
 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.
@@ -103,22 +103,22 @@ ThisPHPDoesNotSupportTypeBase=This PHP system does not support any interface to
 FunctionNotAvailableInThisPHP=Not available on this PHP
 MigrateScript=Migration script
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
+DataMigration=Migrasi Data
 DatabaseMigration=Structure database migration
 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.
-Upgrade=Upgrade
+Upgrade=Pemutakhiran
 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
+Start=Mulai
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
-NotAvailable=Not available
+NotAvailable=Tidak tersedia
 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=Mohon perbaiki kesalahan dan tekan F5 untuk memuat ulang halaman
 AlreadyDone=Already migrated
-DatabaseVersion=Database version
-ServerVersion=Database server version
+DatabaseVersion=Versi Database
+ServerVersion=Versi Server Database
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 CharsetChoice=Character set choice
 CharacterSetClient=Character set used for generated HTML web pages
@@ -151,7 +151,7 @@ NextStepMightLastALongTime=Current step may last several minutes. Please wait un
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
-MigrationFinished=Migration finished
+MigrationFinished=Proses migrasi selesai
 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.
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
@@ -164,8 +164,8 @@ MigrationSupplierOrder=Data migration for supplier's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successful
-MigrationUpdateFailed=Failed upgrade process
+MigrationSuccessfullUpdate=Proses Pemutakhiran berhasil
+MigrationUpdateFailed=Proses pemutakhiran gagal
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
 MigrationPaymentsNumberToUpdate=%s payment(s) to update
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index 9246a04ced9..40bca8e85fb 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/id_ID/resource.lang b/htdocs/langs/id_ID/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/id_ID/resource.lang
+++ b/htdocs/langs/id_ID/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 60edf794f82..a72321ea970 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Bæta síu möguleika til að sýna / fela thirdparties sem nú eru í starfsemi eða hætt henni
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Leita síur valkostir
 NumberOfKeyToSearch=NBR af stöfum til að kalla fram leit: %s
 ViewFullDateActions=Sýna fullur dagsetningar aðgerðir í þriðja blaði
@@ -208,6 +210,7 @@ ModulesJobDesc=Viðskipti mát veita einfalda fyrirfram uppsetningu Dolibarr fyr
 ModulesMarketPlaceDesc=Þú getur fundið fleiri einingar til að hlaða niður á yfirborð vefsíðum á Internetinu ...
 ModulesMarketPlaces=Meira mát ...
 DoliStoreDesc=DoliStore, opinber markaður staður fyrir Dolibarr ERP / CRM ytri mát
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Vefsíða veitendur þú getur leitað til að finna fleiri mát ...
 URL=Link
 BoxesAvailable=Hnefaleikar boði
@@ -444,7 +447,7 @@ Module55Desc=Strikamerki er stjórnun
 Module56Name=Símtækni
 Module56Desc=Símtækni sameining
 Module57Name=Standandi pantanir
-Module57Desc=Standandi fyrirmæli og stjórnun afturköllun á
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial sameining
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Bæta við RSS straum inni Dolibarr skjár síður
 Module330Name=Bókamerki
 Module330Desc=Bókamerki í stjórnun
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar sameining
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Flokkar
 Module1780Desc=Stjórn Flokkur's (vörur, birgja og viðskiptavina)
 Module2000Name=Fckeditor
 Module2000Desc=WYSIWYG Editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Dagskrá
@@ -503,6 +508,8 @@ Module2500Name=Rafræn Innihald Stjórnun
 Module2500Desc=Vista og samnýta skjöl
 Module2600Name=WebServices
 Module2600Desc=Virkja Dolibarr vefþjónusta miðlara
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Nota online Gravatar þjónusta (www.gravatar.com) til að sýna mynd af notendum og meðlimum (stofna með tölvupósti þeirra). Vantar internet
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module til að bjóða upp á netinu greiðslu síðu með kreditkorti með PayBox
 Module50100Name=Point of sölu
@@ -527,7 +534,7 @@ Module50200Desc=Module til að bjóða upp á netinu greiðslu síðu með kredi
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Skipulag vistuð
 BackToModuleList=Til baka í mát lista
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Varanleg leita mynd til vinstri valmynd
 DefaultLanguage=Sjálfgefið tungumál til að nota (tungumálið code)
 EnableMultilangInterface=Virkja Fjöltyng tengi
 EnableShowLogo=Sýna merki á vinstri valmynd
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Vélin þín hefur verið uppfærð
 CompanyInfo=Fyrirtæki / stofnun upplýsingar
 CompanyIds=Fyrirtæki / stofnun auðkenni
diff --git a/htdocs/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang
index a5614eca50f..9426f2e6177 100644
--- a/htdocs/langs/is_IS/agenda.lang
+++ b/htdocs/langs/is_IS/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Actions áhrif til
 ActionsDoneBy=Actions gert með því að
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Allar aðgerðir mínar / verkefni
 AllActions= Allar aðgerðir / verkefni
 ViewList=Skoða lista
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index cf099f5789b..e793677dee7 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/is_IS/contracts.lang b/htdocs/langs/is_IS/contracts.lang
index e58b93f1b03..8faf347b95c 100644
--- a/htdocs/langs/is_IS/contracts.lang
+++ b/htdocs/langs/is_IS/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Listi yfir gangi samningur línur
 ListOfRunningServices=Listi af hlaupandi þjónusta
 NotActivatedServices=Óvirkur þjónustu (meðal gildi samninga)
 BoardNotActivatedServices=Þjónusta til virkja meðal gildi samninga
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s  virkt þjónusta
 LastModifiedServices=Last %s  breytt þjónusta
 EditServiceLine=Breyta þjónustu línu
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sölufulltrúi undirrita samning
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index a21ac67cabe..2e910c852e4 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Birgir merkjamál þurfa
 ErrorSupplierCodeAlreadyUsed=Birgir sem notaður er þegar
 ErrorBadParameters=Bad breytur
 ErrorBadValueForParameter=Rangt gildi '%s &quot;fyrir breytu rangt að' %s að '
-ErrorBadImageFormat=Mynd skrá hefur ekki studdur snið
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat='Á %s' gildi hefur rangt snið dagsetningar
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Tókst ekki að skrifa í möppunni %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Notandi með <b>notandanafn %s </b> fannst ekki.
 ErrorLoginHasNoEmail=Þessi notandi hefur ekki netfang. Aðferð aflýst.
 ErrorBadValueForCode=Bad gerðir gildi fyrir kóða. Prófaðu aftur með nýtt gildi ...
 ErrorBothFieldCantBeNegative=Fields %s og %s getur ekki verið bæði neikvæð
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Notandi Reikningur <b>%s</b> notað til að framkvæma vefur framreiðslumaður hefur ekki leyfi til að
 ErrorNoActivatedBarcode=Nei barcode gerð virk
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index 4766f33b8e1..a151150fd4c 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -8,7 +8,7 @@ Members=Members
 MemberAccount=Aðildarríkin Innskráning
 ShowMember=Sýna meðlimur kort
 UserNotLinkedToMember=Notandi tengist ekki meðlimur
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Members Miðasala
 FundationMembers=Stofnun meðlimir
 Attributs=Eiginleiki
@@ -85,8 +85,7 @@ SubscriptionLateShort=Seint
 SubscriptionNotReceivedShort=Aldrei fengið
 ListOfSubscriptions=Listi yfir áskriftir
 SendCardByMail=Senda kort
-AddMember=Bæta við félagi
-MemberType=Aðildarríkin tegund
+AddMember=Create member
 NoTypeDefinedGoToSetup=Enginn tegundir skilgreindar. Fara til skipulag - Members tegundir
 NewMemberType=Nýr meðlimur tegund
 WelcomeEMail=Velkomin í tölvupósti
@@ -126,12 +125,12 @@ Date=Dagsetning
 DateAndTime=Dagsetning og tími
 PublicMemberCard=Aðildarríkin almenningi kort
 MemberNotOrNoMoreExpectedToSubscribe=Aðildarríkin ekki eða ekki fleiri ráð til að gerast áskrifandi
-AddSubscription=Bæta við áskrift
+AddSubscription=Create subscription
 ShowSubscription=Sýna áskrift
 MemberModifiedInDolibarr=Aðildarríkin breytt í Dolibarr
 SendAnEMailToMember=Senda upplýsingar email til félagi
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Netfang efni fyrir aðildarríki autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=Tölvupóstur fyrir aðild autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=Netfang efni fyrir aðildarríki löggilding
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=Netfang efni fyrir aðildarríki resiliation
 DescADHERENT_MAIL_RESIL=Tölvupóstur fyrir aðild resiliation
 DescADHERENT_MAIL_FROM=Sendandi Email fyrir sjálfvirka tölvupósti
 DescADHERENT_ETIQUETTE_TYPE=Snið af merki síðu
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Snið af kortum síðu
 DescADHERENT_CARD_HEADER_TEXT=Texti prentuð á toppur af félagi kort
 DescADHERENT_CARD_TEXT=Texti prentaðir á meðlimur spil (samræma til vinstri)
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Engar þriðja aðila í tengslum við þennan
 ThirdPartyDolibarr=Dolibarr þriðja aðila
 MembersAndSubscriptions= Aðilar og Subscriptions
 MoreActions=Fjölbreyttari aðgerðir á upptöku
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=Búa beinni viðskipti færslu á reikning
 MoreActionBankViaInvoice=Búa til reikning og greiðslu á reikning
 MoreActionInvoiceOnly=Búa til reikning án greiðslu
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Síðast áskrift upphæð
 MembersStatisticsByCountries=Notendur tölfræði eftir landi
 MembersStatisticsByState=Notendur tölfræði eftir fylki / hérað
 MembersStatisticsByTown=Notendur tölfræði eftir bænum
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Fjöldi félaga
 NoValidatedMemberYet=Engar fullgiltar meðlimir fundust
 MembersByCountryDesc=Þessi skjár sýnir þér tölfræði á meðlimum með löndum. Grafísk veltur þó á Google netinu línurit þjónustu og er aðeins í boði ef nettengingin er er að vinna.
@@ -196,9 +197,10 @@ Collectivités=Félög
 Particuliers=Starfsfólk
 Entreprises=Stofnanir
 DOLIBARRFOUNDATION_PAYMENT_FORM=Til að gera áskrift greiðslu með millifærslu, sjá síðu <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe~~dobj</a> . <br> Til að greiða með kreditkorti eða PayPal, smelltu á hnappinn neðst á síðunni. <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 3838200a716..861e2f2c32e 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ef varan er þjónusta við takmarkaðan tíma:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Fjöldi verð
 MultiPriceLevelsName=Verð flokkar
-AssociatedProductsAbility=Virkja sub-vörur
-AssociatedProducts=Sub-vörur
-AssociatedProductsNumber=Fjöldi vara að semja þessa vöru
-ParentProductsNumber=Fjöldi vara foreldra
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Félagi
 Translation=Þýðing
 KeywordFilter=Leitarorð sía
@@ -132,7 +132,7 @@ AddDel=Bæta við / Eyða
 Quantity=Magn
 NoMatchFound=Engin samsvörun fannst
 ProductAssociationList=Listi yfir tengdum vörum / þjónustu: nafn á vöru / þjónustu (magn áhrifum)
-ProductParentList=Listi yfir vörur og þjónustu með þessa vöru sem hluti
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Einn af völdum vöru er foreldri með núverandi vöru
 DeleteProduct=Eyða vöru / þjónustu
 ConfirmDeleteProduct=Ertu viss um að þú viljir eyða þessari vöru / þjónustu?
@@ -179,7 +179,7 @@ CloneProduct=Klóna vöru eða þjónustu
 ConfirmCloneProduct=Ertu viss um að þú viljir klón vöru eða <b>þjónustu %s ?</b>
 CloneContentProduct=Klóna allar helstu upplýsingar um vöru / þjónustu
 ClonePricesProduct=Klóna helstu upplýsingar og verð
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Þessi vara er notuð
 NewRefForClone=Tilv. nýrra vara / þjónusta
 CustomerPrices=Viðskiptavinir verð
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 347428bf607..4e1de0881dc 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Þetta sýnir öll verkefni og verkefni (notandi heimildir veita þér
 Myprojects=Verkefnin mín
 ProjectsArea=Verkefni area
 NewProject=Ný verkefni
-AddProject=Bæta við verkefnið
+AddProject=Create project
 DeleteAProject=Eyða verkefni
 DeleteATask=Eyða verkefni
 ConfirmDeleteAProject=Ertu viss um að þú viljir eyða þessu verkefni?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nýr tími
 MyTimeSpent=Minn tími var
 MyTasks=verkefni mitt
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Ný verkefni
-AddTask=Bæta við verkefni
+AddTask=Create task
 AddDuration=Bæta við lengd
 Activity=Afþreying
 Activities=Verkefni / starfsemi
diff --git a/htdocs/langs/is_IS/resource.lang b/htdocs/langs/is_IS/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/is_IS/resource.lang
+++ b/htdocs/langs/is_IS/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index 0ef7747d4a1..d73332b8408 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Útlán á
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Sýna Dragið
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hins vegar, ef reikningur hefur að minnsta kosti einn hætt greiðslu ekki enn afgreidd, mun það ekki vera eins og borgað til að leyfa að stjórna afturköllun áður.
-DoStandingOrdersBeforePayments=Þetta tabs leyfa þér að biðja fyrir standandi röð. Þegar það verður lokið, getur þú slegið greiðslu til loka reikning.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Greiðsla standa röð %s af bankanum
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 3efcd058a7f..b0a7137761f 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Per scegliere una terza parte usare i campi di auto-com
 ActivityStateToSelectCompany= Aggiungere un filtro per visualizzare/nascondere i terzi attualmente in attività o meno
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Per scegliere i contatti usare i campi di auto-completamento (invece di una lista di selezione).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Opzioni dei filtri di ricerca
 NumberOfKeyToSearch=N ° di caratteri per attivare ricerca: %s
 ViewFullDateActions=Visualizzazione di tutte le date delle azioni nel foglio dei terzi
@@ -208,6 +210,7 @@ ModulesJobDesc=I moduli business forniscono delle semplici configurazioni predef
 ModulesMarketPlaceDesc=Potete trovare altri moduli da scaricare su vari siti web esterni...
 ModulesMarketPlaces=Più moduli ...
 DoliStoreDesc=DoliStore, il mercato ufficiale dei moduli esterni per Dolibarr ERP/CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Siti Web in cui è possibile cercare altri moduli ...
 URL=Collegamento
 BoxesAvailable=Caselle disponibili
@@ -444,7 +447,7 @@ Module55Desc=Gestione codici a barre
 Module56Name=Telefonia
 Module56Desc=Integrazione telefonia
 Module57Name=Ordini permanenti
-Module57Desc=Gestione ordini permanenti (RID) e domiciliazioni
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrazione di un sistema ClickToDial (per esempio Asterisk)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=Feed RSS
 Module320Desc=Aggiungi feed RSS alle pagine di Dolibarr
 Module330Name=Segnalibri
 Module330Desc=Gestione segnalibri
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Calendario web
 Module410Desc=Integrazione calendario web
 Module500Name=Spese speciali (tasse, contributi sociali, dividendi)
@@ -495,6 +498,8 @@ Module1780Name=Categorie
 Module1780Desc=Gestione Categorie (prodotti, fornitori e clienti)
 Module2000Name=FCKeditor
 Module2000Desc=Permette di usare un editor avanzato per alcune aree di testo
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Gestione dei task programmati
 Module2400Name=Ordine del giorno
@@ -503,6 +508,8 @@ Module2500Name=Gestione dei contenuti digitali
 Module2500Desc=Salvare e condividere documenti
 Module2600Name=WebServices
 Module2600Desc=Attivare i webservices di Dolibarr
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Usa il servizio online Gravatar (www.gravatar.com) per mostrare le foto degli utenti/membri. Necessita dell'accesso a Internet
 Module2800Desc=Client FTP
@@ -517,7 +524,7 @@ Module6000Desc=Gestione flussi di lavoro
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Modulo per offrire il pagamento online con PayBox
 Module50100Name=Punti vendita
@@ -527,7 +534,7 @@ Module50200Desc=Modulo per offrire il pagamento online con Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Stampa tramite Stampante IPP Cups
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Sondaggio aperto
 Module55000Desc=Modulo per creare sondaggi online (Doodle, Studs, Rdvz o simili)
 Module59000Name=Margini
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Impostazioni salvate
 BackToModuleList=Torna alla lista moduli
 BackToDictionaryList=Torna alla lista dei dizionari
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Modulo di ricerca permanente nel menu di sinistra
 DefaultLanguage=La lingua da impostare come predefinita (codice lingua)
 EnableMultilangInterface=Attiva l'interfaccia multilingua
 EnableShowLogo=Abilita la visualizzazione del logo
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Il sistema è stato aggiornato con successo
 CompanyInfo=Informazioni società/fondazione
 CompanyIds=Identità società/fondazione
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index 8e0c4d9f732..7a63495c2c1 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -2,8 +2,8 @@
 IdAgenda=ID evento
 Actions=Azioni
 ActionsArea=Area eventi (azioni e compiti)
-Agenda=Ordine del giorno
-Agendas=Ordini del giorno
+Agenda=Agenda
+Agendas=Agende
 Calendar=Calendario
 Calendars=Calendari
 LocalAgenda=Calendario interno
@@ -29,6 +29,7 @@ ActionsToDoBy=Eventi assegnati a
 ActionsDoneBy=Azioni fatte da
 ActionsForUser=Eventi per utente
 ActionsForUsersGroup=Eventi per tutti gli utenti del gruppo
+ActionAssignedTo=Event assigned to
 AllMyActions= Tutte i miei compiti/azioni
 AllActions= Tutte i compiti/azioni
 ViewList=Vista elenco
@@ -39,12 +40,12 @@ ViewPerUser=Visualizzazione per utente
 ViewWithPredefinedFilters= Vista con filtri predefiniti
 AutoActions= Riempimento automatico
 AgendaAutoActionDesc= Definire qui gli eventi che devono essere creati automaticamente da Dolibarr. Se non è selezionato nulla (impostazione predefinita), nel calendario saranno visualizzate solo azioni inserite manualmente.
-AgendaSetupOtherDesc= Questa pagina consente di configurare gli altri parametri del modulo ordine del giorno.
-AgendaExtSitesDesc=Questa pagina consente di configurare i calendari esterni.
+AgendaSetupOtherDesc= Questa pagina consente di configurare gli altri parametri del modulo calendario.
+AgendaExtSitesDesc=Questa pagina consente di configurare i calendari esterni da includere nell'agenda di dolibarr.
 ActionsEvents=Eventi per i quali creare un'azione
 PropalValidatedInDolibarr=Proposta convalidata
 InvoiceValidatedInDolibarr=Fattura convalidata
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Ricevute %s validate dal POS
 InvoiceBackToDraftInDolibarr=Fattura %s riportata allo stato di bozza
 InvoiceDeleteDolibarr=La fattura %s è stata cancellata
 OrderValidatedInDolibarr= Ordine convalidato
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index c3f16a3d40e..a0d411e1db6 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -116,8 +116,8 @@ TransferDesc=Trasferimento da un conto ad un altro, Dolibarr scriverà due recor
 TransferFrom=Da
 TransferTo=A
 TransferFromToDone=È stato registrato un trasferimento da <b> %s </b> a <b> %s </b> di <b> %s </b> %s.
-CheckTransmitter=Emittente
-ValidateCheckReceipt=Convalidare questo deposito di assegno?
+CheckTransmitter=Ordinante
+ValidateCheckReceipt=Convalidare la ricevuta dell'assegno?
 ConfirmValidateCheckReceipt=Vuoi davvero convalidare questa ricevuta?<br/>Non sarà possibile fare cambiamenti una volta convalidata.
 DeleteCheckReceipt=Eliminare questa ricevuta?
 ConfirmDeleteCheckReceipt=Vuoi davvero eliminare questa ricevuta?
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 197311e45c0..4c3e86002d4 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -15,25 +15,25 @@ DisabledBecauseNotErasable=Disabilitate perché non cancellabili
 InvoiceStandard=Fattura Standard
 InvoiceStandardAsk=Fattura Standard
 InvoiceStandardDesc=Questo tipo di fattura è la fattura più comune.
-InvoiceDeposit=Deposito fattura
-InvoiceDepositAsk=Deposito fattura
-InvoiceDepositDesc=Fattura emessa quando è stato ricevuto un deposito.
+InvoiceDeposit=Fattura d'acconto
+InvoiceDepositAsk=Fattura d'acconto
+InvoiceDepositDesc=Fattura emessa quando è stato ricevuto un acconto.
 InvoiceProForma=Fattura proforma
 InvoiceProFormaAsk=Fattura proforma
 InvoiceProFormaDesc=La <b>fattura proforma</b> è uguale ad una fattura vera, ma non ha valore contabile.
 InvoiceReplacement=Fattura sostitutiva
-InvoiceReplacementAsk=Sostituzione fattura per fattura
-InvoiceReplacementDesc=La <b>sostituzione fattura</b> è utilizzata per annullare e sostituire completamente una fattura non ancora pagata.<br><br>Nota: Solo le fatture non pagate possono essere sostituite. Se la fattura che vuoi sostituire non è già stata chiusa, questa verrà automaticamente chiusa come "abbandonata".
-InvoiceAvoir=Nota di credito a correzione
+InvoiceReplacementAsk=Fattura sostitutiva
+InvoiceReplacementDesc=La <b>fattura sostitutiva</b> è utilizzata per annullare e sostituire completamente una fattura non ancora pagata.<br><br>Nota: Solo le fatture non pagate possono essere sostituite. Se la fattura che vuoi sostituire non è ancora stata chiusa, questa verrà automaticamente chiusa come "abbandonata".
+InvoiceAvoir=Nota di credito
 InvoiceAvoirAsk=Nota di credito per correggere fattura
-InvoiceAvoirDesc=La <b>nota di credito a correzione</b> è una fattura con importo negativo utilizzata per risolvere il problema di una fattura emessa con importo diverso da quello realmente pagato (perché il cliente ha pagato troppo per errore, o non ha pagato completamente perché ad esempio ha restituito alcuni prodotti).<br/><br/>Nota: la fattura originale deve essere già chiusa ( "pagata" o "parzialmente pagata") per consentire la creazione di una nota di credito a correzione.
+InvoiceAvoirDesc=La <b>nota di credito</b> è una fattura con importo negativo utilizzata per risolvere il problema di una fattura emessa con importo diverso da quello realmente pagato (perché il cliente ha pagato troppo per errore o non ha pagato completamente perché ad esempio ha restituito alcuni prodotti).
 invoiceAvoirWithLines=Crea una Nota Credito con le righe della fattura di origine.
 invoiceAvoirWithPaymentRestAmount=Crea nota di credito con il restante da pagare della fattura originale
 invoiceAvoirLineWithPaymentRestAmount=Crea nota di credito con il restante da pagare
 ReplaceInvoice=Sostituire fattura %s
-ReplacementInvoice=Sostituzione fattura
+ReplacementInvoice=Fattura sostitutiva
 ReplacedByInvoice=Sostituita dalla fattura %s
-ReplacementByInvoice=Sostituzione della fattura
+ReplacementByInvoice=Sostituita dalla fattura
 CorrectInvoice=Corretta fattura %s
 CorrectionInvoice=Correzione fattura
 UsedByInvoice=Usato per pagare fattura %s
@@ -94,7 +94,7 @@ SearchACustomerInvoice=Cerca una fattura attiva
 SearchASupplierInvoice=Cerca una fattura fornitore
 CancelBill=Annulla una fattura
 SendRemindByMail=Promemoria tramite email
-DoPayment=Emetti pagamento
+DoPayment=Registra pagamento
 DoPaymentBack=Emetti rimborso
 ConvertToReduc=Converti in futuro sconto
 EnterPaymentReceivedFromCustomer=Inserisci il pagamento ricevuto dal cliente
@@ -148,7 +148,7 @@ SuppliersDraftInvoices=Bozze di fattura fornitore
 Unpaid=Non pagato
 ConfirmDeleteBill=Vuoi davvero cancellare questa fattura?
 ConfirmValidateBill=Vuoi davvero convalidare questa fattura con riferimento <b> %s </b>?
-ConfirmUnvalidateBill=Vuoi davvero portare la fattura <b>%s</b> allo stato di progetto?
+ConfirmUnvalidateBill=Sei sicuro di voler convertire la fattura <b>%s</b> in bozza?
 ConfirmClassifyPaidBill=Vuoi davvero cambiare lo stato della fattura <b>%s</b> in "pagata"?
 ConfirmCancelBill=Vuoi davvero annullare la fattura <b>%s</b>?
 ConfirmCancelBillQuestion=Perché si desidera classificare questa fattura come "abbandonata" ?
@@ -167,7 +167,7 @@ ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b>cattivo cliente</b> è u
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Questa scelta viene utilizzata quando il pagamento non è completo perché alcuni dei prodotti sono stati restituiti
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilizzare questa scelta se tutte le altre opzioni sono inadeguate, per esempio: <br/>- il pagamento non è completo, in quanto alcuni prodotti sono stati restituiti.<br/>- l'importo richiesto è troppo oneroso per essere trasformato in uno sconto.<br/>Per correttezza contabile dovrà essere emessa una nota di credito.
 ConfirmClassifyAbandonReasonOther=Altro
-ConfirmClassifyAbandonReasonOtherDesc=Questa scelta sarà utilizzata in tutti gli altri casi. Perché, ad esempio, si prevede di creare una fattura in sostituzione.
+ConfirmClassifyAbandonReasonOtherDesc=Questa scelta sarà utilizzata in tutti gli altri casi. Perché, ad esempio, si prevede di creare una fattura sostitutiva.
 ConfirmCustomerPayment=Confermare riscossione per <b>%s</b> %s?
 ConfirmSupplierPayment=Confermare riscossione per <b>%s</b> %s?
 ConfirmValidatePayment=Vuoi davvero convalidare questo pagamento? Una volta convalidato non si potranno più operare modifiche.
@@ -182,7 +182,7 @@ ShowBill=Visualizza fattura
 ShowInvoice=Visualizza fattura
 ShowInvoiceReplace=Visualizza la fattura sostitutiva
 ShowInvoiceAvoir=Visualizza nota di credito
-ShowInvoiceDeposit=Visualizza deposito fattura
+ShowInvoiceDeposit=Visualizza fattura d'acconto
 ShowPayment=Visualizza pagamento
 File=File
 AlreadyPaid=Già pagato
@@ -252,10 +252,10 @@ RelativeDiscount=Sconto relativo
 GlobalDiscount=Sconto assoluto
 CreditNote=Nota di credito
 CreditNotes=Note di credito
-Deposit=Deposito
+Deposit=Acconto
 Deposits=Depositi
 DiscountFromCreditNote=Sconto da nota di credito per %s
-DiscountFromDeposit=Pagamenti dal deposito della fattura %s
+DiscountFromDeposit=Pagamenti dalla fattura d'acconto %s
 AbsoluteDiscountUse=Questo tipo di credito può essere utilizzato su fattura prima della sua convalida
 CreditNoteDepositUse=La fattura deve essere convalidata per l'utilizzo di questo credito
 NewGlobalDiscount=Nuovo sconto globale
@@ -346,8 +346,8 @@ ExtraInfos=Extra info
 RegulatedOn=Regolamentato su
 ChequeNumber=Assegno N°
 ChequeOrTransferNumber=Assegno/Bonifico N°
-ChequeMaker=Emittente assegno
-ChequeBank=Banca dell'assegno
+ChequeMaker=Traente dell'assegno
+ChequeBank=Banca emittente
 NetToBePaid=Netto a pagare
 PhoneNumber=Tel
 FullPhoneNumber=Telefono
@@ -371,7 +371,7 @@ UseCreditNoteInInvoicePayment=Riduci l'ammontare del pagamento con la nota di cr
 MenuChequeDeposits=Depositi assegni
 MenuCheques=Assegni
 MenuChequesReceipts=Ricezione assegni
-NewChequeDeposit=Nuovo deposito
+NewChequeDeposit=Nuovo acconto
 ChequesReceipts=Ricevute assegni
 ChequesArea=Area assegni
 ChequeDeposits=Depositi assegni
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index c0b713303fa..d32a581c27b 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -109,7 +109,7 @@ SuppliersProductsSellSalesTurnover=Fatturato generato dalle vendite di prodotti
 CheckReceipt=Ricevuta di versamento assegno
 CheckReceiptShort=Ricevuta assegno
 LastCheckReceiptShort=Last %s check receipts
-NewCheckReceipt=Nuovo assegno
+NewCheckReceipt=Nuovo sconto
 NewCheckDeposit=Nuovo deposito
 NewCheckDepositOn=Nuovo deposito sul conto: %s
 NoWaitingChecks=Nessun assegno in attesa di deposito.
@@ -141,8 +141,8 @@ RulesResultDue=- Gli importi indicati sono tutti tasse incluse<br/>- Comprendono
 RulesResultInOut=- Include i pagamenti reali di fatture, spese e IVA. <br>- Si basa sulle date di pagamento di fatture, spese e IVA.
 RulesCADue=- Comprende le fatture del cliente, che siano state pagate o meno.<br/>- Si basa sulla data di tali fatture.<br/>
 RulesCAIn=- Comprende le fatture effettivamente pagate dai clienti.<br/>- Si basa sulla data dei pagamenti.<br/>
-DepositsAreNotIncluded=- Ricevute di deposito non incluse
-DepositsAreIncluded=- Ricevute di deposito incluse
+DepositsAreNotIncluded=- Le fatture d'acconto non sono incluse
+DepositsAreIncluded=- Le fatture d'acconto sono incluse
 LT2ReportByCustomersInInputOutputModeES=IRPF soggetti terzi(Spagna)
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReportByCustomersInInputOutputMode=Report per IVA cliente riscossa e pagata
@@ -177,7 +177,7 @@ InvoiceRef=Rif. fattura
 CodeNotDef=Non definito
 AddRemind=Invia importo disponibile
 RemainToDivide= Ancora da inviare:
-WarningDepositsNotIncluded=Le ricevute di deposito non sono incluse in questa versione del modulo contabilità.
+WarningDepositsNotIncluded=Le fatture d'acconto non sono incluse in questa versione del modulo contabilità.
 DatePaymentTermCantBeLowerThanObjectDate=La data termine di pagamento non può essere anteriore alla data dell'oggetto
 Pcg_version=Versione pcg
 Pcg_type=Tipo pcg
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=in accordo con il fornitore, scegliere il metodo app
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Metodo di calcolo
 AccountancyJournal=Codice del giornale di contabilità
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang
index 31a3df9e376..30637765163 100644
--- a/htdocs/langs/it_IT/contracts.lang
+++ b/htdocs/langs/it_IT/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Elenco delle righe di contratto in esecuzione
 ListOfRunningServices=Elenco dei servizi in esecuzione
 NotActivatedServices=Servizi non attivati (con contratti convalidati)
 BoardNotActivatedServices=Servizi da attivare con contratti convalidati
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Ultimi %s servizi attivati
 LastModifiedServices=Ultimi %s servizi modificati
 EditServiceLine=Modifica riga del servizio
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista dei servizi in scadenza
 NoteListOfYourExpiredServices=Questa lista contiene i servizi relativi a contratti di terze parti per le quali siete collegati come rappresentanti commerciali.
 StandardContractsTemplate=Template standard per i contratti
 ContactNameAndSignature=Per %s, Nome e firma:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Contatto interno per la firma del contratto
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 63153883a4c..96edeef52f2 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Il codice fornitore è obbligatorio
 ErrorSupplierCodeAlreadyUsed=Codice fornitore già utilizzato
 ErrorBadParameters=Parametri errati
 ErrorBadValueForParameter=Valore '%s' errato per il parametro '%s'
-ErrorBadImageFormat=Formato del file immagine non supportato
+ErrorBadImageFormat=Tipo file immagine non supportato (la tua installazione di PHP non supporta le funzioni per convertire le immagini di questo formato)
 ErrorBadDateFormat=Il valore '%s' ha un formato della data sbagliato
 ErrorWrongDate=La data non è corretta!
 ErrorFailedToWriteInDir=Impossibile scrivere nella directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Utente con accesso <b>%s</b> inesistente
 ErrorLoginHasNoEmail=Questo utente non ha alcun indirizzo email. Processo interrotto.
 ErrorBadValueForCode=Valore del codice errato. Riprova con un nuovo valore...
 ErrorBothFieldCantBeNegative=I campi %s e %s non possono essere entrambi negativi
+ErrorQtyForCustomerInvoiceCantBeNegative=La quantità di ciascuna riga della fattura cliente non può essere negativa
 ErrorWebServerUserHasNotPermission=L'account utente <b>%s</b> utilizzato per eseguire il server web non ha i permessi necessari
 ErrorNoActivatedBarcode=Nessun tipo di codice a barre attivato
 ErrUnzipFails=Estrazione dell'archivio %s con ZipArchive fallita
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Errore, questo membro non è s
 ErrorThereIsSomeDeliveries=Errore, ci sono alcune consegne collegate a questa spedizione. Cancellazione rifiutata.
 ErrorCantDeletePaymentReconciliated=Impossibile cancellare un pagamento che ha generato una transazione bancaria che è stata conciliata
 ErrorCantDeletePaymentSharedWithPayedInvoice=Impossibile cancellare un pagamento condiviso con almeno una fattura con lo stato Pagato
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=I parametri di configurazione obbligatori non sono ancora stati definiti
@@ -155,5 +174,5 @@ WarningUsingThisBoxSlowDown=Attenzione: l'uso di questo box rallenterà pesantem
 WarningClickToDialUserSetupNotComplete=Le impostazioni di informazione del ClickToDial per il tuo utente non sono complete (vedi la scheda ClickToDial sulla tua scheda utente)
 WarningNotRelevant=Operazione irrilevante per questo dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funzione disabilitata quando le impostazioni di visualizzazione sono ottimizzate per persone non vedenti o browser testuali.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningPaymentDateLowerThanInvoiceDate=La scadenza del pagamento (%s) risulta antecedente alla data di fatturazione (%s) per la fattura %s
+WarningTooManyDataPleaseUseMoreFilters=Troppi risultati. Per favore applica filtri più restrittivi
diff --git a/htdocs/langs/it_IT/exports.lang b/htdocs/langs/it_IT/exports.lang
index 6246fadfae7..ede6d91614d 100644
--- a/htdocs/langs/it_IT/exports.lang
+++ b/htdocs/langs/it_IT/exports.lang
@@ -22,7 +22,7 @@ ImportableFields=Campi importabili
 ImportedFields=Campi importati
 DatasetToExport=Dati da esportare
 DatasetToImport=Dataset da importare
-NoDiscardedFields=N. campi in file di origine vengono scartate
+NoDiscardedFields=Nessun campo del file sorgente sarà scartato
 Dataset=Dataset
 ChooseFieldsOrdersAndTitle=Scegli l'ordine dei campi
 FieldsOrder=Ordine campi
@@ -66,7 +66,7 @@ SourceFileFormat=Fonte formato di file
 FieldsInSourceFile=Campi nel file sorgente
 FieldsInTargetDatabase=Campi di destinazione nel database di Dolibarr (grassetto=obbligatorio)
 Field=Campo
-NoFields=N. campi
+NoFields=Nessun campo
 MoveField=Spostare campo %s numero di colonna
 ExampleOfImportFile=Example_of_import_file
 SaveImportProfile=Salva questo profilo di importazione
@@ -125,7 +125,7 @@ BankAccountNumber=Num. conto
 BankAccountNumberKey=Chiave
 SpecialCode=Codice speciale
 ExportStringFilter=%% permette di sostituire uno o più caratteri nel testo
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtra per un anno/mese/giorno<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtra con un intervallo di anni/mesi/giorni<br> > YYYY, > YYYYMM, > YYYYMMDD : filtra sui seguenti anni/mesi/giorni<br> < YYYY, < YYYYMM, < YYYYMMDD : filtra su tutti i precedenti anni/mesi/giorni
 ExportNumericFilter='NNNNN' filtra per un solo valore<br>'NNNNN+NNNNN' filtra su un range di valori<br>'&gt;NNNNN' filtra per valori inferiori<br>'&gt;NNNNN' filtra per valori superiori
 ## filters
 SelectFilterFields=Se vuoi filtrare su qualche valore, inserisci qui il valore.
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 1dd3ff637b5..638f17657e1 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -79,13 +79,13 @@ NewSubscription=Nuova adesione
 NewSubscriptionDesc=Questo modulo consente di registrare l'adesione di un nuovo membro alla fondazione. Per rinnovare l'adesione (se già iscritto), si prega di contattare la fondazione per email.
 Subscription=Adesione
 Subscriptions=Adesioni
-SubscriptionLate=Tardi
+SubscriptionLate=Ritardi
 SubscriptionNotReceived=Sottoscrizione mai ricevuta
-SubscriptionLateShort=Tardi
+SubscriptionLateShort=Ritardi
 SubscriptionNotReceivedShort=Mai ricevuto
 ListOfSubscriptions=Elenco adesioni
 SendCardByMail=Invia scheda per email
-AddMember=Aggiungi membro
+AddMember=Crea membro
 NoTypeDefinedGoToSetup=Nessun tipo di membro definito. Vai su impostazioni - Tipi di membro
 NewMemberType=Nuovo tipo di membro
 WelcomeEMail=Email di benvenuto
@@ -125,7 +125,7 @@ Date=Data
 DateAndTime=Data e ora
 PublicMemberCard=Scheda membro pubblico
 MemberNotOrNoMoreExpectedToSubscribe=Membri non iscritti o non più attesi per iscrizione
-AddSubscription=Aggiungi adesione
+AddSubscription=Crea sottoscrizione
 ShowSubscription=Visualizza adesione
 MemberModifiedInDolibarr=Membri modificati su Dolibarr
 SendAnEMailToMember=Invia email ai membri
@@ -203,3 +203,4 @@ MembersByNature=Membri per natura
 VATToUseForSubscriptions=Aliquota IVA in uso per le sottoscrizioni
 NoVatOnSubscription=Nessuna IVA per gli abbonamenti
 MEMBER_PAYONLINE_SENDEMAIL=Email di avviso quando Dolibarr riceve la conferma della validazione di un pagamento per adesione
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index 0e4bfada2ce..de1e4921269 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Esiste una spedizione
 DraftOrWaitingApproved=In bozza o approvato, ma non ancora ordinato
 DraftOrWaitingShipped=In bozza o convalidato, ma non ancora spedito
 MenuOrdersToBill=Ordini spediti
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Ordini fatturabili
 SearchOrder=Ricerca ordine
 SearchACustomerOrder=Cerca un ordine cliente
 ShipProduct=Spedisci prodotto
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 35c32720c0b..82fb5481e67 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -15,8 +15,8 @@ ProductCode=Codice prodotto
 ServiceCode=Codice  servizio
 ProductVatMassChange=Modifica di massa dell'IVA
 ProductVatMassChangeDesc=Questa pagina è utile a modificare le tariffe delle tasse definite nei prodotti o servizi da un valore ad un altro. Attenzione: questa modifica influenza l'intero database
-MassBarcodeInit=Inizializzazione di massa del barcode
-MassBarcodeInitDesc=Questa pagina può essere usata per inizializzare un barcode di un oggetto che non ha ancora un barcode definito. Controlla prima che il setup del modulo barcode sia completo. 
+MassBarcodeInit=Inizializzazione di massa dei codici a barre
+MassBarcodeInitDesc=Questa pagina può essere usata per inizializzare un codice a barre di un oggetto che non ha ancora un codice a barre definito. Controlla prima che il setup del modulo Codici a barre sia completo. 
 ProductAccountancyBuyCode=Codice contabilità (acquisto)
 ProductAccountancySellCode=Codice contabilità (vendita)
 ProductOrService=Prodotto o servizio
@@ -80,12 +80,12 @@ ContractStatusClosed=Chiuso
 ContractStatusRunning=In corso
 ContractStatusExpired=Scaduto
 ContractStatusOnHold=In attesa
-ContractStatusToRun=To get running
+ContractStatusToRun=Da avviare
 ContractNotRunning=Il presente contratto non è attivo
 ErrorProductAlreadyExists=Un prodotto con riferimento %s esiste già.
 ErrorProductBadRefOrLabel=Il valore di riferimento o l'etichetta è sbagliato.
 ErrorProductClone=Si è verificato un problema cercando di cuplicare il prodotto o servizio
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Errore. Il prezzo non può essere inferiore del Prezzo minimo
 Suppliers=Fornitori
 SupplierRef=Rif. fornitore
 ShowProduct=Visualizza prodotto
@@ -118,11 +118,11 @@ MultiPricesAbility=Livello diverso di prezzi per prodotto/servizio
 MultiPricesNumPrices=Numero di prezzi per il multi-prezzi
 MultiPriceLevelsName=Categorie di prezzo
 AssociatedProductsAbility=Attiva i prodotti associati
-AssociatedProducts=Prodotti associati
-AssociatedProductsNumber=Numero di prodotti associati
-ParentProductsNumber=Numero del prodotto padre
-IfZeroItIsNotAVirtualProduct=Se 0, questo non è un prodotto virtuale
-IfZeroItIsNotUsedByVirtualProduct=Se 0, questo prodotto non è usata da alcun prodotto virtuale
+AssociatedProducts=Prodotto associato
+AssociatedProductsNumber=Numero di sottoprodotti che compongono questo prodotto associato
+ParentProductsNumber=Numero di prodotti associati che includono questo sottoprodotto
+IfZeroItIsNotAVirtualProduct=Se vale 0, questo non è un prodotto associato
+IfZeroItIsNotUsedByVirtualProduct=Se vale 0, questo prodotto non è utilizzato da nessun prodotto associato come sottoprodotto
 EditAssociate=Modifica associazione
 Translation=Traduzione
 KeywordFilter=Filtro per parola chiave
@@ -132,7 +132,7 @@ AddDel=Aggiungi/Elimina
 Quantity=Quantità
 NoMatchFound=Nessun risultato trovato
 ProductAssociationList=Elenco dei prodotti/servizi associati: nome del prodotto/servizio (quantità interessata)
-ProductParentList=Elenco dei prodotti/servizi comprendenti questo prodotto
+ProductParentList=Elenco dei prodotti/servizi associati che includono questo sottoprodotto
 ErrorAssociationIsFatherOfThis=Uno dei prodotti selezionati è padre dell'attuale prodotto
 DeleteProduct=Elimina un prodotto/servizio
 ConfirmDeleteProduct=Vuoi davvero eliminare questo prodotto/servizio?
@@ -179,7 +179,7 @@ CloneProduct=Clona prodotto/servizio
 ConfirmCloneProduct=Vuoi davvero clonare il prodotto/servizio <b>%s</b>?
 CloneContentProduct=Clona tutte le principali informazioni del prodotto/servizio
 ClonePricesProduct=Clona principali informazioni e prezzi
-CloneCompositionProduct=Clona prodotto/servizio virtuale
+CloneCompositionProduct=Clona prodotto/servizio associato
 ProductIsUsed=Questo prodotto è in uso
 NewRefForClone=Rif. del nuovo prodotto/servizio
 CustomerPrices=Prezzi al cliente
@@ -221,24 +221,29 @@ Quarter1=Primo trimestre
 Quarter2=Secondo trimestre
 Quarter3=Terzo trimestre
 Quarter4=Quarto trimestre
-BarCodePrintsheet=Stampa barcode
-PageToGenerateBarCodeSheets=Con questo strumento, puoi stampare fogli adesivi di barcode. Scegli il formato del foglio adesivo, tipo di barcode e valore del barcode, poi clicca sul bottone <b>%s</b>.
+BarCodePrintsheet=Stampa codice a barre
+PageToGenerateBarCodeSheets=Con questo strumento, puoi stampare fogli adesivi di codici a barre. Scegli il formato del foglio adesivo, il tipo di codice a barre e il valore del codice a barre, poi clicca sul bottone <b>%s</b>.
 NumberOfStickers=Numero di etichette da stampare sulla pagina
-PrintsheetForOneBarCode=Stampa più etichette per singolo barcode
+PrintsheetForOneBarCode=Stampa più etichette per singolo codice a barre
 BuildPageToPrint=Genera pagina da stampare
-FillBarCodeTypeAndValueManually=Riempi il tipo di barcode e il valore manualmente
-FillBarCodeTypeAndValueFromProduct=Riempi il tipo di barcode e valore dal barcode del prodotto
-FillBarCodeTypeAndValueFromThirdParty=Riempi il tipo di barcode e il valore da un barcode di terze parti
-DefinitionOfBarCodeForProductNotComplete=La definizione del tipo o del valore del barcode non è completa per il prodotto %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=La definizione del tipo o valore del barcode non è completa per la terzaparte %s.
-BarCodeDataForProduct=Informazioni barcode del brodotto %s :
-BarCodeDataForThirdparty=Informazioni barcode di terzeparti %s :
-ResetBarcodeForAllRecords=Definisci il valore del barcode per tutti quelli inseriti (questo resetta anche i valori già definiti dei barcode con nuovi valori)
+FillBarCodeTypeAndValueManually=Riempi il tipo di codice a barre e il valore manualmente
+FillBarCodeTypeAndValueFromProduct=Riempi il tipo di codice a barre e valore dal codice a barre del prodotto
+FillBarCodeTypeAndValueFromThirdParty=Riempi il tipo di codice a barre e il valore da un codice a barre di terze parti
+DefinitionOfBarCodeForProductNotComplete=La definizione del tipo o del valore del codice a barre non è completa per il prodotto %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=La definizione del tipo o valore del codice a barre non è completa per la terzaparte %s.
+BarCodeDataForProduct=Informazioni codice a barre del prodotto %s :
+BarCodeDataForThirdparty=Informazioni codice a barre della terza parte %s :
+ResetBarcodeForAllRecords=Definisci il valore del codice a barre per tutti quelli inseriti (questo resetta anche i valori già definiti dei codice a barre con nuovi valori)
 PriceByCustomer=Prezzo per cliente
 PriceCatalogue=Prezzo unico per prodotto/servizio
 PricingRule=Regole prezzi
 AddCustomerPrice=Aggiungi un prezzo per cliente
 ForceUpdateChildPriceSoc=Imposta lo stesso prezzo per i clienti sussidiari
 PriceByCustomerLog=Prezzo per log cliente
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
+MinimumPriceLimit=Il prezzo minimo non può essere inferiore di %s
+MinimumRecommendedPrice=Il prezzo minimo raccomandato è: %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 22dff95f489..62d699144c6 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Questa visualizzazione mostra tutti i progetti e i compiti (hai i priv
 Myprojects=I miei progetti
 ProjectsArea=Area progetti
 NewProject=Nuovo progetto
-AddProject=Aggiungi progetto
+AddProject=Crea progetto
 DeleteAProject=Elimina un progetto
 DeleteATask=Cancella un compito
 ConfirmDeleteAProject=Vuoi davvero eliminare il progetto?
@@ -36,6 +36,8 @@ TaskTimeSpent=Tempo speso sulle attività
 TaskTimeUser=Utente
 TaskTimeNote=Nota
 TaskTimeDate=Data
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Aggiungi tempo lavorato
 MyTimeSpent=Il mio tempo lavorato
 MyTasks=I miei compiti
@@ -45,7 +47,7 @@ TaskDateStart=Data inizio attività
 TaskDateEnd=Data fine attività
 TaskDescription=Descrizione attività
 NewTask=Nuovo compito
-AddTask=Aggiungere compito
+AddTask=Crea attività
 AddDuration=Aggiungi periodo
 Activity=Operatività
 Activities=Compiti/operatività
@@ -85,13 +87,13 @@ ActionsOnProject=Azioni sul progetto
 YouAreNotContactOfProject=Non sei tra i contatti di questo progetto privato
 DeleteATimeSpent=Cancella il tempo lavorato
 ConfirmDeleteATimeSpent=Vuoi davvero cancellare il tempo lavorato?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+DoNotShowMyTasksOnly=Mostra anche le attività non assegnate a me
+ShowMyTasksOnly=Mostra soltanto le attività assegnate a me
 TaskRessourceLinks=Risorse
 ProjectsDedicatedToThisThirdParty=Progetti dedicati a questo soggetto terzo
 NoTasks=Nessun compito per questo progetto
 LinkedToAnotherCompany=Collegato ad un altro soggetto terzo
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAffectedToYou=Attività non assegnate a te
 ErrorTimeSpentIsEmpty=Il campo tempo lavorato è vuoto
 ThisWillAlsoRemoveTasks=Questa azione eliminerà anche tutti i compiti del progetto (al momento ci sono <b>%s</b> compiti) e tutto il tempo lavorato già inserito.
 IfNeedToUseOhterObjectKeepEmpty=Se qualche elemento (fattura, ordine, ...), appartenente ad un altro soggetto terzo deve essere collegato al progetto da creare, non compilare il campo per assegnare il progetto a più di un soggetto terzo.
@@ -120,7 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributore
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributore
 SelectElement=Seleziona elemento
 AddElement=Link all'elemento
-UnlinkElement=Unlink element
+UnlinkElement=Rimuovi collegamento
 # Documents models
 DocumentModelBaleine=Modello per il report di un progetto completo (logo, etc..)
 PlannedWorkload = Carico di lavoro previsto
@@ -129,4 +131,4 @@ ProjectReferers=Elementi correlati
 SearchAProject=Cerca un progetto
 ProjectMustBeValidatedFirst=I progetti devono prima essere validati
 ProjectDraft=Progetti bozza
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associa una risorsa per allocare il tempo
diff --git a/htdocs/langs/it_IT/resource.lang b/htdocs/langs/it_IT/resource.lang
index d64075dfbf5..ec76b191873 100644
--- a/htdocs/langs/it_IT/resource.lang
+++ b/htdocs/langs/it_IT/resource.lang
@@ -1,36 +1,34 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
+MenuResourceIndex=Risorse
+MenuResourceAdd=Nuova risorsa
 MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
+DeleteResource=Elimina risorsa
 ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+NoResourceInDatabase=Nessuna risorsa nel database
+NoResourceLinked=Nessuna risorsa collegata
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
+ResourcePageIndex=Elenco delle risorse
+ResourceSingular=Risorsa
 ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+AddResource=Crea una risorsa
+ResourceFormLabel_ref=Nome della risorsa
+ResourceType=Tipo di risorsa
+ResourceFormLabel_description=Descrizione della risorsa
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Risorse collegate all'elemento
 
 ShowResourcePlanning=Show resource planning
 GotoDate=Go to date
 
-ResourceElementPage=Element resources
+ResourceElementPage=Risorse dell'elemento
 ResourceCreatedWithSuccess=Resource successfully created
 RessourceLineSuccessfullyDeleted=Resource line successfully deleted
 RessourceLineSuccessfullyUpdated=Resource line successfully updated
 ResourceLinkedWithSuccess=Resource linked with success
 
 TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+ConfirmDeleteResource=Conferma l'eliminazione di questa risorsa
+RessourceSuccessfullyDeleted=Risorsa eliminata con successo
+DictionaryResourceType=Tipo di risorse
 
-DictionaryEMailTemplates=Modèles d'Emails
-
-SelectResource=Select resource
+SelectResource=Seleziona risorse
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index 9158af3aed8..ae26dee0a4c 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Data di accredito
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Mostra domiciliazione
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tuttavia, se per la fattura ci sono ancora pagamenti da elaborare, non sarà impostata come pagata per consentire prima la gestione dei domiciliazioni.
-DoStandingOrdersBeforePayments=Questa scheda consente di richiedere un ordine permanente. Una volta finito, è possibile inserire il pagamento per chiudere la fattura.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Ricevuta bancaria
 SetToStatusSent=Imposta stato come "file inviato"
 ThisWillAlsoAddPaymentOnInvoice=Verranno anche creati dei pagamenti tra le ricevuti e saranno classificati come pagati
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Il pagamento dell'ordine permanente %s da parte della banca
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 8244aa168a4..06e48cdad56 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= 活動に現在thirdparties表示/非表示切り替えフィルタオプションを追加したり、それを停止している
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=検索フィルタのオプション
 NumberOfKeyToSearch=検索を開始する文字のNBR：%s
 ViewFullDateActions=3つ目のシートの完全な日付のイベントを表示
@@ -208,6 +210,7 @@ ModulesJobDesc=ビジネス·モジュールは、特定のビジネスのため
 ModulesMarketPlaceDesc=あなたは、インターネット上の外部のWebサイトでダウンロードする複数のモジュールを見つけることができます...
 ModulesMarketPlaces=複数のモジュール...
 DoliStoreDesc=DoliStore、Dolibarr ERP / CRM外部モジュールのための公式の市場の場所
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Webサイトのプロバイダは、あなたが複数のモジュールを見つけるために検索することができます...
 URL=リンク
 BoxesAvailable=利用可能なボックス
@@ -444,7 +447,7 @@ Module55Desc=バーコードの管理
 Module56Name=テレフォニー
 Module56Desc=テレフォニー統合
 Module57Name=立っている受注
-Module57Desc=立っている注文と出金の管理
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDialシステムの統合（アスタリスク、...）
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSSフィード
 Module320Desc=Dolibarr画面のページ内でRSSフィードを追加
 Module330Name=ブックマーク
 Module330Desc=ブックマークの管理
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=のwebcalendar
 Module410Desc=のwebcalendar統合
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=カテゴリー
 Module1780Desc=Categorieの管理（製品、サプライヤー、顧客）
 Module2000Name=WYSIWYGエディタ
 Module2000Desc=高度なエディタを使用して、いくつかのテキストエリアを編集することができます
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=議題
@@ -503,6 +508,8 @@ Module2500Name=電子コンテンツ管理
 Module2500Desc=ドキュメントを保存および共有
 Module2600Name=Webサービス
 Module2600Desc=Dolibarr Webサービスのサーバをイネーブルにします。
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=グラバター
 Module2700Desc=ユーザー/メンバーの写真を（それらのメールに見られる）を表示するオンライングラバターサービス（www.gravatar.com）を使用します。インターネットへのアクセスを必要とする
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=切符売り場
 Module50000Desc=切符売り場でクレジットカードによるオンライン決済のページを提供するモジュール
 Module50100Name=売上高のポイント
@@ -527,7 +534,7 @@ Module50200Desc=Paypalとクレジットカードによるオンライン決済
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=セットアップは、保存された
 BackToModuleList=モジュールリストに戻る
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=左側のメニューの恒久的な検索フォーム
 DefaultLanguage=使用する既定の言語（言語コード）
 EnableMultilangInterface=多言語のインターフェイスをイネーブルにします。
 EnableShowLogo=左メニューのロゴを表示する
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=お使いのシステムは正常に更新されました
 CompanyInfo=会社概要/基礎情報
 CompanyIds=会社概要/基礎アイデンティティ
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index 8492595eac6..d2ed716615c 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=イベントへの影響を受けた
 ActionsDoneBy=によって行われたイベント
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= すべての私のイベント/タスク
 AllActions= すべてのイベント/タスク
 ViewList=リストビュー
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 4b385d678cd..7e09ff1ecfa 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang
index b4e2e7ca76d..3f44104d7fb 100644
--- a/htdocs/langs/ja_JP/contracts.lang
+++ b/htdocs/langs/ja_JP/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=実行中の契約品目のリスト
 ListOfRunningServices=実行中のサービスのリスト
 NotActivatedServices=非アクティブなサービス（検証済みの契約の中で）
 BoardNotActivatedServices=検証済みの契約の中でアクティブにするサービス
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=最後%s活性化サービス
 LastModifiedServices=最後%sは、サービスを変更
 EditServiceLine=編集サービスライン
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=営業担当者の署名の契約
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index fa925a3f694..9742a4ad7c7 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=サプライヤーコードが必要です
 ErrorSupplierCodeAlreadyUsed=サプライヤーコードが既に使用され
 ErrorBadParameters=パラメータが不正で
 ErrorBadValueForParameter=パラメータが正しくない &quot;%s&quot;のために間違った値 &quot;%s&quot;
-ErrorBadImageFormat=イメージファイルはサポートされている形式を持っていないと
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=値 '%s'に間違った日付の形式になっています
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=ディレクトリ%sの書き込みに失敗しました
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=ログイン<b>%s</b>を持つユーザーを見つけ
 ErrorLoginHasNoEmail=このユーザーは電子メールアドレスを持っていません。プロセスが中止されました。
 ErrorBadValueForCode=セキュリティコードの値が正しくありません。新しい値で再試行してください...
 ErrorBothFieldCantBeNegative=フィールド%s %sとは負の両方にすることはできません
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Webサーバを実行するユーザーアカウントを使用<b>%s</b>そのための権限を持っていない
 ErrorNoActivatedBarcode=活性化バーコード·タイプません
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index 37609615f03..7455ea4d526 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -8,7 +8,7 @@ Members=メンバー
 MemberAccount=メンバーログイン
 ShowMember=メンバーカードを提示
 UserNotLinkedToMember=ユーザーがメンバーにリンクされていません
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=メンバーチケット
 FundationMembers=Foundationのメンバー
 Attributs=属性
@@ -85,8 +85,7 @@ SubscriptionLateShort=遅い
 SubscriptionNotReceivedShort=受信しませんでした
 ListOfSubscriptions=サブスクリプションのリスト
 SendCardByMail=メールでカードを送る
-AddMember=メンバーを追加する
-MemberType=メンバー型
+AddMember=Create member
 NoTypeDefinedGoToSetup=いいえメンバーのタイプが定義されていません。セットアップに行く - メンバーの種類
 NewMemberType=新しいメンバの型
 WelcomeEMail=電子メール歓迎
@@ -126,12 +125,12 @@ Date=日付
 DateAndTime=日時
 PublicMemberCard=メンバーパブリックカード
 MemberNotOrNoMoreExpectedToSubscribe=メンバーは、より多くのサブスクライブしないと予想されていないかない
-AddSubscription=サブスクリプションを追加します。
+AddSubscription=Create subscription
 ShowSubscription=サブスクリプションを表示する
 MemberModifiedInDolibarr=メンバーはDolibarrで変更
 SendAnEMailToMember=メンバーへの情報メールを送る
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=メンバーautosubscriptionための電子メールの件名
 DescADHERENT_AUTOREGISTER_MAIL=メンバーautosubscriptionの電子メール
 DescADHERENT_MAIL_VALID_SUBJECT=メンバーの検証のための電子メールの件名
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=メンバーresiliationための電子メール
 DescADHERENT_MAIL_RESIL=メンバーresiliationの電子メール
 DescADHERENT_MAIL_FROM=自動電子メールの送信者の電子メール
 DescADHERENT_ETIQUETTE_TYPE=ラベルページのフォーマット
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=カードのページのフォーマット
 DescADHERENT_CARD_HEADER_TEXT=メンバーカードの上に印刷されたテキスト
 DescADHERENT_CARD_TEXT=テキストは、（左揃え）メンバーカードに印刷
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=このメンバに関連付けられているサ
 ThirdPartyDolibarr=Dolibarrサードパーティ
 MembersAndSubscriptions= メンバーとSubscriptions
 MoreActions=記録上の相補的なアクション
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=アカウントに直接トランザクション·レコードを作成します。
 MoreActionBankViaInvoice=アカウントの請求書と支払いを作成します。
 MoreActionInvoiceOnly=なし支払いで請求書を作成します。
@@ -171,6 +170,8 @@ LastSubscriptionAmount=最後のサブスクリプションの量
 MembersStatisticsByCountries=国別メンバー統計
 MembersStatisticsByState=都道府県/州によってメンバーの統計
 MembersStatisticsByTown=町によってメンバーの統計
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=会員数
 NoValidatedMemberYet=いいえ検証メンバーが見つかりませんでした
 MembersByCountryDesc=この画面には、国によるメンバーの統計情報を表示します。グラフィックは、Googleのオンライングラフサービスに依存しますが、インターネット接続が機能している場合にのみ使用できます。
@@ -196,9 +197,10 @@ Collectivités=組織
 Particuliers=個人的な
 Entreprises=企業
 DOLIBARRFOUNDATION_PAYMENT_FORM=銀行振込を使用してサブスクリプション費用の支払いを行うには、ページ参照<a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribeを</a> 。 <br>クレジットカードまたはPayPalでお支払いには、このページの下部にあるボタンをクリックします。 <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index d02dfb5bad9..8753a3c1353 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=製品は、限られた期間を持つサービスの場
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=価格数
 MultiPriceLevelsName=価格カテゴリ
-AssociatedProductsAbility=サブプロダクトをアクティブにする
-AssociatedProducts=サブプロダクト
-AssociatedProductsNumber=この製品を構成する製品の数
-ParentProductsNumber=親製品の数
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=関連付ける
 Translation=翻訳
 KeywordFilter=キーワードフィルタ
@@ -132,7 +132,7 @@ AddDel=追加/削除
 Quantity=量
 NoMatchFound=マッチするものが見つからない
 ProductAssociationList=関連製品/サービスのリスト：製品/サービスの名前（量の影響）
-ProductParentList=コンポーネントとしては、この製品と製品/サービスのリスト
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=選択した製品の一つは、現在の製品を持つ親です。
 DeleteProduct=製品/サービスを削除します。
 ConfirmDeleteProduct=この製品/サービスを削除してもよろしいですか？
@@ -179,7 +179,7 @@ CloneProduct=クローン製品やサービス
 ConfirmCloneProduct=あなたが製品やサービス<b>%sの</b>クローン<b>を作成</b>してもよろしいですか？
 CloneContentProduct=製品/サービスのすべての主要な情報のクローンを作成する
 ClonePricesProduct=主な情報と価格のクローンを作成する
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=本製品が使用されます
 NewRefForClone=REF。新製品/サービスの
 CustomerPrices=お客様の価格
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index ad6075c0514..5c876e6dd1b 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=このビューは、すべてのプロジェクトとタスク（あ
 Myprojects=私のプロジェクト
 ProjectsArea=プロジェクトエリア
 NewProject=新しいプロジェクト
-AddProject=プロジェクトを追加する
+AddProject=Create project
 DeleteAProject=プロジェクトを削除します。
 DeleteATask=タスクを削除する
 ConfirmDeleteAProject=このプロジェクトを削除してもよろしいですか？
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=新たに費やされた時間は
 MyTimeSpent=私の時間を費やし
 MyTasks=私の仕事
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=新しいタスク
-AddTask=タスクを追加する
+AddTask=Create task
 AddDuration=期間を追加します。
 Activity=アクティビティ
 Activities=タスク/活動
diff --git a/htdocs/langs/ja_JP/resource.lang b/htdocs/langs/ja_JP/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/ja_JP/resource.lang
+++ b/htdocs/langs/ja_JP/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index c8d4567a644..17e7c8c42b5 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=クレジットで
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=引き出しを表示
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=請求書は、まだ少なくとも一つの引き出しの支払いを処理していない場合、前に撤退を管理できるようにするために支払ったとして、しかし、それが設定されません。
-DoStandingOrdersBeforePayments=このタブでは、立っている順序のために要求することができます。それが終了されますしたら、請求書を閉じるには、支払を入力することができます。
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=銀行によって立っている順序%sの支払い
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index a8873ee150c..c8f846c9e55 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang
index 35a7cd38655..b2ab74c91bc 100644
--- a/htdocs/langs/ko_KR/agenda.lang
+++ b/htdocs/langs/ko_KR/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/ko_KR/contracts.lang b/htdocs/langs/ko_KR/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/ko_KR/contracts.lang
+++ b/htdocs/langs/ko_KR/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index cf892ddac82..259ba9c91ec 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index 9246a04ced9..40bca8e85fb 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/ko_KR/resource.lang b/htdocs/langs/ko_KR/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/ko_KR/resource.lang
+++ b/htdocs/langs/ko_KR/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/ko_KR/withdrawals.lang
+++ b/htdocs/langs/ko_KR/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 5039352d999..3d1cd8a7cb2 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Parodyti/paslėpti trečiasias šalis vykdančias ar nutraukusias veiklą, pridėkite filtro pasirinkimą
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Paieškos filtrų nustatymai
 NumberOfKeyToSearch=Paieškai paleisti reikalingas simbolių skaičius: %s
 ViewFullDateActions=Rodyti pilnas įvykių datas trečiajame lape
@@ -208,6 +210,7 @@ ModulesJobDesc=Verslo moduliuose yra paprastos iš anksto nustatytos Dolibarr nu
 ModulesMarketPlaceDesc=Galite rasti daugiau modulių ir atsisiųsti iš išorinių web svetainių internete ...
 ModulesMarketPlaces=Daugiau modulių ...
 DoliStoreDesc=DoliStore, oficiali Dolibarr ERP / CRM išorinių modulių parduotuvė
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Galite ieškoti ir rasti daugiau modulių per Web svetainių tiekėjus...
 URL=Nuoroda
 BoxesAvailable=Prieinami langeliai
@@ -444,7 +447,7 @@ Module55Desc=Brūkšninių kodų valdymas
 Module56Name=Telefonija
 Module56Desc=Telefonijos integracija
 Module57Name=Pastovūs užsakymai
-Module57Desc=Pastovių užsakymų ir atšaukimų valdymas
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial sistemos integracija (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS mechanizmas
 Module320Desc=Pridėti RSS mechanizmą Dolibarr ekrano puslapių viduje
 Module330Name=Žymekliai
 Module330Desc=Žymeklių valdymas
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Web kalendorius
 Module410Desc=Web kalendoriaus integracija
 Module500Name=Specialiosios išlaidos (mokesčiai, socialinės įmokos, dividendai)
@@ -495,6 +498,8 @@ Module1780Name=Kategorijos
 Module1780Desc=Kategorijų valdymas (produktai, tiekėjai ir klientai)
 Module2000Name=WYSIWYG redaktorius
 Module2000Desc=Leisti redaguoti tam tikrą teksto sritį naudojant pažangų redaktorių
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Numatomų užduočių valdymas
 Module2400Name=Darbotvarkė
@@ -503,6 +508,8 @@ Module2500Name=Elektroninis Turinio Valdymas
 Module2500Desc=Išsaugoti dokumentus ir dalintis jais
 Module2600Name=WebServices
 Module2600Desc=Įjungti Dolibarr interneto paslaugas serveryje
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Naudokite Gravatar interneto paslaugą (www.gravatar.com) kad parodyti nuotrauką vartotojams/nariams (surandami prie jų laiškų). Reikalinga interneto prieiga.
 Module2800Desc=FTP klientas
@@ -517,7 +524,7 @@ Module6000Desc=Darbo eigos valdymas
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modulis siūlo internetinio mokėjimo kreditine kortele per Paybox puslapį
 Module50100Name=Pardavimų taškas
@@ -527,7 +534,7 @@ Module50200Desc=Modulis siūlo internetinio mokėjimo kreditine kortele per PayP
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Spausdinti per Cups IPP spausdintuvą.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Atidaryti apklausą
 Module55000Desc=Modulis interneto apklausų sudarymui (pvz.: Doodle, Studs, Rdvz, ...)
 Module59000Name=Paraštės
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Užsakymų metodai
 DictionarySource=Pasiūlymų/užsakymų kilmė
 DictionaryAccountancyplan=Sąskaitų planas
 DictionaryAccountancysystem=Sąskaitų plano modeliai
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Nustatymai išsaugoti
 BackToModuleList=Atgal į modulių sąrašą
 BackToDictionaryList=Atgal į žodynų sąrašą
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Nuolatinė paieškos forma kairiajame meniu
 DefaultLanguage=Naudojama kalba pagal nutylėjimą (kalbos kodas)
 EnableMultilangInterface=Įjungti daugiakalbę sąsają
 EnableShowLogo=Rodyti logotipą kairiajame meniu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Jūsų sistema sėkmingai atnaujinta
 CompanyInfo=Įmonės/Organizacijos informacija
 CompanyIds=Įmonės/Organizacijos tapatybės
diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang
index e56ed276d04..3d2da4f6b67 100644
--- a/htdocs/langs/lt_LT/agenda.lang
+++ b/htdocs/langs/lt_LT/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Įvykiai priskirti
 ActionsDoneBy=Įvykiai atlikti
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Visi mano įvykiai/užduotys
 AllActions= Visi įvykiai/užduotys
 ViewList=Sąrašo vaizdas
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index f07b82c6e96..f029909d1db 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=Priklausomai nuo tiekėjo, pasirinkti tinkamą metod
 TurnoverPerProductInCommitmentAccountingNotRelevant=Apyvartos ataskaita pagal produktą, kai naudojamas <b>Pinigų apskaita</b> būdas nėra tinkamas. Ši ataskaita yra prieinama tik tada, kai naudojama <b>Įsipareigojimų apskaita</b> režimas (žr. Apskaitos modulio nustatymus).
 CalculationMode=Skaičiavimo metodas
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/lt_LT/contracts.lang b/htdocs/langs/lt_LT/contracts.lang
index bc325523e1c..669a370db74 100644
--- a/htdocs/langs/lt_LT/contracts.lang
+++ b/htdocs/langs/lt_LT/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Veikiančių sutarčių eilučių sąrašas
 ListOfRunningServices=Veikiančių paslaugų sąrašas
 NotActivatedServices=Neaktyvios paslaugos (tarp patvirtintų sutarčių)
 BoardNotActivatedServices=Paslaugos aktyvavimui iš patvirtintų sutarčių
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Paskutinės %s aktyvuotos paslaugos
 LastModifiedServices=Paskutinės %s modifikuotos paslaugos
 EditServiceLine=Redaguoti paslaugos eilutę
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Paslaugų, kurios baigiasi, sąrašas
 NoteListOfYourExpiredServices=Šiame sąraše yra tik paslaugos sutarčių trečiosioms šalims, su kuriom Jūs susijęs kaip pardavimo atstovas.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Pardavimų atstovas pasirašantis sutartį
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 3393282345b..785d3b9be28 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Tiekėjo kodas reikalingas
 ErrorSupplierCodeAlreadyUsed=Tiekėjo kodas jau naudojamas
 ErrorBadParameters=Blogi parametrai
 ErrorBadValueForParameter=Nekorektiško parametro '%s' neteisinga reikšmė '%s'
-ErrorBadImageFormat=Paveikslėlio failo nepalaikomas formatas
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Reikšmė '%s' turi neteisingą datos formatą
 ErrorWrongDate=Data yra neteisinga !
 ErrorFailedToWriteInDir=Nepavyko įrašyti į katalogą %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Vartotojas su prisijungimu <b>%s</b> nerastas
 ErrorLoginHasNoEmail=Šis vartotojas neturi e-pašto adreso. Procesas nutrauktas.
 ErrorBadValueForCode=Netinkama saugumo kodo reikšmė. Pabandykite dar kartą su nauja reikšme ...
 ErrorBothFieldCantBeNegative=Laukai %s ir %s negali būti abu neigiami
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Vartotojo sąskaita <b>%s</b> naudojama web serverio vykdymui neturi leidimo tam.
 ErrorNoActivatedBarcode=Nėra įjungta brūkšninio kodo tipo
 ErrUnzipFails=Nepavyko išpakuoti %s su ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Klaida, šis narys nėra susij
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Privalomi nustatymų parametrai dar nėra apibrėžti
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index 9246a04ced9..ac6e97831b8 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Narių sritis
+PublicMembersArea=Vieša narių sritis
+MemberCard=Nario kortelė
+SubscriptionCard=Prenumeratos kortelė
+Member=Narys
+Members=Nariai
+MemberAccount=Nario prisijungimas
+ShowMember=Rodyti nario kortelę
+UserNotLinkedToMember=Vartotojas nėra susietas su nariu
+ThirdpartyNotLinkedToMember=Trečioji šalis nesusieta su nariu
+MembersTickets=Narių kortelės
+FundationMembers=Organizacijos nariai
+Attributs=Atributai
+ErrorMemberTypeNotDefined=Nario tipas nėra apibrėžtas
+ListOfPublicMembers=Viešųjų narių sąrašas
+ListOfValidatedPublicMembers=Patvirtintų viešųjų narių sąrašas
+ErrorThisMemberIsNotPublic=Šis narys nėra viešas
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Kitas narys (pavadinimas/vardas: <b>%s</b>, prisijungimas: <b>%s</b>) jau yra susietas su trečiąja šalimi <b>%s</b>. Pirmiausia pašalinti šį saitą, nes trečioji šalis negali būti susieta tik su nariu (ir atvirkščiai).
+ErrorUserPermissionAllowsToLinksToItselfOnly=Saugumo sumetimais, Jums turi būti suteikti leidimai redaguoti visus vartotojus, kad galėtumėte susieti narį su vartotoju, kuris yra ne Jūsų.
+ThisIsContentOfYourCard=Tai yra Jūsų kortelės detalės
+CardContent=Jūsų nario kortelės turinys
+SetLinkToUser=Saitas su Dolibarr vartotoju
+SetLinkToThirdParty=Saitas su Dolibarr trečiąja šalimi
+MembersCards=Narių vizitinės kortelės
+MembersList=Narių sąrašas
+MembersListToValid=Numatomų narių sąrašas (tvirtinimui)
+MembersListValid=Patvirtintų galiojančių narių sąrašas
+MembersListUpToDate=Patvirtintų galiojančių narių su atnaujintu pasirašymu sąrašas
+MembersListNotUpToDate=Patvirtintų galiojančių narių su pasenusiu pasirašymu sąrašas
+MembersListResiliated=Atkurtų narių sąrašas
+MembersListQualified=Slaptų narių sąrašas (qualified)
+MenuMembersToValidate=Numatomi nariai
+MenuMembersValidated=Patvirtinti galiojantys nariai
+MenuMembersUpToDate=Atnaujinti nariai
+MenuMembersNotUpToDate=Pasenę nariai
+MenuMembersResiliated=Atkurti nariai
+MembersWithSubscriptionToReceive=Nariai, kurių pasirašymą reikia gauti
+DateAbonment=Pasirašymo data
+DateSubscription=Pasirašymo data
+DateNextSubscription=Sekantis pasirašymas
+DateEndSubscription=Pasirašymo pabaigos data
+EndSubscription=Pasirašymo pabaiga
+SubscriptionId=Pasirašymo ID
+MemberId=Nario ID
+NewMember=Naujas narys
+NewType=Naujo nario tipas
+MemberType=Nario tipas
+MemberTypeId=Nario tipo ID
+MemberTypeLabel=Nario tipo etiketė
+MembersTypes=Narių tipai
+MembersAttributes=Narių atributai
+SearchAMember=Ieškoti nario
+MemberStatusDraft=Projektas (turi būti patvirtintas)
+MemberStatusDraftShort=Projektas
+MemberStatusActive=Patvirtintas (laukiama pasirašymo)
+MemberStatusActiveShort=Patvirtintas
+MemberStatusActiveLate=Pasirašymas pasibaigęs
+MemberStatusActiveLateShort=Pasibaigęs
+MemberStatusPaid=Pasirašymas atnaujintas
+MemberStatusPaidShort=Atnaujintas
+MemberStatusResiliated=Atkurtas narys
+MemberStatusResiliatedShort=Atkurtas
+MembersStatusToValid=Projektiniai nariai
+MembersStatusToValidShort=Projektiniai nariai
+MembersStatusValidated=Patvirtinti nariai
+MembersStatusPaid=Pasirašymas atnaujintas
+MembersStatusPaidShort=Atnaujinta
+MembersStatusNotPaid=Pasirašymas pasenęs
+MembersStatusNotPaidShort=Pasenusi
+MembersStatusResiliated=Atkurti nariai
+MembersStatusResiliatedShort=Atkurti nariai
+NewCotisation=Nauja įmoka
+PaymentSubscription=Naujas įmokos mokėjimas
+EditMember=Redaguoti narį
+SubscriptionEndDate=Pasirašymo pabaigos data
+MembersTypeSetup=Narių tipo nustatymai
+NewSubscription=Naujas pasirašymas
+NewSubscriptionDesc=Ši forma leidžia įrašyti Jūsų pasirašymą kaip naują organizacijos narį. Jei norite atnaujinti savo pasirašymą (jei jau narys), prašome vietoj susisiekti su Organizacijos valdyba e-paštu %s.
+Subscription=Pasirašymas
+Subscriptions=Pasirašymai
+SubscriptionLate=Vėlai
+SubscriptionNotReceived=Pasirašymas negautas
+SubscriptionLateShort=Vėlai
+SubscriptionNotReceivedShort=Niekada negautas
+ListOfSubscriptions=Pasirašymų sąrašas
+SendCardByMail=Siųsti kortelę E-paštu
+AddMember=Create member
+NoTypeDefinedGoToSetup=Nė apibrėžtų nario tipų. Eiti į meniu "Narių tipai"
+NewMemberType=Naujas nario tipas
+WelcomeEMail=Sveikinimo e-laiškas
+SubscriptionRequired=Reikalingas pasirašymas
+EditType=Redaguoti nario tipą
+DeleteType=Ištrinti
+VoteAllowed=Balsuoti leidžiama
+Physical=Fizinis
+Moral=Moralinis
+MorPhy=Moralinis/Fizinis
+Reenable=Įjungti vėl
+ResiliateMember=Atkurti narį
+ConfirmResiliateMember=Ar tikrai norite atkurti šį narį ?
+DeleteMember=Ištrinti narį
+ConfirmDeleteMember=Ar tikrai norite ištrinti šį narį (nario ištrynimas kartu ištrins visus jo pasirašymus) ?
+DeleteSubscription=Ištrinti pasirašymą
+ConfirmDeleteSubscription=Ar tikrai norite ištrinti šį pasirašymą ?
+Filehtpasswd=htpasswd failas
+ValidateMember=Patvirtinti narį
+ConfirmValidateMember=Ar tikrai norite patvirtinti šį narį ?
+FollowingLinksArePublic=Sekantys saitai yra atidaryti puslapiai neapsaugoti jokiais Dolibarr leidimais. Jie nėra suformatuoti puslapiai, pateikti kaip pavyzdys, kad parodyti, kaip vartyti narių duomenų bazę.
+PublicMemberList=Viešų narių sąrašas
+BlankSubscriptionForm=Viešo auto pasirašymo forma
+BlankSubscriptionFormDesc=Dolibarr gali suteikti Jums viešą URL ir leisti išorinius lankytojus pateikti užklausimus dėl pasirašymo į organizaciją. Jei mokėjimo internetu modulis įjungtas, mokėjimo forma bus pateikiama automatiškai.
+EnablePublicSubscriptionForm=Įjungti viešą auto pasirašymo formą
+MemberPublicLinks=Vieši saitai/puslapiai
+ExportDataset_member_1=Nariai ir pasirašymai
+ImportDataset_member_1=Nariai
+LastMembers=Paskutiniai %s nariai
+LastMembersModified=Paskutiniai %s modifikuoti nariai
+LastSubscriptionsModified=Paskutiniai %s modifikuoti pasirašymai
+AttributeName=Atributo pavadinimas
+String=Sąlyga
+Text=Tekstas
+Int=Vidinis
+Date=Data
+DateAndTime=Data ir laikas
+PublicMemberCard=Nario vieša kortelė
+MemberNotOrNoMoreExpectedToSubscribe=Narys, kurio pasirašymo nėra ir daugiau nesitikima
+AddSubscription=Create subscription
+ShowSubscription=Rodyti pasirašymą
+MemberModifiedInDolibarr=Narys modifikuotas Dolibarr
+SendAnEMailToMember=Nusiųsti informacinį e-laišką nariui
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Gauto e-laiško subjektas svečio auto įrašo atveju
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Gautas e-laiškas svečio auto įrašo atveju
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-laiško tema nario auto pasirašymui
+DescADHERENT_AUTOREGISTER_MAIL=E-laiškas nario auto pasirašymui
+DescADHERENT_MAIL_VALID_SUBJECT=E-laiško tema nario patvirtinimui
+DescADHERENT_MAIL_VALID=E-laiškas nario patvirtinimui
+DescADHERENT_MAIL_COTIS_SUBJECT=E-laiško tema pasirašymui
+DescADHERENT_MAIL_COTIS=E-laiškas pasirašymui
+DescADHERENT_MAIL_RESIL_SUBJECT=E-laiško tema nario atstatymui
+DescADHERENT_MAIL_RESIL=E-laiškas nario atstatymui
+DescADHERENT_MAIL_FROM=Siuntėjo e-paštas automatiniams e-laiškams
+DescADHERENT_ETIQUETTE_TYPE=Etikečių puslapio formatas
+DescADHERENT_ETIQUETTE_TEXT=Spausdinamas tekstas ant nario adreso puslapių
+DescADHERENT_CARD_TYPE=Kortelių puslapio formatas
+DescADHERENT_CARD_HEADER_TEXT=Spausdinamas tekstas ant nario kortelių viršuje
+DescADHERENT_CARD_TEXT=Spausdinamas tekstas ant nario kortelių (lygiuoti į kairę)
+DescADHERENT_CARD_TEXT_RIGHT=Spausdinamas tekstas ant nario kortelių (lygiuoti į dešinę)
+DescADHERENT_CARD_FOOTER_TEXT=Spausdinamas tekstas ant nario kortelių apačioje
+GlobalConfigUsedIfNotDefined=Bus naudojamas Organizacijos modulyje apibrėžtas tekstas, jei čia neapibrėžiama kitaip
+MayBeOverwrited=Šis tekstas gali būti perrašomas pagal apibrėžtą reikšmę šiam nario tipui
+ShowTypeCard=Rodyti tipą '%s'
+HTPasswordExport=htpassword failo generavimas
+NoThirdPartyAssociatedToMember=Nė viena trečioji šalis nėra asocijuota su šiuo nariu
+ThirdPartyDolibarr=Dolibarr trečioji šalis
+MembersAndSubscriptions= Nariai ir Pasirašymai
+MoreActions=Papildomi veiksmai įrašomi
+MoreActionsOnSubscription=Papildomi veiksmai siūlomi pagal nutylėjimą, kai registruojamas pasirašymas
+MoreActionBankDirect=Sukurti tiesioginį operacijos įrašą sąskaitoje
+MoreActionBankViaInvoice=Sukurti sąskaitą-faktūrą ir mokėjimą sąskaitoje
+MoreActionInvoiceOnly=Sukurti sąskaitą-faktūrą be mokėjimo
+LinkToGeneratedPages=Sukurti apsilankymų korteles
+LinkToGeneratedPagesDesc=Šis ekranas leidžia Jums sukurti PDF failus su vizitinėmis kortelėmis visiems Jūsų nariams ar tik tam tikriems nariams.
+DocForAllMembersCards=Sukurti vizitines korteles visiems nariams
+DocForOneMemberCards=Sukurti vizitines korteles tam tikriems nariams
+DocForLabels=Sukurti adresų lapus
+SubscriptionPayment=Pasirašymo apmokėjimas
+LastSubscriptionDate=Paskutinio pasirašymo data
+LastSubscriptionAmount=Paskutinio pasirašymo suma
+MembersStatisticsByCountries=Narių statistiniai duomenys pagal šalį
+MembersStatisticsByState=Narių statistiniai duomenys pagal valstybę/regioną
+MembersStatisticsByTown=Narių statistiniai duomenys pagal miestus
+MembersStatisticsByRegion=Narių statistika pagal regionus
+MemberByRegion=Nariai pagal regionus
+NbOfMembers=Narių skaičius
+NoValidatedMemberYet=Patvirtintų narių nerasta
+MembersByCountryDesc=Šis ekranas rodo narių statistiką pagal šalis. Grafika priklauso nuo Google interneto grafikos ir yra prieinamas tik tada, kai interneto ryšys veikia.
+MembersByStateDesc=Šis ekranas rodo narių statistiką pagal valstybes/regionus
+MembersByTownDesc=Šis ekranas rodo narių statistiką pagal miestus
+MembersStatisticsDesc=Pasirinkite statistiką, kurią norite skaityti
+MenuMembersStats=Statistika
+LastMemberDate=Paskutinio nario data
+Nature=Kilmė
+Public=Informacija yra vieša
+Exports=Eksportai
+NewMemberbyWeb=Naujas narys pridėtas. Laukiama patvirtinimo
+NewMemberForm=Naujo nario forma
+SubscriptionsStatistics=Pasirašymų statistika
+NbOfSubscriptions=Pasirašymų skaičius
+AmountOfSubscriptions=Pasirašymų apimtis
+TurnoverOrBudget=Apyvarta (įmonės) arba Biudžeto (organizacijos)
+DefaultAmount=Pasirašymo apimtis (pagal nutylėjimą)
+CanEditAmount=Lankytojas gali pasirinkti/redaguoti savo pasirašymo apimtį
+MEMBER_NEWFORM_PAYONLINE=Peršokti į integruotą interneto mokėjimo puslapį
+Associations=Organizacijos
+Collectivités=Organizacijos
+Particuliers=Asmens
+Entreprises=Įmonės
+DOLIBARRFOUNDATION_PAYMENT_FORM=Norint atlikti pasirašymo apmokėjimą naudojant banko pervedimą, žiūrėti psl.: <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br> Mokėti naudojant kreditinę kortelę arba PayPal, spauskite mygtuką šio puslapio apačioje.<br>
+ByProperties=Pagal savybes
+MembersStatisticsByProperties=Narių statistiniai duomenys pagal savybes
+MembersByNature=Nariai pagal kilmę
+VATToUseForSubscriptions=Pasirašymams naudojamas PVM tarifas
+NoVatOnSubscription=Pasirašymams nėra PVM
+MEMBER_PAYONLINE_SENDEMAIL=Įspėti, kai Dolibarr gauna patvirtinimą apie mokėjimą už pasirašymą, nusiunčiant e-laišką
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index a9db1492e92..d2b0da1e0f3 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Jei produktas yra paslauga su ribota trukme:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Kainų skaičius
 MultiPriceLevelsName=Kainų kategorijos
-AssociatedProductsAbility=Įjungti virtualią produktų funkciją
-AssociatedProducts=Virtualus produktas
-AssociatedProductsNumber=Produktų, sudarančių šį virtualų produktą, skaičius
-ParentProductsNumber=Patronuojančio virtualaus produkto skaičius
-IfZeroItIsNotAVirtualProduct=Jei 0, šis produktas nėra virtualus produktas
-IfZeroItIsNotUsedByVirtualProduct=Jei 0, šis produktas nėra naudojamas nei vieno virtualaus produkto
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Prisijungti
 Translation=Vertimas
 KeywordFilter=Raktažodižio filtras
@@ -132,7 +132,7 @@ AddDel=Pridėti/Ištrinti
 Quantity=Kiekis
 NoMatchFound=Atitikimų nerasta
 ProductAssociationList=Susijusių produktų/paslaugų sąrašas: produkto/paslaugos pavadinimas (paveiktas kiekis)
-ProductParentList=Virtualių prekių/paslaugų su šiuo produktu, kaip komponentu, sąrašas
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Vienas iš pasirinkto produkto yra patronuojantis einamam produktui
 DeleteProduct=Ištrinti produktą/paslaugą
 ConfirmDeleteProduct=Ar tikrai norite ištrinti šį produktą/paslaugą ?
@@ -179,7 +179,7 @@ CloneProduct=Klonuoti produktą ar paslaugą
 ConfirmCloneProduct=Ar tikrai norite klonuoti produktą ar paslaugą <b>%s</b> ?
 CloneContentProduct=Klonuoti visą pagrindinę produkto/paslaugos informaciją
 ClonePricesProduct=Klonuoti pagrindinę informaciją ir kainas
-CloneCompositionProduct=Klonuoti virtualų produktą/paslaugą
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Šis produktas naudojamas
 NewRefForClone=Naujo produkto/paslaugos nuoroda
 CustomerPrices=Klientų kainos
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Nustatykite tą pačią kainą ir kliento dukterinėms
 PriceByCustomerLog=Kaina pagal kliento žurnalą
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 77744b81fd3..357d4516d4b 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Šis vaizdas rodo visus projektus ir užduotis (Jūsų vartotojo teis
 Myprojects=Mano projektai
 ProjectsArea=Projektų sritis
 NewProject=Naujas projektas
-AddProject=Pridėti projektą
+AddProject=Create project
 DeleteAProject=Ištrinti projektą
 DeleteATask=Ištrinti užduotį
 ConfirmDeleteAProject=Ar tikrai norite ištrinti šį projektą?
@@ -36,6 +36,8 @@ TaskTimeSpent=Laikas, praleistas vykdant užduotis
 TaskTimeUser=Vartotojas
 TaskTimeNote=Pastaba
 TaskTimeDate=Data
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Naujas praleistas laikas
 MyTimeSpent=Mano praleistas laikas
 MyTasks=Mano užduotys
@@ -45,7 +47,7 @@ TaskDateStart=Užduoties pradžios data
 TaskDateEnd=Užduoties pabaigos data
 TaskDescription=Užduoties aprašymas
 NewTask=Nauja užduotis
-AddTask=Pridėti užduotį
+AddTask=Create task
 AddDuration=Pridėti trukmę
 Activity=Veikla
 Activities=Užduotys/veikla
diff --git a/htdocs/langs/lt_LT/resource.lang b/htdocs/langs/lt_LT/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/lt_LT/resource.lang
+++ b/htdocs/langs/lt_LT/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index 57893855393..9181af3d105 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Kreditą
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Rodyti Išėmimą
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Jei sąskaita-faktūra turi mažiausiai vieną išėmimo mokėjimą dar apdorojamą, tai nebus nustatyta kaip apmokėta, kad pirmiausia leisti išėmimo valdymą.
-DoStandingOrdersBeforePayments=Ši kortelė leidžia prašyti periodinio užsakymo. Kai jis bus įvykdytas, galite įvesti mokėjimą sąskaitos-faktūros uždarymui.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Išėmimo failas
 SetToStatusSent=Nustatyti būklę "Failas išsiųstas"
 ThisWillAlsoAddPaymentOnInvoice=Tai taip pat taikoma sąskaitų-faktūrų mokėjimams ir jų priskyrimui "Apmokėtos"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Periodinio užsakymo %s banko mokėjimas
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 36406135905..5debf8efd8c 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Izmantojiet automātiskos laukus, lai izvēlētos treš
 ActivityStateToSelectCompany= Pievienot filtru iespēja parādīt / slēpt thirdparties kas pašlaik darbībā vai ir pārtraucis to
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Izmantojiet automātiskos laukus, lai izvēlētos kontaktu (tā vietā, lai izmantojot sarakstlodziņu).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Meklēšanas filtru iespējas
 NumberOfKeyToSearch=Rakstzīmju skaits, lai iedarbinātu meklēšanu: %s
 ViewFullDateActions=Rādīt pilnu datumus notikumus trešajā lapā
@@ -208,6 +210,7 @@ ModulesJobDesc=Biznesa moduļi nodrošina vienkāršu iepriekš iestatīšanu Do
 ModulesMarketPlaceDesc=Jūs varat atrast vairāk moduļus, lai lejupielādētu uz ārējām tīmekļa vietnēm internetā ...
 ModulesMarketPlaces=Papildus moduļi ...
 DoliStoreDesc=DoliStore ir oficiālā mājaslapa Dolibarr ERP / CRM papildus moduļiem
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Tīmekļa vietnes pakalpojumu sniedzēji, jūs varat meklēt, lai atrastu jaunus moduļus ...
 URL=Saite
 BoxesAvailable=Pieejamie logi
@@ -444,7 +447,7 @@ Module55Desc=Svītrkodu vadība
 Module56Name=Telefonija
 Module56Desc=Telefonijas integrācija
 Module57Name=Regulārie maksājumi
-Module57Desc=Regulārie maksājumi un atsaukšana vadība
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=NospiedLaiSavienotos
 Module58Desc=Integrācija ar ClickToDial sistēmas (zvaigznīte, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS barotne
 Module320Desc=Pievienot RSS plūsmu Dolibarr lapās
 Module330Name=Grāmatzīmes
 Module330Desc=Grāmatzīmju pārvaldība
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Vebkalendārs
 Module410Desc=Web kalendāra integrācija
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Sadaļas
 Module1780Desc=Kategoriju vadība (produktiem, piegādātājiem un klientiem)
 Module2000Name=WYSIWYG redaktors
 Module2000Desc=Ļauj rediģēt kādu teksta apgabalu, izmantojot uzlabotas redaktoru
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Plānotais uzdevumu pārvaldība
 Module2400Name=Darba kārtība
@@ -503,6 +508,8 @@ Module2500Name=Elektroniskā satura pārvaldība
 Module2500Desc=Saglabāt un nošārēt dokumentus
 Module2600Name=WEB pakalpojumi
 Module2600Desc=Ļautu Dolibarr tīmekļa pakalpojumu serveri
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Izmantot tiešsaistes Gravatar pakalpojumu (www.gravatar.com), lai parādītu fotogrāfijas lietotāju / dalībnieku (atrasts ar saviem e-pastiem). Nepieciešams interneta piekļuves
 Module2800Desc=FTP klients
@@ -517,7 +524,7 @@ Module6000Desc=Plūsmas vadība
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modulis piedāvā tiešsaistes maksājumu lapā, ar kredītkarti, ar Paybox
 Module50100Name=Tirdzniecības punkts
@@ -527,7 +534,7 @@ Module50200Desc=Modulis piedāvā tiešsaistes maksājumu lapā ar kredītkarti
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Drukāt ar Kausi IPP printeri.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Atvērta aptauja
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Malas
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Pasūtījumu veidi
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Kontu līknes
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Iestatījumi saglabāti
 BackToModuleList=Atpakaļ uz moduļu sarakstu
 BackToDictionaryList=Atpakaļ uz vārdnīcu sarakstu
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Pastāvīgā meklēšanas forma kreisajā izvēlnē
 DefaultLanguage=Noklusējuma izmantošanas valoda (valodas kods)
 EnableMultilangInterface=Iespējot daudzvalodu interfeisu
 EnableShowLogo=Rādīt logotipu kreisajā izvēlnē
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Jūsu sistēma ir veiksmīgi atjaunināta
 CompanyInfo=Uzņēmuma / nodibinājums informācija
 CompanyIds=Uzņēmuma / nodibinājums identitātes
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index ac398549ce7..f6a8e0897fd 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Pasākums piešķirts
 ActionsDoneBy=Pasākumi, ko veikuši
 ActionsForUser=Lietotāja notikumi
 ActionsForUsersGroup=Notikumi visiem grupas lietotājiem
+ActionAssignedTo=Event assigned to
 AllMyActions= Visi mani notikumi/uzdevumi
 AllActions= Visi notikumi/uzdevumi
 ViewList=Saraksta skats
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index 8c1e60218e2..51818210e66 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=no piegādātāja, izvēlēties piemērotu metodi pi
 TurnoverPerProductInCommitmentAccountingNotRelevant=Apgrozījums ziņojums par produktu, izmantojot <b>skaidras naudas uzskaites</b> režīmu nav nozīmes. Šis ziņojums ir pieejams tikai tad, ja izmanto <b>saderināšanās grāmatvedības</b> režīmu (skat. iestatīšanu grāmatvedības moduli).
 CalculationMode=Aprēķinu režīms
 AccountancyJournal=Kontu žurnāls
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/lv_LV/contracts.lang b/htdocs/langs/lv_LV/contracts.lang
index 9ba92ea73c9..47372bde2af 100644
--- a/htdocs/langs/lv_LV/contracts.lang
+++ b/htdocs/langs/lv_LV/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Saraksts darbojas līguma līniju
 ListOfRunningServices=Saraksts ar aktīvajiem pakalpojumiem
 NotActivatedServices=Neaktīvais pakalpojumi (starp apstiprinātiem līgumiem)
 BoardNotActivatedServices=Pakalpojumi aktivizēt starp apstiprinātiem līgumiem
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Pēdējais %s aktivizētais pakalpojums
 LastModifiedServices=Pēdējais %s labotais pakalpojums
 EditServiceLine=Edit servisa līnija
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Saraksts pakalpojumu beigsies
 NoteListOfYourExpiredServices=Šajā sarakstā ir tikai pakalpojumu līgumi par trešo pušu jums ir saistītas kā pārdošanas pārstāvis.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Tirdzniecības pārstāvis, parakstot līgumu,
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index c0a9555b153..257f6ce5e0e 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Piegādātāja kods nepieciešams
 ErrorSupplierCodeAlreadyUsed=Piegādātāja kods jau tiek izmantots
 ErrorBadParameters=Slikts parametrs
 ErrorBadValueForParameter=Nepareiza vērtība '%s' parametrs nepareizs '%s'
-ErrorBadImageFormat=Attēla fails nav pareizā formātā
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Vērtībai '%s' ir nepareizs datuma formāts
 ErrorWrongDate=Datums nav pareizs
 ErrorFailedToWriteInDir=Neizdevās ierakstīt direktorijā %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Lietotājs ar pieteikšanās <b>%s</b> nevar atrast.
 ErrorLoginHasNoEmail=Šim lietotājam nav e-pasta adrese. Process atcelts.
 ErrorBadValueForCode=Nepareiza drošības koda vērtība. Mēģiniet vēlreiz ar jauno vērtību ...
 ErrorBothFieldCantBeNegative=Lauki %s un %s nevar būt abi negatīvi
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Lietotāja konts <b>%s</b> izmantot, lai veiktu web serveri nav atļauja, kas
 ErrorNoActivatedBarcode=Nav svītrkodu veids aktivizēts
 ErrUnzipFails=Neizdevās atarhivēt %s izmantojot ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Obligātie uzstādīšanas parametri vēl nav definētas
@@ -156,4 +175,4 @@ WarningClickToDialUserSetupNotComplete=Iestatīšana ClickToDial informāciju pa
 WarningNotRelevant=Nozīmes operācija šajā datu
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Iespēja bloķēta kad iestatījumi ir optimizēti aklai persionai vai teksta pārlūkprogrammām
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningTooManyDataPleaseUseMoreFilters=Par daudz datu, lūdzu izmantojiet vairāk filtru 
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index 4038bc8ad6b..027c6024f71 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Vēlu
 SubscriptionNotReceivedShort=Nekad nav saņemts
 ListOfSubscriptions=Saraksts abonementu
 SendCardByMail=Nosūtīt kartiņu pa e-pastu
-AddMember=Pievienot dalībnieku
+AddMember=Create member
 NoTypeDefinedGoToSetup=Neviens dalībnieka veids nav definēts. Iet uz izvēlnes "Dalībnieku veidi"
 NewMemberType=Jauns dalībnieka veids
 WelcomeEMail=Welcome e-pastu
@@ -125,7 +125,7 @@ Date=Datums
 DateAndTime=Datums un laiks
 PublicMemberCard=Dalībnieku publiskā kartiņa
 MemberNotOrNoMoreExpectedToSubscribe=Dalībvalsts nevar vai vairs sagaidāms, ka parakstīties
-AddSubscription=Pievienot abonementu
+AddSubscription=Create subscription
 ShowSubscription=Rādīt abonementu
 MemberModifiedInDolibarr=Dalībvalsts grozīts Dolibarr
 SendAnEMailToMember=Sūtīt informāciju e-pastu loceklim
@@ -203,3 +203,4 @@ MembersByNature=Dalībnieki pēc būtības
 VATToUseForSubscriptions=PVN likme izmantot abonementu
 NoVatOnSubscription=Nav TVA par abonēšanu
 MEMBER_PAYONLINE_SENDEMAIL=E-pastu, lai brīdinātu, kad Dolibarr saņem apstiprinājumu par apstiprinātu maksājuma parakstīšanas
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/lv_LV/printipp.lang b/htdocs/langs/lv_LV/printipp.lang
index 4a1fa4d4ed3..835e6827f12 100644
--- a/htdocs/langs/lv_LV/printipp.lang
+++ b/htdocs/langs/lv_LV/printipp.lang
@@ -1,18 +1,14 @@
-/*
- * Language code: lv_LV
- * Automatic generated via autotranslator.php tool
- * Generation date 2013-11-09 12:40:15
- */
-
-
-// START - Lines generated via autotranslator.php tool (2013-11-09 12:40:15).
-// Reference language: en_US -> lv_LV
-PrintIPPSetup=Setup moduļa Direct Print
-PrintIPPDesc=Ce modulis Përmet d'Ajouter ANO Bouton d'iespaids tieši des dokumenti vers votre imprimante. Il requiert ANO systeme Linux équipé de Kausi.
-PRINTIPP_ENABLED=Rādīt Picto &quot;Direct print&quot; par dokumentu saraksts
-PRINTIPP_HOST=Drukas serveris
-PRINTIPP_PORT=Osta
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Parole
-NoPrinterFound=Nav printeri atrasts (pārbaudiet savu tases etup)
-// STOP - Lines generated via autotranslator.php tool (2013-11-09 12:49:40).
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index b575e82a1c9..d81b413812e 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ja produkts ir pakalpojums ir ierobežots darbības laiks
 MultiPricesAbility=Vairāku pakāpju cenas precēm / pakalpojumiem
 MultiPricesNumPrices=Cenu skaits
 MultiPriceLevelsName=Cenu sadaļa
-AssociatedProductsAbility=Aktivizētu virtuālo produktu funkciju
-AssociatedProducts=Virtuāls produkts
-AssociatedProductsNumber=Produktu skaits kas veido šo virtuālo produktu
-ParentProductsNumber=Skaits mātes virtuālā produkta
-IfZeroItIsNotAVirtualProduct=Ja 0, šis produkts ir ne virtuālā produkts
-IfZeroItIsNotUsedByVirtualProduct=Ja 0, šis produkts netiek izmantots ar jebkuru virtuālo produkta
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Asociēt
 Translation=Tulkojums
 KeywordFilter=Atslēgvārda filtru
@@ -132,7 +132,7 @@ AddDel=Pievienot / Dzēst
 Quantity=Daudzums
 NoMatchFound=Nekas netika atrasts
 ProductAssociationList=Saraksts saistītu produktu / pakalpojumu: nosaukums, produkta / pakalpojuma (daudzums ietekmē)
-ProductParentList=Saraksts virtuālo produktu / pakalpojumu ar šo produktu kā sastāvdaļu
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Viens no izvēlētā produkta mātes ar pašreizējo produktu
 DeleteProduct=Dzēst produktu / pakalpojumu
 ConfirmDeleteProduct=Vai tiešām vēlaties dzēst šo produktu / pakalpojumu?
@@ -179,7 +179,7 @@ CloneProduct=Klonēt produktu vai pakalpojumu
 ConfirmCloneProduct=Vai jūs tiešām vēlaties klonēt šo produktu vai pakalpojumu <b>%s?</b>
 CloneContentProduct=Klons visus galvenos informations par produktu / pakalpojumu
 ClonePricesProduct=Klons galvenos informations un cenas
-CloneCompositionProduct=Klonēt virtuālo preci / pakalpojumu
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Šis produkts tiek izmantots
 NewRefForClone=Ref. jaunu produktu / pakalpojumu
 CustomerPrices=Klientu cenas
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimālā cena nevar būt zemāka par %s
 MinimumRecommendedPrice=Minimālā rekomendējamā cena : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 6e826e0f93d..63affb41543 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Šo viedokli iepazīstina visus projektus un uzdevumus (jūsu lietotā
 Myprojects=Mani projekti
 ProjectsArea=Projektu sadaļa
 NewProject=Jauns projekts
-AddProject=Pievienot projektu
+AddProject=Izveidot projektu
 DeleteAProject=Dzēst projektu
 DeleteATask=Izdzēst uzdevumu
 ConfirmDeleteAProject=Vai tiešām vēlaties dzēst šo projektu?
@@ -36,6 +36,8 @@ TaskTimeSpent=Pavadītais laiks veicot uzdevumus
 TaskTimeUser=Lietotājs
 TaskTimeNote=Piezīme
 TaskTimeDate=Datums
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Jauns pavadītais laiks
 MyTimeSpent=Mans pavadīts laiks
 MyTasks=Mani uzdevumi
@@ -45,7 +47,7 @@ TaskDateStart=Uzdevuma sākuma datums
 TaskDateEnd=Uzdevuma beigu datums
 TaskDescription=Uzdevuma apraksts
 NewTask=Jauns uzdevums
-AddTask=Pievienot uzdevumu
+AddTask=Izveidot uzdevumu
 AddDuration=Pievienot ilgumu
 Activity=Aktivitāte
 Activities=Uzdevumi/aktivitātes
diff --git a/htdocs/langs/lv_LV/resource.lang b/htdocs/langs/lv_LV/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/lv_LV/resource.lang
+++ b/htdocs/langs/lv_LV/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index df6d59bd321..5341718719f 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Kredīts
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Rādīt izņemšana
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tomēr, ja rēķins satur vismaz vienu maksājums, kas nav apstrādāts, to nevar noteikt kā apmaksātu.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Izstāšanās fails
 SetToStatusSent=Nomainīt uz statusu "Fails nosūtīts"
 ThisWillAlsoAddPaymentOnInvoice=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Maksājumu pastāvīgā rīkojuma %s banka
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index b5d84a0aca7..f12efa61626 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang
index 1ed4e637d14..a24c678a2e5 100644
--- a/htdocs/langs/mk_MK/agenda.lang
+++ b/htdocs/langs/mk_MK/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/mk_MK/contracts.lang b/htdocs/langs/mk_MK/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/mk_MK/contracts.lang
+++ b/htdocs/langs/mk_MK/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index 9246a04ced9..40bca8e85fb 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/mk_MK/resource.lang b/htdocs/langs/mk_MK/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/mk_MK/resource.lang
+++ b/htdocs/langs/mk_MK/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/mk_MK/withdrawals.lang
+++ b/htdocs/langs/mk_MK/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index c84d2eba95a..af6294c16fe 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Bruk autofullfør-felt for å velge tredjepart, i stede
 ActivityStateToSelectCompany= Legg til en filter alternativ for å vise / skjule thirdparties som i dag er i aktivitet eller har opphørt det
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Bruk autofullfør-felt for å velge kontakt (i stedet for å bruke listeboks).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Søkefiltrene alternativer
 NumberOfKeyToSearch=NBR tegn til å utløse søk: %s
 ViewFullDateActions=Vis fulle datoer i tredje ark
@@ -208,6 +210,7 @@ ModulesJobDesc=Forretningsmoduler gir et enkelt forhåndsinnstilt oppsett av Dol
 ModulesMarketPlaceDesc=Du kan finne flere moduler for å laste ned på eksterne nettsider på Internett ...
 ModulesMarketPlaces=Flere moduler ...
 DoliStoreDesc=DoliStore, den offisielle markedsplassen for Dolibarr ERP / CRM eksterne moduler
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Webområde leverandører du kan søke å finne flere moduler ...
 URL=Link
 BoxesAvailable=Tilgjengelige bokser
@@ -444,7 +447,7 @@ Module55Desc=Behandling av strekkoder
 Module56Name=Telefoni
 Module56Desc=Telefoniintegrasjon
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawals' management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integrasjon
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS nyhetsstrøm
 Module320Desc=Legg til RSS nyhetsstrøm på Dolibarrsider
 Module330Name=Bookmerker
 Module330Desc=Behandling av bokmerker
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webkalender
 Module410Desc=Intergrasjon med webkalender
 Module500Name=Spesielle utgifter (skatt, sosiale bidrag, utbytte)
@@ -495,6 +498,8 @@ Module1780Name=Kategorier
 Module1780Desc=Behandling av kategorier (varer, leverandører og kunder)
 Module2000Name=Fckeditor
 Module2000Desc=WYSIWYG Editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Behandle planlagte oppgaver
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Lagre og dele dokumenter
 Module2600Name=SOAP baserte WebServices
 Module2600Desc=Aktiver Dolibarr webtjenester server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Bruke elektronisk Gravatar tjeneste (www.gravatar.com) for å vise bilde av brukere / medlemmer (funnet med e-post). Trenger du en Internett-tilgang
 Module2800Desc=FTP-klient
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PAYBOX
 Module50000Desc=Modul å tilby en online betaling side med kredittkort med PAYBOX
 Module50100Name=Kassaapparat
@@ -527,7 +534,7 @@ Module50200Desc=Modul å tilby en online betaling side med kredittkort med Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Marginer
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordremetoder
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Innstillinger lagret
 BackToModuleList=Tilbake til moduloversikt
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent søkeskjema i venstre meny
 DefaultLanguage=Ønsket standardspråk (språkkode)
 EnableMultilangInterface=Aktiver flerspråklig grensesnitt
 EnableShowLogo=Vis logo på venstre meny
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Systemet ditt er oppdatert!
 CompanyInfo=Firma/organisasjonsinformasjon
 CompanyIds=Firma/organisasjons IDer
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index 5f9c624b305..b277a015704 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Handlinger relatert til
 ActionsDoneBy=Handlinger utført av
 ActionsForUser=Hendelser for brukere
 ActionsForUsersGroup=Hendelser for alle brukerene i gruppen
+ActionAssignedTo=Event assigned to
 AllMyActions= Alle mine handlinger/oppgaver
 AllActions= Alle handlinger/oppgaver
 ViewList=Vis liste
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 98d6fdd4f5f..a2c7df48a4d 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang
index 65aa8892fc3..e8fe7fe9637 100644
--- a/htdocs/langs/nb_NO/contracts.lang
+++ b/htdocs/langs/nb_NO/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Oversikt over løpende kontraktslinjer
 ListOfRunningServices=Overikt over løpende tjenster
 NotActivatedServices=Ikke aktiverte tjenester (blant godkjente kontrakter)
 BoardNotActivatedServices=Tjenester til aktivering blant godkjente kontrakter
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Siste %s aktiverte tjenester
 LastModifiedServices=Siste %s endrede tjenester
 EditServiceLine=Rediger tjenestelinje
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Liste over utløpende tjenester
 NoteListOfYourExpiredServices=Denne listen inneholder kun tjenester av kontrakter for tredjeparter du er koblet til som salgsrepresentant.
 StandardContractsTemplate=Standard kontraktskjema
 ContactNameAndSignature=For %s, navn og signatur:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Salgsrepresentant som signerer kontrakten
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 1e993ae8706..5b4f25054b9 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Leverandørkode påkrevet
 ErrorSupplierCodeAlreadyUsed=Leverandørkode allerede brukt
 ErrorBadParameters=Ugyldige parametere
 ErrorBadValueForParameter=Feil verdi &quot;%s 'for parameter feil' Choice %s 'Choice
-ErrorBadImageFormat=Bildet filen har ikke et støttet format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Verdien '%s' har feil dato format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Kan ike skrive til mappen %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Bruker med logg <b>%s</b> kunne ikke bli funnet.
 ErrorLoginHasNoEmail=Denne brukeren har ingen e-postadresse. Behandle avbrutt.
 ErrorBadValueForCode=Bad verdi for sikkerhetskode. Prøv igjen med ny verdi ...
 ErrorBothFieldCantBeNegative=Fields %s og %s kan ikke være både negativt
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Brukerkonto <b>%s</b> brukes til å utføre web-server har ikke tillatelse til at
 ErrorNoActivatedBarcode=Ingen strekkodetype aktivert
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 1d4c388b824..ad0d955a3cf 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Late
 SubscriptionNotReceivedShort=Fikk aldri
 ListOfSubscriptions=Liste av abonnementer
 SendCardByMail=Send kortet via e-post
-AddMember=Legg medlem
+AddMember=Create member
 NoTypeDefinedGoToSetup=Ingen medlemmer typer definert. Gå til setup - Medlemmer typer
 NewMemberType=Nytt medlem type
 WelcomeEMail=Velkommen e-post
@@ -125,7 +125,7 @@ Date=Dato
 DateAndTime=Dato og tid
 PublicMemberCard=Medlem offentlige kort
 MemberNotOrNoMoreExpectedToSubscribe=Medlem ikke eller ikke mer forventes å abonnere
-AddSubscription=Legg abonnement
+AddSubscription=Create subscription
 ShowSubscription=Vis abonnement
 MemberModifiedInDolibarr=Medlem endret i Dolibarr
 SendAnEMailToMember=Send informasjon epost til medlem
@@ -203,3 +203,4 @@ MembersByNature=Medlemmer av natur
 VATToUseForSubscriptions=Mva-sats som skal brukes for abonnementer
 NoVatOnSubscription=Ingen TVA for abonnementer
 MEMBER_PAYONLINE_SENDEMAIL=Send e-post når Dolibarr mottar en bekreftelse på en validert betaling for abonnement
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 0abab5ff6f6..6590ee183f2 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Hvis varen er en tjeneste med begrenset varighet:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Prisnummer
 MultiPriceLevelsName=Priskategorier
-AssociatedProductsAbility=Aktiver tilknyttede varer
-AssociatedProducts=Tilknyttede varer
-AssociatedProductsNumber=Antall tilknyttede varer
-ParentProductsNumber=Antall foreldre produkt
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Tilknytninger
 Translation=Oversettelse
 KeywordFilter=Nøkkelordfilter
@@ -132,7 +132,7 @@ AddDel=Ny/slett
 Quantity=Mengde
 NoMatchFound=Ingen treff
 ProductAssociationList=Overikt over tilknyttede varer/tjenester: navn på vare/tjeneste (mengdepåvirket)
-ProductParentList=Liste over produkter / tjenester med dette produktet som en komponent
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=En av de valgte varene er foreldre til gjeldende vare
 DeleteProduct=Slett vare/tjeneste
 ConfirmDeleteProduct=Er du sikker på at du vil slette valgte vare/tjeneste?
@@ -155,11 +155,11 @@ QtyMin=Minimum Qty
 PriceQty=Pris for dette kvantum
 PriceQtyMin=Price for this min. qty (w/o discount)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
-DiscountQtyMin=Default discount for qty
+DiscountQtyMin=Standard
 NoPriceDefinedForThisSupplier=Ingen pris/mengde definert for denne leverandør/varekombinasjonen
 NoSupplierPriceDefinedForThisProduct=Ingen leverandørpris/mengde definert for varen
 RecordedProducts=Registrerte varer
-RecordedServices=Services recorded
+RecordedServices=Registrerte tjenester
 RecordedProductsAndServices=Registrete varer/tjenester
 PredefinedProductsToSell=Predefined products to sell
 PredefinedServicesToSell=Predefined services to sell
@@ -179,7 +179,7 @@ CloneProduct=Klon produkt eller tjeneste
 ConfirmCloneProduct=Er du sikker på at du vil klone produktet eller tjenesten <b>%s?</b>
 CloneContentProduct=Klon alle de viktigste informasjoner av produkt / tjeneste
 ClonePricesProduct=Klone viktigste informasjon og priser
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Dette produktet brukes
 NewRefForClone=Ref. av nye produkt / tjeneste
 CustomerPrices=Kunder priser
@@ -191,9 +191,9 @@ HiddenIntoCombo=Gjemt i enkelte lister
 Nature=Natur
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
-AddThisProductCard=Create product card
+AddThisProductCard=Opprett produktkort
 HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist.
-AddThisServiceCard=Create service card
+AddThisServiceCard=Opprett tjenestekort
 HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist.
 CurrentProductPrice=Current price
 AlwaysUseNewPrice=Always use current price of product/service
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 62e4b1ce453..7b9132b42fb 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Denne visningen presenterer alle prosjekter og oppgaver (dine brukerti
 Myprojects=Mine prosjekter
 ProjectsArea=Prosjektområde
 NewProject=Nytt prosjekt
-AddProject=Legg til prosjekt
+AddProject=Create project
 DeleteAProject=Slett et prosjekt
 DeleteATask=Slette en oppgave
 ConfirmDeleteAProject=Er du sikker på at du vil slette dette prosjektet?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Ny tid brukt
 MyTimeSpent=Mitt tidsforbruk
 MyTasks=Mine oppgaver
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Ny oppgave
-AddTask=Legg til oppgave
+AddTask=Create task
 AddDuration=Legg til varighet
 Activity=Aktivitet
 Activities=Oppgaver / aktiviteter
diff --git a/htdocs/langs/nb_NO/resource.lang b/htdocs/langs/nb_NO/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/nb_NO/resource.lang
+++ b/htdocs/langs/nb_NO/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index 92614725008..5de436e0476 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Kreditt på
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Vis Angrerett
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Men hvis faktura har minst én tilbaketrekning betaling ennå ikke behandlet, vil det ikke bli satt som utbetales å tillate å administrere uttak før.
-DoStandingOrdersBeforePayments=Dette faner lar deg for å be om en stående ordre. Når det blir ferdig, kan du skrive inn betaling for å lukke fakturaen.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Betaling av fast oppdrag %s av banken
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 2594d6c0ff3..91728e6f234 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Gebruik automatisch aanvullende velden om relaties te k
 ActivityStateToSelectCompany= Voeg een filter optie voor het tonen / verbergen thirdparties die momenteel in de activiteiten of niet langer het
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Gebruik automatisch aanvullende velden om contacten te kiezen ipv een lijst.
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Zoekfilters opties
 NumberOfKeyToSearch=Aantal karakters om een zoekopdracht te initiëren: %s
 ViewFullDateActions=Toon volledige data-acties in het derden 'sheet'
@@ -208,6 +210,7 @@ ModulesJobDesc=Bedrijfsmodules zorgen voor een eenvoudige voorgeconfigureerde in
 ModulesMarketPlaceDesc=U kunt meer downloadbare modules vinden op externe websites op het internet.
 ModulesMarketPlaces=Meer modules
 DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Websiteaanbieders waarop u naar meer modules kunt zoeken
 URL=Link
 BoxesAvailable=Beschikbare vakken
@@ -444,7 +447,7 @@ Module55Desc=Streepjescodesbeheer
 Module56Name=Telefonie
 Module56Desc=Telefoniebeheer
 Module57Name=Tekenen
-Module57Desc=Beheer van heffingen en bankonttrekkingen
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integratie van een 'ClickToDial' systeem (Asterisk, etc)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS-feeds
 Module320Desc=Voeg een RSS feed toe in de informatieschermen van Dolibarr
 Module330Name=Weblinks (Favouriete internetpagina's in het menu weergeven)
 Module330Desc=weblinkbeheer
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webkalender
 Module410Desc=Integratie van een webkalender
 Module500Name=Bijzondere uitgaven (BTW, sociale lasten, dividenden)
@@ -495,6 +498,8 @@ Module1780Name=Categorieën
 Module1780Desc=Categoriebeheer (producten, leveranciers en afnemers)
 Module2000Name=Fckeditor
 Module2000Desc=Een WYSIWYG editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Beheer taakplanning
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Opslaan en delen van documenten
 Module2600Name=Webdiensten
 Module2600Desc=Activeer de Dolibarr webdienstenserver
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Gebruik de online dienst 'Gravatar' (www.gravatar.com) voor het posten van afbeeldingen van gebruikers / leden (gevonden door hun e-mails). Internet toegang vereist.
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow beheer
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Module om een ​​online betaling pagina te bieden door creditcard met Paybox
 Module50100Name=Verkooppunt
@@ -527,7 +534,7 @@ Module50200Desc=Module om een ​​online betaling pagina te bieden per credit
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module om online polls (zoals Doodle, Studs, Rdvz, ...) te maken
 Module59000Name=Marges
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Bestel methodes
 DictionarySource=Oorsprong van offertes / bestellingen
 DictionaryAccountancyplan=Rekeningschema
 DictionaryAccountancysystem=Modellen voor rekeningschema
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Instellingen opgeslagen
 BackToModuleList=Terug naar moduleoverzicht
 BackToDictionaryList=Terug naar de woordenboeken lijst
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent zoekformulier in linker menu
 DefaultLanguage=Standaard te gebruiken taal (taal-code)
 EnableMultilangInterface=Inschakelen meertalige interface
 EnableShowLogo=Toon logo in het linker menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Uw systeem is bijgewerkt
 CompanyInfo=Bedrijf / stichting informatie
 CompanyIds=Bedrijf / stichting identiteiten
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index 8c50ac2720c..7ba26ccd595 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -6,7 +6,7 @@ Agenda=Agenda
 Agendas=Agenda's
 Calendar=Kalender
 Calendars=Kalenders
-LocalAgenda=Internal calendar
+LocalAgenda=Interne kalender
 ActionsOwnedBy=Event owned by
 AffectedTo=Geaffecteerden
 DoneBy=Gedaan door
@@ -23,12 +23,13 @@ MenuToDoActions=Alle openstaande acties
 MenuDoneActions=Alle beëindigde acties
 MenuToDoMyActions=Mijn openstaande acties
 MenuDoneMyActions=Mijn beëindigde acties
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=Lijst van evenement (interne kalender)
 ActionsAskedBy=Acties geregistreerd door
 ActionsToDoBy=Acties toegewezen aan
 ActionsDoneBy=Acties gedaan door
 ActionsForUser=Evenementen voor gebruiker
 ActionsForUsersGroup=Evenementen voor alle gebruikers van de groep
+ActionAssignedTo=Event assigned to
 AllMyActions= Al mijn acties / taken
 AllActions= Alle acties / taken
 ViewList=Bekijk de lijst
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index 0ff141ea1ed..1819c47be8f 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -109,4 +109,4 @@ CategoriesSetup=Opzetten categorieën
 CategorieRecursiv=Automatisch linken met bovenliggende categorie
 CategorieRecursivHelp=Indien geactiveerd zal het product ook gelinkt worden met de bovenliggende categorie wanneer een subcategorie toegevoegd wordt.
 AddProductServiceIntoCategory=Voeg het volgende product/dienst toe
-ShowCategory=Show category
+ShowCategory=Laat categorie zien
diff --git a/htdocs/langs/nl_NL/commercial.lang b/htdocs/langs/nl_NL/commercial.lang
index 37631e3b272..807bdccd23b 100644
--- a/htdocs/langs/nl_NL/commercial.lang
+++ b/htdocs/langs/nl_NL/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
 Prospects=Prospecten
 DeleteAction=Verwijder een actie
 NewAction=Nieuwe actie
-AddAction=Toevoegen actie
-AddAnAction=Voeg een actie toe
-AddActionRendezVous=Voeg een vergadering toe
+AddAction=Creëer gebeurtenis/taak
+AddAnAction=Creëer een gebeurtenis/taak
+AddActionRendezVous=Creëer een afspraak
 Rendez-Vous=Vergadering
 ConfirmDeleteAction=Weet u zeker dat u deze actie wilt verwijderen?
 CardAction=Actiedetails
@@ -44,8 +44,8 @@ DoneActions=Voltooide acties
 DoneActionsFor=Voltooide acties voor %s
 ToDoActions=Onvolledige acties
 ToDoActionsFor=Onvolledige acties voor %s
-SendPropalRef=Stuur offerte %s
-SendOrderRef=Stuur Opdracht %s
+SendPropalRef=Indienen van commerciëel voorstel %s
+SendOrderRef=Indienen van de order %s
 StatusNotApplicable=Niet van toepassing
 StatusActionToDo=Te doen
 StatusActionDone=Gedaan
@@ -62,7 +62,7 @@ LastProspectContactDone=Contact opgevolgd
 DateActionPlanned=Datum actie gepland voor
 DateActionDone=Datum actie uitgevoerd
 ActionAskedBy=Actie gevraagd door
-ActionAffectedTo=Toewijzen aan
+ActionAffectedTo=Gebeurtenis is eigendom van
 ActionDoneBy=Actie gedaan door
 ActionUserAsk=Geregistreerd door
 ErrorStatusCantBeZeroIfStarted=Als veld '<b>Datum uitgevoerd</b>' is gevuld, is de actie gestart (of afgelopen), dus veld '<b>Status</b>' kan niet 0%% worden.
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 66c85f33f0e..2a093d76225 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=volgens de leverancier, kiest u geschikte methode om
 TurnoverPerProductInCommitmentAccountingNotRelevant=Omzet rapport per product, bij gebruik van een <b>kas boukhoudings-modus</b> is dit niet relevant. Dit rapport is alleen beschikbaar bij gebruik van <b>betrokkenheid accountancy-modus</b> (zie setup van boukhoud module).
 CalculationMode=Berekeningswijze
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/nl_NL/contracts.lang b/htdocs/langs/nl_NL/contracts.lang
index 5178ce872a3..80c0173ed8d 100644
--- a/htdocs/langs/nl_NL/contracts.lang
+++ b/htdocs/langs/nl_NL/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lijst van de lopende contractregels
 ListOfRunningServices=Lijst van lppende diensten
 NotActivatedServices=Inactieve diensten (onder gevalideerde contracten)
 BoardNotActivatedServices=Diensten te activeren onder gevalideerde contracten
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Laatste %s geactiveerd diensten
 LastModifiedServices=Laatste %s bewerkte diensten
 EditServiceLine=Bewerk dienstenregel
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Lijst van Diensten te vervallen
 NoteListOfYourExpiredServices=Deze lijst bevat alleen de diensten van contracten voor relatiesdie zijn gekoppeld aan een vertegenwoordiger.
 StandardContractsTemplate=Standaard contracten sjabloon
 ContactNameAndSignature=Voor %s, naam en handtekening:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Vertegenwoordiger ondertekening contract
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index 2f63daa41a1..e12bceca15f 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -1,63 +1,63 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 About = Over
-CronAbout = About Cron
-CronAboutPage = Cron about page
+CronAbout = Over Cron
+CronAboutPage = Over Cron pagina
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Lees geplande taak
+Permission23102 = Maak/wijzig geplande taak
+Permission23103 = Verwijder geplande taak
+Permission23104 = Voer geplande taak uit
 # Admin
-CronSetup= Scheduled job management setup
+CronSetup= Beheer taakplanning
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
-FileToLaunchCronJobs=Command line to launch cron jobs
-CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+FileToLaunchCronJobs=Commando regel om cron jobs uit te voeren
+CronExplainHowToRunUnix=In een Unix omgeving dien je de crontab te gebruiken om commando's geplanned uit te voeren
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
 # Menu
-CronJobs=Scheduled jobs
-CronListActive=List of active/scheduled jobs
+CronJobs=Geplande taken
+CronListActive=Lijst van active/geplande taken
 CronListInactive=List of disabled jobs
 # Page list
 CronDateLastRun=Last run
 CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
-CronCommand=Command
+CronCommand=Commando
 CronList=Jobs list
 CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
+CronConfirmDelete= Weet je zker dat je deze cron taak wilt verwijderen?
+CronExecute=Voer taak uit
+CronConfirmExecute= Weet je zeker dat je deze taak nu uit wilt voeren
 CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
-CronTask=Job
+CronWaitingJobs=Wachtende taken
+CronTask=Taak
 CronNone= Geen
 CronDtStart=Begindatum
 CronDtEnd=Einddatum
-CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronDtNextLaunch=Volgende uitvoering
+CronDtLastLaunch=Laatste uitvoering
+CronFrequency=Frequentie
+CronClass=Klasse
 CronMethod=Methode
 CronModule=Module
-CronAction=Action
+CronAction=Aktie
 CronStatus=Status
 CronStatusActive=Ingeschakeld
 CronStatusInactive=Uitgeschakeld
-CronNoJobs=No jobs registered
+CronNoJobs=Geen taken opgenomen
 CronPriority=Prioriteit
 CronLabel=Beschrijving
 CronNbRun=Nb. launch
-CronEach=Every
-JobFinished=Job launched and finished
+CronEach=Elke
+JobFinished=Taak gestart en be-eindigd
 #Page card
-CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronAdd= Taak toevoegen
+CronHourStart= Start uur en datum van de taak
+CronEvery= Taak uitvoeren elke
+CronObject= Instantie/Object om te creeren
 CronArgs=Instellingen
 CronSaveSucess=Save succesfully
 CronNote=Reactie
@@ -76,11 +76,11 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 # Info
-CronInfoPage=Information
+CronInfoPage=Informatie
 # Common
-CronType=Task type
-CronType_method=Call method of a Dolibarr Class
-CronType_command=Shell command
+CronType=Taak type
+CronType_method=Aanroep methode van Dolibarr Class
+CronType_command=Shell commando
 CronMenu=Cron
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Kan klasse %s of object %s niet laden
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index f56a053b476..6f146184c81 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Leverancierscode vereist
 ErrorSupplierCodeAlreadyUsed=Leverancierscode al gebruikt
 ErrorBadParameters=Verkeerde parameters
 ErrorBadValueForParameter=Verkeerde waarde %s voor parameter incorrect %s
-ErrorBadImageFormat=Image-bestand heeft niet een ondersteund formaat
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Waarde %s heeft verkeerde datum formaat
 ErrorWrongDate=Datum is niet correct!
 ErrorFailedToWriteInDir=Schrijven in de map %s mislukt
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Gebruiker met gebruikersnaam <b>%s</b> kon niet worden g
 ErrorLoginHasNoEmail=Deze gebruiker heeft geen e-mail adres. Proces afgebroken.
 ErrorBadValueForCode=Onjuist waardetypen voor code. Probeer het opnieuw met een nieuwe waarde
 ErrorBothFieldCantBeNegative=Velden %s %s en kan niet beide negatief
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> gebruikt om web-server uit te voeren heeft geen toestemming voor die
 ErrorNoActivatedBarcode=Geen geactiveerde barcode soort
 ErrUnzipFails=uitpakken %s mislukt met ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Fout, er sommige leveringen gekoppeld met deze verzending. Schrapping geweigerd.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Verplichte setup parameters zijn nog niet gedefinieerd
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index 2e424ae3638..3e29b8dd217 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Laat
 SubscriptionNotReceivedShort=Nooit ontvangen
 ListOfSubscriptions=Abonnementenlijst
 SendCardByMail=Stuur kaart per e-mail
-AddMember=Lid toevoegen
+AddMember=Create member
 NoTypeDefinedGoToSetup=Geen lidtypes ingesteld. Ga naar Home->Setup->Ledentypes
 NewMemberType=Nieuw lidtype
 WelcomeEMail=Welkomst e-mail
@@ -125,7 +125,7 @@ Date=Datum
 DateAndTime=Datum en tijd
 PublicMemberCard=Publieke lidmaatschapskaart
 MemberNotOrNoMoreExpectedToSubscribe=Lid niet geabonneerd of niet langer verwacht te abonneren
-AddSubscription=Abonnement toevoegen
+AddSubscription=Create subscription
 ShowSubscription=Toon abonnement
 MemberModifiedInDolibarr=Lid gewijzigd in Dolibarr
 SendAnEMailToMember=Stuur een informatieve e-mail naar lid
@@ -203,3 +203,4 @@ MembersByNature=Leden volgens aard
 VATToUseForSubscriptions=BTW tarief voor inschrijvingen
 NoVatOnSubscription=Geen BTW bij inschrijving
 MEMBER_PAYONLINE_SENDEMAIL=E-mail om te verwittigen dat Dolibarr een bericht ontvangen heeft voor een bevestigde betaling van een inschrijving
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index 56a94002352..a1af668f2a6 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Afnemersopdrachtenoverzicht
-SuppliersOrdersArea=Leveranciersopdrachtenoverzicht
+OrdersArea=Klantenorders overzicht
+SuppliersOrdersArea=Leverancierorders overzicht
 OrderCard=Opdrachtenkaart
 OrderId=Ordernr
-Order=Opdracht
-Orders=Opdrachten
-OrderLine=Opdrachtregel
+Order=Order
+Orders=Orders
+OrderLine=Orderregel
 OrderFollow=Opvolging
 OrderDate=Opdrachtdatum
 OrderToProcess=Te verwerken opdracht
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 64c7b084a83..0902653a39e 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Als product een dienst is met een beperkte houdbaarheid:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Aantal prijzen
 MultiPriceLevelsName=Prijscategorieën
-AssociatedProductsAbility=Activeer de onderliggende producten
-AssociatedProducts=Onderliggende producten
-AssociatedProductsNumber=Aantal producten waaruit dit product bestaat
-ParentProductsNumber=Aantal ouder product
-IfZeroItIsNotAVirtualProduct=Bij 0 is dit geen virtueel product
-IfZeroItIsNotUsedByVirtualProduct=Bij 0 is dit product niet in gebruik voor een virtueel product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associatie
 Translation=Vertaling
 KeywordFilter=Trefwoord filter
@@ -132,7 +132,7 @@ AddDel=Toevoegen / verwijderen
 Quantity=Hoeveelheid
 NoMatchFound=Geen resultaten gevonden
 ProductAssociationList=Lijst van gerelateerde producten / diensten: naam van het product / de dienst (hoeveelheid geaffecteerd)
-ProductParentList=Lijst van producten / diensten met dit product als een onderdeel
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Een van de geselecteerde product is de ouder van het huidige product
 DeleteProduct=Verwijderen een product / dienst
 ConfirmDeleteProduct=Weet u zeker dat u dit product / deze dienst wilt verwijderen?
@@ -179,7 +179,7 @@ CloneProduct=Kopieer product of dienst
 ConfirmCloneProduct=Weet u zeker dat u het product of de dienst <b>%s</b> wilt klonen?
 CloneContentProduct=Kloon alle hoofdinformatie van het product / de dienst
 ClonePricesProduct=Kloon hoofdinformatie en prijzen
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Dit product wordt gebruikt
 NewRefForClone=Referentie naar nieuw produkt / dienst
 CustomerPrices=Consumentenprijs
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 3f6d56447eb..3485fa3faec 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Deze weergave toont alle projecten en taken (Uw gebruikersrechten staa
 Myprojects=Mijn projecten
 ProjectsArea=Projectenoverzicht
 NewProject=Nieuw project
-AddProject=Project toevoegen
+AddProject=Create project
 DeleteAProject=Project verwijderen
 DeleteATask=Taak verwijderen
 ConfirmDeleteAProject=Weet u zeker dat u dit project wilt verwijderen?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nieuwe bestede tijd
 MyTimeSpent=Mijn bestede tijd
 MyTasks=Mijn taken
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Nieuwe taak
-AddTask=Taak toevoegen
+AddTask=Create task
 AddDuration=Duur toevoegen
 Activity=Activiteit
 Activities=Taken / activiteiten
diff --git a/htdocs/langs/nl_NL/resource.lang b/htdocs/langs/nl_NL/resource.lang
index ead6e558dd8..2f498d486b8 100644
--- a/htdocs/langs/nl_NL/resource.lang
+++ b/htdocs/langs/nl_NL/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Bevestig verwijderen van deze resource
 RessourceSuccessfullyDeleted=Resource met succes verwijderd
 DictionaryResourceType=Type resources
 
-DictionaryEMailTemplates=E-mail modellen
-
 SelectResource=Kies resource
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index 152e287db16..191a09d27f3 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Crediteer op
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Toon intrekking
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Echter, als factuur is ten minste een terugtrekking betaling nog niet verwerkt, zal het niet worden ingesteld als betaald om tot terugtrekking te beheren voor.
-DoStandingOrdersBeforePayments=Deze tabs kunt u aanvraag voor een permanente opdracht. Zodra het zal worden afgewerkt, kunt u de betaling aan de factuur te sluiten.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Betaling van periodieke overboeking %s door de bank
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 359ed174113..9dd96d2668b 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Dodaj filtr opcję aby pokazać / ukryć thirdparties, które są aktualnie w działalności lub przestał go
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Opcje filtrów wyszukiwania
 NumberOfKeyToSearch=NBR znaków do uruchomienia wyszukiwania: %s
 ViewFullDateActions=Pokaż pełny terminy działań w trzecim arkusza
@@ -208,6 +210,7 @@ ModulesJobDesc=Biznes moduły zapewniają prostą konfigurację predefiniowanych
 ModulesMarketPlaceDesc=Mogą Państwo znaleźć więcej modułów do pobrania na zewnętrznych stron internetowych w internecie ...
 ModulesMarketPlaces=Więcej modułów ...
 DoliStoreDesc=DoliStore, urzędowy rynek dla Dolibarr ERP / CRM modułów zewnętrznych
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=dostawców sieci Web można szukać, aby znaleźć więcej modułów ...
 URL=Łącze
 BoxesAvailable=Pola dostępne
@@ -444,7 +447,7 @@ Module55Desc=Kody kreskowe zarządzania
 Module56Name=Telefonia
 Module56Desc=Telefonia integracji
 Module57Name=Zlecenia stałe
-Module57Desc=Zlecenia stałe i wycofań zarządzania
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integracji
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Dodaj kanał RSS Dolibarr wewnątrz ekranu stron
 Module330Name=Zakładki
 Module330Desc=Zakładki zarządzania
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integracji
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Kategorie
 Module1780Desc=Kategorie zarządzania (produktów, dostawców i klientów)
 Module2000Name=FCKeditor
 Module2000Desc=Edytor WYSIWYG
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Porządek obrad
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Zapisz i udostępniania dokumentów
 Module2600Name=WebServices
 Module2600Desc=Włącz serwer usług internetowych Dolibarr
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Użyj Gravatar usług online (www.gravatar.com), aby pokazać zdjęcia użytkowników / członków (znaleziono ich e-maile). Konieczność dostępu do Internetu
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Moduł oferują online strony płatności za pomocą karty kredytowej z Paybox
 Module50100Name=Kasa
@@ -527,7 +534,7 @@ Module50200Desc=Moduł oferują online strony płatności za pomocą karty kredy
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Konfiguracja zapisana
 BackToModuleList=Powrót do listy modułów
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Stałe formularz wyszukiwania na lewym menu
 DefaultLanguage=Domyślny język do użytku (kod języka)
 EnableMultilangInterface=Włącz wielojęzyczny interfejs
 EnableShowLogo=logo Pokaż na menu po lewej stronie
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=System został zaktualizowany
 CompanyInfo=Firma / fundacja informacji
 CompanyIds=Firma / fundament tożsamości
diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang
index 773b9217b95..35b55585299 100644
--- a/htdocs/langs/pl_PL/agenda.lang
+++ b/htdocs/langs/pl_PL/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Zdarzenia przypisane do
 ActionsDoneBy=Zdarzenia wykonane przez
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Wszystkie moje zdarzenia/zadania
 AllActions= Wszystkie zdarzenia/zadania
 ViewList=Widok listy
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 7d6459d8408..32f6c94a9ef 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang
index 634bdf42361..04e1d26974d 100644
--- a/htdocs/langs/pl_PL/contracts.lang
+++ b/htdocs/langs/pl_PL/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Listę uruchomionych linii zamówienia
 ListOfRunningServices=Lista uruchomionych usług
 NotActivatedServices=Nie aktywacji usług (wśród zatwierdzonych umów)
 BoardNotActivatedServices=Usługi uaktywnić wśród zatwierdzonych umów
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Ostatnia %s aktywacji usługi
 LastModifiedServices=Ostatnia %s zmodyfikowane usług
 EditServiceLine=Edycja usługa linii
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Podpisanie umowy sprzedaży
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 696634a340e..43efc8be99c 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Dostawca kod wymagane
 ErrorSupplierCodeAlreadyUsed=Dostawca kod już używane
 ErrorBadParameters=Bad parametry
 ErrorBadValueForParameter=Wrong wartość '%s &quot;dla parametrów nieprawidłowe&quot; %s spacerem
-ErrorBadImageFormat=Plik obrazu ma nie obsługiwanym formacie
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Wartość '%s &quot;ma zły format daty
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Nie można zapisać w katalogu %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Użytkownik z <b>logowania %s</b> nie może zostać znal
 ErrorLoginHasNoEmail=Ten użytkownik nie ma adresu e-mail. Proces przerwany.
 ErrorBadValueForCode=Zła wartość typy kodu. Spróbuj ponownie z nową wartość ...
 ErrorBothFieldCantBeNegative=Pola %s i %s nie może być zarówno negatywny
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Konto użytkownika <b>%s</b> wykorzystywane do wykonywania serwer WWW nie ma zgody na który
 ErrorNoActivatedBarcode=Nie Typ aktywny kodów kreskowych
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index 8573e0e86bf..ec066499c2c 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -8,7 +8,7 @@ Members=Członkowie
 MemberAccount=Member Login
 ShowMember=Pokaż Państwa karty
 UserNotLinkedToMember=Użytkownik nie wiąże się z członkiem
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Członkowie Bilety
 FundationMembers=Fundacja użytkowników
 Attributs=Atrybuty
@@ -85,8 +85,7 @@ SubscriptionLateShort=Późno
 SubscriptionNotReceivedShort=Nigdy nie otrzymała
 ListOfSubscriptions=Lista subskrypcji
 SendCardByMail=Wyślij kartę
-AddMember=Dodaj członków
-MemberType=Państwa typ
+AddMember=Create member
 NoTypeDefinedGoToSetup=Żaden członek typów zdefiniowanych. Przejdź do konfiguracji - Członkowie typy
 NewMemberType=Nowy członek typu
 WelcomeEMail=Zapraszamy e-mail
@@ -126,12 +125,12 @@ Date=Data
 DateAndTime=Data i czas
 PublicMemberCard=Państwa publiczne karty
 MemberNotOrNoMoreExpectedToSubscribe=Państwa nie są lub nie oczekuje, aby subskrybować
-AddSubscription=Dodaj abonament
+AddSubscription=Create subscription
 ShowSubscription=Pokaż subskrypcji
 MemberModifiedInDolibarr=Państwa zmodyfikowany w Dolibarr
 SendAnEMailToMember=Wyślij e-mail informacji na członka
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Temat wiadomości dla członka autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=E-mail dotyczące członka autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=EMail temat członkiem walidacji
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=EMail temat członka resiliation
 DescADHERENT_MAIL_RESIL=EMail dla członka resiliation
 DescADHERENT_MAIL_FROM=Nadawca wiadomości e-mail do automatycznych wiadomości e-mail
 DescADHERENT_ETIQUETTE_TYPE=Etykiety formacie
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format karty stronę
 DescADHERENT_CARD_HEADER_TEXT=Tekst wydrukowany na górę członka karty
 DescADHERENT_CARD_TEXT=Tekst wydrukowany na członka karty
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Nr trzeciej związane do tego członka
 ThirdPartyDolibarr=Dolibarr trzeciej
 MembersAndSubscriptions= Członkowie i Subscriptions
 MoreActions=Działanie uzupełniające na nagrywanie
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=Stworzenie bezpośredniego zapisu na rachunku transakcji
 MoreActionBankViaInvoice=Tworzenie faktury i wpłaty na rachunek
 MoreActionInvoiceOnly=Tworzenie faktury bez zapłaty
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Ostatnio kwota subskrypcji
 MembersStatisticsByCountries=Użytkownicy statystyki według kraju
 MembersStatisticsByState=Użytkownicy statystyki na State / Province
 MembersStatisticsByTown=Użytkownicy statystyki na miasto
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Liczba członków
 NoValidatedMemberYet=Żadna potwierdzona znaleziono użytkowników
 MembersByCountryDesc=Ten ekran pokaże statystyki członków przez poszczególne kraje. Graficzny zależy jednak na Google usługi online grafów i jest dostępna tylko wtedy, gdy połączenie internetowe działa.
@@ -196,9 +197,10 @@ Collectivités=Organizacje
 Particuliers=Osobisty
 Entreprises=Firmy
 DOLIBARRFOUNDATION_PAYMENT_FORM=Aby dokonać płatności abonamentu za pomocą przelewu bankowego, patrz strona <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe~~dobj</a> . <br> Aby zapłacić za pomocą karty kredytowej lub PayPal, kliknij przycisk na dole tej strony. <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index cba9264669d..a334b7f2828 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Jeśli produkt jest usługą z ograniczonym czasem trwani
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Ilość cen
 MultiPriceLevelsName=Kategorie cenowe
-AssociatedProductsAbility=Aktywuj wirtualne cechy produktów
-AssociatedProducts=Produkt wirtualny
-AssociatedProductsNumber=Liczba produktów tworzących ten produkt wirtualny
-ParentProductsNumber=Ilość nadrzędnych produktów wirtualnych
-IfZeroItIsNotAVirtualProduct=Jeśli 0, produkt nie jest produktem wirtualnym
-IfZeroItIsNotUsedByVirtualProduct=Jeśli 0, to ten produkt nie jest używany przez żaden produkt wirtualny
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Współpracownik
 Translation=Tłumaczenie
 KeywordFilter=Filtr słów kluczowych
@@ -132,7 +132,7 @@ AddDel=Dodaj / Usuń
 Quantity=Ilość
 NoMatchFound=Nie znaleziono odpowiednika
 ProductAssociationList=Lista powiązanych produktów / usług: nazwa produktu / usługi (ma wpływ na ilość)
-ProductParentList=Lista wirtualnych produktów / usług z tym produktem jako komponentem
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Jeden z wybranych produktów jest nadrzędny dla produktu bierzącego
 DeleteProduct=Usuń produkt / usługę
 ConfirmDeleteProduct=Czy na pewno chcesz usunąć ten produkt / usługę?
@@ -179,7 +179,7 @@ CloneProduct=Duplikuj produkt lub usługę
 ConfirmCloneProduct=Czy na pewno chcesz wykonać duplikat produktu <b>lub usługi %s?</b>?
 CloneContentProduct=Sklonuj wszystkie główne informacje dot. produktu / usługi
 ClonePricesProduct=Clone główne informacje i ceny
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Ten produkt jest używany
 NewRefForClone=Ref. nowych produktów / usług
 CustomerPrices=Ceny klientów
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 24c44a6fe67..9acde90020b 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Ten widok przedstawia wszystkich projektów i zadań (uprawnień użyt
 Myprojects=Moje projekty
 ProjectsArea=Projekty obszaru
 NewProject=Nowy projekt
-AddProject=Dodaj projekt
+AddProject=Create project
 DeleteAProject=Usuń projektu
 DeleteATask=Usuń zadanie
 ConfirmDeleteAProject=Czy na pewno chcesz usunąć ten projekt?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nowy czas spędzony
 MyTimeSpent=Mój czas spędzony
 MyTasks=Moje zadania
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Nowe zadania
-AddTask=Dodaj zadanie
+AddTask=Create task
 AddDuration=Dodaj czas
 Activity=Aktywność
 Activities=Zadania / działania
diff --git a/htdocs/langs/pl_PL/resource.lang b/htdocs/langs/pl_PL/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/pl_PL/resource.lang
+++ b/htdocs/langs/pl_PL/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index 9c6354451a2..f4a7f570e6b 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Kredyt na
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Pokaż Wypłata
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Jeśli jednak faktura nie co najmniej jeden wypłaty płatności jeszcze przetworzone, nie będzie ustawiony jako zapłaci, aby umożliwić zarządzanie wycofanie wcześniej.
-DoStandingOrdersBeforePayments=Te karty pozwala z prośbą o zlecenia stałego. Gdy będzie gotowy, możesz wpisać płatność zamknąć faktury.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Płatność z %s zamówienia stojących przez bank
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 11a91816da8..3e195800e80 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Adicionar uma opção de filtro para mostrar / esconder terceiros que estão atualmente em atividade ou deixaram de
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Filtros opções de pesquisa
 NumberOfKeyToSearch=Nr palavras chave para adicionar á pesquisa: %s
 ViewFullDateActions=Ver as datas das acções na totalidade na ficha do terceiro
@@ -208,6 +210,7 @@ ModulesJobDesc=Os módulos oficios permitem uma preconfiguração simplificada d
 ModulesMarketPlaceDesc=Você pode encontrar mais módulos para download em sites externos na Internet ...
 ModulesMarketPlaces=mais módulos...
 DoliStoreDesc=DoliStore, o mercado oficial para Dolibarr ERP / CRM módulos externos
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Prestadores do site, você pode pesquisar para encontrar os módulos mais ...
 URL=Link
 BoxesAvailable=Caixas disponiveis
@@ -444,7 +447,7 @@ Module55Desc=Gestão dos códigos de barras
 Module56Name=Central Telefónica
 Module56Desc=Gestão da Central Telefónica
 Module57Name=Débitos Directos
-Module57Desc=Gestão de débitos directos e créditos bancários
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integração com ClickToDial
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=Ligações RSS
 Module320Desc=Criação de ligações de informação RSS nas janelas do ERP
 Module330Name=Favoritos
 Module330Desc=Gestão de Favoritos
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Interface com calendario Webcalendar
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categorías
 Module1780Desc=Gestão de categorías (produtos, Fornecedores e clientes)
 Module2000Name=FCKeditor
 Module2000Desc=Editor WYSIWYG
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Gestão de tarefas agendadas
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Gestão Electrónica de Documentos
 Module2500Desc=Permite administrar uma base de documentos
 Module2600Name=WebServices
 Module2600Desc=O servidor de serviços web ERP/CRM está Disponível
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Usar o serviço online Gravatar (www.gravatar.com) para mostrar as fotos dos utilizadores / membros (que encontrar nos seus e-mails). Necessita de um acesso à Internet
 Module2800Desc=Cliente FTP
@@ -517,7 +524,7 @@ Module6000Desc=Gestão do fluxo de trabalho
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Módulo para oferecer uma página de pagamento online por cartão de crédito com paybox
 Module50100Name=Caixa
@@ -527,7 +534,7 @@ Module50200Desc=Módulo para oferecer uma página de pagamento online por cartã
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margens
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Métodos de encomenda
 DictionarySource=Origem das propostas/ordens
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Configuração guardada
 BackToModuleList=Voltar à lista de módulos
 BackToDictionaryList=Voltar à lista de dicionários
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Zona de pesquisa permanente do menu esquerdo
 DefaultLanguage=Idioma por defeito a utilizar (código idioma)
 EnableMultilangInterface=Activar interface Multi Idioma
 EnableShowLogo=Mostrar o logotipo no menu da esquerda
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=O seu sistema está actualizado
 CompanyInfo=Informação da Empresa/Instituição
 CompanyIds=Identificação regulamentação
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index 2b8af93edae..37be1a827f9 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -6,7 +6,7 @@ Agenda=Agenda
 Agendas=Agendas
 Calendar=Calendário
 Calendars=Calendários
-LocalAgenda=Internal calendar
+LocalAgenda=Calendário interno
 ActionsOwnedBy=Event owned by
 AffectedTo=Afecta o
 DoneBy=Realizado por
@@ -23,12 +23,13 @@ MenuToDoActions=Acções a fazer
 MenuDoneActions=Todos os eventos terminados
 MenuToDoMyActions=Os meus eventos incompletos
 MenuDoneMyActions=Os meus eventos terminados
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=Lista de eventos (Calendário interno)
 ActionsAskedBy=Os meus eventos reportados
 ActionsToDoBy=Eventos atribuídos a
 ActionsDoneBy=Eventos realizados por
 ActionsForUser=Eventos para utilizadores
 ActionsForUsersGroup=Eventos para todos os utilizadores do grupo
+ActionAssignedTo=Event assigned to
 AllMyActions= Todas as minhas acções
 AllActions= Todas as Acções
 ViewList=Ver Lista
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index c3e51b1883c..e28633c2e24 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Modo de cálculo
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/pt_PT/contracts.lang b/htdocs/langs/pt_PT/contracts.lang
index 24c9d555928..2c51fe50855 100644
--- a/htdocs/langs/pt_PT/contracts.lang
+++ b/htdocs/langs/pt_PT/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista de linhas de contractos em serviço
 ListOfRunningServices=Lista de serviços activos
 NotActivatedServices=Serviços não activados (com os contractos validados)
 BoardNotActivatedServices=Serviços a activar com os contractos validados
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Os %s últimos serviços activados
 LastModifiedServices=Os %s últimos sevicios modificados
 EditServiceLine=Edição linha do serviço
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista de Serviços para expirar
 NoteListOfYourExpiredServices=Esta lista contém apenas os serviços de contratos de terceiros aos quais está ligado como representante de vendas.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Comercial assinante do contrato
diff --git a/htdocs/langs/pt_PT/dict.lang b/htdocs/langs/pt_PT/dict.lang
index c13bacf30ff..ea99bec3e23 100644
--- a/htdocs/langs/pt_PT/dict.lang
+++ b/htdocs/langs/pt_PT/dict.lang
@@ -252,8 +252,7 @@ CivilityMME=Sra.
 CivilityMR=Sr.
 CivilityMLE=Dr.
 CivilityMTRE=Eng.
-# CivilityDR=Doctor
-
+CivilityDR=Doutor
 ##### Currencies #####
 Currencyeuros=Euros
 CurrencyAUD=Dólar UA
@@ -290,10 +289,10 @@ CurrencyXOF=Francos CFA BCEAO
 CurrencySingXOF=Franco CFA BCEAO
 CurrencyXPF=PCP Francos
 CurrencySingXPF=Franco CFP
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+CurrencyCentSingEUR=Cêntimos 
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paisa
+CurrencyThousandthSingTND=milésimo
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Campanha de mala direta
@@ -302,11 +301,10 @@ DemandReasonTypeSRC_CAMP_PHO=Campanha de telefone
 DemandReasonTypeSRC_CAMP_FAX=Campanha Fax
 DemandReasonTypeSRC_COMM=Contato comercial
 DemandReasonTypeSRC_SHOP=Loja contato
-# DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_WOM=Palavra de boca
 DemandReasonTypeSRC_PARTNER=Parceiro
 DemandReasonTypeSRC_EMPLOYEE=Empregado
 DemandReasonTypeSRC_SPONSORING=Patrocínio
-
 #### Paper formats ####
 PaperFormatEU4A0=Formato 4A0
 PaperFormatEU2A0=Formato 2A0
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index ed6a020fa81..625f05a06b8 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Código fornecedor obrigatório
 ErrorSupplierCodeAlreadyUsed=Código de fornecedor já utilizado
 ErrorBadParameters=Parâmetros incorrectos
 ErrorBadValueForParameter=&quot;%s&quot; valor incorreto para parâmetro incorreto dos %s dos
-ErrorBadImageFormat=Arquivo de imagem não tem um formato suportado
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=&quot;%s&quot; Valor tem formato de data errado
 ErrorWrongDate=A data não está correcta!
 ErrorFailedToWriteInDir=Impossivel escrever na pasta %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=a conta de utilizador de <b>%s</b> não foi encontrado.
 ErrorLoginHasNoEmail=Este utilizador não tem e-mail. impossivel continuar.
 ErrorBadValueForCode=Valor incorrecto para o código. volte a \ttentar com um Novo valor...
 ErrorBothFieldCantBeNegative=Campos %s %s e não pode ser tanto negativo
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Conta de usuário utilizada para executar <b>%s</b> servidor web não tem permissão para que
 ErrorNoActivatedBarcode=Nenhum tipo de código de barras ativado
 ErrUnzipFails=Falha ao extrair %s com o ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Os parâmetros de configuração obrigatórios ainda não estão definidos
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index 12ca0b0b0ed..2881be0fc16 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -207,5 +207,5 @@ MigrationActioncommElement=Atualizar os dados sobre as ações
 MigrationPaymentMode=A migração de dados para o modo de pagamento
 MigrationCategorieAssociation=Migração de categorias
 
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
+ShowNotAvailableOptions=Mostrar opções ocultas
+HideNotAvailableOptions=Esconder opções ocultas
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 1b9c268819a..4d6bfc4b519 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -62,8 +62,8 @@ SetDate=Definir data
 SelectDate=Seleccionar uma data
 SeeAlso=Ver também %s
 BackgroundColorByDefault=Cor de fundo por omissão
-FileNotUploaded=The file was not uploaded
-FileUploaded=The file was successfully uploaded
+FileNotUploaded=O ficheiro não foi enviado
+FileUploaded=O ficheiro foi enviado com sucesso
 FileWasNotUploaded=Um ficheiro foi seleccionada para ser anexado, mas ainda não foi carregado. Clique em 'Adicionar este Ficheiro' para anexar.
 NbOfEntries=Nº de entradas
 GoToWikiHelpPage=Ler ajuda on-line (é necessário acesso à Internet)
@@ -341,7 +341,7 @@ FullList=Lista completa
 Statistics=Estatísticas
 OtherStatistics=Outras estatísticas
 Status=Estado
-Favorite=Favorite
+Favorite=Favoritos
 ShortInfo=Informação
 Ref=Ref.
 RefSupplier=Ref. fornecedor
@@ -367,7 +367,7 @@ ActionsOnCompany=Acções nesta sociedade
 ActionsOnMember=Eventos sobre este membro
 NActions=%s acções
 NActionsLate=%s em atraso
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=O pedido já foi realizado anteriormente
 Filter=Filtro
 RemoveFilter=Eliminar filtro
 ChartGenerated=Gráficos gerados
@@ -648,7 +648,7 @@ OptionalFieldsSetup=Configuração de atributos extra
 URLPhoto=Url da foto / logotipo
 SetLinkToThirdParty=Link para um terceiro
 CreateDraft=Criar Rascunho
-SetToDraft=Back to draft
+SetToDraft=Voltar para o rascunho
 ClickToEdit=Clique para editar
 ObjectDeleted=%s objeto removido
 ByCountry=Por país
@@ -682,7 +682,7 @@ ViewPrivateNote=Ver notas
 XMoreLines=%s linhas(s) ocultas
 PublicUrl=URL público
 AddBox=Adicionar Caixa
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClickRefresh=Selecione um elemento e actualize a pagina
 # Week day
 Monday=Segunda-feira
 Tuesday=Terça-feira
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index 224c0921c35..b30a848fa5a 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -26,8 +26,8 @@ MembersCards=Cartões de Membros
 MembersList=Lista de Membros
 MembersListToValid=Lista de Membros rascunho (a Confirmar)
 MembersListValid=Lista de Membros validados
-MembersListUpToDate=Lista dos Membros válidos ao día de adesão
-MembersListNotUpToDate=Lista dos Membros válidos não ao día de adesão
+MembersListUpToDate=Lista dos Membros válidos ao dia de adesão
+MembersListNotUpToDate=Lista dos Membros válidos não ao dia de adesão
 MembersListResiliated=Lista dos Membros dados de baixa
 MembersListQualified=Lista dos Membros qualificados
 MenuMembersToValidate=Membros rascunho
@@ -57,17 +57,17 @@ MemberStatusActive=Validado (em espera de filiação )
 MemberStatusActiveShort=Validado
 MemberStatusActiveLate=Filiação não actualizada
 MemberStatusActiveLateShort=Não actualizada
-MemberStatusPaid=Filiação em día
-MemberStatusPaidShort=Em día
+MemberStatusPaid=Subscrição em dia
+MemberStatusPaidShort=Em dia
 MemberStatusResiliated=Membro dado de baixa
 MemberStatusResiliatedShort=De baixa
 MembersStatusToValid=Membros rascunho
 MembersStatusToValidShort=Membros rascunho
 MembersStatusValidated=Membros validados
-MembersStatusPaid=Filicações em día
-MembersStatusPaidShort=Em día
-MembersStatusNotPaid=Filicações não em día
-MembersStatusNotPaidShort=Não em día
+MembersStatusPaid=Subscrições em dia
+MembersStatusPaidShort=Em dia
+MembersStatusNotPaid=Subscrição não em dia
+MembersStatusNotPaidShort=Não em dia
 MembersStatusResiliated=Membros dados de baixa
 MembersStatusResiliatedShort=Membros dados de baixa
 NewCotisation=Nova filiação
@@ -85,7 +85,7 @@ SubscriptionLateShort=Em atraso
 SubscriptionNotReceivedShort=Não recebida
 ListOfSubscriptions=Lista de Filicações
 SendCardByMail=Enviar ficha
-AddMember=Adicionar membro
+AddMember=Create member
 NoTypeDefinedGoToSetup=Nenhum tipo de membro definido. ir a configuração -> Tipos de Membros
 NewMemberType=Novo tipo de membro
 WelcomeEMail=E-mail
@@ -125,7 +125,7 @@ Date=data
 DateAndTime=data e hora
 PublicMemberCard=Ficha pública membro
 MemberNotOrNoMoreExpectedToSubscribe=Não sometida a cotação
-AddSubscription=Adicionar filiação
+AddSubscription=Create subscription
 ShowSubscription=Mostrar filiação
 MemberModifiedInDolibarr=Membro modificado em Dolibarr
 SendAnEMailToMember=Enviar e-mail de informação à membro (E-mail: <b>%s</b>)
@@ -203,3 +203,4 @@ MembersByNature=Membros, por categoria
 VATToUseForSubscriptions=Taxa de IVA a utilizar para assinaturas
 NoVatOnSubscription=Sem TVA para assinaturas
 MEMBER_PAYONLINE_SENDEMAIL=Enviar e-mail para avisar quando Dolibarr receber uma confirmação de pagamento validados por assinatura
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index d2a0cababf2..a8d228293be 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Sim o serviço é de Duração limitada :
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Nº de preços
 MultiPriceLevelsName=Categoría de preços
-AssociatedProductsAbility=Activar produtos associados
-AssociatedProducts=Produtos associados
-AssociatedProductsNumber=Nº de produtos associados
-ParentProductsNumber=Número de produto pai
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associar
 Translation=Tradução
 KeywordFilter=Filtro por Chave
@@ -132,7 +132,7 @@ AddDel=Adicionar/Retirar
 Quantity=Quantidade
 NoMatchFound=Não foram encontrados resultados
 ProductAssociationList=Lista de produtos/serviços associados : Nome do produto/serviço (quantidade afectada)
-ProductParentList=Lista de produtos e serviços com este produto como um componente
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Um dos produtos seleccionados é pai do produto em curso
 DeleteProduct=Eliminar um produto/serviço
 ConfirmDeleteProduct=Está seguro de querer eliminar este produto/serviço?
@@ -179,7 +179,7 @@ CloneProduct=Copie produto ou serviço
 ConfirmCloneProduct=Tem certeza de que pretende copiar produto ou <b>serviço %s?</b>
 CloneContentProduct=Copie todas as principais informações do produto / serviço
 ClonePricesProduct=Copie principais informações e preços
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Este produto é utilizado
 NewRefForClone=Ref. do novo produto / serviço
 CustomerPrices=preços de Clientes
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Preço por registo de cliente
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index cd2b63fb250..37d32c854d4 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Essa visão apresenta todos os projetos e tarefas (as permissões de u
 Myprojects=Meus Projetos
 ProjectsArea=Área de Projetos
 NewProject=Novo Projeto
-AddProject=Adicionar Projeto
+AddProject=Create project
 DeleteAProject=Eliminar um Projeto
 DeleteATask=Eliminar uma Tarefa
 ConfirmDeleteAProject=Tem a certeza que quer eliminar este projeto?
@@ -36,6 +36,8 @@ TaskTimeSpent=Tempo despendido nas tarefas
 TaskTimeUser=Utilizador
 TaskTimeNote=Nota
 TaskTimeDate=Data
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Novo Tempo Dispendido
 MyTimeSpent=Meu Tempo Dispendido
 MyTasks=Minhas Tarefas
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Descrição da tarefa
 NewTask=Nova Tarefa
-AddTask=Adicionar Tarefa
+AddTask=Create task
 AddDuration=Adicionar Duração
 Activity=Atividade
 Activities=Tarefas/Atividades
diff --git a/htdocs/langs/pt_PT/resource.lang b/htdocs/langs/pt_PT/resource.lang
index d64075dfbf5..18177ed2c6a 100644
--- a/htdocs/langs/pt_PT/resource.lang
+++ b/htdocs/langs/pt_PT/resource.lang
@@ -1,36 +1,34 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
+MenuResourceIndex=Recursos
+MenuResourceAdd=Novo recurso
 MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+DeleteResource=Apagar recurso
+ConfirmDeleteResourceElement=Confirme apagar o recurso para este elemento
+NoResourceInDatabase=Nenhum recurso na base de dados
+NoResourceLinked=Nenhum recurso interligado
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Lista de recursos
+ResourceSingular=Recurso
+ResourceCard=Cartão de recurso
+AddResource=Crie um recurso
+ResourceFormLabel_ref=Nome do recurso
+ResourceType=Tipo de recurso
+ResourceFormLabel_description=Descrição do recurso
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Recursos interligados ao elemento
 
 ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+GotoDate=Ir para a data
 
-ResourceElementPage=Element resources
+ResourceElementPage=Recursos do elemento
 ResourceCreatedWithSuccess=Resource successfully created
 RessourceLineSuccessfullyDeleted=Resource line successfully deleted
 RessourceLineSuccessfullyUpdated=Resource line successfully updated
 ResourceLinkedWithSuccess=Resource linked with success
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Cartão de recurso
+ConfirmDeleteResource=Confirme para apagar este recurso
+RessourceSuccessfullyDeleted=Recurso apagado com sucesso
+DictionaryResourceType=Tipo de recursos
 
-DictionaryEMailTemplates=Modèles d'Emails
-
-SelectResource=Select resource
+SelectResource=Selecione o recurso
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index ec8d6c3fda5..e227553e4c9 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Crédito em
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Mostrar levantamento
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se não tiver factura, pelo menos, um pagamento levantamento ainda processado, que não irá ser definido como pago para permitir o levantamento antes de administrar.
-DoStandingOrdersBeforePayments=Estas abas permitem a você pedir uma ordem permanente. Uma vez que ele será terminado, você pode digitar o pagamento para fechar a fatura.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=arquivo retirado
 SetToStatusSent=Definir o estado como "arquivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Isso também irá criar pagamentos em facturas e classificá-los para pagar
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Pagamento de %s ordem permanente pelo banco
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index fbabb4f7401..82af6b13bb6 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Utilizați autocompletarea câmpurilor pentru alegerea
 ActivityStateToSelectCompany= Adaugă o opţiune de filtru pentru a afişa / ascunde thirdparties, care sunt în prezent în activitate sau le-a încetat
 UseSearchToSelectContactTooltip=De asemenea, dacă aveți un număr mare de terţi (> 100 000), puteți crește viteza prin setarea constantei COMPANY_DONOTSEARCH_ANYWHERE la 1 la Setup->Other. Căutarea va fi limitată la începutul șirului.
 UseSearchToSelectContact=Utilizați un câmp cu autocompletare pentru a selecta un contact (în loc de lista derulantă).
+DelaiedFullListToSelectCompany=Aşteaptă  să tastaţi o tastă înaintea încărcării a listei combo de terţi (Acest lucru poate crește performanța dacă aveți un număr mare de terţi)
+DelaiedFullListToSelectContact=Aşteaptă  să tastaţi o tastă înaintea încărcării a listei combo de contacte (Acest lucru poate crește performanța dacă aveți un număr mare de contacte)
 SearchFilter=Opţiuni filtre de căutare
 NumberOfKeyToSearch=Nr caractere pentru a declanşa căutare: %s
 ViewFullDateActions=Arata complet datele de acţiuni în cea de-a treia foaie
@@ -125,7 +127,7 @@ PHPTZ=Time Zone Server PHP
 PHPServerOffsetWithGreenwich=Offset pentru PHP server de latime Greenwich (secondes)
 ClientOffsetWithGreenwich=Client / Browser offset lăţime Greenwich (secunde)
 DaylingSavingTime=Ora de vară (utilizator)
-CurrentHour=Current oră
+CurrentHour=Timp  PHP (server)
 CompanyTZ=Time Zone companie (principale companiei)
 CompanyHour=Ora companiei (principale companiei)
 CurrentSessionTimeOut=Sesiunea curentă timeout
@@ -163,7 +165,7 @@ RunCommandSummary=Backup poate fi lansat cu următoarea comandă
 RunCommandSummaryToLaunch=Backup poate fi lansat cu următoarea comandă
 WebServerMustHavePermissionForCommand=Serverul de web trebuie să aibă permisiunea de a rula astfel de comenzi
 BackupResult=Backup rezultat
-BackupFileSuccessfullyCreated=Fişier backup  generat cu succes
+BackupFileSuccessfullyCreated=Fişier backup generat 
 YouCanDownloadBackupFile=Fişiere generate pot fi acum descarcate
 NoBackupFileAvailable=Niciun fişier backup disponibil.
 ExportMethod=Metodă Export
@@ -178,8 +180,8 @@ Compression=Compresie
 CommandsToDisableForeignKeysForImport=Comandă pentru a dezactiva cheile străine la import
 CommandsToDisableForeignKeysForImportWarning=Necesar dacă doriți să puteţi restaura sql dump -ul dvs  mai târziu
 ExportCompatibility=Compatibilitatea  fişierului de export generat
-MySqlExportParameters=MySQL parametrii export
-PostgreSqlExportParameters= PostgreSQL parametrii export
+MySqlExportParameters=Parametrii export MySQL 
+PostgreSqlExportParameters= Parametrii export PostgreSQL
 UseTransactionnalMode=Utilizaţi mod tranzacţional
 FullPathToMysqldumpCommand=Calea completă la comanda  mysqldump
 FullPathToPostgreSQLdumpCommand=Calea completă la comanda  pg_dump
@@ -208,6 +210,7 @@ ModulesJobDesc=Business furniza module simple predefinite de configurare de Doli
 ModulesMarketPlaceDesc=Puteţi găsi mai multe module pentru descărcare pe site-uri web externe de pe Internet ...
 ModulesMarketPlaces=Module mai multe ...
 DoliStoreDesc=DoliStore, market place oficial  pentru  module externe Dolibarr ERP / CRM
+DoliPartnersDesc=Listă cu unele companii care pot furniza / dezvolta module  la cerere  sau noi  funcţionalităţi (Notă: orice companie Open Source cunoscând limbajul  PHP vă poate oferi dezvoltări specifice)
 WebSiteDesc=Site-ul Web al furnizorilor unde puteţi căuta şi  găsi mai multe module ...
 URL=Link
 BoxesAvailable=Căsuţe disponibile
@@ -229,7 +232,7 @@ InstrucToClearPass=Pentru a avea parola decodificate (clare) în <b>conf.php</b>
 ProtectAndEncryptPdfFiles=Protecţie a generat pdf (nu recommandd, pauzele de masă PDF Generation)
 ProtectAndEncryptPdfFilesDesc=De protecţie a unui document PDF păstrează disponibil pentru a citi şi de a imprima cu orice browser PDF. Cu toate acestea, editarea şi copierea nu este posibil acum. Reţineţi că utilizarea acestei funcţii face construirea unui globale cumulate pdf nu de lucru (cum ar fi facturile unpaid).
 Feature=Funcţionalitate
-DolibarrLicense=Licenta
+DolibarrLicense=Licenţa
 DolibarrProjectLeader=Sef Proiect
 Developpers=Dezvoltatori / colaboratori
 OtherDeveloppers=Altele dezvoltatori / colaboratori
@@ -269,12 +272,12 @@ MAIN_MAIL_SMTPS_ID=SMTP ID-ul de autentificare necesare în cazul în
 MAIN_MAIL_SMTPS_PW=SMTP parola, dacă se cere autentificare
 MAIN_MAIL_EMAIL_TLS= Utilizaţi TLS (SSL) cripta
 MAIN_DISABLE_ALL_SMS=Dezactivaţi toate trimiteri SMS (în scopuri de testare sau demo-uri)
-MAIN_SMS_SENDMODE=Metoda de a utiliza pentru a trimite SMS-uri
-MAIN_MAIL_SMS_FROM=De telefon expeditor numărul implicit pentru trimiterea de SMS
+MAIN_SMS_SENDMODE=Metoda de  utilizare  pentru  trimiterea SMS-urilor
+MAIN_MAIL_SMS_FROM=Numărul de telefon expeditor implicit   pentru trimiterea de SMS
 FeatureNotAvailableOnLinux=Caracteristicã nu sunt disponibile pe Unix, cum ar fi sisteme. Testaţi-vă sendmail program la nivel local.
 SubmitTranslation=Dacă traducere pentru această limbă nu este completă sau găsiţi erori, puteţi corecta acest lucru prin editarea fişierelor în <b>langs</b> directorul <b>/ %s</b> şi prezintă fişiere modificare www.dolibarr.org forum.
-ModuleSetup=Modulul de configurare
-ModulesSetup=Module de configurare
+ModuleSetup=Configurare Modul
+ModulesSetup=Configurare Module
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Clientul Ressource Management (CRM)
 ModuleFamilyProducts=Managementul Produselor
@@ -323,11 +326,11 @@ UseACacheDelay= Întârziere pentru caching de export de răspuns în câteva se
 DisableLinkToHelpCenter=Ascundere link-ul <b>"Aveţi nevoie de ajutor sau sprijin"</b> de la pagina de login
 DisableLinkToHelp=Ascundere link-ul <b>" %s Online Help"</b> de la stânga meniul
 AddCRIfTooLong=Nu exista un ambalaj, aşa că, dacă este linia de documente pe pagină, pentru că prea mult timp, trebuie să adăugaţi-vă revine transportului în textarea.
-ModuleDisabled=Modulul cu handicap
+ModuleDisabled=Modulul dezactivat
 ModuleDisabledSoNoEvent=Modul de persoane atât de eveniment nu a creat
 ConfirmPurge=Sunteţi sigur că doriţi să execute acest purge? <br> Aceasta va şterge definitiv toate fişiere de date cu nici un mod de a le restaura (ECM imagini, fişiere ataşate ...).
 MinLength=Lungimea minimă
-LanguageFilesCachedIntoShmopSharedMemory=Fişiere. Lang încărcate în memorie partajata
+LanguageFilesCachedIntoShmopSharedMemory=Fişierele  .lang încărcate în memorie partajata
 ExamplesWithCurrentSetup=Exemple cu care rulează curent setup
 ListOfDirectories=Lista de directoare OpenDocument template-uri
 ListOfDirectoriesForModelGenODT=Listă de directoare, template-uri care conţin fişiere cu formatul OpenDocument. <br><br> Pune aici plin patetic de directoare. <br> Adauga un retur de car între directorul eah. <br> Pentru a adăuga un director a modulului GED, adăugaţi aici <b>DOL_DATA_ROOT / ECM / yourdirectoryname.</b> <br><br> Fişierele din aceste directoare trebuie să se termine <b>cu. Odt.</b>
@@ -374,7 +377,7 @@ Boolean=Boolean (Checkbox)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Preţ
 ExtrafieldMail = Email
-ExtrafieldSelect = Listă Select
+ExtrafieldSelect = Select Listă 
 ExtrafieldSelectList = Select din tabel
 ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
@@ -425,7 +428,7 @@ Module30Name=Facturi
 Module30Desc=Facturi şi note de credit "de management pentru clienţi. Facturi de gestionare pentru furnizorii
 Module40Name=Furnizori
 Module40Desc=Managementul Furnizorilor şi aprovizionării  (comenzi si facturi)
-Module42Name=Syslog
+Module42Name=Loguri
 Module42Desc=Jurnalizarea facilităţi (syslog)
 Module49Name=Editori
 Module49Desc=Managementul Editorilor
@@ -437,14 +440,14 @@ Module52Name=Stocuri
 Module52Desc=Managementul Stocurilor (produse)
 Module53Name=Servicii
 Module53Desc=Managementul Serviciilor
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Contracte / Abonamente
+Module54Desc=Managementul contractelor (servicii sau abonamente periodice)
 Module55Name=Coduri de bare
 Module55Desc=Coduri de bare "de gestionare a
 Module56Name=Telefonie
 Module56Desc=Telefonie integrare
 Module57Name=Ordine de plată
-Module57Desc=Ordine de plată şi retrageri "de gestionare a
+Module57Desc=Managementul Ordinelor de plată şi al retragerilor . De asemenea, include generarea fișierului SEPA pentru țările europene.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integrare
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=Feed RSS
 Module320Desc=Adauga RSS feed interiorul Dolibarr ecran pagini
 Module330Name=Marcaje
 Module330Desc=Marcaje "de gestionare a
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Proiecte / Oportunitati  / Prospecți
+Module400Desc=Managementul de proiecte, oportunități sau potențiali. Puteți, apoi, atribui apoi orice element (factură, comanda, propunere, intervenție, ...), la un proiect și a obține o vedere transversală din punctul de vedere al proiectului.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integrare
 Module500Name=Cheltuieli speciale( taxe, contributii sociale, dividende)
@@ -495,6 +498,8 @@ Module1780Name=Categorii
 Module1780Desc=Categorii de "management (produse, furnizori şi clienţi)
 Module2000Name=Fckeditor
 Module2000Desc=WYSIWYG Editor
+Module2200Name=Preţuri dinamice
+Module2200Desc=Activați utilizarea expresii matematice pentru prețuri
 Module2300Name=Cron
 Module2300Desc=Managementul taskurilor programate
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Salvaţi şi partaja documente
 Module2600Name=Servicii web
 Module2600Desc=Activarea serviciilor Dolibarr serverul web
+Module2650Name=Servicii web  (client)
+Module2650Desc=Activați Servicii web a clientului Dolibarr  (Poate fi folosit pentru a da date / cererile de servere externe. Doar Comenzi Furnizor sunt acceptate  pentru moment)
 Module2700Name=Gravatar
 Module2700Desc=Folosiţi serviciul online Gravatar (www.gravatar.com) pentru a arăta fotografie de utilizatori / membri (găsit cu mesajele de poştă electronică). Aveţi nevoie de un acces la internet
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Managementul fluxului de lucru
 Module20000Name=Managementul cererilor de concedii
 Module20000Desc=Declară şi urmăreşte cererile de concedii ale angajaţilor
 Module39000Name=Lot Produs
-Module39000Desc=Management Număr lot  și data de expirare pentru produse
+Module39000Desc=Management Număr lot  sau număr de serie ,  data de expirare şi vânzare pentru produse
 Module50000Name=Paybox
 Module50000Desc=Modul de a oferi o pagina de plata online prin card de credit cu Paybox
 Module50100Name=Punct de Vanzare
@@ -527,7 +534,7 @@ Module50200Desc=Modul de a oferi o pagina de plata online prin card de credit cu
 Module50400Name=Contabilitate (avansat)
 Module50400Desc=Management Contabilitate (partidă dublă)
 Module54000Name=Print lP IPrinter
-Module54000Desc=Printează  prin serviciul Cups cu ajutorul  imprimantei IPP
+Module54000Desc=Imprimare directă (fără a deschide documentele) folosind interfața CUPS IPP (imprimanta trebuie să fie vizibilă de pe server și CUPS trebuie să fie instalat pe server).
 Module55000Name=Deschide Sondaj
 Module55000Desc=Modul pentru a face sondaje online (ca Doodle, Studs, Rdvz, ...)
 Module59000Name=Marje
@@ -538,8 +545,8 @@ Module150010Name=Număr lot, data de expirare şi data vânzare
 Module150010Desc=Management Număr lot  și data de expirare pentru produse
 Permission11=Citeşte facturi
 Permission12=Creaţi/Modificare facturi
-Permission13=Unvalidate facturi
-Permission14=Validate facturi
+Permission13=Facturi client nevalidate
+Permission14=Facturi client validate
 Permission15=Trimite facturi prin e-mail
 Permission16=Crearea de plăţi pentru facturile
 Permission19=Ştergere facturi
@@ -558,11 +565,11 @@ Permission38=Exportul de produse
 Permission41=Citiţi cu proiecte şi sarcini
 Permission42=Creare / Modificare de proiecte, pentru a edita sarcinile mele de proiecte
 Permission44=Ştergere proiecte
-Permission61=Citiţi cu intervenţii
+Permission61=Citeşte intervenţii
 Permission62=Creare / Modificare intervenţii
 Permission64=Ştergere intervenţii
 Permission67=Export intervenţii
-Permission71=Citiţi cu membrii
+Permission71=Citeşte membrii
 Permission72=Creare / Modificare membri
 Permission74=Ştergere membri
 Permission75=Configurare tipuri şi atribute pentru membri
@@ -606,11 +613,11 @@ Permission151=Citiţi cu ordine de plată
 Permission152=Setup ordine de plată
 Permission153=Citiţi cu ordine de plată încasări
 Permission154=De credit / refuza încasări Ordinele de plată
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Citește contracte / abonamente
+Permission162=Creare / modificare contracte / abonamente
+Permission163=Activează un serviciu / abonament al unui contract
+Permission164=Dezactivarea unui serviciu / abonament al unui contract
+Permission165=Ștergeți contracte / abonamente
 Permission171=Citeşte deconturile si cheltuielile( proprii şi ale subordonaţilor)
 Permission172=Creare / Modificare ordin de deplasare şi cheltuieli
 Permission173=Ştergere ordin de deplasare şi cheltuieli
@@ -672,7 +679,7 @@ Permission300=Citiţi cu coduri de bare
 Permission301=Creare / Modificare coduri de bare
 Permission302=Ştergere coduri de bare
 Permission311=Citeşte servicii
-Permission312=Assign service/subscription to contract
+Permission312=Atribuire serviciu / abonament la contract
 Permission331=Citiţi cu marcaje
 Permission332=Creare / Modificare marcaje
 Permission333=Ştergeţi marcaje
@@ -698,12 +705,12 @@ Permission532=Creare / Modificare servicii
 Permission534=Ştergere servicii
 Permission536=A se vedea / administra serviciile ascunse
 Permission538=Exportul de servicii
-Permission701=Citiţi cu donaţii
+Permission701=Citiţi donaţii
 Permission702=Creare / Modificare donaţii
 Permission703=Ştergere donaţii
 Permission1001=Citeşte stocuri
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Creare / modificare depozite
+Permission1003=Ștergere depozite
 Permission1004=Citeşte stoc deplasările
 Permission1005=Creare / Modificare stoc deplasările
 Permission1101=Citiţi cu livrare comenzi
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Metode de comandă
 DictionarySource=Originea de propuneri / comenzi
 DictionaryAccountancyplan=Plan de conturi
 DictionaryAccountancysystem=Model pentru plan de conturi
+DictionaryEMailTemplates=Șabloane e-mailuri 
 SetupSaved=Setup salvate
 BackToModuleList=Inapoi la lista de module
 BackToDictionaryList=Inapoi la lista de dicţionare
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent formularul de căutare de pe stânga de meniu
 DefaultLanguage=Implicit de a folosi limba (limba)
 EnableMultilangInterface=Activaţi multilingv interfaţă
 EnableShowLogo=logo-ul Afişare meniu în stânga
+EnableHtml5=Activare HTML5 (Dezvoltare - disponibil doar pe șablonul ELDY)
 SystemSuccessfulyUpdated=Sistemul dumneavoastră a fost actualizat cu succes
 CompanyInfo=Companie / fundaţie informaţii
 CompanyIds=Companie / fundaţie identităţi
@@ -1138,7 +1147,7 @@ AddDeliveryAddressAbility=Adauga data de capacitatea de livrare
 UseOptionLineIfNoQuantity=O linie de produse / servicii cu o suma de zero este considerat ca fiind o opţiune
 FreeLegalTextOnProposal=Free text pe comercial propuneri
 WatermarkOnDraftProposal=Filigranul pe propunerile comerciale ciornă (niciunul daca e gol)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar destinație al propuneri
 ##### Orders #####
 OrdersSetup=Ordinele de gestionare setup
 OrdersNumberingModules=Ordinele de numerotare module
@@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Modulele de intervenţie de numerotare
 TemplatePDFInterventions=Carte de modele de documente de intervenţie
 WatermarkOnDraftInterventionCards=Filigranul pe documentele fişelor de intervenţie (niciunul daca e gol)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Configurare modul Contracte /  Abonamente 
 ContractsNumberingModules=Contracte de numerotare module
 TemplatePDFContracts=Modele documente contracte
 FreeLegalTextOnContracts=Free text  pe contracte
@@ -1269,7 +1278,7 @@ LDAPFieldFirstName=Prenume
 LDAPFieldFirstNameExample=Exemplu: givenname
 LDAPFieldMail=Adresa de e-mail
 LDAPFieldMailExample=Exemplu: mail
-LDAPFieldPhone=Professional numărul de telefon
+LDAPFieldPhone=Numărul de telefon profesional 
 LDAPFieldPhoneExample=Exemplu: telephonenumber
 LDAPFieldHomePhone=Personale numărul de telefon
 LDAPFieldHomePhoneExample=Exemplu: homephone
@@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=Fișierele de tip %s nu sunt comprimate de serverul HTT
 CacheByServer=Cache pe server
 CacheByClient=Cache pe browser
 CompressionOfResources=Compresie a răspunsului HTTP
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=O astfel de detectare automată nu este posibilă cu browserele curente
 ##### Products #####
 ProductSetup=Produse modul de configurare
 ServiceSetup=Servicii de modul de configurare
@@ -1415,11 +1424,11 @@ OSCommerceTestOk=Conectarea la server ' %s' pe bază de date " %s" cu utilizator
 OSCommerceTestKo1=Conectarea la server ' %s' reuseste, dar baza de date " %s" nu a putut fi atins.
 OSCommerceTestKo2=Conectarea la server ' %s' cu utilizatorul " %s" nu a reuşit.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=Configurare modul Depozite  
+UserWarehouse=Folosiţi depozite personale utilizator
+IfYouUsePointOfSaleCheckModule=Dacă utilizați unmodul punct de vânzare  (modulul POS furnizat în mod implicit sau un alt modul extern), acest setup poate fi ignorat de către modul punctul de vânzare . Cele mai multe module de puncte  de vânzări sunt concepute pentru a crea imediat o factură și reduce stocul implicit indiferent de ce optiune  aveţi aici. Deci, dacă aveți nevoie sau nu de a avea o scădere de stoc la înregistrarea unei vinzări din punctul dvs. de vânzare, verificați de asemenea modulul POS configurat.
 ##### Menu #####
-MenuDeleted=Meniu elimină
+MenuDeleted=Meniu eliminat
 TreeMenu=Tree meniuri
 Menus=Meniuri
 TreeMenuPersonalized=Meniuri personalizate
@@ -1482,14 +1491,14 @@ ClickToDialDesc=Acest modul permite să adăugaţi o pictogramă după numărul
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Punctul de vânzare
 CashDeskSetup=Casierie modul de configurare
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Terț generic implicit utilizat pentru vânzări
 CashDeskBankAccountForSell=Case de cont pentru a utiliza pentru vinde
 CashDeskBankAccountForCheque= Cont pentru a utiliza pentru a primi plăţi prin cec
 CashDeskBankAccountForCB= Cont pentru a folosi pentru a primi plăţi în numerar de carduri de credit
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Dezactivați scădere stoc atunci când o vinzare se face de la Point of Sale
+CashDeskIdWareHouse=Forţează și limitează depozitul să folosească scăderea stocului
+StockDecreaseForPointOfSaleDisabled=Scădere stoc de la Point of Sale dezactivat
+CashDeskYouDidNotDisableStockDecease=Nu ai dezactivați scăderea de stocului atunci când se face o vinzare de la Point Of Sale. Astfel, este necesar un depozit.
 ##### Bookmark #####
 BookmarkSetup=Bookmark modul de configurare
 BookmarkDesc=Acest modul vă permite să gestionaţi marcaje. De asemenea, puteţi adăuga comenzi rapide pentru orice Dolibarr pagini sau site-uri web externale pe partea stanga de meniu.
@@ -1549,7 +1558,7 @@ NbNumMin=Numărul minim al caracterelor minuscule
 NbSpeMin=Numărul minim al caracterelor speciale
 NbIteConsecutive=Numărul maxim al caracterelor care se repetă
 NoAmbiCaracAutoGeneration=Nu utiliza caractere ambigue  ("1","l","i","|","0","O") pentru generare automată
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+SalariesSetup=Configurare modul salarii
+SortOrder=Ordine sortare
 Format=Format
 TypePaymentDesc=0:Tip plata Client, 1:Tip plata Furnizor, 2:Ambele tipuri plata Client sau Furnizor
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index dec69f5b654..d73a2321e91 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Evenimente atribuite lui
 ActionsDoneBy=Evenimente efectuate de
 ActionsForUser=Evenimente pentru utilizator
 ActionsForUsersGroup=Evenimente pentru toți utilizatorii din grup
+ActionAssignedTo=Eveniment atribuit la
 AllMyActions= Toate evenimentele / sarcinile mele
 AllActions= Toate  evenimentele / sarcini
 ViewList=Vezi  listă
@@ -44,7 +45,7 @@ AgendaExtSitesDesc=Această pagină vă permite să declaraţi sursele externe d
 ActionsEvents=Evenimente pentru care Dolibarr va crea o acţiune în agendă în mod automat
 PropalValidatedInDolibarr=Propunerea %s validată
 InvoiceValidatedInDolibarr=Factura %s validată
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Factura %s validată din POS
 InvoiceBackToDraftInDolibarr=Factura %s revenită de statutul nevalidată
 InvoiceDeleteDolibarr=Factura %s ştearsă
 OrderValidatedInDolibarr= Comanda %s validată
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index 3032165936b..5782f2b37f2 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -155,6 +155,6 @@ BankDashboard=Sinteză  conturi bancare
 DefaultRIB=IBAN Implicit
 AllRIB=Tot BAN
 LabelRIB=Etichetă BAN
-NoBANRecord=Nici o înregistrare BAN
+NoBANRecord=Nicio înregistrare BAN
 DeleteARib=Ștergeți înregistrarea BAN
 ConfirmDeleteRib=Sigur doriţi să ştergeţi  această înregistrare BAN ?
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index dcd7b8f56e0..287171e92b8 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -35,7 +35,7 @@ ReplacementInvoice=Înlocuire factură
 ReplacedByInvoice=Înlocuită de factura %s
 ReplacementByInvoice=Înlocuită  de factura
 CorrectInvoice=Corecţie factura %s
-CorrectionInvoice=Rectificarea facturii
+CorrectionInvoice=Factură corecţie
 UsedByInvoice=Aplicată pe factura %s
 ConsumedBy=Consumat de
 NotConsumed=Neconsumat
@@ -217,7 +217,7 @@ NoInvoice=Nici o  factură
 ClassifyBill=Clasează factura
 SupplierBillsToPay=Facturi furnizori de plată
 CustomerBillsUnpaid=Facturi clienţi neîncasate
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=Facturile emise prin proceduri mecanographic sunt distribuite prin ordinea alfabetică
 NonPercuRecuperable=Nerecuperabilă
 SetConditions=Setează termenii de plata
 SetMode=Setează modul de plată
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index aadcee9b18d..f40aaeae237 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -1,38 +1,38 @@
 # Language file - Source file is en_US - cashdesk
 CashDeskMenu=Punctul de vânzare
 CashDesk=Punctul de vânzare
-CashDesks=Punctul de vânzare
+CashDesks=Punct de vânzări
 CashDeskBank=Cont bancar
 CashDeskBankCash=Cont bancar (cash)
-CashDeskBankCB=Cont bancar (carte)
-CashDeskBankCheque=Cont bancar (check)
+CashDeskBankCB=Cont bancar (card)
+CashDeskBankCheque=Cont bancar (cec)
 CashDeskWarehouse=Depozit
-CashdeskShowServices=Vânzarea de servicii
+CashdeskShowServices=Servicii disponibile
 CashDeskProducts=Produse
 CashDeskStock=Stoc
 CashDeskOn=pe
-CashDeskThirdParty=A treia parte
+CashDeskThirdParty=Terţ
 CashdeskDashboard=Acces Punct de vânzare
 ShoppingCart=Cosul de cumparaturi
-NewSell=Vindem nou
+NewSell=Vânzare nouă
 BackOffice=Back office
 AddThisArticle=Adauga acest articol
 RestartSelling=Du-te inapoi la vânzare
-SellFinished=Vindem terminat
-PrintTicket=Print bilet
+SellFinished=Vânzare terminată
+PrintTicket=Print bon
 NoProductFound=Nici un articol gasit
-ProductFound=produsul care se găseşte
+ProductFound=produs găsit
 ProductsFound=produse găsite
 NoArticle=Nici un articol
 Identification=Identificare
 Article=Articol
 Difference=Diferenţă
-TotalTicket=Total de bilet
-NoVAT=Nici TVA-ul pentru această vânzare
-Change=Excesul de primit
+TotalTicket=Total bon
+NoVAT=Fără TVA  pentru această vânzare 
+Change=Primit în plus
 CalTip=Click pentru a vizualiza calendarul
 CashDeskSetupStock=Vă rugăm să scadă stoc pe crearea de factură, dar pentru acest depozit este nu a fost definit <br> Schimba modul de configurare stoc, sau alege un depozit
-BankToPay=Taxa de cont
+BankToPay=Comision cont
 ShowCompany=Afişare companie
 ShowStock=Arată depozit
 DeleteArticle=Faceţi clic pentru a elimina acest articol
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index 9323b0a493f..5fe76b345ce 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -37,13 +37,13 @@ Withdrawal=Retragere
 Withdrawals=Retrageri
 AmountHTVATRealReceived=TVA colectat
 AmountHTVATRealPaid=TVA platit
-VATToPay=La plata TVA-ului
-VATReceived=TVA-ul a primit
-VATToCollect=TVA-ul pentru a colecta
-VATSummary=TVA Sumar
-LT2SummaryES=Balanţa IRPF
+VATToPay=TVA vânzări
+VATReceived=TVA recuperat
+VATToCollect=TVA colectat
+VATSummary=Sold TVA
+LT2SummaryES=Sold IRPF
 LT1SummaryES=RE Sold
-VATPaid=Plata TVA-ului
+VATPaid=TVA plătit
 SalaryPaid=Plata salariu
 LT2PaidES=IRPF plătit
 LT1PaidES=RE Platit
@@ -82,10 +82,10 @@ DatePayment=Data Plata
 DateStartPeriod=Dată început perioadă
 DateEndPeriod=Dată sfârşit perioadă
 NewVATPayment=Plata nouă TVA
-newLT2PaymentES=Nou IRPF plată
+newLT2PaymentES=Plată nouă IRPF
 newLT1PaymentES=Plată nouă RE
 LT2PaymentES=IRPF de plata
-LT2PaymentsES=IRPF Plăţi
+LT2PaymentsES=Plăţi IRPF 
 LT1PaymentES=RE Plată
 LT1PaymentsES=RE Plăţi
 VATPayment=Plată TVA
@@ -99,10 +99,10 @@ SupplierAccountancyCode=Cont contabil furnizor
 AccountNumberShort=Numărul de cont
 AccountNumber=Numărul de cont
 NewAccount=Cont nou
-SalesTurnover=Vanzari cifra de afaceri
+SalesTurnover=Cifra de afaceri Vanzari
 SalesTurnoverMinimum=Cifra de afaceri  vânzări minimă
 ByThirdParties=Pe terţi
-ByUserAuthorOfInvoice=Prin factura autor
+ByUserAuthorOfInvoice=După autorul facturii
 AccountancyExport=Export Contabilitate
 ErrorWrongAccountancyCodeForCompany=Bad client contabile cod pentru %s
 SuppliersProductsSellSalesTurnover=A cifrei de afaceri generate de vânzările de furnizorii de produse.
@@ -167,7 +167,7 @@ OrderStats=Statistici privind comenzile
 InvoiceStats=Statistici privind facturile
 Dispatch=Dispecerizare
 Dispatched=Expediate
-ToDispatch=Pentru a expedierii
+ToDispatch=De  expediat
 ThirdPartyMustBeEditAsCustomer=A treia parte trebuie să fie definit ca un client
 SellsJournal=Jurnalul de vânzări
 PurchasesJournal=Jurnalul de cumpărări
@@ -176,7 +176,7 @@ DescPurchasesJournal=Jurnalul de cumpărări
 InvoiceRef=Factură ref.
 CodeNotDef=Nedefinit
 AddRemind=Expedierea Suma disponibilă
-RemainToDivide= Ramaneti la expediere:
+RemainToDivide= Ramane da expediere:
 WarningDepositsNotIncluded=Facturile  în avans nu sunt incluse in aceasta versiune cu acest modul de contabilitate.
 DatePaymentTermCantBeLowerThanObjectDate=Termenul de plată nu poate fi mai mic decât data obiectului.
 Pcg_version=Pcg versiune
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=în funcție de furnizor, alege metoda potrivită pe
 TurnoverPerProductInCommitmentAccountingNotRelevant=Raportul cifra de afaceri pe produs, atunci când se utilizează modul <b>contabilitate de casă</b> nu este relevant. Acest raport este disponibil numai atunci când se utilizează modul  <b>contabilitate de angajament</b> (a se vedea configurarea modulului de contabilitate).
 CalculationMode=Mod calcul
 AccountancyJournal=Jurnal cod contabilitate
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru produsele cumpărate
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cont Contabilitate Predefinit pentru produsele vândute
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru serviciile cumpărate
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cont Contabilitate Predefinit pentru serviciile vândute
 ACCOUNTING_VAT_ACCOUNT=Cont Contabilitate Predefinit pentru TVA Colectată
 ACCOUNTING_VAT_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru TVA Platită
 ACCOUNTING_ACCOUNT_CUSTOMER=Cont Contabilitate Predefinit pentru terţi Clienţi
diff --git a/htdocs/langs/ro_RO/contracts.lang b/htdocs/langs/ro_RO/contracts.lang
index 195c077ba07..c955006df8d 100644
--- a/htdocs/langs/ro_RO/contracts.lang
+++ b/htdocs/langs/ro_RO/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Zona Contracte
 ListOfContracts=Lista contracte
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Ultimele %s contracte modificare
 AllContracts=Toate contractele
 ContractCard=Fişă Contract
 ContractStatus=Status Contract
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista liniilor contractului in service
 ListOfRunningServices=Lista servicii active
 NotActivatedServices=Servicii  inactive (printre contracte validate  )
 BoardNotActivatedServices=Servicii de activat în contractele validate
-LastContracts=Last % contracts
+LastContracts=Ultimele  %s contracte
 LastActivatedServices=Ultimele %s servicii  activate
 LastModifiedServices=Ultimele %s servicii modificate
 EditServiceLine=Editează  linie serviciu
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista  servicii care expiră
 NoteListOfYourExpiredServices=Această listă conține numai serviciile pentru terții la care sunteţi reprezentant de vânzării.
 StandardContractsTemplate=Model standard Contracte
 ContactNameAndSignature=Pentru %s nume şi semnătura:
+OnlyLinesWithTypeServiceAreUsed=Numai liniile cu tipul "Service" va fi clonat.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Reprezentant vanzari de semnare a contractului
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index 26edf119a79..c774dfce023 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=Pe mediul Unix veţi  utiliza instrumentul crontab pentr
 CronExplainHowToRunWin=Pe mediul Microsoft(tm) Windows puteţi utiliza instrumentul Scheduled task pentru a rula linia de comanda la fiecare minut
 # Menu
 CronJobs=Joburi programate
-CronListActive=List of active/scheduled jobs
+CronListActive=Lista  activelor/programatelor joburi
 CronListInactive=Lista joburilor dezactivate
 # Page list
 CronDateLastRun=Ultima rulare
diff --git a/htdocs/langs/ro_RO/donations.lang b/htdocs/langs/ro_RO/donations.lang
index 7f2399e4129..c392d15d66f 100644
--- a/htdocs/langs/ro_RO/donations.lang
+++ b/htdocs/langs/ro_RO/donations.lang
@@ -31,8 +31,8 @@ DonationRecipient=Beneficiar donaţie
 ThankYou=Vă multumim
 IConfirmDonationReception=Beneficiarul declară primirea, ca donaţie , a următoarei sume
 MinimumAmount=Valoarea minimă este %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
+FreeTextOnDonations=Text liber afişat în subsol
+FrenchOptions=Opțiuni pentru Franța
+DONATION_ART200=Afiseaza articolului 200 din CGI dacă sunteți îngrijorat
+DONATION_ART238=Afiseaza articolului 238 din CGI dacă sunteți îngrijorat
+DONATION_ART885=Afiseaza articol 885 din CGI dacă sunteți îngrijorat
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 21d11c437ac..e83f98969fc 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Eroare, acest membru nu este 
 ErrorThereIsSomeDeliveries=Eroare, există unele livrări legate de acest transport. Ștergere refuzată.
 ErrorCantDeletePaymentReconciliated=Nu se poate șterge o plată care a generat o tranzacție bancară care a fost conciliată
 ErrorCantDeletePaymentSharedWithPayedInvoice=Nu se poate șterge o plată partajată de cel puțin un factură cu statutul platită
+ErrorPriceExpression1=Nu se poate atribui la constanta '%s'
+ErrorPriceExpression2=Nu se poate redefini  funcția built-in  '%s'
+ErrorPriceExpression3=Variabila nedefinita '%s'  în definiția funcției
+ErrorPriceExpression4=Caracter ilegal '%s'
+ErrorPriceExpression5=Neașteptat '%s'
+ErrorPriceExpression6=Număr greșit de argumente (%s dat, %s așteptat)
+ErrorPriceExpression8=Operator neașteptat '%s'
+ErrorPriceExpression9=A apărut o eroare neașteptată
+ErrorPriceExpression10=Iperator '%s' lipsă operand
+ErrorPriceExpression11=Asteptam '%s'
+ErrorPriceExpression14=Împărţirea la zero,
+ErrorPriceExpression17=Variabila  '%s' nedefinită
+ErrorPriceExpression19=Expresia nu a fost găsită
+ErrorPriceExpression20=Expresie goală
+ErrorPriceExpression21=Rezultat gol '%s'
+ErrorPriceExpression22=Rezultat negativ '%s'
+ErrorPriceExpressionInternal=Eroare internă '%s'
+ErrorPriceExpressionUnknown=Eroare Necunoscută '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Parametri de setare obligatorii nu sunt încă definiţi
diff --git a/htdocs/langs/ro_RO/externalsite.lang b/htdocs/langs/ro_RO/externalsite.lang
index 25f72b0bed9..a66dc1f4189 100644
--- a/htdocs/langs/ro_RO/externalsite.lang
+++ b/htdocs/langs/ro_RO/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=Link-ul de instalare pentru site-ul extern
 ExternalSiteURL=URL-ul site-ului extern
 ExternalSiteModuleNotComplete=Modulul Site extern nu a fost configurat corespunzător.
-ExampleMyMenuEntry=My menu entry
+ExampleMyMenuEntry=Intrare  Meniul meu
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index 1e4ceeea37d..7001d1c09c5 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -1,35 +1,35 @@
 # Dolibarr language file - Source file is en_US - install
 InstallEasy=Doar urmaţi instrucţiunile pas cu pas.
-MiscellaneousChecks=Cerinţe preliminare a verifica
+MiscellaneousChecks=Verificare Cerinţe preliminare 
 DolibarrWelcome=Bine ati venit la Dolibarr
 ConfFileExists=<b>%s</b> fişierul de configurare există.
 ConfFileDoesNotExists=<b>%s</b> fişier de configurare nu exista!
 ConfFileDoesNotExistsAndCouldNotBeCreated=<b>%s</b> de fişiere de configurare nu există şi nu a putut fi creat!
-ConfFileCouldBeCreated=<b>%s</b> fişier de configurare ar putea fi creat.
+ConfFileCouldBeCreated=Fişier de configurare <b>%s</b> ar putea fi creat.
 ConfFileIsNotWritable=<b>%s</b> fişier de configurare nu poate fi scris. Verificaţi permisiunile. Pentru prima de instalare, serverul de web trebuie să fie acordate pentru a putea scrie în acest fişier în timpul procesului de configurare (&quot;chmod 666&quot;, de exemplu, pe un Unix ca OS).
 ConfFileIsWritable=<b>%s</b> fişier de configurare este de scriere.
 ConfFileReload=Reîncarcă toate informaţiile din fişierul de configurare.
 PHPSupportSessions=Acest PHP susţine sesiuni.
 PHPSupportPOSTGETOk=Acest PHP suportă variabile POST si GET.
 PHPSupportPOSTGETKo=Este posibil de configurare PHP nu suporta variabile POST şi / sau GET. Verificaţi <b>variables_order</b> de parametru în php.ini.
-PHPSupportGD=Acest sprijin PHP functii grafice HG nr.
-PHPSupportUTF8=Acest sprijin PHP funcţii utf8.
+PHPSupportGD=Acest PHP suportă  functii grafice GD.
+PHPSupportUTF8=Acest PHP suportă  funcţii  UTF8.
 PHPMemoryOK=PHP max memorie sesiune este setată la <b>%s.</b> Acest lucru ar trebui să fie suficient.
 PHPMemoryTooLow=PHP max memorie sesiune este setată la octeţi <b>%s.</b> Acest lucru ar trebui să fie prea mic. Modificarea <b>php.ini</b> pentru a seta parametrul <b>memory_limit</b> de bytes <b>%s</b> cel puţin.
 Recheck=Click aici pentru un test mult mai semnificativ
 ErrorPHPDoesNotSupportSessions=Instalarea dvs. PHP nu are suport pentru sesiuni. Această caracteristică este necesar pentru a face Dolibarr de lucru. Verificaţi configurarea PHP.
 ErrorPHPDoesNotSupportGD=Instalarea dvs. PHP nu are suport pentru funcţia de grafică HG nr. Graficul nu va fi disponibil.
 ErrorPHPDoesNotSupportUTF8=Instalarea dvs. PHP nu are suport pentru funcţii utf8. Dolibarr nu poate funcţiona corect. Rezolva acest lucru înainte de a instala Dolibarr.
-ErrorDirDoesNotExists=%s director nu există.
+ErrorDirDoesNotExists=Directorul  %s  nu există.
 ErrorGoBackAndCorrectParameters=Du-te înapoi şi de a corecta parametrii greşite.
 ErrorWrongValueForParameter=Este posibil să fi tastat greşit o valoare pentru parametrul &quot;%s&quot;.
-ErrorFailedToCreateDatabase=Nu a reuşit să creeze &quot;%s&quot; bază de date.
-ErrorFailedToConnectToDatabase=Nu a reuşit să se conecteze la &quot;%s&quot; bază de date.
+ErrorFailedToCreateDatabase=Eşec la crearea bazei de date '%s'.
+ErrorFailedToConnectToDatabase=Eşec la conectarea la baza de date '%s'.
 ErrorDatabaseVersionTooLow=Versiunea bazei de date (%s) prea veche. Versiunea %s este necesară.
 ErrorPHPVersionTooLow=PHP versiune prea veche. %s versiune este necesar.
 WarningPHPVersionTooLow=PHP versiune prea veche. %s versiune sau mai mult este de aşteptat. Această versiune ar trebui să permită instalarea, dar nu este acceptat.
 ErrorConnectedButDatabaseNotFound=Conectarea la serverul de succes, dar &quot;%s&quot; bază de date nu a fost găsit.
-ErrorDatabaseAlreadyExists=&quot;%s&quot; baza de date există deja.
+ErrorDatabaseAlreadyExists=Baza de date  '%s' există deja.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Dacă baza de date nu există, du-te înapoi şi a verifica opţiunea &quot;Creare bază de date&quot;.
 IfDatabaseExistsGoBackAndCheckCreate=Dacă baza de date există deja, du-te înapoi şi debifaţi &quot;Crearea bazei de date&quot; opţiune.
 WarningBrowserTooOld=Versiune prea veche a browser-ului. Actualizarea browser-ul dvs. la o versiune recentă a Firefox, Chrome sau Opera este foarte recomandată.
@@ -40,19 +40,19 @@ License=Utilizarea de licenţă
 ConfigurationFile=Fişier de configurare
 WebPagesDirectory=Director în cazul în care paginile web sunt stocate
 DocumentsDirectory=Director pentru a stoca documentele încărcate şi a generat
-URLRoot=URL-ul Root
+URLRoot=URL Rădăcină 
 ForceHttps=Forţarea conexiuni securizate (HTTPS)
 CheckToForceHttps=Bifaţi această opţiune pentru a forţa conexiuni securizate (HTTPS). <br> Acest lucru presupune faptul că serverul de web este configurat cu un certificat SSL.
 DolibarrDatabase=Baza de date Dolibarr
-DatabaseChoice=Baza de date alegere
-DatabaseType=Baza de date de tip
-DriverType=Sterownik typu
+DatabaseChoice= Alegere Baza de date
+DatabaseType=Tip Baza de date 
+DriverType=Tip driver
 Server=Server
 ServerAddressDescription=Numele sau adresa IP pentru serverul de baze de date, de obicei &quot;localhost&quot;, atunci când serverul de baze de date este găzduit pe acelaşi server decât serverul de web
 ServerPortDescription=Port-ul serverului de baze de date. Păstraţi gol, dacă necunoscut.
-DatabaseServer=Date de pe server
-DatabaseName=Nazwa bazy danych
-DatabasePrefix=Baza de date prefix de masă
+DatabaseServer=Server  baze de date
+DatabaseName=Nume bază de date
+DatabasePrefix=Prefix Tabel Baza de date
 Login=Login
 AdminLogin=Autentifica-te pentru proprietarul bazei de date Dolibarr.
 Password=Parolă
@@ -71,20 +71,20 @@ ConfigurationSaving=Salvarea fişier de configurare
 ServerConnection=Conexiune server
 DatabaseConnection=Baza de date a conexiunii
 DatabaseCreation=Baza de date crearea de
-UserCreation=Ghid de creaţie
+UserCreation=Creare utilizator
 CreateDatabaseObjects=Baza de date crearea de obiecte
 ReferenceDataLoading=Date de referinta de încărcare
 TablesAndPrimaryKeysCreation=Mese si primar cheile de creare
-CreateTableAndPrimaryKey=Crearea %s de masă
+CreateTableAndPrimaryKey=Creare tabel %s
 CreateOtherKeysForTable=Crearea cheile străine şi indicii pentru %s de masă
 OtherKeysCreation=Cheile străine şi crearea de indici
-FunctionsCreation=Funcţii crearea de
+FunctionsCreation=Creare Funcţii
 AdminAccountCreation=Administrator crearea de autentificare
 PleaseTypePassword=Vă rugăm să introduceţi o parolă, parole goale nu sunt permise!
 PleaseTypeALogin=Vă rugăm să introduceţi un login!
 PasswordsMismatch=Parolele diferă, vă rugăm să încercaţi din nou!
 SetupEnd=Sfârşitul de configurare
-SystemIsInstalled=Această instalaţie este completă.
+SystemIsInstalled=Această instalare este completă.
 SystemIsUpgraded=Dolibarr a fost actualizat cu succes.
 YouNeedToPersonalizeSetup=Trebuie să vă configuraţi Dolibarr pentru a se potrivi nevoilor dumneavoastră (aspect, caracteristici, ...). Pentru a face acest lucru, va rugam sa urmati link-ul de mai jos:
 AdminLoginCreatedSuccessfuly=<b>&quot;%s&quot;</b> Dolibarr administrator de autentificare a creat cu succes.
@@ -107,7 +107,7 @@ DataMigration=Migrarea datelor
 DatabaseMigration=Structura bazei de date a migraţiei
 ProcessMigrateScript=Script de prelucrare
 ChooseYourSetupMode=Alegeţi modul de configurare şi faceţi clic pe &quot;Start&quot; ...
-FreshInstall=Proaspete de instalare
+FreshInstall=Instalare proaspătă
 FreshInstallDesc=Utilizaţi acest mod în cazul în care aceasta este prima de instalare. Dacă nu, acest mod se poate repara o instalare incompleta anterior, dar dacă doriţi să faceţi upgrade versiunii dvs., alegeţi &quot;Upgrade&quot; modul.
 Upgrade=Uaktualnij
 UpgradeDesc=Utilizaţi acest mod, dacă aţi înlocuit fişierele vechi Dolibarr cu fişiere dintr-o versiune mai nouă. Acest lucru se va actualiza baza de date şi de date.
@@ -120,7 +120,7 @@ AlreadyDone=Migrat deja
 DatabaseVersion=Versiunea bazei de date
 ServerVersion=Baza de date server de versiune
 YouMustCreateItAndAllowServerToWrite=Trebuie să creaţi acest director şi pentru a permite serverului de web pentru a scrie în ea.
-CharsetChoice=Set de caractere alegere
+CharsetChoice=Alegere Set de caractere 
 CharacterSetClient=Setul de caractere utilizat pentru paginile web generate HTML
 CharacterSetClientComment=Alegeţi setul de caractere pentru afişarea Web. <br/> Set de caractere implicit propusă este una din baza de date.
 DBSortingCollation=Caracter de sortare pentru
@@ -144,14 +144,14 @@ InstallChoiceSuggested=<b>Instalaţi alegere sugerat de instalator.</b>
 MigrateIsDoneStepByStep=Versiunea ţintă (%s) are un deficit de mai multe versiuni, astfel încât instalaţi expertul va reveni pentru a sugera migraţiei viitor, după ce acesta va fi terminat.
 CheckThatDatabasenameIsCorrect=Verificaţi că numele bazei de date <b>&quot;%s&quot;</b> este corectă.
 IfAlreadyExistsCheckOption=În cazul în care acest nume este corectă şi că baza de date nu există încă, trebuie să verificaţi opţiunea &quot;Creare bază de date&quot;.
-OpenBaseDir=PHP openbasedir parametru
+OpenBaseDir= Parametru openbasedir PHP 
 YouAskToCreateDatabaseSoRootRequired=Ai verificat caseta &quot;Crearea bazei de date&quot;. Pentru aceasta, aveţi nevoie pentru a oferi autentificare user / parola de superuser (partea de jos a formularului).
 YouAskToCreateDatabaseUserSoRootRequired=Ai verificat caseta &quot;Crearea bazei de date proprietar&quot;. Pentru aceasta, aveţi nevoie pentru a oferi autentificare user / parola de superuser (partea de jos a formularului).
 NextStepMightLastALongTime=Pasul curent poate dura câteva minute. Vă rugăm să aşteptaţi până când este afişat următorul ecran complet înainte de a continua.
 MigrationCustomerOrderShipping=Migrarea de transport maritim pentru depozitare client comenzi
 MigrationShippingDelivery=Upgrade de depozitare de transport maritim
 MigrationShippingDelivery2=Upgrade de depozitare de transport 2
-MigrationFinished=Migraţia terminat
+MigrationFinished=Migraţia terminată
 LastStepDesc=<strong>Ultimul pas:</strong> Definirea aici nume de utilizator şi parola pe care intenţionaţi să îl utilizaţi pentru conectarea la software-ul. Nu pierde aceasta ca este cont pentru a administra toate celelalte.
 ActivateModule=Activaţi modul %s
 ShowEditTechnicalParameters=Click aici pentru a vedea / edita  parametrii avansaţi (mod expert)
@@ -167,7 +167,7 @@ MigrationContract=Migrarea datelor pentru contracte
 MigrationSuccessfullUpdate=Upgrade de succes
 MigrationUpdateFailed=Procesul de actualizare a eşuat
 MigrationRelationshipTables=Migrare a datelor pentru tabelele relaţie (%s)
-MigrationPaymentsUpdate=De plată de date de corecţie
+MigrationPaymentsUpdate=Corecţie dată de plată 
 MigrationPaymentsNumberToUpdate=De plată %s (e) pentru a actualiza
 MigrationProcessPaymentUpdate=Actualizaţi plată (e) %s
 MigrationPaymentsNothingToUpdate=Nu există mai multe lucruri de făcut
@@ -189,23 +189,23 @@ MigrationContractsIncoherentCreationDateUpdate=Bad contract de crearea de valoar
 MigrationContractsIncoherentCreationDateUpdateSuccess=Bad contract de crearea de valoare data de corecţie făcut cu succes
 MigrationContractsIncoherentCreationDateNothingToUpdate=Nici o valoare rău pentru data de creare contractului pentru a corecta
 MigrationReopeningContracts=Contract de deschis închis de eroare
-MigrationReopenThisContract=Redeschide %s contractuale
-MigrationReopenedContractsNumber=Contracte de %s modificate
+MigrationReopenThisContract=Redeschide  contract %s 
+MigrationReopenedContractsNumber=%s Contracte modificate
 MigrationReopeningContractsNothingToUpdate=Nici un contract închis pentru a deschide
 MigrationBankTransfertsUpdate=Actualizaţi legături între tranzacţie bancară şi un transfer bancar
 MigrationBankTransfertsNothingToUpdate=Toate link-uri sunt de până la zi
 MigrationShipmentOrderMatching=Trimiteri la data primirii de actualizare
 MigrationDeliveryOrderMatching=Livrare la primirea de actualizare
-MigrationDeliveryDetail=Livrare de actualizare
+MigrationDeliveryDetail=Actualizare Livrare 
 MigrationStockDetail=Actualizarea valoarea stocului de produse
 MigrationMenusDetail=Actualizaţi tabelele de meniuri dinamice
 MigrationDeliveryAddress=Actualizaţi adresa de livrare în transporturi
 MigrationProjectTaskActors=Migrare de date pentru tabel llx_projet_task_actors
 MigrationProjectUserResp=Migrarea datelor domeniul fk_user_resp de llx_projet la llx_element_contact
 MigrationProjectTaskTime=Actualizare de timp petrecut în secunde
-MigrationActioncommElement=Actualiza datele privind acţiunile
+MigrationActioncommElement=Actualizare date pe acţiuni
 MigrationPaymentMode=Migrare de date pentru modul de plată
 MigrationCategorieAssociation=Migrarea categoriilor
 
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
+ShowNotAvailableOptions=Afişează opţiunile nedisponibile
+HideNotAvailableOptions=Acunde opţiunile nedisponibile
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index 1ab3e168ebb..12c12ea721a 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -115,7 +115,7 @@ SentBy=Trimis de
 MailingNeedCommand=Din motive de securitate, trimiterea unui email-uri este mai bine cand este efectuată de la linia de comandă. Dacă aveți unul, întrebați administratorul pentru a lansa următoarea comandă pentru a trimite email-uri la toți destinatarii:
 MailingNeedCommand2=Puteţi, totuşi, trimite-le on-line, prin adăugarea parametrului MAILING_LIMIT_SENDBYWEB cu valoare de numărul maxim de mesaje de poştă electronică pe care doriţi să o trimiteţi prin sesiuni.
 ConfirmSendingEmailing=Dacă nu puteţi sau preferaţi să le trimiteţi cu browser-ul web, vă rugăm să confirmați că sunteți sigur că doriți să trimiteți emailurile acum de la browser-ul dvs.?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Notă: Trimiterea de emailurilor din interfata web se face de mai multe ori din motive de securitate și pauze, <b>%s</b> beneficiari la un moment dat pentru fiecare sesiune trimitere.
 TargetsReset=Cer senin lista
 ToClearAllRecipientsClickHere=Pentru a goli beneficiarilor lista pentru acest email-uri, faceţi clic pe butonul
 ToAddRecipientsChooseHere=Pentru a adăuga destinatari, alegeţi din aceste liste
@@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=%s notificări vor fi trimise prin e-mail
 AddNewNotification=Activaţi un nou target  email notificari 
 ListOfActiveNotifications=Lista tuturor targetelor emailurilor de notificare
 ListOfNotificationsDone=Lista toate notificările e-mail trimis
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=Configurarea trimiterii  e-mail a fost de configurat la '%s'.  Acest mod nu poate fi utilizat pentru a trimite email-uri în masă.
+MailSendSetupIs2=Trebuie mai întâi să mergi, cu un cont de administrator, în meniu%sHome - Setup - EMails%s  pentru a schimba parametrul  <strong>'%s'</strong> de utilizare în modul '%s'.  Cu acest mod, puteți introduce configurarea serverului SMTP furnizat de furnizorul de servicii Internet și de a folosi facilitatea Mass email .
+MailSendSetupIs3=Daca aveti intrebari cu privire la modul de configurare al serverului SMTP, puteți cere la %s.
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index 95203b0641a..a60474b8897 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -85,8 +85,7 @@ SubscriptionLateShort=Întârziate
 SubscriptionNotReceivedShort=Neîncasată
 ListOfSubscriptions=Lista cotizaţii
 SendCardByMail=Trimite fişa pe email
-AddMember=Adaugă membru
-MemberType=Tip Membru
+AddMember=Creare membru
 NoTypeDefinedGoToSetup=Nici un  tip de membru definit.  Du-te la meniull "Tipuri Membri"
 NewMemberType=Tip nou Membru
 WelcomeEMail=Email de bun venit
@@ -126,7 +125,7 @@ Date=Dată
 DateAndTime=Data şi ora
 PublicMemberCard=Fişa Membru public
 MemberNotOrNoMoreExpectedToSubscribe=Membrii care n-au plătit cotizaţia
-AddSubscription=Adaugă cotizaţie
+AddSubscription=Creare adeziune
 ShowSubscription=Afişează adeziune
 MemberModifiedInDolibarr=Membrii modificaţi în Dolibarr
 SendAnEMailToMember=Trimite e-mail de informare membrului
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Valoarea ultimei cotizaţii
 MembersStatisticsByCountries=Statistici Membri după ţară
 MembersStatisticsByState=Statistici Membri  după regiune / judeţ
 MembersStatisticsByTown=Statistici Membri după oraşe
+MembersStatisticsByRegion=Statistici Membri  după regiune
+MemberByRegion=Membrii după regiune
 NbOfMembers=Număr  membri
 NoValidatedMemberYet=Nici un membru validat găsit
 MembersByCountryDesc=Acest ecran vă arată statisticile cu privire la membrii după ţări. Graficul depinde  serviciul on-line Google grafic şi este disponibil numai în cazul în care conexiunea la internet este activă.
@@ -202,3 +203,4 @@ MembersByNature=Membri după personalitate juridică
 VATToUseForSubscriptions=Rata TVA utilizată pentru înscrieri
 NoVatOnSubscription=Fără TVA la adeziuni
 MEMBER_PAYONLINE_SENDEMAIL=Email de avertizare atunci când Dolibarr primeşte o confirmare a unei plăți validate pentru înscriere
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produs folosit pentru linia  abonamentului în factura:  %s
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 579ae622ecc..52e5bd348e1 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=O expediţie există
 DraftOrWaitingApproved=Comenzi Schiţe sau încă  neaprobate
 DraftOrWaitingShipped=Comenzi Schiţe sau  validate încă neexpediate
 MenuOrdersToBill=Comenzi livrate
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Comenzi facturabile
 SearchOrder=Caută Comanda
 SearchACustomerOrder=Caută o comandă client
 ShipProduct=Expediază produs
diff --git a/htdocs/langs/ro_RO/paybox.lang b/htdocs/langs/ro_RO/paybox.lang
index 5e7b247ee58..864c5f70c35 100644
--- a/htdocs/langs/ro_RO/paybox.lang
+++ b/htdocs/langs/ro_RO/paybox.lang
@@ -35,6 +35,6 @@ MessageKO=Mesaj de pe pagina anulat schimbul de plată
 NewPayboxPaymentReceived=O nouă plată Paybox primită
 NewPayboxPaymentFailed=O plată nouă Paybox încercată dar eşuată
 PAYBOX_PAYONLINE_SENDEMAIL=Email pentru avertizare după o plată (realizată sau nu)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_PBX_SITE=Valoare pentru PBX SITE
+PAYBOX_PBX_RANG=Valoare pentru PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Valoare pentru PBX ID
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 94de8dd384d..f2e97e17072 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Setează acelasi preţ pe subsidiarele clientuli
 PriceByCustomerLog=Log Preţ pe client
 MinimumPriceLimit=Preţul minim nu poate fi mai mic decat %s
 MinimumRecommendedPrice=Preţul minim recomandat este: %s
+PriceExpressionEditor=Editor expresie preț
+PriceExpressionSelected=Expresie preț selectatată
+PriceExpressionEditorHelp="preț = 2 + 2" sau "2 + 2" pentru stabilirea prețului <br> Extra câmpurile sunt variabile, cum ar fi ""#options_myextrafieldkey# * 2"<br> Există variabile speciale, cum ar fi#quantity# and #tva_tx#<br> Folosiți ; pentru a separa expresiile
+PriceMode=Mod  preț
+PriceNumeric=Număr
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 8d89f5a4f9d..e5fb1a57e8c 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -36,6 +36,8 @@ TaskTimeSpent=Timp consumat pe task
 TaskTimeUser=Utilizator
 TaskTimeNote=Nota
 TaskTimeDate=Data
+TasksOnOpenedProject=Sarcini la proiectele deschise
+WorkloadNotDefined=Volumul de muncă nu este definit
 NewTimeSpent=Timp nou consumat
 MyTimeSpent=Timpul meu consumat
 MyTasks=TAskurile mele
diff --git a/htdocs/langs/ro_RO/resource.lang b/htdocs/langs/ro_RO/resource.lang
index d64075dfbf5..8a2f531d677 100644
--- a/htdocs/langs/ro_RO/resource.lang
+++ b/htdocs/langs/ro_RO/resource.lang
@@ -1,36 +1,34 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Resurse
+MenuResourceAdd=Resursă nouă
+MenuResourcePlanning=Planificare resursă
+DeleteResource=Şterge resursa
+ConfirmDeleteResourceElement=Confirmaţi ştergerea resursei pentru acest element
+NoResourceInDatabase=Nici o resursă în baza de date.
+NoResourceLinked=Nici o resursă legată
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Lista resurse
+ResourceSingular=Resursă
+ResourceCard=Fişă resursă
+AddResource=Crează resursă
+ResourceFormLabel_ref=Nume resursă
+ResourceType=Tip resursă
+ResourceFormLabel_description=Descriere resursă
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Resurse legate de elementul
 
-ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+ShowResourcePlanning=Arată planificare resursă
+GotoDate=Mergi la data
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Element resurse
+ResourceCreatedWithSuccess=Resursă creată
+RessourceLineSuccessfullyDeleted=Linie resursă ștearsă
+RessourceLineSuccessfullyUpdated=Linie  resursă actualizată
+ResourceLinkedWithSuccess=Resursă legată cu succes
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Fişă resursă
+ConfirmDeleteResource=Confirmaţi ştergerea acestei resurse
+RessourceSuccessfullyDeleted=Resursă ştearsă
+DictionaryResourceType=Tipuri resurse
 
-DictionaryEMailTemplates=Modèles d'Emails
-
-SelectResource=Select resource
+SelectResource=Selectează resursa
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 24f32791525..b951fc80a47 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Eticheta Depozit este obligatorie
 CorrectStock=Corectează stoc
 ListOfWarehouses=Lista  depozite
 ListOfStockMovements=Lista mişcări de stoc
-StocksArea=Warehouses area
+StocksArea=Zona Depozite
 Location=Locație
 LocationSummary=Nume scurt locaţie
 NumberOfDifferentProducts=Numărul de produse diferite
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index 31d08174920..e6a719a0b0e 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -102,7 +102,7 @@ UserDisabled=User %s cu handicap
 UserEnabled=User %s activat
 UserDeleted=User %s eliminat
 NewGroupCreated=Grupul creat %s
-GroupModified=Group %s modified
+GroupModified=Grup %s modificat
 GroupDeleted=Grupul %s eliminat
 ConfirmCreateContact=Yu Sunteţi sigur că doriţi să creaţi un cont pentru acest Dolibarr de contact?
 ConfirmCreateLogin=Sunteţi sigur că doriţi să creaţi un cont pentru acest Dolibarr membru?
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index 38374aafce8..0793f5019ea 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -47,7 +47,7 @@ RefusedData=Data respingerii
 RefusedReason=Motivul respingerii
 RefusedInvoicing=Facturare respingerea
 NoInvoiceRefused=Nu încărcaţi respingerea
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Factura refuzată (Încărcați  refuzul la client)
 Status=Status
 StatusUnknown=Necunoscut
 StatusWaiting=Aşteptare
@@ -79,10 +79,11 @@ CreditDate=Credit pe
 WithdrawalFileNotCapable=Imposibil de a genera fișierul chitanţă de retragere pentru țara dvs %s (Țara dvs. nu este acceptată)
 ShowWithdraw=Arată Retragere
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Cu toate acestea, dacă factura are cel puțin o plată de retragere  încă neprelucrată, aceasta nu va fi setată ca plătită permite în  prealabil gestionarea retragerii.
-DoStandingOrdersBeforePayments=Acest tab vă permite să solicitaţi un ordin de plată. Odată ce este complet, puteți introduce plata pentru a închide factura.
+DoStandingOrdersBeforePayments=Acest tab vă permite să solicitaţi un ordin de plată.   Odată ce este dat intră în  meniul Bancă> Retragerea de a gestiona ordinul de plată. Când ordinul de plată este închis, plata pe factura va fi înregistrată în mod automat, iar factura închisă dacă restul de plata este nul.
 WithdrawalFile=Fişier Retragere
 SetToStatusSent=Setează statusul "Fişier Trimis"
 ThisWillAlsoAddPaymentOnInvoice=Aceasta se va aplica, de asemenea, plății facturilor și vor  fi clasificate ca "Plătit"
+StatisticsByLineStatus=Statistici după starea  liniilor
 
 ### Notifications
 InfoCreditSubject=Plata %s comandă în picioare de către bancă
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index fce5cff17a9..d85f4bd7539 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Использовать автодополнение 
 ActivityStateToSelectCompany= Добавить в фильтр опцию показать / скрыть контрагентов, которые в настоящее время бездействуют или отстранились
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Использовать автодополнение для выбора контакта (вместо списка)
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Настройки поискового фильтра
 NumberOfKeyToSearch=Кол-во символов для запуска поиска: %s
 ViewFullDateActions=Показать полный даты действия в третий лист
@@ -208,6 +210,7 @@ ModulesJobDesc=Бизнес модули обеспечивают простую
 ModulesMarketPlaceDesc=Вы сможете найти больше модулей для загрузки на внешних веб-сайтах в Интернете ...
 ModulesMarketPlaces=Еще модули ...
 DoliStoreDesc=DoliStore, официальный рынок для внешних модулей Dolibarr ERP / CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Веб-сайты, где Вы можете найти еще модули ...
 URL=Ссылка
 BoxesAvailable=Доступные боксы
@@ -444,7 +447,7 @@ Module55Desc=Штрих-коды управления
 Module56Name=Телефония
 Module56Desc=Телефония интеграции
 Module57Name=Постоянные заказы
-Module57Desc=Постоянные приказы и снятие управления
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial интеграции
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Подача
 Module320Desc=Добавить RSS канал внутри Dolibarr экране страниц
 Module330Name=Закладки
 Module330Desc=Закладки управления
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграции
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Категории
 Module1780Desc=Категории управления (продукции, поставщиков и заказчиков)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG редактор
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Управление запланированными заданиями
 Module2400Name=Повестка дня
@@ -503,6 +508,8 @@ Module2500Name=Электронное управление
 Module2500Desc=Сохранение и обмен документами
 Module2600Name=WebServices
 Module2600Desc=Включить сервер услуг Dolibarr Сети
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Использование онлайн Gravatar службы (www.gravatar.com), чтобы показать фото пользователей / участников (нашли с их электронной почты). Необходимость доступа в Интернет
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Модуль предлагает онлайн страницу оплаты с помощью кредитной карты с PayBox
 Module50100Name=Кассовое
@@ -527,7 +534,7 @@ Module50200Desc=Модуль предлагает онлайн страницу
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Управление Бизнес-Процессами
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Наценки
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Происхождение Коммерческих предложений / Заказов
 DictionaryAccountancyplan=План счетов
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Настройки сохранены
 BackToModuleList=Вернуться к списку модулей
 BackToDictionaryList=Назад к списку словарей
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Постоянный поиск формы на лево
 DefaultLanguage=Язык по умолчанию (код языка)
 EnableMultilangInterface=Включить многоязычный интерфейс
 EnableShowLogo=Показать логотип на левом меню
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Система была успешно обновлена
 CompanyInfo=Информация о Компании / фонде
 CompanyIds=Компания / фундамент тождествам
diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang
index fbe2fb1cfcf..ff1b49742b4 100644
--- a/htdocs/langs/ru_RU/agenda.lang
+++ b/htdocs/langs/ru_RU/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=События назначенные
 ActionsDoneBy=Действия, проделанную
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Все мои действия / задачи
 AllActions= Все ле действия / задачи
 ViewList=Посмотреть список
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index 9c6f18e7213..ba15732dac1 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Режим вычислений
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/ru_RU/contracts.lang b/htdocs/langs/ru_RU/contracts.lang
index 0e2e79dd3c3..16b0b7d4c85 100644
--- a/htdocs/langs/ru_RU/contracts.lang
+++ b/htdocs/langs/ru_RU/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Список запуска контракта ли
 ListOfRunningServices=Список запущенных служб
 NotActivatedServices=Не активируется услуг (в том числе утверждены контракты)
 BoardNotActivatedServices=Услуги для активации среди утверждены контракты
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Последнее %s активированных услуг
 LastModifiedServices=Последнее% с измененными услуги
 EditServiceLine=Изменить направление
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Список истекающих услуг
 NoteListOfYourExpiredServices=Этот список содержит только услуги по договорам с Контрагентами, с которыми связаны как торговый представитель
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Торговый представитель подписания контракта
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index a4f06909eab..34a00865c83 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Требуется код Поставщика
 ErrorSupplierCodeAlreadyUsed=Код Поставщика уже используется
 ErrorBadParameters=Неверные параметры
 ErrorBadValueForParameter=Неверное значение %s для параметра неправильной %s
-ErrorBadImageFormat=Файл изображения имеет не поддерживаемый формат
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat= Значение '%s' имеет неверный формат даты
 ErrorWrongDate=Дата некорректна!
 ErrorFailedToWriteInDir=Не удалось записать в директорию %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Пользователь с <b>логином %s</b> н
 ErrorLoginHasNoEmail=Этот пользователь не имеет адреса электронной почты. Процесс прерван.
 ErrorBadValueForCode=Плохо значения типов кода. Попробуйте еще раз с новой стоимости ...
 ErrorBothFieldCantBeNegative=Поля %s и %s не может быть и отрицательным
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Учетная запись пользователя <b>%s</b> используется для выполнения веб-сервер не имеет разрешения для этого
 ErrorNoActivatedBarcode=Нет штрих-кодов типа активированного
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Обязательные параметры не определены
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index 9d4f302eb56..b7750075fd8 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Поздно
 SubscriptionNotReceivedShort=Никогда не получил
 ListOfSubscriptions=Список подписчиков
 SendCardByMail=Отправить карту
-AddMember=Добавить члена
+AddMember=Create member
 NoTypeDefinedGoToSetup=Ни один из членов определенных типов. Переход к установке - членов типов
 NewMemberType=Новый член типа
 WelcomeEMail=Приветственное Email-письмо
@@ -125,7 +125,7 @@ Date=Свидание
 DateAndTime=Дата и время
 PublicMemberCard=Член общественного карту
 MemberNotOrNoMoreExpectedToSubscribe=Члены, не больше и не ожидается, подписаться
-AddSubscription=Добавить подписку
+AddSubscription=Create subscription
 ShowSubscription=Показать подписки
 MemberModifiedInDolibarr=Член Изменения в Dolibarr
 SendAnEMailToMember=Отправить по электронной почте информацию члена
@@ -203,3 +203,4 @@ MembersByNature=Members by nature
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index 27b43d63d39..c94b0a8803c 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Если продукт является услугой 
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Кол-во Цена
 MultiPriceLevelsName=Цена категорий
-AssociatedProductsAbility=Включить связанные продукты
-AssociatedProducts=Связанные продукты
-AssociatedProductsNumber=Количество продукции
-ParentProductsNumber=Количество родителей продукт
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Ассоциированные
 Translation=Перевод
 KeywordFilter=Ключевое слово фильтр
@@ -132,7 +132,7 @@ AddDel=Добавить / Удалить
 Quantity=Кол-во
 NoMatchFound=Не найдено соответствия
 ProductAssociationList=Список продуктов / услуг: Наименование товара / услуги (количество пострадавших)
-ProductParentList=Список продуктов / услуг с этим продуктом в качестве компонента
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Один из выбранного продукта родителей с действующим продукта
 DeleteProduct=Удалить товар / услугу
 ConfirmDeleteProduct=Вы уверены, что хотите удалить этот продукт / услугу?
@@ -179,7 +179,7 @@ CloneProduct=Клон продукт или услугу
 ConfirmCloneProduct=Вы уверены, что хотите клонировать продукт или <b>услуга %s?</b>
 CloneContentProduct=Клон все основные данные о продукции / услуг
 ClonePricesProduct=Клон основные данные и цены
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Этот продукт используется
 NewRefForClone=Ссылка нового продукта / услуги
 CustomerPrices=Клиенты цены
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 85f329b89b2..ec8ab9c70d4 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Эта точка зрения представляет всех пр
 Myprojects=Мои проекты
 ProjectsArea=Проекты области
 NewProject=Новый проект
-AddProject=Добавить проект
+AddProject=Create project
 DeleteAProject=Удаление проекта
 DeleteATask=Удалить задание
 ConfirmDeleteAProject=Вы уверены, что хотите удалить этот проект?
@@ -36,6 +36,8 @@ TaskTimeSpent=Время, потраченное на задачи
 TaskTimeUser=Пользователь
 TaskTimeNote=Заметка
 TaskTimeDate=Дата
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Новое время
 MyTimeSpent=Мое время
 MyTasks=Мои задачи
@@ -45,7 +47,7 @@ TaskDateStart=Дата начала задачи
 TaskDateEnd=Дата завершения задачи
 TaskDescription=Описание задачи
 NewTask=Новые задачи
-AddTask=Добавить задачу
+AddTask=Create task
 AddDuration=Добавить продолжительность
 Activity=Мероприятие
 Activities=Задачи / мероприятия
diff --git a/htdocs/langs/ru_RU/resource.lang b/htdocs/langs/ru_RU/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/ru_RU/resource.lang
+++ b/htdocs/langs/ru_RU/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index 4e8a688b7ce..1e27c270b19 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Кредит на
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Показать Вывод
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Однако, если счет-фактура имеет по крайней мере один вывод оплаты еще не обработан, то он не будет установлен, как оплачиваются, чтобы управлять снятие ранее.
-DoStandingOrdersBeforePayments=Это вкладок позволяет запросить за постоянного платежного поручения. Как только она будет закончена, вы можете ввести оплату, чтобы закрыть счета.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Оплата постоянных %s порядке банк
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 06473396026..c726f320ec8 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Pridať možnosť filtra pre zobrazenie / skrytie thirdparties, ktoré sú v súčasnej dobe v činnosti alebo prestal ju
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Hľadať filtre možnosti
 NumberOfKeyToSearch=Predradníka znaky na spustenie hľadania: %s
 ViewFullDateActions=Všetky dáta udalosti v tretí list
@@ -208,6 +210,7 @@ ModulesJobDesc=Obchodné moduly poskytujú jednoduché preddefinované nastaveni
 ModulesMarketPlaceDesc=Môžete si nájsť viac modulov k stiahnutiu na externých webových stránok na internete ...
 ModulesMarketPlaces=Viac moduly ...
 DoliStoreDesc=DoliStore, oficiálny trh pre Dolibarr ERP / CRM externých modulov
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Poskytovatelia webových stránok môžete vyhľadávať nájsť viac modulov ...
 URL=Odkaz
 BoxesAvailable=Trezory sú k dispozícii
@@ -444,7 +447,7 @@ Module55Desc=Barcode riadenie
 Module56Name=Telefónia
 Module56Desc=Telefónia integrácia
 Module57Name=Trvalé príkazy
-Module57Desc=Trvalé príkazy a abstinenčné riadenie
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrácia ClickToDial systému (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Pridať RSS kanál vnútri obrazoviek Dolibarr
 Module330Name=Záložky
 Module330Desc=Správa záložiek
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integrácia
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Kategórie
 Module1780Desc=Category management (produkty, dodávatelia a odberatelia)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Nechajte upraviť niektoré textové pole pomocou pokročilého editora
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Plánované správu úloh
 Module2400Name=Program rokovania
@@ -503,6 +508,8 @@ Module2500Name=Elektronický Redakčný
 Module2500Desc=Uložiť a zdieľať dokumenty
 Module2600Name=WebServices
 Module2600Desc=Povoliť Dolibarr webových služieb servera
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Pomocou on-line služby (Gravatar www.gravatar.com) ukázať fotku užívateľov / členov (nájdený s ich e-maily). Potrebujete prístup k internetu
 Module2800Desc=FTP klient
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modul ponúknuť on-line platby kreditnou kartou stránku s Paybox
 Module50100Name=Bod predaja
@@ -527,7 +534,7 @@ Module50200Desc=Modul ponúknuť on-line platby kreditnou kartou stránku s Payp
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Tlač cez poháre tlačiarne IPP.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Okraje
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Nastavenie uložené
 BackToModuleList=Späť na zoznam modulov
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanentný vyhľadávací formulár na ľavom menu
 DefaultLanguage=Predvolený jazyk používať (kód jazyka)
 EnableMultilangInterface=Povoliť viacjazyčné rozhranie
 EnableShowLogo=Zobraziť logo na ľavom menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Systém bol úspešne aktualizovaný
 CompanyInfo=Spoločnosti / Nadácia informácie
 CompanyIds=Spoločnosť / nadácie identity
diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang
index b267c89fb22..6aaa3b7800d 100644
--- a/htdocs/langs/sk_SK/agenda.lang
+++ b/htdocs/langs/sk_SK/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Akcia priradené
 ActionsDoneBy=Akcie vykonané
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Všetky moje akcie / úlohy
 AllActions= Všetky udalosti / úlohy
 ViewList=Zobrazenie zoznamu
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index a3dd3513e49..05c32f0d35a 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=podľa dodávateľa zvoliť vhodnú metódu použiť
 TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat správa za tovar, pri použití <b>hotovosti evidencia</b> režim nie je relevantná. Táto správa je k dispozícii len pri použití <b>zásnubný evidencia</b> režimu (pozri nastavenie účtovného modulu).
 CalculationMode=Výpočet režim
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/sk_SK/contracts.lang b/htdocs/langs/sk_SK/contracts.lang
index d69c3405dd9..9ed7ccf7da6 100644
--- a/htdocs/langs/sk_SK/contracts.lang
+++ b/htdocs/langs/sk_SK/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Zoznam bežiacich zmlúv liniek
 ListOfRunningServices=Zoznam spustených služieb
 NotActivatedServices=Neaktívne služby (u overených zmlúv)
 BoardNotActivatedServices=Služby pre aktiváciu u overených zmlúv
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Posledné %s aktiváciu služby
 LastModifiedServices=Posledné %s upravené služby
 EditServiceLine=Upraviť linka
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Zoznam služieb vyprší
 NoteListOfYourExpiredServices=Tento zoznam obsahuje iba služby zmlúv pre tretie strany si sú prepojené ako obchodného zástupcu.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Obchodný zástupca podpise zmluvy
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 06bdb2b3b44..1b9648f54a2 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Dodávateľ povinný kód
 ErrorSupplierCodeAlreadyUsed=Dodávateľ kód už používaný
 ErrorBadParameters=Bad parametre
 ErrorBadValueForParameter=Chybná hodnota &quot;%s&quot; pre nastavenie parametrov nesprávnych &quot;%s&quot;
-ErrorBadImageFormat=Obrazový súbor nemá podporovaný formát
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Hodnota &quot;%s&quot; má nesprávny formát dátumu
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Nepodarilo sa zapísať do adresára %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Užívateľ s prihlásením <b>%s</b> nebol nájdený.
 ErrorLoginHasNoEmail=Tento užívateľ nemá žiadnu e-mailovú adresu. Proces prerušená.
 ErrorBadValueForCode=Bad hodnota bezpečnostného kódu. Skúste to znova s ​​novou hodnotou ...
 ErrorBothFieldCantBeNegative=Polia %s a %s nemôžu byť negatívna
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Užívateľský účet <b>%s</b> použiť na spustenie webový server nemá oprávnenie pre ktoré
 ErrorNoActivatedBarcode=Žiaden čiarový kód aktivovaný typ
 ErrUnzipFails=Nepodarilo sa rozbaliť %s s ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Povinné parametre sú doteraz stanovené
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index 473092c87c0..eec0d8666a4 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -85,8 +85,7 @@ SubscriptionLateShort=Neskoro
 SubscriptionNotReceivedShort=Nikdy nedostal
 ListOfSubscriptions=Zoznam predplatné
 SendCardByMail=Poslať kartu e-mailom
-AddMember=Pridať člena
-MemberType=Členské typ
+AddMember=Create member
 NoTypeDefinedGoToSetup=Žiadny člen definované typy. Choď na menu &quot;Členovia typy&quot;
 NewMemberType=Nový člen typu
 WelcomeEMail=Vitajte e-mail
@@ -126,7 +125,7 @@ Date=Dátum
 DateAndTime=Dátum a čas
 PublicMemberCard=Členské verejné karta
 MemberNotOrNoMoreExpectedToSubscribe=Člen, ktorý alebo nie viac očakáva, že k odberu
-AddSubscription=Pridať predplatné
+AddSubscription=Create subscription
 ShowSubscription=Zobraziť predplatné
 MemberModifiedInDolibarr=Člen upravený v Dolibarr
 SendAnEMailToMember=Poslať e-mail Informácie o členovi
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Posledný úpisu
 MembersStatisticsByCountries=Členovia Štatistiky podľa krajiny
 MembersStatisticsByState=Členovia štatistika štát / provincia
 MembersStatisticsByTown=Členovia štatistika podľa mesta
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Počet členov
 NoValidatedMemberYet=Žiadne overené členmi nájdených
 MembersByCountryDesc=Táto obrazovka vám ukáže štatistiku členov jednotlivých krajinách. Grafika však závisí od Google on-line služby grafu a je k dispozícii iba v prípade, je pripojenie k internetu funguje.
@@ -202,3 +203,4 @@ MembersByNature=Členovia od prírody
 VATToUseForSubscriptions=Sadzba DPH sa má použiť pre predplatné
 NoVatOnSubscription=Nie TVA za upísané vlastné imanie
 MEMBER_PAYONLINE_SENDEMAIL=E-mail upozorniť pri Dolibarr obdržíte potvrdenie o overenú platby za predplatné
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/sk_SK/printipp.lang b/htdocs/langs/sk_SK/printipp.lang
index 1b051dae6cb..835e6827f12 100644
--- a/htdocs/langs/sk_SK/printipp.lang
+++ b/htdocs/langs/sk_SK/printipp.lang
@@ -1,18 +1,14 @@
-/*
- * Language code: sk_SK
- * Automatic generated via autotranslator.php tool
- * Generation date 2013-11-08 23:25:26
- */
-
-
-// START - Lines generated via autotranslator.php tool (2013-11-08 23:25:26).
-// Reference language: en_US -> sk_SK
-PrintIPPSetup=Nastavenie modulu Priama tlač
-PrintIPPDesc=Ce modul Permet d'un ajouter Bouton d'dojem priame des dokumenty vers votre imprimante. Il requiert un systeme Linux Equipe de poháre.
-PRINTIPP_ENABLED=Zobraziť Piktogram &quot;Priama tlač&quot; do zoznamu dokumentov
-PRINTIPP_HOST=Tlačový server
-PRINTIPP_PORT=Prístav
-PRINTIPP_USER=Prihlásenie
-PRINTIPP_PASSWORD=Heslo
-NoPrinterFound=Žiadne tlačiarne nájdené (skontrolujte poháre Nasta)
-// STOP - Lines generated via autotranslator.php tool (2013-11-08 23:48:51).
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index 6df1806e58a..c8e4d892a18 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Je-li výrobok je služba s obmedzeným trvaním:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Počet cien
 MultiPriceLevelsName=Cenové kategórie
-AssociatedProductsAbility=Aktivácia virtuálne produkty sa vyznačujú
-AssociatedProducts=Virtuálne produkt
-AssociatedProductsNumber=Počet výrobkov tvoriacich tento virtuálny produkt
-ParentProductsNumber=Počet materskej virtuálneho produktu
-IfZeroItIsNotAVirtualProduct=Ak je 0, tento produkt nie virtuálneho produktu
-IfZeroItIsNotUsedByVirtualProduct=Je-li 0, je tento výrobok nie je používaný žiadnym virtuálneho produktu
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Asociovať
 Translation=Preklad
 KeywordFilter=Kľúčové slovo filter
@@ -132,7 +132,7 @@ AddDel=Pridať / Odstrániť
 Quantity=Množstvo
 NoMatchFound=Nie nájdená zhoda
 ProductAssociationList=Zoznam súvisiacich produktov / služieb: názov produktu / služby (množstvo ovplyvnené)
-ProductParentList=Zoznam virtuálnych produktov / služieb s týmto produktom ako súčasť
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Jedným z vybraného produktu je rodič s aktuálnou produkt
 DeleteProduct=Odstránenie produktu / služby
 ConfirmDeleteProduct=Ste si istí, že chcete zmazať tento výrobok / službu?
@@ -179,7 +179,7 @@ CloneProduct=Clone produkt alebo službu
 ConfirmCloneProduct=Ste si istí, že chcete klonovať produktov alebo služieb <b>%s?</b>
 CloneContentProduct=Klon všetky hlavné informácie o produkte / služby
 ClonePricesProduct=Klonovať hlavné informácie a ceny
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Tento produkt sa používa
 NewRefForClone=Ref nového produktu / služby
 CustomerPrices=Zákazníci ceny
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 1772c61049f..8639f46b4fa 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Tento názor predstavuje všetky projekty a úlohy (vaše užívateľs
 Myprojects=Moje projekty
 ProjectsArea=Projekty oblasť
 NewProject=Nový projekt
-AddProject=Pridať projekt
+AddProject=Create project
 DeleteAProject=Odstránenie projektu
 DeleteATask=Ak chcete úlohu
 ConfirmDeleteAProject=Ste si istí, že chcete zmazať tento projekt?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nový čas strávený
 MyTimeSpent=Môj čas strávený
 MyTasks=Moje úlohy
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Nová úloha
-AddTask=Pridať úloha
+AddTask=Create task
 AddDuration=Pridať trvania
 Activity=Činnosť
 Activities=Úlohy / aktivity
diff --git a/htdocs/langs/sk_SK/resource.lang b/htdocs/langs/sk_SK/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/sk_SK/resource.lang
+++ b/htdocs/langs/sk_SK/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index f7fc78cb9af..4bb8cdd1569 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Kredit na
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Zobraziť Natiahnite
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Odstúpenie súbor
 SetToStatusSent=Nastavte na stav &quot;odoslaný súbor&quot;
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Platba %s trvalého príkazu bankou
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index b72bb07c101..dc018fa38c8 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Za izbiranje partnerjev uporabite polja z avtomatsko iz
 ActivityStateToSelectCompany= Dodaj opcijo filtra za prikaz/skritje partnerjev, ki so trenutno neaktivni ali so prekinili aktivnosti
 UseSearchToSelectContactTooltip=Če je partnerjev zelo veliko (> 100 000), lahko hitrost povišate z nastavitvijo konstante SOCIETE_DONOTSEARCH_ANYWHERE na 1 v Nastavitve->Ostale nastavitve. Iskanje bo s tem omejeno na začetek niza.
 UseSearchToSelectContact=Zaizbiro kontakta uporabite polja z avtomatsko izpolnitvijo (namesto uporabe seznama).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Opcije iskalnega filtra
 NumberOfKeyToSearch=Število znakov za sproženje iskanja: %s ViewFullDateActions=Prikaži celotne datume aktivnosti na tretjem listu
 ViewFullDateActions=Prikaz polnih datumov aktivnosti v tretjem zavihku
@@ -208,6 +210,7 @@ ModulesJobDesc=Poslovni moduli zagotavljajo enostavne prednastavitve aplikacije
 ModulesMarketPlaceDesc=Več modulov si lahko naložite preko zunanjih web strani na internetu...
 ModulesMarketPlaces=Več modulov...
 DoliStoreDesc=DoliStore, uradna tržnica za Dolibarr ERP/CRM zunanje module
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Ponudniki spletnih strani, na katerih lahko poiščete več modulov...
 URL=Link
 BoxesAvailable=Polja, ki so na voljo
@@ -437,14 +440,14 @@ Module52Name=Zaloge
 Module52Desc=Upravljanje zalog proizvodov
 Module53Name=Storitve
 Module53Desc=Upravljanje storitev
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Pogodbe/naročnine
+Module54Desc=Upravljanje pogodb (storitev ali ponavljajočih naročnin)
 Module55Name=Črtne kode
 Module55Desc=Upravljanje črtnih kod
 Module56Name=Telefonija
 Module56Desc=Integracija telefonije
 Module57Name=Trajniki
-Module57Desc=Upravljanje trajnikov in dvigov
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=Klic s klikom
 Module58Desc=Integracija klica s klikom
 Module59Name=Vaš zaznamek
@@ -475,8 +478,8 @@ Module320Name=Vir RSS
 Module320Desc=Dodajanje vira RSS na prikazane Dolibarr strani
 Module330Name=Zaznamki
 Module330Desc=Upravljanje zaznamkov
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projekti/priložnosti/možnosti
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Internetni koledar
 Module410Desc=Integracija internetnega koledarja
 Module500Name=Posebni stroški (davki, socialni prispevki, dividende)
@@ -484,7 +487,7 @@ Module500Desc=Upravljanje posebnih stroškov, kot so davki, socialni prispevki,
 Module510Name=Plače
 Module510Desc=Upravljanje plač in plačil zaposlenim
 Module600Name=Obvestila
-Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
+Module600Desc=Pošiljanje obvestil o nekaterih Dolibarr dogodkih po e-mailu kontaktom pri partnerjih (nastavitev je določena za vsakega partnerja)
 Module700Name=Donacije
 Module700Desc=Upravljanje donacij
 Module1200Name=Mantis
@@ -495,6 +498,8 @@ Module1780Name=Kategorije
 Module1780Desc=Upravljanje kategorij (proizvodi, dobavitelji in kupci)
 Module2000Name=Fck urejevalnik
 Module2000Desc=WYSIWYG urejevalnik
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Periodično opravilo
 Module2300Desc=Načrtovano upravljanje nalog
 Module2400Name=Dnevni red
@@ -503,6 +508,8 @@ Module2500Name=Upravljanje elektronskih vsebin
 Module2500Desc=Shranjevanje dokumentov in dajanje v skupno rabo
 Module2600Name=Spletne storitve
 Module2600Desc=Omogočanje Dolibarr strežnika za spletne storitve
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Uporaba online Gravatar storitev (www.gravatar.com) za prikaz fotografij uporabnikov/članov (na osnovi njihovih emailov). Potreben je internetni dostop
 Module2800Desc=FTP Client
@@ -514,10 +521,10 @@ Module5000Name=Skupine podjetij
 Module5000Desc=Omogoča upravljaje skupine podjetij
 Module6000Name=Potek dela
 Module6000Desc=Upravljanje poteka dela
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
+Module20000Name=Upravljanje zahtevkov za dopust
+Module20000Desc=Določitev in sledenje zahtevkov za dopustov zaposlenih
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Modul za omogočanje strani za spletno plačevanje s kreditno kartico - PayBox
 Module50100Name=Prodajalne
@@ -527,7 +534,7 @@ Module50200Desc=Modul za omogočanje strani za spletno plačevanje s kreditno ka
 Module50400Name=Računovodstvo (napredno)
 Module50400Desc=Upravljanje računovodstva (dvostavno)
 Module54000Name=Tiskanje IPP
-Module54000Desc=Tiskanje preko Cups IPP tiskalnika
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Odpri anketo
 Module55000Desc=Modul za online ankete (kot Doodle, Studs, Rdvz, ...)
 Module59000Name=Marže
@@ -606,16 +613,16 @@ Permission151=Branje tekočih naročil
 Permission152=Nastavitve tekočih naročil
 Permission153=Prenos prejema tekočih naročil
 Permission154=Odobritev/zavrnitev prejema tekočih naročil
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission171=Read trips and expenses (own and his subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
+Permission161=Branje pogodb/naročnin
+Permission162=Kreiranje/spreminjanje pogodb/naročnin
+Permission163=Aktiviranje pogodbene storitve/naročnine
+Permission164=Onemogočenje pogodbene storitve/naročnine
+Permission165=Brisanje pogodb/naročnin
+Permission171=Branje potnih nalogov in stroškov (lastnih in podrejenih)
+Permission172=Kreiranje/spreminjanje potnih nalogov in stroškov
+Permission173=Brisanje potnih nalogov in stroškov
 Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
+Permission178=Izvoz potnih nalogov in stroškov
 Permission180=Branje dobaviteljev
 Permission181=Branje naročil pri dobaviteljih
 Permission182=Kreiranje/spreminjanje naročil pri dobaviteljih
@@ -672,7 +679,7 @@ Permission300=Branje črtnih kod
 Permission301=Kreiranje/spreminjanje črtnih kod
 Permission302=Brisanje črtnih kod
 Permission311=Branje storitev
-Permission312=Assign service/subscription to contract
+Permission312=Dodelitev storitve/naročnine pogodbi
 Permission331=Branje zaznamkov
 Permission332=Kreiranje/spreminjanje zaznamkov
 Permission333=Brisanje zaznamkov
@@ -702,8 +709,8 @@ Permission701=Branje donacij
 Permission702=Kreiranje/spreminjanje donacij
 Permission703=Delete donacij
 Permission1001=Branje zalog
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Kreiranje/spreminjanje skladišč
+Permission1003=Brisanje skladišč
 Permission1004=Branje gibanja zalog
 Permission1005=Kreiranje/spreminjanje gibanja zalog
 Permission1101=Branje dobavnic
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Metode naročanja
 DictionarySource=Izvor ponudb/naročil
 DictionaryAccountancyplan=Tabela računov
 DictionaryAccountancysystem=Modeli tabel računov
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Nastavitve shranjene
 BackToModuleList=Nazaj na seznam modulov
 BackToDictionaryList=Nazaj na seznam slovarjev
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Stalno polje za iskanje na levem meniju
 DefaultLanguage=Privzet jezik uporabe (koda jezika)
 EnableMultilangInterface=Omogočen večjezični vmesnik
 EnableShowLogo=Prikaži logo na levem meniju
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Vaš sistem je bil uspešno posodobljen
 CompanyInfo=Informacije o podjetju/ustanovi
 CompanyIds=Registracijski podatki o podjetju/ustanovi
diff --git a/htdocs/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang
index 81fa94bf320..db29ff08f42 100644
--- a/htdocs/langs/sl_SI/agenda.lang
+++ b/htdocs/langs/sl_SI/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Dogoki, ki se nanašajo na
 ActionsDoneBy=Dogodke izvedel
 ActionsForUser=Aktivnosti za uporabnika
 ActionsForUsersGroup=Aktivnosti za vse uporabnike v skupini
+ActionAssignedTo=Event assigned to
 AllMyActions= Vsi moji dogodki/naloge
 AllActions= Vse dogodki/naloge
 ViewList=Glej seznam
@@ -44,7 +45,7 @@ AgendaExtSitesDesc=Ta stran omogoča določitev zunanjih virov koledarjev za ogl
 ActionsEvents=Dogodki, za katere bo Dolibarr avtomatsko kreiral aktivnost v urniku
 PropalValidatedInDolibarr=Potrjena ponudba %s
 InvoiceValidatedInDolibarr=Potrjen račun %s
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Račun %s je potrjen preko POS
 InvoiceBackToDraftInDolibarr=Račun %s se vrača v status osnutka
 InvoiceDeleteDolibarr=Račun %s izbrisan
 OrderValidatedInDolibarr= Potrjeno naročilo %s
@@ -68,9 +69,9 @@ DateActionStart= Začetni datum
 DateActionEnd= Končni datum
 AgendaUrlOptions1=V filtriran izhod lahko dodate tudi naslednje parametre:
 AgendaUrlOptions2=<b>login=%s</b> za omejitev izhoda na aktivnosti, ki se nanašajo, ali jih je naredil uporabnik <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> za omejitev izhoda na aktivnosti v lasti uporabnika <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> za omejitev izhoda na aktivnosti, ki se nanašajo na uporabnika <b>%s</b>.
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>projekt=PROJECT_ID</b> za omejitev izhoda na aktivnosti povezane s projektom<b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Prikaži rojstni dan kontakta
 AgendaHideBirthdayEvents=Skrij rojstni dan kontakta
 Busy=Zaseden
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 7a3cd7e1b25..a2d5facd9e2 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Dobropis
 InvoiceAvoirAsk=Dobropis za korekcijo računa
 InvoiceAvoirDesc=<b>Dobropis</b> je negativni račun, ki se uporabi za rešitev problema, ko je znesek na računu drugačen od dejansko plačanega zneska (ker je kupec pomotoma plačal preveč, ali ne bo plačal v celoti, ker je na primer vrnil nekatere proizvode).
 invoiceAvoirWithLines=Ustvari dobropis z vrsticami iz originalnega računa
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+invoiceAvoirWithPaymentRestAmount=Ustvari dobropis iz neplačanega preostanka osnovnega računa
+invoiceAvoirLineWithPaymentRestAmount=Dobropis za preostali neplačan znesek
 ReplaceInvoice=Zamenjava računa %s
 ReplacementInvoice=Nadomestni račun
 ReplacedByInvoice=Zamenjan z računom %s
@@ -154,9 +154,9 @@ ConfirmCancelBill=Ali zares želite preklicati račun <b>%s</b> ?
 ConfirmCancelBillQuestion=Zakaj želite označiti ta račun kot 'opuščen' ?
 ConfirmClassifyPaidPartially=Ali zares želite spremeniti račun <b>%s</b> v status 'plačano' ?
 ConfirmClassifyPaidPartiallyQuestion=Ta račun ni bil plačan v celoti. Zakaj želite kljub temu zaključiti ta račun ?
-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.
-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.
+ConfirmClassifyPaidPartiallyReasonAvoir=Neplačan preostanek <b>(%s %s)</b> je popust zaradi predčasnega plačila. DDV je bil popravljen z dobropisom.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Neplačan preostanek <b>(%s %s)</b> je popust zaradi predčasnega plačila. Strinjam se z izgubo DDV zaradi tega popusta.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Neplačan preostanek <b>(%s %s)</b> je popust zaradi predčasnega plačila. DDV na ta popust bo vrnjen brez dobropisa.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Slab kupec
 ConfirmClassifyPaidPartiallyReasonProductReturned=Delno vračilo proizvodov
 ConfirmClassifyPaidPartiallyReasonOther=Znesek opuščen zaradi drugih razlogov
@@ -189,9 +189,9 @@ AlreadyPaid=Že plačano
 AlreadyPaidBack=Že vrnjeno plačilo
 AlreadyPaidNoCreditNotesNoDeposits=Že plačano (brez dobropisa in avansa)
 Abandoned=Opuščeno
-RemainderToPay=Remaining unpaid
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPay=Neplačan preostanek
+RemainderToTake=Preostanek vrednosti za odtegljaj
+RemainderToPayBack=Preostanek vrednosti za vrnitev
 Rest=Na čakanju
 AmountExpected=Reklamiran znesek
 ExcessReceived=Prejet presežek
@@ -217,18 +217,18 @@ NoInvoice=Ni računa
 ClassifyBill=Klacificiraj račun
 SupplierBillsToPay=Računi dobaviteljev za plačilo
 CustomerBillsUnpaid=Neplačani računi kupcev
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=Izpisani računi se pošiljajo po pošti
 NonPercuRecuperable=Nepovratno
 SetConditions=Nastavitev plačilnih pogojev
 SetMode=Nastavitev načina plačila
 Billed=Zaračunano
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
+RepeatableInvoice=Predloga računa
+RepeatableInvoices=Predloga računov
+Repeatable=Predloga
+Repeatables=Predloge
+ChangeIntoRepeatableInvoice=Pretvori v predlogo računa
+CreateRepeatableInvoice=Ustvari predlogo računa
+CreateFromRepeatableInvoice=Ustvari iz predloge računa
 CustomersInvoicesAndInvoiceLines=Računi za kupce in vrstice v računih
 CustomersInvoicesAndPayments=Računi za kupce in plačila
 ExportDataset_invoice_1=Seznam računov za kupce in vrstic v računih
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index 31a939fea21..53f17b73fa9 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -109,4 +109,4 @@ CategoriesSetup=Nastavitve kategorij
 CategorieRecursiv=Avtomatsko poveži z nadrejeno kategorijo
 CategorieRecursivHelp=Če je aktivirano, bo proizvod po dodajanju v podkategorijo povezan tudi z nadrejeno kategorijo
 AddProductServiceIntoCategory=Dodaj sledeči produkt/storitev
-ShowCategory=Show category
+ShowCategory=Prikaži kategorijo
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index b0cc63b9a96..8d61bb9401a 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/sl_SI/contracts.lang b/htdocs/langs/sl_SI/contracts.lang
index 102524da201..1575ee36695 100644
--- a/htdocs/langs/sl_SI/contracts.lang
+++ b/htdocs/langs/sl_SI/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Področje pogodb
 ListOfContracts=Seznam pogodb
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Zadnjih %s spremenjenih pogodb
 AllContracts=Vse pogodbe
 ContractCard=Kartica pogodbe
 ContractStatus=Status pogodbe
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Seznam aktivnih vrstic pogodbe
 ListOfRunningServices=Seznam aktivnih storitev
 NotActivatedServices=Neaktivne storitve (med potrjenimi pogodbami)
 BoardNotActivatedServices=Storitve, ki jih je potrebno aktivirati (med potrjenimi pogodbami)
-LastContracts=Last % contracts
+LastContracts=Zadnjih %s pogodb
 LastActivatedServices=Zadnjih %s aktiviranih storitev
 LastModifiedServices=Zadnjih %s spremenjenih storitev
 EditServiceLine=Ureditev storitvene vrstice
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Seznam storitev, ki potečejo
 NoteListOfYourExpiredServices=Ta seznam vsebuje samo storitve po pogodbah s partnerji, ki so povezane z referentom.
 StandardContractsTemplate=Predloga standardnih pogodb
 ContactNameAndSignature=Za %s, ime in podpis:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Podpisnik pogodbe
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index d0b1d69bfb5..7f9f857ec3a 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Obvezna koda dobavitelja
 ErrorSupplierCodeAlreadyUsed=Koda dobavitelja je že uporabljena
 ErrorBadParameters=Napačni parametri
 ErrorBadValueForParameter=Napačna vrednost '%s' za nepravilen parameter '%s'
-ErrorBadImageFormat=Format slikovne datoteke ni podprt
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Vrednost '%s &quot;je napačen zapis datuma
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Napaka pri pisanju v mapo %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Uporabnik s prijavo <b>%s</b> ni bilo mogoče najti.
 ErrorLoginHasNoEmail=Ta uporabnik nima e-poštni naslov. Obdelati prekinjena.
 ErrorBadValueForCode=Slaba vrednost za varnostno kodo. Poskusite znova z novo vrednost ...
 ErrorBothFieldCantBeNegative=Polja %s in %s ne more biti tako negativna
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Uporabniški račun <b>%s</b> uporablja za izvedbo spletni strežnik nima dovoljenja za to
 ErrorNoActivatedBarcode=Noben tip črtne kode ni aktiviran
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index c2cdfde4b96..a3ba9144853 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -367,7 +367,7 @@ ActionsOnCompany=Aktivnosti v zvezi s tem partnerjem
 ActionsOnMember=Dogodki okoli tega člana
 NActions=%s aktivnosti
 NActionsLate=%s zamujenih
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=Zahtevek je bil že zabeležen
 Filter=Filter
 RemoveFilter=Odstrani filter
 ChartGenerated=Grafikon je ustvarjen
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index 291108ce99a..a70ea086a12 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -40,7 +40,7 @@ DateAbonment=Datum prijave
 DateSubscription=Datum vpisa
 DateNextSubscription=Datum naslednje članarine
 DateEndSubscription=Datum zadnje članarine
-EndSubscription=Zadnja članarina
+EndSubscription=Veljavnost članarine
 SubscriptionId=ID članarine
 MemberId=ID člana
 NewMember=Nov član
@@ -85,7 +85,7 @@ SubscriptionLateShort=Zamujen
 SubscriptionNotReceivedShort=Nikoli prejeto
 ListOfSubscriptions=Spisek članarin
 SendCardByMail=Pošlji kartico
-AddMember=Dodaj člana
+AddMember=Ustvari člana
 NoTypeDefinedGoToSetup=Tipi članov niso določeni. Pojdite v Nastavitve – ipi članov
 NewMemberType=Nov tip člana
 WelcomeEMail=e-pošta za dobrodošlico
@@ -125,7 +125,7 @@ Date=Datum
 DateAndTime=Datum in ura
 PublicMemberCard=Javna kartica člana
 MemberNotOrNoMoreExpectedToSubscribe=Član nima več naročnine in se tudi ne pričakuje
-AddSubscription=Dodaj naročnino
+AddSubscription=Ustvari naročnino
 ShowSubscription=Prikaži naročnino
 MemberModifiedInDolibarr=Član je spremenjen v Dolibarr
 SendAnEMailToMember=Pošlji članu informativno e-pošto
@@ -203,3 +203,4 @@ MembersByNature=Naravni člani
 VATToUseForSubscriptions=Stopnja DDV za naročnine
 NoVatOnSubscription=Ni davka za naročnine
 MEMBER_PAYONLINE_SENDEMAIL=Opozorilno e-sporočilo, ko Dilibarr prejme potrdilo potrjenega plačila za naročnino
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod uporabljen za naročniško vrstico v računu: %s
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index 51ef2f75c91..4aa5b74d03c 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Pošiljka ne obstaja
 DraftOrWaitingApproved=Osnutek ali odobritev, še ne naročen
 DraftOrWaitingShipped=Osnutek ali potrditev, še ne odposlan
 MenuOrdersToBill=Naročila za fakturiranje
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Naročila za fakturiranje
 SearchOrder=Iskanje naročila
 SearchACustomerOrder=Iskanje naročila kupca
 ShipProduct=Pošlji izdelek
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 6a7bf7aa912..1975819eb8e 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -13,10 +13,10 @@ NewProduct=Nov proizvod
 NewService=Nova storitev
 ProductCode=Koda proizvoda
 ServiceCode=Koda storitve
-ProductVatMassChange=Mass VAT change
-ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductVatMassChange=Masovna sprememba DDV
+ProductVatMassChangeDesc=Na tej strani lahko spremenite stopnjo DDV za proizvode in storitve iz ene na drugo vrednost. Pozor, ta sprememba se izvrši v celotni bazi podatkov.
+MassBarcodeInit=Vzpostavitev masovne črtne kode
+MassBarcodeInitDesc=Na tej strani lahko vzpostavite črtno kodo za objekte, ki črtne kode nimajo določene. Pred tem preverite, da je zaključena nastavitev modula za črtne kode.
 ProductAccountancyBuyCode=Računovodski konto (nakup)
 ProductAccountancySellCode=Računovodski konto (prodaja)
 ProductOrService=Proizvod ali storitev
@@ -28,10 +28,10 @@ ProductsAndServicesStatistics=Statistika proizvodov in storitev
 ProductsStatistics=Statistika proizvodov
 ProductsOnSell=Proizvodi, ki so na voljo
 ProductsNotOnSell=Opuščeni proizvodi
-ProductsOnSellAndOnBuy=Products not for sale nor purchase
+ProductsOnSellAndOnBuy=Proizvodi niti za prodajo, niti za nakup
 ServicesOnSell=Storitve, ki so na voljo
 ServicesNotOnSell=Opuščene storitve
-ServicesOnSellAndOnBuy=Services not for sale nor purchase
+ServicesOnSellAndOnBuy=Storitve niti za prodajo, niti za nakup
 InternalRef=Interna referenca
 LastRecorded=Zadnji vneseni proizvodi/storitve za prodajo
 LastRecordedProductsAndServices=Zadnjih %s vnesenih proizvodov/storitev
@@ -72,20 +72,20 @@ PublicPrice=Javna cena
 CurrentPrice=Trenutna cena
 NewPrice=Nova cena
 MinPrice=Minimalna Prodajna cena
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPriceHT=Minimalna prodajna cena (brez DDV)
+MinPriceTTC=Minimalna prodajna cena (z DDV)
 CantBeLessThanMinPrice=Prodajna cena ne more biti nižja od minimalne za ta proizvod (%s brez DDV). To sporočilo se pojavi lahko tudi, če vnesete prevelik popust
 ContractStatus=Status pogodbe
 ContractStatusClosed=Zaprta
 ContractStatusRunning=V obdelavi
 ContractStatusExpired=Pretečena
 ContractStatusOnHold=V mirovanju
-ContractStatusToRun=To get running
+ContractStatusToRun=Zagnana
 ContractNotRunning=Ta pogodba miruje
 ErrorProductAlreadyExists=Proizvod z referenco %s že obstaja.
 ErrorProductBadRefOrLabel=Napačna vrednost reference ali naziva.
-ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorProductClone=Prišlo je do težave pri poskusu kloniranja proizvoda ali storitve.
+ErrorPriceCantBeLowerThanMinPrice=Napaka, cena ne mora biti nižja od minimalne cene.
 Suppliers=Dobavitelji
 SupplierRef=Referenca dobavitelja
 ShowProduct=Prikaži proizvod
@@ -114,17 +114,17 @@ BarcodeValue=Vrednost črtne kode
 NoteNotVisibleOnBill=Opomba (ni vidna na računih, ponudbah...)
 CreateCopy=Kreiraj kopijo
 ServiceLimitedDuration=Če ima proizvod storitev z omejenim trajanjem:
-MultiPricesAbility=Several level of prices per product/service
+MultiPricesAbility=Več nivojev cen za proizvode/storitve
 MultiPricesNumPrices=Število cen
 MultiPriceLevelsName=Kategorije cen
-AssociatedProductsAbility=Aktiviranje povezanih proizvodov
-AssociatedProducts=Povezani proizvodi
-AssociatedProductsNumber=Število povezanih proizvodov
-ParentProductsNumber=Število izdelkov matične
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Vklopi možnost navidezne sestave izdelka
+AssociatedProducts=Sestavljen izdelek
+AssociatedProductsNumber=Število izdelkov, ki sestavljajo navidezni sestavljeni izdelek
+ParentProductsNumber=Število nadrejenih sestavljenih izdelkov
+IfZeroItIsNotAVirtualProduct=Če je 0, ta izdelek ni navidezno sestavljen
+IfZeroItIsNotUsedByVirtualProduct=Če je 0, ta izdelek ni uporabljen v nobenem navideznem sestavljenem izdelku
 EditAssociate=Poveži
-Translation=Prenos
+Translation=Prevod
 KeywordFilter=Filter ključnih besed
 CategoryFilter=Filter kategorij
 ProductToAddSearch=Iskanje proizvoda za dodajanje
@@ -132,7 +132,7 @@ AddDel=Dodaj/briši
 Quantity=Količina
 NoMatchFound=Ni ujemanja
 ProductAssociationList=Seznam odvisnih proizvodov/storitev: ime proizvoda/storitve (količina, na katero se nanaša)
-ProductParentList=Seznam izdelkov / storitev, pri tem izdelku, kot sestavnega dela
+ProductParentList=Seznam zavitkov izdelkov / storitev, pri tem izdelku, kot sestavnega dela
 ErrorAssociationIsFatherOfThis=Eden od izbranih proizvodov je nadrejen trenutnemu proizvodu
 DeleteProduct=Izbriši proizvod/storitev
 ConfirmDeleteProduct=Ali zares želite izbrisati ta proizvod/storitev?
@@ -151,22 +151,22 @@ NoStockForThisProduct=Tega proizvoda ni na zalogi
 NoStock=Ni zaloge
 Restock=Obnovitev zaloge
 ProductSpecial=Specialni
-QtyMin=Minimum Qty
+QtyMin=Minimalna količina
 PriceQty=Cena za to količino
-PriceQtyMin=Price for this min. qty (w/o discount)
-VATRateForSupplierProduct=VAT Rate (for this supplier/product)
-DiscountQtyMin=Default discount for qty
+PriceQtyMin=Cena za to min. količino (brez popusta)
+VATRateForSupplierProduct=Stopnja DDV (za tega dobavitelja/proizvod)
+DiscountQtyMin=Privzet popust za količino
 NoPriceDefinedForThisSupplier=Za tega dobavitelja/storitev ni definirana cena/količina
 NoSupplierPriceDefinedForThisProduct=Za ta proizvod ni definirana cena dobavitelja/količina
 RecordedProducts=Proizvod vnesen
-RecordedServices=Services recorded
+RecordedServices=Zabeležena storitev
 RecordedProductsAndServices=Proizvod/storitev vnesen
-PredefinedProductsToSell=Predefined products to sell
-PredefinedServicesToSell=Predefined services to sell
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase
+PredefinedProductsToSell=Vnaprej določeni proizvodi za prodajo
+PredefinedServicesToSell=Vnaprej določene storitve za prodajo
+PredefinedProductsAndServicesToSell=Vnaprej določeni proizvodi/storitve za prodajo
+PredefinedProductsToPurchase=Vnaprej določen proizvodi za nakup
+PredefinedServicesToPurchase=Vnaprej določene storitve za nakup
+PredefinedProductsAndServicesToPurchase=Vnaprej določeni proizvodi/storitve za nakup
 GenerateThumb=Generiraj sličico
 ProductCanvasAbility=Uporabi posebni "canvas" dodatek
 ServiceNb=Storitev št. %s
@@ -179,66 +179,71 @@ CloneProduct=Kloniraj proizvod ali storitev
 ConfirmCloneProduct=Ali zares želite klonirati ta proizvod ali storitev <b>%s</b> ?
 CloneContentProduct=Klonirajte vse osnovne podatke proizvoda/storitve
 ClonePricesProduct=Klonirajte osnovne podatke in cene
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Kloniraj sestavljen izdelek/storitev
 ProductIsUsed=Ta proizvod je rabljen
 NewRefForClone=Ref. novega proizvoda/storitve
 CustomerPrices=Cene za kupce
 SuppliersPrices=Nabavne cene
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+SuppliersPricesOfProductsOrServices=Cene dobaviteljev (proizvodov ali storitev)
 CustomCode=Carinska tarifa
 CountryOrigin=Država porekla
 HiddenIntoCombo=Skrito v izbranem seznamu
 Nature=Narava
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
-AddThisProductCard=Create product card
-HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist.
-AddThisServiceCard=Create service card
-HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist.
-CurrentProductPrice=Current price
-AlwaysUseNewPrice=Always use current price of product/service
-AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Price by quantity
-PriceByQuantityRange=Quantity range
-ProductsDashboard=Products/Services summary
-UpdateOriginalProductLabel=Modify original label
-HelpUpdateOriginalProductLabel=Allows to edit the name of the product
+ProductCodeModel=Predloga za referenco proizvoda
+ServiceCodeModel=Predloga za referenco storitve
+AddThisProductCard=Ustvari kartico proizvoda
+HelpAddThisProductCard=Ta opcija omogoča ustvarjanje ali kloniranje proizvoda, če še ne obstaja.
+AddThisServiceCard=Ustvari kartico storitve
+HelpAddThisServiceCard=Ta opcija omogoča ustvarjanje ali kloniranje storitve, če še ne obstaja.
+CurrentProductPrice=Trenutna cena
+AlwaysUseNewPrice=Vedno uporabi trenutno ceno proizvoda/storitve
+AlwaysUseFixedPrice=Uporabi fiksno ceno
+PriceByQuantity=Cena na količino
+PriceByQuantityRange=Območje količin
+ProductsDashboard=Povzetek proizvodov/storitev
+UpdateOriginalProductLabel=Spremeni originalni naziv
+HelpUpdateOriginalProductLabel=Vedno uredi ime proizvoda
 ### composition fabrication
-Building=Production and items dispatchment
-Build=Produce
-BuildIt=Produce & Dispatch
-BuildindListInfo=Available quantity for production per warehouse (set it to 0 for no further action)
+Building=Proizvodnja in odprema
+Build=Proizvodnja
+BuildIt=Proizvodnja & odprema
+BuildindListInfo=Količina, ki je na voljo za proizvodnjo po skladišču (postavi na 0, če ni bodočih aktivnosti)
 QtyNeed=Kol.
-UnitPmp=Net unit VWAP
-CostPmpHT=Net total VWAP
-ProductUsedForBuild=Auto consumed by production
-ProductBuilded=Production completed
-ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly VWAP
-ServiceSellByQuarterHT=Services turnover quarterly VWAP
-Quarter1=1st. Quarter
-Quarter2=2nd. Quarter
-Quarter3=3rd. Quarter
-Quarter4=4th. Quarter
-BarCodePrintsheet=Print bar code
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
-BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
-ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Price by customer
-PriceCatalogue=Unique price per product/service
-PricingRule=Pricing Rules
-AddCustomerPrice=Add price by customers
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
+UnitPmp=Neto VWAP na enoto
+CostPmpHT=Neto skupna VWAP
+ProductUsedForBuild=Lastna poraba za proizvodnjo
+ProductBuilded=Zaključena proizvodnja
+ProductsMultiPrice=Večcenovni proizvod
+ProductsOrServiceMultiPrice=Cene za kupce (proizvodov ali storitev, različne cene)
+ProductSellByQuarterHT=Četrtletni prihodek prooizvoda po VWAP 
+ServiceSellByQuarterHT=Četrtletni prihodek storitev po VWAP
+Quarter1=1. četrtletje
+Quarter2=2. četrtletje
+Quarter3=3. četrtletje
+Quarter4=4. četrtletje
+BarCodePrintsheet=Tiskanje črtne kode
+PageToGenerateBarCodeSheets=S tem orodjem lahko natisnete liste z nalepkami črtnih kod. Izberite format lista z nalepkami, tip črtne kode in vrednost črtne kode, nato kliknite gumb <b>%s</b>.
+NumberOfStickers=Število nalepk za tiskanje na stran
+PrintsheetForOneBarCode=Tiskaj več nalepk za eno črtno kodo
+BuildPageToPrint=Generiraj stran za tiskanje
+FillBarCodeTypeAndValueManually=Ročno vnesi tip črtne kode in vrednost.
+FillBarCodeTypeAndValueFromProduct=Vnesi tip črtne kode in vrednost iz črtne kode proizvoda.
+FillBarCodeTypeAndValueFromThirdParty=Vnesi tip črtne kode in vrednost iz črtne kode partnerja.
+DefinitionOfBarCodeForProductNotComplete=Definicija tipa ali vrednosti črtne kode za proizvod %s ni popolna.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definicija tipa ali vrednosti črtne kode za partnerja %s ni popolna.
+BarCodeDataForProduct=Informacija o črtni kodi proizvoda %s :
+BarCodeDataForThirdparty=Informacija o črtni kodi partnerja %s :
+ResetBarcodeForAllRecords=Določite vrednost črtnih kod za vse zapise (s tem boste tudi resetirali že določene vrednosti črtnih kod na novo vrednost)
+PriceByCustomer=Cena po stranki
+PriceCatalogue=Enolična cena po proizvodu/storitvi
+PricingRule=Cenovna pravila
+AddCustomerPrice=Dodaj ceno po strankah
+ForceUpdateChildPriceSoc=Določi enako ceno za podružnice stranke
+PriceByCustomerLog=Cena po imenu stranke
+MinimumPriceLimit=Minimalna cena ne more biti nižja od %s
+MinimumRecommendedPrice=Minimalna priporočena cena je : %s
+PriceExpressionEditor=Urejevalnik prikaza cene
+PriceExpressionSelected=Izbran prikaz cene
+PriceExpressionEditorHelp="cena = 2 + 2" ali "2 + 2" za nastavitev cene<br>Posebna polja so spremenljivke kot "#opcije_mojaposebnapolja# * 2"<br>Tukaj so uporabljene posebne spremenljivke kot #količina# in #tva_tx#<br> ; za ločitev prikazov
+PriceMode=Način cene
+PriceNumeric=Številka
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index ccad08cebaf..d41603e6827 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - projects
 RefProject=Ref. project
-ProjectId=Project Id
+ProjectId=Id projekta
 Project=Projekt
 Projects=Projekti
 SharedProject=Projekti v skupni rabi
@@ -14,7 +14,7 @@ TasksDesc=Ta pogled predstavlja vse projekte in naloge (vaše uporabniško dovol
 Myprojects=Moji projekti
 ProjectsArea=Področje projektov
 NewProject=Nov projekt
-AddProject=Dodaj projekt
+AddProject=Ustvari projekt
 DeleteAProject=Izbriši projekt
 DeleteATask=Izbriši nalogo
 ConfirmDeleteAProject=Ali zares želite izbrisati ta projekt ?
@@ -33,19 +33,21 @@ TimesSpent=Porabljen čas
 RefTask=Referenčna naloga
 LabelTask=Naziv naloge
 TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
-TaskTimeDate=Date
+TaskTimeUser=Uporabnik
+TaskTimeNote=Beležka
+TaskTimeDate=Datum
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nov porabljen čas
 MyTimeSpent=Moj porabljen čas
 MyTasks=Moje naloge
 Tasks=Naloge
 Task=Naloga
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+TaskDateStart=Datum začetka naloge
+TaskDateEnd=Datum konca naloge
+TaskDescription=Opis naloge
 NewTask=Nova naloga
-AddTask=Dodaj nalogo
+AddTask=Ustvari nalogo
 AddDuration=Dodaj trajanje
 Activity=Aktivnost
 Activities=Naloge/aktivnosti
@@ -118,15 +120,15 @@ TypeContact_project_task_internal_TASKEXECUTIVE=Odgovorna oseba
 TypeContact_project_task_external_TASKEXECUTIVE=Odgovorna oseba
 TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
-UnlinkElement=Unlink element
+SelectElement=Izberi element
+AddElement=Povezava do elementa
+UnlinkElement=Nepovezan element
 # Documents models
 DocumentModelBaleine=Model poročila za celoten projekt (logo...)
 PlannedWorkload = Planirana delovna obremenitev
 WorkloadOccupation= Pretvarjanje delovne obremenitve
 ProjectReferers=Referenčni objekti
-SearchAProject=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
+SearchAProject=Iskanje projekta
+ProjectMustBeValidatedFirst=Projekt mora biti najprej potrjen
+ProjectDraft=Osnutek projekta
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
diff --git a/htdocs/langs/sl_SI/resource.lang b/htdocs/langs/sl_SI/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/sl_SI/resource.lang
+++ b/htdocs/langs/sl_SI/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index 7a0c4fd1f16..79ebbecc62d 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Obvezen je naziv skladišča
 CorrectStock=Popravi zalogo
 ListOfWarehouses=Spisek skladišč
 ListOfStockMovements=Seznam gibanja zaloge
-StocksArea=Warehouses area
+StocksArea=Področje skladišč
 Location=Lokacija
 LocationSummary=Kratko ime lokacije
 NumberOfDifferentProducts=Število različnih proizvodov
diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
index 778e491156b..1f41a6282af 100644
--- a/htdocs/langs/sl_SI/users.lang
+++ b/htdocs/langs/sl_SI/users.lang
@@ -102,7 +102,7 @@ UserDisabled=Uporabnik %s je onemogočen
 UserEnabled=Uporabnik %s je aktiviran
 UserDeleted=Uporabnik %s je odstranjen
 NewGroupCreated=Skupina %s je kreirana
-GroupModified=Group %s modified
+GroupModified=Skupina %s je spremenjena
 GroupDeleted=Skupina %s je odstranjena
 ConfirmCreateContact=Ali zares želite kreirati Dolibarr dostop za ta kontakt ?
 ConfirmCreateLogin=Ali zares želite kreirati Dolibarr dostop za tega člana ?
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index a8f6547afae..2e32208fc92 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Datum kredita
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Prikaži nakazilo
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Vendar, če ima račun najmanj eno neizvršeno nakazilo, ne bo označeno kot plačano, da bi bilo pred tem možno izvršiti nakazilo.
-DoStandingOrdersBeforePayments=Ti zavihki omogočajo zahtevo za trajnik. Ko je končano, lahko vnesete plačilo in zaprete račun.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Datoteka nakazila
 SetToStatusSent=Nastavi status na "Datoteka poslana"
 ThisWillAlsoAddPaymentOnInvoice=S tem bodo plačila povezana z računi, ki bodo spremenili status v "Plačano"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Plačilo odprtega naročila %s s strani banke
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index b5d84a0aca7..f12efa61626 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang
index 1ed4e637d14..a24c678a2e5 100644
--- a/htdocs/langs/sq_AL/agenda.lang
+++ b/htdocs/langs/sq_AL/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/sq_AL/contracts.lang b/htdocs/langs/sq_AL/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/sq_AL/contracts.lang
+++ b/htdocs/langs/sq_AL/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index b2de3a851d4..40bca8e85fb 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Late
 SubscriptionNotReceivedShort=Never received
 ListOfSubscriptions=List of subscriptions
 SendCardByMail=Send card by Email
-AddMember=Add member
+AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
 WelcomeEMail=Welcome e-mail
@@ -125,7 +125,7 @@ Date=Date
 DateAndTime=Date and time
 PublicMemberCard=Member public card
 MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-AddSubscription=Add subscription
+AddSubscription=Create subscription
 ShowSubscription=Show subscription
 MemberModifiedInDolibarr=Member modified in Dolibarr
 SendAnEMailToMember=Send information email to member
@@ -170,6 +170,8 @@ LastSubscriptionAmount=Last subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Number of members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
@@ -201,3 +203,4 @@ MembersByNature=Members by nature
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/sq_AL/resource.lang b/htdocs/langs/sq_AL/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/sq_AL/resource.lang
+++ b/htdocs/langs/sq_AL/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 7d53386ea9d..9e3a4d80c03 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Välj en kontoplan
 Validate=Validera
 Addanaccount=Lägg till ett redovisningskonto
 AccountAccounting=Redovisningskonto
-Ventilation=Breakdown
+Ventilation=Fördelning
 ToDispatch=Avsändandet
 Dispatched=Levereras
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Fördelning kunder
+SuppliersVentilation=Fördelning leverantörerna
 TradeMargin=Handelsmarginal
 Reports=Rapporter
 ByCustomerInvoice=Enligt faktura kunder
@@ -45,9 +45,9 @@ WriteBookKeeping=Record konton i huvudboken
 Bookkeeping=Huvudbok
 AccountBalanceByMonth=Saldo per månad
 
-AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
+AccountingVentilation=Uppdelning redovisning
+AccountingVentilationSupplier=Uppdelning redovisnings leverantör
+AccountingVentilationCustomer=Uppdelning redovisnings kund
 Line=Linje
 
 CAHTF=Totala köpesleverantörs HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilerade linjer faktura
 IntoAccount=I bokföringskonto
 
 Ventilate=Ventilera
-VentilationAuto=Automatic breakdown
+VentilationAuto=Automatisk uppdelning
 
 Processing=Bearbetning
 EndProcessing=I slutet av behandlingen
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Inte ventilerad i redovisningskonto
 
 ACCOUNTING_SEPARATORCSV=Separator CSV
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Antal element att vara uppdelning framgår av sidan (max rekommenderad: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Börja sortering av nedbrytnings sidor "Måste uppdelning" av de senaste element
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Börja sorteringen av nedbrytnings sidor "Breakdown" av de senaste element
 
 AccountLength=Längd på redovisningen redovisning i Dolibarr
 AccountLengthDesc=Funktion som gör det möjligt att låtsas en längd av bokföringskonto genom att ersätta mellanslag med noll siffra. Den här funktionen berör endast displayen, det ändrar inte redovisningskonton registrerade i Dolibarr. För export, är nödvändigt denna funktion för att vara kompatibel med viss programvara.
@@ -140,14 +140,14 @@ Active=Uttalande
 
 NewFiscalYear=Nytt räkenskapsår
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
+DescVentilCustomer=Rådgör här den årliga fördelningen redovisning av era fakturor kunder
 TotalVente=Total omsättning HT
 TotalMarge=Total försäljning marginal
 DescVentilDoneCustomer=Konsul här listan med linjerna av fakturor kunder och deras bokföringskonto
 DescVentilTodoCustomer=Ventilera dina rader av kundfaktura med en redovisningskonto
 ChangeAccount=Ändra bokföringskonto för linjer som valts ut av kontot:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Rådgör här den årliga fördelningen redovisning av dina fakturor leverantörer
 DescVentilTodoSupplier=Ventilera dina rader av leverantörsfaktura med en redovisningskonto
 DescVentilDoneSupplier=Konsul här listan med linjerna av fakturor leverantör och deras bokföringskonto
 
@@ -155,4 +155,4 @@ ValidateHistory=Validera Automatiskt
 
 ErrorAccountancyCodeIsAlreadyUse=Fel, du kan inte ta bort denna redovisningskonto eftersom den används
 
-FicheVentilation=Breakdown card
+FicheVentilation=Uppdelning kort
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 3043c9406a5..264a54e753c 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -37,14 +37,14 @@ GUISetup=Visa
 SetupArea=Setup område
 FormToTestFileUploadForm=Formulär för att testa filuppladdning (enligt inställningar)
 IfModuleEnabled=Anm: ja effektivt endast om modul <b>%s</b> är aktiverat
-RemoveLock=Ta bort filen <b>%s</b> om den finns så att uppdatera verktyget.
-RestoreLock=Ersätt en fil <b>%s</b> med läsbehörighet bara på filen för att stänga av någon användning av uppdatering verktyg.
-SecuritySetup=Säkerhet setup
+RemoveLock=Ta bort filen <b>%s</b> om den finns godkänns uppdatering verktyget.
+RestoreLock=Ersätt en fil <b>%s</b> med läsbehörighet bara på filen för att stänga av all användning av uppdaterings verktyg.
+SecuritySetup=Säkerhets inställning
 ErrorModuleRequirePHPVersion=Fel, kräver denna modul PHP version %s eller högre
 ErrorModuleRequireDolibarrVersion=Fel, kräver denna modul Dolibarr version %s eller högre
 ErrorDecimalLargerThanAreForbidden=Fel, en precision högre än <b>%s</b> stöds inte.
 DictionarySetup=Lexikon inställnings
-Dictionary=Ordböcker
+Dictionary=Ordlista
 Chartofaccounts=Kontoplan
 Fiscalyear=Räkenskapsår
 ErrorReservedTypeSystemSystemAuto=Värdena "system" och "systemauto" för typ är reserverade. Du kan använda "user" som värde för att lägga till en egen post.
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Använd automatisk komplettering fält för att välja
 ActivityStateToSelectCompany= Lägg till ett filter alternativ för att visa / dölja thirdparties som för närvarande är i aktivitet eller har upphört att
 UseSearchToSelectContactTooltip=Även om du har ett stort antal tredje parter (> 100 000), kan du öka hastigheten genom att sätta konstant CONTACT_DONOTSEARCH_ANYWHERE till 1 i Setup-> Övrigt. Sökningen kommer då att begränsas till start av strängen.
 UseSearchToSelectContact=Använd automatisk komplettering fält för att välja kontakt (istället för att använda en listruta).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Sök filter alternativ
 NumberOfKeyToSearch=NBR tecken för att utlösa Sök: %s
 ViewFullDateActions=Visa fullständig datum åtgärder i tredje blad
@@ -90,7 +92,7 @@ AntiVirusParam= Fler parametrar på kommandoraden
 AntiVirusParamExample= Exempel för ClamWin - databas = &quot;C: \\ Program Files (x86) \\ ClamWin \\ lib&quot;
 ComptaSetup=Redovisning modul setup
 UserSetup=Användarens hantering setup
-MenuSetup=Meny ledning setup
+MenuSetup=Meny hanterings inställningar
 MenuLimits=Gränser och noggrannhet
 MenuIdParent=Överordnade menyn ID
 DetailMenuIdParent=ID överordnade menyn (0 för en toppmenyn)
@@ -98,12 +100,12 @@ DetailPosition=Sortera nummer att definiera menyposition
 PersonalizedMenusNotSupported=Personliga menyer stöds inte
 AllMenus=Alla
 NotConfigured=Inte konfigurerad
-Setup=Setup
+Setup=Inställning
 Activation=Aktiveringen
 Active=Aktiv
-SetupShort=Setup
+SetupShort=Inställning
 OtherOptions=Andra alternativ
-OtherSetup=Andra setup
+OtherSetup=Andra inställningar
 CurrentValueSeparatorDecimal=Decimaltecken
 CurrentValueSeparatorThousand=Tusentalsavgränsare
 Destination=Destination
@@ -125,7 +127,7 @@ PHPTZ=Tidszon PHP server
 PHPServerOffsetWithGreenwich=PHP server offset bredd Greenwich (sekunder)
 ClientOffsetWithGreenwich=Klient / Browser offset bredd Greenwich (sekunder)
 DaylingSavingTime=Sommartid (användare)
-CurrentHour=PHP server timme
+CurrentHour=PHP Tid (server)
 CompanyTZ=Tidszon företag (huvudföretag)
 CompanyHour=Hour företag (huvudföretag)
 CurrentSessionTimeOut=Aktuell session timeout
@@ -171,7 +173,7 @@ ImportMethod=Import metoden
 ToBuildBackupFileClickHere=Att bygga en backup fil, klicka <a href="%s">här</a> .
 ImportMySqlDesc=För att importera en backup fil måste du använda mysql kommandot från kommandoraden:
 ImportPostgreSqlDesc=Om du vill importera en backup fil måste du använda pg_restore kommando från kommandoraden:
-ImportMySqlCommand=%s %s &lt;mybackupfile.sql
+ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=Filnamn för att generera
 Compression=Komprimering
@@ -195,11 +197,11 @@ DelayedInsert=Fördröjd in
 EncodeBinariesInHexa=Koda binära data i hexadecimal
 IgnoreDuplicateRecords=Ignorera fel dubblettposter (INSERT ignorera)
 Yes=Ja
-No=Nr
+No=Nej
 AutoDetectLang=Autodetektera (webbläsare språk)
 FeatureDisabledInDemo=Funktion avstängd i demo
 Rights=Behörigheter
-BoxesDesc=Fälten är skärmytan som visar en bit av information om vissa sidor. Du kan välja mellan att visa rutan eller inte genom att välja målsidan och klicka på &quot;Aktivera&quot; eller genom att klicka på soptunnan till att stänga av den.
+BoxesDesc=Fälten är skärmytan som visar en bit av information om vissa sidor. Du kan välja mellan att visa rutan eller inte genom att välja målsidan och klicka på "Aktivera" eller genom att klicka på soptunnan till att stänga av den.
 OnlyActiveElementsAreShown=Endast delar av <a href="%s">aktiverade moduler</a> visas.
 ModulesDesc=Dolibarr moduler definiera vilka funktionen är aktiverad i programvaran. Vissa moduler kräver behörigheter som du skall ge till användare efter möjliggör modul.
 ModulesInterfaceDesc=Den Dolibarr moduler gränssnittet kan du lägga till funktioner beroende på yttre programvara, system eller tjänster.
@@ -208,6 +210,7 @@ ModulesJobDesc=Business moduler ge enkla fördefinierade inställningar för Dol
 ModulesMarketPlaceDesc=Du kan hitta fler moduler för att ladda ner på externa webbplatser på Internet ...
 ModulesMarketPlaces=Fler moduler ...
 DoliStoreDesc=DoliStore, den officiella marknadsplatsen för Dolibarr ERP / CRM externa moduler
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Webbplats leverantörer kan du söka för att hitta fler moduler ...
 URL=Länk
 BoxesAvailable=Rutor
@@ -437,14 +440,14 @@ Module52Name=Lager
 Module52Desc=Lager hantering av produkter
 Module53Name=Tjänster
 Module53Desc=Service ledning
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Avtal / Prenumerationer
+Module54Desc=Förvaltning av kontrakt (tjänster eller reccuring abonnemang)
 Module55Name=Streckkoder
 Module55Desc=Barcode ledning
 Module56Name=Telefoni
 Module56Desc=Telefoni integration
 Module57Name=Stående order
-Module57Desc=Stående order och återkallelse ledning
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrering av ett ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS-flöde
 Module320Desc=Lägg till RSS feed inne Dolibarr skärm sidor
 Module330Name=Bokmärken
 Module330Desc=Bokmärk ledning
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integration
 Module500Name=Speciella utgifter (skatt, sociala avgifter, utdelningar)
@@ -495,6 +498,8 @@ Module1780Name=Kategorier
 Module1780Desc=Categorie ledning (produkter, leverantörer och kunder)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG Editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Hantera planlagda uppgifter
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Spara och dela dokument
 Module2600Name=WebServices
 Module2600Desc=Aktivera Dolibarr webbtjänster server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Använder online Gravatar tjänst (www.gravatar.com) för att visa foto av användare / medlemmar (hittade med sin e-post). Behöver en internet
 Module2800Desc=FTP-klient
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Lämna Framställningar förvaltning
 Module20000Desc=Deklarera och följ de anställda lämnar förfrågningar
 Module39000Name=Produktsats
-Module39000Desc=Batchnummer, äter-by och bäst före-datum hantering av produkter
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modul för att erbjuda en online-betalning sidan genom kreditkort med Paybox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Modul för att erbjuda en online-betalning sidan med kreditkort
 Module50400Name=Redovisning (avancerad)
 Module50400Desc=Bokföring och redovisning (dubbla parter)
 Module54000Name=PrintIPP
-Module54000Desc=Skriv ut via Cups IPP-skrivare.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Öppen Poll
 Module55000Desc=Modul för att göra online omröstningar (som Doodle, öar Rdvz, ...)
 Module59000Name=Marginaler
@@ -606,11 +613,11 @@ Permission151=Läs stående order
 Permission152=Skapa / ändra en stående order begäran
 Permission153=Läs stående order kvitton
 Permission154=Kredit / vägrar stående order kvitton
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Läs kontrakt / abonnemang
+Permission162=Skapa / ändra avtal / abonnemang
+Permission163=Aktivera en tjänst / teckning av ett kontrakt
+Permission164=Inaktivera en tjänst / teckning av ett kontrakt
+Permission165=Radera kontrakt / abonnemang
 Permission171=Läs resor och utgifter (eget och hans underordnade)
 Permission172=Skapa / ändra resor och kostnader
 Permission173=Ta bort resor och kostnader
@@ -672,7 +679,7 @@ Permission300=Läs streckkoder
 Permission301=Skapa / modifiera streckkoder
 Permission302=Ta bort streckkoder
 Permission311=Läs tjänster
-Permission312=Assign service/subscription to contract
+Permission312=Tilldela tjänst / abonnemang att ingå avtal
 Permission331=Läs bokmärken
 Permission332=Skapa / ändra bokmärken
 Permission333=Ta bort bokmärken
@@ -702,8 +709,8 @@ Permission701=Läs donationer
 Permission702=Skapa / ändra donationer
 Permission703=Ta bort donationer
 Permission1001=Läs lager
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Skapa / ändra lager
+Permission1003=Radera lager
 Permission1004=Läs lager rörelser
 Permission1005=Skapa / ändra lager rörelser
 Permission1101=Läs leveransorder
@@ -779,9 +786,10 @@ DictionaryOrderMethods=Beställningsmetoder
 DictionarySource=Ursprung av affärsförslag / beställning
 DictionaryAccountancyplan=Kontoplan
 DictionaryAccountancysystem=Modeller för kontoplan
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup sparas
 BackToModuleList=Tillbaka till moduler lista
-BackToDictionaryList=Tillbaka till ordböcker listan
+BackToDictionaryList=Tillbaka till ordlistan
 VATReceivedOnly=Särskilda räntesats inte
 VATManagement=Moms Management
 VATIsUsedDesc=Den momssats som standard när du skapar framtidsutsikter, fakturor, order etc följa aktiva standard regeln: <br> Om säljaren är föremål för mervärdesskatt, då moms som standard = 0. Slut på regeln. <br> Om (den som säljer land = köparlandet), sedan den mervärdesskatt som standard = mervärdesskatt av produkten vid försäljning landet. Slut på regeln. <br> Om säljaren och köparen i Europeiska gemenskapen och varor transporttjänster (bil, fartyg, flygplan), standard moms = 0 (Den mervärdesskatt som skall betalas av köparen vid customoffice av sitt land och inte på säljaren). Slut på regeln. <br> Om säljaren och köparen i Europeiska gemenskapen och köparen är inte ett företag, sedan den mervärdesskatt som standard = moms på produkt som säljs. Slut på regeln. <br> Om säljaren och köparen i Europeiska gemenskapen och köparen är ett företag, då moms som standard = 0. Slut på regeln. <br> Else föreslagna standard moms = 0. Slut på regeln.
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent sökformuläret på menyn till vänster
 DefaultLanguage=Default språk att använda (språkkod)
 EnableMultilangInterface=Aktivera flerspråkigt gränssnitt
 EnableShowLogo=Visa logotypen på vänstra menyn
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Att ditt system har uppdaterats
 CompanyInfo=Företag / stiftelse information
 CompanyIds=Företag / stiftelse identiteter
@@ -1138,7 +1147,7 @@ AddDeliveryAddressAbility=Lägg förmåga leveranstid
 UseOptionLineIfNoQuantity=En rad av produkt / tjänst med en nolla belopp anses som ett alternativ
 FreeLegalTextOnProposal=Fri text på affärsförslag
 WatermarkOnDraftProposal=Vattenstämpel på utkast till affärsförslag (ingen om tom)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bankkonto destination förslag
 ##### Orders #####
 OrdersSetup=Beställ ledning setup
 OrdersNumberingModules=Beställningar numrering moduler
@@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Intervention numrering moduler
 TemplatePDFInterventions=Intervention kort dokument modeller
 WatermarkOnDraftInterventionCards=Vattenstämpel på åtgärdskort dokument (ingen om tom)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Avtal / Prenumerationer modul installation
 ContractsNumberingModules=Kontrakt numrering moduler
 TemplatePDFContracts=Contract documents modeller
 FreeLegalTextOnContracts=Fritext om avtal
@@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=Filer av typen %s är inte komprimerade av HTTP-server
 CacheByServer=Cache med server
 CacheByClient=Cache med browser
 CompressionOfResources=Komprimering av HTTP-svar
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=En sådan automatisk detektering är inte möjligt med nuvarande webbläsare
 ##### Products #####
 ProductSetup=Produkter modul setup
 ServiceSetup=Tjänster modul konfiguration
@@ -1415,9 +1424,9 @@ OSCommerceTestOk=Anslutning till servern &quot;%s&quot; på databas %s &quot;med
 OSCommerceTestKo1=Anslutning till servern &quot;%s&quot; lyckas, men databas %s &quot;kunde inte nås.
 OSCommerceTestKo2=Anslutning till servern &quot;%s&quot; med användare &quot;%s&quot; misslyckades.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=Lagermodul inställnings
+UserWarehouse=Använd användar personliga lager
+IfYouUsePointOfSaleCheckModule=Om du använder en Point of Sale-modul (POS modul som standard eller annan extern modul), kan denna inställning ignoreras av din Point Of Sale modul. De flesta point of sales moduler är utformade för att skapa omedelbart en faktura och minska lager som standard oavsett är alternativ här. Så, om du behöver eller inte ha ett bestånd minskar när du registrerar en sälja från din Point of Sale, kolla även din POS-modul inrättas.
 ##### Menu #####
 MenuDeleted=Meny utgår
 TreeMenu=Tree menyer
@@ -1482,14 +1491,14 @@ ClickToDialDesc=Denna modul gör det möjligt att lägga till en ikon efter tele
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Point of sales
 CashDeskSetup=Point of sales modul setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Standard generiska tredje part att använda för Sells
 CashDeskBankAccountForSell=Konto som ska användas för att ta emot kontant betalning
 CashDeskBankAccountForCheque= Konto som ska användas för att ta emot betalningar med check
 CashDeskBankAccountForCB= Konto som ska användas för att ta emot kontant betalning med kreditkort
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Inaktivera lager minskning när en sälja görs från Point of Sale
+CashDeskIdWareHouse=Tvinga och begränsa lager att använda för aktie minskning
+StockDecreaseForPointOfSaleDisabled=Stock minskning från Point of Sale inaktiv
+CashDeskYouDidNotDisableStockDecease=Du har inte inaktivera lager minskning när du gör en sälja från Point of Sale. Så ett lager krävs.
 ##### Bookmark #####
 BookmarkSetup=Bokmärk modul setup
 BookmarkDesc=Den här modulen kan du hantera bokmärken. Du kan också lägga genvägar till alla Dolibarr sidor eller externale webbplatser på din vänstra menyn.
@@ -1543,13 +1552,13 @@ ConfirmDeleteFiscalYear=Är du säker på att du vill ta bort detta verksamhets
 Opened=Öppnad
 Closed=Stängt
 AlwaysEditable=Kan alltid redigeras
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+MAIN_APPLICATION_TITLE=Tvinga synliga namn ansökan (varning: ställa ditt eget namn här kan bryta funktionen Autofyll inloggning när du använder DoliDroid mobil applikation)
+NbMajMin=Minsta antal versaler
+NbNumMin=Minsta antal numeriska tecken
+NbSpeMin=Minsta antal specialtecken
+NbIteConsecutive=Maximalt antal upprepa samma tecken
+NoAmbiCaracAutoGeneration=Använd inte tvetydiga tecken ("1", "l", "i", "|", "0", "O") för automatisk generering
+SalariesSetup=Inställning av modul löner
+SortOrder=Sorteringsordning
 Format=Format
 TypePaymentDesc=0: Kundbetalning typ, 1: Leverantörsbetalnings typ, 2: Både kunder och leverantörer betalnings typ
diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
index d05899c5119..df18edf920f 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Åtgärder påverkas
 ActionsDoneBy=Åtgärder som utförs av
 ActionsForUser=Händelser för användaren
 ActionsForUsersGroup=Händelser för alla användare av grupp
+ActionAssignedTo=Event assigned to
 AllMyActions= Alla mina handlingar och uppgifter
 AllActions= Alla åtgärder / uppgifter
 ViewList=Visa lista
@@ -44,7 +45,7 @@ AgendaExtSitesDesc=Den här sidan gör det möjligt att deklarera externa kalend
 ActionsEvents=Händelser som Dolibarr kommer att skapa en talan i agenda automatiskt
 PropalValidatedInDolibarr=Förslag %s validerade
 InvoiceValidatedInDolibarr=Faktura %s validerade
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Faktura %s validerats från POS
 InvoiceBackToDraftInDolibarr=Faktura %s gå tillbaka till förslaget status
 InvoiceDeleteDolibarr=Faktura %s raderas
 OrderValidatedInDolibarr= Beställ %s validerade
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index 34167669685..77a566b712f 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -147,10 +147,10 @@ BackToAccount=Tillbaka till konto
 ShowAllAccounts=Visa för alla konton
 FutureTransaction=Transaktioner i Futur. Inget sätt att blidka.
 SelectChequeTransactionAndGenerate=Välj / Filtret kontrollerar att inkludera i kontrollen insättning kvittot och klicka på &quot;Skapa&quot;.
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
-EventualyAddCategory=Eventually, specify a category in which to classify the records
+InputReceiptNumber=Välj kontoutdrag samband med förlikningen. Använd en sorterbar numeriskt värde (t.ex., ÅÅÅÅMM)
+EventualyAddCategory=Så småningom, ange en kategori där för att klassificera de register
 ToConciliate=För att förena?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
+ThenCheckLinesAndConciliate=Kontrollera sedan linjerna som finns i kontoutdraget och klicka
 BankDashboard=Bankkonton sammandrag
 DefaultRIB=Standard BAN
 AllRIB=Alla BAN
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index af80a05d97f..46d04601dc3 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -21,8 +21,8 @@ InvoiceDepositDesc=Denna typ av faktura sker när en insättning har mottagits.
 InvoiceProForma=Proforma faktura
 InvoiceProFormaAsk=Proforma faktura
 InvoiceProFormaDesc=<b>Proforma faktura</b> är en bild av en sann faktura men har ingen bokföring värde.
-InvoiceReplacement=Ersättning faktura
-InvoiceReplacementAsk=Ersättning faktura för faktura
+InvoiceReplacement=Ersättnings faktura
+InvoiceReplacementAsk=Ersättnings faktura för faktura
 InvoiceReplacementDesc=<b> Ersättning faktura </b> används för att avbryta och byta helt en faktura utan betalningar.<br><br>Anmärkning: Endast fakturor utan betalningar kan bytas ut. Om fakturan du ersätter är ännu inte avslutat, kommer den automatiskt att stängas av "övergivna".
 InvoiceAvoir=Kreditnota
 InvoiceAvoirAsk=Kreditnota att korrigera fakturan
@@ -30,12 +30,12 @@ InvoiceAvoirDesc=Den <b>kreditnota</b> är en negativ faktura används för att
 invoiceAvoirWithLines=Skapa kreditnota med innehållet i originalfakturan 
 invoiceAvoirWithPaymentRestAmount=Skapa kreditnota med återstående obetald faktura ursprung
 invoiceAvoirLineWithPaymentRestAmount=Kredit notering för återstående obetalda beloppet
-ReplaceInvoice=Byt faktura %s
+ReplaceInvoice=Ersätt faktura %s
 ReplacementInvoice=Ersättning faktura
 ReplacedByInvoice=Ersatt av faktura %s
 ReplacementByInvoice=Ersatt av faktura
 CorrectInvoice=Korrekt faktura %s
-CorrectionInvoice=Korrigering faktura
+CorrectionInvoice=Korrigerings faktura
 UsedByInvoice=Användas för att betala fakturan %s
 ConsumedBy=Förbrukas av
 NotConsumed=Inte förbrukas
@@ -111,30 +111,30 @@ BillStatusCanceled=Övergiven
 BillStatusValidated=Validerad (måste betalas)
 BillStatusStarted=Påbörjad
 BillStatusNotPaid=Inte betalas
-BillStatusClosedUnpaid=Stängt (obetalda)
-BillStatusClosedPaidPartially=Betalt (delvis)
-BillShortStatusDraft=Förslag
+BillStatusClosedUnpaid=Stängd (obetald)
+BillStatusClosedPaidPartially=Betald (delvis)
+BillShortStatusDraft=Utkast
 BillShortStatusPaid=Betald
-BillShortStatusPaidBackOrConverted=Bearbetade
-BillShortStatusConverted=Bearbetade
+BillShortStatusPaidBackOrConverted=Bearbetad
+BillShortStatusConverted=Bearbetad
 BillShortStatusCanceled=Övergiven
 BillShortStatusValidated=Validerad
 BillShortStatusStarted=Började
 BillShortStatusNotPaid=Inte betalas
 BillShortStatusClosedUnpaid=Stängt
-BillShortStatusClosedPaidPartially=Betalt (delvis)
+BillShortStatusClosedPaidPartially=Betald (delvis)
 PaymentStatusToValidShort=För att validera
 ErrorVATIntraNotConfigured=Intracommunautary momsregistreringsnummer ännu inte definierat
 ErrorNoPaiementModeConfigured=Ingen utebliven betalning läge definieras. Gå till Faktura-modulen setup att fixa detta.
 ErrorCreateBankAccount=Skapa ett bankkonto, då gå till Setup panel Faktura-modul för att definiera betalningssätten
 ErrorBillNotFound=Faktura %s finns inte
-ErrorInvoiceAlreadyReplaced=Misstag, försök dig för att godkänna en faktura för att ersätta faktura %s. Men denna har redan ersatts av faktura %s.
+ErrorInvoiceAlreadyReplaced=Fel, du försöker dig på att  godkänna en faktura för att ersätta faktura %s. Men denna har redan ersatts av faktura %s.
 ErrorDiscountAlreadyUsed=Fel, rabatt som redan används
 ErrorInvoiceAvoirMustBeNegative=Fel, måste korrigera fakturan ett negativt belopp
 ErrorInvoiceOfThisTypeMustBePositive=Fel, skall denna typ av faktura har ett positivt belopp
 ErrorCantCancelIfReplacementInvoiceNotValidated=Fel, kan inte avbryta en faktura som har ersatts av en annan faktura som fortfarande i utkast status
 BillFrom=Från
-BillTo=Bill till
+BillTo=Fakturamottagare
 ActionsOnBill=Åtgärder mot faktura
 NewBill=Ny faktura
 LastBills=Senaste %s fakturor
@@ -157,7 +157,7 @@ ConfirmClassifyPaidPartiallyQuestion=Denna faktura inte har betalats helt. Vad f
 ConfirmClassifyPaidPartiallyReasonAvoir=Återstående obetalt <b>(%s %s)</ b> är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag reglerar momsen med en kreditnota.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Återstående obetalt <b>(%s %s)</ b> är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag godkänner förlust av momsen på denna rabatt.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Återstående obetalt <b>(%s %s)</ b> är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag återskapar momsen på denna rabatt med en kreditnota.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad kund
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Dålig kund
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produkter som returneras delvis
 ConfirmClassifyPaidPartiallyReasonOther=Belopp övergivna av annan orsak
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Detta val är möjligt om din faktura har försetts med lämplig kommentar. (Exempel «Endast den skatt som motsvarar det pris som verkligen har betalats ger rätt till avdrag»)
@@ -172,9 +172,9 @@ ConfirmCustomerPayment=Har du bekräfta denna betalning ingång för <b>%s</b> %
 ConfirmSupplierPayment=Bekräftar du denna betalning för <b>%s</b> %s?
 ConfirmValidatePayment=Är du säker på att du vill godkänna denna betalning? Inga ändringar kan göras efter det att betalning är godkänd.
 ValidateBill=Validera faktura
-UnvalidateBill=Unvalidate faktura
-NumberOfBills=Nb av fakturor
-NumberOfBillsByMonth=Nb av fakturor per månad
+UnvalidateBill=Ovaliderade faktura
+NumberOfBills=Antal av fakturor
+NumberOfBillsByMonth=Antal av fakturor per månad
 AmountOfBills=Belopp för fakturor
 AmountOfBillsByMonthHT=Mängd av fakturor per månad (netto efter skatt)
 ShowSocialContribution=Visa sociala avgifter
@@ -205,7 +205,7 @@ NoOtherDraftBills=Inga andra förslag fakturor
 NoDraftInvoices=Inget faktura-utkast
 RefBill=Faktura ref
 ToBill=Fakturamottagare
-RemainderToBill=Återstår att räkningen
+RemainderToBill=Återstår att fakturan
 SendBillByMail=Skicka faktura via e-post
 SendReminderBillByMail=Skicka påminnelse via e-post
 RelatedCommercialProposals=Relaterade kommersiella förslag
@@ -217,7 +217,7 @@ NoInvoice=Ingen faktura
 ClassifyBill=Klassificera faktura
 SupplierBillsToPay=Leverantörer fakturor att betala
 CustomerBillsUnpaid=Obetalda kunder fakturor
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=De skriftliga fakturor genom mecanographic förfaranden dispens av ordning i brev
 NonPercuRecuperable=Icke återvinningsbara
 SetConditions=Ställ betalningsvillkor
 SetMode=Ställ betalningssätt
@@ -390,7 +390,7 @@ ExpectedToPay=Förväntad utbetalning
 PayedByThisPayment=Betalas av denna betalning
 ClosePaidInvoicesAutomatically=Klassificera &quot;betalade&quot; alla standard eller fakturor ersättning entirely betalt.
 ClosePaidCreditNotesAutomatically=Beteckna "Betalda" alla fullständigt återbetalda kreditnotor.
-AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstår att betala kommer automatiskt stängd för status &quot;betald&quot;.
+AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstående att betala kommer automatiskt stängd för status "betald".
 ToMakePayment=Betala
 ToMakePaymentBack=Återbetala
 ListOfYourUnpaidInvoices=Lista över obetalda fakturor
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index 3c949332eb6..a8fadb4e77b 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -24,7 +24,7 @@ BoxSalesTurnover=Omsättningen
 BoxTotalUnpaidCustomerBills=Totalt obetalda kundens fakturor
 BoxTotalUnpaidSuppliersBills=Totalt obetalda leverantörs fakturor
 BoxTitleLastBooks=Senaste %s inspelade böcker
-BoxTitleNbOfCustomers=Nombre de klient
+BoxTitleNbOfCustomers=Antal klienter
 BoxTitleLastRssInfos=Senaste %s nyheter från %s
 BoxTitleLastProducts=Senast %s modifierade produkter / tjänster
 BoxTitleProductsAlertStock=Produkter i lager alert
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index 527dcf7d7a4..8d653226bc1 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -109,4 +109,4 @@ CategoriesSetup=Kategorier, inställningar
 CategorieRecursiv=Länka automatiskt med förälderkategori
 CategorieRecursivHelp=Om aktiverad kommer produkten även länkas till förälderkategori när den läggs i en underkategori
 AddProductServiceIntoCategory=Lägg till följande produkt / tjänst
-ShowCategory=Show category
+ShowCategory=Visa kategori
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 681b9e10d30..d51e041b7e2 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -3,8 +3,8 @@ Accountancy=Bokföring
 AccountancyCard=Bokföringskort
 Treasury=Treasury
 MenuFinancial=Finansiella
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRules=Gå till <a href="%s">skatt modul inställning</a> att ändra reglerna för beräkning
+TaxModuleSetupToModifyRulesLT=Gå till <a href="%s">Företag inställning</a> att ändra reglerna för beräkning
 OptionMode=Alternativ för bokföring
 OptionModeTrue=Alternativ Input-Output
 OptionModeVirtual=Alternativ Credits-Utdebitering
@@ -12,15 +12,15 @@ OptionModeTrueDesc=I detta sammanhang skall omsättningen beräknas över utbeta
 OptionModeVirtualDesc=I detta sammanhang skall omsättningen beräknas på fakturor (datum för godkännandet). När dessa fakturor betalas, om de har betalats eller inte, de är förtecknade i omsättning produktionen.
 FeatureIsSupportedInInOutModeOnly=Funktionen bara tillgänglig i PROV-FORDRINGAR bokförings-läge (Se redovisning modul konfiguration)
 VATReportBuildWithOptionDefinedInModule=Belopp som anges här beräknas enligt regler som fastställts av Skatteverket modul setup.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+LTReportBuildWithOptionDefinedInModule=Belopp som visas här är beräknade med hjälp av regler som fastställts av bolagets inställning.
 Param=Setup
 RemainingAmountPayment=Belopp som skall erläggas resterande:
 AmountToBeCharged=Totalt belopp att betala:
 AccountsGeneral=Konton
 Account=Konto
 Accounts=Konton
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Konto förälder
+Accountsparent=Konto förälder
 BillsForSuppliers=Räkningar för leverantörer
 Income=Inkomst
 Outcome=Expense
@@ -32,7 +32,7 @@ Profit=Resultat
 Balance=Balans
 Debit=Debet
 Credit=Credit
-Piece=Accounting Doc.
+Piece=Redovisning Doc.
 Withdrawal=Återkallande
 Withdrawals=Uttag
 AmountHTVATRealReceived=Net insamlade
@@ -42,25 +42,25 @@ VATReceived=Mervärdesskatt som
 VATToCollect=Moms inköp
 VATSummary=Moms Balance
 LT2SummaryES=IRPF Balans
-LT1SummaryES=RE Balance
+LT1SummaryES=RE Balans
 VATPaid=Mervärdesskatten
-SalaryPaid=Salary paid
+SalaryPaid=Lön
 LT2PaidES=IRPF Betald
 LT1PaidES=RE Paid
 LT2CustomerES=IRPF omsättning
 LT2SupplierES=IRPF inköp
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
+LT1CustomerES=RE försäljning
+LT1SupplierES=RE inköp
 VATCollected=Momsintäkterna
 ToPay=Att betala
 ToGet=För att komma tillbaka
-SpecialExpensesArea=Area for all special payments
+SpecialExpensesArea=Område för alla special betalningar
 TaxAndDividendsArea=Skatt, sociala avgifter och utdelningar område
 SocialContribution=Sociala avgifter
 SocialContributions=Sociala avgifter
-MenuSpecialExpenses=Special expenses
+MenuSpecialExpenses=Särskilda kostnader
 MenuTaxAndDividends=Skatter och utdelning
-MenuSalaries=Salaries
+MenuSalaries=Löner
 MenuSocialContributions=Sociala avgifter
 MenuNewSocialContribution=Nya bidrag
 NewSocialContribution=Nya sociala bidrag
@@ -73,21 +73,21 @@ PaymentCustomerInvoice=Kundfaktura betalning
 PaymentSupplierInvoice=Leverantörsfaktura betalning
 PaymentSocialContribution=Sociala avgifter betalas
 PaymentVat=Moms betalning
-PaymentSalary=Salary payment
+PaymentSalary=Lön betalning
 ListPayment=Lista över betalningar
 ListOfPayments=Lista över betalningar
 ListOfCustomerPayments=Förteckning över kundbetalningar
 ListOfSupplierPayments=Förteckning över leverantörsbetalningar
 DatePayment=Betalningsdag
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
+DateStartPeriod=Datum startperiod
+DateEndPeriod=Slutdatum perioden
 NewVATPayment=Ny moms betalning
 newLT2PaymentES=Ny IRPF betalning
-newLT1PaymentES=New RE payment
+newLT1PaymentES=Ny RE betalning
 LT2PaymentES=IRPF Betalning
 LT2PaymentsES=IRPF betalningar
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
+LT1PaymentES=RE Betalning
+LT1PaymentsES=RE Betalningar
 VATPayment=Moms Betalning
 VATPayments=Momsbetalningar
 SocialContributionsPayments=Sociala avgifter betalningar
@@ -108,7 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad kund bokföring kod för %s
 SuppliersProductsSellSalesTurnover=Den omsättning som försäljningen av leverantörens produkter.
 CheckReceipt=Kontrollera insättning
 CheckReceiptShort=Kontrollera insättning
-LastCheckReceiptShort=Last %s check receipts
+LastCheckReceiptShort=Senaste% s check kvitton
 NewCheckReceipt=Ny rabatt
 NewCheckDeposit=Nya kontrollera insättning
 NewCheckDepositOn=Skapa kvitto för insättning på konto: %s
@@ -120,42 +120,42 @@ ConfirmPaySocialContribution=Är du säker på att du vill klassificera denna so
 DeleteSocialContribution=Ta bort en social avgift
 ConfirmDeleteSocialContribution=Är du säker på att du vill ta bort denna sociala avgifter?
 ExportDataset_tax_1=Sociala avgifter och betalningar
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+CalcModeVATDebt=<b>Läge% svat på redovisning engagemang% s.</b>
+CalcModeVATEngagement=<b>Läge% svat på inkomster-utgifter% s.</b>
+CalcModeDebt=<b>Läges% sClaims-Skulder% s</b> sa <b>Åtagande redovisning.</b>
+CalcModeEngagement=<b>Läge% sIncomes-Kostnader% s</b> sa <b>kassaredovisning</b>
+CalcModeLT1= <b>Läge% SRE på kundfakturor - leverantörerna fakturerar% s</b>
+CalcModeLT1Debt=<b>Läge% SRE på kundfakturor% s</b>
+CalcModeLT1Rec= <b>Läge% SRE på leverantörerna fakturerar% s</b>
+CalcModeLT2= <b>Läge% sIRPF på kundfakturor - leverantörer fakturor% s</b>
+CalcModeLT2Debt=<b>Läge% sIRPF på kundfakturor% s</b>
+CalcModeLT2Rec= <b>Läge% sIRPF på leverantörernas fakturor% s</b>
+AnnualSummaryDueDebtMode=Överskott av intäkter och kostnader, årliga sammanfattande
+AnnualSummaryInputOutputMode=Överskott av intäkter och kostnader, årliga sammanfattande
 AnnualByCompaniesDueDebtMode=Överskott av intäkter och kostnader, detalj av tredje part, mode <b>%sClaims-Debts%s</b> sa <b>Åtagande redovisning.</b>
 AnnualByCompaniesInputOutputMode=Överskott av intäkter och kostnader, detalj av tredje part, mode <b>%sRevenues-Expenses%s</b> sa <b>redovisning enligt kontantmetoden.</b>
 SeeReportInInputOutputMode=Se rapporten <b>%sIncomes-Expenses%s</b> sa <b>kontanter står</b> för en beräkning på faktiska betalningar
 SeeReportInDueDebtMode=Se rapporten <b>%sClaims-Debts%s</b> sa <b>åtagande står</b> för en beräkning på utfärdade fakturor
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesAmountWithTaxIncluded=- Belopp som visas är med alla skatter inkluderade
 RulesResultDue=- Belopp som anges är med alla skatter inkluderade <br> - Det omfattar utestående fakturor, utlägg och mervärdesskatt oavsett om de betalas eller inte. <br> - Den bygger på validering datum för fakturor och moms och på förfallodagen för kostnader.
-RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT. <br>- It is based on the payment dates of the invoices, expenses and VAT.
+RulesResultInOut=- Den innehåller de verkliga utbetalningarna på fakturor, kostnader och moms. <br> - Den bygger på datum för fakturor, kostnader och moms betalning.
 RulesCADue=- Det omfattar kundens förfallna fakturor oavsett om de betalas eller inte. <br> - Den bygger på valideringen dagen för dessa fakturor. <br>
 RulesCAIn=- Den innehåller alla faktiska utbetalningar av fakturor från kunder. <br> - Den bygger på betalningsdagen för dessa fakturor <br>
 DepositsAreNotIncluded=- Deposit fakturor eller ingår
 DepositsAreIncluded=- Deposit fakturor ingår
 LT2ReportByCustomersInInputOutputModeES=Rapport från tredje part IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+LT1ReportByCustomersInInputOutputModeES=Rapport från tredje part RE
+VATReportByCustomersInInputOutputMode=Rapport av kunden moms samlas och betalas
+VATReportByCustomersInDueDebtMode=Rapport av kunden moms samlas och betalas
+VATReportByQuartersInInputOutputMode=Rapport från graden av mervärdesskatten och en betald
+LT1ReportByQuartersInInputOutputMode=Rapport från RE hastighet
+LT2ReportByQuartersInInputOutputMode=Betänkande av IRPF hastighet
+VATReportByQuartersInDueDebtMode=Rapport från graden av mervärdesskatten och en betald
+LT1ReportByQuartersInDueDebtMode=Rapport från RE hastighet
+LT2ReportByQuartersInDueDebtMode=Betänkande av IRPF hastighet
 SeeVATReportInInputOutputMode=Se rapporten <b>%sVAT encasement%s</b> en vanlig beräkning
 SeeVATReportInDueDebtMode=Se rapporten <b>%sVAT om flow%s</b> för en beräkning med en option på flödet
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInServices=- För tjänster innehåller rapporten de momsregler som faktiskt mottagits eller utfärdats på grundval av betalningsdagen.
 RulesVATInProducts=- För materiella tillgångar, innehåller den för mervärdesskatt fakturor på grundval av fakturadatum.
 RulesVATDueServices=- För tjänster inkluderar redovisa moms fakturor på grund, har betalats eller inte, baserat på fakturadatum.
 RulesVATDueProducts=- För materiella tillgångar, innehåller den för mervärdesskatt fakturor, baserat på fakturadatum.
@@ -178,33 +178,29 @@ CodeNotDef=Inte definierad
 AddRemind=Dispatch tillgängliga beloppet
 RemainToDivide= Återstår att sända:
 WarningDepositsNotIncluded=Insättningar fakturor ingår inte i denna version med denna redovisning modul.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
+DatePaymentTermCantBeLowerThanObjectDate=Betalning sikt datum kan inte vara lägre än objektdatum.
 Pcg_version=Pcg version
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-InvoiceDispatched=Dispatched invoices
-AccountancyDashboard=Accountancy summary
-ByProductsAndServices=By products and services
-RefExt=External ref
-ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
-LinkedOrder=Link to order
-ReCalculate=Recalculate
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
-CalculationMode=Calculation mode
-AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+Pcg_type=Pcg typ
+Pcg_subtype=Pcg subtyp
+InvoiceLinesToDispatch=Faktura linjer avsändandet
+InvoiceDispatched=Skickas fakturor
+AccountancyDashboard=Bokförings sammandrag
+ByProductsAndServices=Genom produkter och tjänster
+RefExt=Extern ref
+ToCreateAPredefinedInvoice=För att skapa en fördefinierad faktura, skapa en standard faktura då, utan att validera den, klicka på knappen "Konvertera till fördefinierad faktura".
+LinkedOrder=Länk för att beställa
+ReCalculate=Räkna
+Mode1=Metod 1
+Mode2=Metod 2
+CalculationRuleDesc=För att beräkna den totala mervärdesskatt, finns det två metoder: <br> Metod 1 är avrundning moms på varje rad, sedan summera dem. <br> Metod 2 är summera all moms på varje rad, sedan avrundning resultatet. <br> Slutresultat kan skiljer sig från några cent. Standardläget är <b>läget% s.</b>
+CalculationRuleDescSupplier=enligt leverantör, väljer lämplig metod att tillämpa samma beräkningsregel och få samma resultat som förväntas av din leverantör.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Omsättning rapport per produkt, när du använder en <b>kontantredovisningsläge</b> inte är relevant. Denna rapport är endast tillgänglig när du använder <b>engagemang bokföring</b> läge (se inställning av bokföring modul).
+CalculationMode=Beräkning läge
+AccountancyJournal=Bokförings kod tidskrift
+ACCOUNTING_VAT_ACCOUNT=Standard bokföring kod för uppbörden av moms
+ACCOUNTING_VAT_BUY_ACCOUNT=Standard bokföring kod för att betala moms
+ACCOUNTING_ACCOUNT_CUSTOMER=Bokföring kod som standard för kund thirdparties
+ACCOUNTING_ACCOUNT_SUPPLIER=Bokföring kod som standard för leverantörs thirdparties
+CloneTax=Klona en social avgift
+ConfirmCloneTax=Bekräfta klon av en social bidrag
+CloneTaxForNextMonth=Klona det för nästa månad
diff --git a/htdocs/langs/sv_SE/contracts.lang b/htdocs/langs/sv_SE/contracts.lang
index f011f836ba8..0d5b012104f 100644
--- a/htdocs/langs/sv_SE/contracts.lang
+++ b/htdocs/langs/sv_SE/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Kontrakt område
 ListOfContracts=Förteckning över avtal
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Senaste %s modifierade kontrakt
 AllContracts=Alla kontrakt
 ContractCard=Kontrakt kort
 ContractStatus=Kontrakt status
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Förteckning över löpande kontrakt linjer
 ListOfRunningServices=Förteckning över löpande tjänster
 NotActivatedServices=Inaktiva tjänster (bland validerade kontrakt)
 BoardNotActivatedServices=Tjänster att aktivera bland validerade kontrakt
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Senaste %s aktiverade tjänster
 LastModifiedServices=Senast %s uppdaterade tjänster
 EditServiceLine=Redigera servicelinjen
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Förteckning över tjänster som löper ut
 NoteListOfYourExpiredServices=Denna förteckning omfattar endast tjänster från avtal med tredje part i förhållande till vilka du är säljare.
 StandardContractsTemplate=Standardkontrakt mall
 ContactNameAndSignature=För %s, namn och underskrift:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Säljare som tecknar avtal
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index 75eaafb3990..cf4ed34e6ae 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=På Unix-miljö bör du använda crontab för att köra
 CronExplainHowToRunWin=På Microsoft (tm) Windows environement kan du använda schemalagd aktivitet verktyg för att köra kommandoraden varje minuter
 # Menu
 CronJobs=Schemalagda jobb
-CronListActive=List of active/scheduled jobs
+CronListActive=Lista över aktiva / schemalagda jobb
 CronListInactive=Lista över handikappade jobb
 # Page list
 CronDateLastRun=Senaste körning
diff --git a/htdocs/langs/sv_SE/donations.lang b/htdocs/langs/sv_SE/donations.lang
index 2e0f351d082..a66b54ae5af 100644
--- a/htdocs/langs/sv_SE/donations.lang
+++ b/htdocs/langs/sv_SE/donations.lang
@@ -31,8 +31,8 @@ DonationRecipient=Donation mottagaren
 ThankYou=Tack
 IConfirmDonationReception=Mottagaren förklarar mottagning, som en donation, av följande belopp
 MinimumAmount=Minsta belopp är% s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
+FreeTextOnDonations=Fri text för att visa i sidfoten
+FrenchOptions=Alternativ för Frankrike
+DONATION_ART200=Visar artikel 200 från CGI om du är orolig
+DONATION_ART238=Visar artikel 238 från CGI om du är orolig
+DONATION_ART885=Visar artikel 885 från CGI om du är orolig
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 230f6f74889..e05970fa6f1 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fel, denna medlem ännu koppla
 ErrorThereIsSomeDeliveries=Fel, det finns några leveranser kopplade till denna sändning. Radering vägrade.
 ErrorCantDeletePaymentReconciliated=Kan inte ta bort en betalning som hade genererat en banktransaktion som conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Kan inte ta bort en betalning som delas av minst en faktura med status betalt
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Obligatoriska inställningsparametrarna har ännu inte definierat
diff --git a/htdocs/langs/sv_SE/exports.lang b/htdocs/langs/sv_SE/exports.lang
index e511fc6c590..5cbc416231e 100644
--- a/htdocs/langs/sv_SE/exports.lang
+++ b/htdocs/langs/sv_SE/exports.lang
@@ -8,7 +8,7 @@ ImportableDatas=Importeras dataset
 SelectExportDataSet=Välj uppsättning data du vill exportera ...
 SelectImportDataSet=Välj uppsättning data du vill importera ...
 SelectExportFields=Välj fält du vill exportera, eller välj en fördefinierad export profil
-SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+SelectImportFields=Välj fil fält du vill importera och deras mål fält i databasen genom att flytta dem upp och ner med ankar %s, eller välj en fördefinierad importprofil:
 NotImportedFields=Fält av källfil importeras inte
 SaveExportModel=Spara den här exportera profilen om du tänker återanvända det senare ...
 SaveImportModel=Spara denna import profil om du planerar att återanvända den senare ...
@@ -64,7 +64,7 @@ ChooseFormatOfFileToImport=Välj filformat som ska användas som importera filfo
 ChooseFileToImport=Ladda upp filer klicka sedan på Picto %s för att välja fil som källa importera filen ...
 SourceFileFormat=Källa filformat
 FieldsInSourceFile=Fält i källfilen
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+FieldsInTargetDatabase=Target fält i Dolibarr databas (fetstil = obligatorisk)
 Field=Fält
 NoFields=Inga fält
 MoveField=Flytta fält %s kolumn nummer
@@ -81,7 +81,7 @@ DoNotImportFirstLine=Importera inte första raden i källfilen
 NbOfSourceLines=Antal rader i källfilen
 NowClickToTestTheImport=Kontrollera importera parametrar som du har definierat. Om de är korrekta, klicka på knappen <b>&quot;%s&quot;</b> för att starta en simulering av importprocessen (inga data kommer att ändras i databasen, det är bara en simulering för tillfället) ...
 RunSimulateImportFile=Starta import simulering
-FieldNeedSource=This field requires data from the source file
+FieldNeedSource=Detta fält kräver data från källfilen
 SomeMandatoryFieldHaveNoSource=Vissa obligatoriska fält inte har någon källa från datafil
 InformationOnSourceFile=Information om källfil
 InformationOnTargetTables=Information om mål fält
@@ -102,33 +102,33 @@ NbOfLinesImported=Antal rader importerades: <b>%s.</b>
 DataComeFromNoWhere=Värde att infoga kommer från ingenstans i källfilen.
 DataComeFromFileFieldNb=Värde att infoga kommer från nummer <b>%s</b> fältet i källfilen.
 DataComeFromIdFoundFromRef=Värde som kommer från flera <b>%s</b> på källfil kommer att användas för att hitta ID förälder motsätta sig att använda (Så objet <b>%s</b> som har ref. Från källfilen måste finns i Dolibarr).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
+DataComeFromIdFoundFromCodeId=Kod som kommer från <b>fältnummer %s</b> av källfilen kommer att användas för att hitta id ordnade objekt för att använda (Så koden från källfilen måste existerar i <b>ordlistan %s).</b> Observera att om du vet id, kan du även använda den till källfilen istället för kod. Importera bör arbeta i båda fallen.
 DataIsInsertedInto=Uppgifter från källfilen kommer att införas i följande område:
 DataIDSourceIsInsertedInto=ID på överordnat objekt hittas med hjälp av data i källfilen kommer att införas i följande område:
 DataCodeIDSourceIsInsertedInto=Id av förälder linje hittades från kod, kommer att införas i följande fält:
 SourceRequired=Data värde är obligatoriskt
 SourceExample=Exempel på möjliga datavärde
 ExampleAnyRefFoundIntoElement=Varje ref för element <b>%s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Varje kod (eller id) fann i <b>ordlistan% s</b>
 CSVFormatDesc=<b>Semikolonavgränsade</b> filformat (. Csv). <br> Detta är en text filformat där separeras fält av separator [%s]. Om separator finns inuti ett fält innehållet är området rundad med rund karaktär [%s]. Escape karaktär att fly rund karaktär är [%s].
-Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is native Excel 95 format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is native Excel 2007 format (SpreadsheetML).
-TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ).
+Excel95FormatDesc=<b>Excel-format</b> (.xls) <br> Detta är Excel 95-format (BIFF5).
+Excel2007FormatDesc=<b>Excel-format</b> (.xlsx) <br> Detta är Excel 2007-format (SpreadsheetML).
+TsvFormatDesc=<b>Tab Separerad Värde</b> filformat (.tsv) <br> Detta är en textfil format där fälten skiljs åt av en tabulator [flik].
+ExportFieldAutomaticallyAdded=<b>Fält %s</b> lades automatiskt. Den kommer att undvika dig att ha liknande linjer som ska behandlas som dubbla poster (med det här fältet till, kommer alla linjer äga sin egen id och kan skilja).
 CsvOptions=Csv alternativ
 Separator=Avdelare
-Enclosure=Enclosure
+Enclosure=Inneslutning
 SuppliersProducts=Levedrantörsprodukter
 BankCode=Bankkod
 DeskCode=Reception kod
 BankAccountNumber=Kontonummer
 BankAccountNumberKey=Nyckel
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+SpecialCode=Specialkod
+ExportStringFilter=%% Tillåter ersätta ett eller flera tecken i texten
+ExportDateFilter=ÅÅÅÅ, ÅÅÅÅMM, ÅÅÅÅMMDD: filter efter ett år / månad / dag <br> ÅÅÅÅ + ÅÅÅÅ, ÅÅÅÅMM + ÅÅÅÅMM, ÅÅÅÅMMDD + ÅÅÅÅMMDD: filter över en rad år / månader / dagar <br> > ÅÅÅÅ,> ÅÅÅÅMM,> ÅÅÅÅMMDD: filter på alla följande år / månader / dagar <br> <ÅÅÅÅ, <ÅÅÅÅMM, <ÅÅÅÅMMDD: filter på alla tidigare år / månader / dagar
+ExportNumericFilter='NNNNN "filter med en värde <br> 'NNNNN + NNNNN' filter över ett intervall av värden <br> "> NNNNN" filter med lägre värden <br> "> NNNNN" filter med högre värden
 ## filters
-SelectFilterFields=If you want to filter on some values, just input values here.
+SelectFilterFields=Om du vill filtrera på vissa värderingar, fyll i ingångsvärden här.
 FilterableFields=Champs Filtrables
-FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
+FilteredFields=Filtrerad fält
+FilteredFieldsValues=Värde för filter
diff --git a/htdocs/langs/sv_SE/externalsite.lang b/htdocs/langs/sv_SE/externalsite.lang
index c912ae72dd0..e8162ce8502 100644
--- a/htdocs/langs/sv_SE/externalsite.lang
+++ b/htdocs/langs/sv_SE/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=Setup länk till extern webbplats
 ExternalSiteURL=Extern webbplats URL
 ExternalSiteModuleNotComplete=Modul ExternalSite var inte korrekt konfigurerad.
-ExampleMyMenuEntry=My menu entry
+ExampleMyMenuEntry=Min meny posten
diff --git a/htdocs/langs/sv_SE/interventions.lang b/htdocs/langs/sv_SE/interventions.lang
index b97e7592c6a..425f3245245 100644
--- a/htdocs/langs/sv_SE/interventions.lang
+++ b/htdocs/langs/sv_SE/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
 Interventions=Insatser
 InterventionCard=Intervention kort
 NewIntervention=Nya insatser
-AddIntervention=Create intervention
+AddIntervention=Skapa ingripande
 ListOfInterventions=Förteckning över åtgärder
 EditIntervention=Redigera ingripande
 ActionsOnFicheInter=Åtgärder för ingripande
@@ -23,22 +23,22 @@ ConfirmDeleteInterventionLine=Är du säker på att du vill ta bort detta ingrip
 NameAndSignatureOfInternalContact=Namn och underskrift ingripa:
 NameAndSignatureOfExternalContact=Namn och underskrift av kund:
 DocumentModelStandard=Standarddokument modell för insatser
-InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionCardsAndInterventionLines=Ingrepp och linjer av interventioner
+InterventionClassifyBilled=Klassificera "Fakturerad"
+InterventionClassifyUnBilled=Classify "ofakturerade"
 StatusInterInvoiced=Fakturerade
 RelatedInterventions=Insatserna
 ShowIntervention=Visar ingripande
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by Email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionDeletedInDolibarr=Intervention %s deleted
-SearchAnIntervention=Search an intervention
+SendInterventionRef=Inlämning av ingrepp %s
+SendInterventionByMail=Skicka ingripa Email
+InterventionCreatedInDolibarr=Ingrepp %s skapad
+InterventionValidatedInDolibarr=Ingrepp %s validerade
+InterventionModifiedInDolibarr=Ingrepp %s modifierade
+InterventionClassifiedBilledInDolibarr=Ingrepp %s uppsättning som faktureras
+InterventionClassifiedUnbilledInDolibarr=Ingrepp %s uppsättning som ofakturerade
+InterventionSentByEMail=Ingrepp %s skickas via e-post
+InterventionDeletedInDolibarr=Ingrepp %s raderad
+SearchAnIntervention=Sök en intervention
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Representanten uppföljning ingripande
 TypeContact_fichinter_internal_INTERVENING=Ingripa
@@ -49,5 +49,5 @@ ArcticNumRefModelDesc1=Generic nummer modell
 ArcticNumRefModelError=Misslyckades med att aktivera
 PacificNumRefModelDesc1=Återgå numero med format %syymm-nnnn där YY är år, mm månaden och nnnn är en sekvens utan avbrott och ingen återgång till 0
 PacificNumRefModelError=En intervention kort börjar med $ syymm finns redan och är inte förenligt med denna modell för sekvens. Ta bort den eller byta namn på den för att aktivera denna modul.
-PrintProductsOnFichinter=Print products on intervention card
-PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinter=Trycksaker på interventionskort
+PrintProductsOnFichinterDetails=forinterventions genereras från order
diff --git a/htdocs/langs/sv_SE/ldap.lang b/htdocs/langs/sv_SE/ldap.lang
index caea335f633..fe63de5bc39 100644
--- a/htdocs/langs/sv_SE/ldap.lang
+++ b/htdocs/langs/sv_SE/ldap.lang
@@ -25,5 +25,5 @@ UserSynchronized=Användare synkroniseras
 GroupSynchronized=Grupp synkroniseras
 MemberSynchronized=Medlem synkroniseras
 ContactSynchronized=Kontakta synkroniseras
-ForceSynchronize=Force synkronisera Dolibarr -> LDAP
+ForceSynchronize=Tvinga synkronisering Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Misslyckades med att läsa LDAP-databas. Kontrollera LDAP-modul setup och databas tillgänglighet.
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index 5837916e0aa..73f612bb83f 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -15,10 +15,10 @@ MailReply=Svara
 MailTo=Mottagare (s)
 MailCC=Kopiera till
 MailCCC=Cachad kopia till
-MailTopic=EMail ämne
+MailTopic=E-post ämne
 MailText=Meddelande
 MailFile=Bifogade filer
-MailMessage=EMail kropp
+MailMessage=E-post huvuddel
 ShowEMailing=Visa e-post
 ListOfEMailings=Lista över emailings
 NewMailing=Ny e-post
@@ -43,20 +43,20 @@ MailingStatusSentCompletely=Skickade helt
 MailingStatusError=Fel
 MailingStatusNotSent=Skickas inte
 MailSuccessfulySent=E-post skickad (från %s till %s)
-MailingSuccessfullyValidated=EMailing successfully validated
-MailUnsubcribe=Unsubscribe
-Unsuscribe=Unsubscribe
-MailingStatusNotContact=Don't contact anymore
+MailingSuccessfullyValidated=E-post validerades
+MailUnsubcribe=Avanmälan
+Unsuscribe=Avanmälan
+MailingStatusNotContact=Kontakta inte längre
 ErrorMailRecipientIsEmpty=E-postmottagare är tom
 WarningNoEMailsAdded=Inga nya E-posta lägga till mottagarens lista.
 ConfirmValidMailing=Är du säker på att du vill godkänna denna e-post?
-ConfirmResetMailing=Varning, genom reinitializing skicka e-post <b>%s,</b> kan du göra en massa utskick av detta e-postmeddelande annan gång. Är du säker på att du detta är vad du vill göra?
+ConfirmResetMailing=Varning, genom att återinitialisera e-post <b>%s,</b> kan du göra en massa utskick av detta e-postmeddelande en annan gång. Är du säker på att detta är vad du vill göra?
 ConfirmDeleteMailing=Är du säker på att du vill ta bort denna emailling?
 NbOfRecipients=Antal mottagare
-NbOfUniqueEMails=Nb av unika e-post
-NbOfEMails=Nb av e-post
+NbOfUniqueEMails=Antal av unika e-post
+NbOfEMails=Antal e-post
 TotalNbOfDistinctRecipients=Antal skilda mottagare
-NoTargetYet=Inga stödmottagare ännu (Gå på fliken &quot;mottagare&quot;)
+NoTargetYet=Inga stödmottagare ännu (Gå på fliken "mottagare" )
 AddRecipients=Lägg till mottagare
 RemoveRecipient=Ta bort mottagare
 CommonSubstitutions=Vanliga substitutioner
@@ -67,37 +67,37 @@ NoAttachedFiles=Inga bifogade filer
 BadEMail=Dåligt värde för e-post
 CloneEMailing=Klon Email
 ConfirmCloneEMailing=Är du säker på att du vill klona denna e-post?
-CloneContent=Klon meddelande
+CloneContent=Klona meddelande
 CloneReceivers=Cloner mottagare
 DateLastSend=Datum för senaste sändning
 DateSending=Datum skicka
 SentTo=Skickat till <b>%s</b>
 MailingStatusRead=Läsa
-CheckRead=Read Receipt
-YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
-MailtoEMail=Hyper link to email
-ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
-EMailSentToNRecipients=EMail sent to %s recipients.
-XTargetsAdded=<b>%s</b> recipients added into target list
-EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
-MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s)
-SendRemind=Send reminder by EMails
-RemindSent=%s reminder(s) sent
-AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent)
-NoRemindSent=No EMail reminder sent
-ResultOfMassSending=Result of mass EMail reminders sending
+CheckRead=Läs Kvitto
+YourMailUnsubcribeOK=<b>E-post %s</b> är korrekt avbeställt från sändlistan
+MailtoEMail=Hyper länk till e-post
+ActivateCheckRead=Låt använd länken "Unsubcribe"
+ActivateCheckReadKey=Key bruk för att kryptera URL användning för "Läs Kvitto" och "Unsubcribe" -funktionen
+EMailSentToNRecipients=EMail skickas till% s mottagare.
+XTargetsAdded=<b>% s</b> mottagare läggs in i målet listan
+EachInvoiceWillBeAttachedToEmail=Ett dokument med standardfakturadokumentmall kommer att skapas och bifogas varje e-postmeddelande.
+MailTopicSendRemindUnpaidInvoices=Påminnelse om faktura% s (% s)
+SendRemind=Skicka påminnelse av e-post
+RemindSent=% S påminnelse (er) skickas
+AllRecipientSelectedForRemind=Alla thirdparties väljs och om ett e-post sätts (observera att en post per faktura skickas)
+NoRemindSent=Ingen EMail påminnelse
+ResultOfMassSending=Resultat av massa e påminnelser skicka
 
 # Libelle des modules de liste de destinataires mailing
 MailingModuleDescContactCompanies=Kontakter av alla tredje parter (kund, prospekt, leverantör, ...)
 MailingModuleDescDolibarrUsers=Alla Dolibarr användare med e-post
 MailingModuleDescFundationMembers=Stiftelsen medlemmar med e-post
 MailingModuleDescEmailsFromFile=E-post från en textfil (email, namn, efternamn, kommentarer)
-MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other)
+MailingModuleDescEmailsFromUser=E-post från användarens input (email, efternamn, förnamn, andra)
 MailingModuleDescContactsCategories=Tredje part med e-post (per kategori)
 MailingModuleDescDolibarrContractsLinesExpired=Tredje part med utgångna avtalets linjer
 MailingModuleDescContactsByCompanyCategory=Kontakter med tredje part (av tredje part kategori)
-MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category
+MailingModuleDescContactsByCategory=Kontakter / adresser från tredje part efter kategori
 MailingModuleDescMembersCategories=Foundation medlemmar (per kategori)
 MailingModuleDescContactsByFunction=Kontakter från tredje part (i position / funktion)
 LineInFile=Line %s i filen
@@ -112,30 +112,30 @@ SearchAMailing=Sök utskick
 SendMailing=Skicka e-post
 SendMail=Skicka e-post
 SentBy=Skickat av
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand=Av säkerhetsskäl, skicka ett email är bättre när de utförs från kommandoraden. Om du har en, be din serveradministratör för att lansera följande kommando för att skicka e-post till alla mottagare:
 MailingNeedCommand2=Du kan dock skicka dem online genom att lägga till parametern MAILING_LIMIT_SENDBYWEB med värde av maximalt antal e-postmeddelanden du vill skicka genom sessionen. För detta, gå hem - Setup - Annat.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+ConfirmSendingEmailing=Om du inte kan eller föredrar att skicka dem med din webbläsare, bekräfta att du är säker på att du vill skicka e-post nu från din webbläsare?
+LimitSendingEmailing=Obs: Sänder av email från webbgränssnitt sker i flera gånger för säkerhets- och timeout <b>skäl,% s</b> mottagare i taget för varje sändning session.
 TargetsReset=Rensa lista
 ToClearAllRecipientsClickHere=Klicka här för att rensa listor över mottagare av detta e-post
 ToAddRecipientsChooseHere=Lägg till mottagare genom att välja från listorna
 NbOfEMailingsReceived=Massa emailings fått
-NbOfEMailingsSend=Mass emailings sent
+NbOfEMailingsSend=Massemail skickas
 IdRecord=ID rekord
 DeliveryReceipt=Leveranskvitto
 YouCanUseCommaSeparatorForSeveralRecipients=Du kan använda <b>kommateckenavgränsare</b> att ange flera mottagare.
-TagCheckMail=Track mail opening
-TagUnsubscribe=Unsubscribe link
-TagSignature=Signature sending user
-TagMailtoEmail=Recipient EMail
+TagCheckMail=Spår post öppning
+TagUnsubscribe=Avanmälan länk
+TagSignature=Signatur sändande användarens
+TagMailtoEmail=Mottagarens EMail
 # Module Notifications
 Notifications=Anmälningar
 NoNotificationsWillBeSent=Inga e-postmeddelanden planeras för detta evenemang och företag
 ANotificationsWillBeSent=En anmälan kommer att skickas via e-post
 SomeNotificationsWillBeSent=%s anmälningar kommer att skickas via e-post
-AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=List all active email notification targets
+AddNewNotification=Aktivera ett nytt mål e-postmeddelande
+ListOfActiveNotifications=Lista alla aktiva mål för e-postmeddelanden
 ListOfNotificationsDone=Lista alla e-postmeddelanden skickas
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=Konfiguration av e-post att skicka har ställts in till "% s". Detta läge kan inte användas för att skicka massutskick.
+MailSendSetupIs2=Du måste först gå, med ett administratörskonto, i meny% Shome - Setup - e-post% s för att ändra parameter <strong>'% s'</strong> för att använda läget "% s". Med det här läget kan du ange inställningar för SMTP-servern från din internetleverantör och använda Mass mejla funktionen.
+MailSendSetupIs3=Om du har några frågor om hur man ställer in din SMTP-server, kan du be att% s.
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index a14984c379e..facd4e8651d 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -290,8 +290,8 @@ UnitPrice=Pris per enhet
 UnitPriceHT=Pris per enhet (netto)
 UnitPriceTTC=Pris per enhet
 PriceU=Styckpris
-PriceUHT=Styckpris (netto)
-PriceUTTC=Styckpris
+PriceUHT=St.pris(net)
+PriceUTTC=St.pris
 Amount=Belopp
 AmountInvoice=Fakturabelopp
 AmountPayment=Betalningsbelopp
@@ -367,7 +367,7 @@ ActionsOnCompany=Åtgärder om denna tredje part
 ActionsOnMember=Händelser om denna medlem
 NActions=%s åtgärder
 NActionsLate=%s sent
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=Begär redan registrerats
 Filter=Filter
 RemoveFilter=Ta bort filtret
 ChartGenerated=Diagram genererat
diff --git a/htdocs/langs/sv_SE/margins.lang b/htdocs/langs/sv_SE/margins.lang
index 2579ca249f1..82c57619fd6 100644
--- a/htdocs/langs/sv_SE/margins.lang
+++ b/htdocs/langs/sv_SE/margins.lang
@@ -8,7 +8,7 @@ MarginOnServices=Marginal / Tjänster
 MarginRate=Marginalsats
 MarkRate=Markera sats
 DisplayMarginRates=Visa marginalsatser
-DisplayMarkRates=Display mark rates
+DisplayMarkRates=Display markera hastigheter
 InputPrice=Inpris
 margin=Hantering av vinstmarginaler
 margesSetup=Inställningar för vinstmarginalhantering
@@ -23,22 +23,22 @@ StartDate=Startdatum
 EndDate=Slutdatum
 Launch=Start
 ForceBuyingPriceIfNull=Tvinga inköpspris om tom
-ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
+ForceBuyingPriceIfNullDetails=Om "ON", kommer marginalen att vara noll på linjen (köp pris = försäljningspris), annars ("OFF"), marge kommer vara lika med försäljningspris (köp pris = 0)
 MARGIN_METHODE_FOR_DISCOUNT=Marginalmetod för globala rabatter
 UseDiscountAsProduct=Som produkt
 UseDiscountAsService=Som tjänst
 UseDiscountOnTotal=På delsumma
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definierar om en global rabatt behandlas som en produkt, en tjänst, eller bara på delsumman för beräkning marginal.
 MARGIN_TYPE=Typ av marginal
 MargeBrute=Bruttomarginal
 MargeNette=Nettomarginal
 MARGIN_TYPE_DETAILS=Bruttomarginal: Säljpris - Inköpspris<br/>Nettomarginal: Säljpris - Kostnadspris
 CostPrice=Kostnadspris
 BuyingCost=Kostnadspris
-UnitCharges=Unit charges
-Charges=Charges
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
+UnitCharges=Enhetsladdningar
+Charges=Avgifter
+AgentContactType=Handelsagent kontakttyp
+AgentContactTypeDetails=Definiera vad kontakttyp (länkad på fakturor) kommer att användas för marginalrapport per försäljning representant
+rateMustBeNumeric=Betyg måste vara ett numeriskt värde
+markRateShouldBeLesserThan100=Mark takt bör vara lägre än 100
+ShowMarginInfos=Visa marginal information
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index 6110d5aa422..1fcf12f9f2b 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -203,3 +203,4 @@ MembersByNature=Medlemmar på sort
 VATToUseForSubscriptions=Moms-sats för prenumeration
 NoVatOnSubscription=Ingen moms för prenumeration
 MEMBER_PAYONLINE_SENDEMAIL=E-post för att varna när Dolibarr mottager en bekräftelse för en validerad betalning för en prenumeration
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/sv_SE/opensurvey.lang b/htdocs/langs/sv_SE/opensurvey.lang
index c5403b5cff7..97ea739efce 100644
--- a/htdocs/langs/sv_SE/opensurvey.lang
+++ b/htdocs/langs/sv_SE/opensurvey.lang
@@ -5,27 +5,27 @@ OrganizeYourMeetingEasily=Organisera dina möten och enkäter lätt. Först väl
 NewSurvey=Ny enkät
 NoSurveysInDatabase=%s enkät (er) i databasen.
 OpenSurveyArea=Enkät område
-AddACommentForPoll=You can add a comment into poll...
+AddACommentForPoll=Du kan lägga till en kommentar till enkät ...
 AddComment=Lägg till kommentar
 CreatePoll=Skapa enkät
 PollTitle=Enkät titel
-ToReceiveEMailForEachVote=Receive an email for each vote
+ToReceiveEMailForEachVote=Få ett mail för varje omröstning
 TypeDate=Typ Datum
 TypeClassic=Typ standard
-OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+OpenSurveyStep2=Välj datum amoung de fria dagarna (grå). De utvalda dagar är gröna. Du kan avmarkera en dag tidigare valts genom att klicka igen på det
 RemoveAllDays=Ta bort alla dagar
 CopyHoursOfFirstDay=Kopiera timmar av första dagen
-RemoveAllHours=Remove all hours
-SelectedDays=Selected days
-TheBestChoice=The best choice currently is
-TheBestChoices=The best choices currently are
+RemoveAllHours=Ta bort alla timmar
+SelectedDays=Valda dagar
+TheBestChoice=Det bästa valet för närvarande är
+TheBestChoices=De bästa valen för närvarande
 with=med
-OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+OpenSurveyHowTo=Om du går med på att rösta i den här omröstningen, måste du ge ditt namn väljer de värden som passar bäst för dig och bekräfta med plusknappen i slutet av raden.
+CommentsOfVoters=Kommentarer väljare
+ConfirmRemovalOfPoll=Är du säker på att du vill ta bort den här omröstningen (och alla röster)
 RemovePoll=Radera enkäten
-UrlForSurvey=URL to communicate to get a direct access to poll
-PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
+UrlForSurvey=URL för att kommunicera för att få direkt tillgång till poll
+PollOnChoice=Du skapar en omröstning för att göra en multi-val för en omröstning. Först in alla möjliga val för din enkät:
 CreateSurveyDate=Skapa en datum enkät
 CreateSurveyStandard=Skapa en vanlig enkät
 CheckBox=Enkel checkbox
@@ -33,34 +33,34 @@ YesNoList=List (tom/ja/nej)
 PourContreList=Lista (tom/för/emot)
 AddNewColumn=Lägg till ny kolumn
 TitleChoice=Val av etikett
-ExportSpreadsheet=Export result spreadsheet
+ExportSpreadsheet=Export resultat kalkylblad
 ExpireDate=Begränsa datum
 NbOfSurveys=Antal enkäter
 NbOfVoters=Antal av väljarna
 SurveyResults=Resultat
-PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-5MoreChoices=5 more choices
-Abstention=Abstention
+PollAdminDesc=Det är tillåtet att ändra alla tycker linjer här omröstningen med knappen "Edit". Du kan, liksom, ta bort en kolumn eller en rad med% s. Du kan också lägga till en ny kolumn med% s.
+5MoreChoices=5 fler alternativ
+Abstention=Avhållsamhet
 Against=Mot
-YouAreInivitedToVote=You are invited to vote for this poll
-VoteNameAlreadyExists=This name was already used for this poll
-ErrorPollDoesNotExists=Error, poll <strong>%s</strong> does not exists.
+YouAreInivitedToVote=Du är inbjuden att rösta på den här omröstningen
+VoteNameAlreadyExists=Detta namn används redan för den här omröstningen
+ErrorPollDoesNotExists=Fel, inte <strong>enkät% s</strong> inte existerar.
 OpenSurveyNothingToSetup=Det finns ingen specifik inställning att göra.
-PollWillExpire=Your poll will expire automatically <strong>%s</strong> days after the last date of your poll.
+PollWillExpire=Din enkät förfaller <strong>automatiskt% s</strong> dagar efter den sista dagen för din enkät.
 AddADate=Lägg till ett datum
 AddStartHour=Lägg till start tid
 AddEndHour=Lägg till slut tid
 votes=röst (er)
-NoCommentYet=No comments have been posted for this poll yet
-CanEditVotes=Can change vote of others
-CanComment=Voters can comment in the poll
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-BackToCurrentMonth=Back to current month
-ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
+NoCommentYet=Inga kommentarer har lagts till den här omröstningen ännu
+CanEditVotes=Kan ändra röst andras
+CanComment=Väljarna kan kommentera i omröstningen
+CanSeeOthersVote=Väljarna kan se andra människors röst
+SelectDayDesc=För varje vald dag kan du välja, eller inte, mötes timmar i följande format: <br> - Tom, <br> - "8h", "8H" eller "08:00" för att ge ett möte start timme, <br> - "8-11", "8h-11h", "8H-11H" eller "8: 00-11: 00" för att ge en mötets början och slut timme, <br> - "8h15-11h15", "8H15-11H15" eller "8: 15-11: 15" för samma sak men med några minuter.
+BackToCurrentMonth=Tillbaka till aktuella månaden
+ErrorOpenSurveyFillFirstSection=Du har inte fyllt den första sektionen av röstningen skapande
 ErrorOpenSurveyOneChoice=Ange minst ett val
 ErrorOpenSurveyDateFormat=Datum måste ha formatet ÅÅÅÅ-MM-DD
 ErrorInsertingComment=Det uppstod ett fel när du skapa din kommentar
-MoreChoices=Enter more choices for the voters
-SurveyExpiredInfo=The voting time of this poll has expired.
-EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+MoreChoices=Ange fler alternativ för väljarna
+SurveyExpiredInfo=Den omröstningen i denna enkät har gått ut.
+EmailSomeoneVoted=% S har fyllt en rad. Du kan hitta din enkät på länken:% s
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index 43df2e39b0b..ad1112357ea 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=En sändning föreligger
 DraftOrWaitingApproved=Förslag eller godkänts ännu ej beställas
 DraftOrWaitingShipped=Förslag eller godkännas ännu inte sändas
 MenuOrdersToBill=Order till faktura
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Fakturerbara order
 SearchOrder=Sök ordning
 SearchACustomerOrder=Sök en kundorder
 ShipProduct=Ship produkt
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index ab030a8c9ac..326d05f3b36 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -5,7 +5,7 @@ Tools=Verktyg
 ToolsDesc=Detta område är avsedd för gruppen diverse verktyg som inte finns i andra menyposter. <br><br> Dessa verktyg kan nås från menyn på sidan.
 Birthday=Födelsedag
 BirthdayDate=Födelsedag
-DateToBirth=Datum för födelse
+DateToBirth=Födelsedatum
 BirthdayAlertOn= födelsedag alert aktiva
 BirthdayAlertOff= födelsedag alert inaktiv
 Notify_FICHINTER_VALIDATE=Intervention validerade
@@ -55,11 +55,11 @@ AttachANewFile=Bifoga en ny fil / dokument
 LinkedObject=Länkat objekt
 Miscellaneous=Diverse
 NbOfActiveNotifications=Antal anmälningar
-PredefinedMailTest=Detta är en test post. \\ NDet två linjerna är åtskilda av en vagnretur.
+PredefinedMailTest=Detta är en test post. \nDet två linjerna är åtskilda av en vagnretur.\n\n__SIGNATURE__
 PredefinedMailTestHtml=Detta är en <b>test</b> post (ordet Provningen skall i fetstil). <br> De två linjerna är åtskilda av en vagnretur.
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Här hittar du fakturan __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Vi vill varna er att fakturan __FACREF__ tycks inte betalt. Så detta är fakturan i bilagan igen, som en påminnelse. __PERSONALIZED__Sincerely __SIGNATURE__
-PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Här hittar du det kommersiella förslaget __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \nHär hittar du det kommersiella förslaget __PROPREF__\n__PERSONALIZED__mvh\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Här hittar ordern __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Här hittar du vår ordning __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Här hittar du fakturan __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
@@ -203,26 +203,26 @@ ForgetIfNothing=Om du inte har begärt denna förändring, bara glömma detta ma
 
 ##### Calendar common #####
 AddCalendarEntry=Lägg till post i kalendern %s
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-PaymentDoneInDolibarr=Payment %s done
-CustomerPaymentDoneInDolibarr=Customer payment %s done
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberValidatedInDolibarr=Member %s validated
-MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentDeletedInDolibarr=Shipment %s deleted
+NewCompanyToDolibarr=Företag %s tillsatt
+ContractValidatedInDolibarr=Kontrakt %s validerade
+ContractCanceledInDolibarr=Kontrakt %s annulleras
+ContractClosedInDolibarr=Kontrakt %s stängd
+PropalClosedSignedInDolibarr=Förslag %s undertecknade
+PropalClosedRefusedInDolibarr=Förslag %s vägrade
+PropalValidatedInDolibarr=Förslag %s validerade
+PropalClassifiedBilledInDolibarr=Förslag %s klassificerad faktureras
+InvoiceValidatedInDolibarr=Faktura %s validerade
+InvoicePaidInDolibarr=Faktura %s ändrades till betald
+InvoiceCanceledInDolibarr=Faktura %s annulleras
+PaymentDoneInDolibarr=Betalning %s klar
+CustomerPaymentDoneInDolibarr=Kundbetalning %s klar
+SupplierPaymentDoneInDolibarr=Leverantör betalning %s klar
+MemberValidatedInDolibarr=Medlem %s validerade
+MemberResiliatedInDolibarr=Medlem %s resiliated
+MemberDeletedInDolibarr=Medlem %s raderad
+MemberSubscriptionAddedInDolibarr=Teckning av medlem %s tillades
+ShipmentValidatedInDolibarr=Frakten %s validerad
+ShipmentDeletedInDolibarr=Frakten %s raderad
 ##### Export #####
 Export=Exportera
 ExportsArea=Export område
diff --git a/htdocs/langs/sv_SE/paybox.lang b/htdocs/langs/sv_SE/paybox.lang
index af4eacf9828..bbef3fa717e 100644
--- a/htdocs/langs/sv_SE/paybox.lang
+++ b/htdocs/langs/sv_SE/paybox.lang
@@ -32,9 +32,9 @@ VendorName=Namn på leverantör
 CSSUrlForPaymentForm=CSS-formatmall URL för inbetalningskort
 MessageOK=Meddelande på validerade betalning återvänder sida
 MessageKO=Meddelande om avbokning betalning återvänder sida
-NewPayboxPaymentReceived=New Paybox payment received
-NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+NewPayboxPaymentReceived=Ny Paybox betalning mottagen
+NewPayboxPaymentFailed=Ny Paybox betalnings försök men misslyckats
+PAYBOX_PAYONLINE_SENDEMAIL=EMail varnar efter en betalning (lyckade eller misslyckade)
+PAYBOX_PBX_SITE=Värde för PBX SITE
+PAYBOX_PBX_RANG=Värde för PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Värde för PBX-ID
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index d0d98e3e1f9..d9456de8b17 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -28,10 +28,10 @@ ProductsAndServicesStatistics=Produkter och tjänster statistik
 ProductsStatistics=Produkter statistik
 ProductsOnSell=Tillgängliga produkter
 ProductsNotOnSell=Föråldrade produkter
-ProductsOnSellAndOnBuy=Products not for sale nor purchase
+ProductsOnSellAndOnBuy=Produkter inte till salu eller köp
 ServicesOnSell=Tillgängliga tjänster
 ServicesNotOnSell=Föråldrade tjänster
-ServicesOnSellAndOnBuy=Services not for sale nor purchase
+ServicesOnSellAndOnBuy=Tjänster som inte till salu eller köp
 InternalRef=Intern hänvisning
 LastRecorded=Senaste produkter / tjänster att sälja in
 LastRecordedProductsAndServices=Senaste %s inspelade produkter / tjänster
@@ -72,20 +72,20 @@ PublicPrice=Offentliga pris
 CurrentPrice=Nuvarande pris
 NewPrice=Nytt pris
 MinPrice=Halvnot. försäljningspris
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPriceHT=Minim. försäljningspris (netto efter skatt)
+MinPriceTTC=Minim. försäljningspris (inkl. moms)
 CantBeLessThanMinPrice=Försäljningspriset kan inte vara lägre än lägsta tillåtna för denna bok (%s utan skatt)
 ContractStatus=Kontrakt status
 ContractStatusClosed=Stängt
 ContractStatusRunning=Running
 ContractStatusExpired=löpt ut
 ContractStatusOnHold=Inte kör
-ContractStatusToRun=To get running
+ContractStatusToRun=För att få igång
 ContractNotRunning=Detta kontrakt är inte igång
 ErrorProductAlreadyExists=En produkt med hänvisning %s finns redan.
 ErrorProductBadRefOrLabel=Felaktigt värde för referens eller etikett.
 ErrorProductClone=Ett problem uppstod vid kloning av produkten eller tjänsten.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Fel Pris Kan inte vara lägre än Lägsta pris.
 Suppliers=Leverantörer
 SupplierRef=Leverantör ref.
 ShowProduct=Visa produkt
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Om produkten är en tjänst med begränsad varaktighet:
 MultiPricesAbility=Flera prisnivåer per produkt eller tjänst
 MultiPricesNumPrices=Antal pris
 MultiPriceLevelsName=Pris kategorier
-AssociatedProductsAbility=Aktivera biprodukter
-AssociatedProducts=Biprodukter
-AssociatedProductsNumber=Antal produkter komponera denna produkt
-ParentProductsNumber=Antal förälder produkt
-IfZeroItIsNotAVirtualProduct=Om 0 är denna produkt inte en virtuell produkt
-IfZeroItIsNotUsedByVirtualProduct=Om 0 är denna produkt inte använd i någon virtuell produkt
+AssociatedProductsAbility=Aktivera virtuellt paket funktionen
+AssociatedProducts=Paket produkt
+AssociatedProductsNumber=Antal produkter komponera denna virtuellt paket produkt
+ParentProductsNumber=Antal förälder förpackningsartikel
+IfZeroItIsNotAVirtualProduct=Om 0 är denna produkt inte ett virtuellt paket produkt
+IfZeroItIsNotUsedByVirtualProduct=Om 0 är denna produkt inte används av någon virtuellt paket produkt
 EditAssociate=Associate
 Translation=Översättning
 KeywordFilter=Nyckelord filter
@@ -132,7 +132,7 @@ AddDel=Lägg till / Ta bort
 Quantity=Kvantitet
 NoMatchFound=Ingen matchning hittades
 ProductAssociationList=Lista över relaterade produkter / tjänster: namn på produkten / tjänsten (kvantitet påverkas)
-ProductParentList=Förteckning över produkter och tjänster med denna produkt som en komponent
+ProductParentList=Lista över paket produkter / tjänster med denna produkt som en komponent
 ErrorAssociationIsFatherOfThis=Ett av valda produkten är förälder med nuvarande produkt
 DeleteProduct=Ta bort en produkt / tjänst
 ConfirmDeleteProduct=Är du säker på att du vill ta bort denna produkt / tjänst?
@@ -179,12 +179,12 @@ CloneProduct=Klon produkt eller tjänst
 ConfirmCloneProduct=Är du säker på att du vill klona produkt eller tjänst <b>%s?</b>
 CloneContentProduct=Klona alla viktiga informationer av produkt / tjänst
 ClonePricesProduct=Klona viktigaste informationer och priser
-CloneCompositionProduct=Klona virtuell produkt / tjänst
+CloneCompositionProduct=Klon förpackad produkt / tjänster
 ProductIsUsed=Denna produkt används
 NewRefForClone=Ref. av ny produkt / tjänst
 CustomerPrices=Kunder priser
 SuppliersPrices=Leverantörer priser
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+SuppliersPricesOfProductsOrServices=Leverantörer priser (av produkter eller tjänster)
 CustomCode=Tullkodex
 CountryOrigin=Ursprungsland
 HiddenIntoCombo=Dold i vissa utvalda listor
@@ -209,14 +209,14 @@ Build=Tillverka
 BuildIt=Tillverka och sänd
 BuildindListInfo=Tillgänglig mängd för tillverkning per lager (ställ till 0 för ingen åtgärd)
 QtyNeed=Antal
-UnitPmp=Net unit VWAP
-CostPmpHT=Net total VWAP
+UnitPmp=Netto enhet VWAP
+CostPmpHT=Totalt netto VWAP
 ProductUsedForBuild=Automatiskt förbrukad för tillverkning
 ProductBuilded=Tillverkning klar
 ProductsMultiPrice=Produkt multi-priser
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly VWAP
-ServiceSellByQuarterHT=Services turnover quarterly VWAP
+ProductsOrServiceMultiPrice=Kunder priser (av produkter eller tjänster, multi-priser)
+ProductSellByQuarterHT=Produkter omsättning kvartalsvis VWAP
+ServiceSellByQuarterHT=Tjänster omsättning kvartalsvis VWAP
 Quarter1=1:a kvartalet
 Quarter2=2:a kvartalet
 Quarter3=3:e kvartalet
@@ -240,5 +240,10 @@ PricingRule=Prisregler
 AddCustomerPrice=Lägg till pris per kund
 ForceUpdateChildPriceSoc=Sätt samma pris på kunds filialer
 PriceByCustomerLog=Pris per kundlogg
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
+MinimumPriceLimit=Minimipris kan inte vara lägre än %s
+MinimumRecommendedPrice=Minsta rekommenderade priset är : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index d5d0379b62f..b771cfecc0b 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectId=Project Id
+RefProject=Ref. projekt
+ProjectId=Projekt Id
 Project=Projekt
 Projects=Projekt
 SharedProject=Alla
@@ -14,7 +14,7 @@ TasksDesc=Denna uppfattning presenterar alla projekt och uppgifter (din använda
 Myprojects=Mina projekt
 ProjectsArea=Projekt område
 NewProject=Nytt projekt
-AddProject=Lägg till projektet
+AddProject=Skapa projekt
 DeleteAProject=Ta bort ett projekt
 DeleteATask=Ta bort en uppgift
 ConfirmDeleteAProject=Är du säker på att du vill ta bort detta projekt?
@@ -32,20 +32,22 @@ TimeSpent=Tid som tillbringas
 TimesSpent=Tid
 RefTask=Ref. uppgift
 LabelTask=Label uppgift
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
-TaskTimeDate=Date
+TaskTimeSpent=Tid som ägnas åt uppgifter
+TaskTimeUser=Användare
+TaskTimeNote=Anmärkning
+TaskTimeDate=Datum
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Ny tid
 MyTimeSpent=Min tid
 MyTasks=Mina uppgifter
 Tasks=Uppgifter
 Task=Uppgift
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+TaskDateStart=Uppgift startdatum
+TaskDateEnd=Uppgift slutdatum
+TaskDescription=Uppgiftsbeskrivning
 NewTask=Ny uppgift
-AddTask=Lägg till uppgift
+AddTask=Skapa uppgift
 AddDuration=Lägg varaktighet
 Activity=Aktivitet
 Activities=Uppgifter / aktiviteter
@@ -54,8 +56,8 @@ MyActivities=Mina uppgifter / aktiviteter
 MyProjects=Mina projekt
 DurationEffective=Effektiv längd
 Progress=Framsteg
-ProgressDeclared=Declared progress
-ProgressCalculated=Calculated progress
+ProgressDeclared=Förklarades framsteg
+ProgressCalculated=Beräknat framsteg
 Time=Tid
 ListProposalsAssociatedProject=Förteckning över de kommersiella förslag i samband med projektet
 ListOrdersAssociatedProject=Förteckning över kundens order i samband med projektet
@@ -85,48 +87,48 @@ ActionsOnProject=Åtgärder för projektet
 YouAreNotContactOfProject=Du är inte en kontakt på denna privata projekt
 DeleteATimeSpent=Ta bort tid
 ConfirmDeleteATimeSpent=Är du säker på att du vill ta bort denna tid?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+DoNotShowMyTasksOnly=Se även uppgifter som inte tilldelats mig
+ShowMyTasksOnly=Visa bara aktiviteter för mig
 TaskRessourceLinks=Resurser
 ProjectsDedicatedToThisThirdParty=Projekt som arbetat med denna tredje part
 NoTasks=Inga uppgifter för detta projekt
 LinkedToAnotherCompany=Kopplat till annan tredje part
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAffectedToYou=Uppgift inte tilldelats dig
 ErrorTimeSpentIsEmpty=Tid är tom
 ThisWillAlsoRemoveTasks=Denna åtgärd kommer också att ta bort alla aktiviteter av projekt <b>(%s</b> uppgifter på för tillfället) och alla ingångar för nedlagd tid.
 IfNeedToUseOhterObjectKeepEmpty=Om vissa objekt (faktura, order, ...), som tillhör en annan tredje part, måste kopplas till projektet för att skapa, hålla denna tomt för att få projektet att flera tredje part.
-CloneProject=Clone project
-CloneTasks=Clone tasks
-CloneContacts=Clone contacts
-CloneNotes=Clone notes
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-ConfirmCloneProject=Are you sure to clone this project ?
-ProjectReportDate=Change task date according project start date
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Project %s created
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
+CloneProject=Klon projekt
+CloneTasks=Klon uppgifter
+CloneContacts=Klon kontakter
+CloneNotes=Klon anteckningar
+CloneProjectFiles=Klon projekt fogade filer
+CloneTaskFiles=Klon uppgift(er) anslöt filer (om uppgiften(s) klonad)
+ConfirmCloneProject=Är du säker på att klona detta projekt?
+ProjectReportDate=Ändra uppgift datum enligt projektets startdatum
+ErrorShiftTaskDate=Omöjligt att flytta datum på uppgiften enligt nytt projekt startdatum
+ProjectsAndTasksLines=Projekt och uppdrag
+ProjectCreatedInDolibarr=Projekt %s skapad
+TaskCreatedInDolibarr=Uppgift %s skapad
+TaskModifiedInDolibarr=Uppgift %s modifierade
+TaskDeletedInDolibarr=Uppgift %s raderad
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Projektledare
 TypeContact_project_external_PROJECTLEADER=Projektledare
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Bidragsgivare
+TypeContact_project_external_PROJECTCONTRIBUTOR=Bidragsgivare
 TypeContact_project_task_internal_TASKEXECUTIVE=Uppgift verkställande
 TypeContact_project_task_external_TASKEXECUTIVE=Uppgift verkställande
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
-UnlinkElement=Unlink element
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Bidragsgivare
+TypeContact_project_task_external_TASKCONTRIBUTOR=Bidragsgivare
+SelectElement=Välj elementet
+AddElement=Länk till inslag
+UnlinkElement=Ta bort länk elementet
 # Documents models
 DocumentModelBaleine=En fullständig projektets rapport modellen (logo. ..)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
-ProjectReferers=Refering objects
-SearchAProject=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+PlannedWorkload = Planerad arbetsbelastning
+WorkloadOccupation= Arbetsbelastning affektation
+ProjectReferers=Med hänvisning objekt
+SearchAProject=Sök ett projekt
+ProjectMustBeValidatedFirst=Projekt måste valideras först
+ProjectDraft=Utkast projekt
+FirstAddRessourceToAllocateTime=Associera en resurse att avsätta tid
diff --git a/htdocs/langs/sv_SE/resource.lang b/htdocs/langs/sv_SE/resource.lang
index d64075dfbf5..38588c87528 100644
--- a/htdocs/langs/sv_SE/resource.lang
+++ b/htdocs/langs/sv_SE/resource.lang
@@ -1,36 +1,34 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Resurser
+MenuResourceAdd=Ny resurs
+MenuResourcePlanning=Resursplanering
+DeleteResource=Radera resurs
+ConfirmDeleteResourceElement=Bekräfta radera resurs för detta element
+NoResourceInDatabase=Ingen resurs i databasen.
+NoResourceLinked=Ingen resurs kopplad
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Listan över resurser
+ResourceSingular=Resurs
+ResourceCard=Resurs kort
+AddResource=Skapa en resurs
+ResourceFormLabel_ref=Resursnamn
+ResourceType=Resurs typ
+ResourceFormLabel_description=Resursbeskrivning
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Resurser kopplade till elementet
 
-ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+ShowResourcePlanning=Visa resursplanering
+GotoDate=Gå till datum
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Element resurser
+ResourceCreatedWithSuccess=Resursen har skapats
+RessourceLineSuccessfullyDeleted=Resurslinje har tagits bort
+RessourceLineSuccessfullyUpdated=Resurs linje har uppdaterats
+ResourceLinkedWithSuccess=Resurs kopplat med framgång
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Resurs kort
+ConfirmDeleteResource=Bekräfta radera denna resurs
+RessourceSuccessfullyDeleted=Resurs tagits bort
+DictionaryResourceType=Typ av resurser
 
-DictionaryEMailTemplates=Modèles d'Emails
-
-SelectResource=Select resource
+SelectResource=Välj resurs
diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
index 79bd2f814a7..5c4e735ad88 100644
--- a/htdocs/langs/sv_SE/sendings.lang
+++ b/htdocs/langs/sv_SE/sendings.lang
@@ -61,8 +61,8 @@ ShipmentCreationIsDoneFromOrder=För närvarande är skapandet av en ny leverans
 RelatedShippings=Relaterade sändningar
 ShipmentLine=Transport linje
 CarrierList=Lista över transportörer
-SendingRunning=Product from customer order already sent
-SuppliersReceiptRunning=Product from supplier order already received
+SendingRunning=Produkten från kundorder redan skickad
+SuppliersReceiptRunning=Produkten från leverantörs beställning redan mottaget
 
 # Sending methods
 SendingMethodCATCH=Fångst av kunden
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 33a5ae1a790..947f99a1ccd 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Lagrets etikett krävs
 CorrectStock=Rätt lager
 ListOfWarehouses=Lista över lager
 ListOfStockMovements=Lista över lagerförändringar
-StocksArea=Warehouses area
+StocksArea=Lager område
 Location=Plats
 LocationSummary=Kortnamn plats
 NumberOfDifferentProducts=Antal olika produkter
@@ -94,13 +94,13 @@ DesiredStock=Önskat lager
 StockToBuy=Att beställa
 Replenishment=Påfyllning
 ReplenishmentOrders=Påfyllningsbeställningar
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=Enligt öka / minska aktieoptioner, fysiska lagret och virtuella lager (fysiska + aktuella beställningar) kan skilja
+UseVirtualStockByDefault=Använd virtuellt lager som standard, i stället för fysiska lager, för påfyllning funktion
 UseVirtualStock=Använd virtuellt lager
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+UsePhysicalStock=Använd fysiskt lager
+CurentSelectionMode=Curent urvalsläget
 CurentlyUsingVirtualStock=Virtuell lager
-CurentlyUsingPhysicalStock=Physical stock
+CurentlyUsingPhysicalStock=Fysiskt lager
 RuleForStockReplenishment=Regel för påfyllning av lager
 SelectProductWithNotNullQty=Välj minst en produkt med antal skilt från noll samt leverantör
 AlertOnly= Endast larm
@@ -113,13 +113,13 @@ Replenishments=Påfyllningar
 NbOfProductBeforePeriod=Antal av produkt %s i lager före vald period (< %s)
 NbOfProductAfterPeriod=Antal av produkt %s i lager efter vald period (> %s)
 MassMovement=Massrörelse
-MassStockMovement=Mass stock movement
+MassStockMovement=Mass lager rörelse
 SelectProductInAndOutWareHouse=Välj produkt, antal, ursprungslager och mållager och klicka "%s". När det är gjort för alla lageröverföringar klicka på "%s".
 RecordMovement=Spela in överföring
 ReceivingForSameOrder=Godsmottagning för denna order
 StockMovementRecorded=Sparade lageröverföringar
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+RuleForStockAvailability=Regler om krav på lagerhållning
+StockMustBeEnoughForInvoice=Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i faktura
+StockMustBeEnoughForOrder=Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i beställning
+StockMustBeEnoughForShipment= Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i transporten
 
diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang
index 1d0aac29844..712bdc678b6 100644
--- a/htdocs/langs/sv_SE/suppliers.lang
+++ b/htdocs/langs/sv_SE/suppliers.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Leverantörer
 Supplier=Leverantör
-AddSupplier=Lägg till en leverantör
+AddSupplier=Skapa en leverantör
 SupplierRemoved=Leverantör bort
 SuppliersInvoice=Leverantörer faktura
 NewSupplier=Ny leverantör
@@ -12,8 +12,8 @@ OrderDate=Beställ datum
 BuyingPrice=BETALKURS
 BuyingPriceMin=Lägsta köpkurs
 BuyingPriceMinShort=Min köpkurs
-TotalBuyingPriceMin=Total of subproducts buying prices
-SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Totalt subprodukter köper priserna
+SomeSubProductHaveNoPrices=Vissa under produkter har inget pris definierat
 AddSupplierPrice=Lägg leverantör pris
 ChangeSupplierPrice=Byta leverantör pris
 ErrorQtyTooLowForThisSupplier=Kvantitet för låg för denna leverantör eller något pris som anges på denna produkt för denna leverantör
@@ -27,7 +27,7 @@ RefSupplierShort=Ref. leverantör
 Availability=Tillgänglighet
 ExportDataset_fournisseur_1=Leverantörsfakturor listan och fakturornas linjer
 ExportDataset_fournisseur_2=Leverantörsfakturor och betalningar
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_3=Leverantörs order och orderrader
 ApproveThisOrder=Godkänna denna ordning
 ConfirmApproveThisOrder=Är du säker på att du vill godkänna att <b>%s?</b>
 DenyingThisOrder=Att förneka denna beställning
@@ -39,6 +39,6 @@ AddSupplierOrder=Skapa leverantör för
 AddSupplierInvoice=Skapa leverantörsfaktura
 ListOfSupplierProductForSupplier=Förteckning över produkter och priser för leverantör <b>%s</b>
 NoneOrBatchFileNeverRan=Ingen eller parti <b>%s</b> sprang inte nyligen
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+SentToSuppliers=Skickas till leverantörer
+ListOfSupplierOrders=Lista över leverantörsorder
+MenuOrdersSupplierToBill=Leverantörs order att fakturera
diff --git a/htdocs/langs/sv_SE/trips.lang b/htdocs/langs/sv_SE/trips.lang
index 638626eeab7..888f20ddd2d 100644
--- a/htdocs/langs/sv_SE/trips.lang
+++ b/htdocs/langs/sv_SE/trips.lang
@@ -4,7 +4,7 @@ Trips=Resor
 TripsAndExpenses=Resor och kostnader
 TripsAndExpensesStatistics=Resor och kostnader statistik
 TripCard=Trip-kort
-AddTrip=Lägg resa
+AddTrip=Skapa resa
 ListOfTrips=Förteckning över resor
 ListOfFees=Prislista för
 NewTrip=Ny resa
@@ -19,4 +19,4 @@ TF_TRIP=Trip
 ListTripsAndExpenses=Förteckning över resor och kostnader
 ExpensesArea=Resor och kostnader område
 SearchATripAndExpense=Sök en resa och kostnader
-ClassifyRefunded=Classify 'Refunded'
+ClassifyRefunded=Klassificerad 'Återbetalas'
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index 0220079b20d..34a10699b5c 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -102,7 +102,7 @@ UserDisabled=Användare %s funktionshindrade
 UserEnabled=Användare %s aktiverad
 UserDeleted=Användare %s bort
 NewGroupCreated=Grupp %s skapade
-GroupModified=Group %s modified
+GroupModified=Grupp% s modifierade
 GroupDeleted=Grupp %s bort
 ConfirmCreateContact=Är du säker på att du vill skapa en Dolibarr konto för denna kontakt?
 ConfirmCreateLogin=Är du säker på att du vill skapa en Dolibarr konto för denna medlem?
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index 29af1f4babb..49cab6a2f77 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -14,13 +14,13 @@ WithdrawalReceiptShort=Kvitto
 LastWithdrawalReceipts=Senaste %s tillbakadragande kvitton
 WithdrawedBills=Indragna fakturor
 WithdrawalsLines=Återkallelse linjer
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+RequestStandingOrderToTreat=Begäran om stående order att bearbeta
+RequestStandingOrderTreated=Begäran om stående order bearbetas
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Ännu inte möjligt. Uttag status måste vara inställd på "kredit" innan den förklarar förkastar på specifika linjer.
 CustomersStandingOrders=Kunden stående order
 CustomerStandingOrder=Kunden stående order
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
+NbOfInvoiceToWithdraw=St. av faktura med återkallnings begäran
+NbOfInvoiceToWithdrawWithInfo=St. av faktura med återkallande begäran för kunder som har definierat bankkontouppgifter
 InvoiceWaitingWithdraw=Faktura väntar på återkalla
 AmountToWithdraw=Belopp att dra tillbaka
 WithdrawsRefused=Återkallar vägrade
@@ -47,7 +47,7 @@ RefusedData=Datum för avslag
 RefusedReason=Orsak till avslag
 RefusedInvoicing=Fakturering avslaget
 NoInvoiceRefused=Ladda inte avslaget
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Faktura vägrade (Ladda avslag till kunden)
 Status=Status
 StatusUnknown=Okänd
 StatusWaiting=Väntar
@@ -76,13 +76,14 @@ WithBankUsingRIB=För bankkonton med hjälp av RIB
 WithBankUsingBANBIC=För bankkonton som använder IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Bankkonto för att ta emot drar
 CreditDate=Krediter på
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+WithdrawalFileNotCapable=Det går inte att skapa uttags kvitto fil för ditt land %s (ditt land stöds inte)
 ShowWithdraw=Visa Dra
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Om faktura har minst ett uttag betalning som ännu inte behandlats, kommer det inte anges som betalas för att hantera uttag innan.
-DoStandingOrdersBeforePayments=Detta flikar gör att du kan begära en stående order. När det kommer att vara färdig, kan du skriva betalningen för att stänga fakturan.
-WithdrawalFile=Withdrawal file
-SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+WithdrawalFile=Utträde fil
+SetToStatusSent=Ställ in på status "File Skickat"
+ThisWillAlsoAddPaymentOnInvoice=Detta kommer också att gälla utbetalningar till fakturor och kommer att klassificera dem som "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Betalning av %s stående order av banken
@@ -92,5 +93,5 @@ InfoTransMessage=Den stående beställning %s har transmited till bank med %s %s
 InfoTransData=Belopp: %s <br> Metode: %s <br> Datum: %s
 InfoFoot=Detta är ett automatiskt meddelande skickas av Dolibarr
 InfoRejectSubject=Stående order vägrade
-InfoRejectMessage=Hello,<br><br>the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+InfoRejectMessage=Hej, <br><br> den stående beställning av faktura %s relaterad till bolagets %s, med en mängd %s har avslagits av banken. <br><br>--<br> %s
 ModeWarning=Alternativ på riktigt läget inte var satt, sluta vi efter denna simulering
diff --git a/htdocs/langs/sv_SE/workflow.lang b/htdocs/langs/sv_SE/workflow.lang
index d56158cf973..dc3223565db 100644
--- a/htdocs/langs/sv_SE/workflow.lang
+++ b/htdocs/langs/sv_SE/workflow.lang
@@ -6,6 +6,6 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Skapa en kundorder automatiskt efter en kom
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter en kommersiell förslag undertecknas
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter ett avtal validerad
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter en kundorder är stängd
-# descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
-# descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
-# descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klassificera länkad förslag källa att faktureras när kundorder är inställd på betald
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klassificera länkade källa kundorder (s) för att faktureras när kundfaktura är inställd på betald
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassificera länkade källa kundorder (s) för att faktureras när kundfaktura valideras
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 36d25ed38ed..df4ca8e96de 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang
index 1ed4e637d14..a24c678a2e5 100644
--- a/htdocs/langs/th_TH/agenda.lang
+++ b/htdocs/langs/th_TH/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/th_TH/contracts.lang b/htdocs/langs/th_TH/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/th_TH/contracts.lang
+++ b/htdocs/langs/th_TH/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index eb2063c629c..40bca8e85fb 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Late
 SubscriptionNotReceivedShort=Never received
 ListOfSubscriptions=List of subscriptions
 SendCardByMail=Send card by Email
-AddMember=Add member
+AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
 WelcomeEMail=Welcome e-mail
@@ -125,7 +125,7 @@ Date=Date
 DateAndTime=Date and time
 PublicMemberCard=Member public card
 MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-AddSubscription=Add subscription
+AddSubscription=Create subscription
 ShowSubscription=Show subscription
 MemberModifiedInDolibarr=Member modified in Dolibarr
 SendAnEMailToMember=Send information email to member
@@ -203,3 +203,4 @@ MembersByNature=Members by nature
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/th_TH/resource.lang b/htdocs/langs/th_TH/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/th_TH/resource.lang
+++ b/htdocs/langs/th_TH/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 90cb9765785..f1710cd2aad 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -12,7 +12,7 @@ SessionId=Oturum Kimliği
 SessionSaveHandler=Oturum kayıt yürütücüsü
 SessionSavePath=Oturum kayıt konumu
 PurgeSessions=Oturum Temizleme
-ConfirmPurgeSessions=Gerçekten tüm oturumları temizlemek istiyor musunuz? Bu (kendiniz hariç), tüm kullanıcıların bağlantılarını kesecektir.
+ConfirmPurgeSessions=Tüm oturumları gerçekten temizlemek istiyor musunuz? Bu (kendiniz hariç), tüm kullanıcıların bağlantılarını kesecektir.
 NoSessionListWithThisHandler=PHP nizde yapılandırılmış olan oturum kayıt işlemcisi çalışmakta olan tüm oturumların listelenmesine izin vermiyor.
 LockNewSessions=Yeni bağlantıları kilitle
 ConfirmLockNewSessions=Herhangi bir yeni Dolibarr bağlantısını yalnız kendinizle kısıtlamak istediğinizden emin misiniz? Bundan sonra yalnızca <b>%s</b> kullanıcısı bağlanabilecektir.
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Üçüncü parti seçimi için liste kutusu kullanmak y
 ActivityStateToSelectCompany= Halen faaliyette olan olan ya da durdurulmuş olan üçüncü partilerin görünmesi/gizlenmesi için bir süzgeç seçeneği ekleyin
 UseSearchToSelectContactTooltip=Ayrıca çok fazla sayıda üçüncü partiniz varsa (>100 000), Kurulum->Diğer den CONTACT_DONOTSEARCH_ANYWHERE değişmezini 1 e ayarlayarak hızı arttırabilirsiniz. Sonra arama dizenin başlamasıyla sınırlı olacaktır.
 UseSearchToSelectContact=Kişi seçimi için oto tamamlamalı alan kullanın (liste kutusu kullanmak yerine).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Arama süzgeçi seçenekleri
 NumberOfKeyToSearch=Aramayı başlatacak karakter sayısı: %s
 ViewFullDateActions=Üçüncü sayfada tam gün etkinliklerini göster
@@ -82,7 +84,7 @@ NextValueForReplacements=Sonraki değer (yenileme)
 MustBeLowerThanPHPLimit=Not: PHP niz yüklenen her dosyanın boyutunu, parametrelerin değeri ne olursa olsun <b>%s</b> %s ile sınırlandırır
 NoMaxSizeByPHPLimit=Not: PHP yapılandırmanızda hiç sınır ayarlanmamış
 MaxSizeForUploadedFiles=Yüklenen dosyalar için ençok boyut (herhangi bir yüklemeye izin vermemek için 0 a ayarlayın)
-UseCaptchaCode=Giriş sayfasında grafiksel kod (CAPTCHA) kullan
+UseCaptchaCode=Kullanıcı girişi sayfasında grafiksel kod (CAPTCHA) kullan
 UseAvToScanUploadedFiles=Yüklenen dosyaların taranması için anti-virüs kullan
 AntiVirusCommand= Antivirüs komutu tam yolu
 AntiVirusCommandExample= ClamWin için örnek: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>ClamAv için örnek: /usr/bin/clamscan
@@ -208,6 +210,7 @@ ModulesJobDesc=İş modülleri belirli bir iş için önceden tanımlanmış bas
 ModulesMarketPlaceDesc=Internette dış web sitelerinde indirmek için daha çok modül bulabilirsiniz...
 ModulesMarketPlaces=Daha çok modül...
 DoliStoreDesc=DoliStore, Dolibarr ERP/CRM dış modülleri için resmi pazar yeri
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Daha çok modül arayabileceğiniz Web sitesi sağlayıcıları...
 URL=Bağlantı
 BoxesAvailable=Kutular mevcut
@@ -320,7 +323,7 @@ UMask=Unix/Linux/BSD dosya sisteminde yeni dosyalar için Umask parametresi.
 UMaskExplanation=Bu parametre Dolibarr tarafından sunucuda oluşturulan dosyaların izinlerini varsayılan olarak tanımlamanıza (örneğin yükleme sırasında) izin verir.<br>Bu sekizli değer olmalıdır (örneğin, 0666 herkes için okuma ve yazma anlamına gelir).<br>Bu parametre Windows sunucusunda kullanılmaz.
 SeeWikiForAllTeam=Tüm oyuncular ve kuruluşlarının tam listesi için wiki sayfalarına bir göz atın
 UseACacheDelay= Saniye olarak önbellek aktarması tepki gecikmesi (hiç önbellek yoksa 0 ya da boş)
-DisableLinkToHelpCenter=Giriş sayfasında "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
+DisableLinkToHelpCenter=Kullanıcı girişi sayfasında "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
 DisableLinkToHelp=Sol menüde "<b>%s Çevrimiçi yardım</b>" bağlantısını gizle
 AddCRIfTooLong=Otomatik kaydırma yoktur, yani belge üzerinde çok uzun olmasından dolayı satır sayfa sınırı dışına çıkmışsa metin alanında kendiniz satırbaşı yapmalısınız.
 ModuleDisabled=Modül devre dışı
@@ -444,7 +447,7 @@ Module55Desc=Barkod yönetimi
 Module56Name=Telefon
 Module56Desc=Telefon entegrasyonu
 Module57Name=Ödeme talimatları
-Module57Desc=Ödeme talimatları ve para çekme yönetimi
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=TıklaAra
 Module58Desc=TıklaAra entegrasyonu
 Module59Name=Bookmark4u
@@ -465,7 +468,7 @@ Module200Name=LDAP
 Module200Desc=LDAP dizin senkronizasyonu
 Module210Name=PostNuke
 Module210Desc=PostNuke entegrasyonu
-Module240Name=Veri verme
+Module240Name=Veri dışaaktarma
 Module240Desc=Dolibarr verilerini dışaaktarma aracı (yardımlı)
 Module250Name=Veri içeaktarımı
 Module250Desc=Dolibarr verilerini içeaktarma aracı (yardımlı)
@@ -475,8 +478,8 @@ Module320Name=RSS Besleme
 Module320Desc=Dolibarr ekran sayfaları içine RSS ekle
 Module330Name=Yerimleri
 Module330Desc=Yerimi yönetimi
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projeler/Fırsatlar/Adaylar
+Module400Desc=Projlerin, fırsatların ve adayların yönetimi. Daha sonra bir projeye herhangi bir unsur (fatura, sipariş, teklif, müdahale, ...) atayabilirsiniz ve proje görünümünde bir çapraz bir görünüm elde edebilirsiniz.
 Module410Name=Web Takvimi
 Module410Desc=WebT akvimi entegrasyonu
 Module500Name=Özel giderler (vergi, sosyal katkı payları, temettüler)
@@ -495,6 +498,8 @@ Module1780Name=Kategoriler
 Module1780Desc=Kategori yönetimi (ürünler, tedarikçiler ve müşteriler)
 Module2000Name=FCKdüzenleyici (FCKeditor)
 Module2000Desc=Gelişmiş editör kullanarak bazı metin alanlarının düzenlenmesini sağlar
+Module2200Name=Dinamik Fiyatlar
+Module2200Desc=Fiyatlar için matematik ifadelerin kullanımını etkinleştir
 Module2300Name=Kron
 Module2300Desc=Planlı görev yönetimi
 Module2400Name=Gündem
@@ -503,6 +508,8 @@ Module2500Name=Elektronik İçerik Yönetimi
 Module2500Desc=Belgeleri saklayın ve yönetin
 Module2600Name=Web Hizmetleri
 Module2600Desc=Dolibarr web hizmetleri sunucusunu etkinleştirin
+Module2650Name=WebHizmetleri (istemci)
+Module2650Desc=Dolibarr web hizmetleri istemcisini etkinleştir (Dış sunuculara veri/istek iteklemek için kullanılabilir. Tedarikçi siparişleri yalnızca anında desteklenir
 Module2700Name=Gravatar
 Module2700Desc=Kullanıcıların/Üyelerin resimlerini (epostalarında bulunan) göstermek için çevrimiçi Gravatar hizmetini kullanın (www.gravatar.com). İnternet erişimi gerektirir.
 Module2800Desc=FTP İstemcisi
@@ -517,7 +524,7 @@ Module6000Desc=İş akışı yönetimi
 Module20000Name=İzin İstekleri yönetimi
 Module20000Desc=Çalışanların izin isteklerini bildirin ve izleyin
 Module39000Name=Ürün kümesi
-Module39000Desc=Parti numarası, ürünlerin yenme ve satış tarihi yönetiminde
+Module39000Desc=Parti ya da seri numarası, ürünlerin son yenme tarihi ve son satma tarihi yönetimi
 Module50000Name=PayBox
 Module50000Desc=PayBox modülü ile kredi kartı ile çevrimiçi ödeme sayfası sunmak için
 Module50100Name=Satış Noktaları
@@ -527,15 +534,15 @@ Module50200Desc=Kredi kartı ya da Paypal ile ödeme sağlayan çevrimiçi ödem
 Module50400Name=Muhasebe (gelişmiş)
 Module50400Desc=Muhasebe yönetimi (çift taraf)
 Module54000Name=IPP Yazdır
-Module54000Desc=Cup'a IPP Yazıcıyla yazdır.
+Module54000Desc=Cups IPP aryüzü kullanılarak doğrudan yazdırma (belgeler açılmadan)  (Yazıcı sunucudan görülmeli ve sunucuda CUPS kurulu olmalı)
 Module55000Name=Anket aç
 Module55000Desc=Çevrimiçi anketler yapmak için modül (Doodle, Studs, Rdvz gibi)
 Module59000Name=Oranlar
 Module59000Desc=Oran yönetimi modülü
 Module60000Name=Komisyonlar
 Module60000Desc=Komisyon yönetimi modülü
-Module150010Name=Parti no, son yeme tarihi ve son kullanma tarihi
-Module150010Desc=toplu numaralandırma, ürün için kullanma tarihi ve satma tarihi yönetimi
+Module150010Name=Parti numarası, son yenme tarihi ve son satış tarihi
+Module150010Desc=ürünün parti numarası, son yenme tarihi ve son satış tarihi yönetimi
 Permission11=Müşteri faturalarını oku
 Permission12=Müşteri faturaları oluştur/düzenle
 Permission13=Müşteri faturalarının doğrulamasını kaldır
@@ -606,11 +613,11 @@ Permission151=Ödeme talimatlarını oku
 Permission152=Ödeme talimatı isteği oluştur/değiştir
 Permission153=Ödeme talimatı fişleri aktarımı
 Permission154=Ödeme talimatı fişleri alacaklandır/reddet
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Sözleşme/abonelik oku
+Permission162=Sözleşme/abonelik oluştur/değiştir
+Permission163=Bir sözleşmeye ait bir hizmet/abonelik etkinleştir
+Permission164=Bir sözleşmeye ait bir hizmet/abonelik engelle
+Permission165=Sözleşme/abonelik sil
 Permission171=Seyahat ve giderleri okuyun (kendi ve astlarının)
 Permission172=Gezi ve gider oluştur/değiştir
 Permission173=Gezi ve gider sil
@@ -672,7 +679,7 @@ Permission300=Bar kod oku
 Permission301=Bar kod oluştur/değiştir
 Permission302=Bar kod sil
 Permission311=Hizmet oku
-Permission312=Assign service/subscription to contract
+Permission312=Sözleşmeye hizmet/abonelik ata
 Permission331=Yerimi oku
 Permission332=Yerimi oluştur/değiştir
 Permission333=Yerimi sil
@@ -702,8 +709,8 @@ Permission701=Bağış oluştur/değiştir
 Permission702=Bağış sil
 Permission703=Bağış sil
 Permission1001=Stok oku
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Depo oluştur/değiştir
+Permission1003=Depo sil
 Permission1004=Stok hareketlerini oku
 Permission1005=Stok hareketleri oluştur/değiştir
 Permission1101=Teslimat emirlerini oku
@@ -718,7 +725,7 @@ Permission1185=Tedarikçi siparişi onayla
 Permission1186=Tedarikçi siparişi ver
 Permission1187=Tedarikçi siparişi alındı fişi
 Permission1188=Tedarikçi siparişi kapat
-Permission1201=Bir verme sonucu al
+Permission1201=Bir dışaaktarma sonucu al
 Permission1202=Dışaaktarma oluştur/değiştir
 Permission1231=Tedarikçi faturalarını oku
 Permission1232=Tedarikçi faturaları oluştur/değiştir
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Sipariş yöntemleri
 DictionarySource=Teklifin/siparişin kökeni
 DictionaryAccountancyplan=Hesap planı
 DictionaryAccountancysystem=Hesap planı modelleri
+DictionaryEMailTemplates=Eposta şablonları
 SetupSaved=Kurulum kaydedildi
 BackToModuleList=Modül listesine geri git
 BackToDictionaryList=Sözlük listesine dön
@@ -883,11 +891,12 @@ DefaultSkin=Varsayılan dış görünüm teması
 MaxSizeList=Listenin ençok uzunluğu
 DefaultMaxSizeList=Liste için varsayılan ençok uzunluk
 MessageOfDay=Günün mesajı
-MessageLogin=Giriş sayfası mesajı
+MessageLogin=Kullanıcı girişi sayfası mesajı
 PermanentLeftSearchForm=Sol menüdeki sabit arama formu
 DefaultLanguage=Kullanılan varsayılan dil (dil kodu)
 EnableMultilangInterface=Çoklu dil arayüzünü etkinleştir
 EnableShowLogo=Logoyu sol menüde göster
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Sisteminiz başarıyla güncellendi
 CompanyInfo=Firma/dernek bilgileri
 CompanyIds=Firma/dernek kimlikleri
@@ -985,13 +994,13 @@ BackupDescY=Üretilen bilgi döküm dosyası güvenli bir yerde korunmalıdır.
 BackupPHPWarning=Bu yöntemle yedekleme garanti edilmez. Öncekini yeğleyin
 RestoreDesc=Bir Dolibarr yedeklemesini geri yüklemek için şunları yapmalısınız:
 RestoreDesc2=Yeni Dolibarr kurulum dizini belgeleri dosyaların ağaç ayıklamak için veya bu belgeleri geçerli dizinle içine <b>(% s)</b> listesi arşiv dosyası belgeleri (örneğin zip dosyası) Restore. * Belge dizini arşiv dosyalarını yeni Dolibarr kurulumundaki ya da bu geçerli belge dizinindeki dizine ayıklamak için geri yükleyin(<b>%s</b>).
-RestoreDesc3=* Bir yedek dökümü dosyasından, yeni Dolibarr yükleme veritabanına verileri geri yükleyin veya bu geçerli yükleme veritabanına geri yükleyin. Uyarı, geri yükleme bir kez tamamlandığında, yeniden bağlanmak için yedekleme yapılırken varolan bir giriş / parola kullanmanız gerekir. Bu geçerli yükleme içine yedekleme veritabanını geri yüklemek için, bu yardımcıyı takip edebilirsiniz.
+RestoreDesc3=* Bir yedek dökümü dosyasından, yeni Dolibarr yükleme veritabanına verileri geri yükleyin veya bu geçerli yükleme veritabanına geri yükleyin. Uyarı, geri yükleme bir kez tamamlandığında, yeniden bağlanmak için yedekleme yapılırken varolan bir Kullanıcı girişi / parola kullanmanız gerekir. Bu geçerli yükleme içine yedekleme veritabanını geri yüklemek için, bu yardımcıyı takip edebilirsiniz.
 RestoreMySQL=MySQL içeaktar
 ForcedToByAModule= Bu kural bir aktif modül tarafından <b>s</b> ye zorlanır
 PreviousDumpFiles=Mevcut veritabanı yedekleme dosyaları dökümü
 WeekStartOnDay=Haftanın ilk günü
 RunningUpdateProcessMayBeRequired=Yükseltme işlemini çalıştırmak gerekli gibi görünüyor (Program sürümü %s veritabanı sürümü %s ten farklı)
-YouMustRunCommandFromCommandLineAfterLoginToUser=Bu komutu <b>%s</b> kullanıcısı ile bir kabuğa (to a shell) giriş yaptıktan sonra komut satırından çalıştırabilir ya da parolayı elde etmek için komut satırının sonuna –W seçeneğini ekleyebilirsiniz.
+YouMustRunCommandFromCommandLineAfterLoginToUser=Bu komutu <b>%s</b> kullanıcısı ile bir kabuğa giriş yaptıktan sonra komut satırından çalıştırabilir ya da parolayı <b>%s</b> elde etmek için komut satırının sonuna –W seçeneğini ekleyebilirsiniz.
 YourPHPDoesNotHaveSSLSupport=SSL fonksiyonları PHP nizde mevcut değildir
 DownloadMoreSkins=Daha fazla kaplama indirin
 SimpleNumRefModelDesc=Referans sayısını %syymm-nnnn biçimi ile girin; yy yıl mm ay ve nnnn deliksiz ve sıfırlanamayan bir dizidir
@@ -1001,7 +1010,7 @@ TranslationUncomplete=Kısmi çeviri
 SomeTranslationAreUncomplete=Bazı diller kısmi olarak çevrilmiş ya da hatalar içeriyor olabilir. Bazılarını belirlerseniz, dil dosyalarını buraya kayıt ederek düzeltebilirsiniz <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 MenuUseLayout=Dikey menüyü gizlenebilir yap (javascript seçeneği devre dışı olmamalıdır)
 MAIN_DISABLE_METEO=Meteo görünümünü engelle
-TestLoginToAPI=API giriş testi
+TestLoginToAPI=API  kullanıcı girişi denemesi
 ProxyDesc=Dolibarr’ın bazı özelliklerinin çalışması için internet erişimi olması gerekir. Bunun için burada parametreleri tanımlayın. Dolibarr sunucusu bir proxy sunucu arkasında ise, bu parametreler üzerinden Internet erişiminin nasıl olacağını Dolibarr’a söyler.
 ExternalAccess=Dış erişim
 MAIN_PROXY_USE=Bir proxy sunucusu kullan (aksi takdirde internete doğrudan erişin)
@@ -1063,7 +1072,7 @@ GeneratePassword=Oluşturulmuş bir şifre önerin
 RuleForGeneratedPasswords=Önerilen parola oluşturmak ya da parola doğrulamak için kural
 DoNotSuggest=Herhangi bir parola önermeyin
 EncryptedPasswordInDatabase=Veritabanındaki parolanın şifrelendirilmesine izin vermek için
-DisableForgetPasswordLinkOnLogonPage=Giriş sayfasında “Parolayı unut” bağlantısını gösterme
+DisableForgetPasswordLinkOnLogonPage=Kullanıcı girişi sayfasında “Parola unutuldu” bağlantısını gösterme
 UsersSetup=Kullanıcılar modülü kurulumu
 UserMailRequired=Yeni bir kullanıcı oluşturmak için gerekli EPosta
 ##### Company setup #####
@@ -1138,7 +1147,7 @@ AddDeliveryAddressAbility=Teslim tarihi özelliği ekle
 UseOptionLineIfNoQuantity=Sıfır tutarında olan ürün/hizmet satırını bir seçenek olarak kabul et
 FreeLegalTextOnProposal=Teklifler üzerinde serbest metin
 WatermarkOnDraftProposal=Taslak tekliflerde filigran (boşsa yoktur)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Teklif için banka hesabı iste
 ##### Orders #####
 OrdersSetup=Sipariş yönetimi kurulumu
 OrdersNumberingModules=Sipariş numaralandırma modülü
@@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Müdahale numaralandırma modülü
 TemplatePDFInterventions=Müdahale kartı belgesi modelleri
 WatermarkOnDraftInterventionCards=Taslak müdahale kartı belgelerinde filigran (boşsa yoktur)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Sözleşme/Abonelik modül ayarları
 ContractsNumberingModules=Sözleşme numaralandırma modülleri
 TemplatePDFContracts=Sözleşme belge modelleri
 FreeLegalTextOnContracts=Sözleşmeler üzerinde serbest metin
@@ -1169,7 +1178,7 @@ WatermarkOnDraftContractCards=Taslak sözleşmeler üzerinde filigran (boşsa yo
 MembersSetup=Üye modülü kurulumu
 MemberMainOptions=Ana seçenekler
 AddSubscriptionIntoAccount=Yeni bir ödentili abonelik eklerken, banka modülünde varsayılan olarak bir banka işlemi öner
-AdherentLoginRequired= Her üye için bir Giriş yönetin
+AdherentLoginRequired= Her üye için bir Kullanıcı girişi yönetin
 AdherentMailRequired=Yeni üye oluşturmak için E-posta gereklidir
 MemberSendInformationByMailByDefault=Üyelere onay epostası (doğrulama ya da yeni abonelik) göndermek için onay kutusu varsayılan olarak açıktır
 ##### LDAP setup #####
@@ -1249,11 +1258,11 @@ LDAPSetupForVersion3=LDAP sunucusu sürüm 3 için yapılandırılmış
 LDAPSetupForVersion2=LDAP sunucusu sürüm 2 için yapılandırılmış
 LDAPDolibarrMapping=Dolibarr Eşleme
 LDAPLdapMapping=LDAP Eşleme
-LDAPFieldLoginUnix=Giriş (Unix)
+LDAPFieldLoginUnix=Kullanıcı girişi (Unix)
 LDAPFieldLoginExample=Örnek: uid
 LDAPFilterConnection=Arama süzgeçi
 LDAPFilterConnectionExample=Örnek: &(objectClass = InetOrgPerson)
-LDAPFieldLoginSamba=Giriş (samba, activedirectory)
+LDAPFieldLoginSamba=Kullanıcı girişi (samba, activedirectory)
 LDAPFieldLoginSambaExample=Örnek: sAMAccountName
 LDAPFieldFullname=İlk Adı
 LDAPFieldFullnameExample=Örnek: cn
@@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=%s türündeki dosyalar HTTP sunucusu tarafından sık
 CacheByServer=Sunucu önbelleği
 CacheByClient=Tarayıcı önbelleği
 CompressionOfResources=HTTP yanıtlarının sıkıştırılması
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=Böyle bir otomatik algılama mevcut tarayıcılar için olası değildir
 ##### Products #####
 ProductSetup=Ürünler modülü kurulumu
 ServiceSetup=Hizmetler modülü kurulumu
@@ -1415,9 +1424,9 @@ OSCommerceTestOk='%s' Sunucusuna '%s' veritabanında kullanıcı '% s' ile bağl
 OSCommerceTestKo1='%s' Sunucusuna bağlantı başarılı ancak veritabanı '% s' e ulaşılamadı.
 OSCommerceTestKo2=’%s’ Sunucusuna ‘%s’ kullanıcısı ile bağlantı başarısız oldu.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=Depo modülü ayarları
+UserWarehouse=Kullanıcı kişisel deposunu kullan
+IfYouUsePointOfSaleCheckModule=Eğer bir Satış Noktası modülü kullanıyorsanız (varsayılan olarak sağlanan ya da başka bir dış POS modülü), bu ayarlar Satış Noktası modülünüz tarafından gözardı edilebilir. Buradaki seçenekler ne olursa olsun çoğu satış notası modülü ön tanımlı olarak anında fatura oluşturacak ve stok eksiltecek şeklide tasarlanmıştır. Yani, Satış Noktanızdan bir satış kaydederken stok eksiltme gereksiniminiz varsa da yoksa da, aynı zamanda POS modülünüzün ayarlarını da denetleyin.
 ##### Menu #####
 MenuDeleted=Menü silindi
 TreeMenu=Ağaç menüler
@@ -1471,7 +1480,7 @@ AccountancyCodeSell=Satış hesap. kodu
 AccountancyCodeBuy=Alış hesap. kodu
 ##### Agenda #####
 AgendaSetup=Etkinlik ve gündem modülü kurulumu
-PasswordTogetVCalExport=Verme bağlantısı yetki anahtarı
+PasswordTogetVCalExport=Dışaaktarma bağlantısı yetki anahtarı
 PastDelayVCalExport=Bundan daha büyük etkinliği dışaaktarma
 AGENDA_USE_EVENT_TYPE=Etkinlik türlerini kullan (Ayarlar -> Sözlük -> Gündem etkinlik türleri) menüsünden yönetilir
 AGENDA_DEFAULT_FILTER_TYPE=Gündem görünümü arama süzgeçinde, etkinlikler için otomatik olarak bu etkinlik türünü ayarlar
@@ -1482,14 +1491,14 @@ ClickToDialDesc=Bu modül, telefon numaraları ardına bir simge eklemenizi sağ
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Satış Noktası
 CashDeskSetup=Satış Noktası kurulum modülü
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Satışlar için kullanılacak varsayılan genel üçüncü parti
 CashDeskBankAccountForSell=Nakit ödemeleri almak için kullanılan varsayılan hesap
 CashDeskBankAccountForCheque= Ödemeleri çek ile almak için kullanılan varsayılan hesap
 CashDeskBankAccountForCB= Nakit ödemeleri kredi kartıyla almak için kullanılan varsayılan hesap
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Satış Noktasından satış yapıldığında stok eksiltilmesini engelle
+CashDeskIdWareHouse=Depoyu stok azaltmada kullanmak için zorla ve sınırla
+StockDecreaseForPointOfSaleDisabled=Satış Noktasından stok eksiltme engelli
+CashDeskYouDidNotDisableStockDecease=Satış Noktasından satış yapılırken stok eksiltilmesini engellemediniz. Bu durumda depo gereklidir.
 ##### Bookmark #####
 BookmarkSetup=Yerimi modülü kurulumu
 BookmarkDesc=Bu modül yerimlerini yönetmenize olanak sağlar. Ayrıca, soldaki menüden herhangi Dolibarr sayfaları veya dış web siteleri için kısayollar ekleyebilirsiniz.
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index 18a36d5b8d3..4dc82ae066f 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Etkinlikten etkilenen
 ActionsDoneBy=Etkinliği yapan
 ActionsForUser=Kullanıcı etkinlikleri
 ActionsForUsersGroup=Grupun tüm üyelerine ait etkinlikler
+ActionAssignedTo=Event assigned to
 AllMyActions= Tüm etkinliklerim/görevlerim
 AllActions= Tüm etkinlikler/görevler
 ViewList=Liste görünümü
@@ -44,7 +45,7 @@ AgendaExtSitesDesc=Bu sayfa takvimlerin dış kaynaklarında Dolibarr gündemind
 ActionsEvents=Dolibarr'ın otomatik olarak gündemde bir etkinlik oluşturacağı eylemler
 PropalValidatedInDolibarr=%s Teklifi doğrulandı
 InvoiceValidatedInDolibarr=%s Faturası doğrulandı
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=POS tan doğrulanan fatura %s
 InvoiceBackToDraftInDolibarr=%s Faturasını taslak durumuna geri götür
 InvoiceDeleteDolibarr=%s faturası silindi
 OrderValidatedInDolibarr= %s Siparişi doğrulandı
@@ -67,8 +68,8 @@ DateActionDoneEnd= Gerçek bitiş tarihi
 DateActionStart= Başlama tarihi
 DateActionEnd= Bitiş tarihi
 AgendaUrlOptions1=Süzgeç çıktısına ayrıca aşağıdaki parametreleri ekleyebilirsiniz:
-AgendaUrlOptions2=Eylem çıktılarını eylem, oluşturan, eylemden etkilenen ya da eylemi yapan kullanıcı <b>login=%s</b> sınırlayacak kullanıcı <b>%s</b>.
-AgendaUrlOptions3=<b>kullanıcı=%s</b>,  bir <b>%s</b> kullanıcısına ait eylemlerin çıkışlarını sınırlamak içindir.
+AgendaUrlOptions2=Eylem çıktılarını eylem, oluşturan, eylemden etkilenen ya da eylemi yapan kullanıcı <b>kullanıcı girişi=%s</b> sınırlayacak kullanıcı <b>%s</b>.
+AgendaUrlOptions3=<b>kullanıcı girişi=%s</b>,  bir <b>%s</b> kullanıcısına ait eylemlerin çıkışlarını sınırlamak içindir.
 AgendaUrlOptions4=Çıktıyı kullanıcı <b>%s</b> tarafından etkilenen etkinliklerle sınırlamak için<b>logint=%s</b>.
 AgendaUrlOptionsProject=<b>proje=PROJECT_ID</b>, bu <b>PROJECT_ID</b> projesi ile ilişkilendirilmiş eylemlerin çıkışını çıkışını sınırlamak içindir.
 AgendaShowBirthdayEvents=Kişilerin doğum günlerini göster
@@ -78,7 +79,7 @@ ExportDataset_event1=Gündem etkinlikleri listesi
 DefaultWorkingDays=Varsayılan haftalık çalışma günleri aralığı (Örnek: 1-5, 1-6)
 DefaultWorkingHours=Varsayılan günlük çalışma saatleri (Örnek: 9-18)
 # External Sites ical
-ExportCal=Takvim ver
+ExportCal=Takvim dışaaktar
 ExtSites=Dış takvimleri içeaktar
 ExtSitesEnableThisTool=Gündemde dış takvimleri (genel ayarlarda tanımlanan) göster. Kullanıcılar tarafından tanımlanan dış takvimleri etkilemez.
 ExtSitesNbOfAgenda=Takvimlerin sayısı
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index d855c5c73e3..643815b8abe 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -217,7 +217,7 @@ NoInvoice=Fatura yok
 ClassifyBill=Fatura sınıflandır
 SupplierBillsToPay=Ödenecek tedarikçi faturaları
 CustomerBillsUnpaid=Ödenmemiş müşteri faturaları
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=Mekanografik işlemlerle yazılmış faturalar harf sırasına göre dağıtılırlar
 NonPercuRecuperable=Kurtarılamaz
 SetConditions=Ödeme koşullarını ayarla
 SetMode=Ödeme biçimini ayarla
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 7fffe687d62..94e1b382509 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -277,8 +277,8 @@ CustomerCode=Müşteri kodu
 SupplierCode=Tedarikçi kodu
 CustomerAccount=Müşteri hesabı
 SupplierAccount=Tedarikçi hesabı
-CustomerCodeDesc=Tüm müşteriler için müşteri kodu eşsiz olmalı
-SupplierCodeDesc=Tüm tedarikçiler için tedarikçi kodu eşsiz olmalı
+CustomerCodeDesc=Tüm müşteriler için müşteri kodu benzersiz olmalı
+SupplierCodeDesc=Tüm tedarikçiler için tedarikçi kodu benzersiz olmalı
 RequiredIfCustomer=Eğer üçüncü parti bir müşteri ya da aday ise gereklidir
 RequiredIfSupplier=Eğer üçüncü bir tedarikçi ise gereklidir
 ValidityControledByModule=Doğrulama modülü tarafından denetlenir
@@ -365,7 +365,7 @@ NoParentCompany=Hiçbiri
 ExportImport=İçeaktar-Dışaaktar
 ExportCardToFormat=Biçimlenip dışaaktarılacak kart
 ContactNotLinkedToCompany=Kişi herhangi bir üçüncü partiye bağlı değil
-DolibarrLogin=Dolibarr girişi
+DolibarrLogin=Dolibarr kullanıcı girişi
 NoDolibarrAccess=Dolibarr erişimi yok
 ExportDataset_company_1=Üçüncü partiler (Firmalar/dernekler/kişiler) ve özellikleri
 ExportDataset_company_2=Kişiler ve özellikleri
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index a97057a7824..20a21a9f512 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=tedarikçiye göre, aynı hesaplama kuralını kulla
 TurnoverPerProductInCommitmentAccountingNotRelevant=Ürüne göre ciro raporu, <b>nakit muhasebesi</b>modu için uygun değildir. Bu rapor yalnızca, <b>tahakkuk muhasebesi</b> modu için uygundur (muhasebe modülü ayarlarına bakın).
 CalculationMode=Hesaplama modu
 AccountancyJournal=Muhasebe kodu günlüğü
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Ürün alımı için varsayılan muhasebe kodu
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Ürün satışı için varsayılan muhasebe kodu
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Hizmet alımı için varsayılan muhasebe kodu
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Hizmet satışı için varsayılan muhasebe kodu
 ACCOUNTING_VAT_ACCOUNT=Alınan KDV için varsayılan muhasebe kodu
 ACCOUNTING_VAT_BUY_ACCOUNT=Ödenen KDV için varsayılan muhasebe kodu
 ACCOUNTING_ACCOUNT_CUSTOMER=Müşteri üçüncü partiler için varsayılan muhasebe kodu
diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang
index 7a4c4151b2f..d5b9448378c 100644
--- a/htdocs/langs/tr_TR/contracts.lang
+++ b/htdocs/langs/tr_TR/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Sözleşmeler alanı
 ListOfContracts=Sözleşme Listesi
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Değiştirilen son %s sözleşme
 AllContracts=Bütün sözleşmeler
 ContractCard=Sözleşme kartı
 ContractStatus=Sözleşme durumu
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Yürürlükte olan hizmet kalemleri
 ListOfRunningServices=Yürürlükteki hizmetler listesi
 NotActivatedServices=Etkin olmayan hizmetler (doğrulanmış sözleşmeler arasından)
 BoardNotActivatedServices=Doğrulanmış sözleşmelerden etkinleştirilecek hizmetler
-LastContracts=Last % contracts
+LastContracts=Son %s sözleşme
 LastActivatedServices=Etkinleştirilen son %s hizmet
 LastModifiedServices=Değiştirilen son %s hizmet
 EditServiceLine=Hizmet kalemi düzenle
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Süresi dolacak Hizmetler Listesi
 NoteListOfYourExpiredServices=Bu listede yalnızca satış temsilcisi olarak atandığınız üçüncü partilere ait hizmet sözleşmeleri bulunur.
 StandardContractsTemplate=Standart sözleşme kalıbı
 ContactNameAndSignature=%s için, ad ve imza
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sözleşmeyi imzalalayacak satış temsilcisi
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index f2fe6338f23..2e5755e83e9 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=Unix ortamında her dakika Komut satırını çalıştı
 CronExplainHowToRunWin=Microsoft (tm) Windows ortamında her dakika Komut satırı çalıştırmak için Planlı görev araçlarını kullanabilirsiniz
 # Menu
 CronJobs=Planlı işler
-CronListActive=List of active/scheduled jobs
+CronListActive=Etkin/programlı işler listesi
 CronListInactive=Etkin olmayan işler listesi
 # Page list
 CronDateLastRun=Son çalıştırma
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 0111fb8633e..df96ebb71d0 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -8,7 +8,7 @@ Errors=Hatalar
 ErrorButCommitIsDone=Hatalar bulundu, buna rağmen doğruluyoruz
 ErrorBadEMail=%s EPostası yanlış
 ErrorBadUrl=URL %s yanlış
-ErrorLoginAlreadyExists=%s girişi zaten var.
+ErrorLoginAlreadyExists=%s kullanıcı adı zaten var.
 ErrorGroupAlreadyExists=%s Grubu zaten var.
 ErrorRecordNotFound=Kayıt bulunamadı.
 ErrorFailToCopyFile='<b>%s</b>' dosyası '<b>%s</b>' içine kopyalanamadı.
@@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Hata, bu üye henüz bir üç
 ErrorThereIsSomeDeliveries=Hata, bu sevkiyata bağlı bazı teslimatlar var. Silme işlemi reddedildi.
 ErrorCantDeletePaymentReconciliated=Uzlaştırılmış bir banka işlemi oluşturulmuş bir ödeme silinemez
 ErrorCantDeletePaymentSharedWithPayedInvoice=Ödendi durumunda olan en az bir faturayla paylaşılan bir ödeme silinemez
+ErrorPriceExpression1='%s' Değişkenine atama yapılamıyor
+ErrorPriceExpression2='%s' Dahili işlevi yeniden tanımlanamıyor
+ErrorPriceExpression3=İşlev tanımındaki '%s' değişkeni tanımlanmamış
+ErrorPriceExpression4=Geçersi karakter '%s'
+ErrorPriceExpression5=Beklenmeyen '%s'
+ErrorPriceExpression6=Hatalı argüman sayısı (verilen %s, beklenen %s)
+ErrorPriceExpression8=Beklenmeyen işlemci '%s'
+ErrorPriceExpression9=Beklenmeyen bir hata oldu
+ErrorPriceExpression10='%s' İşlemcisinin işleneni yok
+ErrorPriceExpression11=Beklenen '%s'
+ErrorPriceExpression14=Sıfıra bölünme
+ErrorPriceExpression17=Beklenmeyen değişken '%s'
+ErrorPriceExpression19=İfade bulunamadı
+ErrorPriceExpression20=Boş ifade
+ErrorPriceExpression21=Boş sonuç '%s'
+ErrorPriceExpression22=Eksi sonuç '%s'
+ErrorPriceExpressionInternal=İç hata '%s'
+ErrorPriceExpressionUnknown=Bilinmeyen hata '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış
diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang
index c4baa85d1b9..f08d37906d7 100644
--- a/htdocs/langs/tr_TR/exports.lang
+++ b/htdocs/langs/tr_TR/exports.lang
@@ -14,10 +14,10 @@ SaveExportModel=Yeniden kullanmak için bu dışaaktarma profilini kaydedebilirs
 SaveImportModel=Yeniden kullanmak için bu içeaktarma profilini kaydedebilirsiniz...
 ExportModelName=Dışaaktarma profili adı
 ExportModelSaved=İçeaktarma profili <b>%s</b> adıyla kaydedildi.
-ExportableFields=Verilebilir alanlar
-ExportedFields=Verilen alanlar
-ImportModelName=Alma profili adı
-ImportModelSaved=Alma profili <b>%s</b> adıyla kaydedildi.
+ExportableFields=Dışaaktarılabilir alanlar
+ExportedFields=Dışaaktarılan alanlar
+ImportModelName=İçeaktarma profili adı
+ImportModelSaved=İçeaktarma profili <b>%s</b> adıyla kaydedildi.
 ImportableFields=İçeaktarılabilir alanlar
 ImportedFields=İçeaktarılan alanlar
 DatasetToExport=Dışaaktarılacak veri kümesi
@@ -56,7 +56,7 @@ LineTotalHT=Satırın vergi hariç tutarı
 LineTotalTTC=Satırın vergi dahil tutarı
 LineTotalVAT=Satırın KDV tutarı
 TypeOfLineServiceOrProduct=Satır türü (0 = ürün, 1 = hizmet)
-FileWithDataToImport=Alınacak verileri içeren dosya
+FileWithDataToImport=İçeaktarılacak verileri içeren dosya
 FileToImport=İçeaktarılacak kaynak dosya
 FileMustHaveOneOfFollowingFormat=İçeaktarılacak dosya aşağıdaki biçimlerden birinde olmalıdır
 DownloadEmptyExample=Örnek boş kaynak dosyasını indirin
@@ -68,7 +68,7 @@ FieldsInTargetDatabase=Dolibarr veritabanındaki hedef alanlar (koyu=zorunlu)
 Field=Alan
 NoFields=Alan sayısı
 MoveField=%s numaralı alan sütununu taşıyın
-ExampleOfImportFile=İçeaktarılacak_dosya_örneği
+ExampleOfImportFile=İçeaktarma_dosya_örneği
 SaveImportProfile=Bu içeaktarma profilini kaydedin
 ErrorImportDuplicateProfil=Bu içeaktarma profili bu ad ile kaydedilemedi. Aynı adlı bir profil zaten var.
 ImportSummary=İçeaktarma ayarlarının özeti
@@ -85,20 +85,20 @@ FieldNeedSource=Bu alanlar kaynak dosyadan bir veri gerektirir
 SomeMandatoryFieldHaveNoSource=Veri dosyasında, bazı zorunlu alanların kaynağı yok
 InformationOnSourceFile=Kaynak dosya bilgileri
 InformationOnTargetTables=Hedef alan bilgileri
-SelectAtLeastOneField=En az bir kaynak alanı verilecek alanlar bölümüne koyun
-SelectFormat=Bu alma dosya biçimini seçin
-RunImportFile=Dosya almayı başlatın
-NowClickToRunTheImport=Alma provasının sonucunu denetleyin. Herşey yolundaysa, kesin almayı başlatın.
-DataLoadedWithId=Tüm veriler şu alma kodu ile yüklenecek: <b>%s</b>
+SelectAtLeastOneField=En az bir kaynak alanı dışaaktarılacak alanlar bölümüne koyun
+SelectFormat=Bu içeaktarma dosya biçimini seçin
+RunImportFile=Dosya içeaktarmayı başlatın
+NowClickToRunTheImport=İçeaktarma denemesi sonucunu denetleyin. Herşey yolundaysa, kesin içeaktarmayı başlatın.
+DataLoadedWithId=Tüm veriler şu içeaktarma kodu ile yüklenecek: <b>%s</b>
 ErrorMissingMandatoryValue=Kaynak dosyada alan için zorunlu veri boş <b>%s</b>.
 TooMuchErrors=Kaynak dosyasında, liste sınırlandığından görüntülenmeyen <b>%s</b> hatalı satır daha var.
 TooMuchWarnings=Kaynak dosyasında, liste sınırlandığından görüntülenmeyen <b>%s</b> uyarı içeren satır daha var.
 EmptyLine=Boş satır (atlanacak)
 CorrectErrorBeforeRunningImport=Kesin alma işleminden önce tüm hataları düzeltmelisiniz.
 FileWasImported=Dosya <b>%s</b> sayısı ile alındı.
-YouCanUseImportIdToFindRecord=Veritabanınızı <b>import_key='%s'</b> ölçütü ile süzerseniz alınmış tüm kayıtları görebilirsiniz.
+YouCanUseImportIdToFindRecord=Veritabanınızı <b>import_key='%s'</b> ölçütü ile süzerseniz içeaktarılmış tüm kayıtları görebilirsiniz.
 NbOfLinesOK=Hatasız ve uyarı içermeyen satır sayısı:<b>%s</b>.
-NbOfLinesImported=Sorunsuz alınan satır sayısı:<b>%s</b>.
+NbOfLinesImported=Sorunsuz içeaktarılan satır sayısı:<b>%s</b>.
 DataComeFromNoWhere=Eklenecek değer kaynak dosyada hiç bir yerden gelmiyor.
 DataComeFromFileFieldNb=Eklenecek değer kaynak dosyada <b>%s</b> numaralı alandan geliyor.
 DataComeFromIdFoundFromRef=Kaynak dosyanın <b>%s</b> numaralı alanından gelen değer, üst nesne kodunun bulunması için kullanılacak (yani kaynak dosyadaki ilgili <b>%s</b> nesnesi önceden Dolibarr içinde bulunmalıdır).
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 9210e6a384d..128034c94d7 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -115,7 +115,7 @@ SentBy=Gönderen
 MailingNeedCommand=Güvenlik nedeni ile, Eposta gönderiminin komut satırından yapılması daha iyidir. Bütün posta alıcılarına eposta göndermek için sunucu yönetcisinden aşağıdaki komutu başlatmasını isteyin:
 MailingNeedCommand2=Bunula birlikte, oturum tarafından gönderilecek ençok Eposta sayılı MAILING_LIMIT_SENDBYWEB parametresini ekleyerek çevrim içi olarak gönderebilirsiniz. Bunu için Giriş-Kurulum-Diğer menüsüne gidin.
 ConfirmSendingEmailing=Eğer www tarayıcınız ile gönderemiyor ya da yeğlemiyorsanız, lütfen kendi tarayıcınızdan eposta göndermek istediğinizden emin olduğunuzu onaylayın.
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Not: Web arayüzünden eposta gönderimi güvenlik ve süre aşımı yüzünden birçok kez yapılmıştır, her gönderme oturumu başına <b>%s<b> alıcıya
 TargetsReset=Listeyi temizle
 ToClearAllRecipientsClickHere=Bu e-posta Alıcı listesini temizlemek için burayı tıkla
 ToAddRecipientsChooseHere=Listeden seçerek alıcıları ekle
@@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=Epostayala %s bildirim gönderilecektir
 AddNewNotification=Yeni bir eposta bildirim hedefi etkinleştir
 ListOfActiveNotifications=Bütün etkin eposta bildirim hedeflerini listele
 ListOfNotificationsDone=Gönderilen tüm e-posta bildirimleri listesi
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=Yapılandırma e postası '%s' için ayarlandı. Bu mod toplu epostalama için kullanılamaz.
+MailSendSetupIs2='%s' Modunu kullanmak için <strong>'%s'</strong> parametresini değiştirecekseniz, önce yönetici hesabı ile %sGiriş - Ayarlar - Epostalar%s menüsüne gitmelisiniz. Bu mod ile İnternet Servis Sağlayıcınız tarafından sağlanan SMTP sunucusu ayarlarını girebilir ve Toplu eposta özelliğini kullanabilirsiniz.
+MailSendSetupIs3=SMTP sunucusunun nasıl yapılandırılacağı konusunda sorunuz varsa, %s e sorabilirsiniz.
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index c475724245b..d5e3a2636d5 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -131,7 +131,7 @@ AddActionDone=Bitmiş etkinlik ekle
 Close=Kapat
 Close2=Kapat
 Confirm=Onayla
-ConfirmSendCardByMail=Gerçekten bu kartı posta ile buna <b>%s</b> göndermek istiyor musunuz?
+ConfirmSendCardByMail=Bu kartın içeriğini posta ile gerçekten  buna <b>%s</b> göndermek istiyor musunuz?
 Delete=Sil
 Remove=Kaldır
 Resiliate=Sonlandır
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index 098079e7015..44e74af7fa6 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Gecikmiş
 SubscriptionNotReceivedShort=Hiç alınmadı
 ListOfSubscriptions=Abonelikler listesi
 SendCardByMail=Kartı Eposta ile gönder
-AddMember=Üye ekle
+AddMember=Üye oluştur
 NoTypeDefinedGoToSetup=Hiçbir üyelik türü tanımlanmamıştır. Kurulum  - Üye türlerine git
 NewMemberType=Yeni üye türü
 WelcomeEMail=Hoşgeldiniz e-postası
@@ -125,7 +125,7 @@ Date=Tarih
 DateAndTime=Tarih ve saat
 PublicMemberCard=Genel üyelik kartı
 MemberNotOrNoMoreExpectedToSubscribe=Artık üyelik ya da abonelike beklenmiyor
-AddSubscription=Abonelik ekle
+AddSubscription=Abonelik oluştur
 ShowSubscription=Abonelik göster
 MemberModifiedInDolibarr=Üyelik Dolibarr'da değiştirilmiş
 SendAnEMailToMember=Üyelere bilgi e-postası gönder
@@ -203,3 +203,4 @@ MembersByNature=Doğal üyeler
 VATToUseForSubscriptions=Abonelikler için kullanılacak KDV oranı
 NoVatOnSubscription=Abonelikler için KDV yok
 MEMBER_PAYONLINE_SENDEMAIL=Dolibarr'ın bir doğrulanmış abonelik ödeme onayını almasıyla gönderilecek uyarı epostası
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Faturada abonelik kalemi olarak kullanılan ürün: %s
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index 26268de14f1..140d9f1f08e 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Bir sevkiyat var
 DraftOrWaitingApproved=Taslak veya onaylanmış henüz sipariş verilmemiş
 DraftOrWaitingShipped=Taslak veya onaylanmış henüz sevkedilmemiş
 MenuOrdersToBill=Teslim edilen siparişler
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Faturalanabilir siparişler
 SearchOrder=Sipariş ara
 SearchACustomerOrder=Müşteri siparişi ara
 ShipProduct=Ürünü sevket
diff --git a/htdocs/langs/tr_TR/printipp.lang b/htdocs/langs/tr_TR/printipp.lang
index af623b6b2ad..82d85eaae0c 100644
--- a/htdocs/langs/tr_TR/printipp.lang
+++ b/htdocs/langs/tr_TR/printipp.lang
@@ -1,9 +1,14 @@
-# Dolibarr language file - tr_TR - printipp
-PrintIPPSetup=Doğrudan Yazdırma modülü kurulumu
-PrintIPPDesc=Bu modül, yazıcıya doğrudan belge yazdırma düğmesi ekler. Bu bir Cups içeren bir Linux sistemi gerektirir.
-PRINTIPP_ENABLED=Belge listesinde "Doğrudan yazdır" resim ikonunu göster
-PRINTIPP_HOST=Yazdırma sunucusu
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Doğrudan Yazdırma modülü ayarı
+PrintIPPDesc=Bu modül belgeleri doğrudan yazıcıya gönderecek bir Yazdır düğmesi ekler. CUPS kurulmuş bir Linux sistemi gerektirir.
+PRINTIPP_ENABLED=Belge listelerinde "Doğrudan yazdır" simgesini göster
+PRINTIPP_HOST=Yazıcı sunucusu
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Giriş
+PRINTIPP_USER=Kullanıcı girişi
 PRINTIPP_PASSWORD=Parola
-NoPrinterFound=Yazıcı bulnamadı (Cups ayarını denetleyin)
+NoPrinterFound=Hiç yazıcı bulunamadı (CUPS ayarlarınızı denetleyin)
+FileWasSentToPrinter=%s Dosyası yazıcıya gönderildi
+NoDefaultPrinterDefined=Tanımlı varsayılan yazıcı yok
+DefaultPrinter=Varsayılan yazıcı
+Printer=Yazıcı
+CupsServer=CUPS Sunucusu
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 23c2de284d3..9ec2f349d3b 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -27,15 +27,15 @@ ProductsAndServicesNotOnSell=Eski Ürünler ve Hizmetler
 ProductsAndServicesStatistics=Ürün ve Hizme istatistikleri
 ProductsStatistics=Ürün istatistikleri
 ProductsOnSell=Varolan ürünler
-ProductsNotOnSell=Eskimiş ürünler
-ProductsOnSellAndOnBuy=Ürünler satılamaz ve satın alınamaz
+ProductsNotOnSell=Kullanılmayan ürünler
+ProductsOnSellAndOnBuy=Satılmaz ve satınalınmaz ürünler
 ServicesOnSell=Varolan hizmetler
-ServicesNotOnSell=Eskimiş hizmetler
-ServicesOnSellAndOnBuy=Hizmetler satılamaz ve satın alınamaz
+ServicesNotOnSell=Kullanılmayan hizmetler
+ServicesOnSellAndOnBuy=Satılmaz ve satınalınmaz hizmetler
 InternalRef=İç referans
 LastRecorded=Satışta kaydedilen son ürünler/hizmetler
-LastRecordedProductsAndServices=Son kaydedilen %s ürünler/hizmetler
-LastModifiedProductsAndServices=Son değiştirilen %s ürünler/hizmetler
+LastRecordedProductsAndServices=Son kaydedilen %s ürün/hizmet
+LastModifiedProductsAndServices=Son değiştirilen %s ürün/hizmet
 LastRecordedProducts=Son %s ürün kaydedildi
 LastRecordedServices=Son %s hizmet kaydedildi
 LastProducts=Son ürünler
@@ -171,7 +171,7 @@ GenerateThumb=Kararlama (thumb) oluştur
 ProductCanvasAbility=Özel “kanvas” eklentileri kullan
 ServiceNb=Hizmet sayısı #%s
 ListProductServiceByPopularity=Popülerliğine göre ürün/hizmet listesi
-ListProductByPopularity=Popülerliğine göre ürünler/hizmetler Listesi
+ListProductByPopularity=Popülerliğine göre ürün listesi
 ListServiceByPopularity=Popülerliğine göre hizmetler listesi
 Finished=Üretilen ürünler
 RowMaterial=İlk malzeme
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Müşterinin ortaklılarına aynı fiyatı uygula
 PriceByCustomerLog=Müşteri fiyat günlüğü
 MinimumPriceLimit=Enaz fiyat bundan düşük olamaz %s
 MinimumRecommendedPrice=Önerilen enaz fiyat: %s
+PriceExpressionEditor=Fiyat ifadesi düzenleyici
+PriceExpressionSelected=Seçili fiyat ifadesi
+PriceExpressionEditorHelp=Fiyatı ayarlamak için "fiyat = 2 + 2" ya da "2 + 2"<br>EkAlanlar "#options_myextrafieldkey# * 2" benzeri değişkenlerdir<br>#quantity# and #tva_tx# benzeri özel değişkenler vardır<br>İfadeleri ayırmak için ; kullanın
+PriceMode=Fiyat biçimi
+PriceNumeric=Sayı
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 09343d28968..3fc2b0041c6 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -36,6 +36,8 @@ TaskTimeSpent=Göreve harcanan süre
 TaskTimeUser=Kullanıcı
 TaskTimeNote=Not
 TaskTimeDate=Tarih
+TasksOnOpenedProject=Açık projelerdeki görevler
+WorkloadNotDefined=İşyükü tanımlanmamış
 NewTimeSpent=Yeni harcanan süre
 MyTimeSpent=Harcadığım sürelerim
 MyTasks=Grevlerim
@@ -66,7 +68,7 @@ ListSupplierInvoicesAssociatedProject=Proje ile ilgili tedarikçi faturalarını
 ListContractAssociatedProject=Proje ile ilgili sözleşmelerin listesi
 ListFichinterAssociatedProject=Proje ile ilgili müdahalelerin listesi
 ListTripAssociatedProject=Proje ile ilgili geziler ve giderlerin listesi
-ListActionsAssociatedProject=Proje ile ilgili eylemlerin listesi
+ListActionsAssociatedProject=Proje ile ilgili etkinliklerin listesi
 ActivityOnProjectThisWeek=Projede bu haftaki etkinlik
 ActivityOnProjectThisMonth=Projede bu ayki etkinlik
 ActivityOnProjectThisYear=Projede bu yılki etkinlik
diff --git a/htdocs/langs/tr_TR/resource.lang b/htdocs/langs/tr_TR/resource.lang
index e8adc0a0e76..f593c7e0fe4 100644
--- a/htdocs/langs/tr_TR/resource.lang
+++ b/htdocs/langs/tr_TR/resource.lang
@@ -22,8 +22,8 @@ GotoDate=Tarihe git
 
 ResourceElementPage=Öğe kaynağı
 ResourceCreatedWithSuccess=Kaynak oluşturma başarılı
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
+RessourceLineSuccessfullyDeleted=Kaynak satır silinmesi başarılı
+RessourceLineSuccessfullyUpdated=Kaynak satır güncellemesi başarılı
 ResourceLinkedWithSuccess=Kaynak bağlantılama başarılı
 
 TitleResourceCard=Kaynak kartı
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Bu kaynağı silmeyi onayla
 RessourceSuccessfullyDeleted=Kaynak silme başarılı
 DictionaryResourceType=Kaynak türleri
 
-DictionaryEMailTemplates=E-posta modelleri
-
 SelectResource=Kaynak seç
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index edbf7dc5df3..b160e4cc1c7 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -102,7 +102,7 @@ UserDisabled=Kullanıcı %s engellendi
 UserEnabled=Kullanıcı %s etkinleştirildi
 UserDeleted=Kullanıcı %s kaldırıldı
 NewGroupCreated=Grup %s oluşturuldu
-GroupModified=Group %s modified
+GroupModified=Değiştirilen grup %s
 GroupDeleted=Grubu %s kaldırıldı
 ConfirmCreateContact=Bu kişi için bir Dolibarr hesabı oluşturmak istediğinizden emin misiniz?
 ConfirmCreateLogin=Bu üye için Dolibarr hesabı oluşturmak istediğinizden emin misiniz?
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index d62f8661f0c..ed188e7fdb8 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -47,7 +47,7 @@ RefusedData=Ret Tarihi
 RefusedReason=Ret nedeni
 RefusedInvoicing=Rettin faturalandırılması
 NoInvoiceRefused=Reddi borç yazmayın
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Fatura reddedildi (Reddedileni müşterinin hesabına yaz)
 Status=Durum
 StatusUnknown=Bilinmeyen
 StatusWaiting=Bekliyor
@@ -79,10 +79,11 @@ CreditDate=Alacak tarihi
 WithdrawalFileNotCapable=Ülkeniz %s için para çekme makbuzu oluşturulamıyor (Ülkeniz desteklenmiyor)
 ShowWithdraw=Para çekme göster
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Faturaya henüz enaz bir ödeme tahsilatı işlenmemişse, para çekme yönetimine izin vermek için ödendi olarak ayarlanamaz.
-DoStandingOrdersBeforePayments=Bu sekmeler ödeme talimatı istemenizi sağlar. Bitirildiğinde, faturayı kapatmak için ödemeyi yazabilirsiniz.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Para çekme dosyası
 SetToStatusSent="Dosya Gönderildi" durumuna ayarla
 ThisWillAlsoAddPaymentOnInvoice=Bu aynı zamanda faturalara ödeme oluşturur ve onları "ödendi" olarak sınıflandırır
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Banka tarafından ödenen %s ödeme talimatı
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 37e41038659..d68844d9f62 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang
index 43252eb188c..13d9dea3c7e 100644
--- a/htdocs/langs/uk_UA/agenda.lang
+++ b/htdocs/langs/uk_UA/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/uk_UA/contracts.lang b/htdocs/langs/uk_UA/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/uk_UA/contracts.lang
+++ b/htdocs/langs/uk_UA/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index eb2063c629c..40bca8e85fb 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Late
 SubscriptionNotReceivedShort=Never received
 ListOfSubscriptions=List of subscriptions
 SendCardByMail=Send card by Email
-AddMember=Add member
+AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
 WelcomeEMail=Welcome e-mail
@@ -125,7 +125,7 @@ Date=Date
 DateAndTime=Date and time
 PublicMemberCard=Member public card
 MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-AddSubscription=Add subscription
+AddSubscription=Create subscription
 ShowSubscription=Show subscription
 MemberModifiedInDolibarr=Member modified in Dolibarr
 SendAnEMailToMember=Send information email to member
@@ -203,3 +203,4 @@ MembersByNature=Members by nature
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/uk_UA/resource.lang b/htdocs/langs/uk_UA/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/uk_UA/resource.lang
+++ b/htdocs/langs/uk_UA/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index b5d84a0aca7..f12efa61626 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
index 1ed4e637d14..a24c678a2e5 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/uz_UZ/contracts.lang b/htdocs/langs/uz_UZ/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/uz_UZ/contracts.lang
+++ b/htdocs/langs/uz_UZ/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index eb2063c629c..40bca8e85fb 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Late
 SubscriptionNotReceivedShort=Never received
 ListOfSubscriptions=List of subscriptions
 SendCardByMail=Send card by Email
-AddMember=Add member
+AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
 WelcomeEMail=Welcome e-mail
@@ -125,7 +125,7 @@ Date=Date
 DateAndTime=Date and time
 PublicMemberCard=Member public card
 MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-AddSubscription=Add subscription
+AddSubscription=Create subscription
 ShowSubscription=Show subscription
 MemberModifiedInDolibarr=Member modified in Dolibarr
 SendAnEMailToMember=Send information email to member
@@ -203,3 +203,4 @@ MembersByNature=Members by nature
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 01fe161a7d1..52535054170 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Sử dụng các lĩnh vực tự động gõ để l
 ActivityStateToSelectCompany= Thêm tùy chọn bộ lọc để ẩn/hiện các nhà phát triển thứ ba hiện đang hoạt động hoặc đã bị xóa
 UseSearchToSelectContactTooltip=Ngoài ra nếu bạn có một số lượng lớn các bên thứ ba (> 100 000), bạn có thể tăng tốc độ bằng cách thiết lập CONTACT_DONOTSEARCH_ANYWHERE liên tục đến 1 trong Setup-> khác. Tìm kiếm sau đó sẽ được giới hạn để bắt đầu của chuỗi.
 UseSearchToSelectContact=Sử dụng các trường để lựa chọn năng tự động gõ liên lạc (thay vì sử dụng một hộp danh sách).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Tùy chọn bộ lọc tìm kiếm
 NumberOfKeyToSearch=Ký tự nbr để tìm: %s
 ViewFullDateActions=Hiển thị ngày tháng đầy đủ của sự kiện ở bảng tính thứ ba
@@ -208,6 +210,7 @@ ModulesJobDesc=Module kinh doanh cung cấp thiết lập được xác định
 ModulesMarketPlaceDesc=Bạn có thể tìm thấy các mô-đun tải bên ngoài trang web trên Internet ...
 ModulesMarketPlaces=Nhiều mô-đun ...
 DoliStoreDesc=DoliStore, trên thị trường chính thức cho Dolibarr ERP / CRM module bên ngoài
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Cung cấp dịch vụ trang web, bạn có thể tìm kiếm để tìm các mô-đun ...
 URL=Liên kết
 BoxesAvailable=Hộp có sẵn
@@ -444,7 +447,7 @@ Module55Desc=Quản lý mã vạch
 Module56Name=Điện thoại
 Module56Desc=Tích hợp điện thoại
 Module57Name=Chỉ thị thanh toán định kỳ
-Module57Desc=Quảng lý rút tiền và chỉ thị thanh toán định kỳ
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Tích hợp hệ thống ClickToDial (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Thêm nguồn cấp dữ liệu RSS trong trang màn hình Dolibarr
 Module330Name=Đánh dấu
 Module330Desc=Quản lý Bookmark
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar tích hợp
 Module500Name=Chi phí đặc biệt (thuế, đóng góp xã hội, cổ tức)
@@ -495,6 +498,8 @@ Module1780Name=Loại
 Module1780Desc=Quản lý danh mục (sản phẩm, nhà cung cấp và khách hàng)
 Module2000Name=Trình soạn thảo WYSIWYG
 Module2000Desc=Cho phép chỉnh sửa một số vùng văn bản bằng cách sử dụng một biên tập viên cao cấp
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Quản lý công việc theo lịch trình
 Module2400Name=Chương trình nghị sự
@@ -503,6 +508,8 @@ Module2500Name=Quản lý nội dung điện tử
 Module2500Desc=Lưu và chia sẻ tài liệu
 Module2600Name=WebServices
 Module2600Desc=Cho phép các máy chủ dịch vụ web Dolibarr
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Sử dụng dịch vụ trực tuyến Gravatar (www.gravatar.com) để hiển thị hình ảnh của người sử dụng / thành viên (được tìm thấy với các email của họ). Cần truy cập internet
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Quản lý công việc
 Module20000Name=Để lại yêu cầu quản lý
 Module20000Desc=Khai báo và nhân viên theo yêu cầu nghỉ phép
 Module39000Name=Hàng loạt sản phẩm
-Module39000Desc=Số lô, ăn theo và bán theo quản lý ngày sản phẩm
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Nơi trả tiền
 Module50000Desc=Module để cung cấp một trang thanh toán trực tuyến bằng thẻ tín dụng với nơi trả tiền
 Module50100Name=Điểm bán hàng
@@ -527,7 +534,7 @@ Module50200Desc=Module để cung cấp một trang thanh toán trực tuyến b
 Module50400Name=Kế toán (nâng cao)
 Module50400Desc=Kế toán quản trị (đôi bên)
 Module54000Name=PrintIPP
-Module54000Desc=In qua Cup IPP in.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Mở Poll
 Module55000Desc=Mô-đun để thực hiện các cuộc thăm dò trực tuyến (như Doodle, Studs, Rdvz, ...)
 Module59000Name=Lợi nhuận
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Phương pháp đặt hàng
 DictionarySource=Nguồn gốc của các đề xuất / đơn đặt hàng
 DictionaryAccountancyplan=Biểu đồ tài khoản
 DictionaryAccountancysystem=Mô hình biểu đồ của tài khoản
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Thiết lập lưu
 BackToModuleList=Trở lại danh sách các mô-đun
 BackToDictionaryList=Trở lại danh sách từ điển
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Hình thức tìm kiếm thường xuyên trên menu bê
 DefaultLanguage=Ngôn ngữ mặc định để sử dụng (mã ngôn ngữ)
 EnableMultilangInterface=Kích hoạt giao diện đa ngôn ngữ
 EnableShowLogo=Hiển thị biểu tượng trên menu bên trái
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Hệ thống của bạn đã được cập nhật thành công
 CompanyInfo=Thông tin Công ty / cơ sở
 CompanyIds=Xác định Công ty/ Cơ sở
diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang
index 3f6a2a0afa0..d382aef3a06 100644
--- a/htdocs/langs/vi_VN/agenda.lang
+++ b/htdocs/langs/vi_VN/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Sự kiện được giao
 ActionsDoneBy=Sự kiện được thực hiện bởi
 ActionsForUser=Sự kiện cho người sử dụng
 ActionsForUsersGroup=Sự kiện cho tất cả người dùng của nhóm
+ActionAssignedTo=Event assigned to
 AllMyActions= Tất cả các sự kiện của tôi / nhiệm vụ
 AllActions= Tất cả các sự kiện / nhiệm vụ
 ViewList=Danh sách xem
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index 6894f90a149..c169fe2afbc 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=theo nhà cung cấp, lựa chọn phương pháp th
 TurnoverPerProductInCommitmentAccountingNotRelevant=Báo cáo doanh thu mỗi sản phẩm, khi sử dụng chế độ <b>kế toán tiền mặt</b> là không có liên quan. Báo cáo này chỉ có sẵn khi sử dụng chế độ <b>kế toán tham gia</b> (xem thiết lập của module kế toán).
 CalculationMode=Chế độ tính toán
 AccountancyJournal=Đang kế toán tạp chí
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Mã kế toán mặc định để mua sản phẩm
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Mã kế toán mặc định để bán sản phẩm
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Mã kế toán mặc định để mua dịch vụ
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Mã kế toán mặc định để bán các dịch vụ
 ACCOUNTING_VAT_ACCOUNT=Kế toán mã mặc định cho thu thuế GTGT
 ACCOUNTING_VAT_BUY_ACCOUNT=Kế toán mã mặc định để nộp thuế GTGT
 ACCOUNTING_ACCOUNT_CUSTOMER=Kế toán mã bằng cách mặc định cho khách hàng thirdparties
diff --git a/htdocs/langs/vi_VN/contracts.lang b/htdocs/langs/vi_VN/contracts.lang
index 2cafa5e8b81..e5d7db9f1bb 100644
--- a/htdocs/langs/vi_VN/contracts.lang
+++ b/htdocs/langs/vi_VN/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Danh sách các đường chạy hợp đồng
 ListOfRunningServices=Danh sách các dịch vụ đang chạy
 NotActivatedServices=Dịch vụ không hoạt động (trong hợp đồng xác nhận)
 BoardNotActivatedServices=Dịch vụ để kích hoạt các hợp đồng xác nhận
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Dịch vụ kích hoạt cuối% s
 LastModifiedServices=Dịch vụ biến đổi cuối cùng% s
 EditServiceLine=Dòng Chỉnh sửa dịch vụ
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Danh sách Dịch vụ hết hạn
 NoteListOfYourExpiredServices=Danh sách này chỉ bao gồm các dịch vụ hợp đồng cho các bên thứ ba mà bạn đang kết nối như là một đại diện bán hàng.
 StandardContractsTemplate=Hợp đồng tiêu chuẩn mẫu
 ContactNameAndSignature=Đối với% s, tên, chữ ký:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Bán hàng ký kết hợp đồng đại diện
diff --git a/htdocs/langs/vi_VN/ecm.lang b/htdocs/langs/vi_VN/ecm.lang
index 8f3f349ff81..b8c8e2d59a3 100644
--- a/htdocs/langs/vi_VN/ecm.lang
+++ b/htdocs/langs/vi_VN/ecm.lang
@@ -24,7 +24,7 @@ ECMCreationDate=Ngày tạo
 ECMNbOfFilesInDir=Số lượng hồ sơ trong thư mục
 ECMNbOfSubDir=Số thư mục con
 ECMNbOfFilesInSubDir=Số ảnh trong thư mục con
-ECMCreationUser=Đấng Tạo Hóa
+ECMCreationUser=Người tạo
 ECMArea=Khu vực EDM
 ECMAreaDesc=Các (quản lý tài liệu điện tử) khu vực EDM cho phép bạn lưu, chia sẻ và tìm kiếm một cách nhanh chóng tất cả các loại tài liệu trong Dolibarr.
 ECMAreaDesc2=* Thư mục tự động được điền tự động khi thêm tài liệu từ thẻ của một phần tử. <br> * Hướng dẫn sử dụng các thư mục có thể được sử dụng để lưu các tài liệu không liên quan đến một yếu tố cụ thể.
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 2d435e1bd08..a949fb6453e 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Mã nhà cung cấp yêu cầu
 ErrorSupplierCodeAlreadyUsed=Mã nhà cung cấp đã được sử dụng
 ErrorBadParameters=Thông số xấu
 ErrorBadValueForParameter=Sai giá trị '% s' cho tham số không chính xác '% s'
-ErrorBadImageFormat=Tập tin hình ảnh đã không phải là một định dạng được hỗ trợ
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Giá trị '% s' có định dạng sai ngày
 ErrorWrongDate=Ngày là không đúng!
 ErrorFailedToWriteInDir=Không thể viết trong thư mục% s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Người sử dụng có đăng <b>nhập% s</b> không
 ErrorLoginHasNoEmail=Thành viên này không có địa chỉ email. Quá trình hủy bỏ.
 ErrorBadValueForCode=Bad giá trị so với mã bảo vệ. Hãy thử lại với giá trị mới ...
 ErrorBothFieldCantBeNegative=Fields% s và% s không thể được cả hai tiêu cực
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Tài khoản người <b>dùng% s</b> được sử dụng để thực hiện các máy chủ web không có sự cho phép cho điều đó
 ErrorNoActivatedBarcode=Không có loại mã vạch kích hoạt
 ErrUnzipFails=Không thể giải nén% s với ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Lỗi, thành viên này chưa
 ErrorThereIsSomeDeliveries=Lỗi, có một số việc giao hàng có liên quan đến lô hàng này. Xóa từ chối.
 ErrorCantDeletePaymentReconciliated=Không thể xóa một khoản thanh toán đã tạo ra một giao dịch ngân hàng đã được hoà giải
 ErrorCantDeletePaymentSharedWithPayedInvoice=Không thể xóa một khoản thanh toán được chia sẻ bởi ít nhất một hóa đơn với tình trạng payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Thiết lập các thông số bắt buộc chưa được xác định
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index 7f11e9e529b..eb2687751c6 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -26,8 +26,8 @@ MembersCards=Thành viên danh thiếp
 MembersList=Danh sách thành viên
 MembersListToValid=Danh sách thành viên dự thảo (được xác nhận)
 MembersListValid=Danh sách thành viên hợp lệ
-MembersListUpToDate=Danh sách thành viên hợp lệ lên đến thuê bao ngày
-MembersListNotUpToDate=Danh sách thành viên hợp lệ với các thuê bao trong ngày
+MembersListUpToDate=Danh sách thành viên hợp lệ lên đến mô tả ngày
+MembersListNotUpToDate=Danh sách thành viên hợp lệ với các mô tả trong ngày
 MembersListResiliated=Danh sách thành viên resiliated
 MembersListQualified=Danh sách các thành viên đủ điều kiện
 MenuMembersToValidate=Dự thảo các thành viên
@@ -38,7 +38,7 @@ MenuMembersResiliated=Thành viên Resiliated
 MembersWithSubscriptionToReceive=Thành viên có đăng ký để nhận được
 DateAbonment=Ngày đăng ký
 DateSubscription=Ngày đăng ký
-DateNextSubscription=Thuê bao tiếp theo
+DateNextSubscription=Mô tả tiếp theo
 DateEndSubscription=Ngày kết thúc đăng ký
 EndSubscription=Kết thúc đăng ký
 SubscriptionId=Id đăng ký
@@ -55,7 +55,7 @@ MemberStatusDraft=Dự thảo (cần phải được xác nhận)
 MemberStatusDraftShort=Dự thảo
 MemberStatusActive=Xác nhận (đăng ký chờ đợi)
 MemberStatusActiveShort=Xác nhận
-MemberStatusActiveLate=thuê bao hết hạn
+MemberStatusActiveLate=mô tả hết hạn
 MemberStatusActiveLateShort=Hết hạn
 MemberStatusPaid=Đăng ký cập nhật
 MemberStatusPaidShort=Cho đến nay
@@ -75,17 +75,17 @@ PaymentSubscription=Thanh toán khoản đóng góp mới
 EditMember=Chỉnh sửa thành viên
 SubscriptionEndDate=Ngày kết thúc đăng ký của
 MembersTypeSetup=Loại thành viên thiết lập
-NewSubscription=Thuê bao mới
-NewSubscriptionDesc=Hình thức này cho phép bạn ghi lại các thuê bao của bạn như là một thành viên mới của nền tảng. Nếu bạn muốn gia hạn thuê bao của bạn (nếu đã là thành viên), xin liên lạc với hội đồng quản trị nền tảng thay vì qua email% s.
+NewSubscription=Mô tả mới
+NewSubscriptionDesc=Hình thức này cho phép bạn ghi lại các mô tả của bạn như là một thành viên mới của nền tảng. Nếu bạn muốn gia hạn mô tả của bạn (nếu đã là thành viên), xin liên lạc với hội đồng quản trị nền tảng thay vì qua email% s.
 Subscription=Đăng ký
 Subscriptions=Đăng ký
 SubscriptionLate=Cuối
-SubscriptionNotReceived=Thuê bao không bao giờ nhận được
+SubscriptionNotReceived=Mô tả không bao giờ nhận được
 SubscriptionLateShort=Cuối
 SubscriptionNotReceivedShort=Không bao giờ nhận được
 ListOfSubscriptions=Danh sách đăng ký
 SendCardByMail=Gửi thẻ qua Email
-AddMember=Thêm thành viên
+AddMember=Tạo thành viên
 NoTypeDefinedGoToSetup=Không có loại thành viên được xác định. Tới menu "Thành viên loại"
 NewMemberType=Loại thành viên mới
 WelcomeEMail=Chào mừng e-mail
@@ -100,8 +100,8 @@ Reenable=Bật lại
 ResiliateMember=Resiliate thành viên
 ConfirmResiliateMember=Bạn Bạn có chắc chắn muốn resiliate thành viên này?
 DeleteMember=Xóa thành viên
-ConfirmDeleteMember=Bạn có chắc chắn muốn xóa thành viên này (Xóa một thành viên sẽ xóa tất cả các thuê bao của mình)?
-DeleteSubscription=Xóa một thuê bao
+ConfirmDeleteMember=Bạn có chắc chắn muốn xóa thành viên này (Xóa một thành viên sẽ xóa tất cả các mô tả của mình)?
+DeleteSubscription=Xóa một mô tả
 ConfirmDeleteSubscription=Bạn Bạn có chắc chắn muốn xóa đăng ký này?
 Filehtpasswd=tập tin htpasswd
 ValidateMember=Xác nhận thành viên
@@ -125,8 +125,8 @@ Date=Ngày
 DateAndTime=Ngày và thời gian
 PublicMemberCard=Thẻ thành viên công cộng
 MemberNotOrNoMoreExpectedToSubscribe=Thành viên không hoặc không mong đợi để đăng ký
-AddSubscription=Thêm thuê bao
-ShowSubscription=Hiện thuê bao
+AddSubscription=Tạo mô tả
+ShowSubscription=Hiện mô tả
 MemberModifiedInDolibarr=Thành viên sửa đổi trong Dolibarr
 SendAnEMailToMember=Gửi email thông tin cho các thành viên
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Chủ đề của e-mail nhận được trong trường hợp tự động ghi của khách
@@ -135,8 +135,8 @@ DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Tiêu đề thư điện tử cho thành
 DescADHERENT_AUTOREGISTER_MAIL=Thư điện tử của thành viên autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=Tiêu đề thư điện tử để xác nhận thành viên
 DescADHERENT_MAIL_VALID=Thư điện tử để xác nhận thành viên
-DescADHERENT_MAIL_COTIS_SUBJECT=Tiêu đề thư điện tử cho thuê bao
-DescADHERENT_MAIL_COTIS=Thư điện tử cho thuê bao
+DescADHERENT_MAIL_COTIS_SUBJECT=Tiêu đề thư điện tử cho mô tả
+DescADHERENT_MAIL_COTIS=Thư điện tử cho mô tả
 DescADHERENT_MAIL_RESIL_SUBJECT=Tiêu đề thư điện tử cho thành viên resiliation
 DescADHERENT_MAIL_RESIL=Thư điện tử của thành viên resiliation
 DescADHERENT_MAIL_FROM=Tên người gửi thư điện tử cho email tự động
@@ -155,7 +155,7 @@ NoThirdPartyAssociatedToMember=Không có bên thứ ba liên quan đến thành
 ThirdPartyDolibarr=Bên thứ ba Dolibarr
 MembersAndSubscriptions= Thành viên và theo dõi
 MoreActions=Hành động bổ sung vào thu
-MoreActionsOnSubscription=Hành động bổ sung, đề nghị theo mặc định khi ghi âm một thuê bao
+MoreActionsOnSubscription=Hành động bổ sung, đề nghị theo mặc định khi ghi âm một mô tả
 MoreActionBankDirect=Tạo một bản ghi giao dịch trực tiếp trên tài khoản
 MoreActionBankViaInvoice=Tạo hóa đơn và thanh toán trên tài khoản
 MoreActionInvoiceOnly=Tạo hóa đơn không có thanh toán
@@ -164,7 +164,7 @@ LinkToGeneratedPagesDesc=Màn hình này cho phép bạn tạo ra các tập tin
 DocForAllMembersCards=Tạo danh thiếp cho tất cả các thành viên
 DocForOneMemberCards=Tạo danh thiếp cho một thành viên đặc biệt
 DocForLabels=Tạo tờ địa chỉ
-SubscriptionPayment=Thanh toán thuê bao
+SubscriptionPayment=Thanh toán mô tả
 LastSubscriptionDate=Cuối ngày đăng ký
 LastSubscriptionAmount=Số lượng đăng ký cuối cùng
 MembersStatisticsByCountries=Thành viên thống kê của đất nước
@@ -180,17 +180,17 @@ MembersByTownDesc=Màn hình này hiển thị cho bạn số liệu thống kê
 MembersStatisticsDesc=Chọn thống kê mà bạn muốn đọc ...
 MenuMembersStats=Thống kê
 LastMemberDate=Ngày thành viên cuối cùng
-Nature=Thiên nhiên
+Nature=Tự nhiên
 Public=Thông tin được công khai
 Exports=Xuất khẩu
 NewMemberbyWeb=Thành viên mới được bổ sung. Đang chờ phê duyệt
 NewMemberForm=Hình thức thành viên mới
-SubscriptionsStatistics=Thống kê về thuê bao
+SubscriptionsStatistics=Thống kê về mô tả
 NbOfSubscriptions=Số đăng ký
-AmountOfSubscriptions=Số tiền thuê bao
+AmountOfSubscriptions=Số tiền mô tả
 TurnoverOrBudget=Doanh thu (cho một công ty) hay Ngân sách nhà nước (đối với một nền tảng)
-DefaultAmount=Số lượng mặc định của thuê bao
-CanEditAmount=Khách có thể chọn / chỉnh sửa số lượng thuê bao của mình
+DefaultAmount=Số lượng mặc định của mô tả
+CanEditAmount=Khách có thể chọn / chỉnh sửa số lượng mô tả của mình
 MEMBER_NEWFORM_PAYONLINE=Nhảy vào trang tích hợp thanh toán trực tuyến
 Associations=Cơ sở
 Collectivités=Tổ chức
@@ -199,7 +199,8 @@ Entreprises=Các công ty
 DOLIBARRFOUNDATION_PAYMENT_FORM=Để thực hiện thanh toán đăng ký của bạn bằng cách sử dụng chuyển khoản ngân hàng, xem trang <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Để thanh toán bằng cách sử dụng thẻ tín dụng hoặc Paypal, bấm vào nút ở dưới cùng của trang này. <br>
 ByProperties=Bởi đặc điểm
 MembersStatisticsByProperties=Thành viên thống kê theo các đặc điểm
-MembersByNature=Thành viên của thiên nhiên
-VATToUseForSubscriptions=Thuế suất thuế GTGT để sử dụng cho thuê bao
-NoVatOnSubscription=Không TVA cho thuê bao
-MEMBER_PAYONLINE_SENDEMAIL=Gửi email cảnh báo khi Dolibarr nhận được xác nhận của một xác nhận thanh toán cho thuê bao
+MembersByNature=Thành viên của tự nhiên
+VATToUseForSubscriptions=Thuế suất thuế GTGT để sử dụng cho mô tả
+NoVatOnSubscription=Không TVA cho mô tả
+MEMBER_PAYONLINE_SENDEMAIL=Gửi email cảnh báo khi Dolibarr nhận được xác nhận của một xác nhận thanh toán cho mô tả
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 38a20e0037d..6229c7c4a90 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -17,8 +17,8 @@ ProductVatMassChange=Thay đổi thuế GTGT hàng loạt
 ProductVatMassChangeDesc=Trang này có thể được sử dụng để sửa đổi một thuế suất thuế GTGT được xác định trên sản phẩm hoặc dịch vụ từ một giá trị khác. Cảnh báo, sự thay đổi này được thực hiện trên tất cả các cơ sở dữ liệu.
 MassBarcodeInit=Khối lượng mã vạch init
 MassBarcodeInitDesc=Trang này có thể được sử dụng để khởi tạo một mã vạch trên các đối tượng mà không có mã vạch xác định. Kiểm tra trước đó thiết lập các mô-đun mã vạch hoàn tất.
-ProductAccountancyBuyCode=Đang Toán (mua)
-ProductAccountancySellCode=Đang kế toán (bán)
+ProductAccountancyBuyCode=Mã kế toán (mua)
+ProductAccountancySellCode=Mã kế toán (bán)
 ProductOrService=Sản phẩm hoặc dịch vụ
 ProductsAndServices=Sản phẩm và dịch vụ
 ProductsOrServices=Sản phẩm hoặc dịch vụ
@@ -46,10 +46,10 @@ Warehouse=Kho
 Warehouses=Các kho hàng
 WarehouseOpened=Kho mở
 WarehouseClosed=Kho đóng
-Stock=Cổ
-Stocks=Cổ phiếu
-Movement=Phong trào
-Movements=Biến động
+Stock=tồn kho
+Stocks=tồn kho phiếu
+Movement=Chuyển kho
+Movements=Danh sách chuyển kho
 Sell=Bán hàng
 Buy=Mua
 OnSell=Bán
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Nếu sản phẩm là một dịch vụ với thời gia
 MultiPricesAbility=Một số mức giá cho mỗi sản phẩm / dịch vụ
 MultiPricesNumPrices=Số giá
 MultiPriceLevelsName=Loại giá
-AssociatedProductsAbility=Kích hoạt tính năng sản phẩm ảo
-AssociatedProducts=Sản phẩm ảo
-AssociatedProductsNumber=Số lượng sản phẩm sáng tác sản phẩm ảo này
-ParentProductsNumber=Số phụ huynh sản phẩm ảo
-IfZeroItIsNotAVirtualProduct=Nếu 0, sản phẩm này không phải là một sản phẩm ảo
-IfZeroItIsNotUsedByVirtualProduct=Nếu 0, sản phẩm này không được sử dụng bởi bất kỳ sản phẩm ảo
+AssociatedProductsAbility=Kích hoạt tính năng gói ảo
+AssociatedProducts=Sản phẩm trọn gói
+AssociatedProductsNumber=Số lượng sản phẩm sáng tác sản phẩm này gói ảo
+ParentProductsNumber=Số sản phẩm bao bì mẹ
+IfZeroItIsNotAVirtualProduct=Nếu 0, sản phẩm này không phải là một sản phẩm trọn gói ảo
+IfZeroItIsNotUsedByVirtualProduct=Nếu 0, sản phẩm này không được sử dụng bởi bất kỳ sản phẩm gói ảo
 EditAssociate=Phó
 Translation=Dịch
 KeywordFilter=Bộ lọc từ khóa
@@ -132,7 +132,7 @@ AddDel=Thêm / Xóa
 Quantity=Số lượng
 NoMatchFound=Không có trận đấu được tìm thấy
 ProductAssociationList=Danh sách sản phẩm / dịch vụ liên quan: tên của sản phẩm / dịch vụ (số lượng bị ảnh hưởng)
-ProductParentList=Danh sách sản phẩm ảo / dịch vụ với sản phẩm này như một thành phần
+ProductParentList=Danh sách sản phẩm / dịch vụ trọn gói với sản phẩm này như là một thành phần
 ErrorAssociationIsFatherOfThis=Một trong những sản phẩm được lựa chọn là cha mẹ với sản phẩm hiện tại
 DeleteProduct=Xóa một sản phẩm / dịch vụ
 ConfirmDeleteProduct=Bạn Bạn có chắc chắn muốn xóa sản phẩm này / dịch vụ?
@@ -147,13 +147,13 @@ DeleteProductLine=Xóa dòng sản phẩm
 ConfirmDeleteProductLine=Bạn Bạn có chắc chắn muốn xóa dòng sản phẩm này?
 NoProductMatching=Không có sản phẩm / dịch vụ phù hợp với tiêu chí của bạn
 MatchingProducts=Phù hợp với sản phẩm / dịch vụ
-NoStockForThisProduct=Không có cổ phiếu nào cho sản phẩm này
-NoStock=Không Cổ
-Restock=Trồng cây
+NoStockForThisProduct=Không có tồn kho nào cho sản phẩm này
+NoStock=Không tồn kho
+Restock=Restock
 ProductSpecial=Đặc biệt
 QtyMin=Số lượng tối thiểu
 PriceQty=Giá cho số lượng này
-PriceQtyMin=Giá cho min này. SL (w / o giảm giá)
+PriceQtyMin=Giá cho tối thiểu này. SL (w / o giảm giá)
 VATRateForSupplierProduct=Tỷ lệ thuế GTGT (đối với nhà cung cấp / sản phẩm)
 DiscountQtyMin=Mặc định giảm giá cho SL
 NoPriceDefinedForThisSupplier=Không có giá / SL xác định cho nhà cung cấp / sản phẩm
@@ -175,11 +175,11 @@ ListProductByPopularity=Danh sách sản phẩm nổi tiếng
 ListServiceByPopularity=Danh sách các dịch vụ nổi tiếng
 Finished=Sản phẩm sản xuất
 RowMaterial=Nguyên liệu
-CloneProduct=Sản phẩm hoặc dịch vụ Clone
+CloneProduct=Sản phẩm hoặc dịch vụ sao chép
 ConfirmCloneProduct=Bạn có chắc chắn bạn muốn nhân bản sản phẩm hoặc dịch <b>vụ% s?</b>
 CloneContentProduct=Sao lưu tất cả thông tin chính của sản phẩm / dịch vụ
-ClonePricesProduct=Thông tin chính Clone và giá cả
-CloneCompositionProduct=Ảo sản phẩm / dịch vụ Clone
+ClonePricesProduct=Thông tin chính sao chép và giá cả
+CloneCompositionProduct=sao chép đóng gói sản phẩm / dịch vụ
 ProductIsUsed=Sản phẩm này được sử dụng
 NewRefForClone=Tài liệu tham khảo. các sản phẩm mới / dịch vụ
 CustomerPrices=Giá khách hàng
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Đặt giá trên cùng một công ty con của khách
 PriceByCustomerLog=Giá bán của khách hàng đăng nhập
 MinimumPriceLimit=Giá tối thiểu không thấp hơn% s
 MinimumRecommendedPrice=Giá đề nghị tối thiểu là:% s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index 53fbbdafe60..a6ccfac4cf2 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Phần xem này hiển thị tất cả các dự án và tác vụ (q
 Myprojects=Dự án của tôi
 ProjectsArea=Khu vực dự án
 NewProject=Dự án mới
-AddProject=Thêm dự án
+AddProject=Tạo dự án
 DeleteAProject=Xóa một dự án
 DeleteATask=Xóa một tác vụ
 ConfirmDeleteAProject=Bạn có chắc muốn xóa dự án này?
@@ -36,6 +36,8 @@ TaskTimeSpent=Thời gian dành cho công việc
 TaskTimeUser=Người sử dụng
 TaskTimeNote=Lưu ý
 TaskTimeDate=Ngày
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Thời gian đã qua mới
 MyTimeSpent=Thời gian đã qua của tôi
 MyTasks=Tác vụ của tôi
@@ -45,7 +47,7 @@ TaskDateStart=Nhiệm vụ ngày bắt đầu
 TaskDateEnd=Nhiệm vụ ngày kết thúc
 TaskDescription=Mô tả công việc
 NewTask=Tác vụ mới
-AddTask=Thêm tác vụ
+AddTask=Tạo công việc
 AddDuration=Thêm độ dài thời gian
 Activity=Hoạt động
 Activities=Tác vụ/hoạt động
@@ -85,13 +87,13 @@ ActionsOnProject=Các sự kiện liên quan đến dự án
 YouAreNotContactOfProject=Bạn không thuộc phần liên lạc đối với chủ đề thuộc phạm vi riêng tư này
 DeleteATimeSpent=Xóa thời gian đã bỏ ra
 ConfirmDeleteATimeSpent=Bạn có chắc muốn xóa thời gian đã bỏ ra?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+DoNotShowMyTasksOnly=Xem thêm nhiệm vụ không được gán cho tôi
+ShowMyTasksOnly=Xem chỉ nhiệm vụ được giao với tôi
 TaskRessourceLinks=Các nguồn tài nguyên
 ProjectsDedicatedToThisThirdParty=Các dự án được dành riêng cho bên thứ ba này
 NoTasks=Không có tác vụ nào cho dự án này
 LinkedToAnotherCompany=Được liên kết đến các bên thứ ba
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAffectedToYou=Nhiệm vụ không được giao cho bạn
 ErrorTimeSpentIsEmpty=Thời gian đã qua hiện đang rỗng
 ThisWillAlsoRemoveTasks=Thao tác này sẽ xóa toàn bộ các tác vụ của dự án (<b>%s</b> các tác vụ ở thời điểm hiện tại) và toàn bộ dữ liệu đã nhập vào trong suốt thời gian vừa qua.
 IfNeedToUseOhterObjectKeepEmpty=Nếu một số đối tượng (đơn hàng, đơn đặt hàng, ...), thuộc về một bên thứ ba khác, phải có đường liên kết đến dự án để tạo, duy trì phần này rỗng để dự án có thể có sự tham gia của nhiều bên thứ ba khác
@@ -120,7 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Đóng góp
 TypeContact_project_task_external_TASKCONTRIBUTOR=Đóng góp
 SelectElement=Chọn phần
 AddElement=Liên kết đến yếu tố
-UnlinkElement=Unlink element
+UnlinkElement=Yếu tố Bỏ liên kết
 # Documents models
 DocumentModelBaleine=Mô hình báo cáo hoàn chỉnh của dự án (lôgô...)
 PlannedWorkload = Tải tiến trình công việc đã dự định
@@ -129,4 +131,4 @@ ProjectReferers=Các đối tượng tham chiếu
 SearchAProject=Tìm kiếm một dự án
 ProjectMustBeValidatedFirst=Dự án phải được xác nhận đầu tiên
 ProjectDraft=Dự thảo dự án
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Kết hợp một ressource để phân bổ thời gian
diff --git a/htdocs/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang
index bb544bbfc61..6e9b8aef50b 100644
--- a/htdocs/langs/vi_VN/propal.lang
+++ b/htdocs/langs/vi_VN/propal.lang
@@ -16,7 +16,7 @@ Prospect=Triển vọng
 ProspectList=Danh sách khách hàng tiềm năng
 DeleteProp=Xóa đề nghị thương mại
 ValidateProp=Xác nhận đề nghị thương mại
-AddProp=Thêm đề nghị
+AddProp=Tạo đề xuất
 ConfirmDeleteProp=Bạn Bạn có chắc chắn muốn xóa đề nghị thương mại này?
 ConfirmValidateProp=Bạn có chắc chắn bạn muốn xác nhận đề nghị thương mại này dưới <b>tên% s?</b>
 LastPropals=Cuối% s đề xuất
@@ -55,8 +55,6 @@ NoOpenedPropals=Không có đề xuất thương mại mở
 NoOtherOpenedPropals=Không có đề xuất thương mại mở khác
 RefProposal=Đề nghị ref thương mại
 SendPropalByMail=Gửi đề nghị thương mại qua đường bưu điện
-FileNotUploaded=Các tập tin không được tải lên
-FileUploaded=Các tập tin được tải lên thành công
 AssociatedDocuments=Các tài liệu liên quan đến đề nghị:
 ErrorCantOpenDir=Không thể mở thư mục
 DatePropal=Ngày đề nghị
@@ -76,7 +74,7 @@ CopyPropalFrom=Tạo đề nghị thương mại bằng cách sao chép đề ng
 CreateEmptyPropal=Tạo ra sản phẩm nào đề xuất thương mại Vierge hoặc từ danh sách các sản phẩm / dịch vụ
 DefaultProposalDurationValidity=Mặc định thời hạn đề nghị thương mại (trong ngày)
 UseCustomerContactAsPropalRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng nếu được xác định thay vì địa chỉ của bên thứ ba như là địa chỉ đề nghị người nhận
-ClonePropal=Đề nghị thương mại Clone
+ClonePropal=Đề nghị thương mại sao chép
 ConfirmClonePropal=Bạn có chắc chắn bạn muốn nhân bản đề nghị thương <b>mại% s?</b>
 ConfirmReOpenProp=Bạn có chắc chắn bạn muốn mở lại đề nghị thương <b>mại% s?</b>
 ProposalsAndProposalsLines=Đề nghị thương mại và dòng
diff --git a/htdocs/langs/vi_VN/resource.lang b/htdocs/langs/vi_VN/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/vi_VN/resource.lang
+++ b/htdocs/langs/vi_VN/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang
index a8c8d228906..39ad630c510 100644
--- a/htdocs/langs/vi_VN/suppliers.lang
+++ b/htdocs/langs/vi_VN/suppliers.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Nhà cung cấp
 Supplier=Nhà cung cấp
-AddSupplier=Thêm một nhà cung cấp
+AddSupplier=Tạo một nhà cung cấp
 SupplierRemoved=Nhà cung cấp loại bỏ
 SuppliersInvoice=Nhà cung cấp hóa đơn
 NewSupplier=Nhà cung cấp mới
@@ -11,7 +11,7 @@ ShowSupplier=Hiện nhà cung cấp
 OrderDate=Ngày đặt hàng
 BuyingPrice=Giá mua
 BuyingPriceMin=Giá mua tối thiểu
-BuyingPriceMinShort=Min giá mua
+BuyingPriceMinShort=Tối thiểu giá mua
 TotalBuyingPriceMin=Tổng số subproducts giá mua
 SomeSubProductHaveNoPrices=Một số phụ phẩm đã có giá quy định
 AddSupplierPrice=Thêm giá nhà cung cấp
@@ -40,5 +40,5 @@ AddSupplierInvoice=Tạo nhà cung cấp hóa đơn
 ListOfSupplierProductForSupplier=Danh sách sản phẩm và giá cả cho nhà cung <b>cấp% s</b>
 NoneOrBatchFileNeverRan=Không có hoặc hàng <b>loạt% s</b> không chạy gần đây
 SentToSuppliers=Gửi đến nhà cung cấp
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+ListOfSupplierOrders=Danh sách các đơn đặt hàng nhà cung cấp
+MenuOrdersSupplierToBill=Đơn đặt hàng nhà cung cấp cho hóa đơn
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index 9a2f990f6b0..846f80ab12d 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Về tín dụng
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Hiện Rút
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tuy nhiên, nếu hóa đơn có ít nhất một thanh toán rút chưa qua chế biến, nó sẽ không được thiết lập như là trả tiền để cho phép quản lý thu hồi trước.
-DoStandingOrdersBeforePayments=Thẻ này cho phép bạn yêu cầu để đứng. Sau khi hoàn tất, bạn có thể gõ thanh toán để đóng hóa đơn.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Thu hồi tập tin
 SetToStatusSent=Thiết lập để tình trạng "File gửi"
 ThisWillAlsoAddPaymentOnInvoice=Điều này cũng sẽ áp dụng chi trả cho các hóa đơn và sẽ phân loại là "Đã thanh toán"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Thanh toán đứng thứ tự% s của ngân hàng
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 7cc1e718e38..aa7361675a0 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=使用自动填充字段来选择第三方(而不是使
 ActivityStateToSelectCompany= 添加一个筛选器选项来显示/隐藏当前有往来或已停止往来的客户/供应商。
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=使用自动填充字段来选择联系人（而不是使用一个列表框）。
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=搜索过滤选项
 NumberOfKeyToSearch=触发搜索的字符数量：%s
 ViewFullDateActions=在第三表中显示全天事件
@@ -208,6 +210,7 @@ ModulesJobDesc=业务模块为特定业务提供简单的 Dolibarr 预制设置
 ModulesMarketPlaceDesc=您可以在一些外部网站上找到更多的模块(安全性未知)...
 ModulesMarketPlaces=更多模块...
 DoliStoreDesc=DoliStore，为 Dolibarr 的 ERP/CRM 的外部模块官方市场
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=网站提供者可以搜索找到更多模块...
 URL=链接
 BoxesAvailable=资讯框可用
@@ -444,7 +447,7 @@ Module55Desc=条码的管理
 Module56Name=电话
 Module56Desc=电话整合
 Module57Name=长期订单
-Module57Desc=长期订单和提款管理
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=单击拨号
 Module58Desc=单击拨号系统集成(Asterisk ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS 源
 Module320Desc=添加 RSS 源至 Dolibarr 主屏幕页面
 Module330Name=书签
 Module330Desc=书签的管理
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar 整合
 Module500Name=特别费用（税，社会公益，股息）
@@ -495,6 +498,8 @@ Module1780Name=分类
 Module1780Desc=分类的管理(产品、供应商和客户)
 Module2000Name=所见即所得编辑器
 Module2000Desc=允许在一些文本编辑区中使用所见即所得编辑器
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=任务排程管理
 Module2400Name=日程
@@ -503,6 +508,8 @@ Module2500Name=电子内容管理
 Module2500Desc=保存和共享文件
 Module2600Name=SOAP WebServices
 Module2600Desc=启用 Dolibarr Web 服务的服务器
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=使用网上的 Gravatar 服务(www.gravatar.com)，显示 用户/成员的头像(通过电邮搜索)。需要互联网连接。
 Module2800Desc=FTP 客户端
@@ -517,7 +524,7 @@ Module6000Desc=工作流管理
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=产品批号
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=出纳
 Module50000Desc=模块通过 PayBox 提供信用卡网上支付页面
 Module50100Name=POS
@@ -527,7 +534,7 @@ Module50200Desc=模块提供信用卡与Paypal网上支付页面
 Module50400Name=财会(高级)
 Module50400Desc=会计管理(双方)
 Module54000Name=IPP打印
-Module54000Desc=通过CUPS IPP 打印机打印 . 注：CUPS IPP:支持Internet协议的Unix打印系统
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=利润空间
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=设定值已储存
 BackToModuleList=返回模块列表
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=常驻左侧菜单搜寻框
 DefaultLanguage=默认语言使用(语言代码)
 EnableMultilangInterface=启用多语言界面
 EnableShowLogo=左侧菜单中显示公司标志
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=您的系统已成功更新
 CompanyInfo=公司资讯
 CompanyIds=公司/协会的编号
diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
index f0baa362ff1..50054428dab 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=受影响的行动
 ActionsDoneBy=做的动作
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= 我所有的事件/任务
 AllActions= 所有/任务行动
 ViewList=查看列表
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index cc7916bbd7d..1386b63e55c 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=根据供应商，选择适当的方法来套用相
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=计算模式
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=购货缺省会计代码
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=卖货缺省会计代码
-ACCOUNTING_SERVICE_BUY_ACCOUNT=购买服务缺省会计编码
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=出售服务缺省会计代码
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=第三方客户缺省会计代码
diff --git a/htdocs/langs/zh_CN/contracts.lang b/htdocs/langs/zh_CN/contracts.lang
index d24baa68199..b5ccca60cad 100644
--- a/htdocs/langs/zh_CN/contracts.lang
+++ b/htdocs/langs/zh_CN/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=名单合同线运行
 ListOfRunningServices=运行服务的列表
 NotActivatedServices=不活跃的服务（除验证合同）
 BoardNotActivatedServices=服务激活验证合同之间
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=上次%s的激活服务
 LastModifiedServices=最后%S修饰服务
 EditServiceLine=编辑服务项目
@@ -91,6 +91,7 @@ ListOfServicesToExpire=服务到期列表
 NoteListOfYourExpiredServices=此列表只包含你作为一个销售代表与第三方的服务合同 。
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=销售代表签订合同
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index abbf725b3f9..1a9cf940bfd 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -27,7 +27,7 @@ ErrorProdIdIsMandatory=%s 是强制性的
 ErrorBadCustomerCodeSyntax=坏客户代码的语法
 ErrorBadBarCodeSyntax=Bad syntax for bar code
 ErrorCustomerCodeRequired=客户代码需要
-ErrorBarCodeRequired=Bar code required
+ErrorBarCodeRequired=需要条形码
 ErrorCustomerCodeAlreadyUsed=客户代码已被使用
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=前缀要求
@@ -37,9 +37,9 @@ ErrorSupplierCodeRequired=要求供应商代码
 ErrorSupplierCodeAlreadyUsed=供应商代码已被使用
 ErrorBadParameters=错误的参数
 ErrorBadValueForParameter=错误值“参数不正确”%s %s'“
-ErrorBadImageFormat=图像文件有不支持的格式
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=值“%s”有错误的日期格式
-ErrorWrongDate=Date is not correct!
+ErrorWrongDate=日期不正确！
 ErrorFailedToWriteInDir=无法写在目录%s
 ErrorFoundBadEmailInFile=找到%S的语法不正确的电子邮件文件中的行（例如行%的电子邮件s =%s）的
 ErrorUserCannotBeDelete=用户不能被删除。也许它是相关联的Dolibarr实体。
@@ -74,7 +74,7 @@ ErrorCantSaveADoneUserWithZeroPercentage=无法储存与行动“规约未启动
 ErrorRefAlreadyExists=号的创作已经存在。
 ErrorPleaseTypeBankTransactionReportName=请输入银行收据的名字在交易报告（格式YYYYMM或采用YYYYMMDD）
 ErrorRecordHasChildren=删除记录失败，因为它有一些儿童。
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
+ErrorRecordIsUsedCantDelete=不能删除记录。它已被使用或者包含在其他对象中。
 ErrorModuleRequireJavascript=不能禁用JavaScript必须有此功能的工作。要启用/禁用JavaScript，进入菜单首页->安装->“显示。
 ErrorPasswordsMustMatch=这两种类型的密码必须相互匹配
 ErrorContactEMail=一个技术性错误发生。请联系管理员，以下连接提供错误代码<b>%s</b>在您的邮件，甚至更好，加入了这个页面的屏幕拷贝的电子邮件<b>%s。</b>
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=<b>如何正确</b>使用手机与登录<b>%</b>找不
 ErrorLoginHasNoEmail=这位用户没有电子邮件地址。进程中止。
 ErrorBadValueForCode=代码有错误的值类型。再次尝试以新的价值...
 ErrorBothFieldCantBeNegative=领域的%s及%s可以不消极
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=<b>%s</b>用来执行Web服务器用户帐户没有该权限
 ErrorNoActivatedBarcode=没有激活的条码类型
 ErrUnzipFails=%s 无法解压缩与解压缩
@@ -132,11 +133,29 @@ ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setu
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
-ErrorBadFormat=Bad format!
+ErrorBadFormat=格式错误！
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=强制设置参数尚未定义
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index 77941da84a9..c1f903270ce 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=晚
 SubscriptionNotReceivedShort=从未收到
 ListOfSubscriptions=订阅名单
 SendCardByMail=发送卡
-AddMember=加入会员
+AddMember=Create member
 NoTypeDefinedGoToSetup=任何成员类型定义。前往设置 - 会员类型
 NewMemberType=新会员类型
 WelcomeEMail=欢迎电子邮件
@@ -125,7 +125,7 @@ Date=日期
 DateAndTime=日期和时间
 PublicMemberCard=市民卡会员
 MemberNotOrNoMoreExpectedToSubscribe=会员没有或没有更多的预期订阅
-AddSubscription=添加订阅
+AddSubscription=Create subscription
 ShowSubscription=显示订阅
 MemberModifiedInDolibarr=会员修改Dolibarr
 SendAnEMailToMember=向会员发送信息的电子邮件
@@ -170,6 +170,8 @@ LastSubscriptionAmount=最后认购金额
 MembersStatisticsByCountries=成员由国家统计
 MembersStatisticsByState=成员由州/省的统计信息
 MembersStatisticsByTown=成员由镇统计
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=成员数
 NoValidatedMemberYet=没有验证的成员发现
 MembersByCountryDesc=该屏幕显示您成员国的统计数字。然而，图形取决于谷歌在线图服务，可只有一个互联网连接工作。
@@ -201,3 +203,4 @@ MembersByNature=会员按性质
 VATToUseForSubscriptions=增值税率，用于订阅
 NoVatOnSubscription=没有增值税订阅
 MEMBER_PAYONLINE_SENDEMAIL=通过电子邮件发送警告Dolibarr时收到一个确认的验证支付认购
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index cdd5034bf78..d308f2dbaa5 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=如果产品是有限期的服务：
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=价格个数
 MultiPriceLevelsName=价格分类
-AssociatedProductsAbility=启用虚拟产品功能
-AssociatedProducts=虚拟产品
-AssociatedProductsNumber=组成此虚拟产品的产品数量
-ParentProductsNumber=父虚拟产品的数量
-IfZeroItIsNotAVirtualProduct=0 表示非虚拟产品
-IfZeroItIsNotUsedByVirtualProduct=0 表示此产品未被任何虚拟产品引用。
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=关联
 Translation=翻译
 KeywordFilter=关键词筛选
@@ -132,7 +132,7 @@ AddDel=添加/删除
 Quantity=数量
 NoMatchFound=未发现匹配项目
 ProductAssociationList=相关产品/服务列表: 产品/服务名称 (按数量)
-ProductParentList=由此产品组成的虚拟产品或服务
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=所选产品中有当前产品的父产品
 DeleteProduct=删除产品/服务
 ConfirmDeleteProduct=您确定要删除此产品/服务吗？
@@ -179,7 +179,7 @@ CloneProduct=复制产品/服务
 ConfirmCloneProduct=您确定要复制产品或服务 <b>%s</b> 吗?
 CloneContentProduct=复制产品/服务的所有主要信息
 ClonePricesProduct=复制主要信息/价格
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=此产品已使用
 NewRefForClone=新产品/服务的编号
 CustomerPrices=销售价格
@@ -217,11 +217,11 @@ ProductsMultiPrice=产品多重价格
 ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
-Quarter1=1st. Quarter
-Quarter2=2nd. Quarter
-Quarter3=3rd. Quarter
-Quarter4=4th. Quarter
-BarCodePrintsheet=Print bar code
+Quarter1=第1季度
+Quarter2=第2季度
+Quarter3=第3季度
+Quarter4=第4季度
+BarCodePrintsheet=打印条形码
 PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
 NumberOfStickers=Number of stickers to print on page
 PrintsheetForOneBarCode=Print several stickers for one barcode
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index e9fd2afcaeb..cb9cecbc481 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=这种观点提出的所有项目和任务（您的用户权限批准
 Myprojects=我的项目
 ProjectsArea=项目领域
 NewProject=新项目
-AddProject=新增项目
+AddProject=Create project
 DeleteAProject=删除一个项目
 DeleteATask=删除任务
 ConfirmDeleteAProject=你确定要删除此项目吗？
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=新的时间
 MyTimeSpent=我的时间花
 MyTasks=我的任务
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=新任务
-AddTask=新增任务
+AddTask=Create task
 AddDuration=添加时间
 Activity=活动
 Activities=任务/活动
diff --git a/htdocs/langs/zh_CN/resource.lang b/htdocs/langs/zh_CN/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/zh_CN/resource.lang
+++ b/htdocs/langs/zh_CN/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index 0c7d34a38f5..fa4949d1971 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=信贷
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=显示撤柜
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=然而，如果发票已至少有一个撤出支付尚未处理的，它不会被设置为支付最高允许管理撤出之前。
-DoStandingOrdersBeforePayments=这个标签允许你为一个固定的订单要求。一旦完成，你可以键入付款，收发票。
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=撤回文件
 SetToStatusSent=设置状态“发送的文件”
 ThisWillAlsoAddPaymentOnInvoice=这也将创造在付款发票上，将它们归类支付
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=由银行支付的长期订单%s
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 001aa613e7e..55ae292a37f 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= 添加一個篩選器的選項，以顯示/隱藏thirdparties，這是在目前的活動或已停止
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=搜尋過濾選項
 NumberOfKeyToSearch=需要 %s 個字元來觸發搜尋
 ViewFullDateActions=充分顯示行動的日期，第三表
@@ -208,6 +210,7 @@ ModulesJobDesc=業務模組提供特定業務簡單的Dolibarr預定義設置。
 ModulesMarketPlaceDesc=你可以找到更多的模組，以在互聯網上下載的外部網站的...
 ModulesMarketPlaces=更多的模組...
 DoliStoreDesc=DoliStore，為Dolibarr的ERP / CRM的外部模組官方市場
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=網站提供者可以搜尋找到更多的模組...
 URL=連結
 BoxesAvailable=資訊框可用
@@ -444,7 +447,7 @@ Module55Desc=條碼的管理
 Module56Name=電話
 Module56Desc=電話整合
 Module57Name=長期訂購
-Module57Desc=長期訂購和提款管理
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial一體化
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS饋送
 Module320Desc=添加RSS飼料內Dolibarr屏幕頁面
 Module330Name=書籤
 Module330Desc=書籤的管理
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar一體化
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=分類
 Module1780Desc=分類的管理（產品，供應商和客戶）
 Module2000Name=fckeditor的
 Module2000Desc=所見即所得的編輯器
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=議程
@@ -503,6 +508,8 @@ Module2500Name=電子內容管理
 Module2500Desc=保存和共享文件
 Module2600Name=的WebServices
 Module2600Desc=啟用Web服務的服務器Dolibarr
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=的Gravatar
 Module2700Desc=使用網上的Gravatar服務（www.gravatar.com），以顯示/成員（與他們的電子郵件用戶發現照片）。需要一個互聯網接入
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=出納
 Module50000Desc=模組提供信用卡網上支付頁面與出納
 Module50100Name=銷售點
@@ -527,7 +534,7 @@ Module50200Desc=模組提供信用卡與Paypal網上支付頁面
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=設定值已儲存
 BackToModuleList=返回模組列表
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=常駐左搜尋列表菜單
 DefaultLanguage=預設語言使用（語言代碼）
 EnableMultilangInterface=啟用多語言界面
 EnableShowLogo=在菜單上顯示的標誌
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=您的系統已成功更新
 CompanyInfo=公司/基本資訊
 CompanyIds=公司/基本ID
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index eaa4f1ff00d..65870ed6994 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=受影響的行動
 ActionsDoneBy=做的動作
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= 我所有的行動/任務
 AllActions= 所有/任務行動
 ViewList=查看列表
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index 0550676f5a9..90a7651497b 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/zh_TW/contracts.lang b/htdocs/langs/zh_TW/contracts.lang
index 65b0b67e7fa..d513a4f4b35 100644
--- a/htdocs/langs/zh_TW/contracts.lang
+++ b/htdocs/langs/zh_TW/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=名單合同線運行
 ListOfRunningServices=運行服務的列表
 NotActivatedServices=不活躍的服務（除驗證合同）
 BoardNotActivatedServices=服務激活驗證合同之間
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=上次%s的激活服務
 LastModifiedServices=最後%S修飾服務
 EditServiceLine=編輯服務項目
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=銷售代表簽訂合同
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 8562dccaf35..4fab2ab4b90 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=錯誤!需要提供供應商代號
 ErrorSupplierCodeAlreadyUsed=錯誤!供應商代號已被使用
 ErrorBadParameters=錯誤的參數
 ErrorBadValueForParameter=錯誤值“參數不正確”%s %s'“
-ErrorBadImageFormat=圖像文件有不支持的格式
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=值“%s”有錯誤的日期格式
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=無法寫在目錄%s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=<b>如何正確</b>使用手機與登錄<b>%</b>找不
 ErrorLoginHasNoEmail=這位用戶沒有電子郵件地址。進程中止。
 ErrorBadValueForCode=代碼有錯誤的值類型。再次嘗試以新的價值...
 ErrorBothFieldCantBeNegative=領域的%s及%s可以不消極
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=<b>%s</b>用來執行Web服務器用戶帳戶沒有該權限
 ErrorNoActivatedBarcode=沒有激活的條碼類型
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index ea9fd8a62b4..5caf80e18e8 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -8,7 +8,7 @@ Members=成員
 MemberAccount=會員登錄
 ShowMember=出示會員卡
 UserNotLinkedToMember=用戶成員沒有聯系
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=成員的機票
 FundationMembers=基金會成員
 Attributs=屬性
@@ -85,8 +85,7 @@ SubscriptionLateShort=晚
 SubscriptionNotReceivedShort=從未收到
 ListOfSubscriptions=訂閱名單
 SendCardByMail=發送卡
-AddMember=加入會員
-MemberType=會員類型
+AddMember=Create member
 NoTypeDefinedGoToSetup=任何成員類型定義。前往設置 - 會員類型
 NewMemberType=新會員類型
 WelcomeEMail=歡迎電子郵件
@@ -126,12 +125,12 @@ Date=日期
 DateAndTime=日期和時間
 PublicMemberCard=市民卡會員
 MemberNotOrNoMoreExpectedToSubscribe=會員沒有或沒有更多的預期訂閱
-AddSubscription=添加訂閱
+AddSubscription=Create subscription
 ShowSubscription=顯示訂閱
 MemberModifiedInDolibarr=會員修改Dolibarr
 SendAnEMailToMember=向會員發送信息的電子郵件
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=電郵題目會員autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=電子郵箱會員autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=電郵題目會員驗證
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=電郵題目會員resiliation
 DescADHERENT_MAIL_RESIL=電子郵箱會員resiliation
 DescADHERENT_MAIL_FROM=發件人的電子郵件自動電子郵件
 DescADHERENT_ETIQUETTE_TYPE=標簽的格式頁
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=卡的格式頁
 DescADHERENT_CARD_HEADER_TEXT=文字印在會員卡頂部
 DescADHERENT_CARD_TEXT=文字印在（會員卡，左對齊）
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=無關聯的第三方該會員
 ThirdPartyDolibarr=Dolibarr第三者
 MembersAndSubscriptions= 議員和Subscriptions
 MoreActions=補充行動記錄
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=創建一個直接交易記錄的帳戶
 MoreActionBankViaInvoice=建立發票和付款帳戶
 MoreActionInvoiceOnly=創建一個沒有付款發票
@@ -171,6 +170,8 @@ LastSubscriptionAmount=最後認購金額
 MembersStatisticsByCountries=成員由國家統計
 MembersStatisticsByState=成員由州/省的統計信息
 MembersStatisticsByTown=成員由鎮統計
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=成員數
 NoValidatedMemberYet=沒有驗證的成員發現
 MembersByCountryDesc=該屏幕顯示您成員國的統計數字。然而，圖形取決於谷歌在線圖服務，可只有一個互聯網連接工作。
@@ -196,9 +197,10 @@ Collectivités=組織
 Particuliers=個人
 Entreprises=公司
 DOLIBARRFOUNDATION_PAYMENT_FORM=為了使您的訂閱使用銀行轉帳支付，請參閱頁<a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> 。 <br>使用信用卡或PayPal支付，點擊此頁底部的按鈕。 <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index d6b4c7fc7d0..e7406e70399 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=如果產品是一種有期限的服務，請指定服務
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=多種價格的數量
 MultiPriceLevelsName=價格分類
-AssociatedProductsAbility=啟用子階產品功能
-AssociatedProducts=相關聯的產品
-AssociatedProductsNumber=此產品需要其他子產品(下階)的數量
-ParentProductsNumber=影響上階(母)產品的數量
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=編輯關聯性
 Translation=產品描述翻譯
 KeywordFilter=關鍵字過濾
@@ -132,7 +132,7 @@ AddDel=新增或刪除
 Quantity=數量
 NoMatchFound=沒有找到匹配
 ProductAssociationList=以下為下階子產品(服務)清單，及所需下階數量和庫存數量
-ProductParentList=此產品(服務)是用來組成以下產品(服務)的
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=選定的產品之一，是家長與當前的產品
 DeleteProduct=刪除一個產品/服務
 ConfirmDeleteProduct=你確定要刪除這個產品/服務？
@@ -179,7 +179,7 @@ CloneProduct=複製產品/服務
 ConfirmCloneProduct=你確定要複製一份 <b>%s</b> 產品/服務單嗎 ？
 CloneContentProduct=複製此產品/服務的所有資訊內容
 ClonePricesProduct=複製此產品/服務的價格資訊
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=該產品是用於
 NewRefForClone=新的產品/服務編號
 CustomerPrices=銷售價格
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 3f4b27b3793..3fa7e273657 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=這種觀點提出的所有項目和任務（您的用戶權限批準
 Myprojects=我的項目
 ProjectsArea=項目領域
 NewProject=新項目
-AddProject=新增項目
+AddProject=Create project
 DeleteAProject=刪除一個項目
 DeleteATask=刪除任務
 ConfirmDeleteAProject=你確定要刪除此項目嗎？
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=新的時間
 MyTimeSpent=我的時間花
 MyTasks=我的任務
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=新任務
-AddTask=新增任務
+AddTask=Create task
 AddDuration=添加時間
 Activity=活動
 Activities=任務/活動
diff --git a/htdocs/langs/zh_TW/resource.lang b/htdocs/langs/zh_TW/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/zh_TW/resource.lang
+++ b/htdocs/langs/zh_TW/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index 40e93a15a5a..06d3f9d694c 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=信貸
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=顯示撤櫃
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=然而，如果發票已至少有一個撤出支付尚未處理的，它不會被設置為支付最高允許管理撤出之前。
-DoStandingOrdersBeforePayments=這個標簽允許你為一個固定的訂單要求。一旦完成，你可以鍵入付款，收發票。
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=由銀行支付的長期訂單%s
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 072c0bb5546..018b7cfbdaf 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1188,7 +1188,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
             {
             	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.js'.($ext?'?'.$ext:'').'" />'."\n";
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
             // jQuery jMobile
             if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || (! empty($conf->dol_use_jmobile) && $conf->dol_use_jmobile > 0))
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 46cf4245b60..d811f898c0b 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -131,12 +131,12 @@ if ($id > 0 || ! empty($ref))
         if ($user->rights->facture->lire) {
             $sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,";
             $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht,";
-            $sql.= " f.datef, f.paye, f.fk_statut as statut,";
+            $sql.= " f.datef, f.paye, f.fk_statut as statut, f.type,";
             if (!$user->rights->societe->client->voir && !$socid) $sql.= " sc.fk_soc, sc.fk_user,";
-            $sql.= " sum(d.total_ht) as selling_price,";
-            $sql.= $db->ifsql('f.type =2','sum(d.qty *-1)','sum(d.qty)')." as qty,";
-            $sql.= $db->ifsql('f.type =2','sum(d.qty * d.buy_price_ht *-1)','sum(d.qty * d.buy_price_ht)')." as buying_price,";
-            $sql.= $db->ifsql('f.type =2','sum(-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty)))','sum(d.total_ht - (d.buy_price_ht * d.qty))')." as marge" ;
+            $sql.= " sum(d.total_ht) as selling_price,";							// may be negative or positive
+            $sql.= " sum(d.qty) as qty,";
+            $sql.= " sum(d.qty * d.buy_price_ht) as buying_price,";					// always positive
+            $sql.= " sum(abs(d.total_ht) - (d.buy_price_ht * d.qty)) as marge" ;	// always positive
             $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
             $sql.= ", ".MAIN_DB_PREFIX."facture as f";
             $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
@@ -150,9 +150,9 @@ if ($id > 0 || ! empty($ref))
             if (! empty($socid)) $sql.= " AND f.fk_soc = $socid";
             $sql .= " AND d.buy_price_ht IS NOT NULL";
             if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
-            $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.facnumber, f.total, f.datef, f.paye, f.fk_statut";
+            $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.facnumber, f.total, f.datef, f.paye, f.fk_statut, f.type";
             if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user";
-            $sql.= " ORDER BY ".$sortfield." ".$sortorder;
+            $sql.= $db->order($sortfield,$sortorder);
             // TODO: calculate total to display then restore pagination
             //$sql.= $db->plimit($conf->liste_limit +1, $offset);
             dol_syslog('margin:tabs:productMargins.php', LOG_DEBUG);
@@ -192,13 +192,8 @@ if ($id > 0 || ! empty($ref))
                         $objp = $db->fetch_object($result);
                         $var=!$var;
 
-                        if ($objp->marge < 0) {
-                            $marginRate = ($objp->buying_price != 0)?-1*(100 * $objp->marge / $objp->buying_price):'' ;
-                            $markRate = ($objp->selling_price != 0)?-1*(100 * $objp->marge / $objp->selling_price):'' ;
-                        } else {
-                            $marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
-                            $markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
-                        }
+						$marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
+						$markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
 
                         print '<tr '.$bc[$var].'>';
                         print '<td>';
@@ -208,17 +203,17 @@ if ($id > 0 || ! empty($ref))
                         print "</td>\n";
                         print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
                         print "<td>".$objp->code_client."</td>\n";
-					print "<td align=\"center\">";
-					print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-					print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
-					print "<td align=\"right\">".price($objp->buying_price, null, null, null, null, $rounding)."</td>\n";
-					print "<td align=\"right\">".price($objp->qty, null, null, null, null, $rounding)."</td>\n";
-					print "<td align=\"right\">".price($objp->marge, null, null, null, null, $rounding)."</td>\n";
-					if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-						print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-					if (! empty($conf->global->DISPLAY_MARK_RATES))
-						print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
-					print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
+						print "<td align=\"center\">";
+						print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+						print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
+						print "<td align=\"right\">".price($objp->buying_price, null, null, null, null, $rounding)."</td>\n";
+						print "<td align=\"right\">".price($objp->qty, null, null, null, null, $rounding)."</td>\n";
+						print "<td align=\"right\">".price($objp->marge, null, null, null, null, $rounding)."</td>\n";
+						if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+							print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+						if (! empty($conf->global->DISPLAY_MARK_RATES))
+							print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+						print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
                         print "</tr>\n";
                         $i++;
                         $cumul_achat += $objp->buying_price;
@@ -230,10 +225,13 @@ if ($id > 0 || ! empty($ref))
                 // affichage totaux marges
                 $var=!$var;
                 $totalMargin = $cumul_vente - $cumul_achat;
-                if ($totalMargin < 0) {
+                if ($totalMargin < 0)
+                {
                     $marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
                     $markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
-                } else {
+                }
+                else
+              {
                     $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
                     $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
                 }
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 144246f154a..457d55e81f0 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -143,7 +143,7 @@ if ($socid > 0)
 		$sql.= " AND d.buy_price_ht IS NOT NULL";
 		if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
 		$sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.facnumber, f.total, f.datef, f.paye, f.fk_statut, f.type";
-		$sql.= " ORDER BY ".$sortfield." ".$sortorder;
+		$sql.= $db->order($sortfield,$sortorder);
 		// TODO: calculate total to display then restore pagination
 		//$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
@@ -206,7 +206,7 @@ if ($socid > 0)
 					print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
 					print "</tr>\n";
 					$i++;
-					$cumul_achat += (($objp->type == 2 ? -1 : 1) * $objp->buying_price);
+					$cumul_achat += $objp->buying_price;
 					$cumul_vente += $objp->selling_price;
 				}
 			}
@@ -255,8 +255,8 @@ $db->close();
 ?>
 <script type="text/javascript">
 $(document).ready(function() {
-	$("#totalMargin").html("<?php echo price($totalMargin); ?>");
-	$("#marginRate").html("<?php echo (($marginRate === '')?'n/a':price($marginRate)."%"); ?>");
-	$("#markRate").html("<?php echo (($markRate === '')?'n/a':price($markRate)."%"); ?>");
+	$("#totalMargin").html("<?php echo price($totalMargin, null, null, null, null, $rounding); ?>");
+	$("#marginRate").html("<?php echo (($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%"); ?>");
+	$("#markRate").html("<?php echo (($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%"); ?>");
 });
 </script>
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 7ecc390516d..2d0c1cca468 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -44,13 +44,13 @@ $value = GETPOST('value','alpha');
 
 // Pricing Rules
 $select_pricing_rules=array(
-'PRODUCT_PRICE_UNIQ'=>$langs->trans('PriceCatalogue'),			// Unique price
-'PRODUIT_MULTIPRICES'=>$langs->trans('MultiPricesAbility'),		// Several prices according to a customer level
-'PRODUIT_CUSTOMER_PRICES'=>$langs->trans('PriceByCustomer')		// Different price for each customer
+'PRODUCT_PRICE_UNIQ'=>$langs->trans('PriceCatalogue'),				// Unique price
+'PRODUIT_MULTIPRICES'=>$langs->trans('MultiPricesAbility'),			// Several prices according to a customer level
+'PRODUIT_CUSTOMER_PRICES'=>$langs->trans('PriceByCustomer'),		// Different price for each customer
 );
-if ($conf->global->MAIN_FEATURES_LEVEL==2)
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
-	$select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity');
+	$select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity');	// TODO If this is enabled, price must be hidden when price by qty is enabled, also price for quantity must be used when adding product into order/propal/invoice
 	$select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity');
 }
 
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 61a1c3bff73..7dda37b6f2c 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -58,32 +58,32 @@ $price_by_qty_rowid = GETPOST('pbq', 'int');
 dol_syslog(join(',', $_GET));
 // print_r($_GET);
 
-if (! empty($action) && $action == 'fetch' && ! empty($id)) {
+if (! empty($action) && $action == 'fetch' && ! empty($id))
+{
 	require DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-	
+
 	$outjson = array();
-	
+
 	$object = new Product($db);
 	$ret = $object->fetch($id);
-	if ($ret > 0) {
+	if ($ret > 0)
+	{
 		$outref = $object->ref;
 		$outlabel = $object->label;
 		$outdesc = $object->description;
 		$outtype = $object->type;
 		$outqty = 1;
 		$outdiscount = 0;
-		
+
 		$found = false;
-		
+
 		// Price by qty
-		if (! empty($price_by_qty_rowid) && $price_by_qty_rowid >= 1 && (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))) 		// If we need a
-		                                                                                                                         // particular price related
-		                                                                                                                         // to qty
+		if (! empty($price_by_qty_rowid) && $price_by_qty_rowid >= 1 && (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))) 		// If we need a particular price related to qty
 		{
 			$sql = "SELECT price, unitprice, quantity, remise_percent";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "product_price_by_qty ";
 			$sql .= " WHERE rowid=" . $price_by_qty_rowid . "";
-			
+
 			$result = $db->query($sql);
 			if ($result) {
 				$objp = $db->fetch_object($result);
@@ -98,7 +98,7 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) {
 				}
 			}
 		}
-		
+
 		// Multiprice
 		if (! $found && isset($price_level) && $price_level >= 1 && (! empty($conf->global->PRODUIT_MULTIPRICES))) 		// If we need a particular price
 		                                                                                                           // level (from 1 to 6)
@@ -110,7 +110,7 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) {
 			$sql .= " AND price_level=" . $price_level;
 			$sql .= " ORDER BY date_price";
 			$sql .= " DESC LIMIT 1";
-			
+
 			$result = $db->query($sql);
 			if ($result) {
 				$objp = $db->fetch_object($result);
@@ -123,16 +123,16 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) {
 				}
 			}
 		}
-		
+
 		// Price by customer
 		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && ! empty($socid)) {
-			
+
 			require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
-			
+
 			$prodcustprice = new Productcustomerprice($db);
-			
+
 			$filter = array('t.fk_product' => $object->id,'t.fk_soc' => $socid);
-			
+
 			$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
 			if ($result) {
 				if (count($prodcustprice->lines) > 0) {
@@ -144,48 +144,48 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) {
 				}
 			}
 		}
-		
+
 		if (! $found) {
 			$outprice_ht = price($object->price);
 			$outprice_ttc = price($object->price_ttc);
 			$outpricebasetype = $object->price_base_type;
 			$outtva_tx = $object->tva_tx;
 		}
-		
+
 		$outjson = array('ref' => $outref,'label' => $outlabel,'desc' => $outdesc,'type' => $outtype,'price_ht' => $outprice_ht,'price_ttc' => $outprice_ttc,'pricebasetype' => $outpricebasetype,'tva_tx' => $outtva_tx,'qty' => $outqty,'discount' => $outdiscount);
 	}
-	
+
 	echo json_encode($outjson);
 } else {
 	require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
-	
+
 	$langs->load("products");
 	$langs->load("main");
-	
+
 	top_httphead();
-	
+
 	if (empty($htmlname))
 		return;
-	
+
 	$match = preg_grep('/(' . $htmlname . '[0-9]+)/', array_keys($_GET));
 	sort($match);
 	$idprod = (! empty($match [0]) ? $match [0] : '');
-	
+
 	if (! GETPOST($htmlname) && ! GETPOST($idprod))
 		return;
-		
+
 		// When used from jQuery, the search term is added as GET param "term".
 	$searchkey = (GETPOST($idprod) ? GETPOST($idprod) : (GETPOST($htmlname) ? GETPOST($htmlname) : ''));
-	
+
 	$form = new Form($db);
 	if (empty($mode) || $mode == 1) {
 		$arrayresult = $form->select_produits_list("", $htmlname, $type, "", $price_level, $searchkey, $status, 2, $outjson, $socid);
 	} elseif ($mode == 2) {
 		$arrayresult = $form->select_produits_fournisseurs_list($socid, "", $htmlname, $type, "", $searchkey, $status, $outjson, $socid);
 	}
-	
+
 	$db->close();
-	
+
 	if ($outjson)
 		print json_encode($arrayresult);
 }
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 057aecc6847..50ed04a29df 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -839,7 +839,7 @@ else
         print '<tr>';
         $tmpcode='';
 		if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type);
-        print '<td class="fieldrequired" width="20%">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" size="20" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
+        print '<td class="fieldrequired" width="20%">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" size="32" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
         if ($_error)
         {
             print $langs->trans("RefAlreadyExists");
@@ -1083,7 +1083,7 @@ else
             print '<table class="border allwidth">';
 
             // Ref
-            print '<tr><td width="20%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" size="20" maxlength="128" value="'.dol_escape_htmltag($object->ref).'"></td></tr>';
+            print '<tr><td width="20%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" size="32" maxlength="128" value="'.dol_escape_htmltag($object->ref).'"></td></tr>';
 
             // Label
             print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="libelle" size="40" maxlength="255" value="'.dol_escape_htmltag($object->libelle).'"></td></tr>';
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index bfd0b91fc5f..bb4690224e8 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -55,11 +55,19 @@ $object = new Product($db);
 
 $error=0;
 
+
 /*
  * Actions
  */
 
-if ($action == 'update_price' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+if ($action == 'update_price' && GETPOST("cancel"))
+{
+
+	$action='';
+}
+
+if ($action == 'update_price' && ! GETPOST("cancel") && ($user->rights->produit->creer || $user->rights->service->creer))
+{
 	$result = $object->fetch($id);
 
 	$error=0;
@@ -341,9 +349,9 @@ if ($isphoto) {
 print '</tr>';
 
 // MultiPrix
-if (! empty($conf->global->PRODUIT_MULTIPRICES)) 
+if (! empty($conf->global->PRODUIT_MULTIPRICES))
 {
-	if (! empty($socid)) 
+	if (! empty($socid))
 	{
 		$soc = new Societe($db);
 		$soc->id = $socid;
@@ -366,7 +374,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 
 		// Prix mini
 		print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>';
-		if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') 
+		if ($object->multiprices_base_type["$soc->price_level"] == 'TTC')
 		{
 			print price($object->multiprices_min_ttc["$soc->price_level"]) . ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]);
 		} else {
@@ -411,10 +419,10 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 			// Prix mini
 			print '<tr><td>' . $langs->trans("MinPrice") . ' ' . $i . '</td><td>';
 			if (empty($object->multiprices_base_type["$i"])) $object->multiprices_base_type["$i"]="HT";
-			if ($object->multiprices_base_type["$i"] == 'TTC') 
+			if ($object->multiprices_base_type["$i"] == 'TTC')
 			{
 				print price($object->multiprices_min_ttc["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]);
-			} 
+			}
 			else
 			{
 				print price($object->multiprices_min["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]);
@@ -422,12 +430,13 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 			print '</td></tr>';
 
 			// Price by quantity
-			if ($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) {
+			if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+			{
 				print '<tr><td>' . $langs->trans("PriceByQuantity") . ' ' . $i;
 				print '</td><td>';
 
 				if ($object->prices_by_qty [$i] == 1) {
-					print '<table width="50%" class="noborder">';
+					print '<table width="50%" class="border" summary="List of quantities">';
 
 					print '<tr class="liste_titre">';
 					print '<td>' . $langs->trans("PriceByQuantityRange") . ' ' . $i . '</td>';
@@ -437,30 +446,30 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 					print '<td>&nbsp;</td>';
 					print '</tr>';
 					foreach ($object->prices_by_qty_list [$i] as $ii => $prices) {
-						if ($action == 'edit_price_by_qty' && $rowid == $prices ['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+						if ($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) {
 							print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 							print '<input type="hidden" name="action" value="update_price_by_qty">';
-							print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id [$i] . '">';
-							print '<input type="hidden" value="' . $prices ['rowid'] . '" name="rowid">';
+							print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id[$i] . '">';
+							print '<input type="hidden" value="' . $prices['rowid'] . '" name="rowid">';
 							print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
-							print '<td><input size="5" type="text" value="' . $prices ['quantity'] . '" name="quantity"></td>';
-							print '<td align="right" colspan="2"><input size="10" type="text" value="' . $prices ['price'] . '" name="price">&nbsp;' . $object->price_base_type . '</td>';
+							print '<td><input size="5" type="text" value="' . $prices['quantity'] . '" name="quantity"></td>';
+							print '<td align="right" colspan="2"><input size="10" type="text" value="' . price2num($prices['price'], 'MU') . '" name="price">&nbsp;' . $object->price_base_type . '</td>';
 							// print '<td align="right">&nbsp;</td>';
-							print '<td align="right"><input size="5" type="text" value="' . $prices ['remise_percent'] . '" name="remise_percent">&nbsp;%</td>';
+							print '<td align="right"><input size="5" type="text" value="' . $prices['remise_percent'] . '" name="remise_percent">&nbsp;%</td>';
 							print '<td align="center"><input type="submit" value="' . $langs->trans("Modify") . '" class="button"></td>';
 							print '</tr>';
 							print '</form>';
 						} else {
 							print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
 							print '<td>' . $prices ['quantity'] . '</td>';
-							print '<td align="right">' . price($prices ['price']) . '</td>';
-							print '<td align="right">' . price($prices ['unitprice']) . '</td>';
-							print '<td align="right">' . price($prices ['remise_percent']) . ' %</td>';
+							print '<td align="right">' . price($prices['price']) . '</td>';
+							print '<td align="right">' . price($prices['unitprice']) . '</td>';
+							print '<td align="right">' . price($prices['remise_percent']) . ' %</td>';
 							print '<td align="center">';
 							if (($user->rights->produit->creer || $user->rights->service->creer)) {
-								print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=edit_price_by_qty&amp;rowid=' . $prices ["rowid"] . '">';
+								print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=edit_price_by_qty&amp;rowid=' . $prices["rowid"] . '">';
 								print img_edit() . '</a>';
-								print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete_price_by_qty&amp;rowid=' . $prices ["rowid"] . '">';
+								print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete_price_by_qty&amp;rowid=' . $prices["rowid"] . '">';
 								print img_delete() . '</a>';
 							} else {
 								print '&nbsp;';
@@ -472,7 +481,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 					if ($action != 'edit_price_by_qty' && ($user->rights->produit->creer || $user->rights->service->creer)) {
 						print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 						print '<input type="hidden" name="action" value="update_price_by_qty">';
-						print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id [$i] . '">';
+						print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id[$i] . '">';
 						print '<input type="hidden" value="0" name="rowid">';
 						print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
 						print '<td><input size="5" type="text" value="1" name="quantity"></td>';
@@ -516,7 +525,8 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 	print '</td></tr>';
 
 	// Price by quantity
-	if ($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) {
+	if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+	{
 		print '<tr><td>' . $langs->trans("PriceByQuantity");
 		if ($object->prices_by_qty [0] == 0) {
 			print '&nbsp;<a href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=activate_price_by_qty&level=1">' . $langs->trans("Activate");
@@ -524,7 +534,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 		print '</td><td>';
 
 		if ($object->prices_by_qty [0] == 1) {
-			print '<table width="50%" class="noborder">';
+			print '<table width="50%" class="border" summary="List of quantities">';
 			print '<tr class="liste_titre">';
 			print '<td>' . $langs->trans("PriceByQuantityRange") . '</td>';
 			print '<td align="right">' . $langs->trans("HT") . '</td>';
@@ -532,31 +542,33 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 			print '<td align="right">' . $langs->trans("Discount") . '</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
-			foreach ($object->prices_by_qty_list [0] as $ii => $prices) {
-				if ($action == 'edit_price_by_qty' && $rowid == $prices ['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+			foreach ($object->prices_by_qty_list [0] as $ii => $prices)
+			{
+				if ($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer))
+				{
 					print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 					print '<input type="hidden" name="action" value="update_price_by_qty">';
-					print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id [0] . '">';
-					print '<input type="hidden" value="' . $prices ['rowid'] . '" name="rowid">';
+					print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id[0] . '">';
+					print '<input type="hidden" value="' . $prices['rowid'] . '" name="rowid">';
 					print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
-					print '<td><input size="5" type="text" value="' . $prices ['quantity'] . '" name="quantity"></td>';
-					print '<td align="right" colspan="2"><input size="10" type="text" value="' . $prices ['price'] . '" name="price">&nbsp;' . $object->price_base_type . '</td>';
+					print '<td><input size="5" type="text" value="' . $prices['quantity'] . '" name="quantity"></td>';
+					print '<td align="right" colspan="2"><input size="10" type="text" value="' . price2num($prices['price'], 'MU') . '" name="price">&nbsp;' . $object->price_base_type . '</td>';
 					// print '<td align="right">&nbsp;</td>';
-					print '<td align="right"><input size="5" type="text" value="' . $prices ['remise_percent'] . '" name="remise_percent">&nbsp;%</td>';
+					print '<td align="right"><input size="5" type="text" value="' . $prices['remise_percent'] . '" name="remise_percent">&nbsp;%</td>';
 					print '<td align="center"><input type="submit" value="' . $langs->trans("Modify") . '" class="button"></td>';
 					print '</tr>';
 					print '</form>';
 				} else {
 					print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
-					print '<td>' . $prices ['quantity'] . '</td>';
-					print '<td align="right">' . price($prices ['price']) . '</td>';
-					print '<td align="right">' . price($prices ['unitprice']) . '</td>';
-					print '<td align="right">' . price($prices ['remise_percent']) . ' %</td>';
+					print '<td>' . $prices['quantity'] . '</td>';
+					print '<td align="right">' . price($prices['price']) . '</td>';
+					print '<td align="right">' . price($prices['unitprice']) . '</td>';
+					print '<td align="right">' . price($prices['remise_percent']) . ' %</td>';
 					print '<td align="center">';
 					if (($user->rights->produit->creer || $user->rights->service->creer)) {
-						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=edit_price_by_qty&amp;rowid=' . $prices ["rowid"] . '">';
+						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=edit_price_by_qty&amp;rowid=' . $prices["rowid"] . '">';
 						print img_edit() . '</a>';
-						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete_price_by_qty&amp;rowid=' . $prices ["rowid"] . '">';
+						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete_price_by_qty&amp;rowid=' . $prices["rowid"] . '">';
 						print img_delete() . '</a>';
 					} else {
 						print '&nbsp;';
@@ -798,7 +810,8 @@ if ($result) {
 				print '<td align="center">' . $objp->price_level . "</td>";
 			}
 			// Price by quantity
-			if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+			if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+			{
 				$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
 				print '<td align="center">' . $langs->trans($type) . "</td>";
 			}
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 6fd6d834497..b31305b448b 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -73,13 +73,13 @@ if ($action == 'add' && $user->rights->stock->creer)
 	$object->town        = GETPOST("town");
 	$object->country_id  = GETPOST("country_id");
 
-	if (! empty($object->libelle)) 
+	if (! empty($object->libelle))
 	{
 		$id = $object->create($user);
 		if ($id > 0)
 		{
 			setEventMessage($langs->trans("RecordSaved"));
-			
+
 			if (! empty($backtopage))
 			{
 				header("Location: ".$backtopage);
@@ -180,9 +180,9 @@ if ($action == 'create')
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	
+
 	dol_fiche_head();
-	
+
 	print '<table class="border" width="100%">';
 
 	// Ref
@@ -225,7 +225,7 @@ if ($action == 'create')
 	print '</table>';
 
 	dol_fiche_end();
-	
+
 	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></div>';
 
 	print '</form>';
@@ -445,10 +445,10 @@ else
 					$totalunit+=$objp->value;
 
                     // Price buy PMP
-					print '<td align="right">'.price(price2num($objp->pmp,'MU')).'</td>';
+					print '<td align="right">'.price(price2num($objp->ppmp,'MU')).'</td>';
                     // Total PMP
-					print '<td align="right">'.price(price2num($objp->pmp*$objp->value,'MT')).'</td>';
-					$totalvalue+=price2num($objp->pmp*$objp->value,'MT');
+					print '<td align="right">'.price(price2num($objp->ppmp*$objp->value,'MT')).'</td>';
+					$totalvalue+=price2num($objp->ppmp*$objp->value,'MT');
 
                     // Price sell min
                     if (empty($conf->global->PRODUIT_MULTIPRICES))
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 9e508f41461..24ca13da355 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -163,21 +163,40 @@ class MouvementStock extends CommonObject
 			{
 				$newpmp=0;
 				$newpmpwarehouse=0;
-				// Note: PMP is calculated on stock input only (type = 0 or 3). If type == 0 or 3, qty should be > 0.
+				// Note: PMP is calculated on stock input only (type of movement = 0 or 3). If type == 0 or 3, qty should be > 0.
 				// Note: Price should always be >0 or 0. PMP should be always >0 (calculated on input)
 				if (($type == 0 || $type == 3) && $price > 0)
 				{
+					// If we will change PMP for the warehouse we edit and the product, we must first check/clean that PMP is defined
+					// on every stock entry with old value (so global updated value will match recalculated value from product_stock)
+					$sql = "UPDATE ".MAIN_DB_PREFIX."product_stock SET pmp = ".($oldpmp?$oldpmp:'0');
+					$sql.= " WHERE pmp = 0 AND fk_product = ".$fk_product;
+					dol_syslog(get_class($this)."::_create", LOG_DEBUG);
+					$resql=$this->db->query($sql);
+					if (! $resql)
+					{
+						$this->error=$this->db->lasterror();
+						$error = -4;
+					}
+					
 					$oldqtytouse=($oldqty >= 0?$oldqty:0);
 					// We make a test on oldpmp>0 to avoid to use normal rule on old data with no pmp field defined
 					if ($oldpmp > 0) $newpmp=price2num((($oldqtytouse * $oldpmp) + ($qty * $price)) / ($oldqtytouse + $qty), 'MU');
-					else $newpmp=$price;
-					$oldqtywarehousetouse=($oldqtywarehouse >= 0?$oldqtywarehouse:0);
+					else 
+					{
+						$newpmp=$price; // For this product, PMP was not yet set. We will set it later.
+					}
+					$oldqtywarehousetouse=$oldqtywarehouse;
 					if ($oldpmpwarehouse > 0) $newpmpwarehouse=price2num((($oldqtywarehousetouse * $oldpmpwarehouse) + ($qty * $price)) / ($oldqtywarehousetouse + $qty), 'MU');
 					else $newpmpwarehouse=$price;
 
-					//print "oldqtytouse=".$oldqtytouse." oldpmp=".$oldpmp." oldqtywarehousetouse=".$oldqtywarehousetouse." oldpmpwarehouse=".$oldpmpwarehouse." ";
-					//print "qty=".$qty." newpmp=".$newpmp." newpmpwarehouse=".$newpmpwarehouse;
-					//exit;
+					/*print "oldqtytouse=".$oldqtytouse." oldpmp=".$oldpmp." oldqtywarehousetouse=".$oldqtywarehousetouse." oldpmpwarehouse=".$oldpmpwarehouse." ";
+					print "qty=".$qty." newpmp=".$newpmp." newpmpwarehouse=".$newpmpwarehouse;
+					exit;*/
+				}
+				else if ($type == 1 || $type == 2)
+				{
+					// After a stock decrease, we don't change value of PMP for product.					
 				}
 				else
 				{
@@ -207,14 +226,17 @@ class MouvementStock extends CommonObject
 				{
 					$this->error=$this->db->lasterror();
 					$error = -3;
-				} else if(empty($fk_product_stock)){
+				} 
+				else if(empty($fk_product_stock))
+				{
 					$fk_product_stock = $this->db->last_insert_id(MAIN_DB_PREFIX."product_stock");
 				}
 
-				}
+			}
 
 			// Update detail stock for sell-by date
-			if (($product->hasbatch()) && (! $error) && (! $skip_sellby)){
+			if (($product->hasbatch()) && (! $error) && (! $skip_sellby))
+			{
 				$param_batch=array('fk_product_stock' =>$fk_product_stock, 'eatby'=>$eatby,'sellby'=>$sellby,'batchnumber'=>$batch);
 				$result=$this->_create_batch($param_batch, $qty);
 				if ($result<0) $error++;
@@ -245,7 +267,6 @@ class MouvementStock extends CommonObject
 
 		if ($movestock && ! $error)
 		{
-
 			$this->product_id = $fk_product;
 			$this->entrepot_id = $entrepot_id;
 			$this->qty = $qty;
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index c55466ebdb1..c85c501fa58 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -52,7 +52,7 @@ $year = strftime("%Y",time());
  */
 
 $sql = "SELECT e.rowid, e.label as ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays,";
-$sql.= " SUM(ps.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue";
+$sql.= " SUM(p.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue";
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON e.rowid = ps.fk_entrepot";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 59561da32ea..b7eb79e5ab7 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -122,10 +122,11 @@ if ($action == "correct_stock" && ! $cancel)
 		if (is_numeric(GETPOST("nbpiece")) && $id)
 		{
 			if (empty($product)) {
-			$product = new Product($db);
-			$result=$product->fetch($id);
+				$product = new Product($db);
+				$result=$product->fetch($id);
 			}
-			if ($product->hasbatch()) {
+			if ($product->hasbatch())
+			{
 				$d_eatby=dol_mktime(12, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
 				$d_sellby=dol_mktime(12, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
 				$result=$product->correct_stock_batch(
@@ -139,15 +140,17 @@ if ($action == "correct_stock" && ! $cancel)
 					$d_sellby,
 					GETPOST('batch_number')
 				);		// We do not change value of stock for a correction
-			} else {
-			$result=$product->correct_stock(
-	    		$user,
-	    		GETPOST("id_entrepot"),
-	    		GETPOST("nbpiece"),
-	    		GETPOST("mouvement"),
-	    		GETPOST("label"),
-	    		$priceunit
-			);		// We do not change value of stock for a correction
+			}
+			else
+			{
+				$result=$product->correct_stock(
+		    		$user,
+		    		GETPOST("id_entrepot"),
+		    		GETPOST("nbpiece"),
+		    		GETPOST("mouvement"),
+		    		GETPOST("label"),
+		    		$priceunit
+				);		// We do not change value of stock for a correction
 			}
 
 			if ($result > 0)
@@ -636,9 +639,9 @@ if ($resql)
 		print '<td colspan="4">'.$entrepotstatic->getNomUrl(1).'</td>';
 		print '<td align="right">'.$obj->reel.($obj->reel<0?' '.img_warning():'').'</td>';
 		// PMP
-		print '<td align="right">'.(price2num($obj->pmp)?price2num($obj->pmp,'MU'):'').'</td>'; // Ditto : Show PMP from movement or from product
+		print '<td align="right">'.(price2num($product->pmp)?price2num($product->pmp,'MU'):'').'</td>'; // Ditto : Show PMP from movement or from product
 		// Value purchase
-		print '<td align="right">'.(price2num($obj->pmp)?price(price2num($obj->pmp*$obj->reel,'MT')):'').'</td>'; // Ditto : Show PMP from movement or from product
+		print '<td align="right">'.(price2num($product->pmp)?price(price2num($product->pmp*$obj->reel,'MT')):'').'</td>'; // Ditto : Show PMP from movement or from product
         // Sell price
 		print '<td align="right">';
         if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price,'MU'),1);
@@ -650,15 +653,15 @@ if ($resql)
         else print $langs->trans("Variable");
 		print '</tr>'; ;
 		$total += $obj->reel;
-		if (price2num($obj->pmp)) $totalwithpmp += $obj->reel;
-		$totalvalue = $totalvalue + price2num($obj->pmp*$obj->reel,'MU'); // Ditto : Show PMP from movement or from product
-        $totalvaluesell = $totalvaluesell + price2num($product->price*$obj->reel,'MU'); // Ditto : Show PMP from movement or from product
+		if (price2num($product->pmp)) $totalwithpmp += $obj->reel;
+		$totalvalue = $totalvalue + ($product->pmp*$obj->reel); // Ditto : Show PMP from movement or from product
+        $totalvaluesell = $totalvaluesell + ($product->price*$obj->reel); // Ditto : Show PMP from movement or from product
 		//Batch Detail
-		if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) 
+		if ((! empty($conf->productbatch->enabled)) && $product->hasbatch())
 		{
 			$details=Productbatch::findAll($db,$obj->product_stock_id);
 			if ($details<0) dol_print_error($db);
-			foreach ($details as $pdluo) 
+			foreach ($details as $pdluo)
 			{
 				print "\n".'<tr><td></td>';
 				print '<td align="right">'.$pdluo->batch.'</td>';
@@ -673,14 +676,15 @@ if ($resql)
 	}
 }
 else dol_print_error($db);
+
 print '<tr class="liste_total"><td align="right" class="liste_total" colspan="4">'.$langs->trans("Total").':</td>';
 print '<td class="liste_total" align="right">'.$total.'</td>';
 print '<td class="liste_total" align="right">';
-print ($totalwithpmp?price($totalvalue/$totalwithpmp):'&nbsp;');
+print ($totalwithpmp?price(price2num($totalvalue/$totalwithpmp,'MU')):'&nbsp;');	// This value may have rounding errors
 print '</td>';
 // Value purchase
 print '<td class="liste_total" align="right">';
-print price(price2num($totalvalue,'MT'),1);
+print $totalvalue?price(price2num($totalvalue,'MT'),1):'&nbsp;';
 print '</td>';
 print '<td class="liste_total" align="right">';
 if (empty($conf->global->PRODUIT_MULTI_PRICES)) print ($total?price($totalvaluesell/$total,1):'&nbsp;');
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index ec449f009c7..41ae40a259d 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -479,48 +479,71 @@ class Project extends CommonObject
             }
         }
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_extrafields";
-        $sql.= " WHERE fk_object IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")";
-
-        dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
+        // Delete tasks
+        if (! $error)
         {
-        	$this->errors[] = $this->db->lasterror();
-        	$error++;
+	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_time";
+	        $sql.= " WHERE fk_task IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")";
+
+	        $resql = $this->db->query($sql);
+	        if (!$resql)
+	        {
+	        	$this->errors[] = $this->db->lasterror();
+	        	$error++;
+	        }
         }
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task";
-        $sql.= " WHERE fk_projet=" . $this->id;
-
-        dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
+        if (! $error)
         {
-        	$this->errors[] = $this->db->lasterror();
-        	$error++;
+	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_extrafields";
+	        $sql.= " WHERE fk_object IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")";
+
+	        $resql = $this->db->query($sql);
+	        if (!$resql)
+	        {
+	        	$this->errors[] = $this->db->lasterror();
+	        	$error++;
+	        }
         }
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet";
-        $sql.= " WHERE rowid=" . $this->id;
-
-        dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
+        if (! $error)
         {
-        	$this->errors[] = $this->db->lasterror();
-        	$error++;
+	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task";
+	        $sql.= " WHERE fk_projet=" . $this->id;
+
+	        $resql = $this->db->query($sql);
+	        if (!$resql)
+	        {
+	        	$this->errors[] = $this->db->lasterror();
+	        	$error++;
+	        }
         }
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_extrafields";
-        $sql.= " WHERE fk_object=" . $this->id;
-
-        dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql)
+        // Delete project
+        if (! $error)
         {
-        	$this->errors[] = $this->db->lasterror();
-        	$error++;
+	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet";
+	        $sql.= " WHERE rowid=" . $this->id;
+
+	        $resql = $this->db->query($sql);
+	        if (!$resql)
+	        {
+	        	$this->errors[] = $this->db->lasterror();
+	        	$error++;
+	        }
+        }
+
+        if (! $error)
+        {
+	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_extrafields";
+	        $sql.= " WHERE fk_object=" . $this->id;
+
+	        $resql = $this->db->query($sql);
+	        if (! $resql)
+	        {
+	        	$this->errors[] = $this->db->lasterror();
+	        	$error++;
+	        }
         }
 
         if (empty($error))
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 3e6219afb40..40773879757 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -342,7 +342,7 @@ class Task extends CommonObject
 
 
     /**
-     *	Delete object in database
+     *	Delete task from database
      *
      *	@param	User	$user        	User that delete
      *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
@@ -379,15 +379,32 @@ class Task extends CommonObject
             }
         }
 
-        // Delete rang of line
-        //$this->delRangOfLine($this->id, $this->element);
+        if (! $error)
+        {
+	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
+	        $sql.= " WHERE fk_task=".$this->id;
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task";
-        $sql.= " WHERE rowid=".$this->id;
+	        $resql = $this->db->query($sql);
+	        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        }
 
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (! $error)
+        {
+	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_extrafields";
+	        $sql.= " WHERE fk_object=".$this->id;
+
+	        $resql = $this->db->query($sql);
+	        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        }
+
+        if (! $error)
+        {
+	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task";
+	        $sql.= " WHERE rowid=".$this->id;
+
+	        $resql = $this->db->query($sql);
+	        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        }
 
         if (! $error)
         {
@@ -412,7 +429,7 @@ class Task extends CommonObject
             return -1*$error;
         }
         else
-        {
+		{
 			//Delete associated link file
 	        if ($conf->projet->dir_output)
 	        {
@@ -791,7 +808,7 @@ class Task extends CommonObject
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
             $sql.= " SET duration_effective = duration_effective + '".price2num($this->timespent_duration)."'";
-			$sql.= ", progress = " . $this->progress;
+			if (isset($this->progress)) $sql.= ", progress = " . $this->progress;	// Do not overwrite value if not provided
             $sql.= " WHERE rowid = ".$this->id;
 
             dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
@@ -803,7 +820,7 @@ class Task extends CommonObject
             }
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time";
-            $sql.= " SET thm = (SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->timespent_fk_user.")";
+            $sql.= " SET thm = (SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->timespent_fk_user.")";	// set average hour rate of user
             $sql.= " WHERE rowid = ".$tasktime_id;
 
             dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 68ade0431aa..f57eb6a5b70 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Peter Fontaine       <contact@peterfontaine.fr>
  *
@@ -185,6 +185,7 @@ if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes')
     }
 }
 
+
 /*
  *	View
  */
@@ -317,8 +318,13 @@ if ($socid && $action != 'edit' && $action != "create")
 		print '<div class="warning">'.$langs->trans("RIBControlError").'</div>';
 	}
 
-    print "<br />";
+    print "<br>";
 
+    
+    /*
+     * List of bank accounts
+     */
+    
     print_titre($langs->trans("AllRIB"));
 
     $rib_list = $soc->get_all_rib();
@@ -339,7 +345,7 @@ if ($socid && $action != 'edit' && $action != "create")
 
         foreach ($rib_list as $rib)
         {
-            print "<tr $bc[$var]>";
+            print "<tr ".$bc[$var].">";
             // Label
             print '<td>'.$rib->label.'</td>';
             // Bank name
@@ -382,7 +388,7 @@ if ($socid && $action != 'edit' && $action != "create")
         }
 
         if (count($rib_list) == 0) {
-            print '<tr><td colspan="5" align="center">'.$langs->trans("NoBANRecord").'</td></tr>';
+            print '<tr '.$bc[0].'><td colspan="7" align="center">'.$langs->trans("NoBANRecord").'</td></tr>';
         }
 
         print '</table>';
@@ -458,7 +464,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 
 		if ($val == 'AccountNumber')
 		{
-			print '<td>'.$langs->trans("BankAccountNumber").'</td>';
+			print '<td class="fieldrequired">'.$langs->trans("BankAccountNumber").'</td>';
 			print '<td><input size="18" type="text" class="flat" name="number" value="'.$account->number.'"></td>';
 			print '</tr>';
 		}
@@ -475,10 +481,10 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 	}
 
     // IBAN
-    print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>';
+    print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("IBAN").'</td>';
     print '<td colspan="4"><input size="30" type="text" name="iban" value="'.$account->iban.'"></td></tr>';
 
-    print '<tr><td valign="top">'.$langs->trans("BIC").'</td>';
+    print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("BIC").'</td>';
     print '<td colspan="4"><input size="12" type="text" name="bic" value="'.$account->bic.'"></td></tr>';
 
     print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 2eff193a5fd..656e88ec83c 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -789,10 +789,11 @@ else
 	        print '</label>';
             print ' &nbsp; &nbsp; ';
 	        print '<label for="radioprivate">';
-            print '<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked="checked"':'').'>';
-	        print '&nbsp;';
-            print $langs->trans("Individual");
-            print '<div class="hideonsmartphone">('.$langs->trans("ToCreateContactWithSameName").')</div>';
+            $text ='<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked="checked"':'').'>';
+	        $text.='&nbsp;';
+	        $text.= $langs->trans("Individual");
+	        $htmltext=$langs->trans("ToCreateContactWithSameName");
+	        print $form->textwithpicto($text, $htmltext, 1, 'help', '', 0, 3);
             print '</label>';
             print '</div>';
             print "<br>\n";
@@ -811,6 +812,8 @@ else
         print '<input type="hidden" name="ThirdPartyName" value="'.$langs->trans('ThirdPartyName').'">';
         if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
 
+        dol_fiche_head(null, 'card', '', 0, '');
+
         print '<table class="border" width="100%">';
 
         // Name, firstname
@@ -1053,14 +1056,7 @@ else
             print $form->selectyesno('localtax2assuj_value',0,1);
             print '</td><tr>';
         }
-/*
-        if ($mysoc->country_code=='ES' && $mysoc->localtax2_assuj!="1" && ! empty($conf->fournisseur->enabled) && (GETPOST("type")=='f' || GETPOST("type")=='')  )
-        {
-        	print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
-        	print $form->selectyesno('localtax2assuj_value',0,1);
-        	print '</td><tr>';
-        }
-*/
+
         if (! empty($conf->global->MAIN_MULTILANGS))
         {
             print '<tr><td><label for="default_lang">'.$langs->trans("DefaultLang").'</label></td><td colspan="3" class="maxwidthonsmartphone">'."\n";
@@ -1097,7 +1093,9 @@ else
 
         print '</table>'."\n";
 
-        print '<br><div align="center">';
+        dol_fiche_end();
+
+        print '<div class="center">';
         print '<input type="submit" class="button" value="'.$langs->trans('AddThirdParty').'">';
         print '</div>'."\n";
 
diff --git a/htdocs/support/default.css b/htdocs/support/default.css
index 14454a19245..ea62df52ef0 100644
--- a/htdocs/support/default.css
+++ b/htdocs/support/default.css
@@ -148,3 +148,11 @@ background: #DDDFDD;
 
 table { font-size: 12px; }
 table.login {  border: 1px solid #C0C0C0; background: #F0F0F0; font-size: 12px; }
+
+.inline-block
+{
+	display:inline-block;
+	vertical-align: top;
+	margin: 12px;
+	min-width: 400px;
+}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 89c779785d5..05893a1896c 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -38,6 +38,7 @@ if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 session_cache_limiter(FALSE);
 
 require_once '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined)
 if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSION['dol_login']);
@@ -63,7 +64,7 @@ $theme='eldy';	// Value of theme
 if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
 
 // Define image path files and other constants
-$fontlist='arial,tahoma,verdana,helvetica';    //$fontlist='Verdana,Helvetica,Arial,sans-serif';
+$fontlist='arial,tahoma,verdana,helvetica';    //$fontlist='Helvetica, Verdana, Arial, sans-serif';
 $img_head='';
 $img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
 $dol_hide_topmenu=$conf->dol_hide_topmenu;
@@ -99,15 +100,15 @@ $colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15);
 $colorbacktabcard1=($colred+15).','.($colgreen+16).','.($colblue+17);  // card
 $colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15);
 $colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15);
-$colorbacklineimpair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3));    // line impair
-$colorbacklineimpair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3));    // line impair
-$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));    // line impair
-$colorbacklinepair1='255,255,255';    // line pair
-$colorbacklinepair2='255,255,255';    // line pair
-$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));
+$colorbacklineimpair1='255,255,255';    // line pair
+$colorbacklineimpair2='255,255,255';    // line pair
+$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));
+$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3));    // line impair
+$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3));    // line impair
+$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));    // line impair
 $colorbackbody='#f9f9f9';
 $colortext='40,40,40';
-$fontsize='13';
+$fontsize='12';
 $fontsizesmaller='11';
 
 // Eldy colors
@@ -124,19 +125,15 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
     $conf->global->THEME_ELDY_BACKTABCARD1='234,234,234';
     $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
     $conf->global->THEME_ELDY_BACKBODY='#f9f9f9;';
-    $conf->global->THEME_ELDY_LINEPAIR1='242,242,242';
-    $conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
-    $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
     $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
     $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
     $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252';
+    $conf->global->THEME_ELDY_LINEPAIR1='242,242,242';
+    $conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
+    $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
     $conf->global->THEME_ELDY_TEXT='50,50,130';
-	/*if ($dol_use_jmobile)
-	{
-    	$conf->global->THEME_ELDY_BACKTABCARD1='245,245,245';    // topmenu
-		$conf->global->THEME_ELDY_BACKTABCARD2='245,245,245';
-		$conf->global->THEME_ELDY_BACKTABACTIVE='245,245,245';
-	}*/
+    $conf->global->THEME_ELDY_FONT_SIZE1='12';
+    $conf->global->THEME_ELDY_FONT_SIZE2='11';
 }
 
 $colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
@@ -167,6 +164,14 @@ if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->
 	$colorbacklinepairhover='';
 }
 
+// Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
+$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));
+$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2));
+
+// Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
+$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));
+$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2));
+
 // Set text color to black or white
 $tmppart=explode(',',$colorbackhmenu1);
 $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
@@ -2929,9 +2934,9 @@ div.dolEventError h1, div.dolEventError h2 {
 /*  Select2                                                                       */
 /* ============================================================================== */
 
-.select2-choice, 
-.select2-drop.select2-drop-above.select2-drop-active, 
-.select2-container-active .select2-choice, 
+.select2-choice,
+.select2-drop.select2-drop-above.select2-drop-active,
+.select2-container-active .select2-choice,
 .select2-container-active .select2-choices,
 .select2-dropdown-open.select2-drop-above .select2-choice,
 .select2-dropdown-open.select2-drop-above .select2-choices,
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 2077c7e73e1..e46647f3b69 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -122,6 +122,10 @@ $arrayofcss=array();
 
 llxHeader('',$langs->trans("UserSetup"),'','',0,0,$arrayofjs,$arrayofcss);
 
+
+print '<form name="extsitesconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="id" value="'.$id.'">';
+
 $head=user_prepare_head($fuser);
 
 dol_fiche_head($head, 'extsites', $langs->trans("User"), 0, 'user');
@@ -129,9 +133,6 @@ dol_fiche_head($head, 'extsites', $langs->trans("User"), 0, 'user');
 print $langs->trans("AgendaExtSitesDesc")."<br>\n";
 print "<br>\n";
 
-print '<form name="extsitesconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="id" value="'.$id.'">';
-
 $selectedvalue=$conf->global->AGENDA_DISABLE_EXT;
 if ($selectedvalue==1) $selectedvalue=0; else $selectedvalue=1;
 
@@ -172,7 +173,8 @@ while ($i <= $MAXAGENDA)
 }
 
 print '</table>';
-print '<br>';
+
+dol_fiche_end();
 
 print '<div class="center">';
 print "<input type=\"submit\" id=\"save\" name=\"save\" class=\"button hideifnotset\" value=\"".$langs->trans("Save")."\">";
@@ -180,7 +182,6 @@ print "</div>";
 
 print "</form>\n";
 
-dol_fiche_end();
 
 llxFooter();
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 15a5cf8b8ed..0b0c452020c 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1795,7 +1795,7 @@ class User extends CommonObject
 			$result.=($lien.img_object($langs->trans("ShowUser"),'user').$lienfin);
 			if ($withpicto != 2) $result.=' ';
 		}
-		$result.=$lien.$this->getFullName($langs,'','',16).$lienfin;
+		$result.=$lien.$this->getFullName($langs,'','',24).$lienfin;
 		return $result;
 	}
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index ac1ebc9e1c5..5d0b0ac77e4 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -114,6 +114,10 @@ if ($result)
     print_liste_field_titre($langs->trans("LastName"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_societe",$param,"","",$sortfield,$sortorder);
+    if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))
+    {
+	    print_liste_field_titre($langs->trans("Entity"),$_SERVER['PHP_SELF'],"u.entity",$param,"","",$sortfield,$sortorder);
+    }
     print_liste_field_titre($langs->trans("DateCreation"),$_SERVER['PHP_SELF'],"u.datec",$param,"",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u2.login",$param,"",'align="center"',$sortfield,$sortorder);
@@ -165,9 +169,20 @@ if ($result)
             $companystatic->canvas=$obj->canvas;
             print $companystatic->getNomUrl(1);
         }
-        // Multicompany enabled
-        else if (! empty($conf->multicompany->enabled))
+        else if ($obj->ldap_sid)
         {
+        	print $langs->trans("DomainUser");
+        }
+        else
+       {
+        	print $langs->trans("InternalUser");
+        }
+        print '</td>';
+
+        // Multicompany enabled
+        if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))
+        {
+        	print '<td>';
         	if (! $obj->entity)
         	{
         		print $langs->trans("AllEntities");
@@ -181,16 +196,8 @@ if ($result)
         			print $mc->label;
         		}
         	}
+        	print '</td>';
         }
-        else if ($obj->ldap_sid)
-        {
-        	print $langs->trans("DomainUser");
-        }
-        else
-        {
-        	print $langs->trans("InternalUser");
-        }
-        print '</td>';
 
         // Date creation
         print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datec),"dayhour").'</td>';