From: Jan Büren Date: Thu, 10 Feb 2022 11:58:58 +0000 (+0100) Subject: Merge pull request #34 from kivitendo/warengruppen_pflichtfeld X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~219 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/670a6e6cb58ccaef212150406b66a955295fe074?ds=inline;hp=-c Merge pull request #34 from kivitendo/warengruppen_pflichtfeld Mandantenkonfiguration - Warengruppe als Pflichtfeld --- 670a6e6cb58ccaef212150406b66a955295fe074 diff --combined locale/de/all index 663af4216,0807feb38..1f8d087e3 --- a/locale/de/all +++ b/locale/de/all @@@ -649,6 -649,7 +649,6 @@@ $self->{texts} = 'Check Details' => 'Bitte Angaben überprüfen', 'Check connectivity' => 'Verbindungstest', 'Check for duplicates' => 'Dublettencheck', - 'Check full signature' => 'Volle Signatur prüfen', 'Check on ap transaction' => 'Prüfen bei Kreditorenbuchung', 'Check on ar transaction' => 'Prüfen bei Debitorenbuchung', 'Check on gl transaction' => 'Prüfen bei Dialogbuchung', @@@ -697,7 -698,6 +697,7 @@@ 'Company name' => 'Firmenname', 'Company name and address' => 'Firmenname und -adresse', 'Company settings' => 'Firmeneinstellungen', + 'Company\'s email signature' => 'Firmen-E-Mail-Signatur', 'Compare to' => 'Gegenüberstellen zu', 'Complexities' => 'Komplexitätsgrade', 'Complexity' => 'Komplexität', @@@ -1328,15 -1328,14 +1328,15 @@@ 'Edit time recordings of all staff members' => 'Zeiterfassungseinträge aller Mitarbeiter bearbeiten', 'Edit title' => 'Titiel bearbeiten', 'Edit units' => 'Einheiten bearbeiten', - 'Edit user signature' => 'Benutzersignatur bearbeiten', 'Editable' => 'Bearbeitbar', '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 address' => 'E-Mail-Adresse', 'Email journal' => 'E-Mail-Journal', 'Email of the delivery order recipient' => 'E-Mail des Lieferscheinempfängers', 'Email of the invoice recipient' => 'E-Mail des Rechnungsempfängers', + 'Email signature' => 'E-Mail-Signatur', 'Employee' => 'Bearbeiter', 'Employee #1 saved!' => 'Benutzer #1 gespeichert!', 'Employee (database ID)' => 'Bearbeiter (Datenbank-ID)', @@@ -1728,6 -1727,7 +1728,7 @@@ 'If enabled purchase and sales records cannot be saved if no transaction description has been entered.' => 'Wenn angeschaltet, so können Einkaufs- und Verkaufsbelege nicht gespeichert werden, solange keine Vorgangsbezeichnung eingegeben wurde.', 'If enabled sales invoices created using OpenDocument/OASIS format will include data for Swiss QR-Bill creation.' => 'Falls aktiviert, enthalten Rechnungen im OpenDocument/OASIS Format, Daten zur Schweizer QR-Rechnung.', 'If enabled the record links view starts always from the sales order including all sublevels' => 'Falls aktiv, werden die verknüpften Belege immer vom Verkaufsauftrag inkl. aller darunterliegenden Belege angezeigt', + 'If enabled, when saving parts the partsgroup must be not be empty.' => 'Falls aktiviert muß beim Speichern von Artikeln eine Warengruppe ausgewählt sein.', 'If item not found, allow creation of new item' => 'Falls Artikel nicht gefunden, erlaube Erfassen eines Neuen', 'If left empty the default sender from the kivitendo configuration will be used (key \'email_from\' in section \'periodic_invoices\'; current value: #1).' => 'Falls leer, so wird der Standardabsender aus der kivitendo-Konfiguration genutzt (Schlüssel »email_from« in Abschnitt »periodic_invoices«; aktueller Wert: #1).', 'If missing then the start date will be used.' => 'Falls es fehlt, so wird die erste Rechnung für das Startdatum erzeugt.', @@@ -2443,6 -2443,7 +2444,7 @@@ 'Partsgroup' => 'Warengruppe', 'Partsgroup (database ID)' => 'Warengruppe (Datenbank-ID)', 'Partsgroup (name)' => 'Warengruppe (Name)', + 'Partsgroup is required for parts' => 'Warengruppe ist Pflichtfeld für Artikel', 'Partsgroups' => 'Warengruppen', 'Partsgroups where variables are shown' => 'Warengruppen, bei denen Variablen angezeigt werden', 'Password' => 'Passwort', @@@ -3615,6 -3616,7 +3617,7 @@@ 'The parts for this delivery order have already been transferred out.' => 'Die Artikel dieses Lieferscheins wurden bereits ausgelagert.', 'The parts have been removed.' => 'Die Waren wurden aus dem Lager entnommen.', 'The parts have been transferred.' => 'Die Waren wurden umgelagert.', + 'The partsgroup is missing.' => 'Die Warengruppe fehlt.', 'The password is too long (maximum length: #1).' => 'Das Passwort ist zu lang (maximale Länge: #1).', 'The password is too short (minimum length: #1).' => 'Das Password ist zu kurz (minimale Länge: #1).', 'The password is weak (e.g. it can be found in a dictionary).' => 'Das Passwort ist schwach (z.B. wenn es in einem Wörterbuch steht).', diff --combined locale/en/all index 7d5c50291,8ae48e1a8..aabb43ca3 --- a/locale/en/all +++ b/locale/en/all @@@ -649,6 -649,7 +649,6 @@@ $self->{texts} = 'Check Details' => '', 'Check connectivity' => '', 'Check for duplicates' => '', - 'Check full signature' => '', 'Check on ap transaction' => '', 'Check on ar transaction' => '', 'Check on gl transaction' => '', @@@ -697,7 -698,6 +697,7 @@@ 'Company name' => '', 'Company name and address' => '', 'Company settings' => '', + 'Company\'s email signature' => '', 'Compare to' => '', 'Complexities' => '', 'Complexity' => '', @@@ -1328,15 -1328,14 +1328,15 @@@ 'Edit time recordings of all staff members' => '', 'Edit title' => '', 'Edit units' => '', - 'Edit user signature' => '', 'Editable' => '', '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 address' => '', 'Email journal' => '', 'Email of the delivery order recipient' => '', 'Email of the invoice recipient' => '', + 'Email signature' => '', 'Employee' => '', 'Employee #1 saved!' => '', 'Employee (database ID)' => '', @@@ -1728,6 -1727,7 +1728,7 @@@ 'If enabled purchase and sales records cannot be saved if no transaction description has been entered.' => '', 'If enabled sales invoices created using OpenDocument/OASIS format will include data for Swiss QR-Bill creation.' => '', 'If enabled the record links view starts always from the sales order including all sublevels' => '', + 'If enabled, when saving parts the partsgroup must be not be empty.' => '', 'If item not found, allow creation of new item' => '', 'If left empty the default sender from the kivitendo configuration will be used (key \'email_from\' in section \'periodic_invoices\'; current value: #1).' => '', 'If missing then the start date will be used.' => '', @@@ -2443,6 -2443,7 +2444,7 @@@ 'Partsgroup' => '', 'Partsgroup (database ID)' => '', 'Partsgroup (name)' => '', + 'Partsgroup is required for parts' => '', 'Partsgroups' => '', 'Partsgroups where variables are shown' => '', 'Password' => '', @@@ -3614,6 -3615,7 +3616,7 @@@ 'The parts for this delivery order have already been transferred out.' => '', 'The parts have been removed.' => '', 'The parts have been transferred.' => '', + 'The partsgroup is missing.' => '', 'The password is too long (maximum length: #1).' => '', 'The password is too short (minimum length: #1).' => '', 'The password is weak (e.g. it can be found in a dictionary).' => '',