From c7f2d1238a0ebd39ea1acfdc7459deee4a95302e Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Mon, 14 May 2018 14:32:19 -0600
Subject: [PATCH] Translations & visual bugs from Stefan Unverricht

---
 importexport/lang/egw_de.lang                 |  5 +++++
 importexport/lang/egw_en.lang                 |  5 +++++
 .../templates/default/definition_index.xet    | 20 +++++++++----------
 importexport/templates/pixelegg/app.css       |  6 +++---
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/importexport/lang/egw_de.lang b/importexport/lang/egw_de.lang
index f7139db6dd..8986081faa 100644
--- a/importexport/lang/egw_de.lang
+++ b/importexport/lang/egw_de.lang
@@ -5,11 +5,13 @@
 %1 is not readable	importexport	de	%1 ist nicht lesbar
 %1 is not writable	importexport	de	%1 ist nicht möglich zu schreiben
 %1 records processed	importexport	de	%1 Einträge ausgeführt
+%s all users	importexport	en	%s all users
 %s just me	importexport	de	%s Nur für mich persönlich verfügbar
 (* for all)	importexport	de	(* Für alle)
 (0-23)	importexport	de	(0-23)
 (0-6, 0=sun)	importexport	de	(0-6, 0=Sonntag)
 *contact id cannot be changed by import	importexport	de	*Contact ID kann nicht durch den Import verändert werden
+add a new definition	importexport	de	Hinzufügen einer neuen Definition
 addressbook csv import	importexport	de	Adressen per CSV Importieren
 addressbook vcard import	importexport	de	Adressen per vCard Importieren
 admin disabled exporting	importexport	de	Ihr Administrator hat den Export deaktiviert
@@ -18,6 +20,7 @@ all users	importexport	de	Alle Benutzer
 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
 changed	importexport	de	Geändert
 changed allowed_users	importexport	de	Erlaubten Benutzer geändert
 changed owner	importexport	de	Besitzer geändert
@@ -110,6 +113,8 @@ schedule import | export	importexport	de	Zeitplan für Import/Export
 schedule not found	importexport	de	Kein Zeitplan gefunden
 schedule times are server time!  currently %s.	importexport	de	Zeitgesteuerter Import bezieht sich auf die Serverzeit. Aktuell %s.
 select definition	importexport	de	Definition auswählen
+select groups	importexport	de	Wähle Gruppen
+Select owner	importexport	de	Eigentümer auswählen
 select plugin	importexport	de	Plug-in auswählen
 select...	importexport	de	Auswählen...
 skipped	importexport	de	Überspringen
diff --git a/importexport/lang/egw_en.lang b/importexport/lang/egw_en.lang
index fc36ae1cc2..204b1741ce 100644
--- a/importexport/lang/egw_en.lang
+++ b/importexport/lang/egw_en.lang
@@ -5,11 +5,13 @@
 %1 is not readable	importexport	en	%1 is not readable.
 %1 is not writable	importexport	en	%1 is not writable.
 %1 records processed	importexport	en	%1 records processed.
+%s all users	importexport	en	%s all users
 %s just me	importexport	en	%s Just me
 (* for all)	importexport	en	(* for all)
 (0-23)	importexport	en	(0-23)
 (0-6, 0=sun)	importexport	en	(0-6, 0=Sun)
 *contact id cannot be changed by import	importexport	en	*Contact ID cannot be changed by import
+add a new definition	importexport	en	Add a new definition
 addressbook csv import	importexport	en	Addressbook CSV Import
 addressbook vcard import	importexport	en	Addressbook vCard import
 admin disabled exporting	importexport	en	Admin disabled exporting
@@ -18,6 +20,7 @@ all users	importexport	en	all users
 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
 changed	importexport	en	Changed
 changed allowed_users	importexport	en	Changed allowed users
 changed owner	importexport	en	Changed owner
@@ -110,6 +113,8 @@ schedule import | export	importexport	en	Schedule import | export
 schedule not found	importexport	en	Schedule not found.
 schedule times are server time!  currently %s.	importexport	en	Schedule times are server time!  Currently %s.
 select definition	importexport	en	Select definition
+select groups	importexport	en	Select groups
+Select owner	importexport	en	Select owner
 select plugin	importexport	en	Select plugin
 select...	importexport	en	Select...
 skipped	importexport	en	Skipped
diff --git a/importexport/templates/default/definition_index.xet b/importexport/templates/default/definition_index.xet
index ac338fa58f..cf82c83cf7 100644
--- a/importexport/templates/default/definition_index.xet
+++ b/importexport/templates/default/definition_index.xet
@@ -49,24 +49,24 @@
 			<vbox class="action_popup-content">
 				<description value="Select owner"/>
 				<listbox type="select-account" id="owner" options="None,accounts"/>
-				<hbox>
-					<button id="save_owner" label="Save" onclick="nm_submit_popup(this); return false;"/>
-					<buttononly label="Cancel" onclick="nm_hide_popup(this,'owner_popup');"/>
-				</hbox>
 			</vbox>
+			<hbox>
+				<button id="save_owner" label="Save" onclick="nm_submit_popup(this); return false;" image="save" background_image="1"/>
+				<buttononly id="cancel_owner" label="Cancel" onclick="nm_hide_popup(this,'owner_popup');" image="cancel" background_image="1"/>
+			</hbox>
 		</box>
 		<box id="allowed_popup" class="action_popup prompt">
-			<vbox>
-				<description value="Change allowed users" class="promptheader"/>
+			<description value="Change allowed users" class="promptheader"/>
+			<vbox class="action_popup-content">
 				<description value="Select groups"/>
 				<checkbox label="%s Just me" id="allowed_private"/>
 				<checkbox label="%s All users" id="all_users"/>
 				<listbox type="select-account" id="allowed" rows="5" account_type="groups"/>
-				<hbox>
-					<button id="save_allowed" label="Save" onclick="nm_submit_popup(this); return false;" image="save" background_image="1"/>
-					<buttononly label="Cancel" onclick="nm_hide_popup(this,'allowed_popup');" image="cancel" background_image="1"/>
-				</hbox>
 			</vbox>
+			<hbox>
+				<button id="save_allowed" label="Save" onclick="nm_submit_popup(this); return false;" image="save" background_image="1"/>
+				<buttononly id="cancel_allowed" label="Cancel" onclick="nm_hide_popup(this,'allowed_popup');" image="cancel" background_image="1"/>
+			</hbox>
 		</box>
 		<styles>
 			td.lr_padding { padding-left: 5px; padding-right: 5px; }
diff --git a/importexport/templates/pixelegg/app.css b/importexport/templates/pixelegg/app.css
index db50f988af..79b602ef82 100755
--- a/importexport/templates/pixelegg/app.css
+++ b/importexport/templates/pixelegg/app.css
@@ -60,7 +60,7 @@ div.preview .content {
   width: 400px;
 }
 #importexport-export_dialog_importexport-export_dialog-general_tab_content table.et2_grid tr:nth-child(even) {
-  background: #FFFFFF;
+  background: #ffffff;
 }
 #importexport-export_dialog_importexport-export_dialog-general_tab_content table.et2_grid tr:nth-child(odd) {
   background: #f2f2f2;
@@ -70,7 +70,7 @@ div.preview .content {
 }
 /* Tab Auswahl*/
 #importexport-export_dialog_importexport-export_dialog-selection_tab table.et2_grid tr:nth-child(even) {
-  background: #FFFFFF;
+  background: #ffffff;
 }
 #importexport-export_dialog_importexport-export_dialog-selection_tab table.et2_grid tr:nth-child(odd) {
   background: #f2f2f2;
@@ -80,7 +80,7 @@ div.preview .content {
 }
 /* Tab Optionen*/
 #importexport-export_dialog_importexport-export_dialog-options_tab table.et2_grid tr:nth-child(even) {
-  background: #FFFFFF;
+  background: #ffffff;
 }
 #importexport-export_dialog_importexport-export_dialog-options_tab table.et2_grid tr:nth-child(odd) {
   background: #f2f2f2;