Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d1776c80 authored by Georg Ehrke's avatar Georg Ehrke
Browse files

Merge tag 'v1.5.7' into stable1.5 

Calendar version 1.5.7
parents d6240c1b 598c97f5

CHANGELOG.md

+11 −0
Original line number Diff line number Diff line 
## 1.5.7 0 2017-12-08

### Fixed

- Issue with displaying wrong year in upper left corner for certain cases

  [#434](https://github.com/nextcloud/calendar/issues/434)

- Don't allow importing events with the same UID in a calendar

  [#589](https://github.com/nextcloud/calendar/issues/589)

- Show warning about email reminders not being implemented in the server yet

  [#676](https://github.com/nextcloud/calendar/pull/676)

- Double escaping of alarm types in the event editor

  [#269](https://github.com/nextcloud/calendar/issues/269)



## 1.5.6 - 2017-10-18

### Fixed

- Issue with sharing read-write with users

appinfo/info.xml

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
* 🙋 **Attendees!** Invite people to your events.

* 🙈 **We’re not reinventing the wheel!** Based on the great [davclient.js](https://github.com/evert/davclient.js), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.

	]]></description>

	<version>1.5.6</version>

	<version>1.5.7</version>

	<licence>agpl</licence>

	<namespace>Calendar</namespace>

	<author homepage="https://georg.coffee">Georg Ehrke</author>

l10n/de.js

+35 −0
Original line number Diff line number Diff line
@@ -74,12 +74,46 @@ OC.L10N.register( 
    "end" : "Ende",

    "Editing reminders of unknown type not supported." : "Das Ändern von Erinnerungen unbekannten Typs wird nicht unterstützt.",

    "Week {number} of {year}" : "Woche {number} aus {year}",

    "Successfully imported {imported} objects" : "Erfolgreich {imported} Objekte importiert ",

    "Imported {imported} out of {all}, skipped one duplicate" : "{imported} von {all} importiert, ein Duplikat übersprungen",

    "Imported {imported} out of {all}, one failure" : "{imported} von {all} importiert, ein Fehler",

    "Imported {imported} out of {all}, {errors} failures" : "{imported} von {all} importiert, {errors} Fehler",

    "Imported {imported} out of {all}, skipped {duplicates} duplicates" : "{imported} von {all} importiert, {duplicates} Duplikate übersprungen",

    "Imported {imported} out of {all}, {errors} failures, skipped {duplicates} duplicates" : "{imported} von {all} importiert, {errors} Fehler, {duplicates} Duplikate übersprungen",

    "Audio alarm {time} before the event starts" : "Audio-Alarm {time} bevor das Ereignis startet",

    "Pop-up {time} before the event starts" : "Pop-Up-Meldung {time} bevor das Ereignis startet",

    "Email {time} before the event starts" : "E-Mail {time} bevor das Ereignis startet",

    "None {time} before the event starts" : "Keine Aktion {time} bevor das Ereignis startet",

    "{type} {time} before the event starts" : "{type} {time} vor Beginn des Ereignisses",

    "Audio alarm {time} before the event ends" : "Audio-Alarm {time} bevor das Ereignis endet",

    "Pop-up {time} before the event ends" : "Pop-Up-Meldung {time} bevor das Ereignis endet",

    "Email {time} before the event ends" : "E-Mail {time} bevor das Ereignis endet",

    "None {time} before the event ends" : "Keine Aktion {time} bevor das Ereignis endet",

    "{type} {time} before the event ends" : "{type} {time} vor Ende des Ereignisses",

    "Audio alarm {time} after the event starts" : "Audio-Alarm {time} nachdem das Ereignis startet",

    "Pop-up {time} after the event starts" : "Pop-Up-Meldung {time} nachdem das Ereignis startet",

    "Email {time} after the event starts" : "E-Mail {time} nachdem das Ereignis startet",

    "None {time} after the event starts" : "Keine Aktion {time} nachdem das Ereignis startet",

    "{type} {time} after the event starts" : "{type} {time} nach Beginn des Ereignisses",

    "Audio alarm {time} after the event ends" : "Audio-Alarm {time} nachdem das Ereignis endete",

    "Pop-up {time} after the event ends" : "Pop-Up-Meldung {time} nachdem das Ereignis endete",

    "Email {time} after the event ends" : "E-Mail {time} nachdem das Ereignis endete",

    "None {time} after the event ends" : "Keine Aktion {time} nachdem das Ereignis endete",

    "{type} {time} after the event ends" : "{type} {time} nach Ende des Ereignisses",

    "Audio alarm at the event's start" : "Audio-Alarm beim Start des Ereignisses",

    "Pop-up at the event's start" : "Pop-Up-Meldung beim Start des Ereignisses",

    "Email at the event's start" : "E-Mail beim Start des Ereignisses",

    "None at the event's start" : "Keine Aktion beim Start des Ereignisses",

    "{type} at the event's start" : "{type} zu Beginn der Ereignisses",

    "Audio alarm at the event's end" : "Audio-Alarm beim Ende des Ereignisses",

    "Pop-up at the event's end" : "Pop-Up-Meldung beim Ende des Ereignisses",

    "Email at the event's end" : "E-Mail beim Ende des Ereignisses",

    "None at the event's end" : "Keine Aktion beim Ende des Ereignisses",

    "{type} at the event's end" : "{type} am Ende des Ereignisses",

    "Audio alarm at {time}" : "Audio-Alarm um {time}",

    "Pop-up at {time}" : "Pop-Up-Meldung um {time}",

    "Email at {time}" : "E-Mail um {time}",

    "None at {time}" : "Keine Aktion um {time}",

    "{type} at {time}" : "{type} um {time}",

    "{calendar} shared by {owner}" : "{calendar} geteilt von {owner}",

    "Please enter a valid WebCal-URL" : "Bitte eine gültige WebCal-Adresse angeben",
@@ -138,6 +172,7 @@ OC.L10N.register( 
    "Absolute" : "Absolut",

    "Repeat" : "Wiederholen",

    "times every" : "mal pro",

    "Email reminders have not been implemented in the CalDAV server yet, hence no email reminders will be send." : "E-Mail-Erinnerungen wurden bisher noch nicht im CalDAV-Server umgesetzt. Daher werden aktuell keine E-Mail-Erinnerungen gesendet.",

    "Add" : "Hinzufügen",

    "Email address of attendee" : "E-Mail-Adresse des Teilnehmers",

    "Please add your email address in the personal settings in order to add attendees." : "Bitte füge Deine E-Mail-Adresse in den persönlichen Einstellungen hinzu, um Teilnehmer hinzufügen zu können. ",

l10n/de.json

+35 −0
Original line number Diff line number Diff line
@@ -72,12 +72,46 @@ 
    "end" : "Ende",

    "Editing reminders of unknown type not supported." : "Das Ändern von Erinnerungen unbekannten Typs wird nicht unterstützt.",

    "Week {number} of {year}" : "Woche {number} aus {year}",

    "Successfully imported {imported} objects" : "Erfolgreich {imported} Objekte importiert ",

    "Imported {imported} out of {all}, skipped one duplicate" : "{imported} von {all} importiert, ein Duplikat übersprungen",

    "Imported {imported} out of {all}, one failure" : "{imported} von {all} importiert, ein Fehler",

    "Imported {imported} out of {all}, {errors} failures" : "{imported} von {all} importiert, {errors} Fehler",

    "Imported {imported} out of {all}, skipped {duplicates} duplicates" : "{imported} von {all} importiert, {duplicates} Duplikate übersprungen",

    "Imported {imported} out of {all}, {errors} failures, skipped {duplicates} duplicates" : "{imported} von {all} importiert, {errors} Fehler, {duplicates} Duplikate übersprungen",

    "Audio alarm {time} before the event starts" : "Audio-Alarm {time} bevor das Ereignis startet",

    "Pop-up {time} before the event starts" : "Pop-Up-Meldung {time} bevor das Ereignis startet",

    "Email {time} before the event starts" : "E-Mail {time} bevor das Ereignis startet",

    "None {time} before the event starts" : "Keine Aktion {time} bevor das Ereignis startet",

    "{type} {time} before the event starts" : "{type} {time} vor Beginn des Ereignisses",

    "Audio alarm {time} before the event ends" : "Audio-Alarm {time} bevor das Ereignis endet",

    "Pop-up {time} before the event ends" : "Pop-Up-Meldung {time} bevor das Ereignis endet",

    "Email {time} before the event ends" : "E-Mail {time} bevor das Ereignis endet",

    "None {time} before the event ends" : "Keine Aktion {time} bevor das Ereignis endet",

    "{type} {time} before the event ends" : "{type} {time} vor Ende des Ereignisses",

    "Audio alarm {time} after the event starts" : "Audio-Alarm {time} nachdem das Ereignis startet",

    "Pop-up {time} after the event starts" : "Pop-Up-Meldung {time} nachdem das Ereignis startet",

    "Email {time} after the event starts" : "E-Mail {time} nachdem das Ereignis startet",

    "None {time} after the event starts" : "Keine Aktion {time} nachdem das Ereignis startet",

    "{type} {time} after the event starts" : "{type} {time} nach Beginn des Ereignisses",

    "Audio alarm {time} after the event ends" : "Audio-Alarm {time} nachdem das Ereignis endete",

    "Pop-up {time} after the event ends" : "Pop-Up-Meldung {time} nachdem das Ereignis endete",

    "Email {time} after the event ends" : "E-Mail {time} nachdem das Ereignis endete",

    "None {time} after the event ends" : "Keine Aktion {time} nachdem das Ereignis endete",

    "{type} {time} after the event ends" : "{type} {time} nach Ende des Ereignisses",

    "Audio alarm at the event's start" : "Audio-Alarm beim Start des Ereignisses",

    "Pop-up at the event's start" : "Pop-Up-Meldung beim Start des Ereignisses",

    "Email at the event's start" : "E-Mail beim Start des Ereignisses",

    "None at the event's start" : "Keine Aktion beim Start des Ereignisses",

    "{type} at the event's start" : "{type} zu Beginn der Ereignisses",

    "Audio alarm at the event's end" : "Audio-Alarm beim Ende des Ereignisses",

    "Pop-up at the event's end" : "Pop-Up-Meldung beim Ende des Ereignisses",

    "Email at the event's end" : "E-Mail beim Ende des Ereignisses",

    "None at the event's end" : "Keine Aktion beim Ende des Ereignisses",

    "{type} at the event's end" : "{type} am Ende des Ereignisses",

    "Audio alarm at {time}" : "Audio-Alarm um {time}",

    "Pop-up at {time}" : "Pop-Up-Meldung um {time}",

    "Email at {time}" : "E-Mail um {time}",

    "None at {time}" : "Keine Aktion um {time}",

    "{type} at {time}" : "{type} um {time}",

    "{calendar} shared by {owner}" : "{calendar} geteilt von {owner}",

    "Please enter a valid WebCal-URL" : "Bitte eine gültige WebCal-Adresse angeben",
@@ -136,6 +170,7 @@ 
    "Absolute" : "Absolut",

    "Repeat" : "Wiederholen",

    "times every" : "mal pro",

    "Email reminders have not been implemented in the CalDAV server yet, hence no email reminders will be send." : "E-Mail-Erinnerungen wurden bisher noch nicht im CalDAV-Server umgesetzt. Daher werden aktuell keine E-Mail-Erinnerungen gesendet.",

    "Add" : "Hinzufügen",

    "Email address of attendee" : "E-Mail-Adresse des Teilnehmers",

    "Please add your email address in the personal settings in order to add attendees." : "Bitte füge Deine E-Mail-Adresse in den persönlichen Einstellungen hinzu, um Teilnehmer hinzufügen zu können. ",

l10n/de_DE.js

+35 −0
Original line number Diff line number Diff line
@@ -74,12 +74,46 @@ OC.L10N.register( 
    "end" : "Ende",

    "Editing reminders of unknown type not supported." : "Das Ändern von Erinnerungen unbekannten Typs wird nicht unterstützt.",

    "Week {number} of {year}" : "Woche {number} aus {year}",

    "Successfully imported {imported} objects" : "Erfolgreich {imported} Objekte importiert ",

    "Imported {imported} out of {all}, skipped one duplicate" : "{imported} von {all} importiert, ein Duplikat übersprungen",

    "Imported {imported} out of {all}, one failure" : "{imported} von {all} importiert, ein Fehler",

    "Imported {imported} out of {all}, {errors} failures" : "{imported} von {all} importiert, {errors} Fehler",

    "Imported {imported} out of {all}, skipped {duplicates} duplicates" : "{imported} von {all} importiert, {duplicates} Duplikate übersprungen",

    "Imported {imported} out of {all}, {errors} failures, skipped {duplicates} duplicates" : "{imported} von {all} importiert, {errors} Fehler, {duplicates} Duplikate übersprungen",

    "Audio alarm {time} before the event starts" : "Audio-Alarm {time} bevor das Ereignis startet",

    "Pop-up {time} before the event starts" : "Pop-Up-Meldung {time} bevor das Ereignis startet",

    "Email {time} before the event starts" : "E-Mail {time} bevor das Ereignis startet",

    "None {time} before the event starts" : "Keine Aktion {time} bevor das Ereignis startet",

    "{type} {time} before the event starts" : "{type} {time} vor Beginn des Ereignisses",

    "Audio alarm {time} before the event ends" : "Audio-Alarm {time} bevor das Ereignis endet",

    "Pop-up {time} before the event ends" : "Pop-Up-Meldung {time} bevor das Ereignis endet",

    "Email {time} before the event ends" : "E-Mail {time} bevor das Ereignis endet",

    "None {time} before the event ends" : "Keine Aktion {time} bevor das Ereignis endet",

    "{type} {time} before the event ends" : "{type} {time} vor Ende des Ereignisses",

    "Audio alarm {time} after the event starts" : "Audio-Alarm {time} nachdem das Ereignis startet",

    "Pop-up {time} after the event starts" : "Pop-Up-Meldung {time} nachdem das Ereignis startet",

    "Email {time} after the event starts" : "E-Mail {time} nachdem das Ereignis startet",

    "None {time} after the event starts" : "Keine Aktion {time} nachdem das Ereignis startet",

    "{type} {time} after the event starts" : "{type} {time} nach Beginn des Ereignisses",

    "Audio alarm {time} after the event ends" : "Audio-Alarm {time} nachdem das Ereignis endete",

    "Pop-up {time} after the event ends" : "Pop-Up-Meldung {time} nachdem das Ereignis endete",

    "Email {time} after the event ends" : "E-Mail {time} nachdem das Ereignis endete",

    "None {time} after the event ends" : "Keine Aktion {time} nachdem das Ereignis endete",

    "{type} {time} after the event ends" : "{type} {time} nach Ende des Ereignisses",

    "Audio alarm at the event's start" : "Audio-Alarm beim Start des Ereignisses",

    "Pop-up at the event's start" : "Pop-Up-Meldung beim Start des Ereignisses",

    "Email at the event's start" : "E-Mail beim Start des Ereignisses",

    "None at the event's start" : "Keine Aktion beim Start des Ereignisses",

    "{type} at the event's start" : "{type} zu Beginn der Ereignisses",

    "Audio alarm at the event's end" : "Audio-Alarm beim Ende des Ereignisses",

    "Pop-up at the event's end" : "Pop-Up-Meldung beim Ende des Ereignisses",

    "Email at the event's end" : "E-Mail beim Ende des Ereignisses",

    "None at the event's end" : "Keine Aktion beim Ende des Ereignisses",

    "{type} at the event's end" : "{type} am Ende des Ereignisses",

    "Audio alarm at {time}" : "Audio-Alarm um {time}",

    "Pop-up at {time}" : "Pop-Up-Meldung um {time}",

    "Email at {time}" : "E-Mail um {time}",

    "None at {time}" : "Keine Aktion um {time}",

    "{type} at {time}" : "{type} um {time}",

    "{calendar} shared by {owner}" : "{calendar} geteilt von {owner}",

    "Please enter a valid WebCal-URL" : "Bitte eine gültige WebCal-Adresse angeben",
@@ -138,6 +172,7 @@ OC.L10N.register( 
    "Absolute" : "Absolut",

    "Repeat" : "Wiederholen",

    "times every" : "mal pro",

    "Email reminders have not been implemented in the CalDAV server yet, hence no email reminders will be send." : "E-Mail-Erinnerungen wurden bisher noch nicht im CalDAV-Server umgesetzt. Daher werden aktuell keine E-Mail-Erinnerungen gesendet.",

    "Add" : "Hinzufügen",

    "Email address of attendee" : "E-Mail-Adresse des Teilnehmers",

    "Please add your email address in the personal settings in order to add attendees." : "Bitte fügen Sie ihre E-Mail-Adresse in den persönlichen Einstellungen hinzu, um Teilnehmer hinzufügen zu können. ",