From 1325740df143bbcb32cc13458416843e09dad892 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Tue, 28 Jun 2016 08:58:19 -0600
Subject: [PATCH] Add tooltip explaining private flag in calendar edit dialog

---
 calendar/lang/egw_de.lang           | 1 +
 calendar/lang/egw_en.lang           | 1 +
 calendar/templates/default/edit.xet | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/calendar/lang/egw_de.lang b/calendar/lang/egw_de.lang
index ba46fea30f..5b840f2ff9 100644
--- a/calendar/lang/egw_de.lang
+++ b/calendar/lang/egw_de.lang
@@ -317,6 +317,7 @@ location, start- and endtimes, ...	calendar	de	Ort, Start- und Endzeiten
 mail all participants	calendar	de	Mail an alle Teilnehmer
 make freebusy information available to not loged in persons?	calendar	de	Die freien/nicht verfügbaren Zeiten für nicht angemeldete Personen sichtbar machen?
 manage mapping	calendar	de	Feldzuordnungen verwalten
+mark event as private to hide title and description	calendar	de	Kennzeichnet Termin als privat und unterdrückt Sichtbarkeit von Titel und Beschreibung
 max. number of entries to show (leave empty for no restriction)	calendar	de	Max. Anzahl von Einträgen die angezeigt werden sollen (Kein Eintrag = Keine Beschränkung)
 maximum available quantity of %1 exceeded!	calendar	de	Maximale Anzahl von %1 erreicht!
 meeting canceled	calendar	de	Termin abgesagt
diff --git a/calendar/lang/egw_en.lang b/calendar/lang/egw_en.lang
index 6819ac5bc6..13d7f77f8a 100644
--- a/calendar/lang/egw_en.lang
+++ b/calendar/lang/egw_en.lang
@@ -317,6 +317,7 @@ location, start- and endtimes, ...	calendar	en	Location, start and end times, ..
 mail all participants	calendar	en	Mail all participants
 make freebusy information available to not loged in persons?	calendar	en	Make Free/Busy information available to not logged in persons
 manage mapping	calendar	en	Manage mapping
+mark event as private to hide title and description	calendar	en	Mark event as private to hide title and description
 max. number of entries to show (leave empty for no restriction)	calendar	en	Max. number of entries to show. Leave empty for no restriction.
 maximum available quantity of %1 exceeded!	calendar	en	Maximum available quantity of %1 exceeded!
 meeting canceled	calendar	en	Meeting canceled
diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index acffc86ea5..aacacb693f 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -210,15 +210,15 @@
 					<description for="start" value="Start" width="88"/>
 					<date-time id="start" needed="1" class="required" onchange="app.calendar.edit_update_participant"/>
 					<description for="duration" value="Duration" id="calendar_edit_duration" />
-					<menulist >
+					<menulist>
 						<menupopup statustext="Duration of the meeting" class="et2_fullWidth" id="duration" no_lang="1" onchange="app.calendar.set_enddate_visibility" options="Use end date,,,,,,,false"/>
 					</menulist>
 					<date-time id="end" onchange="app.calendar.edit_update_participant"/>
 				</row>
 				<row class="dialogHeader2" height="28">
 					<label value="options"/>
-					<checkbox  statustext="Event will occupy the whole day" label="whole day" id="whole_day" onchange="app.calendar.set_alarmOptions_WD"/>
-					<checkbox label="Private" id="public" options="0,1"/>
+					<checkbox statustext="Event will occupy the whole day" label="whole day" id="whole_day" onchange="app.calendar.set_alarmOptions_WD"/>
+					<checkbox label="Private" id="public" options="0,1" statustext="Mark event as private to hide title and description"/>
 					<checkbox statustext="A non blocking event will not conflict with other events" label="non blocking" id="non_blocking" options="1,0, ,disable"/>
 					<hbox>
 						<label for="priority" value="Priority"/>