author | zautrix <zautrix> | 2005-12-02 10:19:28 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-12-02 10:19:28 (UTC) |
commit | 1bb72406b4f160efa20bf4329539543e000295a5 (patch) (side-by-side diff) | |
tree | eb8cee9f4c79dd28443b4e7a3b2374b712c16e9b | |
parent | cba4eb3e05bee757b910f316ffab01d3849c0138 (diff) | |
download | kdepimpi-1bb72406b4f160efa20bf4329539543e000295a5.zip kdepimpi-1bb72406b4f160efa20bf4329539543e000295a5.tar.gz kdepimpi-1bb72406b4f160efa20bf4329539543e000295a5.tar.bz2 |
more sync
-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 3 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
-rw-r--r-- | kabc/addressbook.cpp | 6 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 1 |
4 files changed, 8 insertions, 6 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index 2df2ac7..e7b3927 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt @@ -831,7 +831,8 @@ { "Other Phone","Sonst. Telefon" },
{ "Pi-Sync - all calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - alle Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" },
{ "Pi-Sync - selected calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - ausgewählte Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" },
-{ "Waiting a second before syncing next resource...",""Warte eine Sekunde vor dem Syncen der nächsten resource..." },
+{ "Waiting a second before syncing next resource...","Warte eine Sekunde vor dem Syncen der nächsten resource..." },
+{ "Multi-resource Pi-sync finished","Multi-Resourcen Pi-sync beendet" },
{ "","" },
{ "","" },
{ "","" },
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index ba98b00..cb63a5e 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1575,8 +1575,8 @@ { "Alarm disabled warning","Nichtaktiver Alarm" }, { "Pi-Sync - all calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - alle Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" }, { "Pi-Sync - selected calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - ausgewählte Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" }, -{ "Waiting a second before syncing next resource...",""Warte eine Sekunde vor dem Syncen der nächsten resource..." }, -{ "","" }, +{ "Waiting a second before syncing next resource...","Warte eine Sekunde vor dem Syncen der nächsten resource..." }, +{ "Multi-resource Pi-sync finished","Multi-Resourcen Pi-sync beendet" }, { "","" }, { "","" }, { "","" }, diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index ed3ac84..f9e4387 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -397,7 +397,7 @@ void AddressBook::export2File( QString fileName, QString resourceName ) if ( !resourceName.isEmpty() ) include = (resourceName == (*it).resource()->resourceName() ); if ( include ) { - qDebug(QString ("Exporting resource %1 to file %2").arg( (*it).resource()->name() ).arg( fileName ) ); + //qDebug(QString ("Exporting resource %1 to file %2").arg( (*it).resource()->resourceName() ).arg( fileName ) ); if ( !(*it).IDStr().isEmpty() ) { (*it).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*it).IDStr() ); } @@ -509,10 +509,10 @@ int AddressBook::importFromFile( QString fileName, bool replaceLabel, bool remo KRES::Manager<Resource>::ActiveIterator it; KRES::Manager<Resource> *manager = d->mManager; for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { - qDebug("SaveAB::checking resource..." ); + //qDebug("SaveAB::checking resource..." ); if ( (*it)->resourceName() == resource ) { setRes = (*it); - qDebug("Inserting imported contacs to resource %s", resource.latin1()); + qDebug("KA: AB: Inserting imported contacs to resource %s", resource.latin1()); break; } } diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 7197b30..b7929ec 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -1186,6 +1186,7 @@ void KSyncManager::syncPi() mAskForPreferences = false; } mPisyncFinished = true; + mParent->topLevelWidget()->setCaption( i18n("Multi-resource Pi-sync finished") ); } else { KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |