Browse Source

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

Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
Laurent Destailleur 10 years ago
parent
commit
100fa1067e
100 changed files with 1047 additions and 965 deletions
  1. 6 0
      ChangeLog
  2. 1 1
      build/debian/control
  3. 2 2
      htdocs/admin/dict.php
  4. 1 1
      htdocs/comm/mailing/card.php
  5. 2 1
      htdocs/compta/bank/virement.php
  6. 4 2
      htdocs/compta/deplacement/card.php
  7. 4 2
      htdocs/compta/facture/mergepdftool.php
  8. 1 1
      htdocs/compta/prelevement/card.php
  9. 27 31
      htdocs/compta/prelevement/class/bonprelevement.class.php
  10. 1 1
      htdocs/core/class/html.form.class.php
  11. 2 2
      htdocs/core/menus/standard/eldy.lib.php
  12. 1 1
      htdocs/core/modules/modProjet.class.php
  13. 9 0
      htdocs/expedition/card.php
  14. 0 2
      htdocs/expedition/class/expedition.class.php
  15. 1 1
      htdocs/fichinter/card.php
  16. 21 15
      htdocs/langs/ar_SA/admin.lang
  17. 2 0
      htdocs/langs/ar_SA/banks.lang
  18. 16 10
      htdocs/langs/ar_SA/boxes.lang
  19. 5 2
      htdocs/langs/ar_SA/errors.lang
  20. 1 1
      htdocs/langs/ar_SA/interventions.lang
  21. 7 0
      htdocs/langs/ar_SA/main.lang
  22. 3 1
      htdocs/langs/ar_SA/orders.lang
  23. 1 0
      htdocs/langs/ar_SA/other.lang
  24. 11 10
      htdocs/langs/ar_SA/productbatch.lang
  25. 1 0
      htdocs/langs/ar_SA/projects.lang
  26. 6 1
      htdocs/langs/ar_SA/stocks.lang
  27. 1 1
      htdocs/langs/ar_SA/suppliers.lang
  28. 0 24
      htdocs/langs/ar_SA/trips.lang
  29. 21 15
      htdocs/langs/bg_BG/admin.lang
  30. 2 0
      htdocs/langs/bg_BG/banks.lang
  31. 1 0
      htdocs/langs/bg_BG/boxes.lang
  32. 5 2
      htdocs/langs/bg_BG/errors.lang
  33. 1 1
      htdocs/langs/bg_BG/interventions.lang
  34. 7 0
      htdocs/langs/bg_BG/main.lang
  35. 3 1
      htdocs/langs/bg_BG/orders.lang
  36. 1 0
      htdocs/langs/bg_BG/other.lang
  37. 11 10
      htdocs/langs/bg_BG/productbatch.lang
  38. 1 0
      htdocs/langs/bg_BG/projects.lang
  39. 6 1
      htdocs/langs/bg_BG/stocks.lang
  40. 1 1
      htdocs/langs/bg_BG/suppliers.lang
  41. 0 24
      htdocs/langs/bg_BG/trips.lang
  42. 21 15
      htdocs/langs/bs_BA/admin.lang
  43. 2 0
      htdocs/langs/bs_BA/banks.lang
  44. 16 10
      htdocs/langs/bs_BA/boxes.lang
  45. 5 2
      htdocs/langs/bs_BA/errors.lang
  46. 1 1
      htdocs/langs/bs_BA/interventions.lang
  47. 7 0
      htdocs/langs/bs_BA/main.lang
  48. 3 1
      htdocs/langs/bs_BA/orders.lang
  49. 1 0
      htdocs/langs/bs_BA/other.lang
  50. 11 10
      htdocs/langs/bs_BA/productbatch.lang
  51. 1 0
      htdocs/langs/bs_BA/projects.lang
  52. 6 1
      htdocs/langs/bs_BA/stocks.lang
  53. 1 1
      htdocs/langs/bs_BA/suppliers.lang
  54. 0 24
      htdocs/langs/bs_BA/trips.lang
  55. 218 212
      htdocs/langs/ca_ES/admin.lang
  56. 16 14
      htdocs/langs/ca_ES/banks.lang
  57. 20 14
      htdocs/langs/ca_ES/boxes.lang
  58. 5 2
      htdocs/langs/ca_ES/errors.lang
  59. 14 14
      htdocs/langs/ca_ES/interventions.lang
  60. 55 48
      htdocs/langs/ca_ES/main.lang
  61. 3 1
      htdocs/langs/ca_ES/orders.lang
  62. 1 0
      htdocs/langs/ca_ES/other.lang
  63. 11 10
      htdocs/langs/ca_ES/productbatch.lang
  64. 1 0
      htdocs/langs/ca_ES/projects.lang
  65. 6 1
      htdocs/langs/ca_ES/stocks.lang
  66. 1 1
      htdocs/langs/ca_ES/suppliers.lang
  67. 0 24
      htdocs/langs/ca_ES/trips.lang
  68. 21 15
      htdocs/langs/cs_CZ/admin.lang
  69. 2 0
      htdocs/langs/cs_CZ/banks.lang
  70. 16 10
      htdocs/langs/cs_CZ/boxes.lang
  71. 5 2
      htdocs/langs/cs_CZ/errors.lang
  72. 1 1
      htdocs/langs/cs_CZ/interventions.lang
  73. 7 0
      htdocs/langs/cs_CZ/main.lang
  74. 3 1
      htdocs/langs/cs_CZ/orders.lang
  75. 1 0
      htdocs/langs/cs_CZ/other.lang
  76. 11 10
      htdocs/langs/cs_CZ/productbatch.lang
  77. 1 0
      htdocs/langs/cs_CZ/projects.lang
  78. 6 1
      htdocs/langs/cs_CZ/stocks.lang
  79. 1 1
      htdocs/langs/cs_CZ/suppliers.lang
  80. 0 24
      htdocs/langs/cs_CZ/trips.lang
  81. 21 15
      htdocs/langs/da_DK/admin.lang
  82. 2 0
      htdocs/langs/da_DK/banks.lang
  83. 35 29
      htdocs/langs/da_DK/boxes.lang
  84. 5 2
      htdocs/langs/da_DK/errors.lang
  85. 1 1
      htdocs/langs/da_DK/interventions.lang
  86. 7 0
      htdocs/langs/da_DK/main.lang
  87. 3 1
      htdocs/langs/da_DK/orders.lang
  88. 1 0
      htdocs/langs/da_DK/other.lang
  89. 11 10
      htdocs/langs/da_DK/productbatch.lang
  90. 1 0
      htdocs/langs/da_DK/projects.lang
  91. 6 1
      htdocs/langs/da_DK/stocks.lang
  92. 1 1
      htdocs/langs/da_DK/suppliers.lang
  93. 0 24
      htdocs/langs/da_DK/trips.lang
  94. 0 1
      htdocs/langs/de_AT/products.lang
  95. 6 6
      htdocs/langs/de_DE/accountancy.lang
  96. 139 133
      htdocs/langs/de_DE/admin.lang
  97. 5 5
      htdocs/langs/de_DE/agenda.lang
  98. 7 5
      htdocs/langs/de_DE/banks.lang
  99. 21 15
      htdocs/langs/de_DE/boxes.lang
  100. 77 77
      htdocs/langs/de_DE/categories.lang

+ 6 - 0
ChangeLog

@@ -212,6 +212,7 @@ Dolibarr better:
 - A lot of pages called liste.php were renamed into list.php
 - If you used warehouse/stock module, recheck setup of stock increase/decrease rules of the
   warehouse module and your Point Of Sale module if you use one.
+- Replaced USER_UPDATE_SESSION trigger with an updateSession hook
 
 ***** ChangeLog for 3.6.3 compared to 3.6.2 *****
 - Fix: ref_ext was not saved when recording a customer order from web service
@@ -416,6 +417,11 @@ Fix: [ bug #1757 ] Sorting breaks product/service statistics
 Fix: [ bug #1797 ] Tulip supplier invoice module takes creation date instead of invoice date
 Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled
 Fix: [ bug #1846 ] Browser IE11 not detected
+Fix: [ bug #1906 ] Deplacement does not allow translated decimal format
+Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card
+Fix: [ bug #2583 ] Unable to create a bank transfer with localized numbers
+Fix: [ bug #2577 ] Incorrect invoice status in "Linked objects" page of a project
+Fix: [ bug #2576 ] Unable to edit a dictionary entry that has # in its ref
 
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973

+ 1 - 1
build/debian/control

@@ -22,7 +22,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
 #    libnusoap-php,
 #    libphp-pclzip,
 # Required javascript libraries
-#    libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor,
+#    javascript-common, libjs-jquery, libjs-jquery-ui, libjs-jquery-flot, ckeditor,
 # Misc dependencies
 #    fonts-dejavu-core | ttf-dejavu-core,
     xdg-utils,

+ 2 - 2
htdocs/admin/dict.php

@@ -6,7 +6,7 @@
  * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2011      Remy Younes          <ryounes@gmail.com>
- * Copyright (C) 2012-2013 Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2015 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2012      Christophe Battarel	<christophe.battarel@ltairis.fr>
  * Copyright (C) 2011-2015 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
  *
@@ -1235,7 +1235,7 @@ if ($id)
                     if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable=0; }
                     if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $isdisable=0; $isdisable = 0; }
 
-                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&amp;code='.(! empty($obj->code)?$obj->code:'').'&amp;id='.$id.'&amp;';
+                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&amp;code='.(! empty($obj->code)?urlencode($obj->code):'').'&amp;id='.$id.'&amp;';
 
 					// Favorite
 					// Only activated on country dictionary

+ 1 - 1
htdocs/comm/mailing/card.php

@@ -780,7 +780,7 @@ else
                     if ($conf->file->mailing_limit_sendbyweb == 0)
                     {
                     	$text.=$langs->trans("MailingNeedCommand");
-                    	$text.='<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>';
+                    	$text.='<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
                     	$text.='<br><br>';
                     }
 				    $text.=$langs->trans('ConfirmSendingEmailing').'<br>';

+ 2 - 1
htdocs/compta/bank/virement.php

@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,7 +49,7 @@ if ($action == 'add')
 
 	$dateo = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int'));
 	$label = GETPOST('label','alpha');
-	$amount= GETPOST('amount','int');
+	$amount= GETPOST('amount');
 
 	if (! $label)
 	{

+ 4 - 2
htdocs/compta/deplacement/card.php

@@ -432,11 +432,13 @@ else if ($id)
             print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
             print '</td></tr>';
 
-            // Type
+	        $form->load_cache_types_fees();
+            
+	        // Type
             print '<tr><td>';
             print $form->editfieldkey("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
             print '</td><td>';
-            print $form->editfieldval("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
+            print $form->editfieldval("Type",'type',$form->cache_types_fees[$object->type],$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
             print '</td></tr>';
 
             // Who

+ 4 - 2
htdocs/compta/facture/mergepdftool.php

@@ -791,13 +791,15 @@ if ($resql)
 			print '<td align="right">'.price($objp->total_ttc).'</td>';
 			print '<td align="right">';
 			$cn=$facturestatic->getSumCreditNotesUsed();
+			$dep=$facturestatic->getSumDepositsUsed();
 			if (! empty($objp->am)) print price($objp->am);
 			if (! empty($objp->am) && ! empty($cn)) print '+';
 			if (! empty($cn)) print price($cn);
+			if (! empty($dep)) print price(-$dep);
 			print '</td>';
 
 			// Remain to receive
-			print '<td align="right">'.((! empty($objp->am) || ! empty($cn))?price($objp->total_ttc-$objp->am-$cn):'&nbsp;').'</td>';
+			print '<td align="right">'.((! empty($objp->am) || ! empty($cn) || ! empty($dep))?price($objp->total_ttc-$objp->am-$cn-$dep):'&nbsp;').'</td>';
 
 			// Status of invoice
 			print '<td align="right" class="nowrap">';
@@ -827,7 +829,7 @@ if ($resql)
 			$total_ht+=$objp->total_ht;
 			$total_tva+=($objp->total_tva + $tx1 + $tx2 + $revenuestamp);
 			$total_ttc+=$objp->total_ttc;
-			$total_paid+=$objp->am + $cn;
+			$total_paid+=$objp->am + $cn + $dep;
 
 			$i++;
 		}

+ 1 - 1
htdocs/compta/prelevement/card.php

@@ -190,7 +190,7 @@ if ($id > 0)
 
 	print '<table class="border" width="100%"><tr><td width="20%">';
 	print $langs->trans("WithdrawalFile").'</td><td>';
-	$relativepath = 'receipts/'.$bon->ref;
+	$relativepath = 'receipts/'.$bon->ref.'.xml';
 	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
 	print '</td></tr></table>';
 

+ 27 - 31
htdocs/compta/prelevement/class/bonprelevement.class.php

@@ -907,9 +907,9 @@ class BonPrelevement extends CommonObject
 				if ($resql)
 				{
 					$row = $this->db->fetch_row($resql);
-					$ref = "T".$ref.str_pad(dol_substr("00".intval($row[0])+1),2,"0",STR_PAD_LEFT);
+					$ref = "T".$ref.str_pad(dol_substr("00".intval($row[0])+1,0,2),2,"0",STR_PAD_LEFT);
 
-					$filebonprev = $ref;
+					$this->filename = $conf->prelevement->dir_output.'/receipts/'.$ref.'.xml';
 
 	                // Create withdraw receipt in database
 	                $sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons (";
@@ -928,12 +928,9 @@ class BonPrelevement extends CommonObject
 	                    $dir=$conf->prelevement->dir_output.'/receipts';
 	                    $file=$filebonprev;
 	                    if (! is_dir($dir)) dol_mkdir($dir);
-
-	                    $bonprev = new BonPrelevement($this->db, $dir."/".$file);
-	                    $bonprev->id = $prev_id;
 	                }
 	                else
-	                {
+					{
 	                    $error++;
 	                    dol_syslog(__METHOD__."::Create withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 	                }
@@ -969,7 +966,7 @@ class BonPrelevement extends CommonObject
                          * $fac[8] : client nom
                          * $fac[2] : client id
                          */
-                        $ri = $bonprev->AddFacture($fac[0], $fac[2], $fac[8], $fac[7], $fac[3], $fac[4], $fac[5], $fac[6]);
+                        $ri = $this->AddFacture($fac[0], $fac[2], $fac[8], $fac[7], $fac[3], $fac[4], $fac[5], $fac[6]);
                         if ($ri <> 0)
                         {
                             $error++;
@@ -979,7 +976,7 @@ class BonPrelevement extends CommonObject
                         $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande";
                         $sql.= " SET traite = 1";
                         $sql.= ", date_traite = '".$this->db->idate($now)."'";
-                        $sql.= ", fk_prelevement_bons = ".$prev_id;
+                        $sql.= ", fk_prelevement_bons = ".$this->id;
                         $sql.= " WHERE rowid = ".$fac[1];
 
                         dol_syslog(__METHOD__."::Update Orders::Sql=".$sql, LOG_DEBUG);
@@ -1006,24 +1003,24 @@ class BonPrelevement extends CommonObject
 
                 if (count($factures_prev) > 0)
                 {
-                    $bonprev->date_echeance = $datetimeprev;
-                    $bonprev->reference_remise = $ref;
+                    $this->date_echeance = $datetimeprev;
+                    $this->reference_remise = $ref;
 
-                    $bonprev->numero_national_emetteur    = $conf->global->PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR;
-                    $bonprev->raison_sociale              = $conf->global->PRELEVEMENT_RAISON_SOCIALE;
+                    $this->numero_national_emetteur    = $conf->global->PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR;
+                    $this->raison_sociale              = $conf->global->PRELEVEMENT_RAISON_SOCIALE;
 
-                    $bonprev->emetteur_code_banque 		  = $conf->global->PRELEVEMENT_CODE_BANQUE;
-                    $bonprev->emetteur_code_guichet       = $conf->global->PRELEVEMENT_CODE_GUICHET;
-                    $bonprev->emetteur_numero_compte      = $conf->global->PRELEVEMENT_NUMERO_COMPTE;
-                    $bonprev->emetteur_number_key		  = $conf->global->PRELEVEMENT_NUMBER_KEY;
-                    $bonprev->emetteur_iban               = $conf->global->PRELEVEMENT_IBAN;
-                    $bonprev->emetteur_bic                = $conf->global->PRELEVEMENT_BIC;
-                    $bonprev->emetteur_ics                = $conf->global->PRELEVEMENT_ICS;		// TODO Add this into setup of admin/prelevement.php. Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+                    $this->emetteur_code_banque 		  = $conf->global->PRELEVEMENT_CODE_BANQUE;
+                    $this->emetteur_code_guichet       = $conf->global->PRELEVEMENT_CODE_GUICHET;
+                    $this->emetteur_numero_compte      = $conf->global->PRELEVEMENT_NUMERO_COMPTE;
+                    $this->emetteur_number_key		  = $conf->global->PRELEVEMENT_NUMBER_KEY;
+                    $this->emetteur_iban               = $conf->global->PRELEVEMENT_IBAN;
+                    $this->emetteur_bic                = $conf->global->PRELEVEMENT_BIC;
+                    $this->emetteur_ics                = $conf->global->PRELEVEMENT_ICS;		// TODO Add this into setup of admin/prelevement.php. Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
 
-                    $bonprev->factures = $factures_prev_id;
+                    $this->factures = $factures_prev_id;
 
                     // Generation of SEPA file
-                    $bonprev->generate();
+                    $this->generate();
                 }
                 dol_syslog(__METHOD__."::End withdraw receipt, file ".$filebonprev, LOG_DEBUG);
             }
@@ -1032,8 +1029,8 @@ class BonPrelevement extends CommonObject
              * Update total
              */
             $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
-            $sql.= " SET amount = ".price2num($bonprev->total);
-            $sql.= " WHERE rowid = ".$prev_id;
+            $sql.= " SET amount = ".price2num($this->total);
+            $sql.= " WHERE rowid = ".$this->id;
             $sql.= " AND entity = ".$conf->entity;
 
             $resql=$this->db->query($sql);
@@ -1269,9 +1266,9 @@ class BonPrelevement extends CommonObject
 				}
 			}
 
-			$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, soc.datec, p.code as country_code,";
+			$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, c.code as country_code,";
 			$sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
-			$sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum";
+			$sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum";
 			$sql.= " FROM";
 			$sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
 			$sql.= " ".MAIN_DB_PREFIX."facture as f,";
@@ -1328,7 +1325,7 @@ class BonPrelevement extends CommonObject
 			fputs($this->file, '			<NbOfTxs>'.$i.'</NbOfTxs>'.$CrLf);
 			fputs($this->file, '			<CtrlSum>'.$this->total.'</CtrlSum>'.$CrLf);
 			fputs($this->file, '			<InitgPty>'.$CrLf);
-			fputs($this->file, '				<Nm>'.$this->raison_sociale.'</Nm>'.$CrLf);
+			fputs($this->file, '				<Nm>'.strtoupper(dol_string_unaccent($this->raison_sociale)).'</Nm>'.$CrLf);
 			fputs($this->file, '				<Id>'.$CrLf);
 			fputs($this->file, '				    <PrvtId>'.$CrLf);
 			fputs($this->file, '					<Othr>'.$CrLf);
@@ -1565,7 +1562,7 @@ class BonPrelevement extends CommonObject
 		$XML_DEBITOR .='					<Nm>'.strtoupper(dol_string_unaccent($row_nom)).'</Nm>'.$CrLf;
 		$XML_DEBITOR .='					<PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
-		$XML_DEBITOR .='						<AdrLine>'.strtr($row_address, array(CHR(13) => ", ", CHR(10) => "")).'</AdrLine>'.$CrLf;
+		$XML_DEBITOR .='						<AdrLine>'.dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""))).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='						<AdrLine>'.dol_string_unaccent($row_zip.' '.$row_town).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='					</PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='				</Dbtr>'.$CrLf;
@@ -1692,7 +1689,6 @@ class BonPrelevement extends CommonObject
 			$XML_SEPA_INFO .= '			<NbOfTxs>'.$nombre.'</NbOfTxs>'.$CrLf;
 			$XML_SEPA_INFO .= '			<CtrlSum>'.$total.'</CtrlSum>'.$CrLf;
 			$XML_SEPA_INFO .= '			<PmtTpInf>'.$CrLf;
-			$XML_SEPA_INFO .= '				<InstrPrty>NORM</InstrPrty>'.$CrLf;
 			$XML_SEPA_INFO .= '				<SvcLvl>'.$CrLf;
 			$XML_SEPA_INFO .= '					<Cd>SEPA</Cd>'.$CrLf;
 			$XML_SEPA_INFO .= '				</SvcLvl>'.$CrLf;
@@ -1703,11 +1699,11 @@ class BonPrelevement extends CommonObject
 			$XML_SEPA_INFO .= '			</PmtTpInf>'.$CrLf;
 			$XML_SEPA_INFO .= '			<ReqdColltnDt>'.$dateTime_ETAD.'</ReqdColltnDt>'.$CrLf;
 			$XML_SEPA_INFO .= '			<Cdtr>'.$CrLf;
-			$XML_SEPA_INFO .= '				<Nm>'.$configuration->global->PRELEVEMENT_RAISON_SOCIALE.'</Nm>'.$CrLf;
+			$XML_SEPA_INFO .= '				<Nm>'.strtoupper(dol_string_unaccent($configuration->global->PRELEVEMENT_RAISON_SOCIALE)).'</Nm>'.$CrLf;
 			$XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
 			$XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
-			$XML_SEPA_INFO .= '					<AdrLine>'.$configuration->global->MAIN_INFO_SOCIETE_ADDRESS.'</AdrLine>'.$CrLf;
-			$XML_SEPA_INFO .= '					<AdrLine>'.$configuration->global->MAIN_INFO_SOCIETE_ZIP.' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN.'</AdrLine>'.$CrLf;
+			$XML_SEPA_INFO .= '					<AdrLine>'.strtoupper(dol_string_unaccent($configuration->global->MAIN_INFO_SOCIETE_ADDRESS)).'</AdrLine>'.$CrLf;
+			$XML_SEPA_INFO .= '					<AdrLine>'.strtoupper(dol_string_unaccent($configuration->global->MAIN_INFO_SOCIETE_ZIP.' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN)).'</AdrLine>'.$CrLf;
 			$XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
 			$XML_SEPA_INFO .= '			</Cdtr>'.$CrLf;
 			$XML_SEPA_INFO .= '			<CdtrAcct>'.$CrLf;

+ 1 - 1
htdocs/core/class/html.form.class.php

@@ -205,7 +205,7 @@ class Form
             else
 			{
 				if ($typeofdata == 'email')   $ret.=dol_print_email($value,0,0,0,0,1);
-                elseif ($typeofdata == 'amount')   $ret.=($value != '' ? price($value,'',$langs,0,0,-1,$conf->currency) : '');
+                elseif ($typeofdata == 'amount')   $ret.=($value != '' ? price($value,'',$langs,0,-1,-1,$conf->currency) : '');
                 elseif (preg_match('/^text/',$typeofdata) || preg_match('/^note/',$typeofdata))  $ret.=dol_htmlentitiesbr($value);
                 elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret.=dol_print_date($value,'day');
                 elseif ($typeofdata == 'datehourpicker') $ret.=dol_print_date($value,'dayhour');

+ 2 - 2
htdocs/core/menus/standard/eldy.lib.php

@@ -135,8 +135,8 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0)
 	}
 
 	// Financial
-	$tmpentry=array('enabled'=>(! empty($conf->comptabilite->enabled) || ! empty($conf->accounting->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->don->enabled) || ! empty($conf->tax->enabled) || ! empty($conf->salaries->enabled) || ! empty($conf->loan->enabled)),
-	'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->plancompte->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read) || ! empty($user->rights->loan->read)),
+	$tmpentry=array('enabled'=>(! empty($conf->comptabilite->enabled) || ! empty($conf->accounting->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->don->enabled) || ! empty($conf->tax->enabled) || ! empty($conf->salaries->enabled) || ! empty($conf->fournisseur->enabled) || ! empty($conf->loan->enabled)),
+	'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->plancompte->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read) || ! empty($user->rights->fournisseur->facture->lire) || ! empty($user->rights->loan->read)),
 	'module'=>'comptabilite|accounting|facture|don|tax|salaries|loan');
 	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)

+ 1 - 1
htdocs/core/modules/modProjet.class.php

@@ -188,7 +188,7 @@ class modProjet extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='ProjectsAndTasksLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r]=array(array("projet","export"));
-		$this->export_dependencies_array[$r]=array('task_time'=>'ppt.rowid');
+		$this->export_dependencies_array[$r]=array('task_time'=>'ptt.rowid');
 
 		$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label',
 		's.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text',

+ 9 - 0
htdocs/expedition/card.php

@@ -140,6 +140,7 @@ if (empty($reshook))
 
 	    $object->socid					= $objectsrc->socid;
 	    $object->ref_customer			= $objectsrc->ref_client;
+	    $object->model_pdf				= GETPOST('model');
 	    $object->date_delivery			= $date_delivery;	// Date delivery planed
 	    $object->fk_delivery_address	= $objectsrc->fk_delivery_address;
 	    $object->shipping_method_id		= GETPOST('shipping_method_id','int');
@@ -603,6 +604,14 @@ if ($action == 'create')
 				print '</td></tr>';
 			}
 
+            // Document model
+            print "<tr><td>".$langs->trans("Model")."</td>";
+            print '<td colspan="3">';
+			include_once DOL_DOCUMENT_ROOT . '/core/modules/expedition/modules_expedition.php';
+			$liste = ModelePdfExpedition::liste_modeles($db);
+			print $form->selectarray('model', $liste, $conf->global->EXPEDITION_ADDON_PDF);
+            print "</td></tr>\n";
+            
             // Other attributes
             $parameters=array('colspan' => ' colspan="3"');
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action);    // Note that $action and $object may have been modified by hook

+ 0 - 2
htdocs/expedition/class/expedition.class.php

@@ -182,8 +182,6 @@ class Expedition extends CommonObject
 
 		$now=dol_now();
 
-		if (empty($this->model_pdf)) $this->model_pdf=$conf->global->EXPEDITION_ADDON_PDF;
-
 		require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
 		$error = 0;
 

+ 1 - 1
htdocs/fichinter/card.php

@@ -1554,7 +1554,7 @@ else if ($id > 0 || ! empty($ref))
 				print '<td align="right">';
 				$selectmode='select';
 				if (! empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) $selectmode='text';
-				$form->select_duration('duration', (!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))?3600:(60*60*GETPOST('durationhour','int')+60*GETPOST('durationmin','int')), 0, $selectmode, 1);
+				$form->select_duration('duration', (!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))?3600:(60*60*GETPOST('durationhour','int')+60*GETPOST('durationmin','int')), 0, $selectmode);
 				print '</td>';
 
 				print '<td align="center" valign="middle" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline"></td>';

+ 21 - 15
htdocs/langs/ar_SA/admin.lang

@@ -297,10 +297,11 @@ MenuHandlers=قائمة مناولي
 MenuAdmin=قائمة تحرير
 DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=هذا هو الإعداد لهذه العملية :
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=الخطوة ق ٪
 FindPackageFromWebSite=العثور على الحزمة التي توفر ميزة تريد (على سبيل المثال على موقع الويب ق ٪).
 DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=تفريغ الملف إلى مجموعة Dolibarr 'sجذور دليل <b>٪ ق</b>
+UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=الانتهاء من تركيب وDolibarr على استعداد لاستخدام هذا العنصر الجديد.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (vat is not applied on local tax)<br>2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)<br>3 : local tax apply on products without vat (vat is not applied on local tax)<br>4 : local tax apply on products before vat (vat is calculated on amount + localtax)<br>5 : local tax apply on services without vat (vat is not applied on local tax)<br>6 : local tax apply on services before vat (vat is calculated on amount + localtax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -540,8 +541,8 @@ Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product batch
-Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
+Module39000Name=Product lot
+Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع PayBox
 Module50100Name=نقطة البيع
@@ -558,8 +559,6 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
 Permission11=قراءة الفواتير
 Permission12=خلق الفواتير
 Permission13=تعديل الفواتير
@@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= معدل الطاقة المتجددة بشكل افتر
 LocalTax2IsNotUsedDescES= افتراضيا IRPF المقترحة هي 0. نهاية الحكم.
 LocalTax2IsUsedExampleES= في اسبانيا ، لحسابهم الخاص والمهنيين المستقلين الذين يقدمون الخدمات والشركات الذين اختاروا النظام الضريبي من وحدات.
 LocalTax2IsNotUsedExampleES= في اسبانيا هم bussines لا تخضع لنظام ضريبي وحدات.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2=Purchases
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
+CalcLocaltax3=Sales
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=العلامة التي يستخدمها التقصير إذا لم يمكن العثور على ترجمة للقانون
 LabelOnDocuments=علامة على وثائق
@@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=لا أمن الحدث وقد سجلت حتى الآن. ه
 NoEventFoundWithCriteria=لا أمن حال تم العثور على مثل هذا البحث criterias.
 SeeLocalSendMailSetup=انظر المحلية الإعداد sendmail
 BackupDesc=لتقديم دعم كامل للDolibarr ، يجب عليك :
-BackupDesc2=* حفظ الوثائق محتوى الدليل <b>(٪)</b> والذي يحتوي على جميع وتحميل الملفات ولدت (هل يمكن أن تقدم على سبيل المثال والرمز البريدي).
-BackupDesc3=* حفظ محتوى قاعدة البيانات مع نفايات. لهذا ، يمكنك استخدام التالية مساعد.
+BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
 BackupDescX=الأرشيف دليل ينبغي أن تحفظ في مكان آمن.
 BackupDescY=وقد ولدت وينبغي التخلص من الملفات المخزنة في مكان آمن.
 BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
 RestoreDesc=Dolibarr لاستعادة النسخ الاحتياطي ، يجب عليك :
-RestoreDesc2=* استعادة ارشيف ملف (ملف مضغوط على سبيل المثال) للوثائق ودليل لانتزاع شجرة الملفات في دليل وثائق جديدة أو Dolibarr تركيب هذه الوثائق الحالية directoy <b>(٪).</b>
-RestoreDesc3=* استعادة البيانات ، احتياطية من إلقاء الملف في قاعدة البيانات من جديد Dolibarr تركيب أو في قاعدة البيانات الحالية لهذا التثبيت. تحذير ، بعد الانتهاء من اعادة ، يجب استخدام ادخل كلمة السر ، التي كانت موجودة عندما تم احتياطية ، لربط جديد. النسخ الاحتياطي لاستعادة قاعدة بيانات في هذا التركيب الحالي ، يمكنك اتباع هذه مساعدا.
+RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
+RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
 ForcedToByAModule= هذه القاعدة <b>ق ٪</b> الى جانب تفعيل وحدة
 PreviousDumpFiles=متاح تفريغ النسخ الاحتياطي ملفات قاعدة البيانات
@@ -1337,6 +1336,8 @@ LDAPFieldCountry=قطر
 LDAPFieldCountryExample=على سبيل المثال : (ج)
 LDAPFieldDescription=وصف
 LDAPFieldDescriptionExample=مثال ذلك : وصف
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example : publicnote
 LDAPFieldGroupMembers= أعضاء الفريق
 LDAPFieldGroupMembersExample= على سبيل المثال : uniqueMember
 LDAPFieldBirthdate=تاريخ الميلاد
@@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= حساب لاستخدام لاستلام المبال
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
 BookmarkSetup=إعداد وحدة المرجعية
@@ -1616,3 +1617,8 @@ ListOfNotificationsPerContact=List of notifications per contact*
 ListOfFixedNotifications=List of fixed notifications
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
 Threshold=Threshold
+BackupDumpWizard=Wizard to build database backup dump file
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>

+ 2 - 0
htdocs/langs/ar_SA/banks.lang

@@ -163,3 +163,5 @@ LabelRIB=BAN Label
 NoBANRecord=No BAN record
 DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+StartDate=Start date
+EndDate=End date

+ 16 - 10
htdocs/langs/ar_SA/boxes.lang

@@ -12,6 +12,7 @@ BoxLastProspects=آفاق الماضي
 BoxLastCustomers=آخر الزبائن
 BoxLastSuppliers=الماضي الموردين
 BoxLastCustomerOrders=آخر طلبات الزبائن
+BoxLastValidatedCustomerOrders=Last validated customer orders
 BoxLastBooks=آخر الكتب
 BoxLastActions=آخر الأعمال
 BoxLastContracts=آخر العقود
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=دي اسم العميل
 BoxTitleLastRssInfos=آخر الأخبار من ٪ ق ق ٪
 BoxTitleLastProducts=آخر تعديل ٪ ق المنتجات / الخدمات
 BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=آخر تعديل ق ٪ طلبات الزبائن
+BoxTitleLastCustomerOrders=Last %s customer orders
+BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
 BoxTitleLastSuppliers=الماضي وسجل الموردين ق ٪
 BoxTitleLastCustomers=الماضي وسجل للعملاء ل ٪
 BoxTitleLastModifiedSuppliers=%s آخر تعديل الموردين
 BoxTitleLastModifiedCustomers=%s آخر تعديل الزبائن
-BoxTitleLastCustomersOrProspects=آخر تعديل ق ٪ العملاء أو آفاق
-BoxTitleLastPropals=٪ ق الماضي سجلت مقترحات
+BoxTitleLastCustomersOrProspects=Last %s customers or prospects
+BoxTitleLastPropals=Last %s proposals
+BoxTitleLastModifiedPropals=Last %s modified proposals
 BoxTitleLastCustomerBills=ق الماضي ٪ العميل الفواتير
+BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
 BoxTitleLastSupplierBills=ق الماضي ٪ فواتير المورد
-BoxTitleLastProspects=الماضي وسجل آفاق ق ٪
+BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
 BoxTitleLastModifiedProspects=%s آخر تعديل آفاق
 BoxTitleLastProductsInContract=الماضي ٪ ق المنتجات / الخدمات في عقد
-BoxTitleLastModifiedMembers=آخر تعديل لأعضاء %s
+BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
-BoxTitleOldestUnpaidCustomerBills=أقدم ٪ ق العميل الفواتير غير المدفوعة
-BoxTitleOldestUnpaidSupplierBills=أقدم ٪ ق المورد الفواتير غير المدفوعة
+BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
+BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
 BoxTitleCurrentAccounts=Opened account's balances
 BoxTitleSalesTurnover=مبيعات
-BoxTitleTotalUnpaidCustomerBills=العميل الفواتير غير المدفوعة
-BoxTitleTotalUnpaidSuppliersBills=المورد الفواتير غير المدفوعة
+BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
+BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
 BoxTitleLastModifiedContacts=%s آخر تعديل الأسماء / عناوين
 BoxMyLastBookmarks=آخر العناوين ق ٪
 BoxOldestExpiredServices=أقدم نشط خدمات منتهية الصلاحية
@@ -76,7 +80,8 @@ NoContractedProducts=أي المنتجات / الخدمات المتعاقد ع
 NoRecordedContracts=لا عقود المسجلة
 NoRecordedInterventions=No recorded interventions
 BoxLatestSupplierOrders=Latest supplier orders
-BoxTitleLatestSupplierOrders=%s latest supplier orders
+BoxTitleLatestSupplierOrders=Last %s supplier orders
+BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
 NoSupplierOrder=No recorded supplier order
 BoxCustomersInvoicesPerMonth=Customer invoices per month
 BoxSuppliersInvoicesPerMonth=Supplier invoices per month
@@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s
 ForCustomersInvoices=العملاء والفواتير
 ForCustomersOrders=Customers orders
 ForProposals=مقترحات
+LastXMonthRolling=The last %s month rolling

+ 5 - 2
htdocs/langs/ar_SA/errors.lang

@@ -159,14 +159,17 @@ ErrorPriceExpression22=Negative result '%s'
 ErrorPriceExpressionInternal=Internal error '%s'
 ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
 ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
 ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
 ErrorGlobalVariableUpdater2=Missing parameter '%s'
 ErrorGlobalVariableUpdater3=The requested data was not found in result
 ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined

+ 1 - 1
htdocs/langs/ar_SA/interventions.lang

@@ -50,4 +50,4 @@ ArcticNumRefModelError=فشل لتفعيل
 PacificNumRefModelDesc1=عودة número مع الشكل nnnn - ٪ syymm فيها السنة هي السنة ، هو شهر ملم وnnnn هو كسر التسلسل وليس هناك عودة لل0
 PacificNumRefModelError=تدخل البطاقة ابتداء من دولار ويوجد بالفعل syymm لا تتفق مع هذا النموذج من التسلسل. إزالة أو تغيير تسميتها لتصبح لتفعيل هذه الوحدة.
 PrintProductsOnFichinter=Print products on intervention card
-PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinterDetails=interventions generated from orders

+ 7 - 0
htdocs/langs/ar_SA/main.lang

@@ -220,6 +220,7 @@ Next=التالي
 Cards=بطاقات
 Card=بطاقة
 Now=الآن
+HourStart=Start hour
 Date=تاريخ
 DateAndHour=Date and hour
 DateStart=تاريخ البدء
@@ -242,6 +243,8 @@ DatePlanShort=تاريخ تعتزم
 DateRealShort=التاريخ الحقيقي.
 DateBuild=التقرير بناء التاريخ
 DatePayment=تاريخ الدفع
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
 DurationYear=سنة
 DurationMonth=الشهر
 DurationWeek=الأسبوع
@@ -408,6 +411,8 @@ OtherInformations=معلومات أخرى
 Quantity=الكمية
 Qty=الكمية
 ChangedBy=تغيير
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
 ReCalculate=Recalculate
 ResultOk=النجاح
 ResultKo=فشل
@@ -696,6 +701,8 @@ SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
+Deny=Deny
+Denied=Denied
 # Week day
 Monday=يوم الاثنين
 Tuesday=الثلاثاء

+ 3 - 1
htdocs/langs/ar_SA/orders.lang

@@ -79,7 +79,9 @@ NoOpenedOrders=أي أوامر فتح
 NoOtherOpenedOrders=أي أوامر فتح
 NoDraftOrders=No draft orders
 OtherOrders=أوامر أخرى
-LastOrders=ق الماضي أوامر ٪
+LastOrders=Last %s customer orders
+LastCustomerOrders=Last %s customer orders
+LastSupplierOrders=Last %s supplier orders
 LastModifiedOrders=آخر تعديل أوامر ق ٪
 LastClosedOrders=٪ ق الماضي أوامر مغلقة
 AllOrders=جميع أوامر

+ 1 - 0
htdocs/langs/ar_SA/other.lang

@@ -203,6 +203,7 @@ NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
 
 ##### Calendar common #####
 AddCalendarEntry=إضافة الدخول في التقويم ق ٪

+ 11 - 10
htdocs/langs/ar_SA/productbatch.lang

@@ -1,21 +1,22 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use batch/serial number
-ProductStatusOnBatch=Yes (Batch/serial required)
-ProductStatusNotOnBatch=No (Batch/serial not used)
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
 ProductStatusOnBatchShort=Yes
 ProductStatusNotOnBatchShort=No
-Batch=Batch/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Batch number
-batch_number=Batch/Serial number
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
 l_eatby=Eat-by date
 l_sellby=Sell-by date
-DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Batch: %s
+DetailBatchNumber=Lot/Serial details
+DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+printBatch=Lot/Serial: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
-WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use batch/serial number

+ 1 - 0
htdocs/langs/ar_SA/projects.lang

@@ -14,6 +14,7 @@ MyTasksDesc=ويقتصر هذا الرأي على المشروعات أو الم
 OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
 TasksPublicDesc=هذا الرأي يعرض جميع المشاريع والمهام ويسمح لك قراءة.
 TasksDesc=هذا الرأي يعرض جميع المشاريع والمهام (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
 ProjectsArea=مشاريع المنطقة
 NewProject=مشروع جديد
 AddProject=إنشاء مشروع

+ 6 - 1
htdocs/langs/ar_SA/stocks.lang

@@ -16,6 +16,7 @@ CancelSending=الغاء ارسال
 DeleteSending=حذف ارسال
 Stock=الأسهم
 Stocks=الاسهم
+StocksByLotSerial=Stock by lot/serial
 Movement=الحركة
 Movements=حركات
 ErrorWarehouseRefRequired=مستودع الاشارة اسم مطلوب
@@ -78,6 +79,7 @@ IdWarehouse=معرف مخزن
 DescWareHouse=وصف المخزن
 LieuWareHouse=المكان مخزن
 WarehousesAndProducts=والمستودعات والمنتجات
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=متوسط أسعار المدخلات
 AverageUnitPricePMP=متوسط أسعار المدخلات
 SellPriceMin=بيع سعر الوحدة
@@ -131,4 +133,7 @@ IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock content correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).

+ 1 - 1
htdocs/langs/ar_SA/suppliers.lang

@@ -43,4 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
-UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
+UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)

+ 0 - 24
htdocs/langs/ar_SA/trips.lang

@@ -69,11 +69,9 @@ MOTIF_CANCEL=Reason
 DATE_REFUS=Deny date
 DATE_SAVE=Validation date
 DATE_VALIDE=Validation date
-DateApprove=Approving date
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Payment date
 
-Deny=Deny
 TO_PAID=Pay
 BROUILLONNER=Reopen
 SendToValid=Sent to approve
@@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta
 SaveTrip=Validate expense report
 ConfirmSaveTrip=Are you sure you want to validate this expense report ?
 
-Synchro_Compta=NDF <-> Compte
-
-TripSynch=Synchronisation : Notes de frais <-> Compte courant
-TripToSynch=Notes de frais à intégrer dans la compta
-AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
-ViewAccountSynch=Voir le compte
-
-ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
-ndfToAccount=Note de frais - Intégration
-
-ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
-AccountToNdf=Note de frais - Retrait
-
-LINE_NOT_ADDED=Ligne non ajoutée :
-NO_PROJECT=Aucun projet sélectionné.
-NO_DATE=Aucune date sélectionnée.
-NO_PRICE=Aucun prix indiqué.
-
-TripForValid=à Valider
-TripForPaid=à Payer
-TripPaid=Payée
-
 NoTripsToExportCSV=No expense report to export for this period.

+ 21 - 15
htdocs/langs/bg_BG/admin.lang

@@ -297,10 +297,11 @@ MenuHandlers=Меню работещи
 MenuAdmin=Menu Editor
 DoNotUseInProduction=Не използвайте на продукшън платформа
 ThisIsProcessToFollow=Това е настройка на процеса:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Стъпка %s
 FindPackageFromWebSite=Намери пакет, който осигурява функция искате (например относно официалния уеб сайт %s).
 DownloadPackageFromWebSite=Изтегляне на пакет %s.
-UnpackPackageInDolibarrRoot=Разопаковайте пакет файл в главната директория <b>%s</b> Dolibarr
+UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install е завършен и Dolibarr е готов за използване с този нов компонент.
 NotExistsDirect=Алтернатива главната директория не е дефинирано. <br>
 InfDirAlt=От версия 3 е възможно да се определи алтернативен directory.This корен ви позволява да съхранявате, едно и също място, плъгини и собствени шаблони. <br> Просто създайте директория, в основата на Dolibarr (напр. по поръчка). <br>
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Библиотека използвана за направа на PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (vat is not applied on local tax)<br>2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)<br>3 : local tax apply on products without vat (vat is not applied on local tax)<br>4 : local tax apply on products before vat (vat is calculated on amount + localtax)<br>5 : local tax apply on services without vat (vat is not applied on local tax)<br>6 : local tax apply on services before vat (vat is calculated on amount + localtax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Обнови връзка
@@ -540,8 +541,8 @@ Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product batch
-Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
+Module39000Name=Product lot
+Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Модул предлага онлайн страница на плащане с кредитна карта с Paybox
 Module50100Name=Точка на продажбите
@@ -558,8 +559,6 @@ Module59000Name=Полета
 Module59000Desc=Модул за управление на маржовете
 Module60000Name=Комисии
 Module60000Desc=Модул за управление на комисии
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
 Permission11=Клиентите фактури
 Permission12=Създаване / промяна на фактури на клиентите
 Permission13=Unvalidate клиентите фактури
@@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= RE процент по подразбиране при с
 LocalTax2IsNotUsedDescES= По подразбиране предложения IRPF е 0. Край на правило.
 LocalTax2IsUsedExampleES= В Испания, на свободна практика и независими специалисти, които предоставят услуги и фирми, които са избрани на данъчната система от модули.
 LocalTax2IsNotUsedExampleES= В Испания те са за бизнес, които не подлежат на данъчната система от модули.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2=Purchases
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
+CalcLocaltax3=Sales
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Етикет на документи
@@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Няма да се иска никакво обезпеч
 NoEventFoundWithCriteria=Няма да се иска никакво обезпечение събитие е за такива критерии за търсене.
 SeeLocalSendMailSetup=Вижте настройка Sendmail
 BackupDesc=За да направите пълно архивно копие на Dolibarr, трябва да:
-BackupDesc2=* Запазване на съдържанието на директорията с документи <b>(%s),</b> която съдържа всички качени и генерирани файлове (можете да направите примерно zip).
-BackupDesc3=* Запазване на съдържанието на базата данни в дъмп файл. Можете да използвате този помощник.
+BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
 BackupDescX=Архива на директорията трябва да се съхранява на сигурно място.
 BackupDescY=Генерирания дъмп файл трябва да се съхранява на сигурно място.
 BackupPHPWarning=Backup с този метод не може да бъде гарантирано. Предпочитам предишния
 RestoreDesc=За да възстановите резервно копие на Dolibarr, трябва да:
-RestoreDesc2=* Възстановяване от архивен файл (примерно zip) на документи, указател, за да извлечете дървото на файлове в документите директория на нова инсталация Dolibarr или в тази актуални документи directoy <b>(%s).</b>
-RestoreDesc3=* Възстановяване на данни от архивния файл на сметището в базата данни на новата инсталация Dolibarr или в базата данни на тази инсталация. Внимание, след като се възстанови приключи, трябва да се използва име / парола, че е съществувал, когато резервно копие е направено, за да се свържете отново. За да възстановите резервната база данни в тази инсталация, можете да следвате този помощник.
+RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
+RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL внос
 ForcedToByAModule= Това правило е принуден да <b>%s</b> от активиран модул
 PreviousDumpFiles=Файлове с бекъпи на базата данни
@@ -1337,6 +1336,8 @@ LDAPFieldCountry=Държава
 LDAPFieldCountryExample=Пример: в
 LDAPFieldDescription=Описание
 LDAPFieldDescriptionExample=Пример: описание
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example : publicnote
 LDAPFieldGroupMembers= Членовете на групата
 LDAPFieldGroupMembersExample= Пример: uniqueMember
 LDAPFieldBirthdate=Рождена дата
@@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Акаунт по подразбиране да се 
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
 BookmarkSetup=Bookmark настройка модул
@@ -1616,3 +1617,8 @@ ListOfNotificationsPerContact=List of notifications per contact*
 ListOfFixedNotifications=List of fixed notifications
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
 Threshold=Threshold
+BackupDumpWizard=Wizard to build database backup dump file
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>

+ 2 - 0
htdocs/langs/bg_BG/banks.lang

@@ -163,3 +163,5 @@ LabelRIB=BAN Label
 NoBANRecord=No BAN record
 DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+StartDate=Start date
+EndDate=End date

+ 1 - 0
htdocs/langs/bg_BG/boxes.lang

@@ -94,3 +94,4 @@ BoxProductDistributionFor=Разпределение на %s за %s
 ForCustomersInvoices=Клиента фактури
 ForCustomersOrders=Клиентски поръчки
 ForProposals=Предложения
+LastXMonthRolling=The last %s month rolling

+ 5 - 2
htdocs/langs/bg_BG/errors.lang

@@ -159,14 +159,17 @@ ErrorPriceExpression22=Negative result '%s'
 ErrorPriceExpressionInternal=Internal error '%s'
 ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
 ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
 ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
 ErrorGlobalVariableUpdater2=Missing parameter '%s'
 ErrorGlobalVariableUpdater3=The requested data was not found in result
 ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
 
 # Warnings
 WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени

+ 1 - 1
htdocs/langs/bg_BG/interventions.lang

@@ -50,4 +50,4 @@ ArcticNumRefModelError=Неуспешно да активирате
 PacificNumRefModelDesc1=Връщане Numero с формат %syymm-NNNN, където YY е годината, mm е месец и NNNN е последователност, без почивка и няма връщане назад 0
 PacificNumRefModelError=Интервенционната карта започва с $ syymm вече съществува и не е съвместим с този модел на последователност. Извадете го или го преименувайте да се активира този модул.
 PrintProductsOnFichinter=Print products on intervention card
-PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinterDetails=interventions generated from orders

+ 7 - 0
htdocs/langs/bg_BG/main.lang

@@ -220,6 +220,7 @@ Next=Следващ
 Cards=Карти
 Card=Карта
 Now=Сега
+HourStart=Start hour
 Date=Дата
 DateAndHour=Date and hour
 DateStart=Начална дата
@@ -242,6 +243,8 @@ DatePlanShort=Планирана дата
 DateRealShort=Реална дата
 DateBuild=Report build date
 DatePayment=Дата на изплащане
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
 DurationYear=година
 DurationMonth=месец
 DurationWeek=седмица
@@ -408,6 +411,8 @@ OtherInformations=Други данни
 Quantity=Количество
 Qty=Количество
 ChangedBy=Променено от
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
 ReCalculate=Recalculate
 ResultOk=Успех
 ResultKo=Провал
@@ -696,6 +701,8 @@ SelectElementAndClickRefresh=Изберете елемент и натиснет
 PrintFile=Print File %s
 ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
+Deny=Deny
+Denied=Denied
 # Week day
 Monday=Понеделник
 Tuesday=Вторник

+ 3 - 1
htdocs/langs/bg_BG/orders.lang

@@ -79,7 +79,9 @@ NoOpenedOrders=Не са открити поръчки
 NoOtherOpenedOrders=Няма други поръчки
 NoDraftOrders=No draft orders
 OtherOrders=Други поръчки
-LastOrders=Последни поръчки %s
+LastOrders=Last %s customer orders
+LastCustomerOrders=Last %s customer orders
+LastSupplierOrders=Last %s supplier orders
 LastModifiedOrders=Последните %s променени поръчки
 LastClosedOrders=Последните %s затворени поръчки
 AllOrders=Всички поръчки

+ 1 - 0
htdocs/langs/bg_BG/other.lang

@@ -203,6 +203,7 @@ NewKeyWillBe=Вашият нов ключ за влизане в софтуер
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=Необходимо е да щтракнете върху следния линк за да потвърдите промяната на паролата
 ForgetIfNothing=Ако не сте заявили промяната, просто забравете за този имейл. Вашите идентификационни данни се съхраняват на сигурно място.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
 
 ##### Calendar common #####
 AddCalendarEntry=Добави запис в календара %s

+ 11 - 10
htdocs/langs/bg_BG/productbatch.lang

@@ -1,21 +1,22 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use batch/serial number
-ProductStatusOnBatch=Yes (Batch/serial required)
-ProductStatusNotOnBatch=No (Batch/serial not used)
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
 ProductStatusOnBatchShort=Yes
 ProductStatusNotOnBatchShort=No
-Batch=Batch/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Batch number
-batch_number=Batch/Serial number
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
 l_eatby=Eat-by date
 l_sellby=Sell-by date
-DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Batch: %s
+DetailBatchNumber=Lot/Serial details
+DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+printBatch=Lot/Serial: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
-WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use batch/serial number

+ 1 - 0
htdocs/langs/bg_BG/projects.lang

@@ -14,6 +14,7 @@ MyTasksDesc=Тази гледна точка е ограничена до про
 OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
 TasksPublicDesc=Този възглед представя всички проекти и задачи, които може да чете.
 TasksDesc=Този възглед представя всички проекти и задачи (потребителски разрешения ви даде разрешение да видите всичко).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
 ProjectsArea=Проекти област
 NewProject=Нов проект
 AddProject=Create project

+ 6 - 1
htdocs/langs/bg_BG/stocks.lang

@@ -16,6 +16,7 @@ CancelSending=Отмяна на изпращане
 DeleteSending=Изтриване на изпращане
 Stock=Наличност
 Stocks=Наличности
+StocksByLotSerial=Stock by lot/serial
 Movement=Движение
 Movements=Движения
 ErrorWarehouseRefRequired=Изисква се референтно име на склад
@@ -78,6 +79,7 @@ IdWarehouse=Id на склад
 DescWareHouse=Описание на склад
 LieuWareHouse=Локализация на склад
 WarehousesAndProducts=Складове и продукти
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Средна входна цена
 AverageUnitPricePMP=Средна изходна цена
 SellPriceMin=Единична продажна цена
@@ -131,4 +133,7 @@ IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock content correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).

+ 1 - 1
htdocs/langs/bg_BG/suppliers.lang

@@ -43,4 +43,4 @@ ListOfSupplierOrders=Списък на нарежданията за доста
 MenuOrdersSupplierToBill=Поръчки на доставчика за фактуриране
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
-UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
+UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)

+ 0 - 24
htdocs/langs/bg_BG/trips.lang

@@ -69,11 +69,9 @@ MOTIF_CANCEL=Reason
 DATE_REFUS=Deny date
 DATE_SAVE=Validation date
 DATE_VALIDE=Validation date
-DateApprove=Approving date
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Payment date
 
-Deny=Deny
 TO_PAID=Pay
 BROUILLONNER=Reopen
 SendToValid=Sent to approve
@@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta
 SaveTrip=Validate expense report
 ConfirmSaveTrip=Are you sure you want to validate this expense report ?
 
-Synchro_Compta=NDF <-> Compte
-
-TripSynch=Synchronisation : Notes de frais <-> Compte courant
-TripToSynch=Notes de frais à intégrer dans la compta
-AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
-ViewAccountSynch=Voir le compte
-
-ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
-ndfToAccount=Note de frais - Intégration
-
-ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
-AccountToNdf=Note de frais - Retrait
-
-LINE_NOT_ADDED=Ligne non ajoutée :
-NO_PROJECT=Aucun projet sélectionné.
-NO_DATE=Aucune date sélectionnée.
-NO_PRICE=Aucun prix indiqué.
-
-TripForValid=à Valider
-TripForPaid=à Payer
-TripPaid=Payée
-
 NoTripsToExportCSV=No expense report to export for this period.

+ 21 - 15
htdocs/langs/bs_BA/admin.lang

@@ -297,10 +297,11 @@ MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=Ove postavke su za procesuiranje:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory <b>%s</b>
+UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (vat is not applied on local tax)<br>2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)<br>3 : local tax apply on products without vat (vat is not applied on local tax)<br>4 : local tax apply on products before vat (vat is calculated on amount + localtax)<br>5 : local tax apply on services without vat (vat is not applied on local tax)<br>6 : local tax apply on services before vat (vat is calculated on amount + localtax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -540,8 +541,8 @@ Module6000Name=Workflow - Tok rada
 Module6000Desc=Upravljanje workflow-om - tokom rada
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product batch
-Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
+Module39000Name=Product lot
+Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -558,8 +559,6 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
 Permission13=Unvalidate customer invoices
@@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices,
 LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2=Purchases
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
+CalcLocaltax3=Sales
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
@@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
 NoEventFoundWithCriteria=No security event has been found for such search criterias.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
-BackupDesc2=* Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
-BackupDesc3=* Save content of your database into a dump file. For this, you can use following assistant.
+BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
 BackupDescX=Archived directory should be stored in a secure place.
 BackupDescY=The generated dump file should be stored in a secure place.
 BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
 RestoreDesc=To restore a Dolibarr backup, you must:
-RestoreDesc2=* Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
-RestoreDesc3=* Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation. Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
+RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
+RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
 ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
 PreviousDumpFiles=Available database backup dump files
@@ -1337,6 +1336,8 @@ LDAPFieldCountry=Country
 LDAPFieldCountryExample=Example : c
 LDAPFieldDescription=Description
 LDAPFieldDescriptionExample=Example : description
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example : publicnote
 LDAPFieldGroupMembers= Group members
 LDAPFieldGroupMembersExample= Example : uniqueMember
 LDAPFieldBirthdate=Birthdate
@@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
 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
@@ -1616,3 +1617,8 @@ ListOfNotificationsPerContact=List of notifications per contact*
 ListOfFixedNotifications=List of fixed notifications
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
 Threshold=Threshold
+BackupDumpWizard=Wizard to build database backup dump file
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>

+ 2 - 0
htdocs/langs/bs_BA/banks.lang

@@ -163,3 +163,5 @@ LabelRIB=BAN Label
 NoBANRecord=No BAN record
 DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+StartDate=Start date
+EndDate=End date

+ 16 - 10
htdocs/langs/bs_BA/boxes.lang

@@ -12,6 +12,7 @@ BoxLastProspects=Last modified prospects
 BoxLastCustomers=Zadnji izmijenjeni kupci
 BoxLastSuppliers=Zadnji izmijenjeni dobavljači
 BoxLastCustomerOrders=Zadnje narudžbe kupca
+BoxLastValidatedCustomerOrders=Last validated customer orders
 BoxLastBooks=Zadnje knjige
 BoxLastActions=Zadnje akcije
 BoxLastContracts=Zadnji ugovori
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Broj klijenata
 BoxTitleLastRssInfos=Zanjih %s vijesti od %s
 BoxTitleLastProducts=Zadnjih %s izmijenjenih proizvoda/usluga
 BoxTitleProductsAlertStock=Upozorenje za proizvode u zalihama
-BoxTitleLastCustomerOrders=Zadnjih %s izmijenjenih narudžbi kupca
+BoxTitleLastCustomerOrders=Last %s customer orders
+BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
 BoxTitleLastSuppliers=Zadnjih %s zapisanih dobavljača
 BoxTitleLastCustomers=Zadnjih %s zapisanih kupaca
 BoxTitleLastModifiedSuppliers=Zadnjih %s izmijenjenih dobavljača
 BoxTitleLastModifiedCustomers=Zadnjih %s izmijenjenih kupaca
-BoxTitleLastCustomersOrProspects=Last %s modified customers or prospects
-BoxTitleLastPropals=Zadnjih %s zapisanih prijedloga
+BoxTitleLastCustomersOrProspects=Last %s customers or prospects
+BoxTitleLastPropals=Last %s proposals
+BoxTitleLastModifiedPropals=Last %s modified proposals
 BoxTitleLastCustomerBills=Zadnjih %s faktura kupca
+BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
 BoxTitleLastSupplierBills=Zadnjih %s faktura dobavljača
-BoxTitleLastProspects=Last %s recorded prospects
+BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
 BoxTitleLastModifiedProspects=Last %s modified prospects
 BoxTitleLastProductsInContract=Zadnjih %s proizvoda/usluga u ugovoru
-BoxTitleLastModifiedMembers=Zadnjih %s izmijenjenih članova
+BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Zadnjih %s izmijenjenih intervencija
-BoxTitleOldestUnpaidCustomerBills=Najstarijih %s neplaćenih faktura kupaca
-BoxTitleOldestUnpaidSupplierBills=Najstarijih %s neplaćenih faktura dobavljača
+BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
+BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
 BoxTitleCurrentAccounts=Stanja otvorenog računa
 BoxTitleSalesTurnover=Sales turnover
-BoxTitleTotalUnpaidCustomerBills=Neplaćene fakture kupca
-BoxTitleTotalUnpaidSuppliersBills=Neplaćene fakture dobavljača
+BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
+BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
 BoxTitleLastModifiedContacts=Zadnjih %s izmijenjenih kontakata/adresa
 BoxMyLastBookmarks=Mojih zadnjih %s bookmark-a
 BoxOldestExpiredServices=Najstarije aktivne zastarjele usluge
@@ -76,7 +80,8 @@ NoContractedProducts=Nema ugovorenih proizvoda/usluga
 NoRecordedContracts=Nema zapisanih kontakata
 NoRecordedInterventions=Nema zapisanih intervencija
 BoxLatestSupplierOrders=Najnovije narudžbe dobavljaču
-BoxTitleLatestSupplierOrders=%s najnovijih narudžbi dobavljaču
+BoxTitleLatestSupplierOrders=Last %s supplier orders
+BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
 NoSupplierOrder=Nema zapisanih narudžbi dobavljaču
 BoxCustomersInvoicesPerMonth=Fakture kupca po mjesecu
 BoxSuppliersInvoicesPerMonth=Fakture dobavljača po mjesecu
@@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribucija %s za %s
 ForCustomersInvoices=Fakture kupaca
 ForCustomersOrders=Narudžbe kupaca
 ForProposals=Prijedlozi
+LastXMonthRolling=The last %s month rolling

+ 5 - 2
htdocs/langs/bs_BA/errors.lang

@@ -159,14 +159,17 @@ ErrorPriceExpression22=Negative result '%s'
 ErrorPriceExpressionInternal=Internal error '%s'
 ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
 ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
 ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
 ErrorGlobalVariableUpdater2=Missing parameter '%s'
 ErrorGlobalVariableUpdater3=The requested data was not found in result
 ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined

+ 1 - 1
htdocs/langs/bs_BA/interventions.lang

@@ -50,4 +50,4 @@ ArcticNumRefModelError=Neuspjelo aktiviranje
 PacificNumRefModelDesc1=Vratiti broj sa formatom %syymm-nnnn, gdje je yy godina, mm mjesec i nnnn niz bez prekida i bez vraćanja za 0.
 PacificNumRefModelError=Kartica intervencije koja počinje sa $syymm već postoji i nije kompatibilna sa ovim modelom nizda. Odstrani ili promijeni da bi se modul mogao aktivirati.
 PrintProductsOnFichinter=Isprintaj proizvode sa kartice intervencije
-PrintProductsOnFichinterDetails=za intervencije generisano sa narudžbi
+PrintProductsOnFichinterDetails=interventions generated from orders

+ 7 - 0
htdocs/langs/bs_BA/main.lang

@@ -220,6 +220,7 @@ Next=Next
 Cards=Cards
 Card=Card
 Now=Now
+HourStart=Start hour
 Date=Date
 DateAndHour=Date and hour
 DateStart=Date start
@@ -242,6 +243,8 @@ DatePlanShort=Date planed
 DateRealShort=Date real.
 DateBuild=Report build date
 DatePayment=Date of payment
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -408,6 +411,8 @@ OtherInformations=Other informations
 Quantity=Quantity
 Qty=Qty
 ChangedBy=Changed by
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -696,6 +701,8 @@ SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
+Deny=Deny
+Denied=Denied
 # Week day
 Monday=Monday
 Tuesday=Tuesday

+ 3 - 1
htdocs/langs/bs_BA/orders.lang

@@ -79,7 +79,9 @@ NoOpenedOrders=No opened orders
 NoOtherOpenedOrders=No other opened orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
-LastOrders=Last %s orders
+LastOrders=Last %s customer orders
+LastCustomerOrders=Last %s customer orders
+LastSupplierOrders=Last %s supplier orders
 LastModifiedOrders=Last %s modified orders
 LastClosedOrders=Last %s closed orders
 AllOrders=All orders

+ 1 - 0
htdocs/langs/bs_BA/other.lang

@@ -203,6 +203,7 @@ NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s

+ 11 - 10
htdocs/langs/bs_BA/productbatch.lang

@@ -1,21 +1,22 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use batch/serial number
-ProductStatusOnBatch=Yes (Batch/serial required)
-ProductStatusNotOnBatch=No (Batch/serial not used)
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
 ProductStatusOnBatchShort=Yes
 ProductStatusNotOnBatchShort=No
-Batch=Batch/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Batch number
-batch_number=Batch/Serial number
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
 l_eatby=Eat-by date
 l_sellby=Sell-by date
-DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Batch: %s
+DetailBatchNumber=Lot/Serial details
+DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+printBatch=Lot/Serial: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
-WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use batch/serial number

+ 1 - 0
htdocs/langs/bs_BA/projects.lang

@@ -14,6 +14,7 @@ MyTasksDesc=Ovaj pregled predstavlja sve projekte ili zadatke za koje ste kontak
 OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
 TasksPublicDesc=Ovaj pregled predstavlja sve projekte ili zadatke koje možete čitati.
 TasksDesc=Ovaj pregled predstavlja sve projekte i zadatke (postavke vaših korisničkih dozvola vam omogućavaju da vidite sve).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
 ProjectsArea=Područje za projekte
 NewProject=Novi projekat
 AddProject=Create project

+ 6 - 1
htdocs/langs/bs_BA/stocks.lang

@@ -16,6 +16,7 @@ CancelSending=Poništi slanje
 DeleteSending=Obriši slanje
 Stock=Zaliha
 Stocks=Zalihe
+StocksByLotSerial=Stock by lot/serial
 Movement=Kretanje
 Movements=Kretanja
 ErrorWarehouseRefRequired=Referentno ime skladište je potrebno
@@ -78,6 +79,7 @@ IdWarehouse=ID skladišta
 DescWareHouse=Opis skladišta
 LieuWareHouse=Lokalizacija skladišta
 WarehousesAndProducts=Skladišta i proizvodi
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Ponderirani prosjek ulazne cijene
 AverageUnitPricePMP=Ponderirani prosjek ulazne cijene
 SellPriceMin=Prodajna cijena jedinice
@@ -131,4 +133,7 @@ IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock content correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).

+ 1 - 1
htdocs/langs/bs_BA/suppliers.lang

@@ -43,4 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
-UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
+UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)

+ 0 - 24
htdocs/langs/bs_BA/trips.lang

@@ -69,11 +69,9 @@ MOTIF_CANCEL=Reason
 DATE_REFUS=Deny date
 DATE_SAVE=Validation date
 DATE_VALIDE=Validation date
-DateApprove=Approving date
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Payment date
 
-Deny=Deny
 TO_PAID=Pay
 BROUILLONNER=Reopen
 SendToValid=Sent to approve
@@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta
 SaveTrip=Validate expense report
 ConfirmSaveTrip=Are you sure you want to validate this expense report ?
 
-Synchro_Compta=NDF <-> Compte
-
-TripSynch=Synchronisation : Notes de frais <-> Compte courant
-TripToSynch=Notes de frais à intégrer dans la compta
-AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
-ViewAccountSynch=Voir le compte
-
-ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
-ndfToAccount=Note de frais - Intégration
-
-ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
-AccountToNdf=Note de frais - Retrait
-
-LINE_NOT_ADDED=Ligne non ajoutée :
-NO_PROJECT=Aucun projet sélectionné.
-NO_DATE=Aucune date sélectionnée.
-NO_PRICE=Aucun prix indiqué.
-
-TripForValid=à Valider
-TripForPaid=à Payer
-TripPaid=Payée
-
 NoTripsToExportCSV=No expense report to export for this period.

+ 218 - 212
htdocs/langs/ca_ES/admin.lang

@@ -8,11 +8,11 @@ VersionExperimental=Experimental
 VersionDevelopment=Desenvolupament
 VersionUnknown=Desconeguda
 VersionRecommanded=Recomanada
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheck=Arxius d'Integritat
+FilesMissing=Arxius que falten
+FilesUpdated=Arxius actualitzats
+FileCheckDolibarr=Comproveu arxius de Dolibarr
+XmlNotFound=Arxiu XML de Dolibarr no trobat
 SessionId=Sesió ID
 SessionSaveHandler=Modalitat de salvaguardat de sessions
 SessionSavePath=Localització salvaguardat de sessions
@@ -26,9 +26,9 @@ YourSession=La seva sessió
 Sessions=Sessions d'usuaris
 WebUserGroup=Servidor web usuari/grup
 NoSessionFound=Sembla que el seu PHP no pot llistar les sessions actives. El directori de salvaguardat de sessions (<b>%s</b>) pot estar protegit (per exemple, pels permisos del sistema operatiu o per la directiva open_basedir del seu PHP)
-HTMLCharset=Charset de les pàgines HTML
-DBStoringCharset=Charset base de dades per emmagatzematge de dades
-DBSortingCharset=Charset base de dades per classificar les dades
+HTMLCharset=Codificació de les pàgines HTML
+DBStoringCharset=Codificació base de dades per emmagatzematge de dades
+DBSortingCharset=Codificació base de dades per classificar les dades
 WarningModuleNotActive=Mòdul <b>%s</b> no actiu
 WarningOnlyPermissionOfActivatedModules=Atenció, només els permisos relacionats amb els mòduls activats s'indiquen aquí. Activar els altres mòduls a la pàgina Configuració->Mòduls
 DolibarrSetup=Instal·lació/Actualització de Dolibarr
@@ -48,19 +48,19 @@ SecuritySetup=Configuració de la seguretat
 ErrorModuleRequirePHPVersion=Error, aquest mòdul requereix una versió %s o superior de PHP
 ErrorModuleRequireDolibarrVersion=Error, aquest mòdul requereix una versió %s o superior de Dolibarr
 ErrorDecimalLargerThanAreForbidden=Error, les precisions superiors a <b>%s</b> no estan suportades.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+DictionarySetup=Diccionaris
+Dictionary=Diccionaris
+Chartofaccounts=Pla comptable
+Fiscalyear=Anys fiscals
 ErrorReservedTypeSystemSystemAuto=L'ús del tipus 'system' i 'systemauto' està reservat. Podeu utilitzar 'user' com a valor per afegir el seu propi registre
 ErrorCodeCantContainZero=El codi no pot contenir el valor 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+DisableJavascript=Desactivar funcions JavaScript i Ajax (Recomanat per a persones o navegadors de text)
 ConfirmAjax=Utilitzar els popups de confirmació Ajax
 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=Utilitzeu els camps de autocompletat per triar tercers en lloc d'utilitzar un quadre de llista.
 ActivityStateToSelectCompany= Afegir un filtre en la recerca per mostrar/ocultar els tercers en actiu o que hagin deixat d'exercir
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+UseSearchToSelectContact=Utilitzeu els camps de autocompletat per triar contactes (en lloc d'utilitzar un quadre de llista).
 DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Opcions filtres de cerca
@@ -74,7 +74,7 @@ ShowPreview=Veure previsualització
 PreviewNotAvailable=Vista prèvia no disponible
 ThemeCurrentlyActive=Tema actualment actiu
 CurrentTimeZone=Fus horari PHP (Servidor)
-MySQLTimeZone=TimeZone MySql (database)
+MySQLTimeZone=Zona horària MySql (base de dades)
 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=Àrea
 Table=Taula
@@ -84,7 +84,7 @@ Mask=Màscara
 NextValue=Pròxim valor
 NextValueForInvoices=Pròxim valor (factures)
 NextValueForCreditNotes=Pròxim valor (abonaments)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Pròxim valor (dipòsit)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Observació: El seu PHP limita la mida a <b>%s</b> %s de màxim, qualsevol que sigui el valor d'aquest paràmetre
 NoMaxSizeByPHPLimit=Cap limitació interna en el seu servidor PHP
@@ -113,9 +113,9 @@ OtherOptions=Altres opcions
 OtherSetup=Varis
 CurrentValueSeparatorDecimal=Separador decimal
 CurrentValueSeparatorThousand=eparador milers
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
+Destination=Destinació
+IdModule=ID del modul
+IdPermissions=ID de permisos
 Modules=Mòduls
 ModulesCommon=Mòduls principals
 ModulesOther=Mòduls complementaris
@@ -125,9 +125,9 @@ ParameterInDolibarr=Variable %s
 LanguageParameter=Variable idioma %s
 LanguageBrowserParameter=Variable %s
 LocalisationDolibarrParameters=Paràmetres de localització
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
+ClientTZ=Zona horària client (usuari)
+ClientHour=Hora client (usuari)
+OSTZ=Zona horària Servidor SO
 PHPTZ=Zona horària Servidor PHP
 PHPServerOffsetWithGreenwich=Offset amb Greenwich (segons)
 ClientOffsetWithGreenwich=Offset client/navegador amb Greenwich (segons)
@@ -142,7 +142,7 @@ Box=Panell
 Boxes=Panells
 MaxNbOfLinesForBoxes=Nº de línies màxim per als panells
 PositionByDefault=Posició per defecte
-Position=Position
+Position=Lloc
 MenusDesc=Els gestors de menú defineixen el contingut de les 2 barres de menús (la barra horitzontal i la barra vertical). És possible assignar gestors diferents segons l'usuari sigui intern o extern.
 MenusEditorDesc=L'editor de menús permet definir entrades personalitzades en els menús. S'ha d'utilitzar amb prudència sota pena de posar a Dolibarr en una situació inestable essent necessària una instal·lació per trobar un menú coherent.
 MenuForUsers=Menú per als usuaris
@@ -246,8 +246,8 @@ OfficialWebSiteFr=lloc web oficial francòfon
 OfficialWiki=Wiki Dolibarr
 OfficialDemo=Demo en línia Dolibarr
 OfficialMarketPlace=Lloc oficial de mòduls complementaris i extensions
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
+OfficialWebHostingService=Serveis d'allotjament web (cloud hosting)
+ReferencedPreferredPartners=Soci preferent
 OtherResources=Autres ressources
 ForDocumentationSeeWiki=Per a la documentació d'usuari, desenvolupador o Preguntes Freqüents (FAQ), consulteu el wiki Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Per altres qüestions o realitzar les seves pròpies consultes, pot utilitzar el fòrum Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
@@ -268,7 +268,7 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nom servidor o ip del servidor SMT
 MAIN_MAIL_EMAIL_FROM=Correu electrònic de l'emissor per trameses e automàtics (Per defecte en php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=E-Mail usat per als retorns d'error dels e-mails enviats
 MAIN_MAIL_AUTOCOPY_TO= Enviar automàticament còpia oculta dels e-mails enviats a
-MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Enviar automàticament còpia oculta dels pressupostos enviats a
 MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
 MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_DISABLE_ALL_MAILS=Desactivar globalment tot enviament de correus electrònics (per mode de proves)
@@ -297,10 +297,11 @@ MenuHandlers=Gestors de menú
 MenuAdmin=Editor de menú
 DoNotUseInProduction=No utilitzar en producció
 ThisIsProcessToFollow=Heus aquí el procediment a seguir:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Pas %s
 FindPackageFromWebSite=Cercar el paquet que respon a la seva necessitat (per exemple en el lloc web %s)
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Descomprimir el paquet a la carpeta arrel de Dolibarr <b>%s</b> sobre els arxius existents (sense desplaçar o esborrar els existents, sota pena de perdre la seva configuració o els mòduls no oficials instal·lats)
+DownloadPackageFromWebSite=Descarregar el paquet %s.
+UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=La instal·lació ha finalitzat i Dolibarr està disponible amb el nou component.
 NotExistsDirect=No existeix el directori alternatiu.<br>
 InfDirAlt=Des de la versió 3 és possible definir un directori root alternatiu, això li permet emmagatzemar en el mateix lloc mòduls i temes personalitzades.<br>Només cal crear un directori en l'arrel de Dolibarr (per exemple: custom).<br>
@@ -309,9 +310,9 @@ YouCanSubmitFile=Seleccioneu mòdul:
 CurrentVersion=Versió actual de Dolibarr
 CallUpdatePage=Trucar a la pàgina d'actualització de l'estructura i dades de la base de dades %s.
 LastStableVersion=Última versió estable disponible
-UpdateServerOffline=Update server offline
+UpdateServerOffline=Actualitzacións del servidor fora de línia
 GenericMaskCodes=Podeu introduir qualsevol màscara numèrica. En aquesta màscara, pot utilitzar les següents etiquetes:<br><b>{000000}</b> correspon a un número que s'incrementa en cadascun %s. Introduïu tants zeros com longuitud desitgi mostrar. El comptador es completarà a partir de zeros per l'esquerra per tal de tenir tants zeros com la màscara. <br><b>{000000+000}</b>Igual que l'anterior, amb una compensació corresponent al número a la dreta del signe + s'aplica a partir del primer %s.<br><b>{000000@x}</b>igual que l'anterior, però el comptador es restableix a zero quan s'arriba a x mesos (x entre 1 i 12). Si aquesta opció s'utilitza i x és de 2 o superior, llavors la seqüència {yy}{mm} ó {yyyy}{mm} també és necessària.<br><b>  {dd}  </b> dies (01 a 31).<br><b> {mm}</b> mes (01 a 12).<br><b> {yy} </ b>, <b> {yyyy</ b> ó <b>{y} </b> any en 2, 4 ó 1 xifra.<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> el codi de client de n caràcters<br><b>{cccc000}</b> el codi de client en n caràcters és seguir per un comptador dedicat per al client. Aquest comptador dedicat del client es reinicia al mateix temps que el comptador global.<br><b>{tttt}</b> El codi de tipus tercer en n caràcters (veure tipus Diccionari tercers).<br>
 GenericMaskCodes3=Qualsevol altre caràcter a la màscara es quedarà sense canvis. <br> No es permeten espais<br>
 GenericMaskCodes4a=<u>Exemple a la 99ª %s del tercer L'Empresa realitzada el 31/03/2007: </u> <br>
 GenericMaskCodes4b=<u>Exemple sobre un tercer creat el 31/03/2007: </u> <br>
@@ -388,16 +389,16 @@ ExtrafieldSelectList = Llista de selecció de table
 ExtrafieldSeparator=Separador
 ExtrafieldCheckBox=Casella de verificació
 ExtrafieldRadio=Botó de selecció excloent
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
-ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldCheckBoxFromList= Casella de verificació de la taula
+ExtrafieldLink=Enllaç a un objecte
+ExtrafieldParamHelpselect=La llista ha de ser en forma clau, valor<br><br> per exemple : <br>1,text1<br>2,text2<br>3,text3<br>...
+ExtrafieldParamHelpcheckbox=La llista ha de ser en forma clau, valor<br><br> per exemple : <br>1,text1<br>2,text2<br>3,text3<br>...
+ExtrafieldParamHelpradio=La llista ha de ser en forma clau, valor<br><br> per exemple : <br>1,text1<br>2,text2<br>3,text3<br>...
 ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Llibreria usada per a la creació d'arxius PDF
 WarningUsingFPDF=Atenció: El seu arxiu <b>conf.php</b> conté la directiva <b>dolibarr_pdf_force_fpdf=1</b>. Això fa que s'usi la llibreria FPDF per generar els seus arxius PDF. Aquesta llibreria és antiga i no cobreix algunes funcionalitats (Unicode, transparència d'imatges, idiomes ciríl · lics, àrabs o asiàtics, etc.), Pel que pot tenir problemes en la generació dels PDF.<br> Per resoldre-ho, i disposar d'un suport complet de PDF, pot descarregar la <a href="http://www.tcpdf.org/" target="_blank"> llibreria TCPDF </a>, i a continuació comentar o eliminar la línia <b>$dolibarr_pdf_force_fpdf=1</b>, i afegir al seu lloc <b>$dolibarr_lib_TCPDF_PATH='ruta_a_TCPDF'</b>
-LocalTaxDesc=Alguns països apliquen 2 o 3 taxes a cada línia de factura. Si és el cas, escolliu el tipus de la segona i tercera taxa i el seu valor. Els possibles tipus són: <br> 1: taxa local aplicable a productes i serveis sense IVA (IVA no s'aplica a la taxa local) <br> 2: taxa local s'aplica a productes i serveis abans de l'IVA (IVA es calcula sobre import + taxa local) <br> 3: taxa local s'aplica a productes sense IVA (IVA no s'aplica a la taxa local) <br> 4: taxa local s'aplica a productes abans de l'IVA (IVA es calcula sobre l'import + taxa local) <br> 5: taxa local s'aplica a serveis sense IVA (IVA no s'aplica a la taxa local) <br> 6: taxa local s'aplica a serveis abans de l'IVA (IVA es calcula sobre import + taxa local)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Introduïu un número de telèfon que voleu marcar per provar l'enllaç de crida ClickToDial per a l'usuari <strong>%s</strong>
 RefreshPhoneLink=Refrescar enllaç
@@ -405,15 +406,15 @@ LinkToTest=Enllaç seleccionable per l'usuari <strong>%s</strong> (feu clic al n
 KeepEmptyToUseDefault=Deixeu aquest camp buit per usar el valor per defecte
 DefaultLink=Enllaç per defecte
 ValueOverwrittenByUserSetup=Atenció: Aquest valor pot ser sobreescrit per un valor específic de la configuració de l'usuari (cada usuari pot tenir la seva pròpia url clicktodial)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=Mòdul extern - Instal·lat al directori %s
 BarcodeInitForThirdparties=Mass barcode init for thirdparties
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
+CurrentlyNWithoutBarCode=Actualment, té <strong>%s</strong> registres a <strong>%s</strong> %s sense codi de barres definit.
 InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
+EraseAllCurrentBarCode=Esborrar tots els valors de codi de barres actuals
+ConfirmEraseAllCurrentBarCode=Esteu segur que voleu esborrar tots els valors de codis de barres actuals?
+AllBarcodeReset=S'han eliminat tots els valors de codi de barres
+NoBarcodeNumberingTemplateDefined=No hi ha plantilla de codi de barres habilitada a la configuració del mòdul de codi de barres.
 NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
 
 # Modules
@@ -449,8 +450,8 @@ Module52Name=Stocks de productes
 Module52Desc=Gestió de stocks de productes
 Module53Name=Serveis
 Module53Desc=Gestió de serveis
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Contractes/Subscripcions
+Module54Desc=Gestió de contractes (serveis o subscripcions diaries)
 Module55Name=Codis de barra
 Module55Desc=Gestió dels codis de barra
 Module56Name=Telefonia
@@ -487,38 +488,38 @@ Module320Name=Fils RSS
 Module320Desc=Addició de fils d'informació RSS en les pantalles Dolibarr
 Module330Name=Bookmarks
 Module330Desc=Gestió de bookmarks
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module400Name=Projectes/Oportunitats/Leads
+Module400Desc=Gestió de projectes, oportunitats o clients potencials. A continuació, pot assignar qualsevol element (factura, ordre, proposta, intervenció, ...) a un projecte i obtenir una visió transversal de la vista del projecte.
 Module410Name=Webcalendar
 Module410Desc=Interface amb el calendari webcalendar
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
+Module500Name=Despeses especials (impostos, càrregues socials, dividends)
+Module500Desc=Gestió de despeses especials, impostos, càrregues socials, dividends i salaris
+Module510Name=Sous
+Module510Desc=Gestió dels salaris dels empleats i pagaments
+Module520Name=Préstec
+Module520Desc=Gestió de préstecs
 Module600Name=Notificacions
-Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
+Module600Desc=Enviar notificacions per correu electrònic sobre alguns esdeveniments de negocis del Dolibarr als contactes de tercers (configuració definida en cada tercer)
 Module700Name=Donacions
 Module700Desc=Gestió de donacions
-Module770Name=Expense Report
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module770Name=Informe de despeses
+Module770Desc=Informes de despeses de gestió i reclamació (transport, menjar, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Interface amb el sistema de seguiment d'incidències Mantis
 Module1400Name=Comptabilitat experta
 Module1400Desc=Gestió experta de la comptabilitat (doble partida)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
+Module1520Name=Generar document
+Module1520Desc=Generació de documents de correu massiu
+Module1780Name=Etiquetes/categories
 Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permet l'edició de certes zones de text mitjançant un editor avançat
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
+Module2200Name=Multi-preus
+Module2200Desc=Activar l'ús d'expressions matemàtiques per als preus
 Module2300Name=Cron
-Module2300Desc=Scheduled job management
+Module2300Desc=Gestor de tasques programades
 Module2400Name=Agenda
 Module2400Desc=Gestió de l'agenda i de les accions
 Module2500Name=Gestió Electrònica de Documents
@@ -533,33 +534,31 @@ Module2800Desc=Client FTP
 Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacitats de conversió GeoIP Maxmind
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into card of adherents / third parties / contacts
+Module3100Desc=Afegir un botó de Skype a la targeta d'adherents/dels tercers/contactes
 Module5000Name=Multi-empresa
 Module5000Desc=Permet gestionar diverses empreses
 Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product batch
-Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
+Module6000Desc=Gestió Workflow
+Module20000Name=Dies lliures
+Module20000Desc=Gestió dels dies lliures dels empleats
+Module39000Name=Product lot
+Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paybox
 Module50100Name=TPV
 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
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
+Module50400Name=Comptabilitat (avançat)
+Module50400Desc=Gestió experta de la comptabilitat (doble partida)
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Márgenes
+Module55000Name=Obrir enquesta
+Module55000Desc=Mòdul per fer enquestes en línia (com Doodle, Studs, Rdvz, ...)
+Module59000Name=Marges
 Module59000Desc=Mòdul per gestionar els marges de benefici
 Module60000Name=Comissions
 Module60000Desc=Mòdul per gestionar les comissions
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
 Permission11=Consultar factures
 Permission12=Crear/Modificar factures
 Permission13=Devalidar factures
@@ -589,7 +588,7 @@ Permission67=Exporta intervencions
 Permission71=Consultar membres
 Permission72=Crear/modificar membres
 Permission74=Eliminar membres
-Permission75=Setup types of membership
+Permission75=Configurar tipus dels membres
 Permission76=Exportar membres
 Permission78=Consultar cotitzacions
 Permission79=Crear/modificar cotitzacions
@@ -612,8 +611,8 @@ Permission106=Exportar expedicions
 Permission109=Eliminar expedicions
 Permission111=Consultar comptes financers (comptes bancaris, caixes)
 Permission112=Crear/modificar quantitat/eliminar registres bancaris
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
+Permission113=Configuració de comptes financers (crear, controlar les categories)
+Permission114=Reconciliar transaccions
 Permission115=Exporta transaccions i extractes
 Permission116=Captar transferències entre comptes
 Permission117=Gestionar enviament de xecs
@@ -630,22 +629,22 @@ Permission151=Consultar domiciliacions
 Permission152=Crear/modificar domiciliacions
 Permission153=Enviar domiciliacions
 Permission154=Abonar/tornar domiciliacions
-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
+Permission161=Consultar contractes/subscripcions
+Permission162=Crear/Modificar contractes/subscripcions
+Permission163=Activar un servei/subscripció d'un contracte
+Permission164=Desactivar un servei/subscripció d'un contracte
+Permission165=Eliminar contractes/subscripcions
+Permission171=Llegir viatges i despeses (propis i els seus subordinats)
+Permission172=Crear/modificar desplaçaments i despeses
+Permission173=Eliminar desplaçaments i despeses
+Permission174=Cercar tots els honoraris
+Permission178=Exportar desplaçaments i despeses
 Permission180=Consultar proveïdors
 Permission181=Consultar comandes a proveïdors
 Permission182=Crear/modificar comandes a proveïdors
 Permission183=Validar comandes a proveïdors
 Permission184=Aprovar comandes a proveïdors
-Permission185=Order or cancel supplier orders
+Permission185=Enviar o cancel·lar comandes de proveïdors
 Permission186=Rebre comandes de proveïdors
 Permission187=Tancar comandes a proveïdors
 Permission188=Anul·lar comandes a proveïdors
@@ -696,7 +695,7 @@ Permission300=Consultar codis de barra
 Permission301=Crear/modificar codis de barra
 Permission302=Eliminar codi de barra
 Permission311=Consultar serveis
-Permission312=Assign service/subscription to contract
+Permission312=Assignar serveis/subscripció a un contracte
 Permission331=Consultar bookmarks
 Permission332=Crear/modificar bookmarks
 Permission333=Eliminar bookmarks
@@ -713,15 +712,15 @@ Permission401=Consultar havers
 Permission402=Crear/modificar havers
 Permission403=Validar havers
 Permission404=Eliminar havers
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
+Permission510=Consultar salaris
+Permission512=Crear/modificar salaris
+Permission514=Eliminar salaris
+Permission517=Exportació salaris
+Permission520=Consultar préstecs
+Permission522=Crear/modificar préstecs
+Permission524=Eliminar préstecs
 Permission525=Access loan calculator
-Permission527=Export loans
+Permission527=Exportar préstecs
 Permission531=Consultar serveis
 Permission532=Crear/modificar serveis
 Permission534=Eliminar serveis
@@ -732,14 +731,14 @@ Permission702=Crear/modificar donacions
 Permission703=Eliminar donacions
 Permission771=Read expense reports (own and his subordinates)
 Permission772=Create/modify expense reports
-Permission773=Delete expense reports
+Permission773=Eliminar els informes de despeses
 Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission775=Aprovar els informes de despeses
+Permission776=Pagar informes de despeses
+Permission779=Exportar informes de despeses
 Permission1001=Consultar stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Crear/modificar els magatzems
+Permission1003=Eliminar magatzems
 Permission1004=Consultar moviments de stock
 Permission1005=Crear/modificar moviments de stock
 Permission1101=Consultar ordres d'enviament
@@ -754,7 +753,7 @@ Permission1185=Aprovar comandes a proveïdors
 Permission1186=Enviar comandes a proveïdors
 Permission1187=Rebre comandes a proveïdors
 Permission1188=Tancar comandes a proveïdors
-Permission1190=Approve (second approval) supplier orders
+Permission1190=Aprovar (segona aprovació) comandes de proveïdors
 Permission1201=Obtenir resultat d'una exportació
 Permission1202=Crear/modificar exportacions
 Permission1231=Consultar factures de proveïdors
@@ -767,10 +766,10 @@ Permission1237=Exporta comandes de proveïdors juntament amb els seus detalls
 Permission1251=Llançar les importacions en massa a la base de dades (càrrega de dades)
 Permission1321=Exporta factures a clients, atributs i cobraments
 Permission1421=Exporta comandes de clients i atributs
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
+Permission23001=Veure les tasques programades
+Permission23002=Crear/Modificar les tasques programades
+Permission23003=Eliminar tasques programades
+Permission23004=Executar tasca programada
 Permission2401=Llegir accions (esdeveniments o tasques) vinculades al seu compte
 Permission2402=Crear/modificar accions (esdeveniments o tasques) vinculades al seu compte
 Permission2403=Modificar accions (esdeveniments o tasques) vinculades al seu compte
@@ -786,41 +785,41 @@ Permission2802=Utilitzar el client FTP en mode escriptura (esborrar o pujar arxi
 Permission50101=Utilitzar TPV
 Permission50201=Consultar les transaccions
 Permission50202=Importar les transaccions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
+Permission54001=Imprimir
+Permission55001=Llegir enquestes
+Permission55002=Crear/modificar enquestes
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
-DictionaryCompanyType=Thirdparties type
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Cantons
+DictionaryCompanyType=Tipus de tercers
+DictionaryCompanyJuridicalType=Formes jurídiques de tercers
+DictionaryProspectLevel=Perspectiva nivell client potencial
+DictionaryCanton=Departaments/Províncies/Zones
 DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Civility title
-DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFees=Type of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyplan=Chart of accounts
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
+DictionaryCountry=Països
+DictionaryCurrency=Monedes
+DictionaryCivility=Títol cortesia
+DictionaryActions=Tipus d'esdeveniments de l'agenda
+DictionarySocialContributions=Tipus de càrregues socials
+DictionaryVAT=Taxa d'IVA (Impost sobre vendes als EEUU)
+DictionaryRevenueStamp=Imports de segells fiscals
+DictionaryPaymentConditions=Condicions de pagament
+DictionaryPaymentModes=Modes de pagament
+DictionaryTypeContact=Tipus de contactes/adreces
+DictionaryEcotaxe=Barems CEcoParticipación (DEEE)
+DictionaryPaperFormat=Formats paper
+DictionaryFees=Tipus de desplaçaments i honoraris
+DictionarySendingMethods=Mètodes d'expedició
+DictionaryStaff=Empleats
+DictionaryAvailability=Temps de lliurament
+DictionaryOrderMethods=Mètodes de comanda
+DictionarySource=Orígens de pressupostos/comandes
+DictionaryAccountancyplan=Pla comptable
+DictionaryAccountancysystem=Models de plans comptables
+DictionaryEMailTemplates=Models d'emails
 SetupSaved=Configuració desada
 BackToModuleList=Retornar llista de mòduls
-BackToDictionaryList=Back to dictionaries list
+BackToDictionaryList=Tornar a la llista de diccionaris
 VATReceivedOnly=Impostos especials no facturables
 VATManagement=Gestió IVA
 VATIsUsedDesc=El tipus d'IVA proposat per defecte en les creacions de pressupostos, factures, comandes, etc. Respon a la següent regla: <br> Si el venedor no està subjecte a IVA, IVA per defecte= 0. Final de regla. <br> Si el país del venedor= país del comprador llavors IVA per defecte= IVA del producte venut. Final de regla. <br> Si venedor i comprador resideixen a la Comunitat Europea i el bé venut= nou mitjà de transports (auto, vaixell, avió), IVA per defecte= 0 (l'IVA ha de ser pagat pel comprador a la hisenda pública del seu país i no al venedor). Final de regla <br> Si venedor i comprador resideixen a la Comunitat Europea i comprador= particular o empresa sense NIF intracomunitari llavors IVA per defecte= IVA del producte venut. Final de regla. <br> Si venedor i comprador resideixen a la Comunitat Europea i comprador= empresa amb NIF intracomunitari llavors IVA per defecte= 0. Final de regla. <br> Sinó, IVA proposat per defecte= 0. Final de regla. <br>
@@ -828,7 +827,7 @@ VATIsNotUsedDesc=El tipus d'IVA proposat per defecte és 0. Aquest és el cas d'
 VATIsUsedExampleFR=A França, es tracta de les societats o organismes que trien un règim fiscal general (General simplificat o General normal), règim en el qual es declara l'IVA.
 VATIsNotUsedExampleFR=A França, es tracta d'associacions exemptes d'IVA o societats, organismes o professions liberals que han eligedo el règim fiscal de mòduls (IVA en franquícia), pagant un IVA en franquícia sense fer declaració d'IVA. Aquesta elecció fa aparèixer l'anotació "IVA no aplicable - art-293B del CGI" en les factures.
 ##### Local Taxes #####
-LTRate=Rate
+LTRate=Tarifa
 LocalTax1IsUsed=Subjecte
 LocalTax1IsNotUsed=No subjecte
 LocalTax1IsUsedDesc=Ús d'un 2on. tipus d'impost (Diferent de l'IVA)
@@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= El tipus d'IRPF proposat per defecte en les creacions de
 LocalTax2IsNotUsedDescES= El tipus d'IRPF proposat per defecte es 0. Final de regla.
 LocalTax2IsUsedExampleES= A Espanya, es tracta de persones físiques: autònoms i professionals independents que presten serveis i empreses que han triat el règim fiscal de mòduls.
 LocalTax2IsNotUsedExampleES= A Espanya, es tracta d'empreses no subjectes al règim fiscal de mòduls.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2=Purchases
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
+CalcLocaltax3=Sales
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Etiqueta que s'utilitzarà si no es troba traducció per aquest codi
 LabelOnDocuments=Etiqueta sobre documents
@@ -972,14 +971,14 @@ EventsSetup=Configuració del registre d'esdeveniments
 LogEvents=Auditoria de la seguretat d'esdeveniments
 Audit=Auditoria
 InfoDolibarr=Info Dolibarr
-InfoBrowser=Infos Browser
+InfoBrowser=Info. del navegador
 InfoOS=Info SO
 InfoWebServer=Info servidor
 InfoDatabase=Info base de dades
 InfoPHP=Info PHP
 InfoPerf=Info rendiment
-BrowserName=Browser name
-BrowserOS=Browser OS
+BrowserName=Nom del navegador
+BrowserOS=SSOO del navegador
 ListEvents=Auditoria d'esdeveniments
 ListOfSecurityEvents=Llistat d'esdeveniments de seguretat Dolibarr
 SecurityEventsPurged=Esdeveniments de seguretat purgats
@@ -1000,7 +999,7 @@ TriggerDisabledAsModuleDisabled=Triggers d'aquest arxiu desactivats ja que el m
 TriggerAlwaysActive=Triggers d'aquest arxiu sempre actius, ja que els mòduls Dolibarr relacionats estan activats
 TriggerActiveAsModuleActive=Triggers d'aquest arxiu actius ja que el mòdul <b>%s</b> està activat
 GeneratedPasswordDesc=Indiqui aquí que norma vol utilitzar per generar les contrasenyes quan vulgui generar una nova contrasenya
-DictionaryDesc=Define here all reference datas. You can complete predefined value with yours.
+DictionaryDesc=Indiqui aquí les dades de referència. Pot completar/modificar les dades predefinides amb les seves
 ConstDesc=Qualsevol altre paràmetre no editable en les pàgines anteriors
 OnceSetupFinishedCreateUsers=Atenció, està sota un compte d'administrador de Dolibarr. Els administradors s'utilitzen per configurar Dolibarr. Per a un ús corrent de Dolibarr, es recomana utilitzar un compte no administrador creada des del menú "Usuaris i grups"
 MiscellaneousDesc=Definiu aquí els altres paràmetres relacionats amb la seguretat.
@@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=No s'han registrat esdeveniments de seguretat. Això pot s
 NoEventFoundWithCriteria=No s'han trobat esdeveniments de seguretat per a aquests criteris de cerca.
 SeeLocalSendMailSetup=Veure la configuració local d'sendmail
 BackupDesc=Per realitzar una còpia de seguretat completa de Dolibarr, vostè ha de:
-BackupDesc2=* Guardar el contingut de la carpeta de documents (<b>%s</b>) que conté tots els arxius pujats o generats (comprimint la carpeta, per exemple).
-BackupDesc3=* Guardar el contingut de la base de dades en un arxiu de bolcat. Per això pot utilitzar l'assistent a continuació.
+BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
 BackupDescX=La carpeta arxivada haurà de guardar-se en un lloc segur
 BackupDescY=L'arxiu de bolcat generat haurà de guardar-se en un lloc segur.
 BackupPHPWarning=La còpia de seguretat no pot ser garantida amb aquest mètode. És preferible utilitzar l'anterior
 RestoreDesc=Per restaurar una còpia de seguretat de Dolibarr, vostè ha de:
-RestoreDesc2=* Prendre el fitxer (fitxer zip, per exemple) de la carpeta dels documents i descomprimir-lo a la carpeta dels documents d'una nova instal·lació de Dolibarr o en la carpeda dels documents d'aquesta instal·lació (<b>%s</b>).
-RestoreDesc3=* Recarregar el fitxer de bolcat guardat a la base de dades d'una nova instal·lació de Dolibarr o d'aquesta instal·lació. Atenció, una vegada realitzada la restauració, haurà d'utilitzar un login/contrasenya d'administrador existent en el moment de la còpia de seguretat per connectar-se. Per restaurar la base de dades en la instal·lació actual, pot utilitzar l'assistent a continuació.
+RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
+RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=Importació MySQL
 ForcedToByAModule= Aquesta regla està forçada a <b>%s</b> per un dels mòduls activats
 PreviousDumpFiles=Arxius de còpia de seguretat de la base de dades disponibles
@@ -1052,21 +1051,21 @@ MAIN_PROXY_PASS=Contrasenya del servidor proxy
 DefineHereComplementaryAttributes=Definiu aquí la llista d'atributs addicionals, no disponibles a estàndard, i que vol gestionar per %s.
 ExtraFields=Atributs addicionals
 ExtraFieldsLines=atributs complementaris (línies)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsSupplierOrdersLines=Atributs complementaris (línies de comanda)
+ExtraFieldsSupplierInvoicesLines=Atributs complementaris (línies de factura)
 ExtraFieldsThirdParties=Atributs adicionals (tercers)
 ExtraFieldsContacts=Atributs adicionals (contactes/adreçes)
 ExtraFieldsMember=Atributs complementaris (membres)
 ExtraFieldsMemberType=Atributs complementaris (tipus de membres)
-ExtraFieldsCustomerOrders=Complementary attributes (orders)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
+ExtraFieldsCustomerOrders=Atributs complementaris (comandes)
+ExtraFieldsCustomerInvoices=AAtributs complementaris (factures)
 ExtraFieldsSupplierOrders=Atributs complementaris (comandes)
 ExtraFieldsSupplierInvoices=AAtributs complementaris (factures)
 ExtraFieldsProject=Atributs complementaris (projets)
 ExtraFieldsProjectTask=Atributs complementaris (tâches)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyCharsAndNoSpace=només carateres alfanumèrics sense espais
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+AlphaNumOnlyLowerCharsAndNoSpace=només alfanumèrics i caràcters en minúscula sense espai
 SendingMailSetup=Configuració de l'enviament per mail
 SendmailOptionNotComplete=Atenció, en alguns sistemes Linux, amb aquest mètode d'enviament, per poder enviar mails en nom seu, la configuració de sendmail ha de contenir l'opció <b>-ba</b> (paràmetre <b>mail.force_extra_parameters</b> a l'arxiu <b>php.ini</b>). Si alguns dels seus destinataris no reben els seus missatges, proveu de modificar aquest paràmetre PHP amb <b>mail.force_extra_parameters =-ba </b>.
 PathToDocuments=Rutes d'accés a documents
@@ -1082,20 +1081,20 @@ OnlyFollowingModulesAreOpenedToExternalUsers=Recordeu que només els mòduls seg
 SuhosinSessionEncrypt=Emmagatzematge de sessions xifrades per Suhosin
 ConditionIsCurrently=Actualment la condició és %s
 YouUseBestDriver=Està utilitzant el driver %s, actualment és el millor driver disponible.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
+YouDoNotUseBestDriver=Està utilitzant el driver %s però és recomanat l'ús del driver %s.
 NbOfProductIsLowerThanNoPb=Té %s productes/serveis a la base de dades. No és necessària cap optimització en particular.
 SearchOptim=Cercar optimització
 YouHaveXProductUseSearchOptim=Té %s productes a la base de dades. Hauria afegir la constant PRODUCT_DONOTSEARCH_ANYWHERE a 1 a Inici-Configuració-Varis, limitant la cerca al principi de la cadena que fa possible que la base de dades usi l'índex i s'obtingui una resposta immediata.
 BrowserIsOK=Utilitza el navegador web %s. Aquest navegador està optimitzat per a la seguretat i el rendiment.
 BrowserIsKO=Utilitza el navegador web %s. Aquest navegador és una mala opció per a la seguretat, rendiment i fiabilitat. Aconsellem fer servir Firefox, Chrome, Opera o Safari.
-XDebugInstalled=XDebug is loaded.
+XDebugInstalled=XDebug està carregat.
 XCacheInstalled=XCache cau està carregat.
 AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-FieldEdition=Edition of field %s
-FixTZ=TimeZone fix
+FieldEdition=Edició del camp %s
+FixTZ=Fixar zona horaria
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
-EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
+GetBarCode=Obtenir codi de barres
+EmptyNumRefModelDesc=Codi de client/proveïdor lliure sense verificació. Pot ser modificat en qualsevol moment.
 ##### Module password generation
 PasswordGenerationStandard=Retorna una contrasenya generada per l'algoritme intern Dolibarr: 8 caràcters, números i caràcters en minúscules barrejades.
 PasswordGenerationNone=No ofereix contrasenyes. La contrasenya s'introdueix manualment.
@@ -1123,8 +1122,8 @@ WatermarkOnDraft=Marca d'aigua en els documents esborrany
 JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Règles sobre els ID professionals
 MustBeUnique=Ha de ser únic?
-MustBeMandatory=Mandatory to create third parties ?
-MustBeInvoiceMandatory=Mandatory to validate invoices ?
+MustBeMandatory=Obligatori per crear tercers?
+MustBeInvoiceMandatory=Obligatori per validar les factures?
 Miscellaneous=Miscel·lània
 ##### Webcal setup #####
 WebCalSetup=Configuració d'enllaç amb el calendari webcalendar
@@ -1138,7 +1137,7 @@ WebCalServer=Servidor de la base de dades del calendari
 WebCalDatabaseName=Nom de la base de dades
 WebCalUser=Usuari amb accés a la base
 WebCalSetupSaved=Les dades d'enllaç s'han desat correctament.
-WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful.
+WebCalTestOk=La connexió al servidor '%s' a la base '%s' per l'usuari '%s' ha estat satisfactòria.
 WebCalTestKo1=La connexió al servidor '%s' ha estat satisfactòria, però la base '%s' no s'ha pogut comprovar.
 WebCalTestKo2=La conexió al servidor '%s' per l'usuari '%s' ha fallat.
 WebCalErrorConnectOkButWrongDatabase=La connexió ha sortit bé però la base no sembla ser una base webcalendar.
@@ -1180,7 +1179,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
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar compte bancari del pressupost
 ##### AskPriceSupplier #####
 AskPriceSupplierSetup=Price requests suppliers module setup
 AskPriceSupplierNumberingModules=Price requests suppliers numbering models
@@ -1192,7 +1191,7 @@ BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination o
 OrdersSetup=Configuració del mòdul comandes
 OrdersNumberingModules=Mòduls de numeració de les comandes
 OrdersModelModule=Models de documents de comandes
-HideTreadedOrders=Hide the treated or cancelled orders in the list
+HideTreadedOrders=Amaga les comandes processades o anul·lades del llistat
 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)
@@ -1210,11 +1209,11 @@ 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=Contracts/Subscriptions module setup
+ContractsSetup=Configuració del modul contractes/subscripcions
 ContractsNumberingModules=Mòduls de numeració dels contratos
 TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+FreeLegalTextOnContracts=Text lliure en contractes
+WatermarkOnDraftContractCards=Marca d'aigua en contractes (en cas d'estar buit)
 ##### Members #####
 MembersSetup=Configuració del mòdulo Associacions
 MemberMainOptions=Opcions principals
@@ -1289,9 +1288,9 @@ LDAPSynchroKO=Prova de sincronització errònia
 LDAPSynchroKOMayBePermissions=Error de la prova de sincronització. Comproveu que la connexió al servidor sigui correcta i que permet les actualitzacions LDAP
 LDAPTCPConnectOK=Connexió TCP al servidor LDAP efectuada (Servidor=%s, Port=%s)
 LDAPTCPConnectKO=Error de connexió TCP al servidor LDAP (Servidor=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=Connexió/Autenticació al servidor LDAP aconseguida (Servidor=%s, Port=%s, Admin=%s, Password=%s)
 LDAPBindKO=Error de connexió/autenticació al servidor LDAP (Servidor=%s, Port=%s, Admin=%s, Password=%s)
-LDAPUnbindSuccessfull=Disconnect successful
+LDAPUnbindSuccessfull=Desconnexió realitzada
 LDAPUnbindFailed=Desconnexió fallada
 LDAPConnectToDNSuccessfull=Connexió a DN (%s) realitzada
 LDAPConnectToDNFailed=Connexió a DN (%s) fallada
@@ -1337,6 +1336,8 @@ LDAPFieldCountry=Pais
 LDAPFieldCountryExample=Exemple : c
 LDAPFieldDescription=Descripció
 LDAPFieldDescriptionExample=Exemple : description
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example : publicnote
 LDAPFieldGroupMembers= Membres del grup
 LDAPFieldGroupMembersExample= Exemple: uniqueMember
 LDAPFieldBirthdate=Data de naixement
@@ -1348,7 +1349,7 @@ LDAPFieldSidExample=Exemple : objectsid
 LDAPFieldEndLastSubscription=Data finalització com a membre
 LDAPFieldTitle=Lloc/Funció
 LDAPFieldTitleExample=Exemple:títol
-LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class)
+LDAPParametersAreStillHardCoded=Els paràmetres LDAP són codificats en dur (a la classe contact)
 LDAPSetupNotComplete=Configuració LDAP incompleta (a completar en les altres pestanyes)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador o contrasenya no indicats. Els accessos LDAP seran anònims i en només lectura.
 LDAPDescContact=Aquesta pàgina permet definir el nom dels atributs de l'arbre LDAP per a cada informació dels contactes Dolibarr.
@@ -1362,8 +1363,8 @@ YouMayFindPerfAdviceHere=En aquesta pàgina trobareu diverses proves i consells
 NotInstalled=No instal·lat, de manera que el servidor no baixa de rendiment amb això.
 ApplicativeCache=Aplicació memòria cau
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+MemcachedModuleAvailableButNotSetup=Mòdul de memoria cache actiu, però la configuració del mòdul no està completa.
+MemcachedAvailableAndSetup=Modul de memoria cache dedicada a utilitzar el servidor memcached està habilitat.
 OPCodeCache=OPCode memòria cau
 NoOPCodeCacheFound=No s'ha trobat cap opcode memòria cau. Pot ser que estigui utilitzant un altre opcode com XCache o eAccelerator (millor), o potser no tingui opcode memòria cau (pitjor).
 HTTPCacheStaticResources=Memòria cau HTTP per a estadístiques de recursos (css, img, javascript)
@@ -1374,7 +1375,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=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=La detecció automàtica no és possible amb els navegadors actuals
 ##### Products #####
 ProductSetup=Configuració del mòdul Productes
 ServiceSetup=Configuració del mòdul Serveis
@@ -1385,7 +1386,7 @@ ModifyProductDescAbility=Personalització de les descripcions dels productes en
 ViewProductDescInFormAbility=Visualització de les descripcions dels productes en els formularis
 ViewProductDescInThirdpartyLanguageAbility=Visualització de les descripcions de productes en l'idioma del tercer
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
+UseSearchToSelectProduct=Utilitzeu un formulari de cerca per triar un producte (en lloc d'una llista desplegable).
 UseEcoTaxeAbility=Assumir ecotaxa (DEEE)
 SetDefaultBarcodeTypeProducts=Tipus de codi de barres utilitzat per defecte per als productes
 SetDefaultBarcodeTypeThirdParties=Tipus de codi de barres utilitzat per defecte per als tercers
@@ -1419,9 +1420,9 @@ BarcodeDescUPC=Codis de barra tipus UPC
 BarcodeDescISBN=Codis de barra tipus ISBN
 BarcodeDescC39=Codis de barra tipus C39
 BarcodeDescC128=Codis de barra tipus C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
+GenbarcodeLocation=Generador de codi de barres (utilitzat pel motor intern per a alguns tipus de codis de barres). Ha de ser compatible amb "genbarcode".<br>Per exemple: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Motor intern
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarCodeNumberManager=Configuració de la numeració automatica de codis de barres
 ##### Prelevements #####
 WithdrawalsSetup=Configuració del mòdul domiciliacions
 ##### ExternalRSS #####
@@ -1435,7 +1436,7 @@ 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.
 MailingDelay=Seconds to wait after sending next message
 ##### Notification #####
-NotificationSetup=EMail notification module setup
+NotificationSetup=Configuració del modul de notificació d'EMail
 NotificationEMailFrom=E-Mail emissor (From) dels correus enviats a través de notificacions
 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
@@ -1443,9 +1444,9 @@ FixedEmailTarget=Fixed email target
 SendingsSetup=Configuració del mòdul Expedicions
 SendingsReceiptModel=Model de notes de lliurament
 SendingsNumberingModules=Mòduls de numeració de notes de lliurament
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Ús de notes de lliurament per als enviaments a clients
 NoNeedForDeliveryReceipts=En la majoria dels casos, les notes de lliurament (llista de productes enviats) també actuen com a notes de recepció i són signades pel client. La gestió de les notes de recepció és per tant redundant i poques vegades s'activarà.
-FreeLegalTextOnShippings=Free text on shipments
+FreeLegalTextOnShippings=Text lliure en els enviaments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Mòdul de numeració de les notes de recepció
 DeliveryOrderModel=Model de notes de recepció
@@ -1466,8 +1467,8 @@ 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=Warehouse module setup
-UserWarehouse=Use user personal warehouses
+StockSetup=Configuració del mòdul de magatzem
+UserWarehouse=Utilitzar els stocks personals d'usuaris
 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
@@ -1503,11 +1504,11 @@ ConfirmDeleteLine=Esteu segur de voler eliminar aquesta línia?
 ##### Tax #####
 TaxSetup=Configuració del mòdul d'impostos, càrregues socials i dividends
 OptionVatMode=Opció de càrrega d'IVA
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
+OptionVATDefault=Efectiu
+OptionVATDebitOption=Dèbit
 OptionVatDefaultDesc=La càrrega de l'IVA és: <br>-en l'enviament dels béns (en la pràctica s'usa la data de la factura)<br>-sobre el pagament pels serveis
 OptionVatDebitOptionDesc=La càrrega de l'IVA és: <br>-en l'enviament dels béns en la pràctica s'usa la data de la factura<br>-sobre la facturació dels serveis
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
+SummaryOfVatExigibilityUsedByDefault=Moment d'exigibilitat per defecte l'IVA per a l'opció escollida:
 OnDelivery=Al lliurament
 OnPayment=Al pagament
 OnInvoice=A la factura
@@ -1524,7 +1525,7 @@ AccountancyCodeBuy=Codi comptable compres
 AgendaSetup=Mòdul configuració d'accions i agenda
 PasswordTogetVCalExport=Clau d'autorització vCal export link
 PastDelayVCalExport=No exportar els esdeveniments de més de
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE=Utilitza tipus d'esdeveniments (administrats en menú a Configuració -> Diccionari -> Tipus d'esdeveniments de l'agenda)
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
@@ -1533,14 +1534,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=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Tercer genéric a utilitzar per a les vendes
 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
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+CashDeskIdWareHouse=Forçar i restringir el magatzem a usar l'stock a disminuir
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
 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
@@ -1584,35 +1585,40 @@ TaskModelModule=Mòdul de documents informes de tasques
 ECMSetup = Configuració del mòdul GED
 ECMAutoTree = L'arbre automàtic està disponible
 ##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYear=Fiscal year
-FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-EditFiscalYear=Edit fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
-Closed=Closed
-AlwaysEditable=Can always be edited
+FiscalYears=Anys fiscals
+FiscalYear=Any fiscal
+FiscalYearCard=Carta d'any fiscal
+NewFiscalYear=Nou any fiscal
+EditFiscalYear=Editar any fiscal
+OpenFiscalYear=Obrir any fiscal
+CloseFiscalYear=Tancar any fiscal
+DeleteFiscalYear=Eliminar any fiscal
+ConfirmDeleteFiscalYear=Esteu segur d'eliminar aquest any fiscal?
+Opened=Obert
+Closed=Tancat
+AlwaysEditable=Sempre es pot editar
 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
+NbMajMin=Nombre mínim de caràcters en majúscules
+NbNumMin=Nombre mínim de caràcters numèrics
+NbSpeMin=Nombre mínim de caràcters especials
+NbIteConsecutive=Capacitat màxima per repetir mateixos caràcters
+NoAmbiCaracAutoGeneration=No utilitzar caràcters semblants ("1", "l", "i", "|", "0", "O") per a la generació automàtica
+SalariesSetup=Configuració dels sous dels mòduls
+SortOrder=Ordre de classificació
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
+IncludePath=Incloure ruta (que es defineix a la variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerContact=List of notifications per contact*
+ListOfNotificationsPerContact=Llista de notificacions per contacte*
 ListOfFixedNotifications=List of fixed notifications
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
 Threshold=Threshold
+BackupDumpWizard=Wizard to build database backup dump file
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>

+ 16 - 14
htdocs/langs/ca_ES/banks.lang

@@ -8,7 +8,7 @@ FinancialAccount=Compte
 FinancialAccounts=Comptes
 BankAccount=Compte bancari
 BankAccounts=Comptes bancaris
-ShowAccount=Show Account
+ShowAccount=Mostrar el compte
 AccountRef=Ref. compte financier
 AccountLabel=Etiqueta compte financier
 CashAccount=Compte caixa/efectiu
@@ -29,15 +29,15 @@ EndBankBalance=Saldo final
 CurrentBalance=Saldo actual
 FutureBalance=Saldo previst
 ShowAllTimeBalance=Mostar balanç des de principi
-AllTime=From start
+AllTime=Des del principi
 Reconciliation=Conciliació
 RIB=Compte bancari
 IBAN=Identificador IBAN
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
+IbanValid=Codi IBAN vàlid
+IbanNotValid=Codi IBAN no és vàlid
 BIC=Identificador BIC/SWIFT
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
+SwiftValid=BIC/SWIFT és vàlid
+SwiftNotValid=BIC/SWIFT no és vàlid
 StandingOrders=Domiciliacions
 StandingOrder=Domiciliació
 Withdrawals=Reintegraments
@@ -138,7 +138,7 @@ CashBudget=Pressupost de tresoreria
 PlannedTransactions=Transaccions previstes
 Graph=Gràfics
 ExportDataset_banque_1=Transacció bancària i extracte
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_2=Resguard
 TransactionOnTheOtherAccount=Transacció sobre l'altra compte
 TransactionWithOtherAccount=Transferència de compte
 PaymentNumberUpdateSucceeded=Numero de pagament modificat
@@ -152,14 +152,16 @@ BackToAccount=Tornar al compte
 ShowAllAccounts=Mostra per a tots els comptes
 FutureTransaction=Transacció futura. No és possible conciliar.
 SelectChequeTransactionAndGenerate=Seleccioneu/filtreu els xecs a incloure a la remesa i feu clic a "Crear".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+InputReceiptNumber=Seleccioneu l'estat del compte bancari relacionat amb la conciliació. Utilitzeu un valor numèric com: AAAAMM o AAAAMMDD
 EventualyAddCategory=Eventualment, indiqui una categoria en la qual classificar els registres
 ToConciliate=A conciliar?
 ThenCheckLinesAndConciliate=A continuació, comproveu les línies presents en l'extracte bancari i feu clic
 BankDashboard=Resum comptes bancaris
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+DefaultRIB=Codi BAN per defecte
+AllRIB=Tots els codis BAN
+LabelRIB=Etiqueta del codi BAN
+NoBANRecord=Codi BAN no registrat
+DeleteARib=Codi BAN eliminat
+ConfirmDeleteRib=Segur que vols eliminar aquest registre BAN?
+StartDate=Start date
+EndDate=End date

+ 20 - 14
htdocs/langs/ca_ES/boxes.lang

@@ -12,13 +12,14 @@ BoxLastProspects=Últims clients potencials modificats
 BoxLastCustomers=Últims clients modificats
 BoxLastSuppliers=Últims proveïdors modificats
 BoxLastCustomerOrders=Últimes comandes
+BoxLastValidatedCustomerOrders=Ultimes comandes de clients validades
 BoxLastBooks=Últims books
 BoxLastActions=Últims esdeveniments
 BoxLastContracts=Últims contractes
 BoxLastContacts=Últims contactes/adreçes
 BoxLastMembers=Últims membres modificats
 BoxFicheInter=Últimes intervencions modificades
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Balanç de comptes oberts
 BoxSalesTurnover=Volum de vendes
 BoxTotalUnpaidCustomerBills=Total factures a clients pendents de cobrament
 BoxTotalUnpaidSuppliersBills=Total factures de proveïdors pendents de pagament
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Nombre de clients
 BoxTitleLastRssInfos=Les %s últimes infos de %s
 BoxTitleLastProducts=Els %s darrers productes/serveis registrats
 BoxTitleProductsAlertStock=Productes en alerta d'estoc
-BoxTitleLastCustomerOrders=Les %s darreres comandes de clients modificades
+BoxTitleLastCustomerOrders=Ultimes %s comandes de clients
+BoxTitleLastModifiedCustomerOrders=Últimes %s comandes de clients modificades
 BoxTitleLastSuppliers=Els %s darrers proveïdors registrats
 BoxTitleLastCustomers=Els %s darrers clients registrats
 BoxTitleLastModifiedSuppliers=Els %s últims proveïdors modificats
 BoxTitleLastModifiedCustomers=Els %s últims clients modificats
-BoxTitleLastCustomersOrProspects=Els %s darrers clients o clients potencials registrats
-BoxTitleLastPropals=Els %s darrers pressupostos registrats
+BoxTitleLastCustomersOrProspects=Últims %s clients o clients potencials registrats
+BoxTitleLastPropals=Últims %s pressupostos
+BoxTitleLastModifiedPropals=Últims %s pressupostos modificats
 BoxTitleLastCustomerBills=Les %s últimes factures a clients modificades
+BoxTitleLastModifiedCustomerBills=Ultimes %s factures de clients modificades
 BoxTitleLastSupplierBills=Les %s últimes factures de proveïdors modificades
-BoxTitleLastProspects=Els %s darrers clients potencials registrats
+BoxTitleLastModifiedSupplierBills=Últimes %s factures de proveïdors modificades
 BoxTitleLastModifiedProspects=Els %s últims clients potencials modificats
 BoxTitleLastProductsInContract=Els %s darrers productes/serveis contractats
-BoxTitleLastModifiedMembers=Els %s últims membres modificats
+BoxTitleLastModifiedMembers=Últims %s membres modificats
 BoxTitleLastFicheInter=Les %s últimes intervencions modificades
 BoxTitleOldestUnpaidCustomerBills=Les %s factures més antigues a clients pendents de cobrament
 BoxTitleOldestUnpaidSupplierBills=Les %s factures més antigues de proveïdors pendents de pagament
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Balanç de comptes oberts
 BoxTitleSalesTurnover=Volum de vendes realitzades
-BoxTitleTotalUnpaidCustomerBills=Pendent de clients
-BoxTitleTotalUnpaidSuppliersBills=Pendent a proveïdors
+BoxTitleTotalUnpaidCustomerBills=Factures a clients pendents de cobrament
+BoxTitleTotalUnpaidSuppliersBills=Factures de proveïdors pendents de pagament
 BoxTitleLastModifiedContacts=Els últims %s contactes/adreçes modificades
 BoxMyLastBookmarks=Els meus %s darrers marcadors
 BoxOldestExpiredServices=Serveis antics expirats
@@ -74,9 +78,10 @@ NoRecordedProducts=Sense productes/serveis registrats
 NoRecordedProspects=Sense clients potencials registrats
 NoContractedProducts=Sense productes/serveis contractats
 NoRecordedContracts=Sense contractes registrats
-NoRecordedInterventions=No recorded interventions
+NoRecordedInterventions=No hi ha intervencions registrades
 BoxLatestSupplierOrders=Últimes comandes a proveïdors
-BoxTitleLatestSupplierOrders=Les %s últimes comandes a proveïdors
+BoxTitleLatestSupplierOrders=Últimes %s comandes a proveïdors
+BoxTitleLatestModifiedSupplierOrders=Últimes %s comandes de proveïdors modificades
 NoSupplierOrder=Sense comandes a proveïdors
 BoxCustomersInvoicesPerMonth=Factures a clients per mes
 BoxSuppliersInvoicesPerMonth=Factures de proveïdors per mes
@@ -84,8 +89,9 @@ BoxCustomersOrdersPerMonth=Comandes de clients per mes
 BoxSuppliersOrdersPerMonth=Comandes a proveïdors per mes
 BoxProposalsPerMonth=Pressupostos per mes
 NoTooLowStockProducts=Sense productes per sota de l'estoc mínim
-BoxProductDistribution=Products/Services distribution
-BoxProductDistributionFor=Distribution of %s for %s
+BoxProductDistribution=Distribució de productes/serveis
+BoxProductDistributionFor=Distribució de %s per %s
 ForCustomersInvoices=Factures a clientes
-ForCustomersOrders=Customers orders
+ForCustomersOrders=Comandes de clients
 ForProposals=Pressupostos
+LastXMonthRolling=The last %s month rolling

+ 5 - 2
htdocs/langs/ca_ES/errors.lang

@@ -159,14 +159,17 @@ ErrorPriceExpression22=Negative result '%s'
 ErrorPriceExpressionInternal=Internal error '%s'
 ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
 ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
 ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
 ErrorGlobalVariableUpdater2=Missing parameter '%s'
 ErrorGlobalVariableUpdater3=The requested data was not found in result
 ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
 
 # Warnings
 WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits

+ 14 - 14
htdocs/langs/ca_ES/interventions.lang

@@ -3,7 +3,7 @@ Intervention=Intervenció
 Interventions=Intervencions
 InterventionCard=Fitxa intervenció
 NewIntervention=Nova itervenció
-AddIntervention=Create intervention
+AddIntervention=Crear intervenció
 ListOfInterventions=Llista d'intervencions
 EditIntervention=Editar
 ActionsOnFicheInter=Esdeveniments sobre l'intervenció
@@ -24,21 +24,21 @@ NameAndSignatureOfInternalContact=Nom i signatura del participant:
 NameAndSignatureOfExternalContact=Nom i signatura del client:
 DocumentModelStandard=Document model estàndard per a intervencions
 InterventionCardsAndInterventionLines=Fitxes i línies d'intervenció
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyBilled=Classificar "facturat"
+InterventionClassifyUnBilled=Classificar "no facturat"
 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
+SendInterventionRef=Presentar intervenció %s
+SendInterventionByMail=Enviar intervenció per email
+InterventionCreatedInDolibarr=Intervenció %s creada
+InterventionValidatedInDolibarr=Intervenció %s validada
+InterventionModifiedInDolibarr=Intervenció %s modificada
+InterventionClassifiedBilledInDolibarr=Intervenció %s marcada com a facturada
+InterventionClassifiedUnbilledInDolibarr=Intervenció %s marcada com a no facturada
+InterventionSentByEMail=Intervenció %s enviada per email
+InterventionDeletedInDolibarr=Intevenció %s eliminada
+SearchAnIntervention=Cerca una intervenció
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Responsable seguiment de la intervenció
 TypeContact_fichinter_internal_INTERVENING=Interventor
@@ -50,4 +50,4 @@ ArcticNumRefModelError=Activació impossible
 PacificNumRefModelDesc1=Retorna el número amb el format %syymm-nnnn on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense quedar a 0
 PacificNumRefModelError=Una factura que comença per # $$syymm existeix en base i és incompatible amb aquesta numeració. Elemínela o renombrela per activar aquest mòdul.
 PrintProductsOnFichinter=Mostrar els productes a la fitxa d'intervenció
-PrintProductsOnFichinterDetails=per a les intervencions generades a partir de comandes
+PrintProductsOnFichinterDetails=interventions generated from orders

+ 55 - 48
htdocs/langs/ca_ES/main.lang

@@ -14,7 +14,7 @@ FormatDateShortJava=dd/MM/yyyy
 FormatDateShortJavaInput=dd/MM/yyyy
 FormatDateShortJQuery=dd/mm/yy
 FormatDateShortJQueryInput=dd/mm/yy
-FormatHourShortJQuery=HH:MI
+FormatHourShortJQuery=HH:MM
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
@@ -35,7 +35,7 @@ ErrorFailedToOpenFile=Impossible obrir el fitxer %s
 ErrorCanNotCreateDir=Impossible crear la carpeta %s
 ErrorCanNotReadDir=Impossible llegir la carpeta %s
 ErrorConstantNotDefined=Parámetre %s no definit
-ErrorUnknown=Unknown error
+ErrorUnknown=Error desconegut
 ErrorSQL=Error de SQL
 ErrorLogoFileNotFound=El arxiu logo '%s' no es troba
 ErrorGoToGlobalSetup=Aneu a la Configuració 'Empresa/Institució' per corregir
@@ -59,13 +59,13 @@ 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.
-SetDate=Set date
-SelectDate=Select a date
+SetDate=Definir data
+SelectDate=Seleccioneu una data
 SeeAlso=Veure també %s
-SeeHere=See here
+SeeHere=Mira aquí
 BackgroundColorByDefault=Color de fons
-FileNotUploaded=The file was not uploaded
-FileUploaded=The file was successfully uploaded
+FileNotUploaded=No s'ha pujat l'arxiu
+FileUploaded=L'arxiu s'ha carregat correctament
 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)
@@ -96,7 +96,7 @@ InformationLastAccessInError=Informació sobre l'últim accés a la base de dade
 DolibarrHasDetectedError=Dolibarr ha trobat un error tècnic
 InformationToHelpDiagnose=Heus aquí la informació que podrà ajudar al diagnòstic
 MoreInformation=Més informació
-TechnicalInformation=Technical information
+TechnicalInformation=Informació tècnica
 NotePublic=Nota (pública)
 NotePrivate=Nota (privada)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr està configurat per limitar la precisió dels preus unitaris a <b>%s </b> decimals.
@@ -141,7 +141,7 @@ Cancel=Anul·lar
 Modify=Modificar
 Edit=Editar
 Validate=Validar
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Validar i aprovar
 ToValidate=A validar
 Save=Gravar
 SaveAs=Gravar com
@@ -159,10 +159,10 @@ Search=Cercar
 SearchOf=Cerca de
 Valid=Validar
 Approve=Aprovar
-Disapprove=Disapprove
+Disapprove=Desaprovar
 ReOpen=Reobrir
 Upload=Enviar arxiu
-ToLink=Link
+ToLink=Enllaç
 Select=Seleccionar
 Choose=Escollir
 ChooseLangage=Triar l'idioma
@@ -173,7 +173,7 @@ User=Usuari
 Users=Usuaris
 Group=Grup
 Groups=Grups
-NoUserGroupDefined=No user group defined
+NoUserGroupDefined=Grup d'usuari no definit
 Password=Contrasenya
 PasswordRetype=Repetir contrasenya
 NoteSomeFeaturesAreDisabled=Atenció, només uns pocs mòduls/funcionalitats han estat activats en aquesta demo.
@@ -211,7 +211,7 @@ Limit=Límit
 Limits=Límits
 DevelopmentTeam=Equip de desenvolupament
 Logout=Desconnexió
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
+NoLogoutProcessWithAuthMode=No s'ha pogut desconnectar amb el mètode de autenticació <b>%s</b>
 Connection=Connexió
 Setup=Configuració
 Alert=Alerta
@@ -220,8 +220,9 @@ Next=Següent
 Cards=Fitxes
 Card=Fitxa
 Now=Ara
+HourStart=Start hour
 Date=Data
-DateAndHour=Date and hour
+DateAndHour=Data i hora
 DateStart=Data inici
 DateEnd=Data fi
 DateCreation=Data de creació
@@ -242,6 +243,8 @@ DatePlanShort=Data Planif.
 DateRealShort=Data real
 DateBuild=Data generació de l'informe
 DatePayment=Data pagament
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
 DurationYear=any
 DurationMonth=mes
 DurationWeek=setmana
@@ -264,16 +267,16 @@ days=dies
 Hours=Hores
 Minutes=Minuts
 Seconds=Segons
-Weeks=Weeks
+Weeks=setmanes
 Today=Avuí
 Yesterday=Ahir
 Tomorrow=Demà
-Morning=Morning
-Afternoon=Afternoon
+Morning=Demati
+Afternoon=Tarda
 Quadri=Trimistre
 MonthOfDay=Mes del dia
 HourShort=H
-MinuteShort=mn
+MinuteShort=Minut
 Rate=Tipus
 UseLocalTax=Incloure taxes
 Bytes=Bytes
@@ -324,7 +327,7 @@ SubTotal=Subtotal
 TotalHTShort=Import
 TotalTTCShort=Total
 TotalHT=Base imponible
-TotalHTforthispage=Total (net of tax) for this page
+TotalHTforthispage=Base imposable a la pagina
 TotalTTC=Total
 TotalTTCToYourCredit=Total a crèdit
 TotalVAT=Total IVA
@@ -349,10 +352,10 @@ FullList=Llista completa
 Statistics=Estadístiques
 OtherStatistics=Altres estadístiques
 Status=Estat
-Favorite=Favorite
+Favorite=Favorit
 ShortInfo=Info.
 Ref=Ref.
-ExternalRef=Ref. extern
+ExternalRef=Ref. externa
 RefSupplier=Ref. proveïdor
 RefPayment=Ref. pagament
 CommercialProposalsShort=Pressupostos
@@ -367,7 +370,7 @@ ActionNotApplicable=No aplicable
 ActionRunningNotStarted=No començat
 ActionRunningShort=Començat
 ActionDoneShort=Acabat
-ActionUncomplete=Uncomplete
+ActionUncomplete=Incomplet
 CompanyFoundation=Empresa o institució
 ContactsForCompany=Contactes d'aquest tercer
 ContactsAddressesForCompany=Contactes/adreces d'aquest tercer
@@ -376,7 +379,7 @@ ActionsOnCompany=Esdeveniments respecte aquest tercer
 ActionsOnMember=Esdeveniments respecte aquest membre
 NActions=%s esdeveniments
 NActionsLate=%s en retard
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=Sol·licitud ja recollida
 Filter=Filtre
 RemoveFilter=Eliminar filtre
 ChartGenerated=Gràfics generats
@@ -395,8 +398,8 @@ Available=Disponible
 NotYetAvailable=Encara no disponible
 NotAvailable=No disponible
 Popularity=Popularitat
-Categories=Tags/categories
-Category=Tag/category
+Categories=Etiquetes/categories
+Category=Etiqueta/categoria
 By=Per
 From=De
 to=a
@@ -408,7 +411,9 @@ OtherInformations=Altres informacions
 Quantity=Quantitat
 Qty=Qt.
 ChangedBy=Modificat per
-ReCalculate=Recalculate
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
+ReCalculate=Recalcular
 ResultOk=Èxit
 ResultKo=Error
 Reporting=Informe
@@ -520,13 +525,13 @@ NbOfCustomers=Nombre de clients
 NbOfLines=Números de línies
 NbOfObjects=Nombre d'objectes
 NbOfReferers=Consumició
-Referers=Refering objects
+Referers=Objectes vinculats
 TotalQuantity=Quantitat total
 DateFromTo=De %s a %s
 DateFrom=A partir de %s
 DateUntil=Fins %s
 Check=Verificar
-Uncheck=Uncheck
+Uncheck=Desmarcar
 Internal=Intern
 External=Extern
 Internals=Interns
@@ -565,7 +570,7 @@ MailSentBy=Mail enviat per
 TextUsedInTheMessageBody=Text utilitzat en el cos del missatge
 SendAcknowledgementByMail=Enviament rec. per e-mail
 NoEMail=Sense e-mail
-NoMobilePhone=No mobile phone
+NoMobilePhone=Sense mòbil
 Owner=Propietari
 DetectedVersion=Versió detectada
 FollowingConstantsWillBeSubstituted=Les següents constants seran substituïdes pel seu valor corresponent.
@@ -591,7 +596,7 @@ TotalWoman=Total
 TotalMan=Total
 NeverReceived=Mai rebut
 Canceled=Cancel·lat
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+YouCanChangeValuesForThisListFromDictionarySetup=Pot canviar aquestos valors al menú configuració->diccionaris
 Color=Color
 Documents=Documents
 DocumentsNb=Fitxers adjunts (%s)
@@ -620,8 +625,8 @@ Notes=Notes
 AddNewLine=Afegir nova línia
 AddFile=Afegir arxiu
 ListOfFiles=Llistat d'arxius disponibles
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
+FreeZone=Zona lliure
+FreeLineOfType=Tipus de zona lliure
 CloneMainAttributes=Clonar l'objecte amb aquests atributs principals
 PDFMerge=Fussió PDF
 Merge=Fussió
@@ -658,7 +663,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
+SetToDraft=Tornar a redactar
 ClickToEdit=Clic per a editar
 ObjectDeleted=Objecte %s eliminat
 ByCountry=Per país
@@ -681,21 +686,23 @@ HomeDashboard=Resum
 Deductible=Deduïble
 from=de
 toward=cap a
-Access=Access
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show transaction
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
+Access=Accés
+HelpCopyToClipboard=Utilitzeu Ctrl+C per copiar al portapapers
+SaveUploadedFileWithMask=Desa el fitxer al servidor amb el nom "<strong>%s</strong>" (del contrari "%s")
+OriginFileName=Nom original de l'arxiu
+SetDemandReason=Definir orige
+SetBankAccount=Definir el compte bancari
+AccountCurrency=Divisa del compte
+ViewPrivateNote=Veure notes
+XMoreLines=%s línia(es)  oculta(es)
+PublicUrl=URL pública
+AddBox=Afegir quadre
+SelectElementAndClickRefresh=Seleccioneu un element i feu clic a Actualitza
+PrintFile=%s arxius a imprimir
+ShowTransaction=Mostra transacció
+GoIntoSetupToChangeLogo=Anar a Inici->Configuració->Empresa per canviar el logotip o anar a Inici->Configuració->Visualització per amagar.
+Deny=Deny
+Denied=Denied
 # Week day
 Monday=Dilluns
 Tuesday=Dimarts

+ 3 - 1
htdocs/langs/ca_ES/orders.lang

@@ -79,7 +79,9 @@ NoOpenedOrders=Cap comanda esborrany
 NoOtherOpenedOrders=Cap altra comanda esborrany
 NoDraftOrders=Sense comandes esborrany
 OtherOrders=Altres comandes
-LastOrders=Les %s darreres comandes
+LastOrders=Last %s customer orders
+LastCustomerOrders=Last %s customer orders
+LastSupplierOrders=Last %s supplier orders
 LastModifiedOrders=Les %s darreres comandes modificades
 LastClosedOrders=Les %s darreres comandes tancades
 AllOrders=Totes les comandes

+ 1 - 0
htdocs/langs/ca_ES/other.lang

@@ -203,6 +203,7 @@ NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
 
 ##### Calendar common #####
 AddCalendarEntry=Afegir entrada al calendari

+ 11 - 10
htdocs/langs/ca_ES/productbatch.lang

@@ -1,21 +1,22 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use batch/serial number
-ProductStatusOnBatch=Yes (Batch/serial required)
-ProductStatusNotOnBatch=No (Batch/serial not used)
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
 ProductStatusOnBatchShort=Yes
 ProductStatusNotOnBatchShort=No
-Batch=Batch/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Batch number
-batch_number=Batch/Serial number
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
 l_eatby=Eat-by date
 l_sellby=Sell-by date
-DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Batch: %s
+DetailBatchNumber=Lot/Serial details
+DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+printBatch=Lot/Serial: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
-WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use batch/serial number

+ 1 - 0
htdocs/langs/ca_ES/projects.lang

@@ -14,6 +14,7 @@ MyTasksDesc=Aquesta vista es limita als projectes i tasques en què vostè és u
 OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
 TasksPublicDesc=Aquesta vista mostra tots els projectes i tasques en els que vostè té dret a tenir visibilitat.
 TasksDesc=Aquesta vista mostra tots els projectes i tasques (les sevas autoritzacions li ofereixen una visió completa).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
 ProjectsArea=Àrea projectes
 NewProject=Nou projecte
 AddProject=Create project

+ 6 - 1
htdocs/langs/ca_ES/stocks.lang

@@ -16,6 +16,7 @@ CancelSending=Anul·lar enviament
 DeleteSending=Eliminar enviament
 Stock=Estoc
 Stocks=Estocs
+StocksByLotSerial=Stock by lot/serial
 Movement=Moviment
 Movements=Moviments
 ErrorWarehouseRefRequired=El nom de referència del magatzem és obligatori
@@ -78,6 +79,7 @@ IdWarehouse=Id. magatzem
 DescWareHouse=Descripció magatzem
 LieuWareHouse=Localització magatzem
 WarehousesAndProducts=Magatzems i productes
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Preu mitjà ponderat (PMP)
 AverageUnitPricePMP=Preu mitjà ponderat (PMP) d'aquisició
 SellPriceMin=Preu de venda unitari
@@ -131,4 +133,7 @@ IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock content correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).

+ 1 - 1
htdocs/langs/ca_ES/suppliers.lang

@@ -43,4 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
-UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
+UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)

+ 0 - 24
htdocs/langs/ca_ES/trips.lang

@@ -69,11 +69,9 @@ MOTIF_CANCEL=Reason
 DATE_REFUS=Deny date
 DATE_SAVE=Validation date
 DATE_VALIDE=Validation date
-DateApprove=Approving date
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Payment date
 
-Deny=Deny
 TO_PAID=Pay
 BROUILLONNER=Reopen
 SendToValid=Sent to approve
@@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta
 SaveTrip=Validate expense report
 ConfirmSaveTrip=Are you sure you want to validate this expense report ?
 
-Synchro_Compta=NDF <-> Compte
-
-TripSynch=Synchronisation : Notes de frais <-> Compte courant
-TripToSynch=Notes de frais à intégrer dans la compta
-AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
-ViewAccountSynch=Voir le compte
-
-ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
-ndfToAccount=Note de frais - Intégration
-
-ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
-AccountToNdf=Note de frais - Retrait
-
-LINE_NOT_ADDED=Ligne non ajoutée :
-NO_PROJECT=Aucun projet sélectionné.
-NO_DATE=Aucune date sélectionnée.
-NO_PRICE=Aucun prix indiqué.
-
-TripForValid=à Valider
-TripForPaid=à Payer
-TripPaid=Payée
-
 NoTripsToExportCSV=No expense report to export for this period.

+ 21 - 15
htdocs/langs/cs_CZ/admin.lang

@@ -297,10 +297,11 @@ MenuHandlers=Menu handlery
 MenuAdmin=Menu editor
 DoNotUseInProduction=Nepoužívejte ve výrobě
 ThisIsProcessToFollow=Nastaveno na proces:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Krok %s
 FindPackageFromWebSite=Nalezni balíček, obsahující funkci jež chcete (např. na oficiálních stránkách %s).
 DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Rozbalit balíček do kořenového adresáře Dolibarr <b>%s</b>
+UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Instalace je dokončena a Dolibarr je připraven k použití.
 NotExistsDirect=Alternativní kořenový adresář není definován. <br>
 InfDirAlt=Od verze 3 je možné definovat alternativní kořenovou složku. To umožňuje ukládat na stejné místo plug-iny a vlastní šablony. <br> Stačí vytvořit adresář v kořenovém adresáři Dolibarr (např.: custom). <br>
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Knihovna použít k vytvoření PDF
 WarningUsingFPDF=Upozornění: Váš <b>conf.php</b> obsahuje direktivu <b>dolibarr_pdf_force_fpdf = 1.</b> To znamená, že můžete používat knihovnu FPDF pro generování PDF souborů. Tato knihovna je stará a nepodporuje mnoho funkcí (Unicode, obraz transparentnost, azbuka, arabské a asijské jazyky, ...), takže může dojít k chybám při generování PDF. <br> Chcete-li vyřešit tento a mají plnou podporu generování PDF, stáhněte si <a href="http://www.tcpdf.org/" target="_blank">TCPDF knihovny</a> , pak komentář nebo odebrat řádek <b>$ dolibarr_pdf_force_fpdf = 1,</b> a místo něj doplnit <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir &quot;</b>
-LocalTaxDesc=Některé země používají 2 nebo 3 daně na každou fakturu řádku. Pokud je to tento případ, vybrat typ druhém a třetím daně a její sazba. Možné typem jsou: <br> 1: pobytová taxa platí o produktech a službách bez DPH (není aplikován na místní daně) <br> 2: pobytová taxa platí o produktech a službách před DPH (je vypočtena na částku + localtax) <br> 3: pobytová taxa platí na výrobky bez DPH (není aplikován na místní daně) <br> 4: pobytová taxa platí na výrobky před DPH (je vypočtena na částku + localtax) <br> 5: pobytová taxa platí na služby bez DPH (není aplikován na místní daně) <br> 6: pobytová taxa platí o službách před DPH (je vypočtena na částku + localtax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Zadejte telefonní číslo pro volání ukázat odkaz na test ClickToDial URL pro <strong>%s</strong>
 RefreshPhoneLink=Obnovit odkaz
@@ -540,8 +541,8 @@ Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product batch
-Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
+Module39000Name=Product lot
+Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modul nabídnout on-line platby kreditní kartou stránku s Paybox
 Module50100Name=Bod prodeje
@@ -558,8 +559,6 @@ Module59000Name=Okraje
 Module59000Desc=Modul pro správu marže
 Module60000Name=Provize
 Module60000Desc=Modul pro správu provize
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
 Permission11=Přečtěte si zákazníků faktury
 Permission12=Vytvořit / upravit zákazníků faktur
 Permission13=Unvalidate zákazníků faktury
@@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= RE sazba ve výchozím nastavení při vytváření vyhl
 LocalTax2IsNotUsedDescES= Ve výchozím nastavení je navrhovaná IRPF je 0. Konec vlády.
 LocalTax2IsUsedExampleES= Ve Španělsku, na volné noze a nezávislí odborníci, kteří poskytují služby a firmy, kteří se rozhodli daňového systému modulů.
 LocalTax2IsNotUsedExampleES= Ve Španělsku jsou bussines, které nejsou předmětem daňového systému modulů.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2=Purchases
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
+CalcLocaltax3=Sales
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label používá ve výchozím nastavení, pokud není překlad lze nalézt kód
 LabelOnDocuments=Štítek na dokumenty
@@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Žádná událost zabezpečení byl zaznamenán ještě. T
 NoEventFoundWithCriteria=Žádná událost zabezpečení byl nalezen na těchto vyhledávacích kritérii.
 SeeLocalSendMailSetup=Podívejte se na místní sendmail nastavení
 BackupDesc=Chcete-li provést kompletní zálohu Dolibarr, musíte:
-BackupDesc2=* Uložte obsah adresáře dokumentů <b>(%s),</b> který obsahuje všechny nahrané a generované soubory (můžete udělat zip pro příklad).
-BackupDesc3=* Ukládání obsahu databáze do souboru s výpisem. K tomu můžete použít následující asistenta.
+BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
 BackupDescX=Archivní adresář by měl být skladován na bezpečném místě.
 BackupDescY=Vygenerovaný soubor výpisu by měl být skladován na bezpečném místě.
 BackupPHPWarning=Záloha nemůže být garantováno s touto metodou. Preferuji předchozí
 RestoreDesc=Chcete-li obnovit zálohu Dolibarr, musíte:
-RestoreDesc2=* Obnovení souboru archivu (zip soubor například) v adresáři dokumentů získat struktuře souborů v adresáři dokumentů jako nová instalace Dolibarr nebo do této aktuálních dokumentech directoy <b>(%s).</b>
-RestoreDesc3=* Obnovení dat ze záložního souboru výpisu, do databáze nové instalaci Dolibarr nebo do databáze této aktuální instalaci. Pozor, po obnovení dokončeno, musíte použít login / heslo, které existovaly, kdy byla provedena záloha, znovu připojit. Chcete-li obnovit zálohu databáze do této aktuální instalaci, můžete sledovat náš pomocník.
+RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
+RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
 ForcedToByAModule= Toto pravidlo je nucen <b>%s</b> aktivovaným modulem
 PreviousDumpFiles=Dostupné databázové soubory zálohování výpisu
@@ -1337,6 +1336,8 @@ LDAPFieldCountry=Země
 LDAPFieldCountryExample=Příklad: c
 LDAPFieldDescription=Popis
 LDAPFieldDescriptionExample=Příklad: popis
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example : publicnote
 LDAPFieldGroupMembers= Členové skupiny
 LDAPFieldGroupMembersExample= Příklad: uniqueMember
 LDAPFieldBirthdate=Datum narození
@@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Výchozí účet použít pro příjem plateb prostře
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
 BookmarkSetup=Záložka Nastavení modulu
@@ -1616,3 +1617,8 @@ ListOfNotificationsPerContact=List of notifications per contact*
 ListOfFixedNotifications=List of fixed notifications
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
 Threshold=Threshold
+BackupDumpWizard=Wizard to build database backup dump file
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>

+ 2 - 0
htdocs/langs/cs_CZ/banks.lang

@@ -163,3 +163,5 @@ LabelRIB=BAN Label
 NoBANRecord=No BAN record
 DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+StartDate=Start date
+EndDate=End date

+ 16 - 10
htdocs/langs/cs_CZ/boxes.lang

@@ -12,6 +12,7 @@ BoxLastProspects=Naposledy měnění prospekti
 BoxLastCustomers=Naposledy měnění zákazníci
 BoxLastSuppliers=Naposledy měnění dodavatelé
 BoxLastCustomerOrders=Poslední zákaznické objednávky
+BoxLastValidatedCustomerOrders=Last validated customer orders
 BoxLastBooks=Poslední knihy
 BoxLastActions=Poslední akce
 BoxLastContracts=Poslední smlouvy
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Počet klientů
 BoxTitleLastRssInfos=Poslední %s zprávy z %s
 BoxTitleLastProducts=Poslední %s modifikované produkty / služby
 BoxTitleProductsAlertStock=Produkty skladem pohotovosti
-BoxTitleLastCustomerOrders=Poslední %s upravené zákaznické objednávky
+BoxTitleLastCustomerOrders=Last %s customer orders
+BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
 BoxTitleLastSuppliers=Poslední %s zaznamenán dodavatele
 BoxTitleLastCustomers=Poslední %s nahrané zákazníky
 BoxTitleLastModifiedSuppliers=Poslední %s upravené dodavatele
 BoxTitleLastModifiedCustomers=Poslední %s modifikované zákazníky
-BoxTitleLastCustomersOrProspects=Poslední %s modifikované zákazníky nebo vyhlídky
-BoxTitleLastPropals=Poslední %s zaznamenané návrhy
+BoxTitleLastCustomersOrProspects=Last %s customers or prospects
+BoxTitleLastPropals=Last %s proposals
+BoxTitleLastModifiedPropals=Last %s modified proposals
 BoxTitleLastCustomerBills=Minulý %s zákazníka faktury
+BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
 BoxTitleLastSupplierBills=Minulý %s dodavatelských faktur
-BoxTitleLastProspects=Poslední %s zaznamenán vyhlídky
+BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
 BoxTitleLastModifiedProspects=Poslední %s upravené vyhlídky
 BoxTitleLastProductsInContract=Poslední %s produkty / služby ve smlouvě
-BoxTitleLastModifiedMembers=Poslední %s modifikované členů
+BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Poslední %s upravený zásah
-BoxTitleOldestUnpaidCustomerBills=Nejstarší %s Nezaplacené faktury zákazníka
-BoxTitleOldestUnpaidSupplierBills=Nejstarší %s Nezaplacené faktury dodavatele
+BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
+BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
 BoxTitleCurrentAccounts=Opened account's balances
 BoxTitleSalesTurnover=Obrat
-BoxTitleTotalUnpaidCustomerBills=Nezaplacené faktury zákazníka
-BoxTitleTotalUnpaidSuppliersBills=Nezaplacené faktury dodavatele
+BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
+BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
 BoxTitleLastModifiedContacts=Poslední %s upravené kontakty / adresy
 BoxMyLastBookmarks=Moje poslední %s záložky
 BoxOldestExpiredServices=Nejstarší aktivní vypršela služby
@@ -76,7 +80,8 @@ NoContractedProducts=Žádné produkty / služby smluvně
 NoRecordedContracts=Žádné zaznamenané smlouvy
 NoRecordedInterventions=Žádné zaznamenané zásahy
 BoxLatestSupplierOrders=Nejnovější dodavatelské objednávky
-BoxTitleLatestSupplierOrders=%s nejnovější dodavatelské objednávky
+BoxTitleLatestSupplierOrders=Last %s supplier orders
+BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
 NoSupplierOrder=Žádné zaznamenané dodavatele, aby
 BoxCustomersInvoicesPerMonth=Zákazníků faktury za měsíc
 BoxSuppliersInvoicesPerMonth=Dodavatelských faktur za měsíc
@@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribuce %s pro %s
 ForCustomersInvoices=Zákazníci faktury
 ForCustomersOrders=Zákazníci objednávky
 ForProposals=Návrhy
+LastXMonthRolling=The last %s month rolling

+ 5 - 2
htdocs/langs/cs_CZ/errors.lang

@@ -159,14 +159,17 @@ ErrorPriceExpression22=Negative result '%s'
 ErrorPriceExpressionInternal=Internal error '%s'
 ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
 ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
 ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
 ErrorGlobalVariableUpdater2=Missing parameter '%s'
 ErrorGlobalVariableUpdater3=The requested data was not found in result
 ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
 
 # Warnings
 WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny

+ 1 - 1
htdocs/langs/cs_CZ/interventions.lang

@@ -50,4 +50,4 @@ ArcticNumRefModelError=Nepodařilo se aktivovat
 PacificNumRefModelDesc1=Zpět numero ve formátu %syymm-nnnn, kde yy je rok, MM je měsíc a nnnn je sekvence bez přerušení a bez vrátí na 0.
 PacificNumRefModelError=Zásah karta začíná s $ syymm již existuje a není kompatibilní s tímto modelem sekvence. Vyjměte ji nebo přejmenujte jej na aktivaci tohoto modulu.
 PrintProductsOnFichinter=Vytisknout produktů na intervenční karty
-PrintProductsOnFichinterDetails=forinterventions získané z objednávek
+PrintProductsOnFichinterDetails=interventions generated from orders

+ 7 - 0
htdocs/langs/cs_CZ/main.lang

@@ -220,6 +220,7 @@ Next=Další
 Cards=Karty
 Card=Karta
 Now=Nyní
+HourStart=Start hour
 Date=Datum
 DateAndHour=Date and hour
 DateStart=Datum začátku
@@ -242,6 +243,8 @@ DatePlanShort=Datum hoblované
 DateRealShort=Datum skutečný.
 DateBuild=Zpráva datum sestavení
 DatePayment=Datum platby
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
 DurationYear=rok
 DurationMonth=měsíc
 DurationWeek=týden
@@ -408,6 +411,8 @@ OtherInformations=Ostatní informace
 Quantity=Množství
 Qty=Množství
 ChangedBy=Změnil
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
 ReCalculate=Přepočítat
 ResultOk=Úspěch
 ResultKo=Selhání
@@ -696,6 +701,8 @@ SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
+Deny=Deny
+Denied=Denied
 # Week day
 Monday=Pondělí
 Tuesday=Úterý

+ 3 - 1
htdocs/langs/cs_CZ/orders.lang

@@ -79,7 +79,9 @@ NoOpenedOrders=Žádné otevřené příkazy
 NoOtherOpenedOrders=Žádný jiný otevřel objednávky
 NoDraftOrders=Žádné návrhy objednávky
 OtherOrders=Ostatní objednávky
-LastOrders=Poslední %s objednávky
+LastOrders=Last %s customer orders
+LastCustomerOrders=Last %s customer orders
+LastSupplierOrders=Last %s supplier orders
 LastModifiedOrders=Poslední %s modifikované objednávky
 LastClosedOrders=Poslední %s uzavřené objednávky
 AllOrders=Všechny objednávky

+ 1 - 0
htdocs/langs/cs_CZ/other.lang

@@ -203,6 +203,7 @@ NewKeyWillBe=Váš nový klíč pro přihlášení do softwaru bude
 ClickHereToGoTo=Klikněte zde pro přechod na %s
 YouMustClickToChange=Musíte však nejprve kliknout na následující odkaz pro potvrzení této změny hesla
 ForgetIfNothing=Pokud jste o tuto změnu, stačí zapomenout na tento e-mail. Vaše přihlašovací údaje jsou v bezpečí.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
 
 ##### Calendar common #####
 AddCalendarEntry=Přidat záznam do kalendáře %s

+ 11 - 10
htdocs/langs/cs_CZ/productbatch.lang

@@ -1,21 +1,22 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use batch/serial number
-ProductStatusOnBatch=Yes (Batch/serial required)
-ProductStatusNotOnBatch=No (Batch/serial not used)
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
 ProductStatusOnBatchShort=Yes
 ProductStatusNotOnBatchShort=No
-Batch=Batch/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Batch number
-batch_number=Batch/Serial number
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
 l_eatby=Eat-by date
 l_sellby=Sell-by date
-DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Batch: %s
+DetailBatchNumber=Lot/Serial details
+DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+printBatch=Lot/Serial: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
-WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use batch/serial number

+ 1 - 0
htdocs/langs/cs_CZ/projects.lang

@@ -14,6 +14,7 @@ MyTasksDesc=Tento pohled je omezen na projekty či úkoly u kterých jste uveden
 OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
 TasksPublicDesc=Tento pohled zobrazuje všechny projekty a úkoly které máte oprávnění číst.
 TasksDesc=Tento pohled zobrazuje všechny projekty a úkoly (vaše uživatelské oprávnění vám umožňuje vidět vše).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
 ProjectsArea=Projekty
 NewProject=Nový projekt
 AddProject=Create project

+ 6 - 1
htdocs/langs/cs_CZ/stocks.lang

@@ -16,6 +16,7 @@ CancelSending=Zrušit zasílání
 DeleteSending=Smazat odeslání
 Stock=Sklad
 Stocks=Zásoby
+StocksByLotSerial=Stock by lot/serial
 Movement=Pohyb
 Movements=Pohyby
 ErrorWarehouseRefRequired=Sklad referenční jméno je povinné
@@ -78,6 +79,7 @@ IdWarehouse=Id sklad
 DescWareHouse=Popis sklad
 LieuWareHouse=Lokalizace sklad
 WarehousesAndProducts=Sklady a produkty
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Vážený průměr cen vstupů
 AverageUnitPricePMP=Vážený průměr cen vstupů
 SellPriceMin=Prodejní jednotka Cena
@@ -131,4 +133,7 @@ IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock content correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).

+ 1 - 1
htdocs/langs/cs_CZ/suppliers.lang

@@ -43,4 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
-UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
+UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)

+ 0 - 24
htdocs/langs/cs_CZ/trips.lang

@@ -69,11 +69,9 @@ MOTIF_CANCEL=Reason
 DATE_REFUS=Deny date
 DATE_SAVE=Validation date
 DATE_VALIDE=Validation date
-DateApprove=Approving date
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Payment date
 
-Deny=Deny
 TO_PAID=Pay
 BROUILLONNER=Reopen
 SendToValid=Sent to approve
@@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta
 SaveTrip=Validate expense report
 ConfirmSaveTrip=Are you sure you want to validate this expense report ?
 
-Synchro_Compta=NDF <-> Compte
-
-TripSynch=Synchronisation : Notes de frais <-> Compte courant
-TripToSynch=Notes de frais à intégrer dans la compta
-AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
-ViewAccountSynch=Voir le compte
-
-ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
-ndfToAccount=Note de frais - Intégration
-
-ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
-AccountToNdf=Note de frais - Retrait
-
-LINE_NOT_ADDED=Ligne non ajoutée :
-NO_PROJECT=Aucun projet sélectionné.
-NO_DATE=Aucune date sélectionnée.
-NO_PRICE=Aucun prix indiqué.
-
-TripForValid=à Valider
-TripForPaid=à Payer
-TripPaid=Payée
-
 NoTripsToExportCSV=No expense report to export for this period.

+ 21 - 15
htdocs/langs/da_DK/admin.lang

@@ -297,10 +297,11 @@ MenuHandlers=Menu håndterer
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=Det er opsætningen til processen:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Trin %s
 FindPackageFromWebSite=Find en pakke, der giver funktion, du ønsker (for eksempel på web site %s).
 DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Pak pakke filen i Dolibarr's <b>rodbibliotek %s</b>
+UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Installer er færdig og Dolibarr er klar til brug med denne nye komponent.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (vat is not applied on local tax)<br>2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)<br>3 : local tax apply on products without vat (vat is not applied on local tax)<br>4 : local tax apply on products before vat (vat is calculated on amount + localtax)<br>5 : local tax apply on services without vat (vat is not applied on local tax)<br>6 : local tax apply on services before vat (vat is calculated on amount + localtax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -540,8 +541,8 @@ Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product batch
-Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
+Module39000Name=Product lot
+Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PAYBOX
 Module50000Desc=Modul til at tilbyde en online betaling side med kreditkort med PAYBOX
 Module50100Name=Cash desk
@@ -558,8 +559,6 @@ Module59000Name=Margin
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
 Permission11=Læs fakturaer
 Permission12=Opret/Modify fakturaer
 Permission13=Unvalidate fakturaer
@@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= RE sats som standard, når du opretter udsigter, fakturae
 LocalTax2IsNotUsedDescES= Som standard den foreslåede IRPF er 0. Slut på reglen.
 LocalTax2IsUsedExampleES= I Spanien, freelancere og selvstændige, der leverer tjenesteydelser og virksomheder, der har valgt at skattesystemet i de moduler.
 LocalTax2IsNotUsedExampleES= I Spanien er bussines ikke underlagt skattesystemet i moduler.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2=Purchases
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
+CalcLocaltax3=Sales
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Etiket, som bruges som standard, hvis ingen oversættelse kan findes for kode
 LabelOnDocuments=Etiketten på dokumenter
@@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Ingen sikkerhed tilfælde er blevet registreret endnu. Det
 NoEventFoundWithCriteria=Ingen sikkerhed tilfælde er fundet for sådanne søgefelter.
 SeeLocalSendMailSetup=Se din lokale sendmail setup
 BackupDesc=Hvis du vil foretage en komplet sikkerhedskopi af Dolibarr, skal du:
-BackupDesc2=* Gem indholdet af dokumenter directory <b>( %s),</b> der indeholder alle uploadede og genererede filer (du kan gøre en zip for eksempel).
-BackupDesc3=* Gem indholdet af din database med en dump. for dette, kan du bruge følgende assistent.
+BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
 BackupDescX=Arkiveret mappe skal opbevares på et sikkert sted.
 BackupDescY=De genererede dump fil bør opbevares på et sikkert sted.
 BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
 RestoreDesc=At genskabe en Dolibarr sikkerhedskopi, skal du:
-RestoreDesc2=* Restore arkivfil (zip-fil, for eksempel) af dokumenter biblioteket til at udpakke træ af filer i dokumenter mappe til en ny Dolibarr installation eller i denne aktuelle dokumenter directoy <b>( %s).</b>
-RestoreDesc3=* Gendan data fra en sikkerhedskopi dump fil, i databasen i den nye Dolibarr installation eller i databasen i denne aktuelle installation. Advarsel, når genoprette er færdig, skal du bruge et login / password, der eksisterede, da backup blev foretaget, for at oprette forbindelse igen. Sådan gendanner du en backup-database i denne aktuelle installation, kan du følge dette assistent.
+RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
+RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
 ForcedToByAModule= Denne regel er tvunget til <b>at %s</b> ved en aktiveret modul
 PreviousDumpFiles=Tilgængelig database backup dump filer
@@ -1337,6 +1336,8 @@ LDAPFieldCountry=Land
 LDAPFieldCountryExample=Eksempel: c
 LDAPFieldDescription=Beskrivelse
 LDAPFieldDescriptionExample=Eksempel: beskrivelse
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example : publicnote
 LDAPFieldGroupMembers= Gruppens medlemmer
 LDAPFieldGroupMembersExample= Eksempel: uniqueMember
 LDAPFieldBirthdate=Fødselsdato
@@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Konto til at bruge til at modtage kontant betaling ved
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
 BookmarkSetup=Bogmærkemodulet setup
@@ -1616,3 +1617,8 @@ ListOfNotificationsPerContact=List of notifications per contact*
 ListOfFixedNotifications=List of fixed notifications
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
 Threshold=Threshold
+BackupDumpWizard=Wizard to build database backup dump file
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>

+ 2 - 0
htdocs/langs/da_DK/banks.lang

@@ -163,3 +163,5 @@ LabelRIB=BAN Label
 NoBANRecord=No BAN record
 DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+StartDate=Start date
+EndDate=End date

+ 35 - 29
htdocs/langs/da_DK/boxes.lang

@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=Rss oplysninger
 BoxLastProducts=Seneste produkter / ydelser
-# BoxProductsAlertStock=Products in stock alert
+BoxProductsAlertStock=Products in stock alert
 BoxLastProductsInContract=Seneste kontraheret produkter / tjenester
 BoxLastSupplierBills=Seneste leverandørens fakturaer
 BoxLastCustomerBills=Seneste kundens fakturaer
@@ -12,13 +12,14 @@ BoxLastProspects=Seneste udsigter
 BoxLastCustomers=Seneste kunder
 BoxLastSuppliers=Seneste leverandører
 BoxLastCustomerOrders=Seneste kundens ordrer
+BoxLastValidatedCustomerOrders=Last validated customer orders
 BoxLastBooks=Seneste bøger
 BoxLastActions=Seneste tiltag
 BoxLastContracts=Seneste kontrakter
 BoxLastContacts=Sidste kontakter / adresser
 BoxLastMembers=Nyeste medlemmer
-# BoxFicheInter=Last interventions
-# BoxCurrentAccounts=Opened accounts balance
+BoxFicheInter=Last interventions
+BoxCurrentAccounts=Opened accounts balance
 BoxSalesTurnover=Omsætning
 BoxTotalUnpaidCustomerBills=Total ubetalte kundens fakturaer
 BoxTotalUnpaidSuppliersBills=Total ubetalte leverandørens fakturaer
@@ -26,27 +27,30 @@ BoxTitleLastBooks=Seneste %s registreres bøger
 BoxTitleNbOfCustomers=Nombre de klient
 BoxTitleLastRssInfos=Seneste %s nyheder fra %s
 BoxTitleLastProducts=Seneste %s modificerede produkter / ydelser
-# BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Seneste %s modificerede kundens ordrer
+BoxTitleProductsAlertStock=Products in stock alert
+BoxTitleLastCustomerOrders=Last %s customer orders
+BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
 BoxTitleLastSuppliers=Seneste %s registreres leverandører
 BoxTitleLastCustomers=Seneste %s registreres kunder
 BoxTitleLastModifiedSuppliers=Sidst %s ændret leverandører
 BoxTitleLastModifiedCustomers=Sidst %s ændret kunder
-BoxTitleLastCustomersOrProspects=Seneste %s registreres kunder eller kundeemner
-BoxTitleLastPropals=Seneste %s registreres forslag
+BoxTitleLastCustomersOrProspects=Last %s customers or prospects
+BoxTitleLastPropals=Last %s proposals
+BoxTitleLastModifiedPropals=Last %s modified proposals
 BoxTitleLastCustomerBills=Seneste %s kundens fakturaer
+BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
 BoxTitleLastSupplierBills=Seneste %s leverandørens fakturaer
-BoxTitleLastProspects=Seneste %s registreres udsigter
+BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
 BoxTitleLastModifiedProspects=Sidst %s ændret udsigterne
 BoxTitleLastProductsInContract=Seneste %s produkter / services i en kontrakt
-BoxTitleLastModifiedMembers=Sidste %s modificerede medlemmer
-# BoxTitleLastFicheInter=Last %s modified intervention
-BoxTitleOldestUnpaidCustomerBills=Aldersformand %s ubetalte kundens fakturaer
-BoxTitleOldestUnpaidSupplierBills=Aldersformand %s ubetalte leverandørens fakturaer
-# BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleLastModifiedMembers=Last %s members
+BoxTitleLastFicheInter=Last %s modified intervention
+BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
+BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
+BoxTitleCurrentAccounts=Opened account's balances
 BoxTitleSalesTurnover=Omsætning
-BoxTitleTotalUnpaidCustomerBills=Ulønnet kundens fakturaer
-BoxTitleTotalUnpaidSuppliersBills=Ulønnet leverandørens fakturaer
+BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
+BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
 BoxTitleLastModifiedContacts=Sidste %s ændret kontakter / adresser
 BoxMyLastBookmarks=Min sidste %s bogmærker
 BoxOldestExpiredServices=Ældste aktive udløbne tjenester
@@ -55,7 +59,7 @@ BoxTitleLastActionsToDo=Seneste %s aktioner at gøre
 BoxTitleLastContracts=Sidste %s kontrakter
 BoxTitleLastModifiedDonations=Sidste %s ændret donationer
 BoxTitleLastModifiedExpenses=Sidste %s ændret udgifter
-# BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGlobalActivity=Global activity (invoices, proposals, orders)
 FailedToRefreshDataInfoNotUpToDate=Det lykkedes ikke at opdatere RSS flux. Seneste vellykkede opdatere dato: %s
 LastRefreshDate=Sidst opdateret dato
 NoRecordedBookmarks=No bookmarks defined. Click <a href=Nr. bogmærker defineret. Klik <a href="%s">her</a> for at tilføje bogmærker.
@@ -74,18 +78,20 @@ NoRecordedProducts=Nr. registreres produkter / tjenester
 NoRecordedProspects=Nr. registreres udsigter
 NoContractedProducts=Ingen produkter / tjenesteydelser kontrakt
 NoRecordedContracts=Ingen registrerede kontrakter
-# NoRecordedInterventions=No recorded interventions
-# BoxLatestSupplierOrders=Latest supplier orders
-# BoxTitleLatestSupplierOrders=%s latest supplier orders
-# NoSupplierOrder=No recorded supplier order
-# BoxCustomersInvoicesPerMonth=Customer invoices per month
-# BoxSuppliersInvoicesPerMonth=Supplier invoices per month
-# BoxCustomersOrdersPerMonth=Customer orders per month
-# BoxSuppliersOrdersPerMonth=Supplier orders per month
-# BoxProposalsPerMonth=Proposals per month
-# NoTooLowStockProducts=No product under the low stock limit
-# BoxProductDistribution=Products/Services distribution
-# BoxProductDistributionFor=Distribution of %s for %s
+NoRecordedInterventions=No recorded interventions
+BoxLatestSupplierOrders=Latest supplier orders
+BoxTitleLatestSupplierOrders=Last %s supplier orders
+BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
+NoSupplierOrder=No recorded supplier order
+BoxCustomersInvoicesPerMonth=Customer invoices per month
+BoxSuppliersInvoicesPerMonth=Supplier invoices per month
+BoxCustomersOrdersPerMonth=Customer orders per month
+BoxSuppliersOrdersPerMonth=Supplier orders per month
+BoxProposalsPerMonth=Proposals per month
+NoTooLowStockProducts=No product under the low stock limit
+BoxProductDistribution=Products/Services distribution
+BoxProductDistributionFor=Distribution of %s for %s
 ForCustomersInvoices=Kundernes fakturaer
-# ForCustomersOrders=Customers orders
+ForCustomersOrders=Customers orders
 ForProposals=Forslag
+LastXMonthRolling=The last %s month rolling

+ 5 - 2
htdocs/langs/da_DK/errors.lang

@@ -159,14 +159,17 @@ ErrorPriceExpression22=Negative result '%s'
 ErrorPriceExpressionInternal=Internal error '%s'
 ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
 ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
 ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
 ErrorGlobalVariableUpdater2=Missing parameter '%s'
 ErrorGlobalVariableUpdater3=The requested data was not found in result
 ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined

+ 1 - 1
htdocs/langs/da_DK/interventions.lang

@@ -50,4 +50,4 @@ ArcticNumRefModelError=Det lykkedes ikke at aktivere
 PacificNumRefModelDesc1=Retur numero med format %syymm-nnnn hvor ÅÅ er årstal, MM er måneden og nnnn er en sekvens uden pause, og ikke vende tilbage til 0
 PacificNumRefModelError=En intervention kortet begynder med $ syymm allerede eksisterer og er ikke kompatible med denne model af sekvensinformation. Fjern den eller omdøbe den til at aktivere dette modul.
 PrintProductsOnFichinter=Print products on intervention card
-PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinterDetails=interventions generated from orders

+ 7 - 0
htdocs/langs/da_DK/main.lang

@@ -220,6 +220,7 @@ Next=Næste
 Cards=Postkort
 Card=Kort
 Now=Nu
+HourStart=Start hour
 Date=Dato
 DateAndHour=Date and hour
 DateStart=Dato start
@@ -242,6 +243,8 @@ DatePlanShort=Dato høvlet
 DateRealShort=Dato reel.
 DateBuild=Rapport bygge dato
 DatePayment=Dato for betaling
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
 DurationYear=år
 DurationMonth=måned
 DurationWeek=uge
@@ -408,6 +411,8 @@ OtherInformations=Andre informationer
 Quantity=Mængde
 Qty=Qty
 ChangedBy=Ændret ved
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
 ReCalculate=Genberegn
 ResultOk=Succes
 ResultKo=Fejl
@@ -696,6 +701,8 @@ SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
+Deny=Deny
+Denied=Denied
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag

+ 3 - 1
htdocs/langs/da_DK/orders.lang

@@ -79,7 +79,9 @@ NoOpenedOrders=Nr. åbnet ordrer
 NoOtherOpenedOrders=Ingen andre åbnet ordrer
 NoDraftOrders=No draft orders
 OtherOrders=Andre kendelser
-LastOrders=Seneste %s ordrer
+LastOrders=Last %s customer orders
+LastCustomerOrders=Last %s customer orders
+LastSupplierOrders=Last %s supplier orders
 LastModifiedOrders=Seneste %s modificerede ordrer
 LastClosedOrders=Seneste %s lukkede ordrer
 AllOrders=Alle ordrer

+ 1 - 0
htdocs/langs/da_DK/other.lang

@@ -203,6 +203,7 @@ NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
 
 ##### Calendar common #####
 AddCalendarEntry=Tilføj post i kalenderen %s

+ 11 - 10
htdocs/langs/da_DK/productbatch.lang

@@ -1,21 +1,22 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use batch/serial number
-ProductStatusOnBatch=Yes (Batch/serial required)
-ProductStatusNotOnBatch=No (Batch/serial not used)
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
 ProductStatusOnBatchShort=Yes
 ProductStatusNotOnBatchShort=No
-Batch=Batch/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Batch number
-batch_number=Batch/Serial number
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
 l_eatby=Eat-by date
 l_sellby=Sell-by date
-DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Batch: %s
+DetailBatchNumber=Lot/Serial details
+DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+printBatch=Lot/Serial: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
-WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use batch/serial number

+ 1 - 0
htdocs/langs/da_DK/projects.lang

@@ -14,6 +14,7 @@ MyTasksDesc=Dette synspunkt er begrænset til projekter eller opgaver, du er en
 OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
 TasksPublicDesc=Dette synspunkt præsenterer alle projekter og opgaver, som du får lov til at læse.
 TasksDesc=Dette synspunkt præsenterer alle projekter og opgaver (din brugertilladelser give dig tilladelse til at se alt).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
 ProjectsArea=Projekter område
 NewProject=Nyt projekt
 AddProject=Create project

+ 6 - 1
htdocs/langs/da_DK/stocks.lang

@@ -16,6 +16,7 @@ CancelSending=Annuller afsendelse
 DeleteSending=Slet afsendelse
 Stock=Stock
 Stocks=Lagre
+StocksByLotSerial=Stock by lot/serial
 Movement=Bevægelighed
 Movements=Bevægelser
 ErrorWarehouseRefRequired=Warehouse reference navn er påkrævet
@@ -78,6 +79,7 @@ IdWarehouse=Id lager
 DescWareHouse=Beskrivelse lager
 LieuWareHouse=Lokalisering lager
 WarehousesAndProducts=Lager og produkter
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Gennemsnitlig input pris
 AverageUnitPricePMP=Gennemsnitlig input pris
 SellPriceMin=Salgsenhed Pris
@@ -131,4 +133,7 @@ IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock content correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).

+ 1 - 1
htdocs/langs/da_DK/suppliers.lang

@@ -43,4 +43,4 @@ ListOfSupplierOrders=Liste over leverandør ordrer
 MenuOrdersSupplierToBill=Leverandør ordrer der kan faktureres
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
-UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
+UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)

+ 0 - 24
htdocs/langs/da_DK/trips.lang

@@ -69,11 +69,9 @@ MOTIF_CANCEL=Reason
 DATE_REFUS=Deny date
 DATE_SAVE=Validation date
 DATE_VALIDE=Validation date
-DateApprove=Approving date
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Payment date
 
-Deny=Deny
 TO_PAID=Pay
 BROUILLONNER=Reopen
 SendToValid=Sent to approve
@@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta
 SaveTrip=Validate expense report
 ConfirmSaveTrip=Are you sure you want to validate this expense report ?
 
-Synchro_Compta=NDF <-> Compte
-
-TripSynch=Synchronisation : Notes de frais <-> Compte courant
-TripToSynch=Notes de frais à intégrer dans la compta
-AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
-ViewAccountSynch=Voir le compte
-
-ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
-ndfToAccount=Note de frais - Intégration
-
-ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
-AccountToNdf=Note de frais - Retrait
-
-LINE_NOT_ADDED=Ligne non ajoutée :
-NO_PROJECT=Aucun projet sélectionné.
-NO_DATE=Aucune date sélectionnée.
-NO_PRICE=Aucun prix indiqué.
-
-TripForValid=à Valider
-TripForPaid=à Payer
-TripPaid=Payée
-
 NoTripsToExportCSV=No expense report to export for this period.

+ 0 - 1
htdocs/langs/de_AT/products.lang

@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Artikel Nr.
-ProductLabel=Produktbezeichnung
 ProductAccountancyBuyCode=Kontierungsschlüssel (Einkauf)
 ProductAccountancySellCode=Kontierungsschlüssel (verkaufen)
 OnSell=Verfügbar

+ 6 - 6
htdocs/langs/de_DE/accountancy.lang

@@ -19,7 +19,7 @@ OptionsDeactivatedForThisExportModel=Für dieses Exportierungsmodell, sind die E
 Selectmodelcsv=Wählen Sie ein Exportmodell
 Modelcsv_normal=Klassischer Export
 Modelcsv_CEGID=Export zu CEGID Expert
-BackToChartofaccounts=Return chart of accounts
+BackToChartofaccounts=Zurück zum  Kontenplan
 Back=Rückkehr 
 
 Definechartofaccounts=Kontenplan definieren
@@ -52,7 +52,7 @@ AccountingVentilationSupplier=Abbau von Buchhaltungs-Lieferanten
 AccountingVentilationCustomer=Abbau von Buchhaltungs-Kunden
 Line=Zeile
 
-CAHTF=Total purchase supplier HT
+CAHTF=Summe Lieferantenbestellungen netto
 InvoiceLines=Rechnungszeile bereinigen
 InvoiceLinesDone=Bereinigte Rechnungszeilen
 IntoAccount=Im Buchhaltungs-Konto
@@ -75,7 +75,7 @@ ACCOUNTING_LIST_SORT_VENTILATION_TODO=Beginnen Sie die Sortierung der Abbau Seit
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Beginnen Sie die Sortierung der Abbau Seiten "Abbau" durch die aktuellen Elemente
 
 AccountLength=Länge der in Dolibarr gezeigten Rechnungskonten
-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.
+AccountLengthDesc=Funktion ermöglicht, eine Länge von Rechnungslegungs Konto indem Räume, die durch den Nullwert vorzutäuschen. Diese Funktion berührt nur die Anzeige, ist es nicht die in Dolibarr registriert Rechnungswesen Konten ändern. Für den Export ist diese Funktion erforderlich, bei bestimmten Software-kompatibel zu sein.
 ACCOUNTING_LENGTH_GACCOUNT=Länge der Finanzbuchführung
 ACCOUNTING_LENGTH_AACCOUNT=Länge der Partner
 
@@ -91,8 +91,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Konto der Warte
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Buchhaltungskonto standardmäßig für die gekauften Produkte (wenn nicht im Produktblatt definiert)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Buchhaltungskonto standardmäßig für die verkauften Produkte (wenn nicht im Produktblatt definiert)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Buchhaltungskonto standardmäßig für die gekauften Dienstleistungen (wenn nicht im Produktblatt definiert)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Buchhaltungskonto standardmäßig für die verkauften Dienstleistungen (wenn nicht im Produktblatt definiert)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Buchhaltungskonto standardmäßig für die gekauften Leistungen (wenn nicht im Produktblatt definiert)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Buchhaltungskonto standardmäßig für die verkauften Leistungen (wenn nicht im Produktblatt definiert)
 
 Doctype=Dokumententyp
 Docdate=Datum
@@ -103,7 +103,7 @@ Labelcompte=Label-Account
 Debit=Soll
 Credit=Haben
 Amount=Betrag
-Sens=Sens
+Sens=Zweck
 Codejournal=Journal
 
 DelBookKeeping=Löschen Sie die Einträge des Hauptbuchs

+ 139 - 133
htdocs/langs/de_DE/admin.lang

@@ -8,11 +8,11 @@ VersionExperimental=Experimentell
 VersionDevelopment=Entwicklung
 VersionUnknown=Unbekannt
 VersionRecommanded=Empfohlene
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheck=Datei Integrität
+FilesMissing=Fehlende Dateien
+FilesUpdated=Dateien ersetzt
+FileCheckDolibarr=Überprüfe Integrität von Dolibarr Dateien
+XmlNotFound=XML-Datei  Integrität von Dolibarr nicht gefunden
 SessionId=Sitzungs ID
 SessionSaveHandler=Handler für Sitzungsspeicherung
 SessionSavePath=Pfad für Sitzungsdatenspeicherung
@@ -96,8 +96,8 @@ AntiVirusCommandExample= Beispiel für ClamWin: c:\\Program Files (x86)\\ClamWin
 AntiVirusParam= Weitere Parameter auf der Kommandozeile
 AntiVirusParamExample= Beispiel für ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Buchhaltungsmoduls-Einstellungen
-UserSetup=Benutzerverwaltungs-Einstellunen
-MenuSetup=Menüverwaltungs-Einstellungen
+UserSetup=Benutzerverwaltung Einstellungen
+MenuSetup=Menüverwaltung Einstellungen
 MenuLimits=Grenzwerte und Genauigkeit
 MenuIdParent=Eltern-Menü-ID
 DetailMenuIdParent=ID des übergeordneten Menüs (0 für einen Eltern-Menü)
@@ -227,7 +227,7 @@ AutomaticIfJavascriptDisabled=Bei deaktiviertem JavaScript automatisch
 AvailableOnlyIfJavascriptNotDisabled=Nur bei aktiviertem JavaScript verfügbar
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Nur bei aktiviertem JavaScript und AJAX verfügbar
 Required=Erforderlich
-UsedOnlyWithTypeOption=Used by some agenda option only
+UsedOnlyWithTypeOption=verwendet nur von einigen Agenda-Optionen
 Security=Sicherheit
 Passwords=Passwörter
 DoNotStoreClearPassword=Passwörter in der Datenbank nicht im Klartext speichern (Empfohlene Einstellung)
@@ -297,9 +297,10 @@ MenuHandlers=Menü-Handler
 MenuAdmin=Menü-Editor
 DoNotUseInProduction=Nicht in Produktion nutzen
 ThisIsProcessToFollow=So führen Sie die Installation/Aktualisierung des Systems durch:
+ThisIsAlternativeProcessToFollow=Dies ist ein alternativer Setup-Prozess:
 StepNb=Schritt %s
 FindPackageFromWebSite=Finden Sie ein Paket, das die gewünschten Funktionen beinhaltet (zum Beispiel auf der offiziellen Website %s).
-DownloadPackageFromWebSite=Download package %s.
+DownloadPackageFromWebSite=Herunterladen des Installationspakets von der Website %s
 UnpackPackageInDolibarrRoot=Entpacken des Pakets in den Stammordner der Systeminstallation <b>%s</b>
 SetupIsReadyForUse=Die Installation ist abgeschlossen und das System zur Verwendung der neuen Komponente bereit.
 NotExistsDirect=Kein alternatives Stammverzeichnis definiert.<br>
@@ -309,9 +310,9 @@ YouCanSubmitFile=Modul wählen:
 CurrentVersion=Aktuelle dolibarr-Version
 CallUpdatePage=Zur Aktualisierung der Daten und Datenbankstrukturen gehen Sie zur Seite %s.
 LastStableVersion=Letzte stabile Version
-UpdateServerOffline=Update server offline
+UpdateServerOffline=Update-Server offline
 GenericMaskCodes=Sie können ein beliebiges Numerierungsschema wählen. Dieses Schema könnte z.B. so aussehen:<br><b>{000000}</b> steht für eine 6-stellige Nummer, die sich bei jedem neuen %s automatisch erhöht. Wählen Sie die Anzahl der Nullen je nach gewünschter Nummernlänge. Der Zähler füllt sich automatisch bis zum linken Ende mit Nullen um das gewünschte Format abzubilden. <br><b>{000000+000}</b> führt zu einem ähnlichen Ergebnis, allerdings mit einem Wertsprung in Höhe des Werts rechts des Pluszeichens, der beim ersten %s angewandt wird. <br><b>{000000@x}</b> wie zuvor, jedoch stellt sich der Zähler bei Erreichen des Monats x (zwischen 1 und 12) automatisch auf 0 zurück. Ist diese Option gewählt und x hat den Wert 2 oder höher, ist die Folge {mm}{yy} or {mm}{yyyy} ebenfalls erfoderlich. <br><b>{dd}</b> Tag (01 bis 31).<br><b>{mm}</b> Monat (01 bis 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> Jahreszahl 1-, 2- oder 4-stellig. <br>
-GenericMaskCodes2=<b>{cccc}</b> 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>  den Kunden-Code mit n Zeichen<br><b>{cccc000}</b> den Kunden-Code mit n Zeichen, gefolgt von einer Client-Zähler zugeordnet zu dem Kunden. <br><b>{tttt}</b> Die Partner ID mit n Zeichen (siehe Wörterbuch Partner Typen).<br>
 GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben. <br> Leerzeichen sind nicht zulässig. <br>
 GenericMaskCodes4a=<u>Beispiel auf der 99. %s des Dritten thecompany Geschehen 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Beispiel für Dritte erstellt am 2007-03-01:</u> <br>
@@ -371,7 +372,7 @@ GetSecuredUrl=Holen der berechneten URL
 ButtonHideUnauthorized=Unterdrücke Schaltflächen bei unerlaubtem Zugriff statt sie zu deaktivieren
 OldVATRates=Alter MwSt. Satz
 NewVATRates=Neuer MwSt. Satz
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
+PriceBaseTypeToChange=Ändern Sie den Basispreis definierte nach
 MassConvert=Starte Massenkonvertierung
 String=Zeichenkette
 TextLong=Langer Text
@@ -388,16 +389,16 @@ ExtrafieldSelectList = Wähle von Tabelle
 ExtrafieldSeparator=Trennzeichen
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
+ExtrafieldCheckBoxFromList= Checkbox von Tabelle
+ExtrafieldLink=Verknüpftes Objekt
 ExtrafieldParamHelpselect=Parameterlisten müssen das Format Schlüssel,Wert haben<br><br> zum Beispiel:<br>1,Wert1<br>2,Wert2<br>3,Wert3<br>...<br><br>Um die Liste in Abhängigkeit zu einer anderen zu haben:<br>1,Wert1|parent_list_code:parent_key<br>2,Wert2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameterlisten müssen das Format Schlüssel,Wert haben<br><br> zum Beispiel:<br>1,Wert1<br>2,Wert2<br>3,Wert3<br>...
 ExtrafieldParamHelpradio=Parameterlisten müssen das Format Schlüssel,Wert haben<br><br> zum Beispiel:<br>1,Wert1<br>2,Wert2<br>3,Wert3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameter-Liste stammt aus einer Tabelle<br>Syntax : \ntable_name:label_field:id_field::filter<br>Beispiel :\nc_typent:libelle:id::filter<br><br> \nFilter kann ein einfacher Test (z.B. aktiv = 1) angezeigt werden nur aktiv, Wert <br> wenn Sie auf extrafields filtern möchten verwenden syntaxt extra.fieldcode = ... (wo Feld-Code ist der Code, der extrafield) <br><br> Um die Liste haben, je nach dem anderen : \n<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Verwendete Bibliothek zur PDF-Erzeugung
 WarningUsingFPDF=Achtung: Ihre <b>conf.php</b> enthält <b>$dolibarr_pdf_force_fpdf=1</b> Dies bedeutet, dass Sie die FPDF-Bibliothek verwenden, um PDF-Dateien zu erzeugen. Diese Bibliothek ist alt und unterstützt viele Funktionen nicht (Unicode-, Bild-Transparenz, kyrillische, arabische und asiatische Sprachen, ...), so dass es zu Fehlern bei der PDF-Erstellung kommen kann. <br> Um dieses Problem zu beheben und volle Unterstützung der PDF-Erzeugung zu erhalten, laden Sie bitte die <a href="http://www.tcpdf.org/" target="_blank">TCPDF Bibliothek</a> , dann kommentieren Sie die Zeile <b>$dolibarr_pdf_force_fpdf=1</b> aus oder entfernen diese und fügen statt dessen <b>$dolibarr_lib_TCPDF_PATH='Pfad_zum_TCPDF_Verzeichnisr'</b> ein
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (vat is not applied on local tax)<br>2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)<br>3 : local tax apply on products without vat (vat is not applied on local tax)<br>4 : local tax apply on products before vat (vat is calculated on amount + localtax)<br>5 : local tax apply on services without vat (vat is not applied on local tax)<br>6 : local tax apply on services before vat (vat is calculated on amount + localtax)
+LocalTaxDesc=In einigen Ländern gelten 2 oder 3 Steuern auf jede Rechnungszeile. Wenn dies der Fall ist, wählen Sie Typ für die zweite und dritte Steuer und seine Geschwindigkeit. Mögliche Art sind: <br> 1: Ortstaxe gelten über Produkte und Dienstleistungen, ohne Mehrwertsteuer (MwSt nicht der örtlichen Steuer angewendet) <br> 2: Ortstaxe gelten für Produkte und Dienstleistungen vor Mehrwertsteuer (MwSt auf Höhe + localtax berechnet) <br> 3: Ortstaxe gelten für Produkte ohne Mehrwertsteuer (MwSt nicht der örtlichen Steuer angewendet) <br> 4: Ortstaxe gelten für Erzeugnisse, bevor Mehrwertsteuer (MwSt auf Höhe + localtax berechnet) <br> 5: Ortstaxe gelten für Dienstleistungen, ohne Mehrwertsteuer (MwSt nicht der örtlichen Steuer angewendet) <br> 6: Ortstaxe gelten für Dienstleistungen vor Mehrwertsteuer (MwSt auf Höhe + localtax berechnet)
 SMS=SMS
 LinkToTestClickToDial=Geben Sie die anzurufende Telefonnr ein, um einen Link zu zeigen, mit dem die ClickToDial-URL für den Benutzer <strong>%s</strong> getestet werden kann
 RefreshPhoneLink=Aktualisierungslink
@@ -449,14 +450,14 @@ Module52Name=Produktbestände
 Module52Desc=Produktbestandsverwaltung
 Module53Name=Leistungen
 Module53Desc=Leistungs-Verwaltung
-Module54Name=Kontrakte/Abonnements
-Module54Desc=Kontraktverwaltung (Dienstleistungen oder sich wiederholende Abos)
+Module54Name=Verträge/Abonnements
+Module54Desc=Vertragsverwaltung (Services oder sich wiederholende Abos)
 Module55Name=Barcodes
 Module55Desc=Barcode-Verwaltung
 Module56Name=Telefonie
 Module56Desc=Telefonie-Integration
 Module57Name=Daueraufträge
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Desc=Daueraufträge und Entzugsmanagement. Hierzu gehört auch Generation von SEPA-Datei für europäische Länder.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial-Integration
 Module59Name=Bookmark4u
@@ -465,8 +466,8 @@ Module70Name=Service
 Module70Desc=Serviceverwaltung
 Module75Name=Reise- und Fahrtspesen
 Module75Desc=Reise- und Fahrtspesenverwaltung
-Module80Name=Sendungen
-Module80Desc=Sendungs-u und Lieferscheinverwaltung
+Module80Name=Lieferungen
+Module80Desc=Versand und Lieferauftragsverwaltung
 Module85Name=Banken und Geld
 Module85Desc=Verwaltung von Bank- oder Bargeldkonten
 Module100Name=Externe Website
@@ -487,45 +488,45 @@ Module320Name=RSS-Feed
 Module320Desc=RSS-Feed-Bildschirm innerhalb des Systems anzeigen
 Module330Name=Lesezeichen
 Module330Desc=Lesezeichenverwaltung
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module400Name=Projekte / Chancen / Leads
+Module400Desc=Projektmanagement, Aufträge oder Leads. Anschließend können Sie ein beliebiges Element (Rechnung, Bestellung, Angebot, Intervention, ...) einem Projekt zuordnen und eine Queransicht von der Projektanzeige bekommen.
 Module410Name=Webkalender
 Module410Desc=Webkalenderintegration
 Module500Name=Sonderausgaben (Steuern, Sozialbeiträge und Dividenden)
 Module500Desc=Steuer-, Sozialbeitrags-, Dividenden- und Lohnverwaltung
 Module510Name=Löhne
 Module510Desc=Verwaltung der Angestellten-Gehälter und -Zahlungen
-Module520Name=Loan
-Module520Desc=Management of loans
+Module520Name=Darlehen
+Module520Desc=Verwaltung von Darlehen
 Module600Name=Benachrichtigungen
 Module600Desc=Senden Sie Benachrichtigungen zu einigen Dolibarr-Events per E-Mail an Partner (wird pro Partner definiert)
 Module700Name=Spenden
 Module700Desc=Spendenverwaltung
-Module770Name=Expense Report
+Module770Name=Spesenabrechnung
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Lieferant-Angebote
+Module1120Desc=Anfordern von Lieferanten-Angeboten und Preise
 Module1200Name=Mantis
 Module1200Desc=Mantis-Integation
 Module1400Name=Buchhaltung
 Module1400Desc=Buchhaltung für Experten (doppelte Buchhaltung)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1520Name=Dokumente erstellen
+Module1520Desc= Mailings Dokumente erstellen
+Module1780Name=Kategorien
+Module1780Desc=Kategorien erstellen (Produkte, Kunden, Lieferanten, Kontakte oder Mitglieder)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG-Editor
 Module2200Name=Dynamische Preise
 Module2200Desc=Mathematische Ausdrücke für Preise aktivieren
 Module2300Name=Cron
-Module2300Desc=Scheduled job management
+Module2300Desc=CronJob Verwaltung
 Module2400Name=Agenda
 Module2400Desc=Maßnahmen/Aufgaben und Agendaverwaltung
 Module2500Name=Inhaltsverwaltung(ECM)
 Module2500Desc=Speicherung und Verteilung von Dokumenten
 Module2600Name=WebServices
 Module2600Desc=Aktivieren Sie Verwendung von Webservices
-Module2650Name=WebServices (client)
+Module2650Name=WebServices (Client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Verwenden Sie den online Gravatar-Dienst (www.gravatar.com) für die Anzeige von Benutzer- und Mitgliederbildern (Zuordnung über E-Mail-Adressen). Hierfür benötigen Sie eine aktive Internetverbindung
@@ -540,8 +541,8 @@ Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module20000Name=Urlaubsantrags-Verwaltung
 Module20000Desc=Definieren und beobachten sie die Urlaubsanträge Ihrer Angestellten.
-Module39000Name=Produktstapel
-Module39000Desc=Chargen- oder Serien-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum auf Produkten
+Module39000Name=Produkt Menge
+Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Über dieses Modul können Sie online Kreditkartenzahlungen entgegennehmen
 Module50100Name=Kasse
@@ -552,14 +553,12 @@ Module50400Name=Buchhaltung (erweitert)
 Module50400Desc=Buchhaltung für Experten (doppelte Buchhaltung)
 Module54000Name=PrintIPP
 Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP (Drucker muss vom Server aus sichtbar sein und auf dem Server muss CUPS installiert sein)
-Module55000Name=Open Poll
+Module55000Name=Offene Umfrage
 Module55000Desc=Modul um online Umfragen zu starten. (Wie Doodle, Studs, Rdvz,...)
 Module59000Name=Gewinnspannen
 Module59000Desc=Modul zur Verwaltung von Gewinnspannen
 Module60000Name=Kommissionen
 Module60000Desc=Modul zur Verwaltung von Kommissionen
-Module150010Name=Batch-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum
-Module150010Desc=Verwaltung von Batch-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum für Produkte
 Permission11=Rechnungen einsehen
 Permission12=Rechnungen erstellen/bearbeiten
 Permission13=Rechnungsfreigabe aufheben
@@ -571,8 +570,8 @@ Permission21=Angebote einsehen
 Permission22=Angebote erstellen/bearbeiten
 Permission24=Angebote freigeben
 Permission25=Angeobte per E-Mail versenden
-Permission26=Angebot schließen
-Permission27=Angeobte löschen
+Permission26=Angebote schließen
+Permission27=Angebote löschen
 Permission28=Angebote exportieren
 Permission31=Produkte/Leistungen einsehen
 Permission32=Produkte/Leistungen erstellen/bearbeiten
@@ -582,9 +581,9 @@ Permission38=Produkte exportieren
 Permission41=Projekte/Aufgaben einsehen
 Permission42=Projekte/Aufgaben erstellen/bearbeiten (Meine)
 Permission44=Projekte löschen
-Permission61=Service ansehen
-Permission62=Service erstellen/bearbeiten
-Permission64=Service löschen
+Permission61=Leistungen ansehen
+Permission62=Leistungen erstellen/bearbeiten
+Permission64=Leistungen löschen
 Permission67=Service exportieren
 Permission71=Mitglieder einsehen
 Permission72=Mitglieder erstellen/bearbeiten
@@ -604,12 +603,12 @@ Permission91=Steuern/Sozialbeiträge einsehen
 Permission92=Steuern/Sozialbeiträge erstellen/bearbeiten
 Permission93=Steuern/Sozialbeiträge löschen
 Permission94=Sozialbeiträge exportieren
-Permission95=Berichte einsehen
-Permission101=Sendungen einsehen
-Permission102=Sendungen erstellen/bearbeiten
-Permission104=Sendungen freigeben
-Permission106=Sendungen exportieren
-Permission109=Sendungen löschen
+Permission95=Buchhaltung einsehen
+Permission101=Auslieferungen einsehen
+Permission102=Auslieferungen erstellen/bearbeiten
+Permission104=Auslieferungen freigeben
+Permission106=Auslieferungen exportieren
+Permission109=Auslieferungen löschen
 Permission111=Finanzkonten einsehen
 Permission112=Transaktionen anlegen/ändern/löschen und vergleichen
 Permission113=Einstellungen Finanzkonten (erstellen, Kategorien verwalten)
@@ -623,18 +622,18 @@ Permission125=Mit Benutzer verbundene Partner löschen
 Permission126=Partner exportieren
 Permission141=Aufgaben einsehen
 Permission142=Aufgaben erstellen/bearbeiten
-Permission144=Aufgaben löschen
+Permission144=Löschen aller Projekte und Aufgaben (einschließlich privater auch nicht in Verbindung treten)
 Permission146=Lieferanten einsehen
 Permission147=Statistiken einsehen
 Permission151=Daueraufträge einsehen
 Permission152=Dauerauftragsanträge erstellen/bearbeiten
 Permission153=Dauerauftragsbelege übertragen
 Permission154=Dauerauftragsbelege kreditieren/ablehnen
-Permission161=Kontrakte/Abonnements einsehen
-Permission162=Kontrakte/Abonnements erstellen/bearbeiten
-Permission163=Dienstleistungen/Abonnements in einem Vertrag aktivieren
-Permission164=Dienstleistungen/Abonnements in einem Vertrag deaktivieren
-Permission165=Kontrakt/Abonnement löschen
+Permission161=Verträge/Abonnements einsehen
+Permission162=Verträge/Abonnements erstellen/bearbeiten
+Permission163=Service/Abonnement in einem Vertrag aktivieren
+Permission164=Service/Abonnement in einem Vertrag deaktivieren
+Permission165=Verträge/Abonnement löschen
 Permission171=Reisen und Spesen einsehen (eigene und Untergebene)
 Permission172=Reisen und Spesen erstellen/ändern
 Permission173=Reisen und Spesen löschen
@@ -645,7 +644,7 @@ Permission181=Lieferantenbestellungen einsehen
 Permission182=Lieferantenbestellungen erstellen/bearbeiten
 Permission183=Lieferantenbestellungen freigeben
 Permission184=Lieferantenbestellungen bestätigen
-Permission185=Order or cancel supplier orders
+Permission185=Bestellung oder Lieferantenbestellungen verwerfen
 Permission186=Lieferantenbestellungen empfangen
 Permission187=Lieferantenbestellungen schließen
 Permission188=Lieferantenbestellungen verwerfen
@@ -653,12 +652,12 @@ Permission192=Leitungen erstellen
 Permission193=Leitungen abbrechen
 Permission194=Read the bandwith lines
 Permission202=ADSL Verbindungen erstellen
-Permission203=Order connections orders
-Permission204=Order connections
+Permission203=Bestellungsverbindungen Bestellungen
+Permission204=Bestell-Verbindungen
 Permission205=Verbindungen verwalten
 Permission206=Verbindungen lesen
 Permission211=Telefonie lesen
-Permission212=Order lines
+Permission212=Auftragszeilen
 Permission213=Leitung aktivieren
 Permission214=Telefonie einrichten
 Permission215=Anbieter einrichten
@@ -683,8 +682,8 @@ Permission255=Andere Passwörter ändern
 Permission256=Andere Benutzer löschen oder deaktivieren
 Permission262=Zugang auf alle Partner erweitern (nicht nur diejenigen im Zusammenhang mit Benutzer). Nicht wirksam für externe Nutzer (immer auf sich selbst beschränkt).
 Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
+Permission272=Rechnungen anzeigen
+Permission273=Ausgabe Rechnungen
 Permission281=Kontakte einsehen
 Permission282=Kontakte erstellen/bearbeiten
 Permission283=Kontakte löschen
@@ -717,11 +716,11 @@ Permission510=Löhne einsehen
 Permission512=Löhne erstellen/bearbeiten
 Permission514=Löhne löschen
 Permission517=Löhne exportieren
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
+Permission520=Darlehen einsehen
+Permission522=Darlehen erstellen/bearbeiten
+Permission524=Lösche Darlehen
+Permission525=Darlehens-rechner
+Permission527=Exportiere Darlehen
 Permission531=Leistungen einsehen
 Permission532=Leistungen erstellen/bearbeiten
 Permission534=Leistungen löschen
@@ -730,13 +729,13 @@ Permission538=Leistungen exportieren
 Permission701=Spenden einsehen
 Permission702=Spenden erstellen/bearbeiten
 Permission703=Spenden löschen
-Permission771=Read expense reports (own and his subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission771=Spesenabrechnungen lesen (eigene und die der Untergebenen)
+Permission772=Spesenabrechnung erstellen/ändern
+Permission773=Spesenabrechnung löschen
+Permission774=Spesenabrechnungen lesen (Alle Benutzer auch nicht Untergebene)
+Permission775=Spesenabrechnung genehmigen
+Permission776=Spesenabrechnung bezahlen
+Permission779=Spesenabrechnung exportieren
 Permission1001=Warenbestände einsehen
 Permission1002=Warenlager erstellen/ändern
 Permission1003=Warenlager löschen
@@ -754,7 +753,7 @@ Permission1185=Lieferantenbestellungen bestätigen
 Permission1186=Lieferantenbestellungen übermitteln
 Permission1187=Eingang von Lieferantenbestellungen bestätigen
 Permission1188=Lieferantenbestellungen schließen
-Permission1190=Approve (second approval) supplier orders
+Permission1190=Lieferantenbestellungen bestätigen (zweite Bestätigung)
 Permission1201=Exportresultate einsehen
 Permission1202=Export erstellen/bearbeiten
 Permission1231=Lieferantenrechnungen einsehen
@@ -767,10 +766,10 @@ Permission1237=Lieferantenbestellungen mit Details exportieren
 Permission1251=Massenimports von externen Daten ausführen (data load)
 Permission1321=Kundenrechnungen, -attribute und -zahlungen exportieren
 Permission1421=Kundenbestellungen und Attribute exportieren
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
+Permission23001=anzeigen cronjobs
+Permission23002=erstellen/ändern cronjobs
+Permission23003=cronjobs löschen
+Permission23004=cronjobs ausführen
 Permission2401=Maßnahmen (Termine/Aufgaben) in Verbindung mit eigenem Konto einsehen
 Permission2402=Maßnahmen (Termine/Aufgaben) in Verbindung mit eigenem Konto erstellen/bearbeiten
 Permission2403=Maßnahmen (Termine/Aufgaben) in Verbindung mit eigenem Konto löschen
@@ -791,7 +790,7 @@ Permission55001=Abstimmungen einsehen
 Permission55002=Abstimmung erstellen/ändern
 Permission59001=Margen einsehen
 Permission59002=Margen definieren
-Permission59003=Read every user margin
+Permission59003=Lesen aller Benutzer Margen
 DictionaryCompanyType=Partnertyp
 DictionaryCompanyJuridicalType=Gesellschaftsformen von Drittanbietern
 DictionaryProspectLevel=Geschäftsaussicht
@@ -809,7 +808,7 @@ DictionaryPaymentModes=Zahlungsarten
 DictionaryTypeContact=Kontaktarten
 DictionaryEcotaxe=Ökosteuern (WEEE)
 DictionaryPaperFormat=Papierformate
-DictionaryFees=Gebührenarten
+DictionaryFees=Spesen- und Kostenarten
 DictionarySendingMethods=Versandarten
 DictionaryStaff=Mitarbeiter
 DictionaryAvailability=Lieferverzug
@@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= Die RE Rate standardmäßig beim Erstellen Aussichten, Re
 LocalTax2IsNotUsedDescES= Standardmäßig werden die vorgeschlagenen IRPF 0 ist. Ende der Regel.
 LocalTax2IsUsedExampleES= In Spanien, Freiberufler und unabhängigen Fachleuten, die ihre Dienstleistungen und Unternehmen, die das Steuersystem von Modulen gewählt haben.
 LocalTax2IsNotUsedExampleES= In Spanien sind sie bussines nicht der Steuer unterliegen System von Modulen.
-CalcLocaltax=Berichte
-CalcLocaltax1ES=Verkauf - Einkauf
+CalcLocaltax=Berichte über lokale Steuern
+CalcLocaltax1=Sales - Käufe
 CalcLocaltax1Desc=Lokale Steuer-Reports werden mit der Differenz von lokalen Verkaufs- und Einkaufs-Steuern berechnet
-CalcLocaltax2ES=Einkäufe
+CalcLocaltax2=Einkauf
 CalcLocaltax2Desc=Lokale Steuer-Reports sind die Summe der lokalen Steuern auf Einkäufe
-CalcLocaltax3ES=Verkäufe
+CalcLocaltax3=Verkauf
 CalcLocaltax3Desc=Lokale Steuer-Reports sind die Summe der lokalen Steuern auf Verkäufe
 LabelUsedByDefault=Standardmäßig verwendete Bezeichnung falls keine Übersetzung vorhanden ist
 LabelOnDocuments=Bezeichnung auf Dokumenten
@@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Keine sicherheitsrelevanten Protokollereignisse. Überprü
 NoEventFoundWithCriteria=Kein sicherheitsrelevantes Protokollereignis zu Ihren Suchkriterien gefunden
 SeeLocalSendMailSetup=Lokale sendmail-Einstellungen anzeigen
 BackupDesc=Um eine vollständige Systemsicherung durchzuführen müssen Sie:
-BackupDesc2=* Eine Sicherung des Dokumentenverzeichnisses (<b>%s</b>), das alle hochgeladenen und erzeugte Dateien beinhaltet, erzeugen (z.B. als zip-Archiv).
-BackupDesc3=* Eine Sicherung der Datenbank über Dump-Befehl anlegen. Hierzu steht Ihnen der folgende Assistent zur Verfügung.
+BackupDesc2=Sichern des Dokumenten-Verzeichnis (<b>%s</b>) welches alle hochgeladenen und erzeugt Dateien enthält (Sie können zum Beispiel eine Zip Datei machen).
+BackupDesc3=Sicherung der Datenbank  (<b>%s</b>) über Dump-Befehl anlegen. Dafür können Sie folgende Assistenten verwenden.
 BackupDescX=Bewahren Sie die archivierten Verzeichnisse an einem sicheren Ort auf.
 BackupDescY=Bewahren Sie den Datenbank-Dump an einem sicheren Ort auf.
 BackupPHPWarning=Datensicherung kann mit dieser Methode nicht garantiert werden. Bevorzugen Sie die vorherige.
 RestoreDesc=Um eine Systemsicherung wiederherzustellen, müssen Sie:
-RestoreDesc2=* Eine erstellte Archivdatei (z.B. ein zip-Archiv) Ihres Dokumentenordners in eine neue dolibarr-Installation oder das derzeitige Dokumentenverzeichnis (<b>%s</b>) entpacken
-RestoreDesc3=* Die Datenbanksicherung aus dem Dump in eine neue dolibarr-Installation oder das bestehende System zurückspielen. Achtung: Nach Beendigung dieses Vorganges müssen Sie sich mit dem Benutzernamen/Passwort-Paar zum Zeitpunkt der Sicherung am System anmelden. Zur Wiederherstellung der Datenbank steht Ihnen der folgende Assistent zur Verfügung:
+RestoreDesc2=Wiederherstellung von Archive Datei (zip Datei zum Beispiel)\nvom documents Verzeichnis um den documents Datei-Baum im documents verzeichnis in eine neue Dolibarr Installation oder in ein bestehendes Dolibarr Verzeichnis (<b>%s</b>).
+RestoreDesc3=* Die Datenbanksicherung aus dem Dump in eine neue Dolibarr-Installation oder das bestehende System (<b>%s</b>) zurückspielen. Achtung: Nach Beendigung dieses Vorganges müssen Sie sich mit dem Benutzernamen/Passwort-Paar zum Zeitpunkt der Sicherung am System anmelden. Zur Wiederherstellung der Datenbank steht Ihnen der folgende Assistent zur Verfügung:
 RestoreMySQL=MySQL Import
 ForcedToByAModule= Diese Regel wird <b>%s</b> durch ein aktiviertes Modul aufgezwungen
 PreviousDumpFiles=Vorige Datenbanksicherungen
@@ -1036,7 +1035,7 @@ YourPHPDoesNotHaveSSLSupport=Ihre PHP-Konfiguration unterstützt keine SSL-Versc
 DownloadMoreSkins=Weitere Oberflächen (Skins) herunterladen
 SimpleNumRefModelDesc=Liefere eine Nummer im Format %syymm-nnnn zurück, wobei YY für das Jahr, MM für das Monat und nnnn für eine 4-stellige, nicht unterbrochene Zahlensequenz steht
 ShowProfIdInAddress=Zeige professionnal ID mit Adressen auf Dokumente
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
+ShowVATIntaInAddress=Ausblenden UID Nummer in Adressen auf Dokumenten.
 TranslationUncomplete=Teilweise Übersetzung
 SomeTranslationAreUncomplete=Einige Sprachen könnten nur teilweise oder fehlerhaft übersetzt sein. Wenn Sie Fehler bemerken, können Sie die Sprachdateien verbessern, indem Sie sich bei <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">Transifex</a> regsitrieren.
 MenuUseLayout=Machen Sie vertikales Menü hidable (Option Javascript muss nicht deaktiviert werden)
@@ -1049,15 +1048,15 @@ MAIN_PROXY_HOST=Name / Anschrift des Proxy-Servers
 MAIN_PROXY_PORT=Port of Proxy-Server
 MAIN_PROXY_USER=Passwort an, um den Proxy-Server verwenden
 MAIN_PROXY_PASS=Kennwort ein, um den Proxy-Server verwenden
-DefineHereComplementaryAttributes=Definieren Sie hier allen Attributen, nicht bereits standardmäßig vorhanden, und dass Sie für %s unterstützt werden.
+DefineHereComplementaryAttributes=Definieren Sie hier alle Attribute, die nicht standardmäßig vorhanden sind, und in %s unterstützt werden sollen.
 ExtraFields=Ergänzende Attribute
 ExtraFieldsLines=Ergänzende Attribute (Zeilen)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsSupplierOrdersLines=Ergänzende Attribute (in Bestellungszeile)
+ExtraFieldsSupplierInvoicesLines=Ergänzende Attribute (in Rechnungszeile)
 ExtraFieldsThirdParties=Ergänzende Attribute (Partner)
 ExtraFieldsContacts=Ergänzende Attribute (Kontakt)
 ExtraFieldsMember=Ergänzende Attribute (Mitglied)
-ExtraFieldsMemberType=Complementary attributes (member type)
+ExtraFieldsMemberType=Ergänzende Attribute (Mitglied)
 ExtraFieldsCustomerOrders=Ergänzende Attribute (Bestellungen)
 ExtraFieldsCustomerInvoices=Ergänzende Attribute (Rechnungen)
 ExtraFieldsSupplierOrders=Ergänzende Attribute (Bestellungen)
@@ -1071,7 +1070,7 @@ SendingMailSetup=Einrichten von Sendungen per E-Mail
 SendmailOptionNotComplete=Achtung, auf einigen Linux-Systemen, E-Mails von Ihrem E-Mail zu senden, sendmail Ausführung Setup muss conatins Option-ba (Parameter mail.force_extra_parameters in Ihre php.ini-Datei). Wenn einige Empfänger niemals E-Mails erhalten, versuchen, diese Parameter mit PHP mail.force_extra_parameters =-ba) zu bearbeiten.
 PathToDocuments=Dokumentenpfad
 PathDirectory=Verzeichnispfad
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
+SendmailOptionMayHurtBuggedMTA=Feature-Mails mit der Methode "PHP mail direkt" senden generiert eine Mail-Nachricht, die nicht korrekt möglicherweise von einigen Mail-Servern empfangen analysiert werden. Ergebnis ist, dass manche Mails nicht von Menschen, die von thoose abgehört Plattformen gehostet gelesen werden. Es ist bei einigen Internet-Providern (Ex: Orange in Frankreich). Dies ist nicht ein Problem in Dolibarr noch in PHP aber auf empfangende Mail-Server. Sie können jedoch hinzuzufügen MAIN_FIX_FOR_BUGGED_MTA Option auf 1 in die Setup - andere zu Dolibarr ändern, um dies zu vermeiden. Sie können jedoch Probleme mit anderen Servern, dass die Achtung streng dem SMTP-Standard zu erleben. Die andere Lösung (empfohlen) ist es, die Methode "SMTP-Socket-Bibliothek", die keine Nachteile hat benutzen.
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Wahl der Sprache auf dem Bildschirm sichtbar verändert werden kann: <br> * Weltweit aus dem Menü <strong>Start - Einstellungen - Anzeige</strong> <br> * Für die Benutzer nur von <strong>Benutzer-Registerkarte Anzeige</strong> von Benutzer-Karte (klicken Sie auf Login-Bildschirm auf der Oberseite).
 TotalNumberOfActivatedModules=Summe aktivierter Module: <b>%s</b>
@@ -1083,9 +1082,9 @@ SuhosinSessionEncrypt=Sitzungsspeicher durch Suhosin verschlüsselt
 ConditionIsCurrently=Einstellung ist aktuell %s
 YouUseBestDriver=Sie verwenden den Treiber %s, dies ist derzeit der beste verfügbare.
 YouDoNotUseBestDriver=Sie verwenden Treiber %s, aber der Treiber %s wird empfohlen.
-NbOfProductIsLowerThanNoPb=Sie haben nur %s Produkte/Dienstleistungen in der Datenbank. Daher ist keine bestimmte Optimierung erforderlich.
+NbOfProductIsLowerThanNoPb=Sie haben nur %s Produkte/Leistungen in der Datenbank. Daher ist keine bestimmte Optimierung erforderlich.
 SearchOptim=Such Optimierung
-YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
+YouHaveXProductUseSearchOptim=Sie haben %s Produkte/Leistungen in die Datenbank. Sie sollten die Konstante PRODUCT_DONOTSEARCH_ANYWHERE auf 1 unter in Übersicht-Einstellungen-Andere Einstellungen hinzufügen, wodurch sich das Suchlimit in der Datenbank von  Anfang des Strings möglich gemacht wird,  und der Index verwendet wird, dadurch sollten sie \nsofort Antwort auf Ihre suche bekommen.
 BrowserIsOK=Sie benutzen den Webbrowser %s. Dieser ist hinsichtlich Sicherheit und Leistung ok.
 BrowserIsKO=Sie benutzen den Webbrowser %s. Dieser ist bekannt für Sicherheitsprobleme, schlechte Leistung und Zuverlässigkeit. Wir empfehlen Ihnen, Firefox, Chrome, Opera oder Safari zu nutzen.
 XDebugInstalled=XDebug installiert.
@@ -1116,7 +1115,7 @@ ModuleCompanyCodeAquarium=Generiert einen Kontierungscode %s, gefolgt von der Li
 ModuleCompanyCodePanicum=Generiert einen leeren Kontierungscode.
 ModuleCompanyCodeDigitaria=Kontierungscode hängt vom Partnercode ab. Der Code setzt sich aus dem Buchstaben 'C' und den ersten 5 Stellen des Partnercodes zusammen.
 UseNotifications=Benachrichtigungen verwenden
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
+NotificationsDesc=E-Mail-Benachrichtigungsfunktionen erlauben Ihnen den stillschweigenden Versand automatischer Benachrichtigungen zu einigen Dolibarr-Ereignissen. Ziele dafür können definiert werden:<br>* pro Partner-Kontakt (Kunden oder Lieferanten), ein Partner zur Zeit.<br>* durch das Setzen einer globalen Ziel-Mail-Adresse in den Modul-Einstellungen
 ModelModules=Dokumentvorlagenmodul
 DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt- oder .ods-Dateien für OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Wasserzeichen auf Entwurf
@@ -1159,7 +1158,7 @@ CreditNoteSetup=Gutschriftsmoduleinstellungen
 CreditNotePDFModules=PDF-Gutschriftsvorlagen
 CreditNote=Gutschrift
 CreditNotes=Gutschriften
-ForceInvoiceDate=Sezte Rechnungsdatum zwingend auf Freigabedatum
+ForceInvoiceDate=Rechnungsdatum ist zwingend Freigabedatum
 DisableRepeatable=Wiederholbare Rechnungen deaktivieren
 SuggestedPaymentModesIfNotDefinedInInvoice=Empfohlene Zahlungsart für Rechnung falls nicht in gesondert definiert
 EnableEditDeleteValidInvoice=Aktivieren Sie die Möglichkeit, freigegebene Rechnungen ohne Zahlungseingang zu bearbeiten/löschen
@@ -1182,11 +1181,11 @@ FreeLegalTextOnProposal=Freier Rechtstext für Angebote
 WatermarkOnDraftProposal=Wasserzeichen auf Angebotsentwürfen (keins, falls leer)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
+AskPriceSupplierSetup=Lieferanten Preisauskunft Moduleinstellungen
+AskPriceSupplierNumberingModules=Nummerierungsmodul Preisanfragen Lieferanten 
+AskPriceSupplierPDFModules=Lieferanten Preisauskunft Dokumentvorlagen
+FreeLegalTextOnAskPriceSupplier=Freier Text auf Preisauskunft Lieferanten
+WatermarkOnDraftAskPriceSupplier=Wasserzeichen auf Entwürfen von Lieferanten Preisauskunft (keins, wenn leer)
 BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
 ##### Orders #####
 OrdersSetup=Bestellverwaltungseinstellungen
@@ -1197,7 +1196,7 @@ ValidOrderAfterPropalClosed=Zur Freigabe der Bestellung nach Schließung des Ang
 FreeLegalTextOnOrders=Freier Rechtstext auf Bestellungen
 WatermarkOnDraftOrders=Wasserzeichen auf Entwürfen von Aufträgen (keins, wenn leer)
 ShippableOrderIconInList=In Auftragsliste ein entsprechendes Icon zufügen, wenn die Bestellung versandbereit ist
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Fragen Sie nach der Ziel-Bankverbindung
 ##### Clicktodial #####
 ClickToDialSetup=Click-to-Dial Moduleinstellungen
 ClickToDialUrlDesc=Definieren Sie hier die URL, die bei einem Klick auf das Telefonsymbol aufgerufen werden soll. In dieser URL können Sie Tags verwenden<br><b>%%1$s</b> wird durch die Telefonnummer des Angerufenen ersetzt<br><b>%%2$s</b> wird durch die Telefonnummer des Anrufers (Ihre) ersetzt<br><b>%%3$s</b> wird durch Ihren Benutzernamen für Click-to-Dial ersetzt (siehe Benutzerdatenblatt)<br><b>%%4$s</b> wird durch Ihr Click-to-Dial-Passwort ersetzt (siehe Benutzerdatenblatt).
@@ -1205,12 +1204,12 @@ ClickToDialUrlDesc=Definieren Sie hier die URL, die bei einem Klick auf das Tele
 Bookmark4uSetup=Bookmark4u Moduleinstellungen
 ##### Interventions #####
 InterventionsSetup=Servicemoduleinstellungen
-FreeLegalTextOnInterventions=Freier Rechtstext für Services
+FreeLegalTextOnInterventions=Freier Rechtstext auf Interventions Dokument
 FicheinterNumberingModules=Intervention Nummerierung Module
 TemplatePDFInterventions=Intervention Karte Dokumenten Modelle
 WatermarkOnDraftInterventionCards=Wasserzeichen auf Interventionskarte Dokumente (keins, wenn leer)
 ##### Contracts #####
-ContractsSetup=Kontrakte/Abonnements-Modul Einstellungen
+ContractsSetup=Verträge/Abonnements-Modul Einstellungen
 ContractsNumberingModules=Verträge Nummerierung Module
 TemplatePDFContracts=Vertragsvorlagen
 FreeLegalTextOnContracts=Freier Text auf Verträgen
@@ -1337,6 +1336,8 @@ LDAPFieldCountry=Land
 LDAPFieldCountryExample=Beispiel: land
 LDAPFieldDescription=Beschreibung
 LDAPFieldDescriptionExample=Beispiel : Beschreibung
+LDAPFieldNotePublic=öffentlicher Hinweis
+LDAPFieldNotePublicExample=Beispiel : Beschreibung
 LDAPFieldGroupMembers= Gruppenmitglieder
 LDAPFieldGroupMembersExample= Beispiel: uniqueMember
 LDAPFieldBirthdate=Geburtsdatum
@@ -1360,10 +1361,10 @@ ForANonAnonymousAccess=Für einen authentifizierten Zugang (z.B. für Schreibzug
 PerfDolibarr=Leistungs-Einstellungen/Optimierungsreport
 YouMayFindPerfAdviceHere=Auf dieser Seite finden Sie einige Überprüfungen oder Hinweise zur Leistung.
 NotInstalled=Nicht installiert, Ihr Server wird dadurch nicht verlangsamt.
-ApplicativeCache=Applicative cache
+ApplicativeCache=Applicative Cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled..
 OPCodeCache=OPCode cache
 NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
 HTTPCacheStaticResources=HTTP Cache für statische Ressourcen (CSS, img, Javascript)
@@ -1377,8 +1378,8 @@ CompressionOfResources=Komprimierung von HTTP Antworten
 TestNotPossibleWithCurrentBrowsers=Automatische Erkennung mit den aktuellen Browsern nicht möglich
 ##### Products #####
 ProductSetup=Produktmoduleinstellungen
-ServiceSetup=Dienstleistungen Modul Setup
-ProductServiceSetup=Produkte und Services Module Setup
+ServiceSetup=Leistungen Modul Setup
+ProductServiceSetup=Produkte und Leistungen Module Einstellungen
 NumberOfProductShowInSelect=Max. Anzahl der Produkte in Mehrfachauswahllisten (0=kein Limit)
 ConfirmDeleteProductLineAbility=Bestätigung für die Entfernung von Produktzeilen in Formularen
 ModifyProductDescAbility=Produktbeschreibungen in Formularen individuell anpassbar
@@ -1419,9 +1420,9 @@ BarcodeDescUPC=Barcode vom Typ UPC
 BarcodeDescISBN=Barcode vom Typ ISBN
 BarcodeDescC39=Barcode vom Typ C39
 BarcodeDescC128=Barcode vom Typ C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
+GenbarcodeLocation=Bar Code Kommandozeilen-Tool (verwendet interne Engine für  einige Barcodetypen)  Muss mit "genbarcode" kompatibel sein. <br> Zum Beispiel: /usr/local/bin/genbarcode
 BarcodeInternalEngine=interne Engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarCodeNumberManager=Manager für die automatische Generierung von Barcode-Nummer
 ##### Prelevements #####
 WithdrawalsSetup=Abbuchungseinstellungen
 ##### ExternalRSS #####
@@ -1433,7 +1434,7 @@ RSSUrlExample=Ein interessanter RSS Feed
 MailingSetup=E-Mail-Kampagnenmodul-Einstellungen
 MailingEMailFrom=E-Mail-Absender (für ausgehende Mails) des E-Mail-Moduls
 MailingEMailError=Antwort-E-Mail-Adresse für unzustellbare E-Mails
-MailingDelay=Seconds to wait after sending next message
+MailingDelay=Wartezeit in Sekunden, bevor die nächste Nachricht gesendet wird
 ##### Notification #####
 NotificationSetup=E-Mail Benachrichtigungs-Einstellungen
 NotificationEMailFrom=E-Mail-Absender (für ausgehende Mails) des Benachrichtigungsmoduls
@@ -1442,9 +1443,9 @@ FixedEmailTarget=Festes E-Mail-Ziel
 ##### Sendings #####
 SendingsSetup=Versandmoduleinstellungen
 SendingsReceiptModel=Versandbelegsvorlage
-SendingsNumberingModules=Sendungen Nummerierung Module
-SendingsAbility=Support shipment sheets for customer deliveries
-NoNeedForDeliveryReceipts=In den meisten Fällen werden Lieferschein sowohl als Versand- (für die Zusammenstellung der Sendung), als auch als Zustellsscheine (vom Kunden zu unterschreiben) verwendet. Ensprechend sind Empfangsbelege meist eine doppelte und daher nicht verwendete Option.
+SendingsNumberingModules=Nummerierungsmodell Auslieferungen
+SendingsAbility=Unterstützung Lieferunterlagen für Kunden 
+NoNeedForDeliveryReceipts=In den meisten Fällen werden Lieferschein sowohl als Versand- (für die Zusammenstellung der Auslieferung), als auch als Zustellsscheine (vom Kunden zu unterschreiben) verwendet. Entsprechend sind Empfangsbelege meist eine doppelte und daher nicht verwendete Option.
 FreeLegalTextOnShippings=Freier Text auf Lieferungen
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Zustellscheinnumerierungs-Module
@@ -1505,7 +1506,7 @@ TaxSetup=Steuer-, Sozialbeitrags- und Dividendenmodul-Einstellungen
 OptionVatMode=MwSt. fällig
 OptionVATDefault=Barbestandsbasis
 OptionVATDebitOption=Rückstellungsbasis
-OptionVatDefaultDesc=Mehrwertsteuerschuld entsteht: <br>- Bei Lieferung/Zahlung für Waren<br>- Bei Zahlung für Dienstleistungen
+OptionVatDefaultDesc=Mehrwertsteuerschuld entsteht: <br>- Bei Lieferung/Zahlung für Waren<br>- Bei Zahlung für Leistungen
 OptionVatDebitOptionDesc=Mehrwertsteuerschuld entsteht: <br>- Bei Lieferung/Zahlung für Waren<br>- Bei Rechnungslegung (Lastschrift) für Dienstleistungen
 SummaryOfVatExigibilityUsedByDefault=Standardmäßiger Zeitpunkt der MwSt.-Fälligkeit in Abhängigkeit zur derzeit gewählten Option:
 OnDelivery=Bei Lieferung
@@ -1517,14 +1518,14 @@ Buy=Kaufen
 Sell=Verkaufen
 InvoiceDateUsed=Rechnungsdatum verwendet
 YourCompanyDoesNotUseVAT=Für Ihr Unternehmen wurde keine MwSt.-Verwendung definiert (Übersicht-Einstellungen-Unternehmen/Stiftung), entsprechend stehen in der Konfiguration keine MwSt.-Optionen zur Verfügung.
-AccountancyCode=Rechnungswesen-Code
+AccountancyCode=Kontierungs-Code
 AccountancyCodeSell=Verkaufskonto-Code
 AccountancyCodeBuy=Einkaufskonto-Code
 ##### Agenda #####
 AgendaSetup=Agenda-Moduleinstellungen
 PasswordTogetVCalExport=Passwort für den VCal-Export
 PastDelayVCalExport=Keine Termine exportieren die älter sind als
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE=Verwenden der Termintypen \nEinstellen unter (Übersicht -> Einstellungen -> Wörterbücher -> Maßnahme) 
 AGENDA_DEFAULT_FILTER_TYPE=Diesen Ereignistyp automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
 AGENDA_DEFAULT_FILTER_STATUS=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
 AGENDA_DEFAULT_VIEW=Welchen Reiter möchten Sie beim Öffnen der Agenda automatisch anzeigen
@@ -1540,8 +1541,8 @@ CashDeskBankAccountForCB= Finanzkonto für die Einlösung von Bargeldzahlungen v
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 CashDeskIdWareHouse=Lager für Entnahmen festlegen und und erzwingen
 StockDecreaseForPointOfSaleDisabled=Verringerung des Lagerbastandes durch Point of Sale deaktivert
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
+CashDeskYouDidNotDisableStockDecease=Sie haben die Reduzierung der Lagerbestände nicht deaktiviert, wenn Sie einen Verkauf auf dem  POS durchführen.\nAuch ist ein Lager/Standort notwendig.
 ##### Bookmark #####
 BookmarkSetup=Lesezeichenmoduleinstellungen
 BookmarkDesc=Dieses Modul ermöglicht die Verwaltung von Lesezeichen. Außerdem können Sie hiermit Verknüpfungen zu internen und externen Seiten im linken Menü anlegen.
@@ -1581,8 +1582,8 @@ ProjectsModelModule=Projektvorlagenmodul
 TasksNumberingModules=Aufgaben-Nummerierungs-Modul
 TaskModelModule=Vorlage für Arbeitsberichte
 ##### ECM (GED) #####
-ECMSetup = GED Setup
-ECMAutoTree = Automatic tree folder and document
+ECMSetup = EDM-Einstellungen
+ECMAutoTree = Automatischer Baumansicht
 ##### Fiscal Year #####
 FiscalYears=Fiskalische Jahre
 FiscalYear=Fiskalisches Jahr
@@ -1596,7 +1597,7 @@ ConfirmDeleteFiscalYear=Möchten Sie dieses fiskalische Jahr wirklich löschen?
 Opened=Geöffnet
 Closed=Geschlossen
 AlwaysEditable=kann immer bearbeitet werden
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+MAIN_APPLICATION_TITLE=Erzwinge sichtbaren Anwendungsnamen (Warnung: Setzen Ihres eigenen Namen hier, kann Autofill Login-Funktion abbrechen, wenn Sie DoliDroid Anwendung nutzen)
 NbMajMin=Mindestanzahl Großbuchstaben
 NbNumMin=Mindestanzahl Ziffern
 NbSpeMin=Mindestanzahl Sonderzeichen
@@ -1606,13 +1607,18 @@ SalariesSetup=Einstellungen des Gehaltsmodul
 SortOrder=Sortierreihenfolge
 Format=Format
 TypePaymentDesc=0:Kunden-Zahlungs-Typ, 1:Lieferanten-Zahlungs-Typ, 2:Sowohl Kunden- als auch Lieferanten-Zahlungs-Typ
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
+IncludePath=Include-Pfad (in Variable '%s' definiert)
+ExpenseReportsSetup=Einstellungen des Moduls Spesenabrechnung
 TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerContact=List of notifications per contact*
-ListOfFixedNotifications=List of fixed notifications
+NoModueToManageStockDecrease=Kein Modul zur automatische Bestandsverkleinerung ist aktiviert. Lager Bestandsverkleinerung kann nur durch manuelle Eingabe erfolgen.
+NoModueToManageStockIncrease=Kein Modul zur automatische Bestandserhöhung ist aktiviert. Lager Bestandserhöhung kann nur durch manuelle Eingabe erfolgen.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Sie können Optionen für E-Mail-Benachrichtigungen von Aktivierung und Konfiguration des Moduls "Benachrichtigung" finden.
+ListOfNotificationsPerContact=Liste der Benachrichtigungen nach Kontakt*
+ListOfFixedNotifications=Liste von ausbesserten Benachrichtigungen
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
-Threshold=Threshold
+Threshold=Schwellenwert
+BackupDumpWizard=Assistenten zum erstellen der Datenbank-Backup Dump-Datei 
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=Aus diesem Grund wird die Prozess hier beschriebenen Upgrade ist nur manuelle Schritte ein privilegierter Benutzer tun kann.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMuseContainCustom=Installation eines externen Modul aus der Anwendung speichern Sie die Modul-Dateien in Verzeichnis <strong>%s</strong>. Zu haben dieses Verzeichnis durch Dolibarr verarbeitet, müssen Sie das Setup Ihrer <strong>conf/conf.php</strong> Option haben <br> - - <strong>$dolibarr_main_url_root_alt</strong> auf <<strong>$dolibarr_main_url_root_alt="/custom"</strong> enabled <strong>= "/custom"</strong> <br> - <strong>$dolibarr_main_document_root_alt</strong>  zu Wert aktiviert <strong>"%s/custom"</strong>

+ 5 - 5
htdocs/langs/de_DE/agenda.lang

@@ -49,9 +49,9 @@ InvoiceValidatedInDolibarrFromPos=Rechnung %s von POS validiert
 InvoiceBackToDraftInDolibarr=Rechnung %s in den Entwurf Status zurücksetzen
 InvoiceDeleteDolibarr=Rechnung %s gelöscht
 OrderValidatedInDolibarr=Bestellung %s freigegeben
-OrderDeliveredInDolibarr=Order %s classified delivered
+OrderDeliveredInDolibarr=Bestellung %s als geliefert markieren
 OrderCanceledInDolibarr=Auftrag storniert %s
-OrderBilledInDolibarr=Order %s classified billed
+OrderBilledInDolibarr=Bestellung %s als bezahlt markieren
 OrderApprovedInDolibarr=Bestellen %s genehmigt
 OrderRefusedInDolibarr=Bestellung %s abgelehnt
 OrderBackToDraftInDolibarr=Bestellen %s zurück nach Draft-Status
@@ -62,7 +62,7 @@ InvoiceSentByEMail=Kundenrechnung %s per E-Mail versendet
 SupplierOrderSentByEMail=Lieferantenbestellung %s per E-Mail versendet
 SupplierInvoiceSentByEMail=Lieferantenrechnung %s per E-Mail versendet
 ShippingSentByEMail=Lieferung %s per Email versendet
-ShippingValidated= Sendung %s freigegeben
+ShippingValidated= Lieferung %s freigegeben
 InterventionSentByEMail=Intervention %s gesendet via E-Mail
 NewCompanyToDolibarr= Partner erstellt
 DateActionPlannedStart= Geplantes Startdatum
@@ -94,5 +94,5 @@ WorkingTimeRange=Arbeitszeit-Bereich
 WorkingDaysRange=Arbeitstag-Bereich
 AddEvent=Maßnahme erstellen
 MyAvailability=Meine Verfügbarkeit
-ActionType=Event type
-DateActionBegin=Start event date
+ActionType=Ereignistyp
+DateActionBegin=Startdatum des Ereignisses

+ 7 - 5
htdocs/langs/de_DE/banks.lang

@@ -33,11 +33,11 @@ AllTime=Vom start
 Reconciliation=Zahlungsabgleich
 RIB=Kontonummer
 IBAN=IBAN
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
+IbanValid=IBAN is gültig
+IbanNotValid=IBAN ist nicht gültig
 BIC=BIC / SWIFT Code
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
+SwiftValid=BIC/SWIFT ist gültig
+SwiftNotValid=BIC/Swift ist nicht gültig
 StandingOrders=Daueraufträge
 StandingOrder=Dauerauftrag
 Withdrawals=Entnahmen
@@ -152,7 +152,7 @@ BackToAccount=Zurück zum Konto
 ShowAllAccounts=Alle Finanzkonten
 FutureTransaction=Zukünftige Transaktionen.
 SelectChequeTransactionAndGenerate=Schecks auswählen/filtern um Sie in den Einzahlungsbeleg zu integrieren und auf "Erstellen" klicken.
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+InputReceiptNumber=Wählen Sie den Kontoauszug  der mit der Zahlungs übereinstimmt. Verwenden Sie einen sortierbaren numerischen Wert: YYYYMM oder YYYYMMDD
 EventualyAddCategory=Wenn möglich Kategorie angeben, worin die Daten eingeordnet werden
 ToConciliate=Konsolidieren?
 ThenCheckLinesAndConciliate=Dann die Zeilen im Bankauszug prüfen und Klicken
@@ -163,3 +163,5 @@ LabelRIB=Bankkonto-Nummer Bezeichnung
 NoBANRecord=Keine Bankkonto-Nummern Einträge
 DeleteARib=Lösche Bankkonto-Nummern Eintrag
 ConfirmDeleteRib=Möchten Sie diesen Bankkonto-Nummern Eintrag wirklich löschen?
+StartDate=Anfangsdatum
+EndDate=Enddatum

+ 21 - 15
htdocs/langs/de_DE/boxes.lang

@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=RSS-Informationen
-BoxLastProducts=%s zuletzt bearbeitete Produkte/Services
+BoxLastProducts=%s zuletzt bearbeitete Produkte/Leistungen
 BoxProductsAlertStock=Lagerbestands-Warnungen
-BoxLastProductsInContract=%s zuletzt verkaufte Produkte/Services
+BoxLastProductsInContract=%s zuletzt verkaufte Waren auf Verträgen
 BoxLastSupplierBills=Zuletzt bearbeitete Lieferantenrechnungen
 BoxLastCustomerBills=Zuletzt bearbeitete Kundenrechnungen
 BoxOldestUnpaidCustomerBills=Älteste offene Kundenrechnungen
@@ -12,6 +12,7 @@ BoxLastProspects=Zuletzt bearbeitete Leads
 BoxLastCustomers=Zuletzt bearbeitete Kunden
 BoxLastSuppliers=Zuletzt bearbeitete Lieferanten
 BoxLastCustomerOrders=Zuletzt bearbeitete Kundenaufträge
+BoxLastValidatedCustomerOrders=Letzte freigegebene Kundenaufträge
 BoxLastBooks=Zuletzt bearbeitete Konten
 BoxLastActions=Zuletzt bearbeitete Maßnahmen
 BoxLastContracts=Zuletzt abgeschlossene Verträge
@@ -25,28 +26,31 @@ BoxTotalUnpaidSuppliersBills=Summe offener Lieferantenrechnungen
 BoxTitleLastBooks=Letzte %s aufgezeichnet Bücher
 BoxTitleNbOfCustomers=Nombre de-Client
 BoxTitleLastRssInfos=%s letzte Neuigkeiten aus %s
-BoxTitleLastProducts=%s zuletzt bearbeitete Produkte/Services
+BoxTitleLastProducts=%s zuletzt bearbeitete Produkte/Leistungen
 BoxTitleProductsAlertStock=Lagerbestands-Warnungen
-BoxTitleLastCustomerOrders=%s zuletzt bearbeitete Kundenaufträge
+BoxTitleLastCustomerOrders=Letzte %s Kundenaufträge
+BoxTitleLastModifiedCustomerOrders=Letzte %s bearbeiteten Kundenaufträge
 BoxTitleLastSuppliers=%s zuletzt erfasste Lieferanten
 BoxTitleLastCustomers=%s zuletzt erfasste Kunden
 BoxTitleLastModifiedSuppliers=%s zuletzt bearbeitete Lieferanten
 BoxTitleLastModifiedCustomers=%s zuletzt bearbeitete Kunden
-BoxTitleLastCustomersOrProspects=%s zuletzt erfasste Kunden oder Interessenten
-BoxTitleLastPropals=%s zuletzt erfasste Angebote
+BoxTitleLastCustomersOrProspects=Letzte %s Kunden oder Leads
+BoxTitleLastPropals=Letzte %s Angebote
+BoxTitleLastModifiedPropals=Letzte %s bearbeiteten Angebote
 BoxTitleLastCustomerBills=%s zuletzt erfasste Kundenrechnungen
+BoxTitleLastModifiedCustomerBills=Letzte %s bearbeiteten Kundenrechnungen
 BoxTitleLastSupplierBills=%s zuletzt erfasste Lieferantenrechnungen
-BoxTitleLastProspects=%s zuletzt erfasste Leads
+BoxTitleLastModifiedSupplierBills=Letzte %s bearbeiteten Lieferantenrechnungen
 BoxTitleLastModifiedProspects=%s zuletzt bearbeitete Leads
-BoxTitleLastProductsInContract=%s zuletzt in Verträgen erfasste Produkte/Services
-BoxTitleLastModifiedMembers=Zuletzt geänderte %s Mitglieder
+BoxTitleLastProductsInContract=%s zuletzt in Verträgen erfasste Produkte/Leistungen
+BoxTitleLastModifiedMembers=Letzte %s Mitglieder
 BoxTitleLastFicheInter=Neueste %s veränderte Eingriffe
 BoxTitleOldestUnpaidCustomerBills=Älteste %s offene Kundenrechnungen
 BoxTitleOldestUnpaidSupplierBills=Älteste %s offene  Lieferantenrechnungen
 BoxTitleCurrentAccounts=Saldo des offenen Kontos
 BoxTitleSalesTurnover=Umsatz
-BoxTitleTotalUnpaidCustomerBills=Summe offener Kundenrechnungen (OP)
-BoxTitleTotalUnpaidSuppliersBills=offene Lieferantenrechnungen
+BoxTitleTotalUnpaidCustomerBills=Offene Kundenrechnungen
+BoxTitleTotalUnpaidSuppliersBills=Unbezahlte Lieferantenrechnungen
 BoxTitleLastModifiedContacts=Zuletzt geändert %s Kontakte/Adressen
 BoxMyLastBookmarks=Meine %s letzten Lesezeichen
 BoxOldestExpiredServices=Die ältesten abgelaufenen aktiven Dienste
@@ -70,13 +74,14 @@ NoUnpaidCustomerBills=Keine offenen Kundenrechnungen
 NoRecordedSupplierInvoices=Keine erfassten Lieferantenrechnungen
 NoUnpaidSupplierBills=Keine offenen Lieferantenrechnungen
 NoModifiedSupplierBills=Keine bearbeiteten Lieferantenrechnungen
-NoRecordedProducts=Keine erfassten Produkte/Services
+NoRecordedProducts=Keine erfassten Produkte/Leistungen
 NoRecordedProspects=Keine erfassten Leads
-NoContractedProducts=Keine Produkte/Services in Auftrag
+NoContractedProducts=Keine Produkte/Leistungen im Auftrag
 NoRecordedContracts=Keine Verträge erfasst
 NoRecordedInterventions=Keine bearbeiteten Eingriffe
 BoxLatestSupplierOrders=Neueste Lieferantenbestellungen
-BoxTitleLatestSupplierOrders=%s neueste Lieferantenbestellungen
+BoxTitleLatestSupplierOrders=Letzte %s Lieferantenbestellungen
+BoxTitleLatestModifiedSupplierOrders=Letzte %s bearbeiteten Lieferantenbestellungen
 NoSupplierOrder=Keine bearbeiteten Lieferantenbestellungen
 BoxCustomersInvoicesPerMonth=Kundenrechnungen pro Monat
 BoxSuppliersInvoicesPerMonth=Lieferantenrechnungen pro Monat
@@ -84,8 +89,9 @@ BoxCustomersOrdersPerMonth=Kundenbestellungen pro Monat
 BoxSuppliersOrdersPerMonth=Lieferantenbestellungen pro Monat
 BoxProposalsPerMonth=Angebote pro Monat
 NoTooLowStockProducts=Keine Produkte unter der min. Warenlimite
-BoxProductDistribution=Produkte/Services Verteilung
+BoxProductDistribution=Verteilung von Produkten/Leistungen
 BoxProductDistributionFor=Verteilung von %s für %s
 ForCustomersInvoices=Kundenrechnungen
 ForCustomersOrders=Kundenbestellungen
 ForProposals=Angebote
+LastXMonthRolling=Die letzten %s Monate rollier

+ 77 - 77
htdocs/langs/de_DE/categories.lang

@@ -1,62 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-categories=tags/categories
-TheCategorie=The tag/category
-NoCategoryYet=No tag/category of this type created
+Rubrique=Kategorie
+Rubriques=Kategorien
+categories=Kategorien
+TheCategorie=Die Kategorie
+NoCategoryYet=Keine Kategorie von dieser Art erstellt
 In=In
 AddIn=Einfügen in
 modify=Ändern
 Classify=Einordnen
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Suppliers tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-ThirdPartyCategoriesArea=Third parties tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-MainCats=Main tags/categories
+CategoriesArea=Kategorienbereich-Übersicht
+ProductsCategoriesArea=Produkte/Leistungen Kategorien-Übersicht
+SuppliersCategoriesArea=Lieferantenkategorienübersicht
+CustomersCategoriesArea=Kundenkategorien
+ThirdPartyCategoriesArea=Partnerkategorien
+MembersCategoriesArea=Mitgliederkategorien
+ContactsCategoriesArea=Kontaktkategorien-Übersicht
+MainCats=Hauptkategorien
 SubCats=Unterkategorien
 CatStatistics=Statistik
-CatList=List of tags/categories
-AllCats=All tags/categories
-ViewCat=View tag/category
-NewCat=Add tag/category
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
+CatList=Liste der Kategorien
+AllCats=Alle Kategorien
+ViewCat=Zeige Tag/Kategorie
+NewCat=Kategorie hinzufügen
+NewCategory=Neue Kategorie
+ModifCat=Kategorie bearbeiten
+CatCreated=Kategorie erstellt
+CreateCat=Kategorie erstellen
+CreateThisCat=Kategorie erstellen
 ValidateFields=Überprüfen Sie die Felder
 NoSubCat=Keine Unterkategorie
 SubCatOf=Unterkategorie von
-FoundCats=Found tags/categories
-FoundCatsForName=Tags/categories found for the name :
-FoundSubCatsIn=Subcategories found in the tag/category
-ErrSameCatSelected=You selected the same tag/category several times
-ErrForgotCat=You forgot to choose the tag/category
+FoundCats=Kategorien gefunden
+FoundCatsForName=Kategorien gefunden für den Suchbegriff:
+FoundSubCatsIn=Unterkategorien in der Kategorie gefunden
+ErrSameCatSelected=Sie haben die gleiche Kategorie mehrmals ausgewählt
+ErrForgotCat=Sie haben vergessen eine Kategorie zu wählen
 ErrForgotField=Sie haben ein oder mehrere Felder nicht ausgefüllt
 ErrCatAlreadyExists=Dieser Name wird bereits verwendet
-AddProductToCat=Add this product to a tag/category?
-ImpossibleAddCat=Impossible to add the tag/category
-ImpossibleAssociateCategory=Impossible to associate the tag/category to
+AddProductToCat=Dieses Produkt einer Kategorie zuweisen?
+ImpossibleAddCat=Kategorie erstellen ist nicht möglich
+ImpossibleAssociateCategory=Es ist nicht möglich die Kategorie zuweisen an
 WasAddedSuccessfully=<b> %s</b> wurde erfolgreich hinzugefügt.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ObjectAlreadyLinkedToCategory=Element ist bereits mit dieser Kategorie verknüpft.
+CategorySuccessfullyCreated=Die Kategorie %s wurde erfolgreich hinzugefügt.
+ProductIsInCategories=Dieses Produkt/Service ist folgenden Kategorien zugewiesen
+SupplierIsInCategories=Dieser Lieferant ist folgenden Kategorien zugewiesen
+CompanyIsInCustomersCategories=Dieser Partner ist folgenden Lead-/Kundenkategorien zugewiesen
+CompanyIsInSuppliersCategories=Dieser Partner ist folgenden Lieferantenkategorien zugewiesen
+MemberIsInCategories=Dieses Mitglied ist folgenden Kategorien zugewiesen
+ContactIsInCategories=Dieser Kontakt ist folgenden Kategorien zugewiesen
+ProductHasNoCategory=Dieses Produkt/Service ist keiner Kategorie zugewiesen.
+SupplierHasNoCategory=Dieser Lieferant ist keiner Kategorie zugewiesen.
+CompanyHasNoCategory= Dieses Unternehmen ist keiner Kategorie zugewiesen.
+MemberHasNoCategory= Dieses Mitglied ist keiner Kategorie zugewiesen.
+ContactHasNoCategory= Dieser Kontakt ist keiner Kategorie zugewiesen.
+ClassifyInCategory=Folgender Kategorie zuweisen
 NoneCategory=Keine
-NotCategorized=Without tag/category
+NotCategorized=ohne Zuordnung
 CategoryExistsAtSameLevel=Diese Kategorie existiert bereits auf diesem Level
 ReturnInProduct=Zurück zur Produktkarte
 ReturnInSupplier=Zurück zur Anbieterkarte
@@ -64,22 +64,22 @@ ReturnInCompany=Zurück zur Kunden-/Lead-Karte
 ContentsVisibleByAll=Für alle sichtbarer Inhalt
 ContentsVisibleByAllShort=Öffentl. Inhalt
 ContentsNotVisibleByAllShort=Privater Inhalt
-CategoriesTree=Tags/categories tree
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
-SuppliersCategoriesShort=Suppliers tags/categories
-CustomersCategoriesShort=Customers tags/categories
-CustomersProspectsCategoriesShort=Lead- / Kundenkategorien
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
+CategoriesTree=Kategoriebaum
+DeleteCategory=Lösche Kategorie
+ConfirmDeleteCategory=Möchten Sie diese Kategorie wirklich löschen?
+RemoveFromCategory=Aus Kategorie entfernen
+RemoveFromCategoryConfirm=Möchten Sie die Kategoriezuweisung wirklich entfernen?
+NoCategoriesDefined=Keine Kategorie definiert
+SuppliersCategoryShort=Lieferantenkategorie
+CustomersCategoryShort=Kundenkategorie
+ProductsCategoryShort=Produktkategorie
+MembersCategoryShort=Mitgliederkategorie
+SuppliersCategoriesShort=Lieferantenkategorien
+CustomersCategoriesShort=Kundenkategorien
+CustomersProspectsCategoriesShort=Kunden- / Leadkategorien
+ProductsCategoriesShort=Produktkategorien
+MembersCategoriesShort=Mitgliederkategorien
+ContactCategoriesShort=Kontaktkategorien
 ThisCategoryHasNoProduct=Diese Kategorie enthält keine Produkte.
 ThisCategoryHasNoSupplier=Diese Kategorie enthält keine Lieferanten.
 ThisCategoryHasNoCustomer=Diese Kategorie enthält keine Kunden.
@@ -88,23 +88,23 @@ ThisCategoryHasNoContact=Diese Kategorie enthält keine Kontakte.
 AssignedToCustomer=Einem Kunden zugeordnet
 AssignedToTheCustomer=An den Kunden
 InternalCategory=Interne Kategorie
-CategoryContents=Tag/category contents
-CategId=Tag/category id
-CatSupList=List of supplier tags/categories
-CatCusList=List of customer/prospect tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
-CatSupLinks=Links between suppliers and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
-CatProdLinks=Links between products/services and tags/categories
-CatMemberLinks=Links between members and tags/categories
-DeleteFromCat=Remove from tags/category
+CategoryContents=Kategorie/Bezeichnung
+CategId=Kategorie-ID
+CatSupList=Liste der Lieferantenkategorien
+CatCusList=Liste der Kunden-/ Leadkategorien
+CatProdList=Liste der Produktkategorien
+CatMemberList=Liste der Mitgliederkategorien
+CatContactList=Liste der Kontaktkategorien
+CatSupLinks=Verbindung zwischen Lieferanten und Kategorien
+CatCusLinks=Verbindung zwischen Kunden-/Leads und Kategorien
+CatProdLinks=Verbindung zwischen Produkten/Leistungen und Kategorien
+CatMemberLinks=Verbindung zwischen Mitgliedern und Kategorien
+DeleteFromCat=Aus Kategorie entfernen
 DeletePicture=Bild löschen
 ConfirmDeletePicture=Bild wirklich löschen?
 ExtraFieldsCategories=Ergänzende Attribute
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
+CategoriesSetup=Tags / Kategorien Einstellungen
+CategorieRecursiv=Automatisch mit übergeordneter Kategorie verbinden
 CategorieRecursivHelp=Wenn aktiviert, wird das Produkt auch zur übergeordneten Kategorie zugewiesen, wenn es einer Unterkategorie zugewiesen wird
-AddProductServiceIntoCategory=Folgendes Produkt/Dienstleistungen hinzufügen
-ShowCategory=Show tag/category
+AddProductServiceIntoCategory=Folgendes Produkt/Service hinzufügen
+ShowCategory=Zeige Kategorie

Some files were not shown because too many files changed in this diff