conflict

2 files changed, 16 insertions, 0 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 79de197..814c541 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,31 +1,33 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.1.14 ************
 
 Added some buttons to the KO/Pi Quick-todo line to make it possible to quickly access some todo view layout settings like display all flat/open/close and hide/show running/done.
 Added a button to add a subtodo quickly.
 
+Added a possibility to search for conflicting events. (In the Action menu. Keyboard shortcut "q" ).
+
 
 ********** VERSION 2.1.13 ************
 
 Fixed a problem in KA/Pi search.
 Fixed some minor problems in KO/Pi.
 Added calendar selection possibility to the todo view popup and to the event/todo/journal editor.
 
 Fixed memory usage problems in KA/Pi:
 When loading data KA/Pi did load the file data twice.
 Example:
   A 600k file did consume 1200k memory during loading process.
   This is fixed, it does now consume only  600k during loading process.
 When saving data KA/Pi did consume a lot of memory for the data parsing during the save process.
 This is fixed.
 Example:
   Before saving a 600k file KA/Pi did consume 21.7 Meg of Ram.
   When saving  KA/Pi did consume 28.6 Meg of Ram. That causes a crash on the Zaurus because there was no memeory left in the system.
   Now  KA/Pi is consuming on saving the same data 22.0 Meg of Ram during the save process. 
 Note: The memory usage of KA/Pi after the data is loaded/saved has not changed.
 The saving of data may be a bit slower now.
 
 Fixed memory usage problems in KO/Pi:
 When KO/Pi did save the data to file, it did not release the used buffers after saving.
 The used buffer was released after saving the next time, but there was new buffer space allocated again on that save operation.
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index bcc23dc..b225594 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1473,34 +1473,48 @@
 { "Pending Suspend Alarm","Laufender Suspend Alarm" },
 { "Error loading calendar %1","Fehler beim Laden von Kalender %1" },
 { "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" },
 { "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" },
 { "Alarm Options","Alarm Einstellungen" },
 { "Delete selected...","Lösche Ausgewählte..." },
 { "None","Nichts" },
 { "Selection","Auswahl" },
 { "Set categories","Setze Kategorien" },
 { "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" },
 { "Reset","Neu setzen" },
 { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" },
 { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" },
 { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" },
 { "\nNO\n WRITEABLE\n   CALENDAR\n      FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n  SCHREIBBARER\n    KALENDER\n      GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" },
 { "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" },
 { "Edit","Edit" },
 { "Last Modified","Zuletzt geändert" },
 { "Journal viewer","Journal Anzeige" },
 { "Configure Calendar Files...","Konfiguriere Kalenderdateien..." },
 { "You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>.","Sie können <b>mehr als eine</b> Kalenderdatei in KO/Pi darstellen und benutzen. Eine Kalenderdatei wird <b>Resource</b> genannt. Um einen Kalender hinzuzufügen oder die Kalendereinstellungen zu ändern benutzen Sie bitte das Menu: <b>Ansicht -> Resourcenansicht umschalten</b>." },
 { "Hide Completed","Verstecke erledigte Todos" },
 { "Show not Running","Zeige nicht Laufende" },
 { "Click to add new Todo","Klick für neues Todo!" },
+{ "Show next conflict for","Zeige nächsten Konflikt für" },
+{ "All events","Alle Termine" },
+{ "Allday events","Ganztagestermine" },
+{ "Events with time","Termine mit Zeit" },
+{ "No conflict found within the next two years","Kein Konflikt innerhalb der nächsten zwei Jahre gefunden" },
+{ "Conflict %1 <-> %2","Konflikt %1 <-> %2" },
+{ "<p><b>Q</b>: Show next date with conflicting events\n ","<p><b>Q</b>: Zeige nächstes Datum mit Terminen im Konflikt\n " },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },