From 119181e56ffd7987ae57749bde85935e29482955 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sat, 23 Apr 2005 20:32:56 +0000
Subject: fixii

---
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
@@ -762,7 +762,16 @@
 { "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" }, 
 { "","" },
 { "","" },
 { "","" },
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
@@ -1358,15 +1358,15 @@
 { "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
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
@@ -358,6 +358,15 @@
 { "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,6 +1,6 @@
 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
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 3c0259f..94d7293 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1807,7 +1807,7 @@ void MainWindow::save()
             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;
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index 2c9e3b6..f36c5ae 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -175,7 +175,10 @@ int KApplication::createBackup( QString fn, QString dp, int numBup )
     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;
diff --git a/version b/version
index 0e45ddc..c0ee423 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.1.2";
+version = "2.1.3";
--
cgit v0.9.0.2