-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 | |||
@@ -763,5 +763,14 @@ | |||
763 | { "Number of Backups:","Anzahl der Backups" }, | 763 | { "Number of Backups:","Anzahl der Backups" }, |
764 | { "Make backup every ","Mache ein Backup alle " }, | 764 | { "Make backup every ","Mache ein Backup alle " }, |
765 | { " days"," Tage" }, | 765 | { " days"," Tage" }, |
766 | { "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." }, | ||
767 | { "Backup Failed!","Backup Problem!" }, | ||
768 | { "Try again now","Versuche jetzt nochmal" }, | ||
769 | { "Try again later","Versuche später nochmal" }, | ||
770 | { "Try again tomorrow","Versuche morgen nochmal" }, | ||
771 | { "Disable backup","Schalte Backup ab" }, | ||
772 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, | ||
773 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, | ||
774 | { "Choose action","Wähle Aktion" }, | ||
766 | { "","" }, | 775 | { "","" }, |
767 | { "","" }, | 776 | { "","" }, |
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 | |||
@@ -1359,13 +1359,13 @@ | |||
1359 | { "Make backup every ","Mache ein Backup alle " }, | 1359 | { "Make backup every ","Mache ein Backup alle " }, |
1360 | { " days"," Tage" }, | 1360 | { " days"," Tage" }, |
1361 | { "","" }, | 1361 | { "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." }, |
1362 | { "","" }, | 1362 | { "Backup Failed!","Backup Problem!" }, |
1363 | { "","" }, | 1363 | { "Try again now","Versuche jetzt nochmal" }, |
1364 | { "","" }, | 1364 | { "Try again later","Versuche später nochmal" }, |
1365 | { "","" }, | 1365 | { "Try again tomorrow","Versuche morgen nochmal" }, |
1366 | { "","" }, | 1366 | { "Disable backup","Schalte Backup ab" }, |
1367 | { "","" }, | 1367 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, |
1368 | { "","" }, | 1368 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, |
1369 | { "","" }, | 1369 | { "Choose action","Wähle Aktion" }, |
1370 | { "","" }, | 1370 | { "","" }, |
1371 | { "","" }, | 1371 | { "","" }, |
diff --git a/bin/kdepim/korganizer/journal.png b/bin/kdepim/korganizer/journal.png index 875b8ba..ed0a9bc 100644 --- a/bin/kdepim/korganizer/journal.png +++ b/bin/kdepim/korganizer/journal.png | |||
Binary files differ | |||
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 | |||
@@ -359,4 +359,13 @@ | |||
359 | { "Make backup every ","Mache ein Backup alle " }, | 359 | { "Make backup every ","Mache ein Backup alle " }, |
360 | { " days"," Tage" }, | 360 | { " days"," Tage" }, |
361 | { "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." }, | ||
362 | { "Backup Failed!","Backup Problem!" }, | ||
363 | { "Try again now","Versuche jetzt nochmal" }, | ||
364 | { "Try again later","Versuche später nochmal" }, | ||
365 | { "Try again tomorrow","Versuche morgen nochmal" }, | ||
366 | { "Disable backup","Schalte Backup ab" }, | ||
367 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, | ||
368 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, | ||
369 | { "Choose action","Wähle Aktion" }, | ||
361 | { "","" }, | 370 | { "","" }, |
362 | { "","" }, | 371 | { "","" }, |
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,5 +1,5 @@ | |||
1 | Summary: A collection of PIM programs | 1 | Summary: A collection of PIM programs |
2 | Name: KDE-Pim-Pi | 2 | Name: KDE-Pim-Pi |
3 | Version: 2.1.2 | 3 | Version: 2.1.3 |
4 | Release: SuSE_9.2 | 4 | Release: SuSE_9.2 |
5 | Copyright:GPL | 5 | Copyright:GPL |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 3c0259f..94d7293 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1808,5 +1808,5 @@ void MainWindow::save() | |||
1808 | int daysTo = reference.daysTo ( QDate::currentDate() ); | 1808 | int daysTo = reference.daysTo ( QDate::currentDate() ); |
1809 | if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) { | 1809 | if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) { |
1810 | setCaption(i18n("KO/Pi:Creating backup ... please wait ..." )); | 1810 | setCaption(i18n("Creating backup ... please wait ..." )); |
1811 | qDebug("KO: Last backup was %d days ago ", daysTo - KOPrefs::instance()->mLastBackupDate); | 1811 | qDebug("KO: Last backup was %d days ago ", daysTo - KOPrefs::instance()->mLastBackupDate); |
1812 | // we need the file path, the backup dir and the number of bups as param | 1812 | // we need the file path, the backup dir and the number of bups as param |
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp index 2c9e3b6..f36c5ae 100644 --- a/microkde/kapplication.cpp +++ b/microkde/kapplication.cpp | |||
@@ -176,5 +176,8 @@ int KApplication::createBackup( QString fn, QString dp, int numBup ) | |||
176 | while ( tryAgain ) { | 176 | while ( tryAgain ) { |
177 | if ( !bupDir.exists() ) { | 177 | if ( !bupDir.exists() ) { |
178 | KBackupPrefs noDir( i18n("<b>Backup directory does not exist: </b>") + dp.right(30)); | 178 | QString bd = dp.right(25); |
179 | if ( dp.length() > 25 ) | ||
180 | bd = "..." + bd; | ||
181 | KBackupPrefs noDir( i18n("<b>Backup directory does not exist: </b>") + bd); | ||
179 | if ( !noDir.exec() ) return 3; | 182 | if ( !noDir.exec() ) return 3; |
180 | if ( noDir.againTomorrow() ) { | 183 | if ( noDir.againTomorrow() ) { |
@@ -1 +1 @@ | |||
version = "2.1.2"; | version = "2.1.3"; | ||