Merge branch 'develop' of [email protected]:Dolibarr/dolibarr.git into d…

…evelop
Dolibarr · Feb 4, 2025 · 1bd28eb · 1bd28eb
2 parents ac7269e + 46ff845
commit 1bd28eb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst
@@ -568,7 +568,6 @@ NbOfOrder
 NbOfSendingsByMonth
 NbOfTicket
 NeedRefresh
-NetMeasure
 Network
 NewAdherent
 NewAdherentAddress
@@ -589,7 +588,6 @@ NoOperations
 NoPasswordGenerationRuleConfigured
 NoReader
 NoRecordedUnpaidInvoices
-NoRecordfound
 NoRecords
 NoRecordsToDisplay
 NoSenderEmailDefined

diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017-2024  Alexandre Spangaro      <[email protected]>
- * Copyright (C) 2018-2024  Frédéric France         <[email protected]>
+ * Copyright (C) 2018-2025  Frédéric France         <[email protected]>
  * Copyright (C) 2023       Laurent Destailleur     <[email protected]>
  * Copyright (C) 2023       Joachim Kueter     		<[email protected]>
  * Copyright (C) 2024		MDW							<[email protected]>
@@ -739,7 +739,7 @@ function setPaymentType()
 		} else {
 			$bankaccountnotfound = 1;
 
-			print '<span class="opacitymedium">'.$langs->trans("NoRecordfound").'</span>';
+			print '<span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span>';
 		}
 		print '</td>';
 		print '</tr>';

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
@@ -326,6 +326,7 @@ TranslatedDescription=Translated description
 TranslatedNote=Translated notes
 ProductWeight=Weight for 1 product
 ProductVolume=Volume for 1 product
+NetMeasure=Net measure
 WeightUnits=Weight unit
 VolumeUnits=Volume unit
 WidthUnits=Width unit