fixx

2 files changed, 4 insertions, 5 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index ed6a1c1..350d6b1 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -477,66 +477,65 @@
 { "Move...","Bewege..." },
 { "Beam...","Sende via IR..." },
 { "&Clone...","Dupliziere.." },
 { "&Move...","Bewege..." },
 { "&Beam...","Sende via IR..." },
 { "Show Completed","Zeige erledigte Todos" },
 { "Show Quick Todo","Zeige Quick Todo" },
 { "Unparent Todo","Un-sub Todo" },
 { "Save selected to file...","Speichere Selektierte..." },
 { "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." },
 { "Set Categ. for selected...","Setze Kateg. für Selekt." },
 { "Beam via IR","Sende via IR" },
 { "Search","Suchen" },
 { "Date Picker","Datum auswählen" },
 { "Day View","Tagesansicht" },
 { "Work Week","Arbeitswoche" },
 { "Week","Wochenansicht" },
 { "Month","Monatsansicht" },
 { "Todo View","Todo Liste" },
 { "Journal","Journal" },
 { "Next days","Nächste Tage" },
 { "Print agenda selection...","Drucke Agendaselektion..." },
 { "Toggle DateNavigator","Navigator umschalten" },
 { "Toggle FilterView","Filteransicht umschalten" },
 { "Prev. month","Vorheriger Monat" },
 { "Go backward","Gehe zurück" },
 { "Go forward","Gehe weiter" },
 { "Synchronize","Synchronisieren" },
 { "AgendaSize","Agendagröße" },
 { "Import (*.ics/*.vcs) file","Importiere (*.ics/*.vcs) Datei" },
 { "Import last file","Importiere letzte Datei" },
 { "Import Opie/Qtopia Cal.","Importiere Opie/Qtopia Kal." },
-{ "Load Calendar Backup","Lade Kalender Backup" },
-{ "Save Calendar Backup...","Speichere Kalender Backup..." },
+{ "Save Backup...","Speichere Backup..." },
 { "Export VCalendar","Exportiere VCalendar" },
 { "Manage new categories...","Verwalte neue Kategorien..." },
 { "Beam complete calendar...","Sende kompletten Kalender..." },
 { "Beam filtered calendar...","Sende gefilterten Kalender..." },
 { "Remote via ssh","Über Netzwerk via ssh" },
 { "With local file","Mit lokaler Datei" },
 { "With last file","Mit letzter Datei" },
 { "KO/Pi: Ready for beaming","KO/Pi: Bereit zum Senden" },
 { "KO/Pi:Beaming done","KO/Pi: Senden erfolgt" },
 { "Save filename","Speichern: Dateinamen wählen" },
 { "File already exists!\nOld file from:\n%1\nOverwrite?\n","Dateiname existiert bereits!\nAlte Datei vom:\n%1\nÜberschreiben?\n" },
 { "KO/Pi: Warning!","KO/Pi: Warnung!" },
 { "Overwrite!","Überschreibe!" },
 { "KO/Pi:Saved %1","KO/Pi:Gespeichert %1" },
 { "All selected items will be\npermanently deleted.\n(Deleting items will take\nsome time on a PDA)\n","Alle selektierten Einträge werden\nunwiederbringlich gelöscht.\n(Löschen kann auf dem\nPDA einige Zeit dauern)\n" },
 { "KO/Pi Confirmation","KO/Pi Bestätigung" },
 { "Close dialog to abort deletion!","Schließe Dialog um das Löschen abzubrechen!" },
 { "Deleting item %d ...","Lösche Eintrag %d ..." },
 { "%d items remaining in list.","%d Einträge sind in der Liste verblieben." },
 { "Size","Größe" },
 { "Date","Datum" },
 { "Mime Type","Datei Typ" },
 { "All Files","Alle Dateien" },
 { "Files","Dateien" },
 { "Documents","DoKumente" },
 { "Select Categories","Selektiere Kategorien" },
 { " &Deselect All "," Auswahl aufheben " },
 { "A&dd","Hinzu" },
 { "&Modify","Ändern" },
 { "Edit Categories","Editiere Kategorien" },
 { " &Edit Categories "," &Editiere Kategorien " },
 { "Beam Options","Beam Einstellungen" },
@@ -552,65 +551,65 @@
 { "KO/Pi:File Saved. Needed %d sec, %d ms","KO/Pi: Abgespeichert in %d sec, %d ms" },
 { "h","Std" },
 { "min","Min" },
 { "hou","Std" },
 { "day","Tag" },
 { "French","Französich" },
 { "Time","Zeit" },
 { "Event Viewer","Termin Ansicht" },
 { "Cancel Sync","Sync Abbrechen" },
 { "Remote","Fern" },
 { "Local","Lokal" },
 { "Conflict! Please choose entry","Konflikt! Bitte Eintrag wählen" },
 { "Local: ","Lokal: " },
 { "Remote: ","Fern: " },
 { "Last modified: ","Zuletzt geändert: " },
 { "Location: ","Ort: " },
 { "<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>","<p><b>Von:</b> %1 </p><p><b>Bis:</b> %2</p>" },
 { "<p><b>On:</b> %1</p>","<p><b>Am:</b> %1</p>" },
 { "<p><b>From:</b> %1</p> ","<p><b>Von:</b> %1</p> " },
 { "<p><b>To:</b> %1</p>","<p><b>Bis:</b> %1</p>" },
 { "<p><b>On:</b> %1</p> ","<p><b>Am:</b> %1</p> " },
 { "<p><b>From:</b> %1 <b>To:</b> %2</p>","<p><b>Von:</b> %1 <b>Bis:</b> %2</p>" },
 { "This is a %1 recurring event.","Das ist ein %1 wiederholender Termin." },
 { "<b>Next recurrence is on:</b>","<b>Nächste Wiederholung ist am:</b>" },
 { "<b>Last recurrence was on:</b>","<b>Letzte Wiederholung war am:</b>" },
 { "( %1 min before )","( %1 min vorher )" },
 { "<b>Alarm on: ","<b>Alarm am: " },
 { "<b>Details: </b>","<b>Details: </b>" },
 { "<p><b>Priority:</b> %2</p>","<p><b>Priorität:</b> %2</p>" },
 { "<p><i>%1 % completed</i></p>","<p><i>%1 % erledigt</i></p>" },
 { "Organizer","Organisator" },
 { "Save","Speichern" },
-{ "Exit (+save)","Beenden (+ speichern)" },
+{ "Exit (+save)","Beenden(+speichern)" },
 { "Home","Zuhause" },
 { "Office","Büro" },
 { "Library","Bibliothek" },
 { "Doctor","Arzt" },
 { "Beach","Strand" },
 { "Conference room","Konferenzraum" },
 { "Drive Home","Heimfahrt" },
 { "Watch TV","Tv gucken" },
 { "Phone call","Telefonanruf" },
 { "Pay bill","Rechnung bezahlen" },
 { "Read book","Buch lesen" },
 { "Watering plants","Pflanzen giessen" },
 {"Appointment","Verabredung" },
 {"Birthday","Geburtstag" },
 {"Business","Geschäft" },
 {"Business Travel","Geschäftsreise" },
 {"Cinema","Kino" },
 {"Customer","Kunde" },
 {"Break","Pause" },
 {"Breakfast","Frühstück" },
 {"Competition","Wettkampf" },
 {"Dinner","Abendessen" },
 {"Education","Erziehung" },
 {"Family","Familie" },
 {"Favorites","Favoriten" },
 {"Festival","Festival" },
 {"Fishing","Angeln" },
 {"Flight","Flug" },
 {"Gifts","Geschenk" },
 {"Holiday","Feiertag" },
 {"Holiday Cards","Ansichtskarten" },
 {"Hot Contacts","Heisse Kontakte" },
@@ -1014,65 +1013,65 @@
 { "<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n","<p><b>+,-</b> : Zoom rein/raus Agenda | <b>A</b>: Wechsle Ganztag Agenda Höhe</p>\n" },
 { "<p><b>S+ctrl</b>: Add sub-todo | <b>X+ctrl</b>: Toggle datenavigator</p>\n","<p><b>S+ctrl</b>: Füge Sub-Todo hinzu | <b>X+ctrl</b>: Zeige/verstecke Datumsnavigator</p>\n" },
 { "<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n","<p><b>T</b>: Gehe zu Heute | <b>T+ctrl</b>: Neues Todo</p>\n" },
 { "<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n","<p><b>E</b>: Editiere selektiertes Item |<b> E+ctrl</b>: Neuer Termin</p>\n" },
 { "<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n","<p><b>D</b>: Ein-Tages Ansicht | <b>M</b>: Monatsansicht</p>\n" },
 { "<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n","<p><b>Z,Y</b>: Arbeitswochenansicht | <b>U</b>: Wochenansicht</p>\n" },
 { "<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n","<p><b>V</b>: Todo Ansicht | <b>L</b>: Termin Listen Ansicht</p>\n" },
 { "<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ","<p><b>X</b>: Nächste-X-Tage Ansicht | <b>W</b>: What's Next Ansicht\n " },
 { "<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n","<p><b>1-0</b> (+<b>ctrl</b>): Selektiere Filter 1-10 (11-20)</p>\n" },
 { "<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n","<p><b>O</b>: Filter An/Aus | <b>J</b>: Journal Ansicht</p>\n" },
 { "<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n","<p><b>Space</b>: Zeige fullscreen | <b>P</b>: Datums Picker</p>\n" },
 { "<p><b>I</b>: Show info for selected event/todo</p>\n","<p><b>I</b>: Zeige Info (Details) für selektiertes Item</p>\n" },
 { "<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n","<p><b>H</b>: Dieser Hilfe Dialog | <b>S</b>: Such Dialog</p>\n" },
 { "<p><h2>KO/Pi key shortcuts:</h2></p>\n","<p><h2>KO/Pi Tastatur Kurzbefehle:</h2></p>\n" },
 { "After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is  one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n","Nachdem etwas geändert wurde, werden die\nDaten automatisch in die Datei abgespeichert\n~/kdepim/apps/korganizer/mycalendar.ics\nnach (konfigurierbar) drei Minuten.\nAus Sicherheitsgründen wird noch einmal\nnach 10 Min. abgespeichert, wenn keine\nÄnderungen vorgenommen wurden. Die \nDaten werden automatisch gespeichert,\nwenn KO/Pi beendet wird.\nSie können eine Backup-Datei erstellen im\nMenu: Datei - Speichere Kalender Backup\n" },
 { "Auto Saving in  KOrganizer/Pi","Auto Speichern in  KOrganizer/Pi" },
 { "\nhttp://sourceforge.net/projects/kdepimpi\n","\nhttp://sourceforge.net/projects/kdepimpi\n" },
 { "\nor report them in the bugtracker on\n","\noder trage sie in dem Bugtracker ein auf\n" },
 { "\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n","\nBitte melde fehlerhaftes Verhalten an\nlutz@pi-sync.info\n" },
 { "2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n","2) Ein Audio Alarm Daemon\nfür den Zaurus ist verfügbar\nals zusätzliche Anwendung\n" },
 { "1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n","1) Importieren von *.vcs oder *.ics Dateien von\nanderen Anwendungen kann möglicherweise\n nicht richtig funktionieren,\nwenn die Termine Eigenschaften haben,\ndie KO/Pi nicht unterstützt.\n" },
 { "Known Problems in  KOrganizer/Pi","Bekannte Probleme in  KOrganizer/Pi" },
 { "KO/Pi FAQ","KO/Pi FAQ" },
 { "PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n","PDA-Edition\nfür: Zaurus 5x00/7x0/860/3000/6000\n" },
 { "KOrganizer/Platform-independent\n","KOrganizer/Platform-independent\n" },
 { "About KOrganizer/Pi","Über KOrganizer/Pi" },
 { "From: ","Von: " },
 { "Remove sync info","Entferne Sync Info" },
 { "For all profiles","Für alle Profile" },
 { "Hide not Running","Verstecke nicht Laufende" },
 { "ME","ME" },
 { "Toolbar","Toolbar" },
-{ "Undo Delete...","Löschen rückgängig machen..." },
+{ "Undo Delete...","Undo Löschen..." },
 { "Undo Delete","Löschen rückgängig machen" },
 { "KDE Sync HowTo...","KDE Sync HowTo..." },
 { "Multi Sync HowTo...","Multi Sync HowTo..." },
 { "Januar","Januar" },
 { "KO/Pi Keys + Colors","KO/Pi Tasten + Farben" },
 { "No Filter","Kein Filter" },
 { "Multiple Sync options","Multi Sync Optionen" },
 { "Sync algo options","Sync Ablauf Optionen" },
 { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" },
 { "Incoming calendar filter:","Eingehender Kalender Filter:" },
 { "Incoming addressbook filter:","Eingehender Adressbuch Filter:" },
 { "Write back options","Optionen zum Zurückschreiben" },
 { "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" },
 { "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" },
 { "Outgoing calendar filter:","Ausgehender Kalender Filter:" },
 { "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" },
 { "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" },
 { "Time period","Zeitspanne" },
 { "From ","Von " },
 { " weeks in the past to "," Wochen in der Vergangenheit bis zu " },
 { " weeks in the future "," Wochen in der Zukunft " },
 { "Profile kind specific settings","Profil Art abhängige Einstellungen" },
 { "Local temp file:","Lokale temp Datei:" },
 { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" },
 { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" },
 { "Language","Sprache" },
 { "Time Format","Zeit Format" },
 { "Time Zone","Zeit Zone" },
 { "%1 groups subscribed","%1 Guppen abboniert" },
 { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" },
 { "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" },
 { "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" },
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 501eed5..862d437 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1036,65 +1036,65 @@ void MainWindow::initActions()
     action = new QAction( "import_quick", i18n("Import last file"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
     importMenu_X->insertSeparator();
     action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
     //#ifndef DESKTOP_VERSION
     importMenu_X->insertSeparator();
     action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
     //#else
 #ifdef _OL_IMPORT_
     importMenu_X->insertSeparator();
     action = new QAction( "import_ol", i18n("Import from OL"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
 #endif
     //#endif
 
     //importMenu->insertSeparator();
 #if 0
     action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
 #endif
-    action = new QAction( "save_cal", i18n("Save Calendar Backup..."), 0,
+    action = new QAction( "save_cal", i18n("Save Backup..."), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
     importMenu->insertSeparator();
     importMenu->insertItem( i18n("Import"), importMenu_X );
     //importMenu->insertSeparator();
     action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
                           this );
     action->addTo( exportMenu_X );    
     connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
 
 
     //LR
     QPopupMenu *ex2phone = new QPopupMenu( this );
     ex2phone->insertItem(i18n("Complete calendar..."), 1 );
     ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
     connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
     exportMenu_X->insertItem( i18n("Export to phone"), ex2phone );
 
     importMenu->insertItem( i18n("Export"), exportMenu_X );
 #ifndef DESKTOP_VERSION
     //importMenu->insertSeparator();
     brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
                           this );
     brAction->addTo( beamMenu_X ); 
     brAction->setToggleAction (true ) ;
     connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) );
 
     action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
                           this );
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );