Fix: Use correct translation key

htdocs/admin/confexped.php

@@ -87,7 +87,7 @@ $h++;
 if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 {
 	$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
-	$head[$h][1] = $langs->trans("Sending");
+	$head[$h][1] = $langs->trans("Shipment");
 	$h++;
 }
 

htdocs/admin/expedition.php

@@ -210,7 +210,7 @@ $head[$h][1] = $langs->trans("Setup");
 $h++;
 
 $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
-$head[$h][1] = $langs->trans("Sending");
+$head[$h][1] = $langs->trans("Shipment");
 $hselected=$h;
 $h++;
 
@@ -225,7 +225,7 @@ dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
 
 /*
  * Expedition numbering model
- */ 
+ */
 
 print_titre($langs->trans("SendingsNumberingModules"));
 
@@ -260,13 +260,13 @@ foreach ($dirmodels as $reldir)
 					require_once $dir.$file.'.php';
 
 					$module = new $file;
-					
+
 					if ($module->isEnabled())
 					{
 						// Show modules according to features level
 						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
-					
+
 						$var=!$var;
 						print '<tr '.$bc[$var].'><td>'.$module->nom."</td>\n";
 						print '<td>';
@@ -276,8 +276,8 @@ foreach ($dirmodels as $reldir)
                         // Show example of numbering module
                         print '<td class="nowrap">';
                         $tmp=$module->getExample();
-                        if (preg_match('/^Error/',$tmp)) { 
-							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; 
+                        if (preg_match('/^Error/',$tmp)) {
+							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
 						}
                         elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
                         else print $tmp;

htdocs/admin/livraison.php

@@ -192,7 +192,7 @@ $h++;
 if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 {
     $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
-    $head[$h][1] = $langs->trans("Sending");
+    $head[$h][1] = $langs->trans("Shipment");
     $h++;
 }
 
@@ -207,7 +207,7 @@ dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
 /*
  * Livraison numbering model
  */
- 
+
 print_titre($langs->trans("DeliveryOrderNumberingModules"));
 
 print '<table class="noborder" width="100%">';
@@ -240,13 +240,13 @@ foreach ($dirmodels as $reldir)
                     require_once $dir.$file.'.php';
 
                     $module = new $file;
-					
+
 					if ($module->isEnabled())
                     {
 						// Show modules according to features level
 						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
-                    
+
                         $var=!$var;
                         print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
                         print $module->info();
@@ -255,8 +255,8 @@ foreach ($dirmodels as $reldir)
                         // Show example of numbering module
                         print '<td class="nowrap">';
                         $tmp=$module->getExample();
-                        if (preg_match('/^Error/',$tmp)) { 
-							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; 
+                        if (preg_match('/^Error/',$tmp)) {
+							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
 						}
                         elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
@@ -315,7 +315,7 @@ print '</table>';
 print '<br>';
 print_titre($langs->trans("DeliveryOrderModel"));
 
-// Defini tableau def de modele 
+// Defini tableau def de modele
 $type="delivery";
 $def = array();
 

htdocs/core/lib/order.lib.php

@@ -52,7 +52,7 @@ function commande_prepare_head($object)
 	|| ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id;
-		if ($conf->expedition_bon->enabled) $text=$langs->trans("Sendings");
+		if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipment");
 		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
 		if ($conf->livraison_bon->enabled)  $text.=$langs->trans("Receivings");
 		$head[$h][1] = $text;
@@ -93,7 +93,7 @@ function commande_prepare_head($object)
 		$head[$h][2] = 'note';
 		$h++;
 	}
-	
+
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	$upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir,'files'));
@@ -137,7 +137,7 @@ function order_admin_prepare_head($object)
 	$head[$h][1] = $langs->trans("ExtraFields");
 	$head[$h][2] = 'attributes';
 	$h++;
-	
+
 	$head[$h][0] = DOL_URL_ROOT.'/admin/orderdet_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
 	$head[$h][2] = 'attributeslines';

htdocs/core/lib/propal.lib.php

@@ -48,7 +48,7 @@ function propal_prepare_head($object)
 	{
 		$langs->load("sendings");
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;
-		if ($conf->expedition_bon->enabled) $text=$langs->trans("Sendings");
+		if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipment");
 		if ($conf->livraison_bon->enabled)  $text.='/'.$langs->trans("Receivings");
 		$head[$h][1] = $text;
 		$head[$h][2] = 'shipping';
@@ -135,7 +135,7 @@ function propal_admin_prepare_head($object)
 	$head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
     $h++;
-    
+
     $head[$h][0] = DOL_URL_ROOT.'/comm/admin/propaldet_extrafields.php';
     $head[$h][1] = $langs->trans("ExtraFieldsLines");
     $head[$h][2] = 'attributeslines';

htdocs/core/modules/expedition/doc/pdf_merou.modules.php

@@ -172,10 +172,10 @@ class pdf_merou extends ModelePdfExpedition
 				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("Sending"));
+				$pdf->SetSubject($outputlangs->transnoentities("Shipment"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Sending"));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Shipment"));
 				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right

htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

@@ -157,10 +157,10 @@ class pdf_rouget extends ModelePdfExpedition
 				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("Sending"));
+				$pdf->SetSubject($outputlangs->transnoentities("Shipment"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Sending"));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Shipment"));
 				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right

htdocs/core/modules/expedition/mod_expedition_ribera.php

@@ -53,10 +53,10 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 		$texte.= '<input type="hidden" name="maskconstexpedition" value="EXPEDITION_RIBERA_MASK">';
 		$texte.= '<table class="nobordernopadding" width="100%">';
 
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Sending"),$langs->transnoentities("Sending"));
+		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Shipment"),$langs->transnoentities("Shipment"));
 		$tooltip.=$langs->trans("GenericMaskCodes2");
 		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Sending"),$langs->transnoentities("Sending"));
+		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Shipment"),$langs->transnoentities("Shipment"));
 		$tooltip.=$langs->trans("GenericMaskCodes5");
 
 		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';

htdocs/expedition/contact.php

@@ -153,7 +153,7 @@ if ($id > 0 || ! empty($ref))
 	$langs->trans("OrderCard");
 
 	$head = shipping_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("Sending"), 0, 'sending');
+	dol_fiche_head($head, 'contact', $langs->trans("Shipment"), 0, 'sending');
 
 
    /*

htdocs/expedition/fiche.php

@@ -87,7 +87,7 @@ if ($id > 0 || ! empty($ref))
 if ($action == 'add')
 {
     $error=0;
-    
+
     $object = new Expedition($db);
 
     $db->begin();
@@ -517,7 +517,7 @@ else if ($action == 'classifybilled')
  * View
  */
 
-llxHeader('',$langs->trans('Sending'),'Expedition');
+llxHeader('',$langs->trans('Shipment'),'Expedition');
 
 $form = new Form($db);
 $formfile = new FormFile($db);
@@ -916,7 +916,7 @@ else
 		$soc->fetch($object->socid);
 
 		$head=shipping_prepare_head($object);
-		dol_fiche_head($head, 'shipping', $langs->trans("Sending"), 0, 'sending');
+		dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), 0, 'sending');
 
 		dol_htmloutput_mesg($mesg);
 
@@ -926,7 +926,7 @@ else
 		if ($action == 'delete')
 		{
 			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('DeleteSending'),$langs->trans("ConfirmDeleteSending",$object->ref),'confirm_delete','',0,1);
-			
+
 		}
 
 		/*
@@ -955,7 +955,7 @@ else
 			}
 
 			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('ValidateSending'),$text,'confirm_valid','',0,1);
-			
+
 		}
 		/*
 		 * Confirmation de l'annulation
@@ -963,7 +963,7 @@ else
 		if ($action == 'annuler')
 		{
 			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('CancelSending'),$langs->trans("ConfirmCancelSending",$object->ref),'confirm_cancel','',0,1);
-			
+
 		}
 
 		// Calculate true totalWeight and totalVolume for all products

htdocs/expedition/index.php

@@ -39,7 +39,7 @@ $companystatic=new Societe($db);
 $shipment=new Expedition($db);
 
 $helpurl='EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones';
-llxHeader('',$langs->trans("Sendings"),$helpurl);
+llxHeader('',$langs->trans("Shipment"),$helpurl);
 
 print_fiche_titre($langs->trans("SendingsArea"));
 

htdocs/expedition/note.php

@@ -88,7 +88,7 @@ if ($id > 0 || ! empty($ref))
 	$soc->fetch($object->socid);
 
 	$head=shipping_prepare_head($object);
-    dol_fiche_head($head, 'note', $langs->trans("Sending"), 0, 'sending');
+    dol_fiche_head($head, 'note', $langs->trans("Shipment"), 0, 'sending');
 
 	print '<table class="border" width="100%">';
 

htdocs/langs/en_US/orders.lang

@@ -56,8 +56,6 @@ DraftOrWaitingShipped=Draft or validated not yet shipped
 MenuOrdersToBill=Orders delivered
 MenuOrdersToBill2=Orders to bill
 SearchOrder=Search order
-Sending=Sending
-Sendings=Sendings
 ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order

htdocs/langs/en_US/sendings.lang

@@ -3,6 +3,7 @@ CHARSET=UTF-8
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+Shipment=Shipment
 Shipments=Shipments
 Receivings=Receivings
 SendingsArea=Shipments area

htdocs/langs/fr_FR/orders.lang

@@ -56,8 +56,6 @@ DraftOrWaitingShipped=Brouillon ou validée pas encore expédiée
 MenuOrdersToBill=Commandes délivrées
 MenuOrdersToBill2=Commandes à facturer
 SearchOrder=Rechercher une commande
-Sending=Expédition
-Sendings=Expéditions
 ShipProduct=Expédier produit
 Discount=Remise
 CreateOrder=Créer Commande

htdocs/langs/fr_FR/sendings.lang

@@ -3,6 +3,7 @@ CHARSET=UTF-8
 RefSending=Réf. expédition
 Sending=Expédition
 Sendings=Expéditions
+Shipment=Expédition
 Shipments=Expéditions
 Receivings=Réceptions
 SendingsArea=Espace expéditions

htdocs/livraison/fiche.php

@@ -479,7 +479,7 @@ else
 			$soc->fetch($delivery->socid);
 
 			$head=delivery_prepare_head($delivery);
-			dol_fiche_head($head, 'delivery', $langs->trans("Sending"), 0, 'sending');
+			dol_fiche_head($head, 'delivery', $langs->trans("Shipment"), 0, 'sending');
 
 			/*
 			 * Confirmation de la suppression
@@ -489,7 +489,7 @@ else
 			{
 				$expedition_id = $_GET["expid"];
 				print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$delivery->id.'&expid='.$expedition_id,$langs->trans("DeleteDeliveryReceipt"),$langs->trans("DeleteDeliveryReceiptConfirm",$delivery->ref),'confirm_delete','','',1);
-				
+
 			}
 
 			/*
@@ -499,7 +499,7 @@ else
 			if ($action == 'valid')
 			{
 				print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$delivery->id,$langs->trans("ValidateDeliveryReceipt"),$langs->trans("ValidateDeliveryReceiptConfirm",$delivery->ref),'confirm_valid','','',1);
-				
+
 			}