-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 11 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 18 | ||||
-rw-r--r-- | bin/kdepim/korganizer/journal.png | bin | 631 -> 607 bytes | |||
-rw-r--r-- | bin/kdepim/pwmanager/germantranslation.txt | 9 | ||||
-rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 2 | ||||
-rw-r--r-- | microkde/kapplication.cpp | 5 | ||||
-rw-r--r-- | version | 2 |
8 files changed, 35 insertions, 14 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index 50056c4..ef4ab3f 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt @@ -759,11 +759,20 @@ { "Colors","Farben" },
{ "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" },
+{ " days"," Tage" },
+{ "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." },
+{ "Backup Failed!","Backup Problem!" },
+{ "Try again now","Versuche jetzt nochmal" },
+{ "Try again later","Versuche später nochmal" },
+{ "Try again tomorrow","Versuche morgen nochmal" },
+{ "Disable backup","Schalte Backup ab" },
+{ "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" },
+{ "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" },
+{ "Choose action","Wähle Aktion" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
\ No newline at end of file diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 9e9a1a1..bba9f87 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1355,19 +1355,19 @@ { "The todo\n%1\nhas subtodos!\nDo you want to set\nthe categories for\nall subtodos as well?","Das Todo\n%1\nhat Untertodos!\nMöchten Sie die Kategorien\nauch für alle Untertodos setzen?" }, { "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" }, -{ "","" }, -{ "","" }, -{ "","" }, -{ "","" }, -{ "","" }, -{ "","" }, -{ "","" }, -{ "","" }, -{ "","" }, +{ "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." }, +{ "Backup Failed!","Backup Problem!" }, +{ "Try again now","Versuche jetzt nochmal" }, +{ "Try again later","Versuche später nochmal" }, +{ "Try again tomorrow","Versuche morgen nochmal" }, +{ "Disable backup","Schalte Backup ab" }, +{ "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, +{ "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, +{ "Choose action","Wähle Aktion" }, { "","" }, { "","" }, { "","" }, { "","" }, diff --git a/bin/kdepim/korganizer/journal.png b/bin/kdepim/korganizer/journal.png Binary files differindex 875b8ba..ed0a9bc 100644 --- a/bin/kdepim/korganizer/journal.png +++ b/bin/kdepim/korganizer/journal.png diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt index 38896fb..06fa727 100644 --- a/bin/kdepim/pwmanager/germantranslation.txt +++ b/bin/kdepim/pwmanager/germantranslation.txt @@ -355,12 +355,21 @@ { "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" },
+{ "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." },
+{ "Backup Failed!","Backup Problem!" },
+{ "Try again now","Versuche jetzt nochmal" },
+{ "Try again later","Versuche später nochmal" },
+{ "Try again tomorrow","Versuche morgen nochmal" },
+{ "Disable backup","Schalte Backup ab" },
+{ "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" },
+{ "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" },
+{ "Choose action","Wähle Aktion" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index 464c9d0..8b8504d 100644 --- a/desktop/rpm/kdepim_rpm +++ b/desktop/rpm/kdepim_rpm @@ -1,9 +1,9 @@ Summary: A collection of PIM programs Name: KDE-Pim-Pi -Version: 2.1.2 +Version: 2.1.3 Release: SuSE_9.2 Copyright:GPL Group: Productivity/Pim Source:http://sourceforge.net/projects/kdepimpi/ URL:http://sourceforge.net/projects/kdepimpi/ Packager: zautrix diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 3c0259f..94d7293 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1804,13 +1804,13 @@ void MainWindow::save() mSyncManager->setBlockSave(true); if ( mView->checkFileVersion( defaultFileName()) ) { if ( KPimGlobalPrefs::instance()->mBackupEnabled ){ QDate reference ( 2000,1,1); int daysTo = reference.daysTo ( QDate::currentDate() ); if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) { - setCaption(i18n("KO/Pi:Creating backup ... please wait ..." )); + setCaption(i18n("Creating backup ... please wait ..." )); qDebug("KO: Last backup was %d days ago ", daysTo - KOPrefs::instance()->mLastBackupDate); // we need the file path, the backup dir and the number of bups as param QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir; if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir) bupDir = KGlobalSettings::backupDataDir(); int retval = KApplication::createBackup( defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers ); diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp index 2c9e3b6..f36c5ae 100644 --- a/microkde/kapplication.cpp +++ b/microkde/kapplication.cpp @@ -172,13 +172,16 @@ int KApplication::createBackup( QString fn, QString dp, int numBup ) int ret = 3; //qDebug("KApplication::createBackup %s --- %s --- %d", fn.latin1(), dp.latin1(), numBup); QDir bupDir ( dp ); bool tryAgain = true; while ( tryAgain ) { if ( !bupDir.exists() ) { - KBackupPrefs noDir( i18n("<b>Backup directory does not exist: </b>") + dp.right(30)); + QString bd = dp.right(25); + if ( dp.length() > 25 ) + bd = "..." + bd; + KBackupPrefs noDir( i18n("<b>Backup directory does not exist: </b>") + bd); if ( !noDir.exec() ) return 3; if ( noDir.againTomorrow() ) { return 0; } else if ( noDir.later() ) { return 3; } else if ( !noDir.again() ) { @@ -1 +1 @@ -version = "2.1.2"; +version = "2.1.3"; |