translatable categories and other translations added

4 files changed, 40 insertions, 21 deletions

diff --git a/apps/calendar/ajax/newevent.php b/apps/calendar/ajax/newevent.php
index f3b95aae4ba..827cfa014a9 100644
--- a/apps/calendar/ajax/newevent.php
+++ b/apps/calendar/ajax/newevent.php
@@ -144,7 +144,7 @@ if($errnum != 0){
 		$des = str_replace("\n","\\n", $description);
 		$data .= "DESCRIPTION:" . $des . "\n";
 	}
-	if($cat != "none"){
+	if($cat != $l->t("None")){
 		$data .= "CATEGORIES:" . $cat . "\n";
 	}
 	if($repeat == "true"){
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index 325a323d57a..7bebba20695 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -12,7 +12,8 @@
 "Attendees" => "Teilnehmer",
 "Description" => "Beschreibung",
 "Submit" => "Speichern",
-"Reset" => "Zurücksetzen",
+"Save" => "Speichern",
+"Cancel" => "Abbrechen",
 "Title" => "Titel",
 "Sunday" => "Sonntag",
 "Monday" => "Montag",
@@ -71,7 +72,25 @@
 "Monthly" => "Monatlich",
 "Yearly" => "Jährlich",
 "Description of the Event" => "Beschreibung des Termins",
-"" => "",
+"None" => "Keine",
+"Birthday" => "Geburtstag",
+"Business" => "Geschäftlich",
+"Call" => "Anrufen",
+"Clients" => "Kunden",
+"Deliverer" => "Lieferanten",
+"Holidays" => "Ferien",
+"Ideas" => "Ideen",
+"Journey" => "Reise",
+"Jubilee" => "Jubiläum",
+"Meeting" => "Treffen",
+"Other" => "Andere",
+"Personal" => "Persönlich",
+"Projects" => "Projekte",
+"Questions" => "Fragen",
+"Work" => "Arbeit",
+"New Calendar" => "Neuer Kalendar",
+"Displayname" => "Anzeigename",
+"Calendar color" => "Kalendarfarbe",
 "" => "",
 "" => ""
 );
diff --git a/apps/calendar/templates/part.choosecalendar.php b/apps/calendar/templates/part.choosecalendar.php
index 500e0a4ca21..82bd1ff5ab3 100644
--- a/apps/calendar/templates/part.choosecalendar.php
+++ b/apps/calendar/templates/part.choosecalendar.php
@@ -17,7 +17,7 @@ for($i = 0; $i < count($option_calendars); $i++){
 </tr>
 <tr>
 	<td colspan="4">
-		<input style="display:none;width: 90%;margin: 0 auto;" type="text" id="caldav_url" onmouseover="document.getElementById('caldav_url').select();" title="<?php echo $l->t("CalDav Link"); ?>">
+		<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="caldav_url" onmouseover="document.getElementById('caldav_url').select();" title="<?php echo $l->t("CalDav Link"); ?>"><img id="caldav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="../../core/img/actions/delete.svg" alt="close" onclick="document.getElementById('caldav_url').style.display = 'none';document.getElementById('caldav_url_close').style.display = 'none';"/></p>
 	</td>
 </tr>
 </table>
@@ -37,5 +37,6 @@ for($i = 0; $i < count($option_calendars); $i++){
 	function showcaldavurl(username, calname){
 		document.getElementById("caldav_url").value = totalurl + "/" + username + "/" + calname;
 		document.getElementById("caldav_url").style.display = "block";
+		document.getElementById("caldav_url_close").style.display = "block";
 	}
 </script>
diff --git a/apps/calendar/templates/part.newevent.php b/apps/calendar/templates/part.newevent.php
index 692be344dec..6260f2337ef 100644
--- a/apps/calendar/templates/part.newevent.php
+++ b/apps/calendar/templates/part.newevent.php
@@ -20,23 +20,22 @@
 			<td width="75px"><?php echo $l -> t("Category");?>:</td>
 			<td>
 			<select class="formselect" id="formcategorie_select" style="width:140px;" id="newevent_cat">
-				<option>none</option>
-				<option>Birthday</option>
-				<option>Business</option>
-				<option>Call</option>
-				<option>Clients</option>
-				<option>Customer</option>
-				<option>Deliverer</option>
-				<option>Holidays</option>
-				<option>Ideas</option>
-				<option>Journey</option>
-				<option>Jubilee</option>
-				<option>Meeting</option>
-				<option>Other</option>
-				<option>Personal</option>
-				<option>Projects</option>
-				<option>Questions</option>
-				<option>Work</option>
+				<option><?php echo $l->t("None"); ?></option>
+				<option><?php echo $l->t("Birthday"); ?></option>
+				<option><?php echo $l->t("Business"); ?></option>
+				<option><?php echo $l->t("Call"); ?></option>
+				<option><?php echo $l->t("Clients"); ?></option>
+				<option><?php echo $l->t("Deliverer"); ?></option>
+				<option><?php echo $l->t("Holidays"); ?></option>
+				<option><?php echo $l->t("Ideas"); ?></option>
+				<option><?php echo $l->t("Journey"); ?></option>
+				<option><?php echo $l->t("Jubilee"); ?></option>
+				<option><?php echo $l->t("Meeting"); ?></option>
+				<option><?php echo $l->t("Other"); ?></option>
+				<option><?php echo $l->t("Personal"); ?></option>
+				<option><?php echo $l->t("Projects"); ?></option>
+				<option><?php echo $l->t("Questions"); ?></option>
+				<option><?php echo $l->t("Work"); ?></option>
 			</select></td>
 			<td width="75px">&nbsp;&nbsp;&nbsp;<?php echo $l -> t("Calendar");?>:</td>
 			<td>