From 5d68fba0a924b9a91728d2cd7601e7b53ec88ec1 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 1 Aug 2019 13:23:47 -0600
Subject: [PATCH] ImportExport - Missing translations from Stefan Unverricht

---
 importexport/lang/egw_de.lang                 |   3 +
 importexport/lang/egw_en.lang                 |   3 +
 .../wizard_basic_import_csv.conditions.xet    |   2 +-
 importexport/templates/pixelegg/app.css       |   1 -
 importexport/templates/pixelegg/app.less      | 103 +++++++++---------
 5 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/importexport/lang/egw_de.lang b/importexport/lang/egw_de.lang
index cabebbdc53..32597ef875 100644
--- a/importexport/lang/egw_de.lang
+++ b/importexport/lang/egw_de.lang
@@ -22,6 +22,7 @@ allowed users	importexport	de	Erlaubte Benutzer
 automatically created by importexport	importexport	de	Wurde automatisch vom Import/Export Modul erstellt
 basic csv import	importexport	de	Basis CSV Import
 change allowed users	importexport	de	Erlaubte Benutzer ändern
+change owner when updating	importexport	de	Besitzer ändern bei der Aktualisierung
 changed	importexport	de	Geändert
 changed allowed_users	importexport	de	Erlaubten Benutzer geändert
 changed owner	importexport	de	Besitzer geändert
@@ -37,6 +38,7 @@ column mismatch: %1 should be %2, not %3	importexport	de	Zuordnungsfehler in der
 condition	importexport	de	Bedingungen
 copied	importexport	de	Kopiert
 create a <a href="%1">new definition</a> for this file	importexport	de	Erstellen Sie hier <a href="%1">Neue Definition</a> für Ihre Importdatei
+create a matching export definition based on this import definition	importexport	de	Erstellt eine passende Exportdefinition, die auf dieser Importdefinition basiert
 create export	importexport	de	Exportdefinition erstellen
 created	importexport	de	erstellt
 csv field	importexport	de	CSV Feld (Importdatei)
@@ -148,6 +150,7 @@ user template folder	importexport	de	Vorlagenverzeichnis verwenden
 users allowed to create their own definitions	importexport	de	Benutzern erlauben, Ihre eigenen Definitionen zu erstellen.
 users allowed to share their own definitions	importexport	de	Benutzer dürfen Ihre Profile auch anderen Nutzern zur Verfügung stellen.
 warnings	importexport	de	Warnungen
+what should be done with unknown values?	importexport	de	Was soll mit unbekannten Werten gemacht werden?
 which useres are allowed for this definition	importexport	de	Welche Benutzer dürfen diese Definition verwenden?
 which users are allowed to use this definition	importexport	de	Welche Benutzer dürfen die Definition benutzen?
 you may want to <a href="%1" target="_new">backup</a> first.	importexport	de	Erstellen Sie eine <a href="%1" target="_new">Sicherung Ihrer bestehenden Daten</a> bevor Sie den Import starten. Für einen erstmaligen Import benötigen Sie ein neues Importprofil.
diff --git a/importexport/lang/egw_en.lang b/importexport/lang/egw_en.lang
index 3439e0b747..ca87ed63f6 100644
--- a/importexport/lang/egw_en.lang
+++ b/importexport/lang/egw_en.lang
@@ -22,6 +22,7 @@ allowed users	importexport	en	Allowed users
 automatically created by importexport	importexport	en	Automatically created by Import|Export
 basic csv import	importexport	en	Basic CSV import
 change allowed users	importexport	en	Change allowed users
+change owner when updating	importexport	en	Change owner when updating
 changed	importexport	en	Changed
 changed allowed_users	importexport	en	Changed allowed users
 changed owner	importexport	en	Changed owner
@@ -37,6 +38,7 @@ column mismatch: %1 should be %2, not %3	importexport	en	Column mismatch: %1 sho
 condition	importexport	en	Condition
 copied	importexport	en	Copied.
 create a <a href="%1">new definition</a> for this file	importexport	en	Create a <a href="%1">new definition</a> for this file
+create a matching export definition based on this import definition	importexport	en	Create a matching export definition based on this import definition
 create export	importexport	en	Create export
 created	importexport	en	created
 csv field	importexport	en	CSV field
@@ -148,6 +150,7 @@ user template folder	importexport	en	User template folder
 users allowed to create their own definitions	importexport	en	Users allowed to create their own definitions
 users allowed to share their own definitions	importexport	en	Users allowed to share their own definitions
 warnings	importexport	en	Warnings
+what should be done with unknown values?	importexport	en	What should be done with unknown values?
 which useres are allowed for this definition	importexport	en	Which users are allowed to use this definition
 which users are allowed to use this definition	importexport	en	Which users are allowed to use this definition
 you may want to <a href="%1" target="_new">backup</a> first.	importexport	en	You may want to <a href="%1" target="_new">backup</a> first.
diff --git a/importexport/templates/default/wizard_basic_import_csv.conditions.xet b/importexport/templates/default/wizard_basic_import_csv.conditions.xet
index 4a34a6fd56..b8b19588cc 100644
--- a/importexport/templates/default/wizard_basic_import_csv.conditions.xet
+++ b/importexport/templates/default/wizard_basic_import_csv.conditions.xet
@@ -4,7 +4,7 @@
 <overlay>
 	<template id="importexport.wizard_basic_import_csv.conditions" template="" lang="" group="0" version="1.9.002">
 		<vbox cols="4" rows="1">
-			<description value="How to merge with existing data?  For each record, all conditions are evaluated from top to bottom, or stop.  For blind insert, leave blank.  " class="condition_help"/>
+			<description value="How to merge with existing data? For each record, all conditions are evaluated from top to bottom, or stop. For blind insert, leave blank." class="condition_help"/>
 			<grid id="conditions">
 				<columns>
 					<column/>
diff --git a/importexport/templates/pixelegg/app.css b/importexport/templates/pixelegg/app.css
index 79b602ef82..230ceeee60 100755
--- a/importexport/templates/pixelegg/app.css
+++ b/importexport/templates/pixelegg/app.css
@@ -130,7 +130,6 @@ div.preview .content {
   margin: 0.5em;
 }
 .wizard_content #importexport-wizardbox_importexport-wizard_basic_import_csv-conditions .condition_help {
-  font-size: 15px;
   line-height: 2em;
   border-bottom: 10px solid transparent;
 }
diff --git a/importexport/templates/pixelegg/app.less b/importexport/templates/pixelegg/app.less
index 23e5f7e4c8..f9220d4188 100755
--- a/importexport/templates/pixelegg/app.less
+++ b/importexport/templates/pixelegg/app.less
@@ -24,48 +24,48 @@
 
 
     img {.dimension_height_m;}
-    
+
     .et2_tabcntr {height: 354px;}
-    
+
 }
 
 /* Tab General*/
  #importexport-export_dialog_importexport-export_dialog-general_tab_content {
-        
-      width: 400px;  
-      
+
+      width: 400px;
+
       table.et2_grid {
         tr:nth-child(even) {background: @color_even;}
-        tr:nth-child(odd) {background: @color_odd;}  
+        tr:nth-child(odd) {background: @color_odd;}
           td {padding: 0.5em;}
-          
+
       }
-      
+
     }
-    
+
 /* Tab Auswahl*/
 #importexport-export_dialog_importexport-export_dialog-selection_tab {
-    
+
          table.et2_grid {
         tr:nth-child(even) {background: @color_even;}
-        tr:nth-child(odd) {background: @color_odd;}  
+        tr:nth-child(odd) {background: @color_odd;}
           td {padding: 0.5em;}
-          
-      } 
-    
-    
+
+      }
+
+
 }
 
 /* Tab Optionen*/
 #importexport-export_dialog_importexport-export_dialog-options_tab{
         table.et2_grid {
         tr:nth-child(even) {background: @color_even;}
-        tr:nth-child(odd) {background: @color_odd;}  
+        tr:nth-child(odd) {background: @color_odd;}
           td {padding: 0.5em;}
-          
+
       }
-    
-    
+
+
 }
 
 /**
@@ -74,73 +74,72 @@
  */
 
  // First
- .wizard_content { 
- 
+ .wizard_content {
+
      #importexport-wizardbox_importexport-wizard_chooseapp,
      #importexport-wizardbox_importexport-wizard_chooseplugin,
      #importexport-wizardbox_importexport-wizard_choosename,
      #importexport-wizardbox_importexport-wizard_basic_import_csv-sample_file,
      #importexport-wizardbox_addressbook-importexport_wizard_vcard_charset{
-         
+
          margin: 15em 0 0 10em;
-         
+
          table.et2_grid{font-size: 15px;}
          /*#importexport-wizardbox_msg{font-size: 2em;}*/
-         
+
          input.et2_textbox{width: 100%;}
-         
+
      }
-     
-     
+
+
      // Filter
      #importexport-wizardbox_importexport-wizard_basic_import_csv-choosesepncharset,
      #importexport-wizardbox_importexport-wizard_basic_import_csv-fieldmapping{
-         
+
          margin: 0.5em;
-      
-        table.et2_grid tr:first-child{height: 62px;} 
-         
+
+        table.et2_grid tr:first-child{height: 62px;}
+
       .et2_label#importexport-wizardbox_msg {font-size: 15px;}
-         
-         
+
+
      }
-     
+
      // Help
      #importexport-wizardbox_importexport-wizard_basic_import_csv-conditions{
-         
+
         margin: 0.5em;
-        
+
         .condition_help {
-                    font-size: 15px;
                     line-height: 2em;
                     border-bottom: 10px solid transparent;
                     }
-                    
-         .et2_label#importexport-wizardbox_msg {font-size: 15px;}           
-         
+
+         .et2_label#importexport-wizardbox_msg {font-size: 15px;}
+
      }
-     
+
      // Choose Owner
      #importexport-wizardbox_addressbook-importexport_wizard_vcard_chooseowner,
      #importexport-wizardbox_addressbook-importexport_wizard_chooseowner{
           margin: 0.5em;
-      
-        table.et2_grid tr:first-child{height: 62px;} 
-         
+
+        table.et2_grid tr:first-child{height: 62px;}
+
       .et2_label#importexport-wizardbox_msg {font-size: 15px;}
      }
-     
+
      // choose
      #importexport-wizardbox_importexport-wizard_chooseallowedusers{
-         
+
       margin: 0.5em;
-      
-      table.et2_grid tr:first-child{height: 62px;} 
-         
-      .et2_label#importexport-wizardbox_msg {font-size: 15px;}  
-         
+
+      table.et2_grid tr:first-child{height: 62px;}
+
+      .et2_label#importexport-wizardbox_msg {font-size: 15px;}
+
      }
-     
+
  }