Merge pull request #5666 from aspangaro/4.0-p45

Fix: Wrong language key

htdocs/compta/salaries/card.php

@@ -415,7 +415,7 @@ if ($id)
 	}
 	else
 	{
-		print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
+		print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a>';
 	}
 	print "</div>";
 }

htdocs/compta/tva/card.php

@@ -365,8 +365,8 @@ if ($id)
 
 	
 	/*
-	* Boutons d'actions
-	*/
+	 * Action buttons
+	 */
 	print "<div class=\"tabsAction\">\n";
 	if ($object->rappro == 0)
 	{
@@ -381,7 +381,7 @@ if ($id)
 	}
 	else
 	{
-		print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
+		print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a>';
 	}
 	print "</div>";
 }

htdocs/langs/en_US/banks.lang

@@ -78,6 +78,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number