Merged changes form main trunk (2.2.8, 2.2.9)

[fa-stable.git] / taxes / tax_groups.php

diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index a210ad965747eea460b16da09d2cbc22dc481a69..7c3f946291c7b3e5b7a6d46af34dd584c0537251 100644 (file)
--- a/taxes/tax_groups.php
+++ b/taxes/tax_groups.php
@@ -141,9 +141,11 @@ if ($Mode == 'RESET')
 $result = get_all_tax_groups(check_value('show_inactive'));
 
 start_form();
+
 start_table(TABLESTYLE);
-$th = array(_("Description"), _("Tax Shipping"), "", "");
+$th = array(_("Description"), _("Shipping Tax"), "", "");
 inactive_control_column($th);
+
 table_header($th);
 
 $k = 0;
@@ -200,7 +202,7 @@ if ($selected_id != -1)
        hidden('selected_id', $selected_id);
 }
 text_row_ex(_("Description:"), 'name', 40);
-yesno_list_row(_("Tax Shipping:"), 'tax_shipping', null, "", "", true);
+yesno_list_row(_("Tax applied to Shipping:"), 'tax_shipping', null, "", "", true);
 
 end_table();