From ab7725c4517a1f6c145075edcff0bdafe105f0ea Mon Sep 17 00:00:00 2001 From: zautrix Date: Wed, 09 Feb 2005 20:56:06 +0000 Subject: fixes --- 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 @@ -2,7 +2,9 @@ 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. 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 @@ -718,6 +718,35 @@ { ""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 @@ -1235,6 +1235,46 @@ { ""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 @@ -3134,7 +3134,8 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo 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 @@ -1227,7 +1227,8 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int 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; diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index c8d0e0d..02e5587 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -1087,7 +1087,7 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) 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; } @@ -1097,19 +1097,20 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) 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(); - mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); + if ( syncOK ) + mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); mPisyncFinished = true; } } @@ -1224,7 +1225,7 @@ void KServerSocket::send_file() 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.\nYou 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 ; } 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 @@ -8,7 +8,7 @@ #include -//#define COLLECT_TRANSLATION +#define COLLECT_TRANSLATION QDict *mLocaleDict = 0; -- cgit v0.9.0.2