From ed2173ce5d1ff27fe7eeef4b328e1411e52f65cc Mon Sep 17 00:00:00 2001 From: Tamino Steinert Date: Tue, 24 Oct 2023 19:08:26 +0200 Subject: [PATCH] locales --- SL/Controller/EmailJournal.pm | 2 +- locale/de/all | 24 +++++++++++++++++-- locale/en/all | 24 +++++++++++++++++-- .../design40_webpages/email_journal/show.html | 3 +-- .../email_journal/tabs/basic_data.html | 2 +- templates/webpages/email_journal/show.html | 2 -- 6 files changed, 47 insertions(+), 10 deletions(-) diff --git a/SL/Controller/EmailJournal.pm b/SL/Controller/EmailJournal.pm index 46ccaf1e4a..4ec730dc35 100644 --- a/SL/Controller/EmailJournal.pm +++ b/SL/Controller/EmailJournal.pm @@ -463,7 +463,7 @@ sub link_and_add_attachment_to_record { $email_journal->link_to_record($record); $self->js->flash('info', - $::locale->text('Linked e-mail and attachment to ') . $record->displayable_name + $::locale->text('Linked email and attachment to ') . $record->displayable_name )->render(); } diff --git a/locale/de/all b/locale/de/all index 146cd173c5..e678f1a255 100644 --- a/locale/de/all +++ b/locale/de/all @@ -376,6 +376,7 @@ $self->{texts} = { 'Apply to transfers without bin' => 'Bei allen Lagerbewegungen ohne Lagerplatz setzen', 'Apply to transfers without comment' => 'Bei allen Lagerbewegungen ohne Kommentar setzen', 'Apply to transfers without warehouse' => 'Bei allen Lagerbewegungen ohne Lager setzen', + 'Apply with Attachment' => 'Mit Anhang anwenden', 'Apply year-end bookings' => 'Jahresabschlußbuchungen durchführen', 'Applying #1:' => 'Führe #1 aus:', 'Approximately #1 prices will be updated.' => 'Ungefähr #1 Preise werden aktualisiert.', @@ -860,7 +861,6 @@ $self->{texts} = { 'Create Invoice' => 'Rechnung erstellen', 'Create PDF' => 'PDF erzeugen', 'Create Reclamation' => 'Reklamation erstellen', - 'Create Record with Attachment' => 'Erzeuge Beleg mit Anhang', 'Create Sub-Version' => 'Unterversion erzeugen', 'Create a new background job' => 'Einen neuen Hintergrund-Job anlegen', 'Create a new client' => 'Einen neuen Mandanten anlegen', @@ -908,6 +908,7 @@ $self->{texts} = { 'Create customers and vendors. Edit all vendors. Edit only customers where salesman equals employee (login)' => 'Kunden und Lieferanten erfassen. Alle Lieferanten bearbeiten. Nur Kunden bearbeiten bei denen der Verkäufer gleich Bearbeiter (login) ist', 'Create delivery order' => 'Lieferschein erstellen', 'Create first invoice on' => 'Erste Rechnung erzeugen am', + 'Create from Workflow' => 'Workflow weiterführen von', 'Create invoice' => 'Buchung erstellen', 'Create invoice?' => 'Rechnung erstellen?', 'Create new' => 'Neu erfassen', @@ -1490,6 +1491,9 @@ $self->{texts} = { 'Either there are no open invoices, or you have already initiated bank transfers with the open amounts for those that are still open.' => 'Entweder gibt es keine offenen Rechnungen, oder es wurden bereits Überweisungen über die offenen Beträge aller offenen Rechnungen erstellt.', 'Element disabled' => 'Element deaktiviert', 'Email' => 'E-Mail', + 'Email Attachment Preview' => 'E-Mail-Anhang-Vorschau', + 'Email Details' => 'E-Mail Details', + 'Email Journal Workflow' => 'E-Mail-Journal-Workflow', 'Email Sender Dunning' => 'E-Mail-Absender für Mahnung', 'Email Sender Letter' => 'E-Mail-Absender für Briefe', 'Email Sender Purchase Delivery Order' => 'E-Mail-Absender für Lieferantenlieferscheine', @@ -1880,7 +1884,9 @@ $ ./scripts/installation_check.pl', 'Here' => 'Hier', 'Here you only provide the credentials for logging into the database.' => 'Hier geben Sie nur die Logindaten für die Anmeldung an der Datenbank ein.', 'Here\'s an example command line:' => 'Hier ist eine Kommandozeile, die als Beispiel dient:', + 'Hide Attachment' => 'Anhang verbergen', 'Hide Filter' => 'Filter verbergen', + 'Hide Records' => 'Belege verbergen', 'Hide all details' => 'Alle Details verbergen', 'Hide buttons' => 'Knöpfe verstecken', 'Hide by default' => 'Standardmäßig verstecken', @@ -2214,8 +2220,10 @@ $ ./scripts/installation_check.pl', 'Link to invoice' => 'Beleglink', 'Link to the following project:' => 'Mit dem folgenden Projekt verknüpfen:', 'Linked Records' => 'Verknüpfte Belege', + 'Linked email and attachment to ' => 'E-Mail und Anhang verknüpft mit ', 'Linked invoices' => 'Verknüpfte Rechnungen', 'Linked to...' => 'Verlinkt zu...', + 'Linking to Record' => 'Zum Beleg hinzufügen', 'Liquidity projection' => 'Liquiditätsübersicht', 'List' => 'Liste', 'List Accounts' => 'Konten anzeigen', @@ -2506,6 +2514,9 @@ $ ./scripts/installation_check.pl', 'No profit and loss carried forward chart configured!' => 'Kein Verlustvortragskonto konfiguriert!', 'No profit carried forward chart configured!' => 'Kein Gewinnvortragskonto konfiguriert!', 'No quotations or orders have been created yet.' => 'Es wurden noch keine Angebote oder Aufträge angelegt.', + 'No record is selected.' => 'Kein Beleg ausgewählt.', + 'No record type is selected.' => 'Kein Belegtyp ausgewählt.', + 'No records found.' => 'Keine Belege gefunden.', 'No report with id #1' => 'Es gibt keinen Report mit der Id #1', 'No requirement spec templates have been created yet.' => 'Es wurden noch keine Pflichtenheftvorlagen angelegt.', 'No results.' => 'Keine Artikel', @@ -2624,6 +2635,7 @@ $ ./scripts/installation_check.pl', 'Only due follow-ups' => 'Nur fällige Wiedervorlagen', 'Only groups that have been configured for the client the user logs in to will be considered.' => 'Allerdings werden nur diejenigen Gruppen herangezogen, die für den Mandanten konfiguriert sind.', 'Only list customer\'s projects in sales records' => 'Nur Projekte des Kunden in Verkaufsbelegen anzeigen', + 'Only open' => 'Nur offene', 'Only run tests from this file:' => 'Nur Tests aus dieser Datei ausführen:', 'Only shown in item mode' => 'werden nur im Artikelmodus angezeigt', 'Oops. No valid action found to dispatch. Please report this case to the kivitendo team.' => 'Ups. Es wurde keine gültige Funktion zum Aufrufen gefunden. Bitte berichten Sie diesen Fall den kivitendo-Entwicklern.', @@ -3035,6 +3047,7 @@ $ ./scripts/installation_check.pl', 'Prozentual/Absolut' => 'Prozentual/Absolut', 'Purchase' => 'Einkauf', 'Purchase (typeabbreviation)' => 'E', + 'Purchase Credit Note' => 'Einkaufsgutschrift', 'Purchase Delivery Order' => 'Einkaufslieferschein', 'Purchase Delivery Orders' => 'Einkaufslieferscheine', 'Purchase Delivery Orders deleteable' => 'Einkaufslieferscheine löschbar', @@ -3449,6 +3462,7 @@ $ ./scripts/installation_check.pl', 'Select from preset' => 'Aus Voreinstellung wählen', 'Select items for delivery order' => 'Positionen für Lieferschein auswählen', 'Select postscript or PDF!' => 'Postscript oder PDF auswählen!', + 'Select record type' => 'Belegtyp auswählen', 'Select tax office...' => 'Finanzamt auswählen...', 'Select template to paste' => 'Einzufügende Vorlage auswählen', 'Select type of removal' => 'Grund der Entnahme auswählen', @@ -3579,9 +3593,11 @@ $ ./scripts/installation_check.pl', 'Show "mark as paid" in sales invoices' => '"als bezahlt markieren" bei Verkaufsrechnungen anzeigen', 'Show AP transactions as part of AP invoice report' => 'Kreditorenbuchungen zusammen mit Verkaufsrechnungen anzeigen', 'Show AR transactions as part of AR invoice report' => 'Debitorenbuchungen zusammen mit Verkaufsrechnungen anzeigen', + 'Show Attachment' => 'Anhang anzeigen', 'Show Bestbefore' => 'Mindesthaltbarkeit anzeigen', 'Show E-Mails' => 'E-Mails anzeigen', 'Show Filter' => 'Filter zeigen', + 'Show Records' => 'Belege anzeigen', 'Show Salesman' => 'Verkäufer anzeigen', 'Show Stornos' => 'Stornos anzeigen', 'Show TODO list' => 'Aufgabenliste anzeigen', @@ -3733,7 +3749,9 @@ $ ./scripts/installation_check.pl', 'Storing the emails in the journal is currently disabled in the client configuration.' => 'Das Speichern von versendeten E-Mails ist derzeit in der Mandantenkonfigurierung abgeschaltet.', 'Storno' => 'Storno', 'Storno (one letter abbreviation)' => 'S', + 'Storno Credit Note' => 'Stornogutschrift', 'Storno Invoice' => 'Stornorechnung', + 'Storno Invoice for Advance Payment' => 'Stornorechnung für Anzahlung', 'Street' => 'Straße', 'Street (Shipping)' => 'Straße (Lieferung)', 'Street 1' => 'Straße 1', @@ -4683,6 +4701,7 @@ $ ./scripts/installation_check.pl', 'View RFQs' => 'Lieferantenanfragen ansehen', 'View SEPA export' => 'SEPA-Export-Details ansehen', 'View background job execution result' => 'Verlauf der Hintergrund-Job-Ausführungen anzeigen', + 'View email' => 'E-Mail anzeigen', 'View purchase delivery orders' => 'Einkaufslieferscheine ansehen', 'View purchase invoices' => 'Einkaufsrechungen ansehen', 'View purchase orders' => 'Lieferantenaufträge ansehen', @@ -4691,7 +4710,6 @@ $ ./scripts/installation_check.pl', 'View sales invoices and credit notes' => 'Rechnungen und Gutschriften ansehen', 'View sales orders' => 'Auftragsbestätigungen ansehen', 'View sales quotations' => 'Angebote ansehen', - 'View sent email' => 'Verschickte E-Mail anzeigen', 'View warehouse content' => 'Lagerbestand ansehen', 'View/edit all employees purchase documents' => 'Bearbeiten/ansehen der Einkaufsdokumente aller Mitarbeiter', 'View/edit all employees sales documents' => 'Bearbeiten/ansehen der Verkaufsdokumente aller Mitarbeiter', @@ -4747,6 +4765,7 @@ $ ./scripts/installation_check.pl', 'With Attachments' => 'Journal mit Anhängen', 'With Extension Of Time' => 'mit Dauerfristverlängerung', 'With Ignoring Onhand' => 'Ohne Prüfung auf Bestand', + 'With closed' => 'Mit geschlossenen', 'With the introduction of clients each client gets its own WebDAV folder.' => 'Mit der Einführung von Mandanten erhält jeder Mandant sein eigenes WebDAV-Verzeichnis.', 'Without Attachments' => 'Journal ohne Anhänge', 'Workflow' => 'Workflow', @@ -5077,6 +5096,7 @@ $ ./scripts/installation_check.pl', 'reclamation item' => 'Reklamationsitem', 'reclamation reasons' => 'Reklamationsgründe', 'record exchange rate' => 'Beleg-Wechselkurs', + 'record imported' => 'Belegimport', 'release_material' => 'Materialausgabebe', 'renew' => 'erneuern', 'reorder item' => 'Eintrag umsortieren', diff --git a/locale/en/all b/locale/en/all index 0129da1ac8..99b437b927 100644 --- a/locale/en/all +++ b/locale/en/all @@ -376,6 +376,7 @@ $self->{texts} = { 'Apply to transfers without bin' => '', 'Apply to transfers without comment' => '', 'Apply to transfers without warehouse' => '', + 'Apply with Attachment' => '', 'Apply year-end bookings' => '', 'Applying #1:' => '', 'Approximately #1 prices will be updated.' => '', @@ -860,7 +861,6 @@ $self->{texts} = { 'Create Invoice' => '', 'Create PDF' => '', 'Create Reclamation' => '', - 'Create Record with Attachment' => '', 'Create Sub-Version' => '', 'Create a new background job' => '', 'Create a new client' => '', @@ -908,6 +908,7 @@ $self->{texts} = { 'Create customers and vendors. Edit all vendors. Edit only customers where salesman equals employee (login)' => '', 'Create delivery order' => '', 'Create first invoice on' => '', + 'Create from Workflow' => '', 'Create invoice' => '', 'Create invoice?' => '', 'Create new' => '', @@ -1490,6 +1491,9 @@ $self->{texts} = { 'Either there are no open invoices, or you have already initiated bank transfers with the open amounts for those that are still open.' => '', 'Element disabled' => '', 'Email' => '', + 'Email Attachment Preview' => '', + 'Email Details' => '', + 'Email Journal Workflow' => '', 'Email Sender Dunning' => '', 'Email Sender Letter' => '', 'Email Sender Purchase Delivery Order' => '', @@ -1879,7 +1883,9 @@ $self->{texts} = { 'Here' => '', 'Here you only provide the credentials for logging into the database.' => '', 'Here\'s an example command line:' => '', + 'Hide Attachment' => '', 'Hide Filter' => '', + 'Hide Records' => '', 'Hide all details' => '', 'Hide buttons' => '', 'Hide by default' => '', @@ -2213,8 +2219,10 @@ $self->{texts} = { 'Link to invoice' => '', 'Link to the following project:' => '', 'Linked Records' => '', + 'Linked email and attachment to ' => '', 'Linked invoices' => '', 'Linked to...' => '', + 'Linking to Record' => '', 'Liquidity projection' => '', 'List' => '', 'List Accounts' => '', @@ -2505,6 +2513,9 @@ $self->{texts} = { 'No profit and loss carried forward chart configured!' => '', 'No profit carried forward chart configured!' => '', 'No quotations or orders have been created yet.' => '', + 'No record is selected.' => '', + 'No record type is selected.' => '', + 'No records found.' => '', 'No report with id #1' => '', 'No requirement spec templates have been created yet.' => '', 'No results.' => '', @@ -2623,6 +2634,7 @@ $self->{texts} = { 'Only due follow-ups' => '', 'Only groups that have been configured for the client the user logs in to will be considered.' => '', 'Only list customer\'s projects in sales records' => '', + 'Only open' => '', 'Only run tests from this file:' => '', 'Only shown in item mode' => '', 'Oops. No valid action found to dispatch. Please report this case to the kivitendo team.' => '', @@ -3034,6 +3046,7 @@ $self->{texts} = { 'Prozentual/Absolut' => '', 'Purchase' => 'Purchase', 'Purchase (typeabbreviation)' => 'P', + 'Purchase Credit Note' => '', 'Purchase Delivery Order' => '', 'Purchase Delivery Orders' => '', 'Purchase Delivery Orders deleteable' => '', @@ -3448,6 +3461,7 @@ $self->{texts} = { 'Select from preset' => '', 'Select items for delivery order' => '', 'Select postscript or PDF!' => '', + 'Select record type' => '', 'Select tax office...' => '', 'Select template to paste' => '', 'Select type of removal' => '', @@ -3578,9 +3592,11 @@ $self->{texts} = { 'Show "mark as paid" in sales invoices' => '', 'Show AP transactions as part of AP invoice report' => '', 'Show AR transactions as part of AR invoice report' => '', + 'Show Attachment' => '', 'Show Bestbefore' => '', 'Show E-Mails' => '', 'Show Filter' => '', + 'Show Records' => '', 'Show Salesman' => '', 'Show Stornos' => '', 'Show TODO list' => '', @@ -3732,7 +3748,9 @@ $self->{texts} = { 'Storing the emails in the journal is currently disabled in the client configuration.' => '', 'Storno' => '', 'Storno (one letter abbreviation)' => '', + 'Storno Credit Note' => '', 'Storno Invoice' => '', + 'Storno Invoice for Advance Payment' => '', 'Street' => '', 'Street (Shipping)' => '', 'Street 1' => '', @@ -4681,6 +4699,7 @@ $self->{texts} = { 'View RFQs' => '', 'View SEPA export' => '', 'View background job execution result' => '', + 'View email' => '', 'View purchase delivery orders' => '', 'View purchase invoices' => '', 'View purchase orders' => '', @@ -4689,7 +4708,6 @@ $self->{texts} = { 'View sales invoices and credit notes' => '', 'View sales orders' => '', 'View sales quotations' => '', - 'View sent email' => '', 'View warehouse content' => '', 'View/edit all employees purchase documents' => '', 'View/edit all employees sales documents' => '', @@ -4745,6 +4763,7 @@ $self->{texts} = { 'With Attachments' => '', 'With Extension Of Time' => '', 'With Ignoring Onhand' => '', + 'With closed' => '', 'With the introduction of clients each client gets its own WebDAV folder.' => '', 'Without Attachments' => '', 'Workflow' => '', @@ -5075,6 +5094,7 @@ $self->{texts} = { 'reclamation item' => '', 'reclamation reasons' => '', 'record exchange rate' => '', + 'record imported' => '', 'release_material' => '', 'renew' => '', 'reorder item' => '', diff --git a/templates/design40_webpages/email_journal/show.html b/templates/design40_webpages/email_journal/show.html index bf9d66705b..b743af9b52 100644 --- a/templates/design40_webpages/email_journal/show.html +++ b/templates/design40_webpages/email_journal/show.html @@ -52,7 +52,7 @@

[% FORM.title %]

[% L.hidden_tag('email_journal_id', SELF.entry.id) %] -

[% LxERP.t8("Email-Workflow") %]

+

[% LxERP.t8("Email Journal Workflow") %]

@@ -153,7 +153,6 @@

[% LxERP.t8("Email-Workflow") %]

{value => "0", name => LxERP.t8("Only open")}, ], default = 0, value_key='value', title_key='name', - class="wi-small", onchange='kivi.EmailJournal.update_record_list();' ) %]
diff --git a/templates/design40_webpages/email_journal/tabs/basic_data.html b/templates/design40_webpages/email_journal/tabs/basic_data.html index 5119ba5ffd..6c5560b925 100644 --- a/templates/design40_webpages/email_journal/tabs/basic_data.html +++ b/templates/design40_webpages/email_journal/tabs/basic_data.html @@ -10,7 +10,7 @@ [% INCLUDE 'generic/toggle_wrapper.html' %] - + diff --git a/templates/webpages/email_journal/show.html b/templates/webpages/email_journal/show.html index 50276cf18b..c17705a4ba 100644 --- a/templates/webpages/email_journal/show.html +++ b/templates/webpages/email_journal/show.html @@ -138,14 +138,12 @@

[% LxERP.t8("Attachments") %]

[% L.input_tag('cv_placeholder', '', style="color:black", class="wi-normal", disabled=1, - placeholder=LxERP.t8("Select record type first"), ) %]
[% 'E-Mail Details' | $T8 %][% 'Email Details' | $T8 %]
[% 'From' | $T8 %]