From 9ddda0071d022205efa849350796a7db409f3338 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 10 Oct 2008 12:58:56 +0000 Subject: [PATCH] missing phrase conflict --- calendar/setup/egw_de.lang | 1 + calendar/setup/egw_en.lang | 1 + 2 files changed, 2 insertions(+) diff --git a/calendar/setup/egw_de.lang b/calendar/setup/egw_de.lang index ead89971fb..ba55dfe88b 100644 --- a/calendar/setup/egw_de.lang +++ b/calendar/setup/egw_de.lang @@ -52,6 +52,7 @@ canceled calendar de Abgesagt charset of file calendar de Zeichensatz der Datei close the window calendar de Schließt das Fenster compose a mail to all participants after the event is saved calendar de Schreibe eine Mail an alle Teilnehmer nachdem der Termin gespeichert wurde +conflict calendar de Konflikt copy of: calendar de Kopie von: copy this event calendar de Kopiert diesen Termin copy your changes to the clipboard, %1reload the entry%2 and merge them. calendar de Kopieren Sie ihre Änderungen in die Zwischenablage, %1laden den Eintrag neu%2 und fügen diese wieder ein. diff --git a/calendar/setup/egw_en.lang b/calendar/setup/egw_en.lang index ffd5f417ac..2f970693f3 100644 --- a/calendar/setup/egw_en.lang +++ b/calendar/setup/egw_en.lang @@ -52,6 +52,7 @@ canceled calendar en Canceled charset of file calendar en Charset of file close the window calendar en Close the window compose a mail to all participants after the event is saved calendar en compose a mail to all participants after the event is saved +conflict calendar en Conflict copy of: calendar en Copy of: copy this event calendar en Copy this event copy your changes to the clipboard, %1reload the entry%2 and merge them. calendar en Copy your changes to the clipboard, %1reload the entry%2 and merge them.