author | zautrix <zautrix> | 2005-07-07 04:18:11 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-07 04:18:11 (UTC) |
commit | b4d85da57e2d558ec088af6f3b2a34b1854462c0 (patch) (side-by-side diff) | |
tree | 0860bfaae1d15aae6cd24861eaa87d0331fb364a /bin | |
parent | cb350dbe9151db2ded62942d29d11d6c8b88eabd (diff) | |
download | kdepimpi-b4d85da57e2d558ec088af6f3b2a34b1854462c0.zip kdepimpi-b4d85da57e2d558ec088af6f3b2a34b1854462c0.tar.gz kdepimpi-b4d85da57e2d558ec088af6f3b2a34b1854462c0.tar.bz2 |
conflict
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 14 |
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 @@ -2,12 +2,14 @@ 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. 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 @@ -1491,12 +1491,26 @@ { "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 " }, +{ "","" }, +{ "","" }, +{ "","" }, +{ "","" }, +{ "","" }, +{ "","" }, +{ "","" }, { "","" }, { "","" }, { "","" }, { "","" }, { "","" }, { "","" }, |