many stribg fixes

12 files changed, 78 insertions, 56 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 4b0c920..7e5240c 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -2,2 +2,11 @@ Info about the changes in new versions of KDE-Pim/Pi
 
+
+********** VERSION 2.0.1 ************
+
+Oooops ... I forgot to test on the Zaurus 5500 ...
+
+Fixed many problems of new (english) strings (and german translations)
+introduced in the latest versions, where the text was not fitting on the 
+240x320 display of the Zaurus 5500.
+
 ********** VERSION 2.0.0 ************
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 2f449ef..3a1b2f4 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -144,4 +144,4 @@
 { "Set Who Am I","Setze "wer bin ich"" },

-{ "Set Categories","Wähle Kategorien" },

-{ "Edit Categories","Editiere Kategorien" },

+{ "Set Categories for Contacts...","Setze Kategorien für Kontakte..." },

+{ "Edit Category List...","Editiere Kategorieliste..." },

 { "Remove "voice"...","Entferne "voice"..." },

@@ -616,3 +616,3 @@
 { "Remove voice completed!","Entferne voice beendet!" },

-{ "Merge with existing categories?","Zu bestehenden Kategorien hinzufügen?" },

+{ "Merge with existing categories?","Zu bestehenden\nKategorien hinzufügen?" },

 { "Setting categories ... please wait!","Setze Kategorien ... bitte warten!" },

@@ -654,4 +654,4 @@
 { "Category rule","Kategorie Regel" },

-{ "Include categories","Schließe Kategorien ein" },

-{ "Exclude categories","Schließe Kategorien aus" },

+{ "Include categories","Inklusive" },

+{ "Exclude categories","Exclusive" },

 { "Include contacts, that are:","Schließe folgende Kontakte ein:" },

@@ -676,10 +676,11 @@
 { "Time Zone","Zeit Zone" },

-{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" },

-{ "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" },

-{ "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" },

+{ "Data storage path","Daten Speicherpfad" },

+{ "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" },

 { "Save settings","Speichere Einstellungen" },

 { "Save standard","Speichere Standard" },

+{ "Save","Speichern" },

 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },

-{ "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" },

-{ "Data storage path","Daten Speicherpfad" },

+{ "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },

 { "Multiple Sync options","Multi Sync Optionen" },

@@ -709,2 +710,6 @@
 { "Unable to load resource '%1'","Resource kann nicht geladen werden: '%1'" },

+{ "Some changes are only\neffective after a restart!\n","Einige Änderungen werden erst\nnach einem Neustart übernommen!\n" },

+{ "","" },

+{ "","" },

+{ "","" },

 { "","" },

diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt
index 68dc6db..58f4ea8 100644
--- a/bin/kdepim/kopiemail/germantranslation.txt
+++ b/bin/kdepim/kopiemail/germantranslation.txt
@@ -245,5 +245,5 @@
 { "%1 groups subscribed","%1 Guppen abboniert" },
-{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" },
-{ "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" },
-{ "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" },
+{ "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" },
 { "Save settings","Speichere Einstellungen" },
@@ -251,3 +251,3 @@
 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
-{ "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" },
+{ "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },
 { "Data storage path","Daten Speicherpfad" },
@@ -265,3 +265,3 @@
 { "Show "To" info field","Zeige "An" Info Feld" },
-{ "","" },
+{ "Mail saved as draft!","Mail als Entwurf gespeichert!" },
 { "","" },
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 3d16c1a..6a20868 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1082,6 +1082,2 @@
 { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" },
-
-
-
-
 { "Language","Sprache" },
@@ -1089,5 +1085,6 @@
 { "Time Zone","Zeit Zone" },
-{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" },
-{ "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" },
-{ "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" },
+{ "%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" },
 { "Save settings","Speichere Einstellungen" },
@@ -1095,3 +1092,3 @@
 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
-{ "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" },
+{ "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },
 { "Data storage path","Daten Speicherpfad" },
@@ -1101,3 +1098,3 @@
 { "Show events, that are done in \nWhat's Next view","Zeige abgelaufene Termine in\nWhat's Next Ansicht" },
-{ "Hide not running Todos in To-do view","Verstecke nicht laufende Todos in To-do Ansicht" },
+{ "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" },
 { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
@@ -1138,3 +1135,3 @@
 { "End ti&me:","Endzeit:" },
-{ "E&xtend time range to include all events","Erweitere Zeitspanne um alle Ereignisse einzuschliessen" },
+{ "E&xtend time range to include all events","Erweitere Zeitspanne um alle Termine einzuschliessen" },
 { "Include to&dos that are due on the printed day(s)","Inclusive To&dos, die an den selektierten Tagen fällig sind" },
@@ -1179,11 +1176,12 @@
 { "Exclude","Exclusive" },
-{ "Edit Selection...","Editiere Selektion..." },
-{ "recurring events","wiederholende Ereignisse" },
+{ "Edit Selection...","Editiere Auswahl" },
+{ "recurring events","wiederholende Termine" },
+{ "recurr. events","wiederh.Termine" },
 { "completed to-dos","erledigte Todos" },
-{ "events","Ereignisse" },
+{ "events","Termine" },
 { "todos","Todos" },
 { "journals","Journale" },
-{ "public","öffentlich" },
+{ "public","öffentl." },
 { "private","privat" },
-{ "confidential","vertraulich" },
+{ "confidential","vertraul." },
 { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" },
@@ -1197,3 +1195,3 @@
 { "Allday:","Ganztägig:" },
-{ "","" },
+{ "compl.todos","erled.Todos" },
 { "","" },
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt
index a47b123..0ebc644 100644
--- a/bin/kdepim/pwmanager/germantranslation.txt
+++ b/bin/kdepim/pwmanager/germantranslation.txt
@@ -11,3 +11,3 @@
 { "&Edit","Bearbeite" },

-{ "&View","Ansichten" },

+{ "&View","Ansicht" },

 { "&Help","Hilfe" },

@@ -176,5 +176,5 @@
 { "External Apps.","Externe Appl." },

-{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" },

-{ "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" },

-{ "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" },

+{ "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" },

 { "Save settings","Speichere Einstellungen" },

@@ -182,3 +182,3 @@
 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },

-{ "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" },

+{ "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },

 { "Data storage path","Daten Speicherpfad" },

@@ -211,3 +211,3 @@
 { "&Configure...","Konfiguriere..." },

-{ "&Options","&Optionen" },

+{ "&Options","Konfig" },

 { "C&ategories...","K&ategorien..." },

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index e2e3a66..0def16e 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2040,6 +2040,6 @@ void KABCore::initActions()
 
-  mActionCategories = new KAction( i18n( "Set Categories" ), 0, this,
+  mActionCategories = new KAction( i18n( "Set Categories for Contacts..." ), 0, this,
                                    SLOT( setCategories() ), actionCollection(),
                                    "edit_set_categories" );
-  mActionEditCategories = new KAction( i18n( "Edit Categories" ), 0, this,
+  mActionEditCategories = new KAction( i18n( "Edit Category List..." ), 0, this,
                                    SLOT( editCategories() ), actionCollection(),
diff --git a/korganizer/filteredit_base.cpp b/korganizer/filteredit_base.cpp
index 15a4aaa..505edf6 100644
--- a/korganizer/filteredit_base.cpp
+++ b/korganizer/filteredit_base.cpp
@@ -15,2 +15,3 @@
 #include <qbuttongroup.h>
+#include <qapplication.h>
 #include <qradiobutton.h>
@@ -109,3 +110,3 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
     languageChange();
-    resize( QSize(324, 281).expandedTo(minimumSizeHint()) );
+    resize( QSize(300, 200).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
@@ -133,4 +134,10 @@ void FilterEdit_base::languageChange()
     textLabel1->setText( tr( "Exclude" ) );
-    mRecurringCheck->setText( tr( "recurring events" ) );
-    mCompletedCheck->setText( tr( "completed to-dos" ) );
+    if (QApplication::desktop()->width() > 480 ) {
+        mCompletedCheck->setText( tr( "completed to-dos" ) );
+        mRecurringCheck->setText( tr( "recurring events" ) );
+    }
+    else {
+        mCompletedCheck->setText( tr( "compl.todos" ) );
+        mRecurringCheck->setText( tr( "recurr. events" ) );
+    }
     textLabel1_2->setText( tr( "Exclude" ) );
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index b73d22f..cf0a458 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -146,3 +146,4 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
       if ( qApp->desktop()->width() < 300 )
-      mListView->setFixedHeight(80);
+          topLayout->setSpacing(1);
+          ;//mListView->setFixedHeight(80);
       topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3);
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index b4fe965..f5eb52e 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -251,5 +251,5 @@ void KOEditorGeneral::pickAlarmSound()
     if (mAlarmProgramButton->isOn())
-        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + mAlarmProgram );
+        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
     if ( mAlarmSoundButton->isOn())
-        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + mAlarmSound );
+        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + getFittingPath(mAlarmSound) );
 }
@@ -279,5 +279,5 @@ void KOEditorGeneral::pickAlarmProgram()
     if (mAlarmProgramButton->isOn())
-        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + mAlarmProgram );
+        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
     if ( mAlarmSoundButton->isOn())
-        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + mAlarmSound );
+        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + getFittingPath(mAlarmSound) );
 }
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index ea73fd0..1b24f56 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -718,3 +718,3 @@ void KOPrefsDialog::setupViewsTab()
   QHBox *habo = new QHBox( topFrame );
-  if ( QApplication::desktop()->width() < 320 ) {
+  if ( QApplication::desktop()->width() <= 480 ) {
       lab = new QLabel ( i18n("Show events that recur "), topFrame );
@@ -722,6 +722,4 @@ void KOPrefsDialog::setupViewsTab()
       ii++;
-      
   } else {
       new QLabel ( i18n("Show events that recur "), habo );
-
   }
@@ -740,3 +738,3 @@ void KOPrefsDialog::setupViewsTab()
   habo = new QHBox( topFrame ); 
-  if ( QApplication::desktop()->width() < 320 ) {
+  if ( QApplication::desktop()->width() <= 480 ) {
       lab = new QLabel (i18n("Show in every cell ") , topFrame );
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index d097078..6eaf2f2 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -118,8 +118,12 @@ void KDEPIMConfigWidget::setupStoreTab()
     new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage  );
-    new QLabel( i18n("<b>Set new data storage dir:</b>"), storePage );
+    new QLabel( i18n("<b>New data storage dir:</b>"), storePage );
     mStoreUrl = new KURLRequester( storePage );
     mStoreUrl->setURL( KGlobal::dirs()->localkdedir() );
-    new QLabel( i18n("Not existing dirs are created automatically"), storePage  );
+    new QLabel( i18n("New dirs are created automatically"), storePage  );
     QHBox *bb = new QHBox( storePage );
-    QPushButton * pb = new QPushButton ( i18n("Save settings"), bb  );
+    QPushButton * pb;
+    if ( QApplication::desktop()->width() < 640 )
+        pb = new QPushButton ( i18n("Save"), bb  );
+    else
+        pb = new QPushButton ( i18n("Save settings"), bb  );
     connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) );
@@ -128,3 +132,3 @@ void KDEPIMConfigWidget::setupStoreTab()
     new QLabel( i18n("<b>New settings are used\nafter a restart</b>"), storePage );
-    new QLabel( i18n("The settings of the storage\ndir is saved in the file\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage  );
+    new QLabel( i18n("Settings are stored in\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage  );
     tabWidget->addTab( storePage, i18n( "Data storage path" ) );
diff --git a/version b/version
index b972ae7..628b450 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.0.0";
+version = "2.0.1";