Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision b65a8b5c

Von Moritz Bunkus vor fast 8 Jahren hinzugefügt

  • ID b65a8b5c5e2016bbc8e8ed1ff17be15a9ddf303f
  • Vorgänger 6d339d68
  • Nachfolger 93e78f47

Übersetzungen: mehrere deutsche Begriffe rund um Kontobewegungen ersetzt

Deutsch:
• Bankbewegung → Kontobewegung (letzteres ist deutlich geläufiger)

Englisch:
• Bank transaction → account movement (letzteres ist die von Leo
angebotene Übersetzung für »Kontobewegung«, und ersteres kennt Leo
gar nicht)
• Bank transaction MT940 → bank statement (denn letzteres ist die
tatsächliche und für Anwender*innen sinnvolle Übersetzung von dem,
was auf Deutsch angezeigt werden soll: Kontoauszug)
• Bank statement → account statement (ersteres ist britisches
Englisch, letzteres amerikanisches Englisch)

Nicht modifiziert wurden die Rechte in der Datenbank sowie Identifier
im Code (sprich der Controller ist immer noch
»SL::Controller::BankTransaction«, und der Typ des CSV-Profils für den
MT940-Import istßt weiterhin »bank_transaction«).

Unterschiede anzeigen:

SL/Controller/BankImport.pm
70 70
        action => [ t8('Account') ],
71 71

  
72 72
        link => [
73
          t8('Post Bank Statement'),
73
          t8('Post Account Statement'),
74 74
          link => $self->url_for(controller => 'BankTransaction', action => 'search'),
75 75
        ],
76 76

  
SL/Controller/BankTransaction.pm
50 50

  
51 51
  $self->setup_search_action_bar;
52 52
  $self->render('bank_transactions/search',
53
                title          => t8('Post Bank Statement'),
53
                title          => t8('Post Account Statement'),
54 54
                 BANK_ACCOUNTS => $bank_accounts);
55 55
}
56 56

  
......
272 272
  $::request->layout->add_javascripts("kivi.BankTransaction.js");
273 273
  $self->setup_list_action_bar;
274 274
  $self->render('bank_transactions/list',
275
                title             => t8('Bank transactions MT940'),
275
                title             => t8('Post Account Statement'),
276 276
                BANK_TRANSACTIONS => $bank_transactions,
277 277
                PROPOSALS         => \@proposals,
278 278
                bank_account      => $bank_account,
......
632 632
        return {
633 633
          %data,
634 634
          result  => 'error',
635
          message => $::locale->text("Bank transaction with id #1 has already been linked to #2.", $bank_transaction->id, $invoice->displayable_name),
635
          message => $::locale->text("Account movement with id #1 has already been linked to #2.", $bank_transaction->id, $invoice->displayable_name),
636 636
        };
637 637
      }
638 638

  
......
919 919
        action => [ t8('Account') ],
920 920

  
921 921
        link => [
922
          t8('Import Bank Statement'),
922
          t8('Import Account Statement'),
923 923
          link => $self->url_for(controller => 'BankImport', action => 'upload_mt940'),
924 924
        ],
925 925

  
......
962 962
        action => [ t8('Account') ],
963 963

  
964 964
        link => [
965
          t8('Import Bank Statement'),
965
          t8('Import Account Statement'),
966 966
          link => $self->url_for(controller => 'BankImport', action => 'upload_mt940'),
967 967
        ],
968 968

  
......
999 999
        action => [ t8('Account') ],
1000 1000

  
1001 1001
        link => [
1002
          t8('Import Bank Statement'),
1002
          t8('Import Account Statement'),
1003 1003
          link => $self->url_for(controller => 'BankImport', action => 'upload_mt940'),
1004 1004
        ],
1005 1005

  
1006 1006
        link => [
1007
          t8('Post Bank Statement'),
1007
          t8('Post Account Statement'),
1008 1008
          link => $self->url_for(controller => 'BankTransaction', action => 'search'),
1009 1009
        ],
1010 1010

  
SL/Controller/CsvImport.pm
335 335
            : $self->type eq 'inventories'       ? $::locale->text('CSV import: inventories')
336 336
            : $self->type eq 'projects'          ? $::locale->text('CSV import: projects')
337 337
            : $self->type eq 'orders'            ? $::locale->text('CSV import: orders')
338
            : $self->type eq 'bank_transactions' ? $::locale->text('CSV import: bank transactions')
338
            : $self->type eq 'bank_transactions' ? $::locale->text('CSV import: account movements')
339 339
            : $self->type eq 'ar_transactions'   ? $::locale->text('CSV import: ar transactions')
340 340
            : die;
341 341

  
......
775 775
          action => [ t8('Account') ],
776 776

  
777 777
          link => [
778
            t8('Post Bank Statement'),
778
            t8('Post Account Statement'),
779 779
            link => $self->url_for(controller => 'BankTransaction', action => 'search'),
780 780
          ],
781 781

  
SL/Controller/CsvImport/BankTransaction.pm
76 76
    # * amount
77 77
    my $num;
78 78
    if ( $num = SL::DB::Manager::BankTransaction->get_all_count(query =>[ remote_account_number => $object->remote_account_number, transdate => $object->transdate, purpose => $object->purpose, amount => $object->amount] ) ) {
79
      push(@{$entry->{errors}}, $::locale->text('Skipping due to existing bank transaction in database'));
79
      push(@{$entry->{errors}}, $::locale->text('Skipping due to existing account movement in database'));
80 80
    };
81 81
  } else {
82 82
      push(@{$entry->{errors}}, $::locale->text('Skipping because transfer amount is empty.'));
SL/Controller/Reconciliation.pm
639 639
        action => [ t8('Account') ],
640 640

  
641 641
        link => [
642
          t8('Import Bank Statement'),
642
          t8('Import Account Statement'),
643 643
          link => $self->url_for(controller => 'BankImport', action => 'upload_mt940'),
644 644
        ],
645 645

  
646 646
        link => [
647
          t8('Post Bank Statement'),
647
          t8('Post Account Statement'),
648 648
          link => $self->url_for(controller => 'BankTransaction', action => 'search'),
649 649
        ],
650 650

  
......
674 674
        action => [ t8('Account') ],
675 675

  
676 676
        link => [
677
          t8('Import Bank Statement'),
677
          t8('Import Account Statement'),
678 678
          link => $self->url_for(controller => 'BankImport', action => 'upload_mt940'),
679 679
        ],
680 680

  
681 681
        link => [
682
          t8('Post Bank Statement'),
682
          t8('Post Account Statement'),
683 683
          link => $self->url_for(controller => 'BankTransaction', action => 'search'),
684 684
        ],
685 685

  
bin/mozilla/rc.pl
180 180
        action => [ t8('Account') ],
181 181

  
182 182
        link => [
183
          t8('Import Bank Statement'),
183
          t8('Import Account Statement'),
184 184
          link => 'controller.pl?action=BankImport/upload_mt940',
185 185
        ],
186 186

  
187 187
        link => [
188
          t8('Post Bank Statement'),
188
          t8('Post Account Statement'),
189 189
          link => 'controller.pl?action=BankTransaction/search',
190 190
        ],
191 191

  
locale/de/all
132 132
  'Account deleted!'            => 'Konto gelöscht!',
133 133
  'Account for fees'            => 'Konto für Gebühren',
134 134
  'Account for interest'        => 'Konto für Zinsen',
135
  'Account movement'            => 'Kontobewegung',
136
  'Account movement with id #1 has already been linked to #2.' => 'Bankbuchung mit id #1 wurde schon mit #2 verlinkt.',
135 137
  'Account movements'           => 'Kontobewegungen',
138
  'Account movements that either only have warnings or no message at all have been posted.' => 'Banktransaktionen, die entweder nur Warnungen oder gar keine Nachricht haben, wurden hingegen verbucht.',
139
  'Account movements with errors have not been posted.' => 'Banktransaktionen mit Fehlern wurden nicht verbucht.',
136 140
  'Account number'              => 'Kontonummer',
137 141
  'Account number not unique!'  => 'Kontonummer bereits vorhanden!',
138 142
  'Account number of the goal/source' => 'Ziel- oder Quellkonto',
......
374 378
  'Bank Code Number'            => 'Bankleitzahl',
375 379
  'Bank Connection Tax Office'  => 'Bankverbindung des Finanzamts',
376 380
  'Bank Connections'            => 'Bankverbindungen',
377
  'Bank Transaction'            => 'Bankkonto',
378 381
  'Bank account'                => 'Bankkonto',
379 382
  'Bank accounts'               => 'Bankkonten',
380 383
  'Bank code'                   => 'Bankleitzahl',
......
382 385
  'Bank collection amount'      => 'Einzugsbetrag',
383 386
  'Bank collection payment list for export #1' => 'Bankeinzugszahlungsliste für SEPA-Export #1',
384 387
  'Bank collections via SEPA'   => 'Bankeinzüge via SEPA',
385
  'Bank transaction'            => 'Bankbuchung',
386
  'Bank transaction with id #1 has already been linked to #2.' => 'Bankbuchung mit id #1 wurde schon mit #2 verlinkt.',
387
  'Bank transactions'           => 'Bankbewegungen',
388
  'Bank transactions MT940'     => 'Kontoauszug verbuchen',
389
  'Bank transactions that either only have warnings or no message at all have been posted.' => 'Banktransaktionen, die entweder nur Warnungen oder gar keine Nachricht haben, wurden hingegen verbucht.',
390
  'Bank transactions with errors have not been posted.' => 'Banktransaktionen mit Fehlern wurden nicht verbucht.',
388
  'Bank transactions'           => 'Kontobewegungen',
391 389
  'Bank transfer amount'        => 'Überweisungssumme',
392 390
  'Bank transfer payment list for export #1' => 'Überweisungszahlungsliste für SEPA-Export #1',
393 391
  'Bank transfers via SEPA'     => 'Überweisungen via SEPA',
......
474 472
  'CSS style for pictures'      => 'CSS Style für Bilder',
475 473
  'CSV export'                  => 'CSV-Export',
476 474
  'CSV export -- options'       => 'CSV-Export -- Optionen',
475
  'CSV import: account movements' => 'CSV Import: Kontobewegungen',
477 476
  'CSV import: ar transactions' => 'CSV Import: Debitorenbuchungen',
478
  'CSV import: bank transactions' => 'CSV Import: Bankbewegungen',
479 477
  'CSV import: contacts'        => 'CSV-Import: Ansprechpersonen',
480 478
  'CSV import: customers and vendors' => 'CSV-Import: Kunden und Lieferanten',
481 479
  'CSV import: inventories'     => 'CSV-Import: Lagerbewegungen/-bestände',
......
1497 1495
  'Import'                      => 'Import',
1498 1496
  'Import AP from Scanner or Email' => 'Einkaufsbelege importieren vom Scanner oder von Email',
1499 1497
  'Import AR from Scanner or Email' => 'Verkaufsbelege importieren vom Scanner oder von Email',
1500
  'Import Bank Statement'       => 'Kontoauszug importieren',
1498
  'Import Account Statement'    => 'Kontoauszug importieren',
1501 1499
  'Import CSV'                  => 'CSV-Import',
1502 1500
  'Import Status'               => 'Import Status',
1503 1501
  'Import a MT940 file:'        => 'Laden Sie eine MT940 Datei hoch:',
......
2127 2125
  'Please contact your administrator or a service provider.' => 'Bitte kontaktieren Sie Ihren Administrator oder einen Dienstleister.',
2128 2126
  'Please contact your administrator.' => 'Bitte wenden Sie sich an Ihren Administrator.',
2129 2127
  'Please correct the settings and try again or deactivate that client.' => 'Bitte korrigieren Sie die Einstellungen und versuchen Sie es erneut, oder deaktivieren Sie diesen Mandanten.',
2130
  'Please create a CSV import profile called "MT940" for the import type bank transactions:' => 'Bitte erstellen Sie ein CSV Import Profil mit dem Namen "MT940" für den Importtyp Bankbewegungen',
2128
  'Please create a CSV import profile called "MT940" for the import type account movements:' => 'Bitte erstellen Sie ein CSV Import Profil mit dem Namen "MT940" für den Importtyp Kontobewegungen',
2131 2129
  'Please define a taxkey for the following taxes and run the update again:' => 'Bitte definieren Sie einen Steuerschlüssel für die folgenden Steuern und starten Sie dann das Update erneut:',
2132 2130
  'Please do so in the administration area.' => 'Bitte erledigen Sie dies im Administrationsbereich.',
2133 2131
  'Please enter a profile name.' => 'Bitte geben Sie einen Profilnamen an.',
......
2161 2159
  'Portrait'                    => 'Hochformat',
2162 2160
  'Position type in quotation/order' => 'Positionstyp in Angebot/Auftrag',
2163 2161
  'Post'                        => 'Buchen',
2164
  'Post Bank Statement'         => 'Kontoauszug verbuchen',
2162
  'Post Account Statement'      => 'Kontoauszug verbuchen',
2165 2163
  'Post Outgoing Payment'       => 'Zahlungsausgang verbuchen',
2166 2164
  'Post Payment'                => 'Zahlung buchen',
2167 2165
  'Post Receipt'                => 'Zahlungseingang verbuchen',
......
2695 2693
  'Skip'                        => 'Überspringen',
2696 2694
  'Skip entry'                  => 'Eintrag überspringen',
2697 2695
  'Skipping because transfer amount is empty.' => 'Übersprungen wegen leeren Betrags.',
2698
  'Skipping due to existing bank transaction in database' => 'Wegen schon existierender Bankbewegung in Datenbank übersprungen',
2696
  'Skipping due to existing account movement in database' => 'Wegen schon existierender Kontobewegung in Datenbank übersprungen',
2699 2697
  'Skipping due to existing entry in database' => 'Wegen existierendem Eintrag mit selber Nummer übersprungen',
2700 2698
  'Skipping due to existing entry in database with different type' => 'Wegen existierendem Eintrag von unterschiedlichem Artikeltyp übersprungen',
2701 2699
  'Skipping due to existing entry with different unit' => 'Wird aufgrund eines existierenden Eintrags mit anderer Einheit übersprungen.',
templates/webpages/bank_transactions/_problems.html
4 4
</h3>
5 5

  
6 6
<p>
7
 [% LxERP.t8("Bank transactions with errors have not been posted.") %]
8
 [% LxERP.t8("Bank transactions that either only have warnings or no message at all have been posted.") %]
7
 [% LxERP.t8("Account movements with errors have not been posted.") %]
8
 [% LxERP.t8("Account movements that either only have warnings or no message at all have been posted.") %]
9 9
</p>
10 10

  
11 11
<table>
templates/webpages/bank_transactions/assign_invoice.html
3 3
[% SET debug = 0 %]
4 4

  
5 5
<form method="post" action="javascript:kivi.BankTransaction.filter_invoices();" id="assign_invoice_window_form" data-bank-transaction-id="[% HTML.escape(SELF.transaction.id) %]">
6
  <b>[%- LxERP.t8("Bank transaction") %]:</b>
6
  <b>[%- LxERP.t8("Account movement") %]:</b>
7 7
  <table>
8 8
   <tr class="listheading">
9 9
    [% IF debug %]<td>[%- LxERP.t8("ID") %]:</td>[% END %]
templates/webpages/bank_transactions/tabs/all.html
3 3
[% BLOCK proposal_div %]
4 4
        <div data-proposal-id="[% prop.id %]">
5 5
         <a href=# onclick="kivi.BankTransaction.add_invoices('[% bt.id %]', '[% prop.id %]');"
6
            title="<table><tr><th></th><th>[% 'Suggested invoice' | $T8 %][% IF !prop.is_sales %] ([% 'AP' | $T8 %])[% END %]</th><th>[% 'Bank transaction' | $T8 %]</th></tr><tr><th>[% 'Amount' | $T8 %]</th><td>[% prop.realamount %] ([% 'open' | $T8 %]: [% LxERP.format_amount(prop.open_amount, 2) %])</td><td>[% LxERP.format_amount(bt.amount, 2) %]</td></tr>[% IF prop.skonto_date %]<tr><th>[% 'Payment terms' | $T8 %]</th><td>[% LxERP.format_amount(prop.amount_less_skonto, 2) %] [% 'until' | $T8 %] [% HTML.escape(prop.skonto_date.to_kivitendo) %] ([% prop.percent_skonto * 100 %] %)</td><td></td></tr>[% END %]<tr><th>[% 'Customer/Vendor' | $T8 %]</th><td>[% HTML.escape(prop.customer.displayable_name) %][% HTML.escape(prop.vendor.displayable_name) %]</td><td>[% HTML.escape(bt.remote_name) %]</td></tr><tr><th>[% 'Invoice Date' | $T8 %]</th><td>[% HTML.escape(prop.transdate_as_date) %]</td><td>[% HTML.escape(bt.transdate_as_date) %] ([% HTML.escape(bt.transdate.utc_rd_days - prop.transdate.utc_rd_days) %])</td></tr><tr><th>[% 'Invoice Number' | $T8 %]</th><td>[% HTML.escape(prop.invnumber) %]</td><td>[% HTML.escape(bt.purpose) %]</td></tr></table>"
6
            title="<table><tr><th></th><th>[% 'Suggested invoice' | $T8 %][% IF !prop.is_sales %] ([% 'AP' | $T8 %])[% END %]</th><th>[% 'Account movement' | $T8 %]</th></tr><tr><th>[% 'Amount' | $T8 %]</th><td>[% prop.realamount %] ([% 'open' | $T8 %]: [% LxERP.format_amount(prop.open_amount, 2) %])</td><td>[% LxERP.format_amount(bt.amount, 2) %]</td></tr>[% IF prop.skonto_date %]<tr><th>[% 'Payment terms' | $T8 %]</th><td>[% LxERP.format_amount(prop.amount_less_skonto, 2) %] [% 'until' | $T8 %] [% HTML.escape(prop.skonto_date.to_kivitendo) %] ([% prop.percent_skonto * 100 %] %)</td><td></td></tr>[% END %]<tr><th>[% 'Customer/Vendor' | $T8 %]</th><td>[% HTML.escape(prop.customer.displayable_name) %][% HTML.escape(prop.vendor.displayable_name) %]</td><td>[% HTML.escape(bt.remote_name) %]</td></tr><tr><th>[% 'Invoice Date' | $T8 %]</th><td>[% HTML.escape(prop.transdate_as_date) %]</td><td>[% HTML.escape(bt.transdate_as_date) %] ([% HTML.escape(bt.transdate.utc_rd_days - prop.transdate.utc_rd_days) %])</td></tr><tr><th>[% 'Invoice Number' | $T8 %]</th><td>[% HTML.escape(prop.invnumber) %]</td><td>[% HTML.escape(bt.purpose) %]</td></tr></table>"
7 7
              class="[% IF bt.agreement >= 5 %]green[% ELSIF bt.agreement < 5 and bt.agreement >= 3 %]orange[% ELSE %]red[% END %] tooltipster-html">&larr;[% HTML.escape(prop.invnumber)%]</a>
8 8
        </div>
9 9
[% END %]
templates/webpages/bankimport/form.html
15 15
 </form>
16 16
 [% ELSE %]
17 17
 <p>
18
 [% "Please create a CSV import profile called \"MT940\" for the import type bank transactions:" | $T8 %] <a href="[% SELF.url_for(controller => 'CsvImport', action => 'new', 'profile.type' => 'bank_transactions' ) %]">CsvImport</a>
18
 [% "Please create a CSV import profile called \"MT940\" for the import type account movements:" | $T8 %] <a href="[% SELF.url_for(controller => 'CsvImport', action => 'new', 'profile.type' => 'bank_transactions' ) %]">CsvImport</a>
19 19
 </p>
20 20
 [% END %]
templates/webpages/reconciliation/_linked_transactions.html
22 22
            [% END %]
23 23

  
24 24
            <td><img width="16px" height="16px" src="image/bank-building.jpg"></td>
25
            <td>[% 'Bank Transaction' | $T8 %]</td>
25
            <td>[% 'Account movement' | $T8 %]</td>
26 26
            [% IF debug %]<td>[% HTML.escape(bt.id) %]</td>[% END %]
27 27
            <td align="right" class="[% HTML.escape(bt.class) %]">[% HTML.escape(bt.transdate_as_date) %]</td>
28 28
            <td align="right" class="[% HTML.escape(bt.class) %]">[% HTML.escape(bt.amount_as_number) %]</td>
......
59 59
            </td>
60 60

  
61 61
            <td><img width="16px" height="16px" src="image/bank-building.jpg"></td>
62
            <td>[% 'Bank Transaction' | $T8 %]</td>
62
            <td>[% 'Account movement' | $T8 %]</td>
63 63
            [% IF debug %]<td>[% HTML.escape(bt.id) %]</td>[% END %]
64 64
            <td align="right">[% HTML.escape(bt.transdate_as_date) %]</td>
65 65
            <td align="right">[% HTML.escape(bt.amount_as_number) %]</td>
templates/webpages/reconciliation/assigning_table.html
17 17
      <tr class="listrow" id='element[% element.type %][% element.id %]'>
18 18
       <td><a href=# onclick="delete_element('[% element.id %]', '[% element.type %]')">x</a></td>
19 19
       <td>[% HTML.escape(element.id) %]</td>
20
       <td>[% IF element.type == 'BT' %][% 'Bank transaction' | $T8 %][% ELSE %][% 'Acc transaction' | $T8 %][% END %]</td>
20
       <td>[% IF element.type == 'BT' %][% 'Account movement' | $T8 %][% ELSE %][% 'Acc transaction' | $T8 %][% END %]</td>
21 21
       <td>[% HTML.escape(element.transdate_as_date) %]</td>
22 22
       <td align="right">[% IF element.type == 'BT' %][% HTML.escape(element.amount_as_number) %][% END %]</td>
23 23
       <td align="right">[% IF element.type == 'BB' %][% LxERP.format_amount(-1 * element.amount, 2) %][% END %]</td>
templates/webpages/reconciliation/proposals.html
18 18
          </td>
19 19

  
20 20
          <td><img width="16px" height="16px" src="image/bank-building.jpg"></td>
21
          <td>[% 'Bank Transaction' | $T8 %]</td>
21
          <td>[% 'Account movement' | $T8 %]</td>
22 22
           [% IF debug %] <td>[% HTML.escape(proposal.BT.id) %]</td>[% END %]
23 23
          <td align="right">[% HTML.escape(proposal.BT.transdate_as_date) %]</td>
24 24
          <td align="right">[% HTML.escape(proposal.BT.amount_as_number) %]</td>
......
50 50
      </tbody>
51 51
  [% END %]
52 52
[% END %]
53

  

Auch abrufbar als: Unified diff