summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt17
-rw-r--r--bin/kdepim/kaddressbook/usertranslation.txt29
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt4
-rw-r--r--bin/kdepim/korganizer/usertranslation.txt2
-rw-r--r--kaddressbook/kabcore.cpp5
-rw-r--r--korganizer/kowhatsnextview.cpp0
6 files changed, 52 insertions, 5 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 85ca87d..b5ad650 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -519,21 +519,34 @@
519{ "Descending","Absteigend" }, 519{ "Descending","Absteigend" },
520{ "Save file","Datei speichern" }, 520{ "Save file","Datei speichern" },
521{ "Error","Fehler" }, 521{ "Error","Fehler" },
522{ "Unable to export contacts.","Exportieren der Kontakte geht nicht." }, 522{ "Unable to export contacts.","Exportieren der Kontakte geht nicht." },
523{ "\nNo unsaved changes detected!\nNothing will be saved!","\nKeine ungespeicherten\nÄnderungen erkannt!\nNichts wird gespeichert!" }, 523{ "\nNo unsaved changes detected!\nNothing will be saved!","\nKeine ungespeicherten\nÄnderungen erkannt!\nNichts wird gespeichert!" },
524{ "Manage new categories...","Verwalte neue Kategorien..." }, 524{ "Manage new categories...","Verwalte neue Kategorien..." },
525{ "&File","Datei" }, 525{ "&File","Datei" },
526{ "&Edit","Bearbeite" }, 526{ "&Edit","Bearbeite" },
527{ "&View","Ansichten" }, 527{ "&View","Ansichten" },
528{ "&Settings","Konfiguration" }, 528{ "&Settings","Konfiguration" },
529{ "&Change selected","Ändere Selekt." }, 529{ "&Change selected","Ändere Selekt." },
530{ "&Help","Hilfe" }, 530{ "&Help","Hilfe" },
531{ "","" }, 531{ "Remove sync info","Entferne Sync Info" },
532{ "","" }, 532{ "For all profiles","Für alle Profile" },
533{ "&Change","Ändere" },
534{ "Import xml (Qtopia)...","Importiere xml (Qtopia)..." },
535{ "Export xml (Qtopia)...","Exportiere xml (Qtopia)..." },
536{ "Export to phone","Exportiere aufs Handy..." },
537{ "Which contacts do you want to select?","Welche Kontakte möchten Sie wählen?" },
538{ "&Modify","Ändere" },
539{ "Choose which contacts to select","Bitte Kontakte auswählen!" },
540{ "After importing/loading/syncing\nthere may be new categories in\naddressees\nwhich are not in the category list.\nPlease choose what to do:\n ","Nach dem Importieren/Laden/Syncen\nkann es neue Kategorien in den \nKontakten geben, die nicht\nin der Kategorieliste enthalten sind.\nBitte wählen Sie, was passieren soll:\n " },
541{ "Manage new Categories","Verwalte neue Kategorien" },
542{ "Add to category list","Füge zur Kategorieliste hinzu" },
543{ "Remove from addressees","Entferne von den Kontakten" },
544{ "New categories not in list:","Kategorien, die nicht in der Liste sind:" },
545{ "A&dd","Hinzufügen" },
533{ "","" }, 546{ "","" },
534{ "","" }, 547{ "","" },
535{ "","" }, 548{ "","" },
536{ "","" }, 549{ "","" },
537{ "","" }, 550{ "","" },
538{ "","" }, 551{ "","" },
539{ "","" }, \ No newline at end of file 552{ "","" }, \ No newline at end of file
diff --git a/bin/kdepim/kaddressbook/usertranslation.txt b/bin/kdepim/kaddressbook/usertranslation.txt
index 16c4178..623b075 100644
--- a/bin/kdepim/kaddressbook/usertranslation.txt
+++ b/bin/kdepim/kaddressbook/usertranslation.txt
@@ -703,12 +703,41 @@
703{ "Only export contacts who are members of a category that is checked on the list to the left.\nThis option is disabled if you have no categories.","Only export contacts who are members of a category that is checked on the list to the left.\nThis option is disabled if you have no categories." }, 703{ "Only export contacts who are members of a category that is checked on the list to the left.\nThis option is disabled if you have no categories.","Only export contacts who are members of a category that is checked on the list to the left.\nThis option is disabled if you have no categories." },
704{ "Select a filter to decide which contacts to export.","Select a filter to decide which contacts to export." }, 704{ "Select a filter to decide which contacts to export.","Select a filter to decide which contacts to export." },
705{ "Check the categories whose members you want to export.","Check the categories whose members you want to export." }, 705{ "Check the categories whose members you want to export.","Check the categories whose members you want to export." },
706{ "Sorting","Sorting" }, 706{ "Sorting","Sorting" },
707{ "Criterion:","Criterion:" }, 707{ "Criterion:","Criterion:" },
708{ "Order:","Order:" }, 708{ "Order:","Order:" },
709{ "Ascending","Ascending" }, 709{ "Ascending","Ascending" },
710{ "Descending","Descending" }, 710{ "Descending","Descending" },
711{ "Save file","Save file" }, 711{ "Save file","Save file" },
712{ "Error","Error" }, 712{ "Error","Error" },
713{ "Unable to export contacts.","Unable to export contacts." }, 713{ "Unable to export contacts.","Unable to export contacts." },
714{ "\nNo unsaved changes detected!\nNothing will be saved!","\nNo unsaved changes detected!\nNothing will be saved!" }, 714{ "\nNo unsaved changes detected!\nNothing will be saved!","\nNo unsaved changes detected!\nNothing will be saved!" },
715{ "Manage new categories...","Verwalte neue Kategorien..." },
716{ "&File","Datei" },
717{ "&Edit","Bearbeite" },
718{ "&View","Ansichten" },
719{ "&Settings","Konfiguration" },
720{ "&Change selected","Ändere Selekt." },
721{ "&Help","Hilfe" },
722{ "Remove sync info","Entferne Sync Info" },
723{ "For all profiles","Für alle Profile" },
724{ "&Change","Ändere" },
725{ "Import xml (Qtopia)...","Importiere xml (Qtopia)..." },
726{ "Export xml (Qtopia)...","Exportiere xml (Qtopia)..." },
727{ "Export to phone","Exportiere aufs Handy..." },
728{ "Which contacts do you want to select?","Welche Kontakte möchten Sie wählen?" },
729{ "&Modify","Ändere" },
730{ "Choose which contacts to select","Bitte Kontakte auswählen!" },
731{ "After importing/loading/syncing\nthere may be new categories in\naddressees\nwhich are not in the category list.\nPlease choose what to do:\n ","Nach dem Importieren/Laden/Syncen\nkann es neue Kategorien in den \nKontakten geben, die nicht\nin der Kategorieliste enthalten sind.\nBitte wählen Sie, was passieren soll:\n " },
732{ "Manage new Categories","Verwalte neue Kategorien" },
733{ "Add to category list","Füge zur Kategorieliste hinzu" },
734{ "Remove from addressees","Entferne von den Kontakten" },
735{ "New categories not in list:","Kategorien, die nicht in der Liste sind:" },
736{ "A&dd","Hinzufügen" },
737{ "","" },
738{ "","" },
739{ "","" },
740{ "","" },
741{ "","" },
742{ "","" },
743{ "","" },
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 8251259..5d35324 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1045,19 +1045,19 @@
1045{ "\nhttp://sourceforge.net/projects/kdepimpi\n","\nhttp://sourceforge.net/projects/kdepimpi\n" }, 1045{ "\nhttp://sourceforge.net/projects/kdepimpi\n","\nhttp://sourceforge.net/projects/kdepimpi\n" },
1046{ "\nor report them in the bugtracker on\n","\noder trage sie in dem Bugtracker ein auf\n" }, 1046{ "\nor report them in the bugtracker on\n","\noder trage sie in dem Bugtracker ein auf\n" },
1047{ "\nPlease report unexpected behaviour to\nlutz@pi-sync.net\n","\nBitte melde fehlerhaftes Verhalten an\nlutz@pi-sync.net\n" }, 1047{ "\nPlease report unexpected behaviour to\nlutz@pi-sync.net\n","\nBitte melde fehlerhaftes Verhalten an\nlutz@pi-sync.net\n" },
1048{ "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" }, 1048{ "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" },
1049{ "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" }, 1049{ "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" },
1050{ "Known Problems in KOrganizer/Pi","Bekannte Probleme in KOrganizer/Pi" }, 1050{ "Known Problems in KOrganizer/Pi","Bekannte Probleme in KOrganizer/Pi" },
1051{ "KO/Pi FAQ","KO/Pi FAQ" }, 1051{ "KO/Pi FAQ","KO/Pi FAQ" },
1052{ "(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n","(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi basiert auf KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden für\nLinux, Zaurus-PDA und Windows\nwww.korganizer.org\nwww.pi-sync.net\n" }, 1052{ "(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n","(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi basiert auf KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden für\nLinux, Zaurus-PDA und Windows\nwww.korganizer.org\nwww.pi-sync.net\n" },
1053{ "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n","PDA-Edition\nfür: Zaurus 5x00 / 7x0 / 8x0\n" }, 1053{ "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n","PDA-Edition\nfür: Zaurus 5x00 / 7x0 / 8x0\n" },
1054{ "KOrganizer/Platform-independent\n","KOrganizer/Platform-independent\n" }, 1054{ "KOrganizer/Platform-independent\n","KOrganizer/Platform-independent\n" },
1055{ "About KOrganizer/Pi","Über KOrganizer/Pi" }, 1055{ "About KOrganizer/Pi","Über KOrganizer/Pi" },
1056{ "From: ","Von: " }, 1056{ "From: ","Von: " },
1057{ "","" }, 1057{ "Remove sync info","Entferne Sync Info" },
1058{ "","" }, 1058{ "For all profiles","Für alle Profile" },
1059{ "","" }, 1059{ "","" },
1060{ "","" }, 1060{ "","" },
1061{ "","" }, 1061{ "","" },
1062{ "","" }, 1062{ "","" },
1063{ "","" }, 1063{ "","" },
diff --git a/bin/kdepim/korganizer/usertranslation.txt b/bin/kdepim/korganizer/usertranslation.txt
index f4c4698..fc6287c 100644
--- a/bin/kdepim/korganizer/usertranslation.txt
+++ b/bin/kdepim/korganizer/usertranslation.txt
@@ -1044,24 +1044,26 @@
1044{ "\nhttp://sourceforge.net/projects/kdepimpi\n","\nhttp://sourceforge.net/projects/kdepimpi\n" }, 1044{ "\nhttp://sourceforge.net/projects/kdepimpi\n","\nhttp://sourceforge.net/projects/kdepimpi\n" },
1045{ "\nor report them in the bugtracker on\n","\noder trage sie in dem Bugtracker ein auf\n" }, 1045{ "\nor report them in the bugtracker on\n","\noder trage sie in dem Bugtracker ein auf\n" },
1046{ "\nPlease report unexpected behaviour to\nlutz@pi-sync.net\n","\nBitte melde fehlerhaftes Verhalten an\nlutz@pi-sync.net\n" }, 1046{ "\nPlease report unexpected behaviour to\nlutz@pi-sync.net\n","\nBitte melde fehlerhaftes Verhalten an\nlutz@pi-sync.net\n" },
1047{ "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" }, 1047{ "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" },
1048{ "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" }, 1048{ "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" },
1049{ "Known Problems in KOrganizer/Pi","Bekannte Probleme in KOrganizer/Pi" }, 1049{ "Known Problems in KOrganizer/Pi","Bekannte Probleme in KOrganizer/Pi" },
1050{ "KO/Pi FAQ","KO/Pi FAQ" }, 1050{ "KO/Pi FAQ","KO/Pi FAQ" },
1051{ "(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n","(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi basiert auf KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden für\nLinux, Zaurus-PDA und Windows\nwww.korganizer.org\nwww.pi-sync.net\n" }, 1051{ "(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n","(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi basiert auf KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden für\nLinux, Zaurus-PDA und Windows\nwww.korganizer.org\nwww.pi-sync.net\n" },
1052{ "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n","PDA-Edition\nfür: Zaurus 5x00 / 7x0 / 8x0\n" }, 1052{ "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n","PDA-Edition\nfür: Zaurus 5x00 / 7x0 / 8x0\n" },
1053{ "KOrganizer/Platform-independent\n","KOrganizer/Platform-independent\n" }, 1053{ "KOrganizer/Platform-independent\n","KOrganizer/Platform-independent\n" },
1054{ "About KOrganizer/Pi","Über KOrganizer/Pi" }, 1054{ "About KOrganizer/Pi","Über KOrganizer/Pi" },
1055{ "From: ","Von: " }, 1055{ "From: ","Von: " },
1056{ "Remove sync info","Entferne Sync Info" },
1057{ "For all profiles","Für alle Profile" },
1056{ "","" }, 1058{ "","" },
1057{ "","" }, 1059{ "","" },
1058{ "","" }, 1060{ "","" },
1059{ "","" }, 1061{ "","" },
1060{ "","" }, 1062{ "","" },
1061{ "","" }, 1063{ "","" },
1062{ "","" }, 1064{ "","" },
1063{ "","" }, 1065{ "","" },
1064{ "","" }, 1066{ "","" },
1065{ "","" }, 1067{ "","" },
1066{ "","" }, 1068{ "","" },
1067{ "","" }, 1069{ "","" },
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 3c97ce9..76f9ab6 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2097,25 +2097,28 @@ void KABCore::addActionsManually()
2097 mActionNewContact->plug( tb ); 2097 mActionNewContact->plug( tb );
2098 2098
2099 mActionEditAddressee->plug( fileMenu ); 2099 mActionEditAddressee->plug( fileMenu );
2100 // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || 2100 // if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
2101 // (!KABPrefs::instance()->mMultipleViewsAtOnce )) 2101 // (!KABPrefs::instance()->mMultipleViewsAtOnce ))
2102 mActionEditAddressee->plug( tb ); 2102 mActionEditAddressee->plug( tb );
2103 2103
2104 fileMenu->insertSeparator(); 2104 fileMenu->insertSeparator();
2105 mActionSave->plug( fileMenu ); 2105 mActionSave->plug( fileMenu );
2106 fileMenu->insertItem( "&Import", ImportMenu ); 2106 fileMenu->insertItem( "&Import", ImportMenu );
2107 fileMenu->insertItem( "&Export", ExportMenu ); 2107 fileMenu->insertItem( "&Export", ExportMenu );
2108 fileMenu->insertItem( i18n("&Change"), changeMenu ); 2108 fileMenu->insertItem( i18n("&Change"), changeMenu );
2109 fileMenu->insertItem( i18n("&Beam"), beamMenu ); 2109#ifndef DESKTOP_VERSION
2110 if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu );
2111#endif
2112
2110 fileMenu->insertSeparator(); 2113 fileMenu->insertSeparator();
2111 mActionMailVCard->plug( fileMenu ); 2114 mActionMailVCard->plug( fileMenu );
2112#ifndef DESKTOP_VERSION 2115#ifndef DESKTOP_VERSION
2113 if ( Ir::supported() ) mActionBR->plug( beamMenu ); 2116 if ( Ir::supported() ) mActionBR->plug( beamMenu );
2114 if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); 2117 if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu );
2115 if ( Ir::supported() ) mActionBeam->plug( beamMenu ); 2118 if ( Ir::supported() ) mActionBeam->plug( beamMenu );
2116#endif 2119#endif
2117 fileMenu->insertSeparator(); 2120 fileMenu->insertSeparator();
2118 mActionQuit->plug( fileMenu ); 2121 mActionQuit->plug( fileMenu );
2119#ifdef _WIN32_ 2122#ifdef _WIN32_
2120 mActionImportOL->plug( ImportMenu ); 2123 mActionImportOL->plug( ImportMenu );
2121#endif 2124#endif
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 3801ed4..5f14bfa 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp