fixes

7 files changed, 83 insertions, 9 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 6ccf763..81b0d59 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,11 +1,13 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.0.6 ************
 
-Two bugfixes in the pi-sync mode.
+Some bugfixes in the pi-sync mode.
+Added German translation for pi-sync mode.
+
 KO/Pi:
 Made the todolist using alternate background.
 
 Other minor fixes in KO/Pi.
 
 
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 57b2fda..5335f47 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -715,12 +715,41 @@
 { "Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?","Verbindungsversuch wegen\nZeitüberschreitung gescheitert!\nWurde vergessen Pi-Sync auf\nder Gegenstelle anzuschalten?" },

 { "ERROR: Receiving remote file failed.","FEHLER: Empfang der entfernten Daten fehlgeschlagen." },

 { "Error","Fehler" },

 { ""You entered an invalid date!\n Date changed  to current date.","Ungültiges Datum eingegeben.\nSetze heutiges Datum." },

 { "You entered an invalid date!\n Will use current date instead.","Ungültiges Datum eingegeben.\nSetze stattdessen heutiges Datum." },

 { "Warning","Warnung" },

+{ "Select week number","Wähle Wochen Nummer" },

+{ "Februar","Februar" },

+{ "Pi-Sync options for device: ","Pi-Sync Einstellungen für Gerät: " },

+{ "Password for remote access:","Passwort für fernen Zugriff:" },

+{ "Remote IP address:","Ferne IP Adresse:" },

+{ "Remote port number:","Ferne Port Nummer:" },

+{ "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." },

+{ "Remote from: ","Fern von: " },

+{ "Local from: ","Lokal von: " },

+{ "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n","Synchronisationsübersicht:\n\n %d lokal hinzugefügt\n %d fern hinzugefügt\n %d lokal geändert\n %d fern geändert\n %d lokal gelöscht\n %d fern gelöscht\n %d eingehende ausgefiltert\n %d ausgehende ausgefiltert\n" },

+{ "Local calendar changed!\n","Lokaler Kalender geändert!\n" },

+{ "Write back","Schreibe zurück" },

+{ "Pi-Sync succesful!","Pi-Sync erfolgreich!" },

+{ "Received sync request","Sync Anfrage erhalten" },

+{ "Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog.","Ferne Synchronisation ...\n\nBenutze diese Anwendung nicht!\n\nWenn das Syncen fehlschlägt kann\ndieser Dialog geschlossen werden." },

+{ "Saving Data to temp file ...","Speichere Daten in temp Datei..." },

+{ "Data saved to temp file!","Daten in temp Datei gespeichert!" },

+{ "Sending file...","Sende Datei..." },

+{ "Waiting for synced file...","Warte auf gesyncte Daten..." },

+{ "Receiving synced file...","Gesyncte Daten erhalten..." },

+{ "Received %1 bytes","%1 Bytes erhalten" },

+{ "Writing file to disk...","Speichere Datei..." },

+{ "Pi-Sync successful!","Pi-Sync erfolgreich!" },

+{ "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" },

+{ "Synchronize!","Synchronisiere!" },

+{ "High clock skew!","Großer Uhrzeitunterschied!" },

+{ "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" },

+{ "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" },

+{ "","" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 6587eaa..c85ca35 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1232,12 +1232,52 @@
 { "Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?","Verbindungsversuch wegen\nZeitüberschreitung gescheitert!\nWurde vergessen Pi-Sync auf\nder Gegenstelle anzuschalten?" },
 { "ERROR: Receiving remote file failed.","FEHLER: Empfang der entfernten Daten fehlgeschlagen." },
 { "Error","Fehler" },
 { ""You entered an invalid date!\n Date changed  to current date.","Ungültiges Datum eingegeben.\nSetze heutiges Datum." },
 { "You entered an invalid date!\n Will use current date instead.","Ungültiges Datum eingegeben.\nSetze stattdessen heutiges Datum." },
 { "Warning","Warnung" },
+{ "Select week number","Wähle Wochen Nummer" },
+{ "Februar","Februar" },
+{ "Click on the week number to\nshow week zoomed","Klicke auf die Wochennummer\num die Woche groß zu zeigen" },
+{ "W","W" },
+{ "Click on this to\nselect week number","Klicke hierauf um\ndie Woche auszuwählen" },
+{ "T: %1","T: %1" },
+{ "Start: ","Start: " },
+{ "Pi-Sync options for device: ","Pi-Sync Einstellungen für Gerät: " },
+{ "Password for remote access:","Passwort für fernen Zugriff:" },
+{ "Remote IP address:","Ferne IP Adresse:" },
+{ "Remote port number:","Ferne Port Nummer:" },
+{ "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." },
+{ "Remote from: ","Fern von: " },
+{ "Local from: ","Lokal von: " },
+{ "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n","Synchronisationsübersicht:\n\n %d lokal hinzugefügt\n %d fern hinzugefügt\n %d lokal geändert\n %d fern geändert\n %d lokal gelöscht\n %d fern gelöscht\n %d eingehende ausgefiltert\n %d ausgehende ausgefiltert\n" },
+{ "Local calendar changed!\n","Lokaler Kalender geändert!\n" },
+{ "Write back","Schreibe zurück" },
+{ "KO/Pi  Synchronization","KO/Pi  Synchronisation" },
+{ "Pi-Sync succesful!","Pi-Sync erfolgreich!" },
+{ "Received sync request","Sync Anfrage erhalten" },
+{ "Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog.","Ferne Synchronisation ...\n\nBenutze diese Anwendung nicht!\n\nWenn das Syncen fehlschlägt kann\ndieser Dialog geschlossen werden." },
+{ "Saving Data to temp file ...","Speichere Daten in temp Datei..." },
+{ "Data saved to temp file!","Daten in temp Datei gespeichert!" },
+{ "Sending file...","Sende Datei..." },
+{ "Waiting for synced file...","Warte auf gesyncte Daten..." },
+{ "Receiving synced file...","Gesyncte Daten erhalten..." },
+{ "Received %1 bytes","%1 Bytes erhalten" },
+{ "Writing file to disk...","Speichere Datei..." },
+{ "Pi-Sync successful!","Pi-Sync erfolgreich!" },
+{ "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" },
+{ "Synchronize!","Synchronisiere!" },
+{ "High clock skew!","Großer Uhrzeitunterschied!" },
+{ "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" },
+{ "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index a8e4de5..1b17665 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -3131,13 +3131,14 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     qDebug( mes );
     mes = i18n("Local addressbook changed!\n") +mes;
     if ( syncManager->mShowSyncSummary ) { 
         if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes,
                                                                        i18n("KA/Pi  Synchronization"),i18n("Write back"))) {
             qDebug("KA: WB cancelled ");
-            return false;
+            syncManager->mWriteBackFile = false; 
+            return syncOK;
         }
     }
     return syncOK;
 }
 
 
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a9de65a..7c8316f 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1224,13 +1224,14 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     mCalendar->checkAlarmForIncidence( 0, true );
     qDebug( mes );
     if ( mSyncManager->mShowSyncSummary ) {
         if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes,
                                                  i18n("KO/Pi  Synchronization"),i18n("Write back"))) {
             qDebug("KO: WB cancelled ");
-            return false;
+            mSyncManager->mWriteBackFile = false;
+            return syncOK;
         }
     }
     return syncOK;
 }
 
 void CalendarView::setSyncDevice( QString s )
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index c8d0e0d..02e5587 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1084,34 +1084,35 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
         mPisyncFinished = true;
 
     } else  if ( state == KCommandSocket::successR ) {
         QTimer::singleShot( 1, this , SLOT ( readFileFromSocket()));
 
     } else  if ( state == KCommandSocket::successW ) {
-        mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
+        mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") );
         mPisyncFinished = true;
     }
 
     delete s;
 }
 
 void KSyncManager::readFileFromSocket()
 {
     QString fileName = syncFileName();
+    bool syncOK = true;
     mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") );
     if ( ! syncWithFile( fileName , true ) ) {
         mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") );
-        mPisyncFinished = true;
-        return;
+        syncOK = false;
     }
     KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
-    if ( mWriteBackFile ) 
+    if ( mWriteBackFile && syncOK  ) 
         commandSocket->writeFile(  fileName );
     else {
         commandSocket->sendStop();
+        if ( syncOK ) 
         mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
         mPisyncFinished = true;
     }
 }
 
 KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name )
@@ -1221,13 +1222,13 @@ void KServerSocket::send_file()
                 QLabel* label = new QLabel( warning, mSyncActionDialog ); 
                 label->setAlignment ( Qt::AlignHCenter );
                 lay->addWidget( label);
                 if ( secs > 180 )
                     {
                         if ( secs > 300 ) {
-                            if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\n of more than 5 minutes.\nPlease adjust your clocks.\n<b>You may get wrong syncing results!<\b>\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) {
+                            if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) {
                                 qDebug("KSS::Sync cancelled ,cs");
                                 return ;
                             }
                         }
                         QFont f = label->font();
                         f.setPointSize ( f.pointSize() *2 );
diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp
index 7f31ab1..aec74fa 100644
--- a/microkde/kdecore/klocale.cpp
+++ b/microkde/kdecore/klocale.cpp
@@ -5,13 +5,13 @@
 #include "kcalendarsystemgregorian.h"
 
 #include "klocale.h"
 
 #include <qstringlist.h>
 
-//#define COLLECT_TRANSLATION
+#define COLLECT_TRANSLATION
 
 
 QDict<QString> *mLocaleDict = 0;
 void setLocaleDict( QDict<QString> * dict )
 {
     mLocaleDict = dict;