Merge remote-tracking branch 'origin/3.7' into develop

Conflicts: htdocs/admin/boxes.php htdocs/comm/action/card.php htdocs/core/class/html.formfile.class.php
2014-12-03 12:54:42 +01:00
parent 07e952a709 79314b7ff8
commit f884f16564
1082 changed files with 15718 additions and 15950 deletions
--- a/.tx/config
+++ b/.tx/config
@@ -248,6 +248,12 @@ source_file = htdocs/langs/en_US/products.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES

+[dolibarr.productbatch]
+file_filter = htdocs/langs/<lang>/productbatch.lang
+source_file = htdocs/langs/en_US/productbatch.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.projects]
 file_filter = htdocs/langs/<lang>/projects.lang
 source_file = htdocs/langs/en_US/projects.lang
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -1,9 +1,22 @@
 #!/usr/bin/php
 <?php
-/*
- * strip_language_file.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/>.
 *
- * (c) 2014 by FromDual GmbH, licensed under GPL v2
+ * -----
 *
 * Compares a secondary language translation file with its primary
 * language file and strips redundant translations.
@@ -12,11 +25,10 @@
 *
 * Usage:
 * cd htdocs/langs
- * ../../dev/translation/strip_language_file.php <primary_lang_dir> <secondary_lang_dir> <languagefile.lang>
+ * ../../dev/translation/strip_language_file.php <primary_lang_dir> <secondary_lang_dir> [file.lang|all]
 *
- * Parameters:
- * 1 - Primary Language
- * 2 - Secondary Language
+ * To rename all .delta files, you can do
+ * for fic in `ls *.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done
 *
 * Rules:
 * secondary string == primary string -> strip
@@ -24,9 +36,6 @@
 * secondary string not in primary -> strip and warning
 * secondary string has no value -> strip and warning
 * secondary string != primary string -> secondary.lang.delta
- *
- * To rename all .delta fils, you can do
- * for fic in `ls *.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done
 */

 /**
@@ -260,6 +269,9 @@ 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";
 }


--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -53,7 +53,7 @@ if ($action == 'update' || $action == 'add')
 	$constname=GETPOST('constname','alpha');
 	$constvalue=(GETPOST('constvalue_'.$constname) ? GETPOST('constvalue_'.$constname) : GETPOST('constvalue'));

-	if (($constname=='ADHERENT_CARD_TYPE' || $constname=='ADHERENT_ETIQUETTE_TYPE') && $constvalue == -1) $constvalue='';
+	if (($constname=='ADHERENT_CARD_TYPE' || $constname=='ADHERENT_ETIQUETTE_TYPE' || $constname=='ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && $constvalue == -1) $constvalue='';
 	if ($constname=='ADHERENT_LOGIN_NOT_REQUIRED') // Invert choice
 	{
 		if ($constvalue) $constvalue=0;
@@ -209,6 +209,23 @@ if ($conf->facture->enabled)
 	}
 	print "</tr>\n";
 	print '</form>';
+
+	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+	{
+		$var=!$var;
+		print '<form action="adherent.php" method="POST">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="constname" value="ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS">';
+		print '<tr '.$bc[$var].'><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
+		print '<td>';
+		print $form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
+		print '</td><td align="center" width="80">';
+		print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+		print '</td>';
+	}
+	print "</tr>\n";
+	print '</form>';
 }

 print '</table>';
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

@@ -315,13 +316,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
                        }
                    }
                    else
-                    {
+					{
                        $error++;
                        $errmsg=$acct->error;
                    }
                }
                else
-                {
+				{
                    $error++;
                    $errmsg=$acct->error;
                }
@@ -385,6 +386,8 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
                {
 	                // Add line to draft invoice
 	                $idprodsubscription=0;
+			        if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) $idprodsubscription = $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS;
+
 	                $vattouse=0;
 	                if (isset($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) && $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS == 'defaultforfoundationcountry')
 	                {
@@ -947,9 +950,10 @@ if ($rowid)
            print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="cotisation" size="6" value="'.GETPOST('cotisation').'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';

            // Label
-            print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
-            print '<td><input name="label" type="text" size="32" value="'.$langs->trans("Subscription").' ';
-            print dol_print_date(($datefrom?$datefrom:time()),"%Y").'" ></td></tr>';
+            print '<tr><td>'.$langs->trans("Label").'</td>';
+            print '<td><input name="label" type="text" size="32" value="';
+            if (empty($conf->global->MEMBER_NO_DEFAULT_LABEL)) print $langs->trans("Subscription").' '.dol_print_date(($datefrom?$datefrom:time()),"%Y");
+            print '"></td></tr>';

            // Complementary action
            if (! empty($conf->banque->enabled) || ! empty($conf->facture->enabled))
@@ -990,7 +994,13 @@ if ($rowid)
                    	print $langs->trans("CreateDolibarrThirdParty");
                    	print '</a>)';
                    }
-                    if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0).'.';
+                    if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0);
+                    if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled)))
+                    {
+                    	$prodtmp=new Product($db);
+                    	$prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+                    	print '. '.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(0));
+                    }
                    print '<br>';
                }
                // Add invoice with payments
@@ -1009,7 +1019,13 @@ if ($rowid)
                    	print $langs->trans("CreateDolibarrThirdParty");
                    	print '</a>)';
                    }
-                    if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0).'.';
+                    if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0);
+                    if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled)))
+                    {
+                    	$prodtmp=new Product($db);
+                    	$prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+                    	print '. '.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(0));
+                    }
                    print '<br>';
                }
                print '</td></tr>';
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1306,7 +1306,7 @@ class Adherent extends CommonObject
                return $rowid;
            }
            else
-            {
+			{
                $this->db->rollback();
                return -2;
            }
--- a/htdocs/adherents/fiche_subscription.php
+++ b/htdocs/adherents/fiche_subscription.php
@@ -180,7 +180,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
 	$head[$h][2] = 'info';
 	$h++;

-	dol_fiche_head($head, 'general', $langs->trans("Subscription"));
+	dol_fiche_head($head, 'general', $langs->trans("Subscription"), 0, 'payment');

 	print "\n";
 	print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="post">';
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -46,7 +46,6 @@ $boxes = array();
 */

 if ($action == 'addconst')
-
 {
    dolibarr_set_const($db, "MAIN_BOXES_MAXLINES",$_POST["MAIN_BOXES_MAXLINES"],'',0,'',$conf->entity);
 }
@@ -54,9 +53,12 @@ if ($action == 'addconst')
 if ($action == 'add') {
    $error=0;
    $db->begin();
-    if (isset($_POST['boxid']) && is_array($_POST['boxid'])) {
-        foreach($_POST['boxid'] as $boxid) {
-            if ($boxid['active']=='on') {
+    if (isset($_POST['boxid']) && is_array($_POST['boxid']))
+    {
+        foreach($_POST['boxid'] as $boxid)
+        {
+            if (is_numeric($boxid['pos']) && $boxid['pos'] >= 0)	// 0=Home, 1=...
+            {
                $pos = $boxid['pos'];

                // Initialize distinct fkuser with all already existing values of fk_user (user that use a personalized view of boxes for page "pos")
@@ -330,7 +332,7 @@ print '<tr class="liste_titre">';
 print '<td width="300">'.$langs->trans("Box").'</td>';
 print '<td>'.$langs->trans("Note").'/'.$langs->trans("Parameters").'</td>';
 print '<td>'.$langs->trans("SourceFile").'</td>';
-print '<td class="center" width="160">'.$langs->trans("ActivateOn").'</td>';
+print '<td width="160" align="center">'.$langs->trans("ActivateOn").'</td>';
 print "</tr>\n";
 $var=true;
 foreach($boxtoadd as $box)
@@ -363,17 +365,16 @@ foreach($boxtoadd as $box)

    // Pour chaque position possible, on affiche un lien d'activation si boite non deja active pour cette position
    print '<td class="center">';
-    print $form->selectarray("boxid[".$box->box_id."][pos]",$pos_name,0,0,0,0,'',1)."\n";
+    print $form->selectarray("boxid[".$box->box_id."][pos]", $pos_name, 0, 1, 0, 0, '', 1)."\n";
    print '<input type="hidden" name="boxid['.$box->box_id.'][value]" value="'.$box->box_id.'">'."\n";
-    print '<input type="checkbox" class="flat" name="boxid['.$box->box_id.'][active]">'."\n";
    print '</td>';

    print '</tr>'."\n";
 }

 print '</table>'."\n";
-print '<br><div class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Activate").'">';
+print '<div class="right">';
+print '<input type="submit" class="button"'.(count($boxtoadd)?'':' disabled="disabled"').' value="'.$langs->trans("Activate").'">';
 print '</div>'."\n";
 print '</form>';
 print "\n".'<!-- End Boxes Available -->'."\n";
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1291,28 +1291,28 @@ if ($id > 0)
 		if (empty($conf->global->AGENDA_DISABLE_BUILDDOC))
 		{
 			print '<div style="clear:both;">&nbsp;</div><div class="fichecenter"><div class="fichehalfleft">';
-	        print '<a name="builddoc"></a>'; // ancre
+            print '<a name="builddoc"></a>'; // ancre

-	        /*
-	         * Documents generes
-	         */
+            /*
+             * Documents generes
+             */

-	        $filedir=$conf->agenda->multidir_output[$conf->entity].'/'.$object->id;
-	        $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
+            $filedir=$conf->agenda->multidir_output[$conf->entity].'/'.$object->id;
+            $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;

-	        $genallowed=$user->rights->agenda->myactions->create;
+            $genallowed=$user->rights->agenda->myactions->create;
 	        $delallowed=$user->rights->agenda->myactions->delete;

-	        $var=true;
+            $var=true;

-	        $somethingshown=$formfile->show_documents('agenda',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,0,0,'','','',$object->default_lang);
+            $somethingshown=$formfile->show_documents('agenda',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,0,0,'','','',$object->default_lang);

 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';


 			print '</div></div></div>';

-	        print '<div style="clear:both;">&nbsp;</div>';
+            print '<div style="clear:both;">&nbsp;</div>';
 	    }
 	}
 }
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -301,12 +301,10 @@ class FormFile
                    $modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
                }
            }
-			
 			else if ($modulepart == 'agenda')
            {
               null;
            }
-			
            else if ($modulepart == 'propal')
            {
                if (is_array($genallowed)) $modellist=$genallowed;
@@ -439,7 +437,7 @@ class FormFile
            }
            else
            {
-            	
+
                // For normalized standard modules
                $file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
                if (file_exists($file))
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -446,7 +446,7 @@ function actions_prepare_head($object)
    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
    $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
    $head[$h][1] = $langs->trans("Documents");
-	if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+	if ($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
    $head[$h][2] = 'documents';
    $h++;

--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -196,8 +196,6 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2406__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/export/', 'Export', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2407__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/index.php', 'New', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2408__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/list.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__);
-- Fiscal year
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled"', __HANDLER__, 'left', 114__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/fiscalyear.php?leftmenu=setup', 'Fiscalyear', 1, 'admin', '', '', 2, 5, __ENTITY__);
 -- Rapports
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2700__+MAX_llx_menu__, 'accountancy', 'ca', 6__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
@@ -208,6 +206,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/sellsjournal.php?leftmenu=ca', 'SellsJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+-- Fiscal year
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled"', __HANDLER__, 'left', 2750__+MAX_llx_menu__, 'home', '', 6__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?leftmenu=setup', 'Fiscalyear', 1, 'main', '$user->rights->accounting->fiscalyear', '', 2, 20, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled"', __HANDLER__, 'left', 2751__+MAX_llx_menu__, 'home', '', 6__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy', 'Chartofaccounts', 1, 'main', '$user->rights->accounting->chartofaccount', '', 2, 21, __ENTITY__);
 -- Check deposit
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__);
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -106,8 +106,8 @@ class modMargin extends DolibarrModules
    			'url'=>'/margin/index.php',
    			'langs'=>'margins',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
    			'position'=>100,
-    			'enabled'=>'$user->rights->margins->liretous',			// Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
-    			'perms'=>'1',			// Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
+    			'enabled'=>'$conf->margin->enabled',			// Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
+    			'perms'=>'$user->rights->margins->liretous',	// Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
    			'target'=>'',
    			'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		$r++;
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -1136,6 +1136,9 @@ ALTER TABLE llx_facture_fourn MODIFY COLUMN ref VARCHAR(255);
 ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_ext VARCHAR(255);
 ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_supplier VARCHAR(255);

+ALTER TABLE llx_facture_rec ADD COLUMN revenuestamp double(24,8) DEFAULT 0;
+ALTER TABLE llx_facturedet_rec MODIFY COLUMN tva_tx double(6,3);
+ALTER TABLE llx_facturedet_rec ADD COLUMN fk_contract_line integer NULL;

 -- This request make mysql drop (mysql bug, so we add it at end):
 --ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES llx_c_barcode_type(rowid);
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -65,6 +65,7 @@ create table llx_facture

  fk_account			integer,								-- bank account
  fk_currency			varchar(3),								-- currency code
+  
  fk_cond_reglement		integer  DEFAULT 1 NOT NULL,			-- condition de reglement (30 jours, fin de mois ...)
  fk_mode_reglement		integer,								-- mode de reglement (Virement, Prelevement)
  date_lim_reglement	date,									-- date limite de reglement
--- a/htdocs/install/mysql/tables/llx_facture_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec.sql
@@ -1,8 +1,8 @@
 -- ===========================================================================
-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2012 Laurent Destailleur  <eldy@users.sourceforge.net>
-- Copyright (C) 2009 Regis Houssin        <regis.houssin@capnetworks.com>
-- Copyright (C) 2010 Juanjo Menent        <jmenent@2byte.es>
+-- Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2012-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2009      Regis Houssin        <regis.houssin@capnetworks.com>
+-- Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
 -- 
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -31,17 +31,21 @@ create table llx_facture_rec
  remise             real     DEFAULT 0,
  remise_percent     real     DEFAULT 0,
  remise_absolue     real     DEFAULT 0,
+  
  tva                double(24,8)     DEFAULT 0,
  localtax1			 double(24,8)     DEFAULT 0,           -- amount localtax1
  localtax2          double(24,8)     DEFAULT 0,           -- amount localtax2
+  revenuestamp       double(24,8)     DEFAULT 0,			 -- amount total revenuestamp
  total              double(24,8)     DEFAULT 0,
  total_ttc          double(24,8)     DEFAULT 0,

  fk_user_author     integer,             -- createur
+  
  fk_projet          integer,             -- projet auquel est associe la facture
-  fk_cond_reglement  integer DEFAULT 0,   -- condition de reglement
+  
+  fk_cond_reglement  integer DEFAULT 0,  -- condition de reglement
  fk_mode_reglement  integer DEFAULT 0,  -- mode de reglement (Virement, Prelevement)
-  date_lim_reglement date,               -- date limite de reglement
+  date_lim_reglement date,				   -- date limite de reglement

  note_private       text,
  note_public        text,
@@ -49,8 +53,9 @@ create table llx_facture_rec
  usenewprice        integer DEFAULT 0,
  frequency          integer,
  unit_frequency     varchar(2) DEFAULT 'd',
+  
  date_when          datetime DEFAULT NULL,		-- date for next gen (when an invoice is generated, this field must be updated with next date)
  date_last_gen      datetime DEFAULT NULL,		-- date for last gen (date with last successfull generation of invoice)
  nb_gen_done        integer DEFAULT NULL,		-- nb of generation done (when an invoice is generated, this field must incremented)
-  nb_gen_max         integer DEFAULT NULL		-- maximum number of generation
+  nb_gen_max         integer DEFAULT NULL		    -- maximum number of generation
 )ENGINE=innodb;
--- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql
@@ -1,6 +1,6 @@
 -- ===================================================================
 -- Copyright (C) 2003		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
-- Copyright (C) 2009		Laurent Destailleur		<eldy@users.sourceforge.net>
+-- Copyright (C) 2009-2014  Laurent Destailleur		<eldy@users.sourceforge.net>
 -- Copyright (C) 2010		Juanjo Menent			<jmenent@2byte.es>
 -- Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@capnetworks.com>
 --
@@ -28,23 +28,23 @@ create table llx_facturedet_rec
  product_type		integer DEFAULT 0,
  label				varchar(255) DEFAULT NULL,
  description		text,
-  tva_tx			double(6,3) DEFAULT 19.6,		-- taux tva
+  tva_tx			double(6,3),	             	-- taux tva
  localtax1_tx      double(6,3) DEFAULT 0,    		-- localtax1 rate
-  localtax1_type	varchar(10)	NULL, 				-- localtax1 type
+  localtax1_type	varchar(10) NULL, 				-- localtax1 type
  localtax2_tx      double(6,3) DEFAULT 0,    		-- localtax2 rate
-  localtax2_type	varchar(10)	NULL, 				-- localtax2 type
+  localtax2_type	varchar(10)	 NULL, 				-- localtax2 type
  qty				real,							-- quantity
-  remise_percent	real DEFAULT 0,					-- pourcentage de remise
-  remise			real DEFAULT 0,					-- montant de la remise
+  remise_percent	real DEFAULT 0,				-- pourcentage de remise
+  remise			real DEFAULT 0,				-- montant de la remise
  subprice			double(24,8),					-- prix avant remise
  price				double(24,8),					-- prix final
  total_ht			double(24,8),					-- Total HT de la ligne toute quantity et incluant remise ligne et globale
  total_tva			double(24,8),					-- Total TVA de la ligne toute quantity et incluant remise ligne et globale
-  total_localtax1	double(24,8) DEFAULT 0,			-- Total LocalTax1 for total quantity of line
-  total_localtax2	double(24,8) DEFAULT 0,			-- total LocalTax2 for total quantity of line
+  total_localtax1	double(24,8) DEFAULT 0,		-- Total LocalTax1 for total quantity of line
+  total_localtax2	double(24,8) DEFAULT 0,		-- total LocalTax2 for total quantity of line
  total_ttc			double(24,8),					-- Total TTC de la ligne toute quantity et incluant remise ligne et globale
-  info_bits			integer    DEFAULT 0,			-- TVA NPR ou non
-  special_code		integer UNSIGNED DEFAULT 0,		-- code pour les lignes speciales
-  rang				integer    DEFAULT 0			-- ordre d'affichage
-  
+  info_bits			integer DEFAULT 0,				-- TVA NPR ou non
+  special_code		integer UNSIGNED DEFAULT 0,	-- code pour les lignes speciales
+  rang				integer DEFAULT 0,				-- ordre d'affichage
+  fk_contract_line  integer NULL					-- id of contract line when predefined invoice comes from contract lines 
 )ENGINE=innodb;
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
 Validate=Validate
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
 ToDispatch=To dispatch
 Dispatched=Dispatched

-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
 Reports=Reports
 ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
 AccountBalanceByMonth=Account balance by month

-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
 Line=Line

 CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
 IntoAccount=In the accounting account

 Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown

 Processing=Processing
 EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account

 ACCOUNTING_SEPARATORCSV=Separator CSV

-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+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

 AccountLength=Length of the accounting accounts shown in Dolibarr
 AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement

 NewFiscalYear=New fiscal year

-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover HT
 TotalMarge=Total sales margin
 DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
 DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
 ChangeAccount=Change the accounting account for lines selected by the account:
 Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
 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

@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically

 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used

-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -475,8 +475,8 @@ Module320Name=تغذية RSS
 Module320Desc=إضافة تغذية RSS داخل الشاشة صفحة Dolibarr
 Module330Name=العناوين
 Module330Desc=العناوين إدارة
-Module400Name=المشاريع
-Module400Desc=إدارة المشاريع داخل وحدات أخرى
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
 Module410Name=Webcalendar
 Module410Desc=Webcalendar التكامل
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module600Name=الإخطارات
-Module600Desc=إرسال الإشعارات عن طريق البريد الإلكتروني على بعض الفعاليات التجارية Dolibarr لطرف ثالث اتصالات
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=التبرعات
 Module700Desc=التبرعات إدارة
 Module1200Name=فرس النبي
@@ -514,16 +514,16 @@ Module5000Name=شركة متعددة
 Module5000Desc=يسمح لك لإدارة الشركات المتعددة
 Module6000Name=Workflow
 Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+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
 Module50000Name=PayBox
 Module50000Desc=وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع PayBox
 Module50100Name=نقطة البيع
 Module50100Desc=نقطة بيع وحدة
-Module50200Name= باي بال
-Module50200Desc= وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع بايبال
+Module50200Name=باي بال
+Module50200Desc=وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع بايبال
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=قراءة أوامر دائمة
 Permission152=إعداد أوامر دائمة
 Permission153=قراءة أوامر دائمة إيصالات
 Permission154=الائتمان / ورفض أوامر دائمة ايصالات
-Permission161=قراءة العقود
-Permission162=إنشاء / تغيير العقود
-Permission163=تفعيل خدمة للعقد
-Permission164=تعطيل خدمة للعقد
-Permission165=حذف العقود
-Permission171=قراءة رحلات
-Permission172=إنشاء / تغيير الرحلات
-Permission173=حذف رحلات
-Permission178=رحلات التصدير
+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
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
 Permission180=قراءة الموردين
 Permission181=قراءة مورد أوامر
 Permission182=إنشاء / تغيير المورد أوامر
@@ -671,7 +672,7 @@ Permission300=شريط قراءة المدونات
 Permission301=إنشاء / تغيير شريط الرموز
 Permission302=حذف شريط الرموز
 Permission311=قراءة الخدمات
-Permission312=إسناد عقود الخدمة
+Permission312=Assign service/subscription to contract
 Permission331=قراءة العناوين
 Permission332=إنشاء / تغيير العناوين
 Permission333=حذف العناوين
@@ -701,8 +702,8 @@ Permission701=قراءة التبرعات
 Permission702=إنشاء / تعديل والهبات
 Permission703=حذف التبرعات
 Permission1001=قراءة مخزونات
-Permission1002=إنشاء / تغيير المخزونات
-Permission1003=حذف الأرصدة
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=قراءة تحركات الأسهم
 Permission1005=إنشاء / تعديل تحركات الأسهم
 Permission1101=قراءة تسليم أوامر
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
 OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
 YouUseBestDriver=You use driver %s that is best driver available currently.
 YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
 NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=عودة رمز المحاسبة التي بناها:
 ModuleCompanyCodePanicum=العودة فارغة مدونة المحاسبة.
 ModuleCompanyCodeDigitaria=قانون المحاسبة طرف ثالث يعتمد على الرمز. الشفرة تتكون من طابع "جيم" في المركز الأول يليه 5 الحروف الأولى من طرف ثالث المدونة.
 UseNotifications=استخدام الإخطارات
-NotificationsDesc=إشعارات البريد الإلكتروني ميزة تسمح لك صمت إرسال البريد الآلي ، وبالنسبة لبعض الأحداث Dolibarr ، لأطراف ثالثة (العملاء أو الموردين) التي هي لتهيئتها. اختيار نشط الاشعار الاتصالات واعتماد أهداف واحدة لطرف ثالث في الوقت المناسب.
+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.
 ModelModules=وثائق قوالب
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=علامة مائية على مشروع الوثيقة
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=إضافة قدرة تاريخ التسليم
 UseOptionLineIfNoQuantity=خط من المنتجات / الخدمات ذات الصفر المبلغ يعتبر خيارا
 FreeLegalTextOnProposal=نص تجارية حرة على مقترحات
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### Orders #####
 OrdersSetup=أوامر إدارة الإعداد
 OrdersNumberingModules=أوامر الترقيم نمائط
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
 ValidOrderAfterPropalClosed=للمصادقة على النظام بعد اقتراح أوثق ، لا يجعل من الممكن للخطوة من جانب النظام المؤقت
 FreeLegalTextOnOrders=بناء على أوامر النص الحر
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 ##### Clicktodial #####
 ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي
 ClickToDialUrlDesc=ودعا الموقع عندما تنقر على الهاتف picto ذلك. Dans l' رابط ، vous pouvez utiliser ليه balises <br> <b>٪ ٪ 1 $ ق</b> qui الأمصال remplacé قدم المساواة جنيه téléphone دي l' appelé <br> <b>٪ ٪</b> 2 $ <b>ق</b> qui الأمصال remplacé لو قدم المساواة téléphone دي l' appelant جنيه مصري vôtre) <br> <b>٪ ٪ ل 3</b> دولار qui الأمصال remplacé vôtre ادخل clicktodial الفقرة (défini سور vôtre فيشه utilisateur) <br> <b>٪ ٪</b> 4 <b>$</b> ق qui الأمصال remplacé الفقرة vôtre يذكره دي clicktodial عتيق (défini سور vôtre فيشه utilisateur).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=الترقيم وحدات التدخل
 TemplatePDFInterventions=تدخل بطاقة نماذج الوثائق
 WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
 ##### Contracts #####
-ContractsSetup=عقود وحدة الإعداد
+ContractsSetup=Contracts/Subscriptions module setup
 ContractsNumberingModules=عقود ترقيم الوحدات
 TemplatePDFContracts=Contracts documents models
 FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 ##### Products #####
 ProductSetup=المنتجات وحدة الإعداد
 ServiceSetup=خدمات وحدة الإعداد
@@ -1382,9 +1384,10 @@ MailingSetup=إعداد وحدة الارسال بالبريد الالكترو
 MailingEMailFrom=مرسل البريد الالكتروني (من) لرسائل البريد الإلكتروني التي بعث بها وحدة الإنترنت
 MailingEMailError=بريد إلكتروني العودة (إلى أخطاء) لرسائل البريد الإلكتروني مع الأخطاء
 ##### Notification #####
-NotificationSetup=الإخطار بو الإعداد وحدة البريد الإلكتروني
+NotificationSetup=EMail notification module setup
 NotificationEMailFrom=مرسل البريد الالكتروني (من) لإرسال رسائل البريد الإلكتروني لالإخطارات
-ListOfAvailableNotifications=قائمة الإخطارات المتاحة (هذا يعتمد على وحدات قائمة المنشط)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
 ##### Sendings #####
 SendingsSetup=ارسال وحدة الإعداد
 SendingsReceiptModel=ارسال استلام نموذج
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=علاقة الخادم '٪ ق' على قاعدة البيان
 OSCommerceTestKo1=علاقة الخادم '٪ ق' تنجح ولكن قاعدة البيانات '٪ ق' لا يمكن التوصل إليها.
 OSCommerceTestKo2=علاقة الخادم '٪ ق' مستخدم '٪ ق' فشلت.
 ##### Stock #####
-StockSetup=تكوين وحدة المخزون
-UserWarehouse=استخدام الأرصدة الشخصية للمستخدم
+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.
 ##### Menu #####
 MenuDeleted=حذف من القائمة
 TreeMenu=شجرة القوائم
@@ -1478,11 +1482,14 @@ ClickToDialDesc=هذا النموذج يسمح لإضافة رمز بعد رقم
 ##### Point Of Sales (CashDesk) #####
 CashDesk=نقاط البيع
 CashDeskSetup=مكتب الإعداد وحدة نقدية
-CashDeskThirdPartyForSell=عامة لاستخدام طرف ثالث لتبيعها
+CashDeskThirdPartyForSell=Default generic third party to use for sells
 CashDeskBankAccountForSell=الحساب النقدي لاستخدامها لتبيع
 CashDeskBankAccountForCheque= حساب لاستخدام لتلقي المدفوعات عن طريق الشيكات
 CashDeskBankAccountForCB= حساب لاستخدام لاستلام المبالغ النقدية عن طريق بطاقات الائتمان
-CashDeskIdWareHouse=Datawarehous لتبيع للمستخدم
+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.
 ##### Bookmark #####
 BookmarkSetup=إعداد وحدة المرجعية
 BookmarkDesc=هذا النموذج يسمح لك لإدارة العناوين. يمكنك أيضا إضافة أي Dolibarr اختصارات لصفحات أو مواقع الويب externale على القائمة اليمنى.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 Opened=Opened
 Closed=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
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= إكمال تلقائي
 AgendaAutoActionDesc= عرف الأحداث التي تريد من دوليبار إنشائها تلقائيا في جدوال الأعمال. إذا لم تقم بإختيار أي شي (الخيار الإفتراضي), سوف يتم فقط إدخال الأنشطلة إلى جدول الأعمال يدوياً
 AgendaSetupOtherDesc= تسمح لك هذه الصفحة بنقل الأحداث إلى تقويم خارجي مثل جوجل, تندربيرد وغيرها, وذلك بإستخدام الخيارات في هذه الصفحة
 AgendaExtSitesDesc=تسمح لك هذه الصفحة بتعريف مصادر خارجية للتقويم وذلك لرؤية الأحداث الخاصة بالتقويم الخاص بهم في تقويم دوليبار
-ActionsEvents= الأحداث التي ستمكن دوليبار من إنشاء أعمال تلقائية في جدول الأعمال
-PropalValidatedInDolibarr= تم تفعيل %s من الإقتراح
-InvoiceValidatedInDolibarr= تم توثيق %s من الفاتورة
+ActionsEvents=الأحداث التي ستمكن دوليبار من إنشاء أعمال تلقائية في جدول الأعمال
+PropalValidatedInDolibarr=تم تفعيل %s من الإقتراح
+InvoiceValidatedInDolibarr=تم توثيق %s من الفاتورة
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=الفاتورة %s للذهاب بها إلى حالة المسودة
 InvoiceDeleteDolibarr=تم حذف %s من الفاتورة
 OrderValidatedInDolibarr= تم توثيق %s من الطلب
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=تم الموافقة على %s من الطلب
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=الطلب %s للذهاب بها إلى حالة المسودة
 OrderCanceledInDolibarr=تم إلغاء %s من الطلب
-InterventionValidatedInDolibarr=تم توثيق %s من التدخل
 ProposalSentByEMail=تم إرسال العرض الرسمي %s بواسطة البريد الإلكتروني
 OrderSentByEMail=تم إرسال طلبية العميل %s بواسطة البريد الإلكتروني
 InvoiceSentByEMail=تم إرسال فاتروة العميل %s بواسطة البريد الإلكتروني
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=تم إرسال طلبية المزود %s بواسطة
 SupplierInvoiceSentByEMail=تم إرسال فاتروة المزود%s بواسطة البريد الإلكتروني
 ShippingSentByEMail=تم إرسال الشحنة %s بواسطة البريد الإلكتروني
 ShippingValidated= Shipping %s validated
-InterventionSentByEMail=تم إرسال التدخل %s بواسطة البريد الإلكتروني
-InterventionClassifiedBilled=Intervention %s classified as Billed
 NewCompanyToDolibarr= تم إنشاء طرف ثالث أو خارجي
 DateActionPlannedStart= التاريخ المخطط للبدء
 DateActionPlannedEnd= التاريخ المخطط للإنهاء
@@ -70,9 +68,9 @@ DateActionStart= تاريخ البدء
 DateActionEnd= تاريخ النهاية
 AgendaUrlOptions1=يمكنك أيضا إضافة المعايير التالية لترشيح النتائج:
 AgendaUrlOptions2=<b>login=<b>login=%s</b> لتقييد الانتاج المنشأ أو الذي تم الإنتهاء منه بواسطة المستخدم <b>%s</b>
-AgendaUrlOptions3=<b>logina=<b>logina=%s</b> لتقييد الانتاج للإجراءات التي أنشأها المستخدم <b>%s</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=<b>logint=%s</b> لتقييد الانتاج للإجراءات المناطة للمستخدم <b>%s</b>
-AgendaUrlOptions5=<b>logind=<b>logind=%s</b> لتقييد الانتاج للإجراءات التي قام بها المستخدم <b>%s</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=أظهر تاريخ الميلاد في عناوين الإتصال
 AgendaHideBirthdayEvents=أخفي تاريخ الميلاد في عناوين الإتصال
 Busy=مشغول
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=عنوان المتصفح للدخول لملف .ical
 ExtSiteNoLabel=لا يوجد وصف
 WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
 MyAvailability=My availability
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=علما الائتمان
 InvoiceAvoirAsk=علما الائتمان لتصحيح الفاتورة
 InvoiceAvoirDesc=<b>الفضل</b> في <b>المذكرة</b> سلبية الفاتورة تستخدم لحل كون فاتورة بمبلغ قد يختلف عن المبلغ المدفوع فعلا (لأنه دفع الكثير من العملاء عن طريق الخطأ ، أو لن تدفع بالكامل منذ عودته لبعض المنتجات على سبيل المثال).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
 ReplaceInvoice=يستعاض عن فاتورة ٪ ق
 ReplacementInvoice=استبدال الفاتورة
 ReplacedByInvoice=بعبارة فاتورة ق ٪
@@ -87,7 +87,7 @@ ClassifyCanceled=تصنيف 'المهجورة'
 ClassifyClosed=تصنيف 'مغلقة'
 ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=إنشاء الفاتورة
-AddBill=تضيف المذكرة الائتمان أو فاتورة
+AddBill=Create invoice or credit note
 AddToDraftInvoices=Add to draft invoice
 DeleteBill=شطب فاتورة
 SearchACustomerInvoice=البحث عن زبون فاتورة
@@ -99,7 +99,7 @@ DoPaymentBack=هل لدفع الظهر
 ConvertToReduc=تحويل الخصم في المستقبل
 EnterPaymentReceivedFromCustomer=دخول الدفع الواردة من العملاء
 EnterPaymentDueToCustomer=من المقرر أن يسدد العميل
-DisabledBecauseRemainderToPayIsZero=لأن بقية المعوقين الدفع صفر
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=مبلغ
 PriceBase=سعر الأساس
 BillStatus=حالة الفاتورة
@@ -137,8 +137,6 @@ BillFrom=من
 BillTo=مشروع قانون ل
 ActionsOnBill=الإجراءات على فاتورة
 NewBill=فاتورة جديدة
-Prélèvements=من أجل الوقوف
-Prélèvements=من أجل الوقوف
 LastBills=آخر الفواتير ق ٪
 LastCustomersBills=٪ ق الماضي فواتير العملاء
 LastSuppliersBills=٪ ق الماضي فواتير الموردين
@@ -156,9 +154,9 @@ ConfirmCancelBill=هل أنت متأكد من أنك تريد إلغاء الف
 ConfirmCancelBillQuestion=لماذا تريدها لتصنيف هذه الفاتورة 'المهجورة؟
 ConfirmClassifyPaidPartially=هل أنت متأكد من أنك تريد تغيير فاتورة <b>٪ ق</b> لمركز paid؟
 ConfirmClassifyPaidPartiallyQuestion=هذه الفاتورة لم تدفع بالكامل. ما هي أسباب قريبة لك هذه الفاتورة؟
-ConfirmClassifyPaidPartiallyReasonAvoir=دفع ما تبقى <b>(٪ ق ٪)</b> هي الخصم الممنوح لدفع مبلغ من قبل. أنا مع تصحيح وضع ضريبة القيمة المضافة علما ائتمان.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=دفع ما تبقى <b>(٪ ق ٪)</b> هي الخصم الممنوح لدفع مبلغ من قبل. إنني أقبل أن تفقد ضريبة القيمة المضافة على هذا الخصم.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=دفع ما تبقى <b>(٪ ق ٪)</b> هي الخصم الممنوح لدفع مبلغ من قبل. أنا استرداد ضريبة القيمة المضافة على هذا الائتمان والخصم من دون ملاحظة.
+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=العملاء سيئة
 ConfirmClassifyPaidPartiallyReasonProductReturned=المنتجات عاد جزئيا
 ConfirmClassifyPaidPartiallyReasonOther=التخلي عن المبلغ لسبب آخر
@@ -191,9 +189,9 @@ AlreadyPaid=دفعت بالفعل
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=دفعت بالفعل (بدون تلاحظ الائتمان والودائع)
 Abandoned=المهجورة
-RemainderToPay=تبقى على الدفع
-RemainderToTake=ما تبقى لاتخاذ
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
 Rest=Pending
 AmountExpected=المبلغ المطالب به
 ExcessReceived=تلقى الزائدة
@@ -219,19 +217,18 @@ NoInvoice=لا الفاتورة
 ClassifyBill=تصنيف الفاتورة
 SupplierBillsToPay=دفع فواتير الموردين
 CustomerBillsUnpaid=فواتير غير مدفوعة للعملاء
-DispenseMontantLettres=ليه factures rédigées قدم المساواة طرائق mécanographiques sont l' arrêté dispensées دي én lettres
-DispenseMontantLettres=ليه factures rédigées قدم المساواة طرائق mécanographiques sont l' arrêté dispensées دي én lettres
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
 NonPercuRecuperable=غير القابلة للاسترداد
 SetConditions=تحدد شروط الدفع
 SetMode=حدد طريقة الدفع
 Billed=فواتير
-RepeatableInvoice=محددة مسبقا فاتورة
-RepeatableInvoices=محددة مسبقا والفواتير
-Repeatable=محددة مسبقا
-Repeatables=محددة مسبقا
-ChangeIntoRepeatableInvoice=تحويل محددة مسبقا
-CreateRepeatableInvoice=إنشاء فاتورة محددة مسبقا
-CreateFromRepeatableInvoice=خلق من فاتورة محددة مسبقا
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
 CustomersInvoicesAndInvoiceLines=فواتير العملاء والفواتير 'خطوط
 CustomersInvoicesAndPayments=العملاء والفواتير والمدفوعات
 ExportDataset_invoice_1=قائمة العملاء والفواتير والفواتير 'خطوط
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
 CatCusLinks=Links between customers/prospects and categories
 CatProdLinks=Links between products/services and categories
 CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
 DeleteFromCat=Remove from category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
 CategorieRecursiv=Link with parent category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=قانون محاسبة العملاء سي
 SuppliersProductsSellSalesTurnover=وقد ولدت عن طريق الدوران مبيعات الموردين المنتجات.
 CheckReceipt=التحقق من إيداع
 CheckReceiptShort=التحقق من إيداع
+LastCheckReceiptShort=Last %s check receipts
 NewCheckReceipt=خصم جديد
 NewCheckDeposit=تأكد من ايداع جديدة
 NewCheckDepositOn=تهيئة لتلقي الودائع على حساب : ٪ ق
--- a/htdocs/langs/ar_SA/contracts.lang
+++ b/htdocs/langs/ar_SA/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=عقود منطقة
 ListOfContracts=قائمة العقود
-LastContracts=آخر تعديل العقود ق ٪
+LastModifiedContracts=Last %s modified contracts
 AllContracts=جميع العقود
 ContractCard=عقد بطاقة
 ContractStatus=عقد مركز
@@ -27,7 +27,7 @@ MenuRunningServices=ادارة الخدمات
 MenuExpiredServices=انتهت الخدمات
 MenuClosedServices=أغلقت الخدمات
 NewContract=العقد الجديد
-AddContract=إضافة العقد
+AddContract=Create contract
 SearchAContract=بحث عقد
 DeleteAContract=الغاء العقد
 CloseAContract=وثيقة العقد
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=قائمة تشغيل خطوط العقد
 ListOfRunningServices=لائحة ادارة الخدمات
 NotActivatedServices=لا تنشيط الخدمات) بين مصدق العقود)
 BoardNotActivatedServices=خدمات لتفعيل العقود بين مصدق
-LastContracts=آخر تعديل العقود ق ٪
+LastContracts=Last % contracts
 LastActivatedServices=ق الماضي ٪ تنشيط الخدمات
 LastModifiedServices=آخر تعديل ٪ ق الخدمات
 EditServiceLine=تعديل خط الخدمات
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -1,10 +1,8 @@
 # Dolibarr language file - Source file is en_US - cron
-#
 # About page
 About = حول
 CronAbout = About Cron
 CronAboutPage = Cron about page
-
 # Right
 Permission23101 = Read Scheduled task
 Permission23102 = Create/update Scheduled task
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
 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 jobs
-CronListInactive= List of disabled jobs
-CronListActive= List of active jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
 # Page list
 CronDateLastRun=Last run
 CronLastOutput=Last run output
--- a/htdocs/langs/ar_SA/donations.lang
+++ b/htdocs/langs/ar_SA/donations.lang
@@ -4,7 +4,7 @@ Donations=التبرعات
 DonationRef=Donation ref.
 Donor=الجهات المانحة
 Donors=الجهات المانحة
-AddDonation=إضافة تبرع
+AddDonation=Create a donation
 NewDonation=منحة جديدة
 ShowDonation=Show donation
 DonationPromise=هدية الوعد
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
 ThankYou=Thank You
 IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
 MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
--- a/htdocs/langs/ar_SA/externalsite.lang
+++ b/htdocs/langs/ar_SA/externalsite.lang
@@ -2,3 +2,4 @@
 ExternalSiteSetup=رابط الإعداد لموقع خارجي
 ExternalSiteURL=الخارجية الموقع URL
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
--- a/htdocs/langs/ar_SA/holiday.lang
+++ b/htdocs/langs/ar_SA/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
 ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
 CantCreateCP=You don't have the right to make leave requests.
 InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=تحديث
 CantUpdate=You cannot update this leave request.
 NoDateDebut=You must select a start date.
 NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
 ConfirmValidCP=Are you sure you want to approve the leave request?
 DateValidCP=Date approved
 TitleToValidCP=Send leave request
 ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
 ConfirmRefuseCP=Are you sure you want to refuse the leave request?
 NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
 ConfirmCancelCP=Are you sure you want to cancel the leave request?
 DetailRefusCP=Reason for refusal
 DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
 UserUpdateCP=For the user
 PrevSoldeCP=Previous Balance
 NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
 UserName=اسم
 Employee=Employee
 FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation

 ## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
 DescOptionCP=Description of the option
 ValueOptionCP=القيمة
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
 AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
 AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
 nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
 TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=صحة
 UpdateEventCP=Update events
--- a/htdocs/langs/ar_SA/interventions.lang
+++ b/htdocs/langs/ar_SA/interventions.lang
@@ -3,7 +3,7 @@ Intervention=التدخل
 Interventions=المداخلات
 InterventionCard=تدخل البطاقة
 NewIntervention=التدخل الجديدة
-AddIntervention=إضافة التدخل
+AddIntervention=Create intervention
 ListOfInterventions=قائمة التدخلات
 EditIntervention=Editer التدخل
 ActionsOnFicheInter=إجراءات على التدخل
@@ -30,6 +30,15 @@ StatusInterInvoiced=فواتير
 RelatedInterventions=التدخلات المتعلقة
 ShowIntervention=عرض التدخل
 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
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=ممثل متابعة التدخل
 TypeContact_fichinter_internal_INTERVENING=التدخل
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -115,7 +115,7 @@ SentBy=أرسلها
 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=ولكن يمكنك إرسالها عبر الإنترنت عن طريق إضافة معلمة MAILING_LIMIT_SENDBYWEB مع قيمة الحد الأقصى لعدد من رسائل البريد الإلكتروني التي تريد إرسالها من خلال هذه الدورة.
 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: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+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.
 TargetsReset=لائحة واضحة
 ToClearAllRecipientsClickHere=من الواضح أن المستفيدين قائمة لهذا البريد الإلكتروني ، انقر على زر
 ToAddRecipientsChooseHere=إضافة إلى المتلقين ، وتختار في هذه القوائم
@@ -133,6 +133,9 @@ Notifications=الإخطارات
 NoNotificationsWillBeSent=إشعارات البريد الإلكتروني لا يجري التخطيط لهذا الحدث ، وشركة
 ANotificationsWillBeSent=1 سيتم إرسال الإشعار عن طريق البريد الإلكتروني
 SomeNotificationsWillBeSent=ق ٪ سوف يتم إرسال الإخطارات عبر البريد الإلكتروني
-AddNewNotification=تفعيل جديد طلب إخطار بالبريد الإلكتروني
-ListOfActiveNotifications=قائمة البريد الإلكتروني لجميع طلبات الإخطار
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
 ListOfNotificationsDone=أرسلت قائمة جميع اشعارات بالبريد الالكتروني
+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.
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=فشلت في العثور على المس
 ErrorNoVATRateDefinedForSellerCountry=خطأ ، لم يعرف لمعدلات ضريبة القيمة المضافة فى البلاد ٪ ق.
 ErrorNoSocialContributionForSellerCountry=خطأ ، لا يوجد نوع المساهمة الاجتماعية المحددة للبلد '%s'.
 ErrorFailedToSaveFile=خطأ ، وفشلت في انقاذ الملف.
-ErrorOnlyPngJpgSupported=خطأ فقط. بابوا نيو غينيا ، وجيه. شكل صورة ملف الدعم.
-ErrorImageFormatNotSupported=PHP الخاص بك لا يدعم وظائف لتحويل الصور من هذا الشكل.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 BackgroundColorByDefault=لون الخلفية الافتراضي
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=يتم تحديد ملف مرفق لكنه لم يكن بعد تحميلها. انقر على "ملف إرفاق" لهذا الغرض.
 NbOfEntries=ملاحظة : إدخالات
 GoToWikiHelpPage=الانترنت تساعد على قراءة (على ضرورة الوصول إلى الإنترنت)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
 Quadri=قادري
 MonthOfDay=خلال شهر من اليوم
 HourShort=حاء
+MinuteShort=mn
 Rate=سعر
 UseLocalTax=Include tax
 Bytes=بايت
@@ -340,6 +341,7 @@ FullList=القائمة الكاملة
 Statistics=احصاءات
 OtherStatistics=آخر الإحصاءات
 Status=حالة
+Favorite=Favorite
 ShortInfo=Info.
 Ref=المرجع.
 RefSupplier=المرجع. المورد
@@ -365,6 +367,7 @@ ActionsOnCompany=الأعمال حول هذا الطرف الثالث
 ActionsOnMember=أحداث حول هذا العضو
 NActions=ق ٪ الإجراءات
 NActionsLate=ق ٪ في وقت متأخر
+RequestAlreadyDone=Request already recorded
 Filter=فلتر
 RemoveFilter=إزالة فلتر
 ChartGenerated=رسم ولدت
@@ -645,6 +648,7 @@ OptionalFieldsSetup=اضافية سمات الإعداد
 URLPhoto=للتسجيل من الصورة / الشعار
 SetLinkToThirdParty=ربط طرف ثالث آخر
 CreateDraft=خلق مشروع
+SetToDraft=Back to draft
 ClickToEdit=انقر للتحرير
 ObjectDeleted=%s الكائن المحذوف
 ByCountry=حسب البلد
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
 # Week day
 Monday=يوم الاثنين
 Tuesday=الثلاثاء
--- a/htdocs/langs/ar_SA/margins.lang
+++ b/htdocs/langs/ar_SA/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
 DisplayMarginRates=Display margin rates
 DisplayMarkRates=Display mark rates
 InputPrice=Input price
-
 margin=Profit margins management
 margesSetup=Profit margins management setup
-
 MarginDetails=Margin details
-
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
-
 ProductService=المنتج أو الخدمة
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
-
 StartDate=تاريخ البدء
 EndDate=نهاية التاريخ
 Launch=يبدأ
-
 ForceBuyingPriceIfNull=Force buying price if null
 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)
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 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_TYPE=Margin type
 MargeBrute=Raw margin
 MargeNette=Net margin
 MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
 CostPrice=Cost price
 BuyingCost=Cost price
 UnitCharges=Unit charges
 Charges=Charges
-
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+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
--- a/htdocs/langs/ar_SA/orders.lang
+++ b/htdocs/langs/ar_SA/orders.lang
@@ -2,7 +2,7 @@
 OrdersArea=أوامر منطقة العملاء
 SuppliersOrdersArea=الموردين أوامر المنطقة
 OrderCard=من أجل بطاقة
-# OrderId=Order Id
+OrderId=Order Id
 Order=ترتيب
 Orders=أوامر
 OrderLine=من أجل خط
@@ -28,7 +28,7 @@ StatusOrderCanceledShort=ألغى
 StatusOrderDraftShort=مسودة
 StatusOrderValidatedShort=صادق
 StatusOrderSentShort=في عملية
-# StatusOrderSent=Shipment in process
+StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=على عملية
 StatusOrderProcessedShort=تجهيز
 StatusOrderToBillShort=على مشروع قانون
@@ -53,9 +53,9 @@ ShippingExist=شحنة موجود
 DraftOrWaitingApproved=الموافقة على مشروع أو لم يأمر بعد
 DraftOrWaitingShipped=مشروع مصادق عليه أو لم تشحن
 MenuOrdersToBill=أوامر لمشروع قانون
-# MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
 SearchOrder=من أجل البحث
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
 ShipProduct=سفينة المنتج
 Discount=الخصم
 CreateOrder=خلق أمر
@@ -65,14 +65,14 @@ ValidateOrder=من أجل التحقق من صحة
 UnvalidateOrder=Unvalidate النظام
 DeleteOrder=من أجل حذف
 CancelOrder=من أجل إلغاء
-AddOrder=من أجل إضافة
+AddOrder=Create order
 AddToMyOrders=أضف إلى أوامر
 AddToOtherOrders=إضافة إلى أوامر أخرى
-# AddToDraftOrders=Add to draft order
+AddToDraftOrders=Add to draft order
 ShowOrder=وتبين من أجل
 NoOpenedOrders=أي أوامر فتح
 NoOtherOpenedOrders=أي أوامر فتح
-# NoDraftOrders=No draft orders
+NoDraftOrders=No draft orders
 OtherOrders=أوامر أخرى
 LastOrders=ق الماضي أوامر ٪
 LastModifiedOrders=آخر تعديل أوامر ق ٪
@@ -82,7 +82,7 @@ NbOfOrders=عدد الأوامر
 OrdersStatistics=أوامر إحصاءات
 OrdersStatisticsSuppliers=المورد أوامر إحصاءات
 NumberOfOrdersByMonth=عدد أوامر الشهر
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=قائمة الأوامر
 CloseOrder=وثيق من أجل
 ConfirmCloseOrder=هل أنت متأكد من أجل اقفال هذا؟ مرة واحدة أمر قد انتهى ، فإنه لا يمكن إلا أن يكون فواتير.
@@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=هل أنت متأكد أنك تريد استعادة <b>
 ConfirmCancelOrder=هل أنت متأكد من أنك تريد إلغاء هذا النظام؟
 ConfirmMakeOrder=هل أنت متأكد من أن يؤكد لك هذا النظام على <b>٪ ق؟</b>
 GenerateBill=توليد الفاتورة
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Classify delivered
 ClassifyBilled=تصنيف "فواتير"
 ComptaCard=بطاقة المحاسبة
 DraftOrders=مشروع أوامر
@@ -101,7 +101,6 @@ RelatedOrders=الأوامر ذات الصلة
 OnProcessOrders=على عملية أوامر
 RefOrder=المرجع. ترتيب
 RefCustomerOrder=المرجع. عملاء النظام
-CustomerOrder=عملاء النظام
 RefCustomerOrderShort=المرجع. العملاء. ترتيب
 SendOrderByMail=لكي ترسل عن طريق البريد
 ActionsOnOrder=إجراءات من أجل
@@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=لم تعرف COMMANDE_SUPPLIER_ADDON
 Error_COMMANDE_ADDON_NotDefined=لم تعرف COMMANDE_ADDON مستمر
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=لم يتم تحميل الملف وحدة '٪ ق'
 Error_FailedToLoad_COMMANDE_ADDON_File=لم يتم تحميل الملف وحدة '٪ ق'
-# Error_OrderNotChecked=No orders to invoice selected
-
-
+Error_OrderNotChecked=No orders to invoice selected
 # Sources
 OrderSource0=اقتراح التجارية
 OrderSource1=الإنترنت
@@ -144,25 +141,22 @@ OrderSource5=التجارية
 OrderSource6=مخزن
 QtyOrdered=الكمية أمرت
 AddDeliveryCostLine=تضاف تكلفة توصيل خط يبين الوزن من أجل
-
 # Documents models
 PDFEinsteinDescription=من أجل نموذج كامل (logo...)
 PDFEdisonDescription=نموذج النظام بسيطة
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete proforma invoice (logo…)
 # Orders modes
 OrderByMail=بريد
 OrderByFax=الفاكس
 OrderByEMail=بريد إلكتروني
 OrderByWWW=على الانترنت
 OrderByPhone=هاتف
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=رمز الحماية
 Calendar=التقويم
-AddTrip=إضافة رحلة
 Tools=أدوات
 ToolsDesc=ويكرس هذا المجال لمجموعة الأدوات المتنوعة التي لم تتوفر في إدخالات القوائم الأخرى. <br><br> ويمكن الوصول إلى هذه الأدوات من القائمة على الجانب.
 Birthday=عيد ميلاد
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
 NbOfAttachedFiles=عدد الملفات المرفقة / وثائق
 TotalSizeOfAttachedFiles=اجمالى حجم الملفات المرفقة / وثائق
 MaxSize=الحجم الأقصى
@@ -80,6 +80,16 @@ ModifiedBy=المعدلة ق ٪
 ValidatedBy=يصادق عليها ق ٪
 CanceledBy=ألغى به ق ٪
 ClosedBy=أغلقت ٪ ق
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
 FileWasRemoved=تم حذف الملف
 DirWasRemoved=دليل أزيل
 FeatureNotYetAvailableShort=متاحة في الإصدار التالي
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your

 ##### Calendar common #####
 AddCalendarEntry=إضافة الدخول في التقويم ق ٪
-NewCompanyToDolibarr=وأضافت الشركة ل ٪ الى Dolibarr
-ContractValidatedInDolibarr=ق ٪ العقد المصادق عليه في Dolibarr
-ContractCanceledInDolibarr=٪ ق الغاء العقد في Dolibarr
-ContractClosedInDolibarr=ق ٪ مغلقا عقد في Dolibarr
-PropalClosedSignedInDolibarr=اقتراح ٪ ق الذي وقع في Dolibarr
-PropalClosedRefusedInDolibarr=ق رفض الاقتراح ٪ في Dolibarr
-PropalValidatedInDolibarr=اقتراح ٪ في التحقق من صحة المستندات Dolibarr
-InvoiceValidatedInDolibarr=فاتورة ٪ في التحقق من صحة المستندات Dolibarr
-InvoicePaidInDolibarr=ق ٪ الفاتورة المدفوعة في تغيير Dolibarr
-InvoiceCanceledInDolibarr=فاتورة ٪ ق الغى في Dolibarr
-PaymentDoneInDolibarr=ق ٪ الدفع به في Dolibarr
-CustomerPaymentDoneInDolibarr=العميل بدفع ٪ ق عمله في Dolibarr
-SupplierPaymentDoneInDolibarr=المورد ٪ ق دفع به في Dolibarr
-MemberValidatedInDolibarr=عضو ٪ في التحقق من صحة المستندات Dolibarr
-MemberResiliatedInDolibarr=عضو في resiliated ٪ ق Dolibarr
-MemberDeletedInDolibarr=عضو ٪ ق حذفها من Dolibarr
-MemberSubscriptionAddedInDolibarr=الاكتتاب عضو ق ٪ وأضاف في Dolibarr
-ShipmentValidatedInDolibarr=%s شحنة التحقق من صحتها في Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+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
 ##### Export #####
 Export=تصدير
 ExportsArea=صادرات المنطقة
--- a/htdocs/langs/ar_SA/paybox.lang
+++ b/htdocs/langs/ar_SA/paybox.lang
@@ -32,6 +32,9 @@ VendorName=اسم البائع
 CSSUrlForPaymentForm=عزيزي ورقة النمط المغلق للنموذج الدفع
 MessageOK=رسالة على الصفحة التحقق من صحة الدفع عودة
 MessageKO=رسالة في إلغاء دفع الصفحة عودة
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+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
--- a/htdocs/langs/ar_SA/resource.lang
+++ b/htdocs/langs/ar_SA/resource.lang
@@ -0,0 +1,36 @@
+
+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
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+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
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
--- a/htdocs/langs/ar_SA/sendings.lang
+++ b/htdocs/langs/ar_SA/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=لحظة، ويتم إنشاء لشحنة جدي
 RelatedShippings=Related shippings
 ShipmentLine=Shipment line
 CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received

 # Sending methods
 SendingMethodCATCH=القبض على العملاء
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=مستودع العلامة مطلوبة
 CorrectStock=تصحيح الأوراق المالية
 ListOfWarehouses=لائحة المخازن
 ListOfStockMovements=قائمة الحركات الأسهم
-StocksArea=مخزون المنطقة
+StocksArea=Warehouses area
 Location=عوضا عن
 LocationSummary=باختصار اسم الموقع
 NumberOfDifferentProducts=Number of different products
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@@ -63,7 +63,6 @@ ShowGroup=وتبين لفريق
 ShowUser=وتظهر للمستخدم
 NonAffectedUsers=غير المتأثرة المستخدمين
 UserModified=المعدل المستخدم بنجاح
-GroupModified=تعديل المجموعة بنجاح
 PhotoFile=ملف الصور
 UserWithDolibarrAccess=مع وصول المستخدمين Dolibarr
 ListOfUsersInGroup=قائمة المستخدمين في هذه المجموعة
@@ -103,7 +102,7 @@ UserDisabled=مستخدم ٪ ق المعوقين
 UserEnabled=مستخدم ٪ ق تفعيلها
 UserDeleted=ق إزالة المستخدم ٪
 NewGroupCreated=أنشأت مجموعة ق ٪
-GroupModified=تعديل المجموعة بنجاح
+GroupModified=Group %s modified
 GroupDeleted=فريق ازالة ق ٪
 ConfirmCreateContact=هل أنت متأكد من خلق Dolibarr حساب هذا الاتصال؟
 ConfirmCreateLogin=هل أنت متأكد من خلق Dolibarr حساب هذا؟
@@ -114,8 +113,10 @@ YourRole=الأدوار الخاص
 YourQuotaOfUsersIsReached=يتم التوصل إلى حصة الخاص بك من المستخدمين النشطين!
 NbOfUsers=ملحوظة من المستخدمين
 DontDowngradeSuperAdmin=يمكن فقط superadmin تقليله a superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
 UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=ورود
 LastWithdrawalReceipts=ق الماضي سحب إيصالات ٪
 WithdrawedBills=Withdrawed الفواتير
 WithdrawalsLines=خطوط السحب
-RequestStandingOrderToTreat=طلب لأوامر دائمة لمعالجة
-RequestStandingOrderTreated=طلب تعامل أوامر دائمة
+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.
 CustomersStandingOrders=الزبون أوامر دائمة
 CustomerStandingOrder=يقف النظام العميل
 NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=طريقة البث
 Send=إرسال
 Lines=خطوط
 StandingOrderReject=رفض إصدار
-InvoiceRefused=تهمة الرفض لزبون
 WithdrawalRefused=سحب Refuseds
 WithdrawalRefusedConfirm=هل أنت متأكد أنك تريد الدخول في رفض الانسحاب للمجتمع
 RefusedData=تاريخ الرفض
 RefusedReason=أسباب الرفض
 RefusedInvoicing=رفض الفواتير
 NoInvoiceRefused=لا تهمة الرفض
-InvoiceRefused=تهمة الرفض لزبون
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
 Status=حالة
 StatusUnknown=غير معروف
 StatusWaiting=انتظار
@@ -76,7 +76,7 @@ WithBankUsingRIB=عن الحسابات المصرفية باستخدام RIB
 WithBankUsingBANBIC=عن الحسابات المصرفية باستخدام IBAN / BIC / SWIFT
 BankToReceiveWithdraw=حساب مصرفي لتلقي تنسحب
 CreditDate=الائتمان على
-WithdrawalFileNotCapable=غير قادر على توليد سحب ملف استلام لبلدك
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=وتظهر سحب
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=ومع ذلك، إذا فاتورة واحدة على الأقل دفع انسحاب لا تتم معالجتها حتى الآن، فإنه لن يكون كما سيولي للسماح لإدارة الانسحاب قبل.
 DoStandingOrdersBeforePayments=هذه علامات تسمح لك لطلب لاستصدار أمر دائم. مرة واحدة وسيتم الانتهاء من ذلك، يمكنك كتابة دفع لإغلاق الفاتورة.
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -7,7 +7,7 @@ Chartofaccounts=Chart of accounts
 Fiscalyear=Fiscal years
 Menuaccount=Accounting accounts
 Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
+MenuTools=Инструменти

 ConfigAccountingExpert=Configuration of the module accounting expert
 Journaux=Journals
@@ -25,19 +25,19 @@ Selectchartofaccounts=Select a chart of accounts
 Validate=Validate
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
 ToDispatch=To dispatch
 Dispatched=Dispatched

-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
-Reports=Reports
+Reports=Отчети
 ByCustomerInvoice=By invoices customers
-ByMonth=By Month
+ByMonth=По месец
 NewAccount=New accounting account
 Update=Update
-List=List
+List=Списък
 Create=Create
 UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
 AccountBalanceByMonth=Account balance by month

-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
 Line=Line

 CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
 IntoAccount=In the accounting account

 Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown

 Processing=Processing
 EndProcessing=The end of processing
@@ -66,11 +66,11 @@ Lineofinvoice=Line of invoice
 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 ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+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

 AccountLength=Length of the accounting accounts shown in Dolibarr
 AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -92,17 +92,17 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)

-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-Numerocompte=Account
-Code_tiers=Thirdparty
-Labelcompte=Label account
-Debit=Debit
-Credit=Credit
-Amount=Amount
+Doctype=Тип на документа
+Docdate=Дата
+Docref=Справка
+Numerocompte=Сметка
+Code_tiers=Трета страна
+Labelcompte=Етикет на сметка
+Debit=Дебит
+Credit=Кредит
+Amount=Сума
 Sens=Sens
-Codejournal=Journal
+Codejournal=Дневник

 DelBookKeeping=Delete the records of the general ledger

@@ -140,19 +140,19 @@ Active=Statement

 NewFiscalYear=New fiscal year

-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover HT
 TotalMarge=Total sales margin
 DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
 DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
 ChangeAccount=Change the accounting account for lines selected by the account:
 Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
 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
+ErrorAccountancyCodeIsAlreadyUse=Възникна грешка, вие не можете да изтриете тази счетоводна сметка, защото се използва.

-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -12,10 +12,10 @@ SessionId=ID на сесията
 SessionSaveHandler=Handler за да запазите сесията
 SessionSavePath=Място за съхранение на сесията
 PurgeSessions=Изчистване на сесиите
-ConfirmPurgeSessions=Do you really want to purge all sessions ? This will disconnect every user (except yourself).
+ConfirmPurgeSessions=Сигурни ли сте, че желаете да изчистите всички сесии? Това ще прекъсне всички потребители (освен Вас).
 NoSessionListWithThisHandler=Запиши сесиен манипулатор конфигурирани във вашата PHP, не позволява да се изброят всички текущи сесии.
 LockNewSessions=Заключване за нови свързвания
-ConfirmLockNewSessions=Сигурен ли сте, че искате да ограничите всяка нова връзка Dolibarr за себе си. Само <b>%s</b> потребителят ще бъде в състояние да се свърже след това.
+ConfirmLockNewSessions=Сигурни ли сте, че желаете да ограничите всяка нова връзка Dolibarr за себе си. Само <b>%s</b> потребителят ще бъде в състояние да се свърже след това.
 UnlockNewSessions=Разрешаване на свързването
 YourSession=Вашата сесия
 Sessions=Потребителска сесия
@@ -42,20 +42,20 @@ RestoreLock=Възстановете файла <b>%s,</b> само с прав
 SecuritySetup=Настройки на сигурността
 ErrorModuleRequirePHPVersion=Грешка, този модул изисква PHP версия %s или по-висока
 ErrorModuleRequireDolibarrVersion=Грешка, този модул изисква Dolibarr версия %s или по-висока
-ErrorDecimalLargerThanAreForbidden=Грешка, с точност по-висока от <b>%s</b> не се поддържа.
+ErrorDecimalLargerThanAreForbidden=Грешка, точност по-висока от <b>%s</b> не се поддържа.
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
 Fiscalyear=Fiscal years
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+ErrorReservedTypeSystemSystemAuto=Стойност 'система' и 'автосистема' за типа са запазени. Може да използвате за стойност 'потребител' при добавяне на ваш личен запис.
+ErrorCodeCantContainZero=Кода не може да съдържа стойност 0
+DisableJavascript=Изключете функциите JavaScript и Ajax (Препоръчва се за незрящи и при текстови браузъри)
 ConfirmAjax=Използвайте Аякс потвърждение изскачащи прозорци
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box.
+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=Use autocompletion fields to choose contact (instead of using a list box).
+UseSearchToSelectContact=Използвайте автоматично довършване полета, за избор на контакт (вместо да използвте списъка от полето).
 SearchFilter=Опции на филтрите за търсене
 NumberOfKeyToSearch=NBR от знаци, за да предизвика търсене: %s
 ViewFullDateActions=Показване на пълните събития дати в третия лист
@@ -70,16 +70,16 @@ CurrentTimeZone=TimeZone PHP (сървър)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Пространство
-Table=Table
+Table=Таблица
 Fields=Полетата
-Index=Index
+Index=Индекс
 Mask=Маска
 NextValue=Следваща стойност
 NextValueForInvoices=Следваща стойност (фактури)
 NextValueForCreditNotes=Следваща стойност (кредитни известия)
 NextValueForDeposit=Next value (deposit)
 NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Забележка: PHP ограничава размера на всяко качване на файлове на %s <b>%s,</b> независимо от стойността на този параметър е
+MustBeLowerThanPHPLimit=Забележка: PHP ограничава размера на всяко качване на файлове на <b>%s</b> %s, независимо от стойността на този параметър е
 NoMaxSizeByPHPLimit=Забележка: Не срокът се определя в конфигурацията на вашия PHP
 MaxSizeForUploadedFiles=Максимален размер за качените файлове (0 за да забраните качване)
 UseCaptchaCode=Използвайте графичен код (CAPTCHA) на страницата за вход
@@ -118,28 +118,28 @@ ParameterInDolibarr=Параметър %s
 LanguageParameter=Езиков параметър %s
 LanguageBrowserParameter=Параметър %s
 LocalisationDolibarrParameters=Локализация параметри
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
+ClientTZ=Часова зона на клиента (потребител)
+ClientHour=Час на клиента (потребител)
+OSTZ=Часова зона на Операционната Система
+PHPTZ=Часова зона на PHP Сървъра
 PHPServerOffsetWithGreenwich=PHP сървъра компенсира широчина Гринуич (секунди)
 ClientOffsetWithGreenwich=Клиент / Browser компенсира широчина Гринуич (секунди)
 DaylingSavingTime=Лятното часово време
-CurrentHour=PHP Time (server)
-CompanyTZ=Company Time Zone (main company)
-CompanyHour=Company Time (main company)
+CurrentHour=Час на PHP (сървър)
+CompanyTZ=Часова зона на фирмата (основна фирма)
+CompanyHour=Час на фирмата (основна фирма)
 CurrentSessionTimeOut=Продължителност на текущата сесия
 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 околната среда
 Box=Кутия
 Boxes=Кутии
 MaxNbOfLinesForBoxes=Максимален брой на редовете за кутии
-PositionByDefault=Подразбиране за
-Position=Position
+PositionByDefault=Default order
+Position=Длъжност
 MenusDesc=Менюта мениджърите определят съдържанието на две ленти с менюта (хоризонтална лента и вертикална лента).
 MenusEditorDesc=Менюто редактор ви позволяват да определите персонализирани вписвания в менютата. Използвайте го внимателно, за да се избегне dolibarr нестабилна и записи в менюто постоянно недостижим. <br> Някои модули добавяне на записи в менютата (в менюто <b>Всички</b> в повечето случаи). Ако сте премахнали някои от тези записи по погрешка, можете да ги възстановите, като изключите и отново да активирате модула.
 MenuForUsers=Меню за потребители
-LangFile=.lang file
+LangFile=.lang файл
 System=Система
 SystemInfo=Системна информация
 SystemTools=Системни инструменти
@@ -171,7 +171,7 @@ ImportMethod=Внос метод
 ToBuildBackupFileClickHere=За изграждането на резервно копие на файла, натиснете <a href="%s">тук</a> .
 ImportMySqlDesc=За да импортирате архивния файл, трябва да използвате MySQL команда от командния ред:
 ImportPostgreSqlDesc=За да импортирате архивния файл, трябва да използвате pg_restore команда от командния ред:
-ImportMySqlCommand=%s %s &lt;mybackupfile.sql
+ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=Име на генерирания файл
 Compression=Компресия
@@ -210,8 +210,8 @@ ModulesMarketPlaces=Повече модули ...
 DoliStoreDesc=DoliStore, официалният пазар за външни модули за Dolibarr ERP/CRM
 WebSiteDesc=Доставчици на уеб сайта можете да търсите да намерите повече модули ...
 URL=Връзка
-BoxesAvailable=Кутии наличните
-BoxesActivated=Кутии активира
+BoxesAvailable=Налични Кутии
+BoxesActivated=Активирани Кутии
 ActivateOn=Активиране на
 ActiveOn=Активирана
 SourceFile=Изходният файл
@@ -238,7 +238,7 @@ OfficialWebSiteFr=Френски официален уеб сайт
 OfficialWiki=Dolibarr документация на Wiki
 OfficialDemo=Dolibarr онлайн демо
 OfficialMarketPlace=Официален магазин за външни модули/добавки
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+OfficialWebHostingService=Препоръчителен уеб хостинг услуги (хостинг в интернет облак)
 ReferencedPreferredPartners=Preferred Partners
 OtherResources=Autres ressources
 ForDocumentationSeeWiki=Документация за потребител или разработчик (Doc, често задавани въпроси ...), <br> можете да намерите в Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
@@ -283,11 +283,11 @@ ModuleFamilyProjects=Проекти / съвместна работа
 ModuleFamilyOther=Друг
 ModuleFamilyTechnic=Mutli модули инструменти
 ModuleFamilyExperimental=Експериментални модули
-ModuleFamilyFinancial=Финансови Модули (Счетоводство / Каса)
+ModuleFamilyFinancial=Финансови Модули (Счетоводство/Каса)
 ModuleFamilyECM=Електронно Управление на Съдържанието (ECM)
 MenuHandlers=Меню работещи
 MenuAdmin=Menu Editor
-DoNotUseInProduction=Do not use in production
+DoNotUseInProduction=Не използвайте на продукшън платформа
 ThisIsProcessToFollow=Това е настройка на процеса:
 StepNb=Стъпка %s
 FindPackageFromWebSite=Намери пакет, който осигурява функция искате (например относно официалния уеб сайт %s).
@@ -302,7 +302,7 @@ CurrentVersion=Текуща версия на Dolibarr
 CallUpdatePage=Отидете на страницата, която се актуализира структурата на базата данни и презареждане на: %s.
 LastStableVersion=Последна стабилна версия
 GenericMaskCodes=Можете да въведете всяка маска за номериране. В тази маска, могат да се използват следните тагове: <br> <b>{000000}</b> съответства на номер, който се увеличава на всеки %s. Влез като много нули като желаната дължина на брояча. Броячът ще бъде завършен с нули от ляво, за да има колкото се може повече нули като маска. <br> <b>{000000 000}</b> същата като предишната, но компенсира, съответстваща на броя на правото на знака + се прилага започва на първи %s. <br> <b>{000000 @}</b> същата като предишната, но броячът се нулира, когато месеца Х е достигнал (Х между 1 и 12, или 0, за да използвате началото на месеца на фискалната година, определени в вашата конфигурация). Ако тази опция се използва и х е 2 или по-висока, тогава последователност {гг} {mm} или {гггг} {mm} също е задължително. <br> <b>{DD}</b> ден (01 до 31). <br> <b>{Mm}</b> месец (01 до 12). <br> <b>{Гг} {гггг}</b> или <b>{Y}</b> година над 2, 4 или 1 брой. <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>
+GenericMaskCodes2=<b>{cccc}</b> клиентския код в знака n <br><b>{cccc000}</b>клиентския код в знак n се следва от брояч предназначен за клиента. Този брояч предназначен за клиента се нулира в същото време в което и глобалния брояч.<br><b>{tttt}</b> Кодът на типа трети страни в знака n (погледнете речник-типове трети страни).<br>
 GenericMaskCodes3=Всички други символи на маската ще останат непокътнати. <br> Интервалите не са разрешени. <br>
 GenericMaskCodes4a=<u>Пример за използване на 99 %s на третата страна КОМПАНИЯТА извършва 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Пример за трета страна е създаден на 2007-03-01:</u> <br>
@@ -437,8 +437,8 @@ Module52Name=Запаси
 Module52Desc=Управление на склад (продукти)
 Module53Name=Услуги
 Module53Desc=Управление на услуги
-Module54Name=Договори
-Module54Desc=Управлението на договорите и услуги
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
 Module55Name=Баркодове
 Module55Desc=Управление на баркод
 Module56Name=Телефония
@@ -475,8 +475,8 @@ Module320Name=RSS емисия
 Module320Desc=Добавяне на RSS емисия в страниците на Dolibarr
 Module330Name=Отметки
 Module330Desc=Управление на отметки
-Module400Name=Проекти
-Module400Desc=Управление на проекти вътре в други модули
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
 Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграция
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module600Name=Известия
-Module600Desc=Изпращане известия по имейл за някои бизнес събития в Dolibarr към трети лица
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Дарения
 Module700Desc=Управление на дарения
 Module1200Name=Богомолка
@@ -514,16 +514,16 @@ Module5000Name=Няколко фирми
 Module5000Desc=Позволява ви да управлявате няколко фирми
 Module6000Name=Workflow
 Module6000Desc=Workflow management
-Module20000Name=Отпуски
-Module20000Desc=Управление на отпуските на служителите
+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
 Module50000Name=Paybox
 Module50000Desc=Модул предлага онлайн страница на плащане с кредитна карта с Paybox
 Module50100Name=Точка на продажбите
 Module50100Desc=Точка на продажбите модул
-Module50200Name= Paypal
-Module50200Desc= Модул предлага онлайн страница на плащане с кредитна карта с Paypal
+Module50200Name=Paypal
+Module50200Desc=Модул предлага онлайн страница на плащане с кредитна карта с Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Нареждания за периодични преводи
 Permission152=Създаване / промяна на постоянни нареждания, искане
 Permission153=Кутия постоянни нареждания разписки
 Permission154=Кредит / отказват постоянни постъпления поръчки
-Permission161=Прочети договори
-Permission162=Създаване / промяна на договорите
-Permission163=Активиране на услугата на договор
-Permission164=Изключване услуга на договор
-Permission165=Изтриване на договори
-Permission171=Прочети пътувания
-Permission172=Създаване / промяна пътувания
-Permission173=Изтриване пътувания
-Permission178=Износ пътувания
+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
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
 Permission180=Прочети доставчици
 Permission181=Доставчика поръчки
 Permission182=Създаване / промяна на доставчика поръчки
@@ -671,7 +672,7 @@ Permission300=Баркодове
 Permission301=Създаване / промяна на баркодове
 Permission302=Изтриване на баркодове
 Permission311=Прочети услуги
-Permission312=Присвояване услуга за сключване на договор
+Permission312=Assign service/subscription to contract
 Permission331=Прочетете отметките
 Permission332=Създаване / промяна на отметки
 Permission333=Изтриване на отметки
@@ -701,8 +702,8 @@ Permission701=Прочети дарения
 Permission702=Създаване / промяна на дарения
 Permission703=Изтриване на дарения
 Permission1001=Прочети запаси
-Permission1002=Създаване / промяна на запасите
-Permission1003=Изтриване на запасите
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=Движението на стоковите наличности
 Permission1005=Създаване / промяна на движението на стоковите наличности
 Permission1101=Поръчките за доставка
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
 OnlyFollowingModulesAreOpenedToExternalUsers=Имайте впредвид, че само следните модули са отворени за външни потребители (каквито и да са правата на тези потребители):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
 YouUseBestDriver=You use driver %s that is best driver available currently.
 YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
 NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Връщане счетоводна код, постр
 ModuleCompanyCodePanicum=Връща празна код счетоводство.
 ModuleCompanyCodeDigitaria=Счетоводството код зависи от код на трето лице. Код се състои от буквата &quot;C&quot; на първа позиция, следван от първите 5 символа на код на трета страна.
 UseNotifications=Използвайте уведомления
-NotificationsDesc=Функцията за уведомления по имейл позволява тихо изпращане на автоматичен мейл, за някои събития в Dolibarr, на трети лица (клиенти и доставчици), които са конфигурирани. Избор на активно уведомяване и цели контакти е направен на една трета страна в момента.
+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.
 ModelModules=Документи шаблони
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Воден знак върху проект на документ
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Добавяне на способността дат
 UseOptionLineIfNoQuantity=Линия на продукт / услуга с нулева сума се разглежда като вариант
 FreeLegalTextOnProposal=Свободен текст на търговски предложения
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### Orders #####
 OrdersSetup=Настройки за управление на поръчки
 OrdersNumberingModules=Поръчки номериране модули
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
 ValidOrderAfterPropalClosed=Да се потвърди ред след предложението близо, това прави възможно да не се увеличат с временния ред
 FreeLegalTextOnOrders=Свободен текст на поръчки
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 ##### Clicktodial #####
 ClickToDialSetup=Кликнете, за да наберете настройка модул
 ClickToDialUrlDesc=Адреса нарича, когато се извършва едно кликване на телефона пиктограма. URL, можете да използвате маркери <br> <b>__PHONETO__,</b> Които ще бъдат заменени с телефонния номер на лицето, да се обадите <br> <b>__PHONEFROM__,</b> Че ще бъде заменен с телефонния номер на повикващата лице (твое) <br> <b>__LOGIN__,</b> Които ще бъдат заменени с clicktodial вход (определено на вашето потребителско карта) <br> <b>__PASS__,</b> Които ще бъдат заменени с clicktodial вашата парола (определено на вашето потребителско карта).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Модули за намеса номериране
 TemplatePDFInterventions=Намеса карти документи модели
 WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
 ##### Contracts #####
-ContractsSetup=Договори модул за настройка
+ContractsSetup=Contracts/Subscriptions module setup
 ContractsNumberingModules=Договори за номериране модули
 TemplatePDFContracts=Contracts documents models
 FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 ##### Products #####
 ProductSetup=Продукти модул за настройка
 ServiceSetup=Услуги модул за настройка
@@ -1382,9 +1384,10 @@ MailingSetup=Настройка на модул Имейли
 MailingEMailFrom=Изпращач (От) за имейли, изпратени от модула за електронна поща
 MailingEMailError=Върнете имейл (грешки) за имейли с грешки
 ##### Notification #####
-NotificationSetup=Настройки на модул за уведомление по e-mail
+NotificationSetup=EMail notification module setup
 NotificationEMailFrom=Изпращач (От) за имейли, изпратени за уведомления
-ListOfAvailableNotifications=Списък на наличните уведомления (Този списък зависи от активирани модули)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
 ##### Sendings #####
 SendingsSetup=Изпращане модул за настройка
 SendingsReceiptModel=Изпращане получаване модел
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Връзка към &quot;%s&quot; сървър на &quot;%s&q
 OSCommerceTestKo1=Свързване към сървър &quot;%s успее, но база данни&quot; %s &quot;не може да бъде постигнато.
 OSCommerceTestKo2=Връзка към сървъра &quot;%s&quot; с потребителя %s &quot;се провали.
 ##### Stock #####
-StockSetup=Наличност модулна конфигурация
-UserWarehouse=Използване на потребителски поименни акции
+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.
 ##### Menu #####
 MenuDeleted=Меню заличават
 TreeMenu=Tree менюта
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Този модул позволява да добавите и
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Точка на продажбите
 CashDeskSetup=Точка на продажбите модул за настройка
-CashDeskThirdPartyForSell=Generic трета страна да използва за продава
+CashDeskThirdPartyForSell=Default generic third party to use for sells
 CashDeskBankAccountForSell=Акаунт по подразбиране да се използва за получаване на парични плащания
 CashDeskBankAccountForCheque= Акаунт по подразбиране да се използва за получаване на плащания с чек
 CashDeskBankAccountForCB= Акаунт по подразбиране да се използва за получаване на парични плащания с кредитни карти
-CashDeskIdWareHouse=Склад да се използва за продава
+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.
 ##### Bookmark #####
 BookmarkSetup=Bookmark настройка модул
 BookmarkDesc=Този модул ви позволява да управлявате отметките. Можете да добавяте преки пътища към страници на Dolibarr или външни уеб сайтове в лявото меню.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 Opened=Opened
 Closed=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
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/htdocs/langs/bg_BG/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Автоматично попълване
 AgendaAutoActionDesc= Определете тук събития, за които искате Dolibarr да създадете автоматично събитие в дневния ред. Ако нищо не се проверява (по подразбиране), само ръчни действия ще бъдат включени в дневния ред.
 AgendaSetupOtherDesc= Тази страница предоставя възможности да се допусне износ на вашите събития Dolibarr в външен календар (Thunderbird, Google Calendar, ...)
 AgendaExtSitesDesc=Тази страница позволява да се обяви външните източници на календари, за да видят своите събития в дневния ред Dolibarr.
-ActionsEvents= Събития, за които Dolibarr ще създаде действие в дневния ред автоматично
-PropalValidatedInDolibarr= Proposal %s validated
-InvoiceValidatedInDolibarr= Фактура %s валидирани
+ActionsEvents=Събития, за които Dolibarr ще създаде действие в дневния ред автоматично
+PropalValidatedInDolibarr=Proposal %s validated
+InvoiceValidatedInDolibarr=Фактура %s валидирани
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Фактура %s се върнете в състояние на чернова
 InvoiceDeleteDolibarr=Invoice %s deleted
 OrderValidatedInDolibarr= Поръчка %s валидирани
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Поръчка %s одобрен
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Поръчка %s се върне в състояние на чернова
 OrderCanceledInDolibarr=Поръчка %s отменен
-InterventionValidatedInDolibarr=Намеса %s валидирани
 ProposalSentByEMail=Търговски %s предложението, изпратено по електронна поща
 OrderSentByEMail=, Изпратени по електронната поща %s поръчка на клиента
 InvoiceSentByEMail=, Изпратени по електронната поща %s клиенти фактура
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=%s доставчик реда, изпратени по
 SupplierInvoiceSentByEMail=, Изпратени по електронната поща %s доставчик фактура
 ShippingSentByEMail=Доставка %s изпращат по електронна поща
 ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Намеса %s изпращат по електронна поща
-InterventionClassifiedBilled=Intervention %s classified as Billed
 NewCompanyToDolibarr= Създадено от трета страна
 DateActionPlannedStart= Планирана начална дата
 DateActionPlannedEnd= Планирана крайна дата
@@ -70,9 +68,9 @@ DateActionStart= Начална дата
 DateActionEnd= Крайна дата
 AgendaUrlOptions1=Можете да добавите и следните параметри, за да филтрирате изход:
 AgendaUrlOptions2=<b>вход = %s</b> да ограничи изход към действия, създадени от засегнати или направено от потребителя <b>%s.</b>
-AgendaUrlOptions3=<b>logina = %s</b> да се ограничи производството на действията, създадени от потребителя <b>%s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint = %s</b> да се ограничи производството на действията, засегнати на потребителските <b>%s.</b>
-AgendaUrlOptions5=<b>logind = %s</b> да се ограничи производството за действия, извършени от потребителя <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Показване на контактите, които имат рожден ден
 AgendaHideBirthdayEvents=Скриване на контактите, които имат рожден ден
 Busy=Зает
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL адрес за достъп до файла .Ical
 ExtSiteNoLabel=Няма описание
 WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
 MyAvailability=My availability
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Кредитно известие
 InvoiceAvoirAsk=Кредитно известие за коригиране на фактура
 InvoiceAvoirDesc=<b>Кредитно известие</b> е отрицателна фактура, използвани за решаване на факта, че фактурата е сумата, която се различава от сумата, наистина са платени (защото платил твърде много от грешка, или няма да се изплаща напълно, тъй като той се върна някои продукти, например).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
 ReplaceInvoice=Сменете фактура %s
 ReplacementInvoice=Подмяна фактура
 ReplacedByInvoice=Заменен с фактура %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Класифициране 'Изоставено'
 ClassifyClosed=Класифициране 'Затворено'
 ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=Създаване на фактура
-AddBill=Добави фактура или кредитно известие
+AddBill=Create invoice or credit note
 AddToDraftInvoices=Add to draft invoice
 DeleteBill=Изтриване на фактура
 SearchACustomerInvoice=Търсене за клиент фактура
@@ -99,7 +99,7 @@ DoPaymentBack=Направете плащане със задна дата
 ConvertToReduc=Конвертиране в бъдеще отстъпка
 EnterPaymentReceivedFromCustomer=Въведете получено плащане от клиент
 EnterPaymentDueToCustomer=Дължимото плащане на клиента
-DisabledBecauseRemainderToPayIsZero=Хора с увреждания, тъй като остатъка за плащане е равна на нула
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=Размер
 PriceBase=Цена база
 BillStatus=Състояние на фактурата
@@ -137,8 +137,6 @@ BillFrom=От
 BillTo=За
 ActionsOnBill=Действия по фактура
 NewBill=Нова фактура
-Prélèvements=Постоянния цел
-Prélèvements=Постоянния цел
 LastBills=Последните %s фактури
 LastCustomersBills=Последните %s фактури на клиенти
 LastSuppliersBills=Последните %s фактури на доставчици
@@ -156,9 +154,9 @@ ConfirmCancelBill=Сигурен ли сте, че искате да отмен
 ConfirmCancelBillQuestion=Защо искате да класифицирате тази фактура като "изоставена"?
 ConfirmClassifyPaidPartially=Сигурен ли сте, че искате да промените фактура <b>%s</b> до статута на платен?
 ConfirmClassifyPaidPartiallyQuestion=Тази фактура не е платена изцяло. Какви са причините за да се затвори тази фактура?
-ConfirmClassifyPaidPartiallyReasonAvoir=Остатък за плащане <b>(%s %s)</b> е отстъпка, предоставена, тъй като плащането е направено преди термина. Нормализира ДДС кредитно известие.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Остатък за плащане <b>(%s %s)</b> е отстъпка, предоставена, тъй като плащането е направено преди термина. Приемам да губят ДДС върху тази отстъпка.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Остатък за плащане <b>(%s %s)</b> е отстъпка, предоставена, тъй като плащането е направено преди термина. Възстановяване на ДДС върху тази отстъпка, без кредитно известие.
+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 клиента
 ConfirmClassifyPaidPartiallyReasonProductReturned=Продукти частично се завръща
 ConfirmClassifyPaidPartiallyReasonOther=Сума, изоставен за друга причина
@@ -191,9 +189,9 @@ AlreadyPaid=Вече е платена
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Вече е платена (без кредитни известия и депозити)
 Abandoned=Изоставен
-RemainderToPay=Остатък за плащане
-RemainderToTake=Остатък да предприеме
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
 Rest=Pending
 AmountExpected=Претендираната сума
 ExcessReceived=Превишение получи
@@ -219,19 +217,18 @@ NoInvoice=Липса на фактура
 ClassifyBill=Класифициране на фактурата
 SupplierBillsToPay=Доставчици фактури за плащане
 CustomerBillsUnpaid=Неплатени фактури на клиентите
-DispenseMontantLettres=Законопроектът, изготвен от механографски са освободени от реда, в писма
-DispenseMontantLettres=Законопроектът, изготвен от механографски са освободени от реда, в писма
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
 NonPercuRecuperable=Невъзстановими
 SetConditions=Задайте условията за плащане
 SetMode=Задайте режим на плащане
 Billed=Таксува
-RepeatableInvoice=Предварително дефиниран фактура
-RepeatableInvoices=Предварително дефинирани фактури
-Repeatable=Предварително дефинирани
-Repeatables=Предварително дефинирани
-ChangeIntoRepeatableInvoice=Конвертиране в предварително определен
-CreateRepeatableInvoice=Създаване на предварително определен фактура
-CreateFromRepeatableInvoice=Създаване на предварително определен фактура
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
 CustomersInvoicesAndInvoiceLines=Клиенти фактури и фактури линии
 CustomersInvoicesAndPayments=Фактури и плащания на клиентите
 ExportDataset_invoice_1=Фактури списък с клиенти и фактура линии
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
 CatCusLinks=Links between customers/prospects and categories
 CatProdLinks=Links between products/services and categories
 CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
 DeleteFromCat=Премахване от категорията
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
 CategorieRecursiv=Link with parent category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad код отчетност за клие
 SuppliersProductsSellSalesTurnover=Генерираният оборот от продажбите на продуктите на доставчика.
 CheckReceipt=Проверете депозит
 CheckReceiptShort=Проверете депозит
+LastCheckReceiptShort=Last %s check receipts
 NewCheckReceipt=Нов отстъпка
 NewCheckDeposit=Нова проверка депозит
 NewCheckDepositOn=Създаване на разписка за депозит по сметка: %s
@@ -199,11 +200,11 @@ 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_SERVICE_SOLD_ACCOUNT=Счетоводен код по подразбиране за продажба на услуги
+ACCOUNTING_VAT_ACCOUNT=Счетоводен код по подразбиране за начисляване на ДДС
+ACCOUNTING_VAT_BUY_ACCOUNT=Счетоводен код по подразбиране за плащане на ДДС
 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
+CloneTax=Клониране на социално-осигурителни вноски
+ConfirmCloneTax=Потвърдете клонирането на социално-осигурителните вноски
+CloneTaxForNextMonth=Клониране за следващ месец
--- a/htdocs/langs/bg_BG/contracts.lang
+++ b/htdocs/langs/bg_BG/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Договори област
 ListOfContracts=Списък на договорите
-LastContracts=Последните %s променени договори
+LastModifiedContracts=Last %s modified contracts
 AllContracts=Всички договори
 ContractCard=Карта на договор
 ContractStatus=Договор статус
@@ -27,7 +27,7 @@ MenuRunningServices=Текущи услуги
 MenuExpiredServices=Изтекли услуги
 MenuClosedServices=Затворени услуги
 NewContract=Нов договор
-AddContract=Добави договор
+AddContract=Create contract
 SearchAContract=Търсене на договора
 DeleteAContract=Изтриване на договора
 CloseAContract=Затваряне на договора
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Списък на линиите на движени
 ListOfRunningServices=Списък на стартираните услуги
 NotActivatedServices=Неактивни услуги (сред валидирани договори)
 BoardNotActivatedServices=Услуги за да активирате сред утвърдени договори
-LastContracts=Последните %s променени договори
+LastContracts=Last % contracts
 LastActivatedServices=Последните %s активирани услуги
 LastModifiedServices=Последните %s променени услуги
 EditServiceLine=Редактиране на сервизна линия
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -1,10 +1,8 @@
 # Dolibarr language file - Source file is en_US - cron
-#
 # About page
 About = За
 CronAbout = About Cron
 CronAboutPage = Cron about page
-
 # Right
 Permission23101 = Read Scheduled task
 Permission23102 = Create/update Scheduled task
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
 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 jobs
-CronListInactive= List of disabled jobs
-CronListActive= List of active jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
 # Page list
 CronDateLastRun=Last run
 CronLastOutput=Last run output
@@ -77,13 +74,13 @@ CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dol
 CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
 CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
 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.
+CronCommandHelp=Системния команден ред за стартиране.
 # Info
-CronInfoPage=Information
+CronInfoPage=Информация
 # Common
-CronType=Task type
+CronType=Тип на задачата
 CronType_method=Call method of a Dolibarr Class
-CronType_command=Shell command
-CronMenu=Cron
-CronCannotLoadClass=Cannot load class %s or object %s
+CronType_command=Терминална команда
+CronMenu=Крон (софтуер за изпънение на автоматични задачи)
+CronCannotLoadClass=Неможе да се зареди класа %s или обекта %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
--- a/htdocs/langs/bg_BG/donations.lang
+++ b/htdocs/langs/bg_BG/donations.lang
@@ -4,7 +4,7 @@ Donations=Дарения
 DonationRef=Дарение
 Donor=Дарител
 Donors=Дарители
-AddDonation=Добавяне на дарение
+AddDonation=Create a donation
 NewDonation=Ново дарение
 ShowDonation=Показване на дарение
 DonationPromise=Обещано дарение
@@ -30,4 +30,9 @@ SearchADonation=Търсене на дарение
 DonationRecipient=Получател на дарението
 ThankYou=Благодарим Ви!
 IConfirmDonationReception=Получателят декларира, че е получил дарение на стойност
-MinimumAmount=Minimum amount is  %s
+MinimumAmount=Минималното количество е %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
--- a/htdocs/langs/bg_BG/externalsite.lang
+++ b/htdocs/langs/bg_BG/externalsite.lang
@@ -2,3 +2,4 @@
 ExternalSiteSetup=Настройка на линк към външен сайт
 ExternalSiteURL=Външен URL адрес на сайта
 ExternalSiteModuleNotComplete=Модула Външен сайт не е конфигуриран правилно.
+ExampleMyMenuEntry=My menu entry
--- a/htdocs/langs/bg_BG/holiday.lang
+++ b/htdocs/langs/bg_BG/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
 ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
 CantCreateCP=You don't have the right to make leave requests.
 InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Актуализация
 CantUpdate=You cannot update this leave request.
 NoDateDebut=Трябва да изберете началната дата.
 NoDateFin=Трябва да изберете крайна дата.
-ErrorDureeCP=Вашето искане за почивка не съдържа работен ден.
-TitleValidCP=Утвърждава искането за отпуск
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
 ConfirmValidCP=Are you sure you want to approve the leave request?
 DateValidCP=Дата на утвърждаване
 TitleToValidCP=Send leave request
 ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Отхвърляне на заявлението за отпуск
+TitleRefuseCP=Refuse the leave request
 ConfirmRefuseCP=Are you sure you want to refuse the leave request?
 NoMotifRefuseCP=Вие трябва да изберете причина за отказ на искането.
-TitleCancelCP=Анулира заявката празници
+TitleCancelCP=Cancel the leave request
 ConfirmCancelCP=Are you sure you want to cancel the leave request?
 DetailRefusCP=Причина за отказа
 DateRefusCP=Дата на отказ
@@ -78,7 +77,7 @@ ActionByCP=В изпълнение на
 UserUpdateCP=За потребителя
 PrevSoldeCP=Предишен баланс
 NewSoldeCP=Нов баланс
-alreadyCPexist=Вече е направено искане за отпуск за този период.
+alreadyCPexist=A leave request has already been done on this period.
 UserName=Име
 Employee=Служители
 FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation

 ## Configuration du Module ##
-ConfCP=Настройки на модула за отпуски
+ConfCP=Configuration of leave request module
 DescOptionCP=Описание на опцията
 ValueOptionCP=Стойност
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Потвърждаване на конфигурацията
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
 UpdateConfCPOK=Актуализира се успешно.
 ErrorUpdateConfCP=Възникна грешка по време на актуализацията, моля опитайте отново.
-AddCPforUsers=Моля, добавете баланса на празниците на потребителите, като <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">кликнете тук</a> .
-DelayForSubmitCP=Краен срок за кандидатстване за отпуск
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
 AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
 AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
 nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
 TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Проверка на
 UpdateEventCP=Актуализиране на събития
--- a/htdocs/langs/bg_BG/interventions.lang
+++ b/htdocs/langs/bg_BG/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Намеса
 Interventions=Интервенциите
 InterventionCard=Интервенция карта
 NewIntervention=Нов намеса
-AddIntervention=Добави намеса
+AddIntervention=Create intervention
 ListOfInterventions=Списък на интервенциите
 EditIntervention=Редактиране намеса
 ActionsOnFicheInter=Действия на интервенцията
@@ -24,12 +24,21 @@ NameAndSignatureOfInternalContact=Име и подпис на намеса:
 NameAndSignatureOfExternalContact=Име и подпис на клиента:
 DocumentModelStandard=Стандартен документ модел за интервенции
 InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyBilled=Класифицирай като "Таксувани"
+InterventionClassifyUnBilled=Класифицирай като "Нетаксувани"
 StatusInterInvoiced=Таксува
 RelatedInterventions=Подобни интервенции
 ShowIntervention=Покажи намеса
 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
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Представител проследяване намеса
 TypeContact_fichinter_internal_INTERVENING=Намеса
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -115,7 +115,7 @@ SentBy=Изпратено от
 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=Все пак можете да ги изпратите онлайн чрез добавяне на параметър MAILING_LIMIT_SENDBYWEB със стойност на максимален брой на имейлите, които искате да изпратите от сесията. За това, отидете на дома - Setup - Други.
 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: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+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.
 TargetsReset=Изчисти списъка
 ToClearAllRecipientsClickHere=Щракнете тук, за да изчистите списъка на получателите за този електронната поща
 ToAddRecipientsChooseHere=Добавяне на получатели, като изберете от списъците
@@ -133,6 +133,9 @@ Notifications=Известия
 NoNotificationsWillBeSent=Не са планирани за това събитие и компания известия по имейл
 ANotificationsWillBeSent=1 уведомление ще бъде изпратено по имейл
 SomeNotificationsWillBeSent=%s уведомления ще бъдат изпратени по имейл
-AddNewNotification=Активиране на ново искане за уведомяване имейл
-ListOfActiveNotifications=Списък на всички активни заявки за уведомяване имейл
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
 ListOfNotificationsDone=Списък на всички имейли, изпратени уведомления
+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.
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -34,7 +34,7 @@ ErrorFailedToOpenFile=Файла %s не може да се отвори
 ErrorCanNotCreateDir=Не може да се създаде папка %s
 ErrorCanNotReadDir=Не може да се прочете директорията %s
 ErrorConstantNotDefined=Параметъра %s не е дефиниран
-ErrorUnknown=Unknown error
+ErrorUnknown=Непозната грешка
 ErrorSQL=SQL грешка
 ErrorLogoFileNotFound=Файла '%s' с логото не е открит
 ErrorGoToGlobalSetup=Отидете на настройките 'Фирма/Организация' за да настроите параметъра
@@ -55,15 +55,15 @@ ErrorDuplicateField=Дублирана стойност в поле с уник
 ErrorSomeErrorWereFoundRollbackIsDone=Някои бяха открити грешки. Ние намаление на цените промени.
 ErrorConfigParameterNotDefined=Параметъра <b>%s</b> не е дефиниран в конфигурационния файл на Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Не можа да се намери потребител <b>%s</b> в базата данни на Dolibarr.
-ErrorNoVATRateDefinedForSellerCountry=Грешка, без ДДС ставки, определени за &quot;%s&quot; страна.
+ErrorNoVATRateDefinedForSellerCountry=Грешка, няма дефинирани ДДС ставки, за държавата '%s'.
 ErrorNoSocialContributionForSellerCountry=Грешка, не е социален тип участие, определено за &quot;%s&quot; страна.
 ErrorFailedToSaveFile=Грешка, файла не е записан.
-ErrorOnlyPngJpgSupported=Грешка, поддържат се само PNG и JPG формати на изображението.
-ErrorImageFormatNotSupported=Вашият PHP не поддържа функции за конвертиране на изображения от този формат.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=Вижте също %s
 BackgroundColorByDefault=Подразбиращ се цвят на фона
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=Файлът е избран за прикачане, но все още не е качен. Кликнете върху &quot;Прикачи файл&quot;.
 NbOfEntries=Брой на записите
 GoToWikiHelpPage=Прочетете онлайн помощта (Нуждаете се от достъп до интернет)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
 HourShort=H
+MinuteShort=Минута
 Rate=Процент
 UseLocalTax=с данък
 Bytes=Байта
@@ -340,6 +341,7 @@ FullList=Пълен списък
 Statistics=Статистика
 OtherStatistics=Други статистически данни
 Status=Състояние
+Favorite=Favorite
 ShortInfo=Инфо.
 Ref=Реф.
 RefSupplier=Реф. снабдител
@@ -365,6 +367,7 @@ ActionsOnCompany=Събития за тази трета страна
 ActionsOnMember=Събития за този член
 NActions=%s събития
 NActionsLate=%s със забавено плащане
+RequestAlreadyDone=Request already recorded
 Filter=Филтър
 RemoveFilter=Премахване на филтъра
 ChartGenerated=Графиката е генерирана
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Допълнителни атрибути за настро
 URLPhoto=URL на снимка/лого
 SetLinkToThirdParty=Връзка към друга трета страна
 CreateDraft=Създаване на проект
+SetToDraft=Back to draft
 ClickToEdit=Кликнете, за да редактирате
 ObjectDeleted=Обекта %s е изтрит
 ByCountry=По държава
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-
+SelectElementAndClickRefresh=Изберете елемент и натиснете Презареждане
 # Week day
 Monday=Понеделник
 Tuesday=Вторник
--- a/htdocs/langs/bg_BG/margins.lang
+++ b/htdocs/langs/bg_BG/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+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
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/htdocs/langs/bg_BG/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Пратка съществува
 DraftOrWaitingApproved=Проект или одобрен, все още не е осъден
 DraftOrWaitingShipped=Проект или потвърдено все още не са изпратени
 MenuOrdersToBill=Доставени поръчки
-MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
 SearchOrder=Търсене за
 SearchACustomerOrder=Search a customer order
 ShipProduct=Кораб продукт
@@ -65,7 +65,7 @@ ValidateOrder=Валидиране за
 UnvalidateOrder=Unvalidate за
 DeleteOrder=Изтрий заявка
 CancelOrder=Отказ за
-AddOrder=Добави за
+AddOrder=Create order
 AddToMyOrders=Добави към моите заповеди
 AddToOtherOrders=Добави към други поръчки
 AddToDraftOrders=Add to draft order
@@ -154,7 +154,6 @@ OrderByPhone=Телефон
 CreateInvoiceForThisCustomer=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-MenuOrdersToBill2=Orders to bill
 OrderCreation=Order creation
 Ordered=Ordered
 OrderCreated=Your orders have been created
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Код за сигурност
 Calendar=Календар
-AddTrip=Добави пътуване
 Tools=Инструменти
 ToolsDesc=Тази област е посветена на група разни инструменти, достъпни в други вписвания в менюто. <br><br> Тези инструменти могат да бъдат достигнати от менюто на страната.
 Birthday=Рожден ден
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
 NbOfAttachedFiles=Брой на прикачените файлове/документи
 TotalSizeOfAttachedFiles=Общ размер на прикачените файлове/документи
 MaxSize=Максимален размер
@@ -80,6 +80,16 @@ ModifiedBy=Променено от %s
 ValidatedBy=Потвърдено от %s
 CanceledBy=Анулирано от %s
 ClosedBy=Затворен от %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
 FileWasRemoved=Файла %s беше премахнат
 DirWasRemoved=Директорията %s беше премахната
 FeatureNotYetAvailableShort=Предлага се в следващата версия
@@ -193,25 +203,26 @@ ForgetIfNothing=Ако не сте заявили промяната, прост

 ##### Calendar common #####
 AddCalendarEntry=Добави запис в календара %s
-NewCompanyToDolibarr=Фирмата %s е добавена в Dolibarr
-ContractValidatedInDolibarr=Поръчки %s заверени в Dolibarr
-ContractCanceledInDolibarr=Поръчки %s анулирани през Dolibarr
-ContractClosedInDolibarr=Поръчки %s затворен в Dolibarr
-PropalClosedSignedInDolibarr=Предложение %s подписан в Dolibarr
-PropalClosedRefusedInDolibarr=Предложение %s отказва Dolibarr
-PropalValidatedInDolibarr=Предложение %s заверени в Dolibarr
-InvoiceValidatedInDolibarr=Фактура %s заверени в Dolibarr
-InvoicePaidInDolibarr=Фактура променени %s на платен в Dolibarr
-InvoiceCanceledInDolibarr=Фактура %s, анулирани през Dolibarr
-PaymentDoneInDolibarr=Плащане %s направено в Dolibarr
-CustomerPaymentDoneInDolibarr=Клиентско плащане %s направено в Dolibarr
-SupplierPaymentDoneInDolibarr=Доставчик на платежни %s направи в Dolibarr
-MemberValidatedInDolibarr=Държавите-%s, заверени в Dolibarr
-MemberResiliatedInDolibarr=%s изключени членове в Dolibarr
-MemberDeletedInDolibarr=Държавите-%s изтрит от Dolibarr
-MemberSubscriptionAddedInDolibarr=Абонамент за държавите %s добави Dolibarr
-ShipmentValidatedInDolibarr=Превоз %s валидирани в Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+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
 ##### Export #####
 Export=Износ
 ExportsArea=Износът площ
--- a/htdocs/langs/bg_BG/paybox.lang
+++ b/htdocs/langs/bg_BG/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Съобщение за анулиране страница плаща
 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
--- a/htdocs/langs/bg_BG/resource.lang
+++ b/htdocs/langs/bg_BG/resource.lang
@@ -0,0 +1,36 @@
+
+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
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+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
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=За момента се извършва от
 RelatedShippings=Свързани shippings
 ShipmentLine=Shipment line
 CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received

 # Sending methods
 SendingMethodCATCH=Улов от клиента
@@ -74,5 +76,5 @@ SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights

 # warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty : %d)
+DetailWarehouseNumber= Склад детайли
+DetailWarehouseFormat= Тегло:%s (Количество : %d)
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Изисква се етикет на склада
 CorrectStock=Промяна на наличност
 ListOfWarehouses=Списък на складовете
 ListOfStockMovements=Списък на движението на стоковите наличности
-StocksArea=Наличности
+StocksArea=Warehouses area
 Location=Място
 LocationSummary=Кратко наименование на място
 NumberOfDifferentProducts=Брой различни продукти
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Показване на групата
 ShowUser=Покажи потребителя
 NonAffectedUsers=За засегнатите потребители
 UserModified=Потребителя е променен успешно
-GroupModified=Групата е променена успешно
 PhotoFile=Снимка
 UserWithDolibarrAccess=Потребител с Dolibarr достъп
 ListOfUsersInGroup=Списък на потребителите в групата
@@ -103,7 +102,7 @@ UserDisabled=Потребителя %s е забранен
 UserEnabled=Потребителя %s е активиран
 UserDeleted=Потребителя %s е премахнат
 NewGroupCreated=Групата %s е създадена
-GroupModified=Групата е променена успешно
+GroupModified=Group %s modified
 GroupDeleted=Групата %s е премахната
 ConfirmCreateContact=Сигурни ли сте, че желаете да създадете Dolibarr акаунт за този контакт ?
 ConfirmCreateLogin=Сигурни ли сте, че желаете да създадете Dolibarr акаунт за този член ?
@@ -114,8 +113,10 @@ YourRole=Вашите роли
 YourQuotaOfUsersIsReached=Вашата квота за активни потребители е достигната!
 NbOfUsers=Брой потребители
 DontDowngradeSuperAdmin=Само истинска черна нинджа може да убие друга черна нинджа
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
 HierarchicView=Йерархичен изглед
 UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Получаване
 LastWithdrawalReceipts=Last %s withdrawal receipts
 WithdrawedBills=Изтеглените фактури
 WithdrawalsLines=Отнемане линии
-RequestStandingOrderToTreat=Искане за постоянни нареждания за лечение
-RequestStandingOrderTreated=Искане за нареждания за периодични преводи третират
+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.
 CustomersStandingOrders=Клиентски поръчки постоянни
 CustomerStandingOrder=Заявка на клиента състояние
 NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Метод Предаване
 Send=Изпращам
 Lines=Линии
 StandingOrderReject=Издаде отхвърли
-InvoiceRefused=Фактура отказа
 WithdrawalRefused=Оттегляне Отказ
 WithdrawalRefusedConfirm=Сигурен ли сте, че искате да въведете изтегляне отказ за обществото
 RefusedData=Дата на отхвърляне
 RefusedReason=Причина за отхвърляне
 RefusedInvoicing=Фактуриране отхвърлянето
 NoInvoiceRefused=Не зареждайте отхвърляне
-InvoiceRefused=Фактура отказа
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
 Status=Статус
 StatusUnknown=Неизвестен
 StatusWaiting=Чакане
@@ -76,7 +76,7 @@ WithBankUsingRIB=За банкови сметки с помощта на RIB
 WithBankUsingBANBIC=За банкови сметки с IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Банкова сметка за получаване оттегли
 CreditDate=Кредит за
-WithdrawalFileNotCapable=Не може да се генерира файл за изтегляне разписка за вашата страна
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Покажи Теглене
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Въпреки това, ако фактурата не е все още най-малко една оттегляне плащане обработват, не се определя като плаща, за да се даде възможност да управляват оттеглянето им преди.
 DoStandingOrdersBeforePayments=Това разделите ви позволява да изисквате за постоянно нареждане. След като той ще бъде завършен, можете да въведете плащането, за да затворите фактура.
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
 Validate=Validate
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
 ToDispatch=To dispatch
 Dispatched=Dispatched

-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
 Reports=Reports
 ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
 AccountBalanceByMonth=Account balance by month

-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
 Line=Line

 CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
 IntoAccount=In the accounting account

 Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown

 Processing=Processing
 EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account

 ACCOUNTING_SEPARATORCSV=Separator CSV

-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+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

 AccountLength=Length of the accounting accounts shown in Dolibarr
 AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement

 NewFiscalYear=New fiscal year

-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover HT
 TotalMarge=Total sales margin
 DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
 DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
 ChangeAccount=Change the accounting account for lines selected by the account:
 Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
 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

@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically

 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used

-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks
 Module52Desc=Stock management (products)
 Module53Name=Services
 Module53Desc=Service management
-Module54Name=Contracts
-Module54Desc=Contract and service management
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects
-Module400Desc=Project management inside other modules
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module600Name=Notifications
-Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
 Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow - Tok rada
 Module6000Desc=Upravljanje workflow-om - tokom rada
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+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
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
 Module50100Desc=Point of sales module
-Module50200Name= Paypal
-Module50200Desc= Module to offer an online payment page by credit card with Paypal
+Module50200Name=Paypal
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Read standing orders
 Permission152=Create/modify a standing orders request
 Permission153=Transmission standing orders receipts
 Permission154=Credit/refuse standing orders receipts
-Permission161=Read contracts
-Permission162=Create/modify contracts
-Permission163=Activate a service of a contract
-Permission164=Disable a service of a contract
-Permission165=Delete contracts
-Permission171=Read trips
-Permission172=Create/modify trips
-Permission173=Delete trips
-Permission178=Export trips
+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
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
 Permission180=Read suppliers
 Permission181=Read supplier orders
 Permission182=Create/modify supplier orders
@@ -671,7 +672,7 @@ Permission300=Read bar codes
 Permission301=Create/modify bar codes
 Permission302=Delete bar codes
 Permission311=Read services
-Permission312=Assign service to contract
+Permission312=Assign service/subscription to contract
 Permission331=Read bookmarks
 Permission332=Create/modify bookmarks
 Permission333=Delete bookmarks
@@ -701,8 +702,8 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission1001=Read stocks
-Permission1002=Create/modify stocks
-Permission1003=Delete stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=Read stock movements
 Permission1005=Create/modify stock movements
 Permission1101=Read delivery orders
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
 OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatska detekcija nije moguća
 YouUseBestDriver=Možete koristiti driver %s koji je trenutno najbolji.
 YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
 NbOfProductIsLowerThanNoPb=Imate samo %s proizvoda/usluga u bazu podataka. To ne zahtijeva posebne optimizacije.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=Notifikacije E-mailovima omogućavaju vam da pošaljete automatski mail, za neke Dolibarr događaje, trećim strankama (kupci ili dobavljači) koji su prethodno konfigurirani. Izbor aktivnih notifikacija i viljanih kontakata se radi posebno za svaku treću stranku.
+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.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Add delivery date ability
 UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
 FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Vodeni žig na nacrte komercijalnih prijedloga (ništa, ako je prazno) 
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
 ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
 FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Vodeni žig na nacrte naloga (ništa, ako je prazno) 
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervention numbering models
 TemplatePDFInterventions=Intervention card documents models
 WatermarkOnDraftInterventionCards=Vodeni žig na nacrte kartica za intervencije (ništa, ako je prazno) 
 ##### Contracts #####
-ContractsSetup=Contracts module setup
+ContractsSetup=Contracts/Subscriptions module setup
 ContractsNumberingModules=Contracts numbering modules
 TemplatePDFContracts=Modeli za dokumente ugovora
 FreeLegalTextOnContracts=Slobodni tekst na ugovorima
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Fajlovi tipa %s nisu kompresovani od strane HTTP server
 CacheByServer=Keširanje na serveru
 CacheByClient=Keširanje u browser-u
 CompressionOfResources=Kompresija HTTP odgovora
-TestNotPossibleWithCurrentBrowsers=Automatska detekcija nije moguća
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1382,9 +1384,10 @@ MailingSetup=EMailing module setup
 MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
 MailingEMailError=Return EMail (Errors-to) for emails with errors
 ##### Notification #####
-NotificationSetup=Notification bu email module setup
+NotificationSetup=EMail notification module setup
 NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of available notifications (This list depends on activated modules)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
 ##### Sendings #####
 SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Use user personal stocks
+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.
 ##### Menu #####
 MenuDeleted=Menu deleted
 TreeMenu=Tree menus
@@ -1478,11 +1482,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Point of sales
 CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Generic third party to use for sells
+CashDeskThirdPartyForSell=Default generic third party to use for sells
 CashDeskBankAccountForSell=Default account to use to receive cash payments
 CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
 CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskIdWareHouse=Warehouse to use for sells
+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.
 ##### Bookmark #####
 BookmarkSetup=Bookmark module setup
 BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 Opened=Opened
 Closed=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
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/htdocs/langs/bs_BA/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatsko popunjavanje
 AgendaAutoActionDesc= Ovdje definirajte događaje za koje želite da Dolibarr automatski kreira događaj u agendi. Ukoliko se ništa ne provjerava (po defaultu), samo manualne akcije će biti uključeni u dnevni red.
 AgendaSetupOtherDesc= Ova stranica pruža mogućnosti izvoza svojih Dolibarr događaja u eksterni kalendar (Thunderbird, Google Calendar, ...)
 AgendaExtSitesDesc=Ova stranica omogućava definisanje eksternih izvora kalendara da vidite svoje događaje u Dolibarr agendi.
-ActionsEvents= Događaji za koje će Dolibarr stvoriti akciju u dnevni red automatski
-PropalValidatedInDolibarr= Prijedlog %s potvrđen
-InvoiceValidatedInDolibarr= Faktura %s potvrđena
+ActionsEvents=Događaji za koje će Dolibarr stvoriti akciju u dnevni red automatski
+PropalValidatedInDolibarr=Prijedlog %s potvrđen
+InvoiceValidatedInDolibarr=Faktura %s potvrđena
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Faktura %s vraćena u status izrade
 InvoiceDeleteDolibarr=Faktura %s obrisana
 OrderValidatedInDolibarr= Narudžba %s potvrđena
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Narudžba %s odobrena
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=NArudžbu %s vratiti u status izrade
 OrderCanceledInDolibarr=Narudžba %s otkazana
-InterventionValidatedInDolibarr=Intervencija %s potvrđena
 ProposalSentByEMail=Poslovni prijedlog %s poslan putem e-maila
 OrderSentByEMail=Narudžba za kupca %s poslana putem e-maila
 InvoiceSentByEMail=Fakture za kupca %s poslana putem e-maila
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Narudžba za dobavljača %s poslan putem e-maila
 SupplierInvoiceSentByEMail=Predračun dobavljača %s poslan putem e-maila
 ShippingSentByEMail=Dostava %s poslana putem e-maila
 ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervencija %s poslana putem e-maila
-InterventionClassifiedBilled=Intervention %s classified as Billed
 NewCompanyToDolibarr= Trća stranka kreirana
 DateActionPlannedStart= Planirani datum početka
 DateActionPlannedEnd= Planirani datum završetka
@@ -70,9 +68,9 @@ DateActionStart= Datum početka
 DateActionEnd= Datum završetka
 AgendaUrlOptions1=Također možete dodati sljedeće parametre za filtriranje prikazanog:
 AgendaUrlOptions2=<b>login =%s</b> da se ograniči prikaz na akcije kreiranje, dodiljene ili završene od strane korisnika <b>%s.</b>
-AgendaUrlOptions3=<b>logina=%s</b> da se ograniči prikaz na akcije kreirane od strane korisnika <b>%s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> da se ograniči prikaz na akcije dodijeljene korisniku <b>%s.</b>
-AgendaUrlOptions5=<b>logind=%s</b> da se ograniči prikaz na akcije završene os strane korisnika <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Prikaži rođendane kontakata
 AgendaHideBirthdayEvents=Sakrij rođendane kontakata
 Busy=Zauzet
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL za pristup .ical fajla
 ExtSiteNoLabel=Nema opisa
 WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
 MyAvailability=My availability
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
 InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
 ReplaceInvoice=Zamijeni fakturu %s
 ReplacementInvoice=Zamjenska faktura
 ReplacedByInvoice=Zamijenjeno sa fakturom %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Označi kao 'Otkazano'
 ClassifyClosed=Označi kao 'Zaključeno'
 ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=Kreiraj predračun
-AddBill=Add invoice or credit note
+AddBill=Create invoice or credit note
 AddToDraftInvoices=Dodaj na uzorak fakture
 DeleteBill=Obriši fakturu
 SearchACustomerInvoice=Traži fakturu kupca
@@ -99,7 +99,7 @@ DoPaymentBack=Izvrši povrat uplate
 ConvertToReduc=Pretvori u budući popust
 EnterPaymentReceivedFromCustomer=Unesi uplate primljene od kupca
 EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Onemogućeno, jer je ostatak za plaćanje nula
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=Iznos
 PriceBase=Price base
 BillStatus=Status fakture
@@ -137,8 +137,6 @@ BillFrom=Od
 BillTo=Račun za
 ActionsOnBill=Aktivnosti na fakturi
 NewBill=Nova faktura
-Prélèvements=Trajni nalog
-Prélèvements=Trajni nalog
 LastBills=Zadnjih %s faktura
 LastCustomersBills=Zadnjih %s faktura kupca
 LastSuppliersBills=Zadnjih %s faktura dobavljača
@@ -156,9 +154,9 @@ ConfirmCancelBill=Jeste li sigurni da želite otkazati fakturu <b>%s</b> ?
 ConfirmCancelBillQuestion=Zašto želite da se ova faktura označi kao 'otkazano'?
 ConfirmClassifyPaidPartially=Jeste li sigurni da želite promijeniti fakturu <b>%s</b> na status plaćeno?
 ConfirmClassifyPaidPartiallyQuestion=Ova faktura nije u potpunosti plaćena. Koji su razlozi za zatvaranje fakture?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <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=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=Loš kupac
 ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvodi djelomično vraćeni
 ConfirmClassifyPaidPartiallyReasonOther=Iznos otkazan zbog drugog razloga
@@ -191,9 +189,9 @@ AlreadyPaid=Već plaćeno
 AlreadyPaidBack=Već izvršen povrat uplate
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
 Abandoned=Otkazano
-RemainderToPay=Ostatak za platiti
-RemainderToTake=Ostatak za uzeti
-RemainderToPayBack=Ostatak za povrat uplate
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
 Rest=Čekanje
 AmountExpected=Iznos za potraživati
 ExcessReceived=Višak primljen
@@ -219,19 +217,18 @@ NoInvoice=Nema fakture
 ClassifyBill=Označi fakturu
 SupplierBillsToPay=Fakture dobavljača za platiti
 CustomerBillsUnpaid=NEplaćene fakture kupaca
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
 NonPercuRecuperable=Nepovratno
 SetConditions=Postaviti uslova plaćanja
 SetMode=Postaviti način plaćanja
 Billed=Fakturisano
-RepeatableInvoice=Predefinisana faktura
-RepeatableInvoices=Predefinisane fakture
-Repeatable=Predefinisano
-Repeatables=Predefinisano
-ChangeIntoRepeatableInvoice=Pretvori u predefinisano
-CreateRepeatableInvoice=Kreiraj predefinisanu fakturu
-CreateFromRepeatableInvoice=Kreiraj na osnovu predefinisane fakture
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
 CustomersInvoicesAndInvoiceLines=Fakture kupaca i tekstovi faktura
 CustomersInvoicesAndPayments=Faktura kupaca i uplate
 ExportDataset_invoice_1=Lista faktura kupaca i tekstovi faktura
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/htdocs/langs/bs_BA/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Veze između dobavljača i kategorija
 CatCusLinks=Links between customers/prospects and categories
 CatProdLinks=Veze između proizvoda/usluga i kategorija
 CatMemberLinks=Veze između članova i kategorija
-CatProdLinks=Veze između proizvoda/usluga i kategorija
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Veze između dobavljača i kategorija
 DeleteFromCat=Ukloni iz kategorije
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
 CategorieRecursiv=Link with parent category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
 SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
 CheckReceipt=Check deposit
 CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Last %s check receipts
 NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
--- a/htdocs/langs/bs_BA/contracts.lang
+++ b/htdocs/langs/bs_BA/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Područje za ugovore
 ListOfContracts=Lista ugovora
-LastContracts=Zadnji %s izmijenjeni ugovori
+LastModifiedContracts=Last %s modified contracts
 AllContracts=Svi ugovori
 ContractCard=Kartica ugovora
 ContractStatus=Status ugovora
@@ -27,7 +27,7 @@ MenuRunningServices=Aktivne usluge
 MenuExpiredServices=Istekle usluge
 MenuClosedServices=Završene usluge
 NewContract=Novi ugovor
-AddContract=Dodaj ugovor
+AddContract=Create contract
 SearchAContract=Traži kontakt
 DeleteAContract=Obrisati ugovor
 CloseAContract=Zatvori ugovor
@@ -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=Zadnji %s izmijenjeni ugovori
+LastContracts=Last % contracts
 LastActivatedServices=Zadnjih $s aktiviranih usluga
 LastModifiedServices=Zadnjih %s izmijenjenih usluga
 EditServiceLine=Izmijeni stavku usluge
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -1,10 +1,8 @@
 # Dolibarr language file - Source file is en_US - cron
-#
 # About page
 About = O programu
 CronAbout = O Cron-u
 CronAboutPage = Stranica o Cron-u
-
 # Right
 Permission23101 = Pročitaj redovne zadatke
 Permission23102 = Kreiraj/Ažuriraj redovni zadatak
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
 # Menu
 CronJobs=Scheduled jobs
-CronListActive= Lista aktivnih poslova
-CronListInactive= Lista onemogućenih poslova
-CronListActive= Lista aktivnih poslova
+CronListActive=List of active/scheduled jobs
+CronListInactive=Lista onemogućenih poslova
 # Page list
 CronDateLastRun=Zadnje pokretanje
 CronLastOutput=Izvještaj o zadnjem pokretanju
--- a/htdocs/langs/bs_BA/donations.lang
+++ b/htdocs/langs/bs_BA/donations.lang
@@ -4,7 +4,7 @@ Donations=Donacije
 DonationRef=Donacija ref.
 Donor=Donator
 Donors=Donatori
-AddDonation=Dodaj donaciju
+AddDonation=Create a donation
 NewDonation=Nova donacija
 ShowDonation=Prikaži donaciju
 DonationPromise=Obećanje za poklon
@@ -31,3 +31,8 @@ DonationRecipient=Primalac donacije
 ThankYou=Hvala Vam
 IConfirmDonationReception=Primalac potvrđuje prijem, kao donacija, slijedeći iznos
 MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
--- a/htdocs/langs/bs_BA/externalsite.lang
+++ b/htdocs/langs/bs_BA/externalsite.lang
@@ -2,3 +2,4 @@
 ExternalSiteSetup=Podesi link za eksterni web sajt
 ExternalSiteURL=Link do eksternog web sajta
 ExternalSiteModuleNotComplete=Modul ExternalSite nije konfigurisan kako treba.
+ExampleMyMenuEntry=My menu entry
--- a/htdocs/langs/bs_BA/holiday.lang
+++ b/htdocs/langs/bs_BA/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
 ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
 CantCreateCP=You don't have the right to make leave requests.
 InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Ažuriranje
 CantUpdate=You cannot update this leave request.
 NoDateDebut=Morate odabrati datum početka.
 NoDateFin=Morate odabrati datum završetka.
-ErrorDureeCP=Vaš zahtjev za godišnji odmor ne sadrži radni dan.
-TitleValidCP=Odobri zahtjev za godišnji odmor
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
 ConfirmValidCP=Are you sure you want to approve the leave request?
 DateValidCP=Datum odobrenja
 TitleToValidCP=Send leave request
 ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Odbiti zahtjev za godišnji odmor
+TitleRefuseCP=Refuse the leave request
 ConfirmRefuseCP=Are you sure you want to refuse the leave request?
 NoMotifRefuseCP=Morate odabrati razlog za odbijanje zahtjeva.
-TitleCancelCP=Poništi zahtjev za godišnji odmor
+TitleCancelCP=Cancel the leave request
 ConfirmCancelCP=Are you sure you want to cancel the leave request?
 DetailRefusCP=Razlog za odbijanje
 DateRefusCP=Datum odbijanja
@@ -78,7 +77,7 @@ ActionByCP=Izvršeno od strane
 UserUpdateCP=Za korisnika
 PrevSoldeCP=Prethodno stanje
 NewSoldeCP=Novo stanje
-alreadyCPexist=Zahtjev za godišnji odmor je vec završen za ovaj period.
+alreadyCPexist=A leave request has already been done on this period.
 UserName=Naziv
 Employee=Zaposlenik
 FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Ručno ažuriranje
 HolidaysCancelation=Leave request cancelation

 ## Configuration du Module ##
-ConfCP=Konfiguracija modula za godišnje odmore
+ConfCP=Configuration of leave request module
 DescOptionCP=Opis opcije
 ValueOptionCP=Vrijednost
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Potvrdite konfiguraciju
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
 UpdateConfCPOK=Uspješno ažuriranje.
 ErrorUpdateConfCP=Došlo je do greške prilikom ažuriranja, molimo pokušajte ponovo.
-AddCPforUsers=Molimo dodajte stanje godišnjih odmora za korisnika <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">klikom ovdje</a>.
-DelayForSubmitCP=Rok za prijavu za godišnji odmor
-AlertapprobatortorDelayCP=Spriječi osobu koja odobrava godišnji odmor u slučaju da se ne poklapa sa rokovima
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
 AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
 AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
 nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
 TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Potvrdi
 UpdateEventCP=Ažuriraj događaje
--- a/htdocs/langs/bs_BA/interventions.lang
+++ b/htdocs/langs/bs_BA/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervencija
 Interventions=Intervencije
 InterventionCard=Kartica intervencija
 NewIntervention=Nova intervencija
-AddIntervention=Dodaj intervenciju
+AddIntervention=Create intervention
 ListOfInterventions=Lista intervencija
 EditIntervention=Izimijeni intervenciju
 ActionsOnFicheInter=Akcije na intervencijama
@@ -30,6 +30,15 @@ StatusInterInvoiced=Fakturisano
 RelatedInterventions=Povezane intervencije
 ShowIntervention=Prikaži intervenciju
 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
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Predstavnik koji kontroliše intervenciju
 TypeContact_fichinter_internal_INTERVENING=Serviser
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -115,7 +115,7 @@ SentBy=Poslano od
 MailingNeedCommand=Iz sigurnosnih razloga, slanje e-pošte je bolje kada se vrši sa komandne lnije. Ako imate pristup, pitajte vašeg server administratora da pokrene slijedeću liniju za slanje e-pošte svim primaocima:
 MailingNeedCommand2=Možete ih poslati online dodavanjem parametra MAILING_LIMIT_SENDBYWEB sa vrijednosti za maksimalni broj e-mailova koje želite poslati po sesiji. Za ovo idite na Početna - Postavke - Ostalo
 ConfirmSendingEmailing=Ako ne možete ili preferirate slanje preko www pretraživača, molim potvrdite da ste sigurni da želite poslati e-poštu sa vašeg pretraživača?
-LimitSendingEmailing=Napomena: Slanje e-pošte preko interneta je ograničeno iz sigurnosnih razloga i timeout razloga primaocima <b>%s</b> od strane sesije za slanje.
+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.
 TargetsReset=Očisti listu
 ToClearAllRecipientsClickHere=Klikni ovdje da očistite listu primaoca za ovu e-poštu
 ToAddRecipientsChooseHere=Odaberi primaoce biranjem sa liste
@@ -133,6 +133,9 @@ Notifications=Notifikacije
 NoNotificationsWillBeSent=Nema planiranih email notifikacija za ovaj događaj i kompaniju
 ANotificationsWillBeSent=1 notifikacija će biti poslana emailom
 SomeNotificationsWillBeSent=%s notifikacija će biti poslane emailom
-AddNewNotification=Aktivirati novi zahtjev za notifikacije o slanje emaila
-ListOfActiveNotifications=Lista svih aktivnih zahtjeva za notifikacije slanja emaila
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
 ListOfNotificationsDone=Lista svih notifikacija o slanju emaila
+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.
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
 ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
-ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported.
-ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 BackgroundColorByDefault=Default background color
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
 GoToWikiHelpPage=Read online help (need Internet access)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
 HourShort=H
+MinuteShort=mn
 Rate=Rate
 UseLocalTax=Include tax
 Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Full list
 Statistics=Statistics
 OtherStatistics=Other statistics
 Status=Status
+Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 RefSupplier=Ref. supplier
@@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
 NActions=%s events
 NActionsLate=%s late
+RequestAlreadyDone=Request already recorded
 Filter=Filter
 RemoveFilter=Remove filter
 ChartGenerated=Chart generated
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup
 URLPhoto=URL of photo/logo
 SetLinkToThirdParty=Link to another third party
 CreateDraft=Create draft
+SetToDraft=Back to draft
 ClickToEdit=Click to edit
 ObjectDeleted=Object %s deleted
 ByCountry=By country
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
 # Week day
 Monday=Monday
 Tuesday=Tuesday
--- a/htdocs/langs/bs_BA/margins.lang
+++ b/htdocs/langs/bs_BA/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
 DisplayMarginRates=Display margin rates
 DisplayMarkRates=Display mark rates
 InputPrice=Input price
-
 margin=Profit margins management
 margesSetup=Profit margins management setup
-
 MarginDetails=Margin details
-
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
-
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
-
 StartDate=Start date
 EndDate=End date
 Launch=Start
-
 ForceBuyingPriceIfNull=Force buying price if null
 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)
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 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_TYPE=Margin type
 MargeBrute=Raw margin
 MargeNette=Net margin
 MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
 CostPrice=Cost price
 BuyingCost=Cost price
 UnitCharges=Unit charges
 Charges=Charges
-
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+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
--- a/htdocs/langs/bs_BA/orders.lang
+++ b/htdocs/langs/bs_BA/orders.lang
@@ -1,168 +1,162 @@
 # Dolibarr language file - Source file is en_US - orders
-# OrdersArea=Customers orders area
-# SuppliersOrdersArea=Suppliers orders area
-# OrderCard=Order card
-# OrderId=Order Id
-# Order=Order
-# Orders=Orders
-# OrderLine=Order line
-# OrderFollow=Follow up
-# OrderDate=Order date
-# OrderToProcess=Order to process
-# NewOrder=New order
-# ToOrder=Make order
-# MakeOrder=Make order
-# SupplierOrder=Supplier order
-# SuppliersOrders=Suppliers orders
-# SuppliersOrdersRunning=Current suppliers orders
-# CustomerOrder=Customer order
-# CustomersOrders=Customer's orders
-# CustomersOrdersRunning=Current customer's orders
-# CustomersOrdersAndOrdersLines=Customer orders and order's lines
-# OrdersToValid=Customer's orders to validate
-# OrdersToBill=Customer's orders delivered
-# OrdersInProcess=Customer's orders in process
-# OrdersToProcess=Customer's orders to process
-# SuppliersOrdersToProcess=Supplier's orders to process
-# StatusOrderCanceledShort=Canceled
-# StatusOrderDraftShort=Draft
-# StatusOrderValidatedShort=Validated
-# StatusOrderSentShort=In process
-# StatusOrderSent=Shipment in process
-# StatusOrderOnProcessShort=Reception
-# StatusOrderProcessedShort=Processed
-# StatusOrderToBillShort=Delivered
-# StatusOrderToBill2Short=To bill
-# StatusOrderApprovedShort=Approved
-# StatusOrderRefusedShort=Refused
-# StatusOrderToProcessShort=To process
-# StatusOrderReceivedPartiallyShort=Partially received
-# StatusOrderReceivedAllShort=Everything received
-# StatusOrderCanceled=Canceled
-# StatusOrderDraft=Draft (needs to be validated)
-# StatusOrderValidated=Validated
-# StatusOrderOnProcess=Waiting to receive
-# StatusOrderProcessed=Processed
-# StatusOrderToBill=Delivered
-# StatusOrderToBill2=To bill
-# StatusOrderApproved=Approved
-# StatusOrderRefused=Refused
-# StatusOrderReceivedPartially=Partially received
-# StatusOrderReceivedAll=Everything received
-# ShippingExist=A shipment exists
-# DraftOrWaitingApproved=Draft or approved not yet ordered
-# DraftOrWaitingShipped=Draft or validated not yet shipped
-# MenuOrdersToBill=Orders delivered
-# MenuOrdersToBill2=Orders to bill
-# SearchOrder=Search order
-# SearchACustomerOrder=Search a customer order
-# ShipProduct=Ship product
-# Discount=Discount
-# CreateOrder=Create Order
-# RefuseOrder=Refuse order
-# ApproveOrder=Accept order
-# ValidateOrder=Validate order
-# UnvalidateOrder=Unvalidate order
-# DeleteOrder=Delete order
-# CancelOrder=Cancel order
-# AddOrder=Add order
-# AddToMyOrders=Add to my orders
-# AddToOtherOrders=Add to other orders
-# AddToDraftOrders=Add to draft order
-# ShowOrder=Show order
-# NoOpenedOrders=No opened orders
-# NoOtherOpenedOrders=No other opened orders
-# NoDraftOrders=No draft orders
-# OtherOrders=Other orders
-# LastOrders=Last %s orders
-# LastModifiedOrders=Last %s modified orders
-# LastClosedOrders=Last %s closed orders
-# AllOrders=All orders
-# NbOfOrders=Number of orders
-# OrdersStatistics=Order's statistics
-# OrdersStatisticsSuppliers=Supplier order's statistics
-# NumberOfOrdersByMonth=Number of orders by month
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
-# ListOfOrders=List of orders
-# CloseOrder=Close order
-# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
-# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
-# ConfirmDeleteOrder=Are you sure you want to delete this order ?
-# ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
-# ConfirmCancelOrder=Are you sure you want to cancel this order ?
-# ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
-# GenerateBill=Generate invoice
-# ClassifyShipped=Classify delivered
-# ClassifyBilled=Classify billed
-# ComptaCard=Accountancy card
-# DraftOrders=Draft orders
-# RelatedOrders=Related orders
-# OnProcessOrders=In process orders
-# RefOrder=Ref. order
-# RefCustomerOrder=Ref. customer order
-# CustomerOrder=Customer order
-# RefCustomerOrderShort=Ref. cust. order
-# SendOrderByMail=Send order by mail
-# ActionsOnOrder=Events on order
-# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-# OrderMode=Order method
-# AuthorRequest=Request author
-# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
-# RunningOrders=Orders on process
-# UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-# PaymentOrderRef=Payment of order %s
-# CloneOrder=Clone order
-# ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
-# DispatchSupplierOrder=Receiving supplier order %s
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Suppliers orders area
+OrderCard=Order card
+OrderId=Order Id
+Order=Order
+Orders=Orders
+OrderLine=Order line
+OrderFollow=Follow up
+OrderDate=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Supplier order
+SuppliersOrders=Suppliers orders
+SuppliersOrdersRunning=Current suppliers orders
+CustomerOrder=Customer order
+CustomersOrders=Customer's orders
+CustomersOrdersRunning=Current customer's orders
+CustomersOrdersAndOrdersLines=Customer orders and order's lines
+OrdersToValid=Customer's orders to validate
+OrdersToBill=Customer's orders delivered
+OrdersInProcess=Customer's orders in process
+OrdersToProcess=Customer's orders to process
+SuppliersOrdersToProcess=Supplier's orders to process
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Reception
+StatusOrderProcessedShort=Processed
+StatusOrderToBillShort=Delivered
+StatusOrderToBill2Short=To bill
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Everything received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Waiting to receive
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderToBill2=To bill
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=Everything received
+ShippingExist=A shipment exists
+DraftOrWaitingApproved=Draft or approved not yet ordered
+DraftOrWaitingShipped=Draft or validated not yet shipped
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+SearchOrder=Search order
+SearchACustomerOrder=Search a customer order
+ShipProduct=Ship product
+Discount=Discount
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Accept order
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+AddOrder=Create order
+AddToMyOrders=Add to my orders
+AddToOtherOrders=Add to other orders
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+NoOpenedOrders=No opened orders
+NoOtherOpenedOrders=No other opened orders
+NoDraftOrders=No draft orders
+OtherOrders=Other orders
+LastOrders=Last %s orders
+LastModifiedOrders=Last %s modified orders
+LastClosedOrders=Last %s closed orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Supplier order's statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
+ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
+ConfirmDeleteOrder=Are you sure you want to delete this order ?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
+ConfirmCancelOrder=Are you sure you want to cancel this order ?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+ClassifyBilled=Classify billed
+ComptaCard=Accountancy card
+DraftOrders=Draft orders
+RelatedOrders=Related orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. customer order
+RefCustomerOrderShort=Ref. cust. order
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
+RunningOrders=Orders on process
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+CloneOrder=Clone order
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
+DispatchSupplierOrder=Receiving supplier order %s
 ##### Types de contacts #####
-# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
-# TypeContact_commande_internal_SHIPPING=Representative following-up shipping
-# TypeContact_commande_external_BILLING=Customer invoice contact
-# TypeContact_commande_external_SHIPPING=Customer shipping contact
-# TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
-# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-# TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
-
-# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
-# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
-# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
-# Error_OrderNotChecked=No orders to invoice selected
-
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Supplier invoice contact
+TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order

+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
+Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
+Error_OrderNotChecked=No orders to invoice selected
 # Sources
-# OrderSource0=Commercial proposal
-# OrderSource1=Internet
-# OrderSource2=Mail campaign
-# OrderSource3=Phone compaign
-# OrderSource4=Fax campaign
-# OrderSource5=Commercial
-# OrderSource6=Store
-# QtyOrdered=Qty ordered
-# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
-
+OrderSource0=Commercial proposal
+OrderSource1=Internet
+OrderSource2=Mail campaign
+OrderSource3=Phone compaign
+OrderSource4=Fax campaign
+OrderSource5=Commercial
+OrderSource6=Store
+QtyOrdered=Qty ordered
+AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
 # Documents models
-# PDFEinsteinDescription=A complete order model (logo...)
-# PDFEdisonDescription=A simple order model
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFEinsteinDescription=A complete order model (logo...)
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete proforma invoice (logo…)
 # Orders modes
-# OrderByMail=Mail
-# OrderByFax=Fax
-# OrderByEMail=EMail
-# OrderByWWW=Online
-# OrderByPhone=Phone
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=EMail
+OrderByWWW=Online
+OrderByPhone=Phone
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Security code
 Calendar=Calendar
-AddTrip=Add trip
 Tools=Tools
 ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
 Birthday=Birthday
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -80,6 +80,16 @@ ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
 CanceledBy=Canceled by %s
 ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailableShort=Available in a next version
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your

 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
-NewCompanyToDolibarr=Company %s added into Dolibarr
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr
-PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr
-PropalValidatedInDolibarr=Proposal %s validated in Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr
-InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr
-PaymentDoneInDolibarr=Payment %s done in Dolibarr
-CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr
-SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr
-MemberValidatedInDolibarr=Member %s validated in Dolibarr
-MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr
-MemberDeletedInDolibarr=Member %s deleted from Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr
-ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+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
 ##### Export #####
 Export=Export
 ExportsArea=Exports area
--- a/htdocs/langs/bs_BA/paybox.lang
+++ b/htdocs/langs/bs_BA/paybox.lang
@@ -1,37 +1,40 @@
 # Dolibarr language file - Source file is en_US - paybox
-# PayBoxSetup=PayBox module setup
-# PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-# PaymentForm=Payment form
-# WelcomeOnPaymentPage=Welcome on our online payment service
-# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-# ThisIsInformationOnPayment=This is information on payment to do
-# ToComplete=To complete
-# YourEMail=Email to receive payment confirmation
-# Creditor=Creditor
-# PaymentCode=Payment code
-# PayBoxDoPayment=Go on payment
-# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-# PleaseBePatient=Please, be patient
-# Continue=Next
-# ToOfferALinkForOnlinePayment=URL for %s payment
-# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
-# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
-# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
-# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
-# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-# YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
-# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
-# AccountParameter=Account parameters
-# UsageParameter=Usage parameters
-# InformationToFindParameters=Help to find your %s account information
-# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-# VendorName=Name of vendor
-# CSSUrlForPaymentForm=CSS style sheet url for payment form
-# MessageOK=Message on validated payment return page
-# MessageKO=Message on canceled payment return page
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome on our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Go on payment
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+PleaseBePatient=Please, be patient
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+MessageOK=Message on validated payment return page
+MessageKO=Message on canceled payment return page
+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
--- a/htdocs/langs/bs_BA/resource.lang
+++ b/htdocs/langs/bs_BA/resource.lang
@@ -0,0 +1,36 @@
+
+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
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+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
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
--- a/htdocs/langs/bs_BA/sendings.lang
+++ b/htdocs/langs/bs_BA/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=U ovom trenutku, nova pošiljka se kreira sa kar
 RelatedShippings=Povezana otpremanja
 ShipmentLine=Tekst pošiljke
 CarrierList=Lista transportera
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received

 # Sending methods
 SendingMethodCATCH=Catch by customer
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Naziv za skladište je potreban
 CorrectStock=Ispravi zalihu
 ListOfWarehouses=Lista skladišta
 ListOfStockMovements=Lista kretanja zaliha
-StocksArea=Dio za zalihe
+StocksArea=Warehouses area
 Location=Lokacija
 LocationSummary=Skraćeni naziv lokacije
 NumberOfDifferentProducts=Broj različitih proizvoda
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Prikaži grupu
 ShowUser=Prikaži korisnika
 NonAffectedUsers=Nedodijeljen korisnici
 UserModified=Korisnik uspješno izmijenjen
-GroupModified=Grupa uspješno izmijenjena
 PhotoFile=Foto fajl
 UserWithDolibarrAccess=Korisnik sa Dolibarr pristupom
 ListOfUsersInGroup=Lista korisnika u ovoj grupi
@@ -103,7 +102,7 @@ UserDisabled=Korisnik %s isključen
 UserEnabled=Korisnik %s aktiviran
 UserDeleted=Korisnik %s uklonjen
 NewGroupCreated=Grupa %s kreirana
-GroupModified=Grupa uspješno izmijenjena
+GroupModified=Group %s modified
 GroupDeleted=Grupa %s uklonjena
 ConfirmCreateContact=Jeste li sigurni da želite kreirati Dolibarr račun za ovaj kontakt?
 ConfirmCreateLogin=Jeste li sigurni da želite stvoriti Dolibarr račun za ovog člana?
@@ -114,8 +113,10 @@ YourRole=Vaše uloga
 YourQuotaOfUsersIsReached=Vaša kvota aktivnih korisnika je postignuta!
 NbOfUsers=Broj korisnika
 DontDowngradeSuperAdmin=Samo superadmin može unazaditi superadmina
-HierarchicalResponsible=Hijerarhijska odgovornost
+HierarchicalResponsible=Supervisor
 HierarchicView=Hijerarhijski prikaz
 UseTypeFieldToChange=Koristite polja Tip za promjene
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Koristiti OpenID za login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Priznanica
 LastWithdrawalReceipts=Posljednjih %s priznanica podizanja
 WithdrawedBills=Podignute fakture
 WithdrawalsLines=Tekst podizanja
-RequestStandingOrderToTreat=Zahtjev za razmatranje trajnim naloga
-RequestStandingOrderTreated=Zahtjev za razmatrene trajne naloge
+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.
 CustomersStandingOrders=Trajnih nalozi kupca
 CustomerStandingOrder=Trajni nalog kupca
 NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmission method
 Send=Poslati
 Lines=Tekst
 StandingOrderReject=Issue a rejection
-InvoiceRefused=Faktura odbijena
 WithdrawalRefused=Withdrawal refused
 WithdrawalRefusedConfirm=Jeste li sigurni da želite da unesete odbijenicu povlačenja za društvo
 RefusedData=Datum odbacivanja
 RefusedReason=Razlog za odbijanje
 RefusedInvoicing=Naplate odbijanja
 NoInvoiceRefused=Ne naplatiti odbijanje
-InvoiceRefused=Faktura odbijena
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
 Status=Status
 StatusUnknown=Nepoznato
 StatusWaiting=Čekanje
@@ -76,7 +76,7 @@ WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
 BankToReceiveWithdraw=Bank account to receive withdraws
 CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country
+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.
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
 Validate=Validate
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
 ToDispatch=To dispatch
 Dispatched=Dispatched

-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
 Reports=Reports
 ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
 AccountBalanceByMonth=Account balance by month

-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
 Line=Line

 CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
 IntoAccount=In the accounting account

 Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown

 Processing=Processing
 EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account

 ACCOUNTING_SEPARATORCSV=Separator CSV

-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+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

 AccountLength=Length of the accounting accounts shown in Dolibarr
 AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement

 NewFiscalYear=New fiscal year

-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover HT
 TotalMarge=Total sales margin
 DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
 DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
 ChangeAccount=Change the accounting account for lines selected by the account:
 Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
 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

@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically

 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used

-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks de productes
 Module52Desc=Gestió de stocks de productes
 Module53Name=Serveis
 Module53Desc=Gestió de serveis
-Module54Name=Contractes
-Module54Desc=Gestió de contractes
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
 Module55Name=Codis de barra
 Module55Desc=Gestió dels codis de barra
 Module56Name=Telefonia
@@ -475,8 +475,8 @@ Module320Name=Fils RSS
 Module320Desc=Addició de fils d'informació RSS en les pantalles Dolibarr
 Module330Name=Bookmarks
 Module330Desc=Gestió de bookmarks
-Module400Name=Projectes
-Module400Desc=Gestió dels projectes en els altres mòduls
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
 Module410Name=Webcalendar
 Module410Desc=Interface amb el calendari webcalendar
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module600Name=Notificacions
-Module600Desc=Enviament de notificacions (per correu electrònic) sobre els esdeveniments de treball Dolibarr
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donacions
 Module700Desc=Gestió de donacions
 Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-empresa
 Module5000Desc=Permet gestionar diverses empreses
 Module6000Name=Workflow
 Module6000Desc=Workflow management
-Module20000Name=Dies lliures
-Module20000Desc=Gestió dels dies lliures dels empleats
+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
 Module50000Name=PayBox
 Module50000Desc=Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paybox
 Module50100Name=TPV
 Module50100Desc=Terminal Punt de Venda per a la venda al taulell
-Module50200Name= Paypal
-Module50200Desc= Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paypal
+Module50200Name=Paypal
+Module50200Desc=Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Consultar domiciliacions
 Permission152=Crear/modificar domiciliacions
 Permission153=Enviar domiciliacions
 Permission154=Abonar/tornar domiciliacions
-Permission161=Consultar contractes de servei
-Permission162=Crear/modificar contractes de servei
-Permission163=Activar els serveis d'un contracte
-Permission164=Desactivar els serveis d'un contracte
-Permission165=Eliminar contractes
-Permission171=Llegir els desplaçaments
-Permission172=Crear/modificar els desplaçaments
-Permission173=Eliminar desplaçaments
-Permission178=Exportar desplaçaments
+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
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
 Permission180=Consultar proveïdors
 Permission181=Consultar comandes a proveïdors
 Permission182=Crear/modificar comandes a proveïdors
@@ -671,7 +672,7 @@ Permission300=Consultar codis de barra
 Permission301=Crear/modificar codis de barra
 Permission302=Eliminar codi de barra
 Permission311=Consultar serveis
-Permission312=Assignar serveis a un contracte
+Permission312=Assign service/subscription to contract
 Permission331=Consultar bookmarks
 Permission332=Crear/modificar bookmarks
 Permission333=Eliminar bookmarks
@@ -701,8 +702,8 @@ Permission701=Consultar donacions
 Permission702=Crear/modificar donacions
 Permission703=Eliminar donacions
 Permission1001=Consultar stocks
-Permission1002=Crear/modificar stocks
-Permission1003=Eliminar stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=Consultar moviments de stock
 Permission1005=Crear/modificar moviments de stock
 Permission1101=Consultar ordres d'enviament
@@ -1038,7 +1039,6 @@ YesInSummer=Sí a l'estiu
 OnlyFollowingModulesAreOpenedToExternalUsers=Recordeu que només els mòduls següents estan oberts a usuaris externs (siguin quins siguin els permisos dels usuaris):
 SuhosinSessionEncrypt=Emmagatzematge de sessions xifrades per Suhosin
 ConditionIsCurrently=Actualment la condició és %s
-TestNotPossibleWithCurrentBrowsers=La detecció automàtica no és possible amb el navegador actual
 YouUseBestDriver=Està utilitzant el driver %s, actualment és el millor driver disponible.
 YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
 NbOfProductIsLowerThanNoPb=Té %s productes/serveis a la base de dades. No és necessària cap optimització en particular.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Retorna un codi comptable compost de<br>%s seguit del
 ModuleCompanyCodePanicum=Retorna un codi comptable buit.
 ModuleCompanyCodeDigitaria=Retorna un codi comptable compost seguint el codi de tercer. El codi està format per caràcter 'C' en primera posició seguit dels 5 primers caràcters del codi tercer.
 UseNotifications=Utilitza notificacions
-NotificationsDesc=La funció de les notificacions permet enviar automàticament un correu electrònic per a un determinat esdeveniment Dolibarr en les empreses configurades per a això
+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.
 ModelModules=Models de documents
 DocumentModelOdt=Generació des dels documents amb format OpenDocument (Arxiu .ODT OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Marca d'aigua en els documents esborrany
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Possibilitat de seleccionar una adreça d'enviament
 UseOptionLineIfNoQuantity=Una línia de producte/servei que té una quantitat nul·la es considera com una opció
 FreeLegalTextOnProposal=Text lliure en pressupostos
 WatermarkOnDraftProposal=Marca d'aigua en pressupostos esborrany (en cas d'estar buit)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### Orders #####
 OrdersSetup=Configuració del mòdul comandes
 OrdersNumberingModules=Mòduls de numeració de les comandes
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
 ValidOrderAfterPropalClosed=Validar la comanda després del tancament del pressupost, permet no passar per la comanda provisional
 FreeLegalTextOnOrders=Text lliure en comandes
 WatermarkOnDraftOrders=Marca d'aigua en comandes esborrany (en cas d'estar buit)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 ##### Clicktodial #####
 ClickToDialSetup=Configuració del mòdul Click To Dial
 ClickToDialUrlDesc=Url de trucada fent clic en la icona telèfon. Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Mòduls de numeració de les fitxes d'intervenció
 TemplatePDFInterventions=Model de documents de les fitxes d'intervenció
 WatermarkOnDraftInterventionCards=Marca d'aigua en fitxes d'intervenció (en cas d'estar buit)
 ##### Contracts #####
-ContractsSetup=Configuració del mòdul contractes
+ContractsSetup=Contracts/Subscriptions module setup
 ContractsNumberingModules=Mòduls de numeració dels contratos
 TemplatePDFContracts=Contracts documents models
 FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Fitxers de tipus %s no són comprimits pel servidor HTT
 CacheByServer=Memòria cau amb el servidor
 CacheByClient=Memòria cau mitjançant el navegador
 CompressionOfResources=Compressió de les respostes HTTP
-TestNotPossibleWithCurrentBrowsers=La detecció automàtica no és possible amb el navegador actual
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 ##### Products #####
 ProductSetup=Configuració del mòdul Productes
 ServiceSetup=Configuració del mòdul Serveis
@@ -1382,9 +1384,10 @@ MailingSetup=Configuració del mòdul E-Mailing
 MailingEMailFrom=E-Mail emissor (From) dels correus enviats per E-Mailing
 MailingEMailError=E-mail de resposta (Errors-to) per a les respostes sobre enviaments per e-mailing amb error.
 ##### Notification #####
-NotificationSetup=Configuració del mòdul notificacions
+NotificationSetup=EMail notification module setup
 NotificationEMailFrom=E-Mail emissor (From) dels correus enviats a través de notificacions
-ListOfAvailableNotifications=Llistat de notificacions disponibles (depèn dels mòduls activats)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
 ##### Sendings #####
 SendingsSetup=Configuració del mòdul Expedicions
 SendingsReceiptModel=Model de notes de lliurament
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=La connexió al servidor '%s' sobre la base '%s' per l'usuari '
 OSCommerceTestKo1=La connexió al servidor '%s' sobre la base '%s' per l'usuari '%s' no s'ha pogut fer.
 OSCommerceTestKo2=La connexió al servidor '%s'  per l'usuari '%s' ha fallat.
 ##### Stock #####
-StockSetup=Configuració del mòdul Stock
-UserWarehouse=Utilitzar els stocks personals d'usuaris
+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.
 ##### Menu #####
 MenuDeleted=Menú eliminat
 TreeMenu=Estructura dels menús
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Aquest mòdul permet afegir una icona després del número de te
 ##### Point Of Sales (CashDesk) #####
 CashDesk=TPV
 CashDeskSetup=Mòdul de configuració Terminal Punt de Venda
-CashDeskThirdPartyForSell=Tercer genéric a utilitzar per a les vendes
+CashDeskThirdPartyForSell=Default generic third party to use for sells
 CashDeskBankAccountForSell=Compte per defecte a utilitzar per als cobraments en efectiu (caixa)
 CashDeskBankAccountForCheque= Compte per defecte a utilitzar per als cobraments amb xecs
 CashDeskBankAccountForCB= Compte per defecte a utilitzar per als cobraments amb targeta de crèdit
-CashDeskIdWareHouse=Magatzem a ultilitzar per a les vendes
+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.
 ##### Bookmark #####
 BookmarkSetup=Configuració del mòdul Bookmark
 BookmarkDesc=Aquest mòdul li permet gestionar els enllaços i accessos directes. També permet afegir qualsevol pàgina de Dolibarr o enllaç web al menú d'accés ràpid de l'esquerra.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 Opened=Opened
 Closed=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
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Inclusió automàtica a l'agenda
 AgendaAutoActionDesc= Indiqueu en aquesta pestanya els esdeveniments per els que desitja que Dolibarr creu automàticament una acció a l'agenda. Si no es marca cap cas (per defecte), només les accions manuals s'han d'incloure en l'agenda.
 AgendaSetupOtherDesc= Aquesta pàgina permet configurar algunes opcions que permeten exportar una vista de la seva agenda Dolibar a un calendari extern (thunderbird, google calendar, ...)
 AgendaExtSitesDesc=Aquesta pàgina permet configurar calendaris externs per a la seva visualització en l'agenda de Dolibarr.
-ActionsEvents= Esdeveniments per a què Dolibarr crei una acció de forma automàtica
-PropalValidatedInDolibarr= Pressupost %s validat
-InvoiceValidatedInDolibarr= Factura %s validada
+ActionsEvents=Esdeveniments per a què Dolibarr crei una acció de forma automàtica
+PropalValidatedInDolibarr=Pressupost %s validat
+InvoiceValidatedInDolibarr=Factura %s validada
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Factura %s tornada a borrador
 InvoiceDeleteDolibarr=Factura %s eliminada
 OrderValidatedInDolibarr= Comanda %s validada
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Comanda %s aprovada
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Comanda %s tordada a borrador
 OrderCanceledInDolibarr=Commanda %s anul·lada
-InterventionValidatedInDolibarr=Intervenció %s validada
 ProposalSentByEMail=Pressupost %s enviat per e-mail
 OrderSentByEMail=Comanda de client %s enviada per e-mail
 InvoiceSentByEMail=Factura a client %s enviada per e-mail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Comanda a proveïdor %s enviada per e-mail
 SupplierInvoiceSentByEMail=Factura de proveïdor %s enviada per e-mail
 ShippingSentByEMail=Expedició %s enviada per e-mail
 ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervenció %s enviada per e-mail
-InterventionClassifiedBilled=Intervention %s classified as Billed
 NewCompanyToDolibarr= Tercer creat
 DateActionPlannedStart= Data d'inici prevista
 DateActionPlannedEnd= Data fi prevista
@@ -70,9 +68,9 @@ DateActionStart= Data d'inici
 DateActionEnd= Data finalització
 AgendaUrlOptions1=Podeu també afegir aquests paràmetres al filtre de sortida:
 AgendaUrlOptions2=<b>login=%s</b> per a restringir insercions a accions creades, que afectin o realitzades per l'usuari <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> per a restringir insercions a accciones creades per l'usuari <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> per a restringir insercions a accions que afectin a l'usuari <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> per a restringir insercions a accions realitzades per l'usuari <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Mostra aniversari dels contactes
 AgendaHideBirthdayEvents=Amaga aniversari dels contacte
 Busy=Ocupat
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=Url d'accés a l'arxiu. ical
 ExtSiteNoLabel=Sense descripció
 WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
 MyAvailability=My availability
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Abonament
 InvoiceAvoirAsk=Abonament per corregir la factura
 InvoiceAvoirDesc=El <b>abonament</ b> és una factura negativa destinada a compensar un import de factura que difereix de l'import realment pagat (per haver pagat de més o per devolució de productes, per exemple).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
 ReplaceInvoice=Rectificar la factura %s
 ReplacementInvoice=Rectificació factura
 ReplacedByInvoice=Rectificada per la factura %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Classificar 'Abandonat'
 ClassifyClosed=Classificar 'Tancat'
 ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=Crear factura
-AddBill=Crear factura o abonament
+AddBill=Create invoice or credit note
 AddToDraftInvoices=Afegir a factura esborrany
 DeleteBill=Eliminar factura
 SearchACustomerInvoice=Cercar una factura a client
@@ -99,7 +99,7 @@ DoPaymentBack=Emetre reembossament
 ConvertToReduc=Convertir en reducció futura
 EnterPaymentReceivedFromCustomer=Afegir pagament rebut de client
 EnterPaymentDueToCustomer=Fer pagament d'abonaments al client
-DisabledBecauseRemainderToPayIsZero=Desactivar ja que la resta a pagar és 0
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=Import
 PriceBase=Preu base
 BillStatus=Estat de la factura
@@ -137,8 +137,6 @@ BillFrom=Emissor
 BillTo=Enviar a
 ActionsOnBill=Eventos sobre la factura
 NewBill=Nova factura
-Prélèvements=Domiciliacions
-Prélèvements=Domiciliacions
 LastBills=Les %s últimes factures
 LastCustomersBills=Les %s últimes factures a clients
 LastSuppliersBills=Les %s últimes factures de proveïdors
@@ -156,9 +154,9 @@ ConfirmCancelBill=Esteu segur de voler anul·lar la factura <b>%s</b>?
 ConfirmCancelBillQuestion=Per quina raó vol abandonar la factura?
 ConfirmClassifyPaidPartially=Esteu segur de voler classificar la factura <b>%s</b> com pagada?
 ConfirmClassifyPaidPartiallyQuestion=Aquesta factura no ha estat totalment pagada. Per què vol classificar-la com a pagada?
-ConfirmClassifyPaidPartiallyReasonAvoir=La resta a pagar <b>(%s %s)</b> s'ha regularitzat (ja que article s'ha tornat, oblidat lliurar, descompte no definit ...) mitjançant un abonament
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=La resta a pagar <b>(%s %s)</b> és un descompte acordat després de la facturació. Accepto perdre l'IVA d'aquest descompte
-ConfirmClassifyPaidPartiallyReasonDiscountVat=La resta a pagar <b>(%s %s)</b> és un descompte
+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=Client morós
 ConfirmClassifyPaidPartiallyReasonProductReturned=Productes retornats en part
 ConfirmClassifyPaidPartiallyReasonOther=D'altra raó
@@ -191,9 +189,9 @@ AlreadyPaid=Ja pagat
 AlreadyPaidBack=Ja reemborsat
 AlreadyPaidNoCreditNotesNoDeposits=Ja pagat (exclosos els abonaments i bestretes)
 Abandoned=Abandonada
-RemainderToPay=Queda per pagar
-RemainderToTake=Queda per cobrar
-RemainderToPayBack=Queda per reemborsar
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
 Rest=Pendent
 AmountExpected=Import reclamat
 ExcessReceived=Rebut en excés
@@ -219,19 +217,18 @@ NoInvoice=Cap factura
 ClassifyBill=Classificar la factura
 SupplierBillsToPay=Factures de proveïdors a pagar
 CustomerBillsUnpaid=Factures a clients pendents de cobrament
-DispenseMontantLettres=Les factures redactactades per processos mecànics estan exemptes de l'ordre en lletres
-DispenseMontantLettres=Les factures redactactades per processos mecànics estan exemptes de l'ordre en lletres
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
 NonPercuRecuperable=No percebut recuperable
 SetConditions=Definir condicions de pagament
 SetMode=Definir mode de pagament
 Billed=Facturat
-RepeatableInvoice=Factura recurrent
-RepeatableInvoices=Factures recurrents
-Repeatable=Recurrent
-Repeatables=Recurrents
-ChangeIntoRepeatableInvoice=Convertir en recurrent
-CreateRepeatableInvoice=Crear factura recurrent
-CreateFromRepeatableInvoice=Crear desde factura recurrent
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
 CustomersInvoicesAndInvoiceLines=Factures a clients i línies de factures
 CustomersInvoicesAndPayments=Factures a clients i pagaments
 ExportDataset_invoice_1=Factures a clients i línies de factura
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Proveïdors
 CatCusLinks=Clients/Clients potencials
 CatProdLinks=Productes
 CatMemberLinks=Membres
-CatProdLinks=Productes
-CatCusLinks=Clients/Clients potencials
-CatSupLinks=Proveïdors
 DeleteFromCat=Eliminar de la categoria
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
 CategorieRecursiv=Link with parent category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Codi comptable incorrecte per a %s
 SuppliersProductsSellSalesTurnover=Volum de vendes generat per la venda dels productes dels proveïdors
 CheckReceipt=Llista de remeses
 CheckReceiptShort=Remeses
+LastCheckReceiptShort=Last %s check receipts
 NewCheckReceipt=Nova remesa
 NewCheckDeposit=Nou ingrés
 NewCheckDepositOn=Crear nova remesa al compte: %s
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Àrea contractes
 ListOfContracts=Llistat de contractes
-LastContracts=Els % darrers contractes
+LastModifiedContracts=Last %s modified contracts
 AllContracts=Tots els contractes
 ContractCard=Fitxa contracte
 ContractStatus=Estat del contracte
@@ -27,7 +27,7 @@ MenuRunningServices=Serveis actius
 MenuExpiredServices=Serveis expirats
 MenuClosedServices=Serveis tancats
 NewContract=Nou contracte
-AddContract=Crear contracte
+AddContract=Create contract
 SearchAContract=Cercar un contracte
 DeleteAContract=Eliminar un contracte
 CloseAContract=Tancar un contracte
@@ -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=Els % darrers contractes
+LastContracts=Last % contracts
 LastActivatedServices=Els %s darrers serveis activats
 LastModifiedServices=Els  %s darrers serveis modificats
 EditServiceLine=Edició línia del servei
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -1,10 +1,8 @@
 # Dolibarr language file - Source file is en_US - cron
-#
 # About page
 About = Sobre
 CronAbout = Sobre Cron
 CronAboutPage = Sobre Cron
-
 # Right
 Permission23101 = Veure les tasques programades
 Permission23102 = Crear/Modificar les tasques programades
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=En un entorn Unix pot parametritzar crontab per executar
 CronExplainHowToRunWin=En un entorn Microsoft (tm) Windows pot utilitzar el planificador de tasques per llançar aquesta comanda cada minut
 # Menu
 CronJobs=Tasques programades
-CronListActive= Llistat de tasques planificades actives
-CronListInactive= Llistat de tasques planificades inactives
-CronListActive= Llistat de tasques planificades actives
+CronListActive=List of active/scheduled jobs
+CronListInactive=Llistat de tasques planificades inactives
 # Page list
 CronDateLastRun=Últim llançament
 CronLastOutput=Última sortida
--- a/htdocs/langs/ca_ES/donations.lang
+++ b/htdocs/langs/ca_ES/donations.lang
@@ -4,7 +4,7 @@ Donations=Donacións
 DonationRef=Ref. donació
 Donor=Donant
 Donors=Donants
-AddDonation=Afegir donació
+AddDonation=Create a donation
 NewDonation=Nova donació
 ShowDonation=Mostrar donació
 DonationPromise=Promesa de donació
@@ -31,3 +31,8 @@ DonationRecipient=Beneficiari
 ThankYou=Moltes gràcies
 IConfirmDonationReception=El beneficiari confirma la recepció, com a donació, de la següent quantitat
 MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
--- a/htdocs/langs/ca_ES/externalsite.lang
+++ b/htdocs/langs/ca_ES/externalsite.lang
@@ -2,3 +2,4 @@
 ExternalSiteSetup=Configuració de l'enllaç al lloc web extern
 ExternalSiteURL=URL del lloc extern
 ExternalSiteModuleNotComplete=El mòdul Lloc web extern no ha estat configurat correctament.
+ExampleMyMenuEntry=My menu entry
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
 ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
 CantCreateCP=You don't have the right to make leave requests.
 InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Actualitzar
 CantUpdate=You cannot update this leave request.
 NoDateDebut=Ha d'indicar una data d'inici.
 NoDateFin=Ha d'indicar una data de fi.
-ErrorDureeCP=La seva petició de vacances no conté cap dia hàbil.
-TitleValidCP=Validar la petició de vacances
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
 ConfirmValidCP=Are you sure you want to approve the leave request?
 DateValidCP=Data de validació
 TitleToValidCP=Send leave request
 ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Rebutjar la petició de vacances
+TitleRefuseCP=Refuse the leave request
 ConfirmRefuseCP=Are you sure you want to refuse the leave request?
 NoMotifRefuseCP=Ha de seleccionar un motiu per rebutjar aquesta petició.
-TitleCancelCP=Anul·lar la petició de vacances
+TitleCancelCP=Cancel the leave request
 ConfirmCancelCP=Are you sure you want to cancel the leave request?
 DetailRefusCP=Motiu del rebuig
 DateRefusCP=Data del rebuig
@@ -78,7 +77,7 @@ ActionByCP=Realitzat per
 UserUpdateCP=Per a l'usuari
 PrevSoldeCP=Saldo anterior
 NewSoldeCP=Nou saldo
-alreadyCPexist=Ja s'ha efectuat una petició de vacances per a aquest període.
+alreadyCPexist=A leave request has already been done on this period.
 UserName=Nom Cognoms
 Employee=Empleat
 FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Actualització manual
 HolidaysCancelation=Leave request cancelation

 ## Configuration du Module ##
-ConfCP=Configuració del mòdul Vacacions
+ConfCP=Configuration of leave request module
 DescOptionCP=Descripció de l'opció
 ValueOptionCP=Valor
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validar la configuració
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
 UpdateConfCPOK=Actualització efectuada correctament.
 ErrorUpdateConfCP=S'ha produït un error durant l'actualització, torne a provar.
-AddCPforUsers=Afegiu els saldos de vacances dels usuaris <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">fent clic aquí</a>.
-DelayForSubmitCP=Antelació mínima per sol·licitar vacances
-AlertapprobatortorDelayCP=Advertir al validador si la petició no correspon a la data límit
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
 AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
 AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
 nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
 TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validar
 UpdateEventCP=Actualitzar els esdeveniments
--- a/htdocs/langs/ca_ES/interventions.lang
+++ b/htdocs/langs/ca_ES/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervenció
 Interventions=Intervencions
 InterventionCard=Fitxa intervenció
 NewIntervention=Nova itervenció
-AddIntervention=Crear intervenció
+AddIntervention=Create intervention
 ListOfInterventions=Llista d'intervencions
 EditIntervention=Editar
 ActionsOnFicheInter=Esdeveniments sobre l'intervenció
@@ -30,6 +30,15 @@ StatusInterInvoiced=Facturado
 RelatedInterventions=Intervencions adjuntes
 ShowIntervention=Mostrar intervenció
 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
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Responsable seguiment de la intervenció
 TypeContact_fichinter_internal_INTERVENING=Interventor
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -115,7 +115,7 @@ SentBy=Enviat por
 MailingNeedCommand=Per raons de seguretat, l'enviament d'un E-Mailing en massa es pot fer en línia de comandes. Demani al seu administrador que llanci la comanda següent per per enviar la correspondència a tots els destinataris:
 MailingNeedCommand2=Podeu enviar en línia afegint el paràmetre MAILING_LIMIT_SENDBYWEB amb un valor nombre que indica el màxim nombre d'e-mails enviats per sessió. Per això aneu a Inici - Configuració - Varis
 ConfirmSendingEmailing=Confirma l'enviament de l'e-mailing?
-LimitSendingEmailing=L'enviament d'un e-mailing des de les pantalles està limitat per raons de seguretat i de timeout a <b>%s</b> destinataris per sessió d'enviament.
+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.
 TargetsReset=Buidar llista
 ToClearAllRecipientsClickHere=Per buidar la llista dels destinataris d'aquest E-Mailing, feu clic al botó
 ToAddRecipientsChooseHere=Per afegir destinataris, escolliu els que figuren en les llistes a continuació
@@ -133,6 +133,9 @@ Notifications=Notificacions
 NoNotificationsWillBeSent=Cap notificació per e-mail està prevista per a aquest esdeveniment i empresa
 ANotificationsWillBeSent=1 notificació serà enviada per e-mail
 SomeNotificationsWillBeSent=%s notificacions seran enviades per e-mail
-AddNewNotification=Activar una nova sol·licitud de notificació
-ListOfActiveNotifications=Llista de les sol·licituds de notificacions actives
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
 ListOfNotificationsDone=Llista de notificacions d'e-mails enviades
+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.
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Impossible trobar l'usuari <b>%s</b> a la
 ErrorNoVATRateDefinedForSellerCountry=Error, cap tipus d'IVA definit per al país '%s'.
 ErrorNoSocialContributionForSellerCountry=Error, cap tipus de càrrega social definida per al país '%s'.
 ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat.
-ErrorOnlyPngJpgSupported=Error, només estan suportats els formats d'imatge jpg i png.
-ErrorImageFormatNotSupported=El seu PHP no suporta les funcions de conversió d'aquest format d'imatge.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=Veure també %s
 BackgroundColorByDefault=Color de fons
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=Un arxiu ha estat seleccionat per adjuntar, però encara no ha estat pujat. Feu clic a "Adjuntar aquest arxiu" per a això.
 NbOfEntries=Nº d'entrades
 GoToWikiHelpPage=Consultar l'ajuda (pot requerir accés a Internet)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
 Quadri=Trimistre
 MonthOfDay=Mes del dia
 HourShort=H
+MinuteShort=mn
 Rate=Tipus
 UseLocalTax=Incloure taxes
 Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Llista completa
 Statistics=Estadístiques
 OtherStatistics=Altres estadístiques
 Status=Estat
+Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 RefSupplier=Ref. proveïdor
@@ -365,6 +367,7 @@ ActionsOnCompany=Esdeveniments respecte aquest tercer
 ActionsOnMember=Esdeveniments respecte aquest membre
 NActions=%s esdeveniments
 NActionsLate=%s en retard
+RequestAlreadyDone=Request already recorded
 Filter=Filtre
 RemoveFilter=Eliminar filtre
 ChartGenerated=Gràfics generats
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Configuració dels atributs opcionals
 URLPhoto=Url de la foto/logo
 SetLinkToThirdParty=Vincular a un altre tercer
 CreateDraft=Crea esborrany
+SetToDraft=Back to draft
 ClickToEdit=Clic per a editar
 ObjectDeleted=Objecte %s eliminat
 ByCountry=Per país
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
 # Week day
 Monday=Dilluns
 Tuesday=Dimarts
--- a/htdocs/langs/ca_ES/margins.lang
+++ b/htdocs/langs/ca_ES/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Marge sobre venda
 DisplayMarginRates=Mostrar els marges sobre cost
 DisplayMarkRates=Mostrar els marges sobre venda
 InputPrice=Introduir un preu
-
 margin=Gestió de marges
 margesSetup=Configuració de la gestió de marges
-
 MarginDetails=Detalls de marges realitzats
-
 ProductMargins=Marges per producte
 CustomerMargins=Marges per client
 SalesRepresentativeMargins=Sales representative margins
-
 ProductService=Producte o servei
 AllProducts=Tots els productes i serveis
 ChooseProduct/Service=Trieu el producte o servei
-
 StartDate=Data d'inici
 EndDate=Data de fi
 Launch=Començar
-
 ForceBuyingPriceIfNull=Forçar el preu de compra si no s'ha indicat
 ForceBuyingPriceIfNullDetails=Amb "ON", la línia es considera un marge nul (es forçarà el preu de compra amb el preu de venda), amb ("OFF") el marge és igual al preu de venda (preu de compra a 0).
 MARGIN_METHODE_FOR_DISCOUNT=Mètode de gestió de descomptes globals
@@ -35,16 +29,16 @@ UseDiscountAsProduct=Com un producte
 UseDiscountAsService=Com un servei
 UseDiscountOnTotal=Sobre el total
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Indica si un descompte global es pren en compte com un producte, servei o només en el total a l'hora de calcular els marges.
-
 MARGIN_TYPE=Tipus de marge gestionat
 MargeBrute=Marge brut
 MargeNette=Marge net
 MARGIN_TYPE_DETAILS=Marge brut: Preu de venda sense IVA - Preu de compra sense IVA <br/> Marge net: Preu de venda sense IVA - Costos
-
 CostPrice=Preu de compra
 BuyingCost=Costos
 UnitCharges=Càrrega unitària
 Charges=Càrreges
-
 AgentContactType=Tipus de contacte comissionat
-AgentContactTypeDetails=Indica el tipus de contacte enllaçat a les factures que seran associats als agents comercials
+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
--- a/Show More
+++ b/Show More