6 files changed, 29 insertions, 15 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index ab6d220..58be545 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1285,4 +1285,12 @@
 { "<b>Created: ","<b>Erstellt am: " },
 { "<b>Last modified: ","<b>Zuletzt geändert am: " },
+{ "Journal: ","Journal: " },
+{ "yearly","jährlich" },
+{ "(%1) ","%1-" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 1f5afc0..4a6e17d 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -142,5 +142,5 @@ bool ListItemVisitor::visit(Event *e)
 bool ListItemVisitor::visit(Todo *t)
 {
-    mItem->setText(0,i18n("To-Do: %1").arg(t->summary()));
+    mItem->setText(0,i18n("Todo: %1").arg(t->summary()));
     if (t->hasStartDate()) {
         mItem->setText(1,t->dtStartDateStr());
@@ -191,9 +191,9 @@ bool ListItemVisitor::visit(Todo *t)
 bool ListItemVisitor::visit(Journal * j)
 { 
-    QString des = j->description().left(50);
+    QString des = j->description().left(30);
     des = des.simplifyWhiteSpace ();
     des.replace (QRegExp ("\\n"),"" );
     des.replace (QRegExp ("\\r"),"" );
-    mItem->setText(0,i18n("Journal")+": "+des.left(25));
+    mItem->setText(0,i18n("Journal: ")+des.left(25));
     mItem->setText(1,j->dtStartDateStr());
     mItem->setText(2,"---");
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index 5181eaf..8a175c9 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -192,5 +192,5 @@ bool  Recurrence::compareLists( const QPtrList<int> &l1 ,const QPtrList<int> &l2
 QString Recurrence::recurrenceText() const
 {
-    QString recurText = i18n("No");
+    QString recurText;
     if ( recurs == Recurrence::rMinutely  )
         recurText = i18n("minutely");
@@ -204,11 +204,17 @@ QString Recurrence::recurrenceText() const
         recurText = i18n("monthly");
     else if ( recurs ==  Recurrence::rMonthlyDay )
-        recurText = i18n("day-monthly");
+        recurText = i18n("monthly");
     else if ( recurs ==  Recurrence::rYearlyMonth )
-        recurText = i18n("month-yearly");
+        recurText = i18n("yearly");
     else if ( recurs ==  Recurrence::rYearlyDay )
         recurText = i18n("day-yearly");
     else if ( recurs ==  Recurrence::rYearlyPos )
         recurText = i18n("position-yearly");
+    if ( !recurText.isEmpty() ) {
+        if ( rFreq > 1 ){
+            recurText = i18n("(%1) ").arg(rFreq ) + recurText;
+        }
+    } else
+         recurText = i18n("No");
     return recurText;
 }
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index 083e6d1..48257ef 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -198,5 +198,5 @@ PwM::PwM(PwMInit *_init, PwMDoc *doc,
 PwM::~PwM()
 {
-    qDebug("PwM::~PwM() %x", this);
+    //qDebug("PwM::~PwM() %x", this);
         disconnect(curDoc(), SIGNAL(docClosed(PwMDoc *)),
                    this, SLOT(docClosed(PwMDoc *)));
@@ -900,5 +900,5 @@ void PwM::activateMpButton(bool activate)
 void PwM::closeEvent(QCloseEvent *e)
 {
-    qDebug("PwM::closeEvent ");
+    //qDebug("PwM::closeEvent ");
     emit closed( this );
     return;
@@ -908,5 +908,5 @@ void PwM::closeEvent(QCloseEvent *e)
 void PwM::docClosed(PwMDoc *doc)
 {
-    qDebug("PwM::docClosed ");
+    //qDebug("PwM::docClosed ");
         PARAM_UNUSED(doc);
         PWM_ASSERT(doc == curDoc());
@@ -1385,5 +1385,5 @@ void PwM::showStatMsg(const QString &msg)
         statusBar()->message(msg, STATUSBAR_MSG_TIMEOUT * 1000);
 #else
-        qDebug("Statusbar : %s",msg.latin1());
+        //qDebug("Statusbar : %s",msg.latin1());
     Global::statusMessage(msg);
 #endif
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp
index 0cf248c..d59d4d8 100644
--- a/pwmanager/pwmanager/pwminit.cpp
+++ b/pwmanager/pwmanager/pwminit.cpp
@@ -89,5 +89,5 @@ PwMInit::PwMInit(PwMApplication *_app)
 PwMInit::~PwMInit()
 {
-    qDebug("PwMInit::~PwMInit() ");
+    //qDebug("PwMInit::~PwMInit() ");
 #ifndef PWM_EMBEDDED
         SelfTest::cancel();
@@ -156,5 +156,5 @@ void PwMInit::initializeApp()
     //   savedCmd.minToTray) {
                 PwMDoc *newDoc = createDoc();
-        qDebug("  createDoc()");
+        //qDebug("  createDoc()");
                 if (!newDoc->openDocUi(newDoc,
                                        conf()->confGlobAutoStart(),
@@ -400,5 +400,5 @@ again:
 
         if (doMinimizeToTray) {
-        qDebug("doMinimizeToTray ");
+        //qDebug("doMinimizeToTray ");
                 PWM_ASSERT(_tray);
                 int mmlock = conf()->confGlobMinimizeLock();
@@ -416,5 +416,5 @@ again:
                 }
         } else if (doDeleteDoc) {
-        qDebug("doDeleteDoc ");
+        //qDebug("doDeleteDoc ");
                 if (!wnd->curDoc()->tryDelete()) {
                         /* We failed deleting the doc,
diff --git a/pwmanager/pwmanager/pwmview.cpp b/pwmanager/pwmanager/pwmview.cpp
index cd816e5..8c4d9cc 100644
--- a/pwmanager/pwmanager/pwmview.cpp
+++ b/pwmanager/pwmanager/pwmview.cpp
@@ -206,5 +206,5 @@ void PwMView::handleRightClick(QListViewItem *item, const QPoint &point, int)
 void PwMView::updateCategories()
 {
-    qDebug("PwMView::updateCategories() ");
+    //qDebug("PwMView::updateCategories() ");
         QString oldSel(getCurrentCategory());
         delAllCategories();