| -rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 5 | ||||
| -rw-r--r-- | bin/kdepim/pwmanager/germantranslation.txt | 5 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 5 | ||||
| -rw-r--r-- | microkde/kapplication.cpp | 13 |
4 files changed, 18 insertions, 10 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index 85aed43..50056c4 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt @@ -760,2 +760,7 @@ { "Alternating background of list views","Abwechselnder Hintergrund für Listen" },
+{ "Backup enabled","Backup angeschaltet" },
+{ "Use standard backup dir","Standard Backupverzeichnis" },
+{ "Number of Backups:","Anzahl der Backups" },
+{ "Make backup every ","Mache ein Backup alle " },
+{ " days"," Tage" },
{ "","" },
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt index a50dd04..38896fb 100644 --- a/bin/kdepim/pwmanager/germantranslation.txt +++ b/bin/kdepim/pwmanager/germantranslation.txt @@ -355,2 +355,7 @@ { "Alternating background of list views","Abwechselnder Hintergrund für Listen" },
+{ "Backup enabled","Backup angeschaltet" },
+{ "Use standard backup dir","Standard Backupverzeichnis" },
+{ "Number of Backups:","Anzahl der Backups" },
+{ "Make backup every ","Mache ein Backup alle " },
+{ " days"," Tage" },
{ "","" },
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 9ad0694..eed023c 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1769,6 +1769,5 @@ void MainWindow::saveOnClose() - - mView->writeSettings(); if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName())) save(); + mView->writeSettings(); } @@ -1814,3 +1813,3 @@ void MainWindow::save() bupDir = KGlobalSettings::backupDataDir(); - int retval = KApplication::createBackup( defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );//55;//call backup + int retval = KApplication::createBackup( defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers ); if ( retval == 0 ) { diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp index 566bb41..2c9e3b6 100644 --- a/microkde/kapplication.cpp +++ b/microkde/kapplication.cpp @@ -172,3 +172,3 @@ int KApplication::createBackup( QString fn, QString dp, int numBup ) int ret = 3; - qDebug("KApplication::createBackup %s --- %s --- %d", fn.latin1(), dp.latin1(), numBup); + //qDebug("KApplication::createBackup %s --- %s --- %d", fn.latin1(), dp.latin1(), numBup); QDir bupDir ( dp ); @@ -202,3 +202,3 @@ int KApplication::createBackup( QString fn, QString dp, int numBup ) } - qDebug("%d backup files exist ", fileList.count()); + qDebug("KApp: %d backup files exist ", fileList.count()); int count = fileList.count(); @@ -217,3 +217,3 @@ int KApplication::createBackup( QString fn, QString dp, int numBup ) file += fName ; - file = dp + "/"+file; + file = dp + file; QString command; @@ -221,4 +221,3 @@ int KApplication::createBackup( QString fn, QString dp, int numBup ) #ifdef _WIN32_ - command = "xcopy "+ fn+ " "+file; - command = QDir::convertSeparators( command ); + command = "copy \""+ QDir::convertSeparators( fn)+ "\" \""+QDir::convertSeparators(file)+ "\" "; #else @@ -226,3 +225,3 @@ int KApplication::createBackup( QString fn, QString dp, int numBup ) #endif - qDebug("command %s ",command.latin1() ); + //qDebug("command %s ",command.latin1() ); tryAgain = true; @@ -230,3 +229,3 @@ int KApplication::createBackup( QString fn, QString dp, int numBup ) res = system ( command.latin1() ); - qDebug("copy result %d ", res); + qDebug("KApp: Copy result %d ", res); if ( res != 0 ) { |