summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-23 20:32:56 (UTC)
committer zautrix <zautrix>2005-04-23 20:32:56 (UTC)
commit119181e56ffd7987ae57749bde85935e29482955 (patch) (unidiff)
tree194551ded27d91ad912d0cbc7dac29bbd502fc0e
parentd5787e249e4c60fb8de5141b07f9bb4b94c65868 (diff)
downloadkdepimpi-119181e56ffd7987ae57749bde85935e29482955.zip
kdepimpi-119181e56ffd7987ae57749bde85935e29482955.tar.gz
kdepimpi-119181e56ffd7987ae57749bde85935e29482955.tar.bz2
fixii
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt11
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt18
-rw-r--r--bin/kdepim/korganizer/journal.pngbin631 -> 607 bytes
-rw-r--r--bin/kdepim/pwmanager/germantranslation.txt9
-rw-r--r--desktop/rpm/kdepim_rpm2
-rw-r--r--korganizer/mainwindow.cpp2
-rw-r--r--microkde/kapplication.cpp5
-rw-r--r--version2
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
@@ -753,17 +753,26 @@
753{ "Edit ","Bearbeite " }, 753{ "Edit ","Bearbeite " },
754{ "No contact changed!","Kein Kontakt verändert" }, 754{ "No contact changed!","Kein Kontakt verändert" },
755{ "%1 contacts changed!","%1 Kontakte geändert!" }, 755{ "%1 contacts changed!","%1 Kontakte geändert!" },
756{ "Mobile (home)","Handy (Arbeit)" }, 756{ "Mobile (home)","Handy (Arbeit)" },
757{ "Mobile (work)","Handy (Privat)" }, 757{ "Mobile (work)","Handy (Privat)" },
758{ "Def.Formatted Name","Def. Format. Name" }, 758{ "Def.Formatted Name","Def. Format. Name" },
759{ "Colors","Farben" }, 759{ "Colors","Farben" },
760{ "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, 760{ "Alternating background of list views","Abwechselnder Hintergrund für Listen" },
761{ "Backup enabled","Backup angeschaltet" }, 761{ "Backup enabled","Backup angeschaltet" },
762{ "Use standard backup dir","Standard Backupverzeichnis" }, 762{ "Use standard backup dir","Standard Backupverzeichnis" },
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{ "","" },
768{ "","" }, 777{ "","" },
769{ "","" }, \ No newline at end of file 778{ "","" }, \ 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
@@ -1349,25 +1349,25 @@
1349{ "Reparenting aborted!","Übertodo setzen abgebrochen" }, 1349{ "Reparenting aborted!","Übertodo setzen abgebrochen" },
1350{ "Cannot move Todo to itself\nor a child of itself","Kann nicht Todo auf\nsich selbst oder\nein Untertodo verschieben" }, 1350{ "Cannot move Todo to itself\nor a child of itself","Kann nicht Todo auf\nsich selbst oder\nein Untertodo verschieben" },
1351{ "Recursive reparenting not possible!","Rekursives Verschieben nicht möglich" }, 1351{ "Recursive reparenting not possible!","Rekursives Verschieben nicht möglich" },
1352{ "Delete all completed todos?\n(Completed recurring todos\nwill not be deleted!)","Entferne alle erledigten Todos?\n(Erledigte wiederholende Todos\nwerden nicht gelöscht!)" }, 1352{ "Delete all completed todos?\n(Completed recurring todos\nwill not be deleted!)","Entferne alle erledigten Todos?\n(Erledigte wiederholende Todos\nwerden nicht gelöscht!)" },
1353{ "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, 1353{ "Alternating background of list views","Abwechselnder Hintergrund für Listen" },
1354{ "times","Zeiten" }, 1354{ "times","Zeiten" },
1355{ "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?" }, 1355{ "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?" },
1356{ "Backup enabled","Backup angeschaltet" }, 1356{ "Backup enabled","Backup angeschaltet" },
1357{ "Use standard backup dir","Standard Backupverzeichnis" }, 1357{ "Use standard backup dir","Standard Backupverzeichnis" },
1358{ "Number of Backups:","Anzahl der Backups" }, 1358{ "Number of Backups:","Anzahl der Backups" },
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{ "","" },
1372{ "","" }, 1372{ "","" },
1373{ "","" }, 1373{ "","" },
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
@@ -349,19 +349,28 @@
349{ "Sorry, there's nothing to save.\nPlease first add some passwords.","Sorry, es gibt nichts zu speichern.\nBitte erst Passwörter hinzufügen." }, 349{ "Sorry, there's nothing to save.\nPlease first add some passwords.","Sorry, es gibt nichts zu speichern.\nBitte erst Passwörter hinzufügen." },
350{ "Add new password","Passwort hinzufügen" }, 350{ "Add new password","Passwort hinzufügen" },
351{ "Successfully saved data.","Datei gespeichert." }, 351{ "Successfully saved data.","Datei gespeichert." },
352{ "Category:","Kategorie:" }, 352{ "Category:","Kategorie:" },
353{ "LOCKED","GESPERRT" }, 353{ "LOCKED","GESPERRT" },
354{ "Colors","Farben" }, 354{ "Colors","Farben" },
355{ "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, 355{ "Alternating background of list views","Abwechselnder Hintergrund für Listen" },
356{ "Backup enabled","Backup angeschaltet" }, 356{ "Backup enabled","Backup angeschaltet" },
357{ "Use standard backup dir","Standard Backupverzeichnis" }, 357{ "Use standard backup dir","Standard Backupverzeichnis" },
358{ "Number of Backups:","Anzahl der Backups" }, 358{ "Number of Backups:","Anzahl der Backups" },
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{ "","" },
363{ "","" }, 372{ "","" },
364{ "","" }, 373{ "","" },
365{ "","" }, 374{ "","" },
366{ "","" }, 375{ "","" },
367 376
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,15 +1,15 @@
1Summary: A collection of PIM programs 1Summary: A collection of PIM programs
2Name: KDE-Pim-Pi 2Name: KDE-Pim-Pi
3Version: 2.1.2 3Version: 2.1.3
4Release: SuSE_9.2 4Release: SuSE_9.2
5Copyright:GPL 5Copyright:GPL
6Group: Productivity/Pim 6Group: Productivity/Pim
7Source:http://sourceforge.net/projects/kdepimpi/ 7Source:http://sourceforge.net/projects/kdepimpi/
8URL:http://sourceforge.net/projects/kdepimpi/ 8URL:http://sourceforge.net/projects/kdepimpi/
9Packager: zautrix 9Packager: zautrix
10 10
11%description 11%description
12This package contains the platform-independent PIM programs from 12This package contains the platform-independent PIM programs from
13www.pi-sync.info, compiled for SuSE 9.2: 13www.pi-sync.info, compiled for SuSE 9.2:
14KTimeTacker/Pi 14KTimeTacker/Pi
15KPhone/Pi 15KPhone/Pi
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 3c0259f..94d7293 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1798,25 +1798,25 @@ void MainWindow::save()
1798 if ( !mCalendarModifiedFlag ) { 1798 if ( !mCalendarModifiedFlag ) {
1799 qDebug("KO: Calendar not modified. Nothing saved."); 1799 qDebug("KO: Calendar not modified. Nothing saved.");
1800 return; 1800 return;
1801 } 1801 }
1802 if ( mSyncManager->blockSave() ) 1802 if ( mSyncManager->blockSave() )
1803 return; 1803 return;
1804 mSyncManager->setBlockSave(true); 1804 mSyncManager->setBlockSave(true);
1805 if ( mView->checkFileVersion( defaultFileName()) ) { 1805 if ( mView->checkFileVersion( defaultFileName()) ) {
1806 if ( KPimGlobalPrefs::instance()->mBackupEnabled ){ 1806 if ( KPimGlobalPrefs::instance()->mBackupEnabled ){
1807 QDate reference ( 2000,1,1); 1807 QDate reference ( 2000,1,1);
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
1813 QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir; 1813 QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
1814 if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir) 1814 if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
1815 bupDir = KGlobalSettings::backupDataDir(); 1815 bupDir = KGlobalSettings::backupDataDir();
1816 int retval = KApplication::createBackup( defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers ); 1816 int retval = KApplication::createBackup( defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );
1817 if ( retval == 0 ) { 1817 if ( retval == 0 ) {
1818 qDebug("KO: Backup cancelled. Will try again tomorrow "); 1818 qDebug("KO: Backup cancelled. Will try again tomorrow ");
1819 // retval == 0 : backup skipped for today, try again tomorrow 1819 // retval == 0 : backup skipped for today, try again tomorrow
1820 KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1; 1820 KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1;
1821 } else if ( retval == 1 ){ 1821 } else if ( retval == 1 ){
1822 qDebug("KO: Backup created."); 1822 qDebug("KO: Backup created.");
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index 2c9e3b6..f36c5ae 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -166,25 +166,28 @@ class KBackupPrefs : public QDialog
166private: 166private:
167 QRadioButton* vcal, *ical, *ocal, *tcal; 167 QRadioButton* vcal, *ical, *ocal, *tcal;
168}; 168};
169int KApplication::createBackup( QString fn, QString dp, int numBup ) 169int KApplication::createBackup( QString fn, QString dp, int numBup )
170{ 170{
171 if ( numBup < 1) return 3; 171 if ( numBup < 1) return 3;
172 int ret = 3; 172 int ret = 3;
173 //qDebug("KApplication::createBackup %s --- %s --- %d", fn.latin1(), dp.latin1(), numBup); 173 //qDebug("KApplication::createBackup %s --- %s --- %d", fn.latin1(), dp.latin1(), numBup);
174 QDir bupDir ( dp ); 174 QDir bupDir ( dp );
175 bool tryAgain = true; 175 bool tryAgain = true;
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() ) {
181 return 0; 184 return 0;
182 } else if ( noDir.later() ) { 185 } else if ( noDir.later() ) {
183 return 3; 186 return 3;
184 } else if ( !noDir.again() ) { 187 } else if ( !noDir.again() ) {
185 return 2; 188 return 2;
186 } 189 }
187 } else { 190 } else {
188 tryAgain = false; 191 tryAgain = false;
189 } 192 }
190 } 193 }
diff --git a/version b/version
index 0e45ddc..c0ee423 100644
--- a/version
+++ b/version
@@ -1 +1 @@
version = "2.1.2"; version = "2.1.3";