Skip to content

Commit

Permalink
Merge pull request #1232 from ehuelsmann/master-translation-fixes
Browse files Browse the repository at this point in the history 
Master translation fixes
  • Loading branch information
@ehuelsmann
ehuelsmann committed Jan 8, 2016
2 parents 8bc273f + 41c5875 commit f0be49c
Show file tree
Hide file tree
Showing 11 changed files with 161 additions and 161 deletions.
6 changes: 3 additions & 3 deletions LedgerSMB/Report/Inventory/Partsgroups.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,17 @@ sub columns {

sub header_lines {
return [{name => 'partsgroup',
text => LedgerSMB::Report::text('Parts Group') }];
text => LedgerSMB::Report::text('Partsgroup') }];
}

=head2 name
Parts Groups
Partsgroups
=cut

sub name {
return LedgerSMB::Report::text('Parts Groups');
return LedgerSMB::Report::text('Partsgroups');
}

=head1 METHODS
Expand Down
2 changes: 1 addition & 1 deletion LedgerSMB/Report/Invoices/Outstanding.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ sub columns {
type => 'text',
pwidth => 10, },
{col_id => 'ship_via',
name => LedgerSMB::Report::text('Ship_Via'),
name => LedgerSMB::Report::text('Ship Via'),
type => 'text',
pwidth => 10, },
];
Expand Down
2 changes: 1 addition & 1 deletion LedgerSMB/Upgrade_Tests.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ push @tests, __PACKAGE__->new(
test_query => "select *
from chart
where not charttype in ('H', 'A')",
display_name => $locale->text('Unknown charttype; should be H(eader)/A(ccount))'),
display_name => $locale->text('Unknown charttype; should be H(eader)/A(ccount)'),
name => 'unknown_charttype',
display_cols => ['accno', 'charttype', 'description'],
column => 'charttype',
Expand Down
86 changes: 43 additions & 43 deletions UI/Reports/co/filter_bm.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<table width="100%">
<tr>
<th class="listtop"><?lsmb text('Balance y Mayor') ?></th>
<th class="listtop">Balance y Mayor</th>

</tr>
<tr height="5"></tr>
Expand All @@ -20,15 +20,15 @@
<table>
<th align="right"><?lsmb text('From') ?></th>
<td><?lsmb PROCESS input element_data = {
class="date"
name="date_from"
size="11"
class="date"
name="date_from"
size="11"
title=datestyle } ?></td>
<th align="right"><?lsmb text('To') ?></th>
<td><?lsmb PROCESS input element_data = {
class="date"
name="date_to"
size="11"
class="date"
name="date_to"
size="11"
title=datestyle } ?></td>
</tr>
<td colspan="5">
Expand All @@ -49,12 +49,12 @@
name="interval"
class="radio"
type="radio"
value="0"
value="0"
checked="checked" } ?>&nbsp;<?lsmb text('Current') ?>
<?lsmb PROCESS input element_data = {
name="interval"
class="radio"
type="radio"
<?lsmb PROCESS input element_data = {
name="interval"
class="radio"
type="radio"
value="1" } ?>&nbsp;<?lsmb text('Month') ?>
<?lsmb PROCESS input element_data = {
name="interval"
Expand All @@ -70,45 +70,45 @@
<table>
<tr>
<td nowrap><?lsmb PROCESS input element_data = {
name="col_accno"
class="checkbox"
type="checkbox"
name="col_accno"
class="checkbox"
type="checkbox"
value="Y"
checked = 'checked'
} ?> <?lsmb text('Account Number') ?></td>
<td nowrap><?lsmb PROCESS input element_data = {
name="col_description"
class="checkbox"
type="checkbox"
value="Y"
name="col_description"
class="checkbox"
type="checkbox"
value="Y"
checked="checked"
} ?> <?lsmb text('Account Name') ?></td>
<td nowrap><?lsmb PROCESS input element_data = {
name="col_starting_balance"
class="checkbox"
type="checkbox"
value="Y"
name="col_starting_balance"
class="checkbox"
type="checkbox"
value="Y"
checked="checked"
} ?> <?lsmb text('starting_balance') ?></td>
<td nowrap><?lsmb PROCESS input element_data = {
name="col_debits"
class="checkbox"
type="checkbox"
value="Y"
name="col_debits"
class="checkbox"
type="checkbox"
value="Y"
checked="checked"
} ?> <?lsmb text('debits') ?></td>

<td nowrap><?lsmb PROCESS input element_data = {
name="col_credits"
class="checkbox"
type="checkbox"
value="Y"
checked="checked"
name="col_credits"
class="checkbox"
type="checkbox"
value="Y"
checked="checked"
} ?> <?lsmb text('Credit') ?></td>
<td nowrap><?lsmb PROCESS input element_data = {
name="col_balance"
class="checkbox"
type="checkbox"
name="col_balance"
class="checkbox"
type="checkbox"
value="Y"
checked = 'checked'
} ?> <?lsmb text('balance') ?></td>
Expand All @@ -125,22 +125,22 @@
</table>

<?lsmb PROCESS input element_data = {
type="hidden"
name="path"
type="hidden"
name="path"
value=path
} ?>
<?lsmb PROCESS input element_data = {
type="hidden"
name="login"
<?lsmb PROCESS input element_data = {
type="hidden"
name="login"
value=login
} ?>

<br>
<?lsmb PROCESS button element_data = {
text = text('Continue')
class="submit"
type="submit"
name="action"
class="submit"
type="submit"
name="action"
value="run_bm"
} ?>
</form>
Expand Down
78 changes: 39 additions & 39 deletions UI/Reports/co/filter_cd.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

<table width="100%">
<tr>
<th class="listtop"><?lsmb text('Caja Diaria') _ ' --- '
_ text('All fields are required') ?>
<th class="listtop">Caja Diaria ---
<?lsmb text('All fields are required') ?>
</th>

</tr>
Expand All @@ -28,65 +28,65 @@
size = 20 } ?></td>
<th align="right"><?lsmb text('Accounts To') ?></th>
<td><?lsmb PROCESS input element_data = {
name="to_accno"
name="to_accno"
size="20"
type="text"
} ?></td>
</tr>

<tr>

<th align="right"><?lsmb text('From') ?></th>
<td><?lsmb PROCESS input element_data = {
class="date"
name="date_from"
size="11"
class="date"
name="date_from"
size="11"
title=datestyle } ?></td>
<th align="right"><?lsmb text('To') ?></th>
<td><?lsmb PROCESS input element_data = {
class="date"
name="date_to"
size="11"
class="date"
name="date_to"
size="11"
title=datestyle } ?></td>
</tr>

<tr>
<th align="right"><?lsmb text('Include in Report') ?></th>

<td nowrap><?lsmb PROCESS input element_data = {
name="col_accno"
class="checkbox"
type="checkbox"
name="col_accno"
class="checkbox"
type="checkbox"
value="Y"
checked = 'checked'
} ?> <?lsmb text('Account Number') ?></td>
<td nowrap><?lsmb PROCESS input element_data = {
name="col_description"
class="checkbox"
type="checkbox"
value="Y"
name="col_description"
class="checkbox"
type="checkbox"
value="Y"
checked="checked"
} ?> <?lsmb text('Account Name') ?></td>
<td nowrap><?lsmb PROCESS input element_data = {
name="col_document_type"
class="checkbox"
type="checkbox"
value="Y"
name="col_document_type"
class="checkbox"
type="checkbox"
value="Y"
checked="checked"
} ?> <?lsmb text('Document Type') ?></td>
<td nowrap><?lsmb PROCESS input element_data = {
name="col_debits"
class="checkbox"
type="checkbox"
value="Y"
name="col_debits"
class="checkbox"
type="checkbox"
value="Y"
checked="checked"
} ?> <?lsmb text('Debits') ?></td>

<td nowrap><?lsmb PROCESS input element_data = {
name="col_credits"
class="checkbox"
type="checkbox"
value="Y"
<td nowrap><?lsmb PROCESS input element_data = {
name="col_credits"
class="checkbox"
type="checkbox"
value="Y"
checked="checked"
} ?> <?lsmb text('Credits') ?></td>
</tr>
Expand All @@ -100,22 +100,22 @@
</table>

<?lsmb PROCESS input element_data = {
type="hidden"
name="path"
type="hidden"
name="path"
value=path
} ?>
<?lsmb PROCESS input element_data = {
type="hidden"
name="login"
<?lsmb PROCESS input element_data = {
type="hidden"
name="login"
value=login
} ?>

<br>
<?lsmb PROCESS button element_data = {
text = text('Continue')
class="submit"
type="submit"
name="action"
class="submit"
type="submit"
name="action"
value="run_caja_diaria"
} ?>
</form>
Expand Down
4 changes: 2 additions & 2 deletions UI/Reports/filters/search_partsgroups.html
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?lsmb INCLUDE 'ui-header.html';
PROCESS 'elements.html'; ?>
<body class="lsmb <?lsmb dojo_theme ?>">
<div class="listtop"><?lsmb text('Search Parts Groups') ?></div>
<div class="listtop"><?lsmb text('Search Partsgroups') ?></div>
<form data-dojo-type="lsmb/lib/Form" action="goods.pl" method="GET">
<div><?lsmb PROCESS input element_data = {
name = 'partsgroup'
value = partsgroup
type = 'text'
class = 'name'
size = 16
label = text('Parts Group') #'
label = text('Partsgroup') #'
} ?></div>
<div><?lsmb PROCESS button element_data = {
type = 'submit'
Expand Down
4 changes: 2 additions & 2 deletions UI/Reports/filters/unapproved.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
default_values = [class_id]
} ?>
</div>
<!--
<!--
Commenting this section out. Does not seem to be used by API. -CT
<div class="input" id="entered_by_div">
Expand All @@ -69,7 +69,7 @@
name="approved"
id="approved-0"
value="0"
label= text("Unpproved")
label= text("Unapproved")
type="radio"
checked="CHECKED"
}; ?>
Expand Down
Loading

0 comments on commit f0be49c

Please sign in to comment.