Merge pull request #5666 from aspangaro/4.0-p45

Fix: Wrong language key
Dolibarr · Aug 29, 2016 · b43bd37 · b43bd37
2 parents 13f61f2 + 7cb4f85
commit b43bd37
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
@@ -415,7 +415,7 @@
 	}
 	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>";
 }

diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
@@ -365,8 +365,8 @@
 
 
 	/*
-	* Boutons d'actions
-	*/
+	 * Action buttons
+	 */
 	print "<div class=\"tabsAction\">\n";
 	if ($object->rappro == 0)
 	{
@@ -381,7 +381,7 @@
 	}
 	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>";
 }

diff --git a/htdocs/langs/en_US/banks.lang b/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