summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore 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.cpp2
6 files changed, 53 insertions, 6 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
@@ -525,14 +525,27 @@
{ "&File","Datei" },
{ "&Edit","Bearbeite" },
{ "&View","Ansichten" },
{ "&Settings","Konfiguration" },
{ "&Change selected","Ändere Selekt." },
{ "&Help","Hilfe" },
-{ "","" },
-{ "","" },
+{ "Remove sync info","Entferne Sync Info" },
+{ "For all profiles","Für alle Profile" },
+{ "&Change","Ändere" },
+{ "Import xml (Qtopia)...","Importiere xml (Qtopia)..." },
+{ "Export xml (Qtopia)...","Exportiere xml (Qtopia)..." },
+{ "Export to phone","Exportiere aufs Handy..." },
+{ "Which contacts do you want to select?","Welche Kontakte möchten Sie wählen?" },
+{ "&Modify","Ändere" },
+{ "Choose which contacts to select","Bitte Kontakte auswählen!" },
+{ "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 " },
+{ "Manage new Categories","Verwalte neue Kategorien" },
+{ "Add to category list","Füge zur Kategorieliste hinzu" },
+{ "Remove from addressees","Entferne von den Kontakten" },
+{ "New categories not in list:","Kategorien, die nicht in der Liste sind:" },
+{ "A&dd","Hinzufügen" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
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
@@ -709,6 +709,35 @@
{ "Ascending","Ascending" },
{ "Descending","Descending" },
{ "Save file","Save file" },
{ "Error","Error" },
{ "Unable to export contacts.","Unable to export contacts." },
{ "\nNo unsaved changes detected!\nNothing will be saved!","\nNo unsaved changes detected!\nNothing will be saved!" },
+{ "Manage new categories...","Verwalte neue Kategorien..." },
+{ "&File","Datei" },
+{ "&Edit","Bearbeite" },
+{ "&View","Ansichten" },
+{ "&Settings","Konfiguration" },
+{ "&Change selected","Ändere Selekt." },
+{ "&Help","Hilfe" },
+{ "Remove sync info","Entferne Sync Info" },
+{ "For all profiles","Für alle Profile" },
+{ "&Change","Ändere" },
+{ "Import xml (Qtopia)...","Importiere xml (Qtopia)..." },
+{ "Export xml (Qtopia)...","Exportiere xml (Qtopia)..." },
+{ "Export to phone","Exportiere aufs Handy..." },
+{ "Which contacts do you want to select?","Welche Kontakte möchten Sie wählen?" },
+{ "&Modify","Ändere" },
+{ "Choose which contacts to select","Bitte Kontakte auswählen!" },
+{ "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 " },
+{ "Manage new Categories","Verwalte neue Kategorien" },
+{ "Add to category list","Füge zur Kategorieliste hinzu" },
+{ "Remove from addressees","Entferne von den Kontakten" },
+{ "New categories not in list:","Kategorien, die nicht in der Liste sind:" },
+{ "A&dd","Hinzufügen" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
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
@@ -1051,13 +1051,13 @@
{ "KO/Pi FAQ","KO/Pi FAQ" },
{ "(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" },
{ "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n","PDA-Edition\nfür: Zaurus 5x00 / 7x0 / 8x0\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" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
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
@@ -1050,12 +1050,14 @@
{ "KO/Pi FAQ","KO/Pi FAQ" },
{ "(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" },
{ "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n","PDA-Edition\nfür: Zaurus 5x00 / 7x0 / 8x0\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" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 3c97ce9..76f9ab6 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2103,13 +2103,16 @@ void KABCore::addActionsManually()
fileMenu->insertSeparator();
mActionSave->plug( fileMenu );
fileMenu->insertItem( "&Import", ImportMenu );
fileMenu->insertItem( "&Export", ExportMenu );
fileMenu->insertItem( i18n("&Change"), changeMenu );
- fileMenu->insertItem( i18n("&Beam"), beamMenu );
+#ifndef DESKTOP_VERSION
+ if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu );
+#endif
+
fileMenu->insertSeparator();
mActionMailVCard->plug( fileMenu );
#ifndef DESKTOP_VERSION
if ( Ir::supported() ) mActionBR->plug( beamMenu );
if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu );
if ( Ir::supported() ) mActionBeam->plug( beamMenu );
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 3801ed4..5f14bfa 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -241,13 +241,13 @@ void KOWhatsNextView::updateView()
todo = todos.next();
}
if ( !itemAdded && iii == 0 ) {
// appendDay ( iii, mEventDate );
//mText += "<table>";
// mText += "<b><font color=\"#000080\"><em>"+i18n("No event, nothing to do.") +"</em></font></b>\n";
- mText += "<h3 align=\"center\"><font color=\"#008000\"><em>"+i18n("No event, nothing to do. ") +"</em></font></h3>\n";
+ mText += "<h3 align=\"center\"><font color=\"#008000\"><em>"+i18n("No event, nothing to do.") +"</em></font></h3>\n";
//mText +="</table>";
}
if ( itemAdded )
mText += "</table>\n";
mEventDate = mEventDate.addDays( 1 );
}