Moved defaults to central location in KPsionConfig

7 files changed, 674 insertions, 735 deletions

diff --git a/kde2/kpsion/kpsion.cpp b/kde2/kpsion/kpsion.cpp
index c7fdc1d..e0c81a4 100644
--- a/kde2/kpsion/kpsion.cpp
+++ b/kde2/kpsion/kpsion.cpp
@@ -186,8 +186,8 @@ setupActions() {
 			    actionCollection());
     KStdAction::showStatusbar(this, SLOT(slotToggleStatusbar()),
 			      actionCollection());
-    KStdAction::saveOptions(this, SLOT(slotSaveOptions()),
-			    actionCollection());
+//    KStdAction::saveOptions(this, SLOT(slotSaveOptions()),
+//			    actionCollection());
     KStdAction::preferences(this, SLOT(slotPreferences()),
 			    actionCollection());
     new KAction(i18n("Start &Format"), 0L, 0, this,
diff --git a/kde2/kpsion/kpsionconfig.cpp b/kde2/kpsion/kpsionconfig.cpp
index 7748862..9d9b89e 100644
--- a/kde2/kpsion/kpsionconfig.cpp
+++ b/kde2/kpsion/kpsionconfig.cpp
@@ -24,6 +24,7 @@
 #include "kpsionconfig.h"
 
 #include <klocale.h>
+#include <kstddirs.h>
 
 #include <iostream.h>
 
@@ -38,12 +39,33 @@ KPsionConfig::KPsionConfig() {
     optionNames.insert(OPT_UIDS, QString("Psion/MachineUIDs"));
     optionNames.insert(OPT_MACHNAME, QString("Psion/Name_%1"));
     optionNames.insert(OPT_BACKUPDRIVES, QString("Psion/BackupDrives_%1"));
+
+    defaults.insert(DEF_INCINTERVAL, QString("1"));
+    defaults.insert(DEF_FULLINTERVAL, QString("7"));
+    defaults.insert(DEF_CONNRETRY, QString("30"));
+    defaults.insert(DEF_SERIALDEV, QString("0"));
+    defaults.insert(DEF_SERIALSPEED, QString("4"));
+    defaults.insert(DEF_BACKUPGEN, QString("3"));
 }
 
 const QString KPsionConfig::
-getOptionName(int optIdx) {
+getStrDefault(int optIdx) {
+    if (optIdx != DEF_BACKUPDIR)
+	return QString::null;
+    return locateLocal("data", "kpsion/backups");
+}
 
-    optMap::Iterator it = optionNames.find(optIdx);
+int KPsionConfig::
+getIntDefault(int optIdx) {
+    cfgMap::Iterator it = defaults.find(optIdx);
+    if (it == defaults.end())
+	return 0;
+    return (*it).toInt();
+}
+
+const QString KPsionConfig::
+getOptionName(int optIdx) {
+    cfgMap::Iterator it = optionNames.find(optIdx);
     if (it == optionNames.end())
 	return QString::null;
     int slash = (*it).find('/');
@@ -52,7 +74,7 @@ getOptionName(int optIdx) {
 
 const QString KPsionConfig::
 getSectionName(int optIdx) {
-    optMap::Iterator it = optionNames.find(optIdx);
+    cfgMap::Iterator it = optionNames.find(optIdx);
     if (it == optionNames.end())
 	return QString::null;
     int slash = (*it).find('/');
@@ -64,14 +86,14 @@ getConfigDevices() {
     QStringList l;
 
     l += i18n("off");
-    l += i18n("/dev/ttyS0");
-    l += i18n("/dev/ttyS1");
-    l += i18n("/dev/ttyS2");
-    l += i18n("/dev/ttyS3");
-    l += i18n("/dev/ircomm0");
-    l += i18n("/dev/ircomm1");
-    l += i18n("/dev/ircomm2");
-    l += i18n("/dev/ircomm3");
+    l += QString("/dev/ttyS0");
+    l += QString("/dev/ttyS1");
+    l += QString("/dev/ttyS2");
+    l += QString("/dev/ttyS3");
+    l += QString("/dev/ircomm0");
+    l += QString("/dev/ircomm1");
+    l += QString("/dev/ircomm2");
+    l += QString("/dev/ircomm3");
 
     return l;
 }
@@ -89,6 +111,25 @@ getConfigSpeeds() {
     return l;
 }
 
+QStringList KPsionConfig::
+getConfigBackupInterval() {
+    QStringList l;
+
+    l += i18n("none");
+    l += i18n("daily");
+    l += i18n("every 2 days");
+    l += i18n("every 3 days");
+    l += i18n("every 4 days");
+    l += i18n("every 5 days");
+    l += i18n("every 6 days");
+    l += i18n("weekly");
+    l += i18n("every 2 weeks");
+    l += i18n("every 3 weeks");
+    l += i18n("monthly");
+
+    return l;
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4
diff --git a/kde2/kpsion/kpsionconfig.h b/kde2/kpsion/kpsionconfig.h
index 95cbb50..0403f67 100644
--- a/kde2/kpsion/kpsionconfig.h
+++ b/kde2/kpsion/kpsionconfig.h
@@ -26,7 +26,7 @@
 #include <qstringlist.h>
 #include <qmap.h>
 
-typedef QMap<int,QString> optMap;
+typedef QMap<int,QString> cfgMap;
 
 class KPsionConfig {
 public:
@@ -44,15 +44,29 @@ public:
 	OPT_BACKUPDRIVES = 9,
     };
 
+    enum cfgDefaults {
+	DEF_BACKUPDIR = 0,
+	DEF_INCINTERVAL = 1,
+	DEF_FULLINTERVAL = 2,
+	DEF_CONNRETRY = 3,
+	DEF_SERIALDEV = 4,
+	DEF_SERIALSPEED = 5,
+	DEF_BACKUPGEN = 6,
+    };
+
     KPsionConfig();
 
     QStringList getConfigDevices();
     QStringList getConfigSpeeds();
+    QStringList getConfigBackupInterval();
     const QString getOptionName(int);
     const QString getSectionName(int);
+    const QString getStrDefault(int);
+    int getIntDefault(int);
 
 private:
-    optMap optionNames;
+    cfgMap optionNames;
+    cfgMap defaults;
 
 };
 #endif
diff --git a/kde2/kpsion/setupdialog.cpp b/kde2/kpsion/setupdialog.cpp
index 03eea8c..fa5959c 100644
--- a/kde2/kpsion/setupdialog.cpp
+++ b/kde2/kpsion/setupdialog.cpp
@@ -48,8 +48,6 @@ SetupDialog::SetupDialog(QWidget *parent, rfsv *plpRfsv, rpcs *plpRpcs)
     QStringList::Iterator sli;
     KPsionConfig pcfg;
 
-    enableLinkedHelp(false);
-
     KConfig *config = kapp->config();
 
     // Page 1
@@ -69,96 +67,64 @@ SetupDialog::SetupDialog(QWidget *parent, rfsv *plpRfsv, rpcs *plpRpcs)
 		    i18n("Click here, for opening a dialog which lets you easily select the backup folder."));
     grid->addWidget(bdirLabel, 0, 1);
     grid->addWidget(bdirButton, 0, 2);
-
-    grid->setColStretch(1, 1);
-
+    grid->setColStretch(0, 1);
     connect(bdirButton, SIGNAL(clicked()), SLOT(slotBdirBrowse()));
 
 
     // Page 2
     page2 = addPage(i18n("Backup &policy"));
-    grid = new QGridLayout(page2);
+    grid = new QGridLayout(page2, 1, 1, marginHint() * 2, spacingHint() * 2);
 
-    QLabel *l = new QLabel(i18n("&Incremental backup reminder"), page2,
+    QLabel *l = new QLabel(i18n("&Incremental backup interval"), page2,
 		   "iBackupIntLabel");
-    grid->addWidget(l, 3, 1);
+    grid->addWidget(l, 0, 0);
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_INCINTERVAL));
     i = config->readNumEntry(pcfg.getOptionName(KPsionConfig::OPT_INCINTERVAL));
     iIntCombo = new KComboBox(false, page2, "iIntCombo");
-    iIntCombo->insertItem(i18n("none"));
-    iIntCombo->insertItem(i18n("daily"));
-    iIntCombo->insertItem(i18n("every 2 days"));
-    iIntCombo->insertItem(i18n("every 3 days"));
-    iIntCombo->insertItem(i18n("every 4 days"));
-    iIntCombo->insertItem(i18n("every 5 days"));
-    iIntCombo->insertItem(i18n("every 6 days"));
-    iIntCombo->insertItem(i18n("weekly"));
-    iIntCombo->insertItem(i18n("every 2 weeks"));
-    iIntCombo->insertItem(i18n("every 3 weeks"));
-    iIntCombo->insertItem(i18n("monthly"));
+    iIntCombo->insertStringList(pcfg.getConfigBackupInterval());
     iIntCombo->setCurrentItem(i);
-    grid->addWidget(iIntCombo, 3, 2);
+    grid->addWidget(iIntCombo, 0, 1);
     l->setBuddy(iIntCombo);
 
-    l = new QLabel(i18n("&Full backup reminder"), page2, "fBackupIntLabel");
-    grid->addWidget(l, 5, 1);
+    l = new QLabel(i18n("&Full backup interval"), page2, "fBackupIntLabel");
+    grid->addWidget(l, 1, 0);
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_FULLINTERVAL));
     i = config->readNumEntry(pcfg.getOptionName(KPsionConfig::OPT_FULLINTERVAL));
     fIntCombo = new KComboBox(false, page2, "fIntCombo");
-    fIntCombo->insertItem(i18n("none"));
-    fIntCombo->insertItem(i18n("daily"));
-    fIntCombo->insertItem(i18n("every 2 days"));
-    fIntCombo->insertItem(i18n("every 3 days"));
-    fIntCombo->insertItem(i18n("every 4 days"));
-    fIntCombo->insertItem(i18n("every 5 days"));
-    fIntCombo->insertItem(i18n("every 6 days"));
-    fIntCombo->insertItem(i18n("weekly"));
-    fIntCombo->insertItem(i18n("every 2 weeks"));
-    fIntCombo->insertItem(i18n("every 3 weeks"));
-    fIntCombo->insertItem(i18n("monthly"));
+    fIntCombo->insertStringList(pcfg.getConfigBackupInterval());
     fIntCombo->setCurrentItem(i);
-    grid->addWidget(fIntCombo, 5, 2);
+    grid->addWidget(fIntCombo, 1, 1);
     l->setBuddy(fIntCombo);
 
     l = new QLabel(i18n("Backup &generations"), page2, "backupGenLabel");
-    grid->addWidget(l, 7, 1);
+    grid->addWidget(l, 2, 0);
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_BACKUPGEN));
     i = config->readNumEntry(pcfg.getOptionName(KPsionConfig::OPT_BACKUPGEN));
     genSpin = new KIntSpinBox(0, 10, 1, i, 10, page2, "backupGenSpin");
-    grid->addWidget(genSpin, 7, 2);
+    grid->addWidget(genSpin, 2, 1);
     l->setBuddy(genSpin);
 
-    grid->setRowStretch(1, 1);
-    grid->setColStretch(1, 1);
-
-    grid->addRowSpacing(2, KDialog::spacingHint());
-    grid->addRowSpacing(4, KDialog::spacingHint());
-    grid->addRowSpacing(6, KDialog::spacingHint());
-
-    grid->addRowSpacing(0, KDialog::marginHint());
-    grid->addRowSpacing(8, KDialog::marginHint());
-    grid->addColSpacing(0, KDialog::marginHint());
-    grid->addColSpacing(3, KDialog::marginHint());
+    grid->setColStretch(0, 1);
 
     // Page 3
     page3 = addPage(i18n("&Connection"));
-    grid = new QGridLayout(page3);
+    grid = new QGridLayout(page3, 1, 1, marginHint() * 2, spacingHint() * 2);
 
     l = new QLabel(i18n("&Connection retry interval (sec.)"), page3,
 		   "rconLabel");
-    grid->addWidget(l, 3, 1);
+    grid->addWidget(l, 0, 0);
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_CONNRETRY));
     i = config->readNumEntry(pcfg.getOptionName(KPsionConfig::OPT_CONNRETRY));
     rconSpin = new KIntSpinBox(0, 600, 1, i, 10, page3, "rconSpin");
-    grid->addWidget(rconSpin, 3, 2);
+    grid->addWidget(rconSpin, 0, 1);
     l->setBuddy(rconSpin);
 
     l = new QLabel(i18n("Serial &device"), page3, "devLabel");
-    grid->addWidget(l, 5, 1);
+    grid->addWidget(l, 1, 0);
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_SERIALDEV));
     tmp = config->readEntry(pcfg.getOptionName(KPsionConfig::OPT_SERIALDEV));
@@ -166,15 +132,18 @@ SetupDialog::SetupDialog(QWidget *parent, rfsv *plpRfsv, rpcs *plpRpcs)
     devCombo = new KComboBox(false, page3, "devCombo");
     sl = pcfg.getConfigDevices();
     devCombo->insertStringList(sl);
-    for (i = 0, sli = sl.begin(); sli != sl.end(); ++i, ++sli) {
-	if (*sli == tmp)
-	    devCombo->setCurrentItem(i);
-    }
-    grid->addWidget(devCombo, 5, 2);
+    if (tmp == "off")
+	devCombo->setCurrentItem(0);
+    else
+	for (i = 0, sli = sl.begin(); sli != sl.end(); ++i, ++sli) {
+	    if (*sli == tmp)
+		devCombo->setCurrentItem(i);
+	}
+    grid->addWidget(devCombo, 1, 1);
     l->setBuddy(devCombo);
 
     l = new QLabel(i18n("Serial &speed"), page3, "speedLabel");
-    grid->addWidget(l, 7, 1);
+    grid->addWidget(l, 2, 0);
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_SERIALSPEED));
     tmp = config->readEntry(pcfg.getOptionName(KPsionConfig::OPT_SERIALSPEED));
@@ -186,27 +155,27 @@ SetupDialog::SetupDialog(QWidget *parent, rfsv *plpRfsv, rpcs *plpRpcs)
 	if (*sli == tmp)
 	    speedCombo->setCurrentItem(i);
     }
-    grid->addWidget(speedCombo, 7, 2);
+    grid->addWidget(speedCombo, 2, 1);
     l->setBuddy(speedCombo);
 
-    grid->setRowStretch(1, 1);
-    grid->setColStretch(1, 1);
-
-    grid->addRowSpacing(2, KDialog::spacingHint());
-    grid->addRowSpacing(4, KDialog::spacingHint());
-    grid->addRowSpacing(6, KDialog::spacingHint());
-
-    grid->addRowSpacing(0, KDialog::marginHint());
-    grid->addRowSpacing(8, KDialog::marginHint());
-    grid->addColSpacing(0, KDialog::marginHint());
-    grid->addColSpacing(3, KDialog::marginHint());
+    grid->setColStretch(0, 1);
 
+    connect(this, SIGNAL(defaultClicked()), SLOT(slotDefaultClicked()));
     connect(this, SIGNAL(okClicked()), SLOT(slotSaveSettings()));
     connect(this, SIGNAL(applyClicked()), SLOT(slotSaveSettings()));
 }
 
 void SetupDialog::
 slotDefaultClicked() {
+    KPsionConfig pcfg;
+
+    bdirLabel->setText(pcfg.getStrDefault(KPsionConfig::DEF_BACKUPDIR));
+    iIntCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_INCINTERVAL));
+    fIntCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_FULLINTERVAL));
+    genSpin->setValue(pcfg.getIntDefault(KPsionConfig::DEF_BACKUPGEN));
+    rconSpin->setValue(pcfg.getIntDefault(KPsionConfig::DEF_CONNRETRY));
+    devCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_SERIALDEV));
+    speedCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_SERIALSPEED));
 }
 
 void SetupDialog::
@@ -242,8 +211,12 @@ slotSaveSettings() {
 		       rconSpin->value());
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_SERIALDEV));
-    config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_SERIALDEV),
-		       devCombo->currentText());
+    if (devCombo->currentItem() == 0)
+	config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_SERIALDEV),
+			   "off");
+    else
+	config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_SERIALDEV),
+			   devCombo->currentText());
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_SERIALSPEED));
     config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_SERIALSPEED),
diff --git a/kde2/kpsion/wizards.cpp b/kde2/kpsion/wizards.cpp
index eb878c4..057d0cb 100644
--- a/kde2/kpsion/wizards.cpp
+++ b/kde2/kpsion/wizards.cpp
@@ -38,7 +38,6 @@
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
-#include <kstddirs.h>
 
 #include <qlayout.h>
 #include <qwhatsthis.h>
@@ -58,7 +57,7 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name)
     QWhatsThis::add(cancelButton(),
 		    i18n("<QT>If you click this button, the setup of <B>KPSion</B> will be aborted and next time you start <B>KPsion</B>, it will run this setup again.</QT>"));
 
-    bdirDefault = locateLocal("data", "kpsion/backups");
+    bdirDefault = pcfg.getStrDefault(KPsionConfig::DEF_BACKUPDIR);
     bdirCreated = "";
 
     // Page 1
@@ -135,7 +134,7 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name)
 	"<QT>"
 	"Next, please specify some information regarding "
 	"backup policy:<UL><LI>How many generations of backups "
-	"do you want to keep?</LI><LI>Shall i remind you about "
+	"do you want to keep?</LI><LI>Shall i perform automatic "
 	"backups?</LI><LI>If yes, in what intervals do you want "
 	"to happen backups?</LI></UL>"
 	"</QT>"
@@ -143,45 +142,27 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name)
     grid->addMultiCellWidget(l, 1, 1, 1, 2, Qt::AlignTop);
 
     l = new QLabel(
-	i18n("&Incremental backup reminder"), page3, "iBackupIntLabel");
+	i18n("&Incremental backup interval"), page3, "iBackupIntLabel");
     grid->addWidget(l, 3, 1);
     iIntCombo = new KComboBox(false, page3, "iIntCombo");
-    iIntCombo->insertItem(i18n("none"));
-    iIntCombo->insertItem(i18n("daily"));
-    iIntCombo->insertItem(i18n("every 2 days"));
-    iIntCombo->insertItem(i18n("every 3 days"));
-    iIntCombo->insertItem(i18n("every 4 days"));
-    iIntCombo->insertItem(i18n("every 5 days"));
-    iIntCombo->insertItem(i18n("every 6 days"));
-    iIntCombo->insertItem(i18n("weekly"));
-    iIntCombo->insertItem(i18n("every 2 weeks"));
-    iIntCombo->insertItem(i18n("every 3 weeks"));
-    iIntCombo->insertItem(i18n("monthly"));
-    iIntCombo->setCurrentItem(1);
+    iIntCombo->insertStringList(pcfg.getConfigBackupInterval());
+    iIntCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_INCINTERVAL));
     grid->addWidget(iIntCombo, 3, 2);
     l->setBuddy(iIntCombo);
 
-    l = new QLabel(i18n("&Full backup reminder"), page3, "fBackupIntLabel");
+    l = new QLabel(i18n("&Full backup interval"), page3, "fBackupIntLabel");
     grid->addWidget(l, 5, 1);
     fIntCombo = new KComboBox(false, page3, "fIntCombo");
-    fIntCombo->insertItem(i18n("none"));
-    fIntCombo->insertItem(i18n("daily"));
-    fIntCombo->insertItem(i18n("every 2 days"));
-    fIntCombo->insertItem(i18n("every 3 days"));
-    fIntCombo->insertItem(i18n("every 4 days"));
-    fIntCombo->insertItem(i18n("every 5 days"));
-    fIntCombo->insertItem(i18n("every 6 days"));
-    fIntCombo->insertItem(i18n("weekly"));
-    fIntCombo->insertItem(i18n("every 2 weeks"));
-    fIntCombo->insertItem(i18n("every 3 weeks"));
-    fIntCombo->insertItem(i18n("monthly"));
-    fIntCombo->setCurrentItem(7);
+    fIntCombo->insertStringList(pcfg.getConfigBackupInterval());
+    fIntCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_FULLINTERVAL));
     grid->addWidget(fIntCombo, 5, 2);
     l->setBuddy(fIntCombo);
 
     l = new QLabel(i18n("Backup &generations"), page3, "backupGenLabel");
     grid->addWidget(l, 7, 1);
-    genSpin = new KIntSpinBox(0, 10, 1, 3, 10, page3, "backupGenSpin");
+    genSpin = new KIntSpinBox(0, 10, 1,
+			      pcfg.getIntDefault(KPsionConfig::DEF_BACKUPGEN),
+			      10, page3, "backupGenSpin");
     grid->addWidget(genSpin, 7, 2);
     l->setBuddy(genSpin);
 
@@ -223,7 +204,9 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name)
     l = new QLabel(
 	i18n("&Connection retry interval (sec.)"), page4, "rconLabel");
     grid->addWidget(l, 3, 1);
-    rconSpin = new KIntSpinBox(0, 600, 1, 30, 10, page4, "rconSpin");
+    rconSpin = new KIntSpinBox(0, 600, 1,
+			       pcfg.getIntDefault(KPsionConfig::DEF_CONNRETRY),
+			       10, page4, "rconSpin");
     grid->addWidget(rconSpin, 3, 2);
     l->setBuddy(rconSpin);
 
@@ -232,7 +215,7 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name)
     devCombo = new KComboBox(false, page4, "devCombo");
     sl = pcfg.getConfigDevices();
     devCombo->insertStringList(sl);
-    devCombo->setCurrentItem(0);
+    devCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_SERIALDEV));
     grid->addWidget(devCombo, 5, 2);
     l->setBuddy(devCombo);
 
@@ -241,7 +224,7 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name)
     speedCombo = new KComboBox(false, page4, "speedCombo");
     sl = pcfg.getConfigSpeeds();
     speedCombo->insertStringList(sl);
-    speedCombo->setCurrentItem(4);
+    speedCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_SERIALSPEED));
     grid->addWidget(speedCombo, 7, 2);
     l->setBuddy(speedCombo);
 
diff --git a/kde2/po/de/kpsion.po b/kde2/po/de/kpsion.po
index 50e4764..03b8877 100644
--- a/kde2/po/de/kpsion.po
+++ b/kde2/po/de/kpsion.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: plptools 0.7\n"
-"POT-Creation-Date: 2001-03-12 05:15+0100\n"
-"PO-Revision-Date: 2001-03-12 05:17CET\n"
+"POT-Creation-Date: 2001-03-13 10:57+0100\n"
+"PO-Revision-Date: 2001-03-13 10:59CET\n"
 "Last-Translator: Fritz Elfert <felfert@to.com>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -14,23 +14,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: kpsion.cpp:241
+#: kpsionbackuplistview.cpp:226
 msgid "Available backups"
 msgstr "Verfügbare Sicherungen"
 
-#: kpsion.cpp:275
+#: kpsionbackuplistview.cpp:260
 msgid "Full"
 msgstr "Voll"
 
-#: kpsion.cpp:282
+#: kpsionbackuplistview.cpp:267
 msgid "Incremental"
 msgstr "Inkremental"
 
-#: kpsion.cpp:289
+#: kpsionbackuplistview.cpp:274
 msgid "%1 backup, created at %2"
 msgstr "%1-Sicherung vom %2"
 
-#: kpsion.cpp:321
+#: kpsionbackuplistview.cpp:306
 msgid ""
 "<qt>Here, you can select the available backups. Select the items you want to "
 "restore, the click on <b>Start</b> to start restoring these items.</qt>"
@@ -39,15 +39,67 @@ msgstr ""
 "die Siezurücksichern wollen aus. Klicken Sie dann auf die Schaltfläche "
 "<B>Start</B> um dieseDateien zu restaurieren.</qt>"
 
-#: kpsion.cpp:482
-msgid "Idle"
-msgstr "Bereit"
+#: kpsionbackuplistview.moc.cpp:42 kpsionbackuplistview.moc.cpp:47
+msgid "KPsionCheckListItem"
+msgstr "KPsionCheckListItem"
 
-#: kpsion.cpp:523 wizards.cpp:227
+#: kpsionbackuplistview.moc.cpp:109 kpsionbackuplistview.moc.cpp:114
+msgid "KPsionBackupListView"
+msgstr "KPsionBackupListView"
+
+#: kpsionconfig.cpp:88
 msgid "off"
 msgstr "aus"
 
-#: kpsion.cpp:527
+#: kpsionconfig.cpp:118
+msgid "none"
+msgstr "keine"
+
+#: kpsionconfig.cpp:119
+msgid "daily"
+msgstr "täglich"
+
+#: kpsionconfig.cpp:120
+msgid "every 2 days"
+msgstr "alle 2 Tage"
+
+#: kpsionconfig.cpp:121
+msgid "every 3 days"
+msgstr "alle 3 Tage"
+
+#: kpsionconfig.cpp:122
+msgid "every 4 days"
+msgstr "alle 4 Tage"
+
+#: kpsionconfig.cpp:123
+msgid "every 5 days"
+msgstr "alle 5 Tage"
+
+#: kpsionconfig.cpp:124
+msgid "every 6 days"
+msgstr "alle 6 Tage"
+
+#: kpsionconfig.cpp:125
+msgid "weekly"
+msgstr "wöchentlich"
+
+#: kpsionconfig.cpp:126
+msgid "every 2 weeks"
+msgstr "alle 2 Wochen"
+
+#: kpsionconfig.cpp:127
+msgid "every 3 weeks"
+msgstr "alle 3 Wochen"
+
+#: kpsionconfig.cpp:128
+msgid "monthly"
+msgstr "monatlich"
+
+#: kpsion.cpp:65
+msgid "Idle"
+msgstr "Bereit"
+
+#: kpsion.cpp:125
 msgid ""
 "<qt>Here, you see your Psion's drives.<br/>Every drive is represented by an "
 "Icon. If you click on it, it gets selected for the next operation. E.g.: "
@@ -61,66 +113,66 @@ msgstr ""
 "abzuwählen.<br/>Wählen Sie beliebig viele Laufwerke und dann eine "
 "Operation.</qt>"
 
-#: kpsion.cpp:595
+#: kpsion.cpp:193
 msgid "Start &Format"
 msgstr "Starte &Formatierung"
 
-#: kpsion.cpp:597
+#: kpsion.cpp:195
 msgid "Start Full &Backup"
 msgstr "Starte &Komplett-Sicherung"
 
-#: kpsion.cpp:600
+#: kpsion.cpp:198
 msgid "Start &Incremental Backup"
 msgstr "Starte &inkrementelle Sicherung"
 
-#: kpsion.cpp:602
+#: kpsion.cpp:200
 msgid "Start &Restore"
 msgstr "Starte &Rücksicherung"
 
-#: kpsion.cpp:616
+#: kpsion.cpp:214
 msgid "Full backup of selected drive(s)"
 msgstr "Komplett-Sicherung der ausgewählten Laufwerke"
 
-#: kpsion.cpp:618
+#: kpsion.cpp:216
 msgid "Incremental backup of selected drive(s)"
 msgstr "Inkrementelle Sicherung der ausgewählten Laufwerke"
 
-#: kpsion.cpp:620
+#: kpsion.cpp:218
 msgid "Restore selected drive(s)"
 msgstr "Sichere ausgewählte Laufwerke zurück"
 
-#: kpsion.cpp:622
+#: kpsion.cpp:220
 msgid "Format selected drive(s)"
 msgstr "Formatiere ausgewählte Laufwerke"
 
-#: kpsion.cpp:693
+#: kpsion.cpp:291
 msgid "Retrieving machine info ..."
 msgstr "Ermittle Geräte-Info ..."
 
-#: kpsion.cpp:704
+#: kpsion.cpp:302
 msgid "Could not get Psion machine info"
 msgstr "Konnte Psion Geräteinfo nicht ermitteln"
 
-#: kpsion.cpp:717
+#: kpsion.cpp:318
 msgid "an unknown machine"
 msgstr "einem unbekannten Gerät"
 
-#: kpsion.cpp:730
+#: kpsion.cpp:329
 msgid "Retrieving drive list ..."
 msgstr "Ermittle Laufwerks-Liste ..."
 
-#: kpsion.cpp:733
+#: kpsion.cpp:332
 msgid "Could not get list of drives"
 msgstr "Konnte Liste der Laufwerke nicht ermitteln"
 
-#: kpsion.cpp:763 kpsion.cpp:1035 kpsion.cpp:1057 kpsion.cpp:1080
-#: kpsion.cpp:1190 kpsion.cpp:1377 kpsion.cpp:1538 kpsion.cpp:1547
-#: kpsion.cpp:1578 kpsion.cpp:1596 kpsion.cpp:1607
+#: kpsion.cpp:362 kpsion.cpp:634 kpsion.cpp:656 kpsion.cpp:679 kpsion.cpp:789
+#: kpsion.cpp:923 kpsion.cpp:1084 kpsion.cpp:1093 kpsion.cpp:1124
+#: kpsion.cpp:1142 kpsion.cpp:1153
 #, c-format
 msgid "Connected to %1"
 msgstr "Verbunden mit %1"
 
-#: kpsion.cpp:797
+#: kpsion.cpp:396
 msgid ""
 "<QT>The selected drive <B>Z:</B> is a <B>ROM</B> drive and therefore cannot "
 "be restored.</QT>"
@@ -128,7 +180,7 @@ msgstr ""
 "<QT>Das gewählte Laufwerk <B>Z:</B> ist ein <B>ROM</B> Laufwerk und kann "
 "deshalb nicht rückgesichert werden.</QT>"
 
-#: kpsion.cpp:844
+#: kpsion.cpp:443
 msgid ""
 "A backup is running.\n"
 "Do you really want to quit?"
@@ -136,7 +188,7 @@ msgstr ""
 "Eine Sicherung läuft.\n"
 "Wollen Sie wirklich das Programm beenden?"
 
-#: kpsion.cpp:846
+#: kpsion.cpp:445
 msgid ""
 "A restore is running.\n"
 "Do you really want to quit?"
@@ -144,7 +196,7 @@ msgstr ""
 "Eine Rücksicherung läuft.\n"
 "Wollen Sie wirklich das Programm beenden?"
 
-#: kpsion.cpp:848
+#: kpsion.cpp:447
 msgid ""
 "A format is running.\n"
 "Do you really want to quit?"
@@ -152,114 +204,94 @@ msgstr ""
 "Eine Formatierung läuft.\n"
 "Wollen Sie wirklich das Programm beenden?"
 
-#: kpsion.cpp:874
+#: kpsion.cpp:473
 msgid "Connecting ..."
 msgstr "Verbindungsaufbau ..."
 
-#: kpsion.cpp:876
+#: kpsion.cpp:475
 msgid "RFSV could not connect to ncpd at %1:%2. "
 msgstr "RFSV konnte ncpd auf %1:%2 nicht erreichen. "
 
-#: kpsion.cpp:879 kpsion.cpp:901 kpsion.cpp:924 kpsion.cpp:949
+#: kpsion.cpp:478 kpsion.cpp:500 kpsion.cpp:523 kpsion.cpp:548
 msgid " (Retry in %1 seconds.)"
 msgstr " (Wiederholung in %1 Sekunden.)"
 
-#: kpsion.cpp:896
+#: kpsion.cpp:495
 #, c-format
 msgid "RFSV could not establish link: %1."
 msgstr "RFSV konnte keine Verbindung aufbauen: %1."
 
-#: kpsion.cpp:917
+#: kpsion.cpp:516
 msgid "RPCS could not connect to ncpd at %1:%2."
 msgstr "RPCS konnte ncpd auf %1:%2 nicht erreichen."
 
-#: kpsion.cpp:940
+#: kpsion.cpp:539
 #, c-format
 msgid "RPCS could not establish link: %1."
 msgstr "RPCS konnte keine Verbindung aufbauen: %1."
 
-#: kpsion.cpp:1039
+#: kpsion.cpp:638
 #, c-format
 msgid "Could not retrieve drive details for drive %1"
 msgstr "Konnte Details des Laufwerks %1 nicht ermitteln."
 
-#: kpsion.cpp:1044
+#: kpsion.cpp:643
 #, c-format
 msgid "Scanning drive %1"
 msgstr "Durchsuche Laufwerk %1"
 
-#: kpsion.cpp:1053
+#: kpsion.cpp:652
 msgid "%1 files need backup"
 msgstr "%1 Dateien müssen gesichert werden"
 
-#: kpsion.cpp:1059
+#: kpsion.cpp:658
 msgid "No files need backup"
 msgstr "Keine Dateien zu sichern"
 
-#: kpsion.cpp:1082
+#: kpsion.cpp:681
 #, c-format
 msgid "Could not create backup folder %1"
 msgstr "Konnte Sicherungs-Ordner %1 nicht anlegen."
 
-#: kpsion.cpp:1106
+#: kpsion.cpp:705
 msgid "Backup %1% done"
 msgstr "Sicherung %1% beendet"
 
-#: kpsion.cpp:1126
+#: kpsion.cpp:725
 msgid "<QT>Could not open<BR/><B>%1</B></QT>"
 msgstr "<QT>Konnte<BR/><B>%1</B><BR/>nicht öffnen</QT>"
 
-#: kpsion.cpp:1146
+#: kpsion.cpp:745
 msgid "<QT>Could not read<BR/><B>%1</B></QT>"
 msgstr "<QT>Konnte<BR/><B>%1</B><BR/>nicht lesen</QT>"
 
-#: kpsion.cpp:1159
+#: kpsion.cpp:758
 msgid "Resetting archive attributes"
 msgstr "Setze Archiv-Attribute zurück"
 
-#: kpsion.cpp:1172
+#: kpsion.cpp:771
 msgid "<QT>Could not set attributes of<BR/><B>%1</B></QT>"
 msgstr "<QT>Konnte Attribute der Datei<BR/><B>%1</B><BR/>nicht setzen</QT>"
 
-#: kpsion.cpp:1194
+#: kpsion.cpp:793
 msgid "Backup done"
 msgstr "Sicherung beendet"
 
-#: kpsion.cpp:1198
-msgid "Restore"
-msgstr "Rücksicherung"
-
-#: kpsion.cpp:1202
-msgid "Start"
-msgstr "Start"
-
-#: kpsion.cpp:1205
-msgid ""
-"Select items in the list of available backups, then click here to start "
-"restore of these items."
-msgstr ""
-"Wählen Sie in der Liste der verfügbaren Sicherungen Dateien aus und "
-"klicken Sie dann hier um die gewählten Dateien zu restaurieren."
-
-#: kpsion.cpp:1216
-msgid "Format drive before restore"
-msgstr "Formatiere Laufwerk vor Rücksicherung"
-
-#: kpsion.cpp:1261 kpsion.cpp:1491
+#: kpsion.cpp:807 kpsion.cpp:1037
 msgid "<QT>Could not get attributes of<BR/><B>%1</B><BR/>Reason: %2</QT>"
 msgstr ""
 "<QT>Konnte Attribute der Datei<BR/><B>%1</B> nicht abfragen<BR/>Grund: "
 "%2</QT>"
 
-#: kpsion.cpp:1290
+#: kpsion.cpp:836
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: kpsion.cpp:1293
+#: kpsion.cpp:839
 msgid "Overwrite &All"
 msgstr "Überschreibe &Alles"
 
-#: kpsion.cpp:1306
+#: kpsion.cpp:852
 msgid ""
 "<QT>The file <B>%1</B> exists already on the Psion with different size "
 "and/or attributes.<P><B>On the Psion:</B><BR/>  Size: %2<BR/>  Date: %3<BR/> "
@@ -272,61 +304,61 @@ msgstr ""
 "%5<BR/>  Datum: %6<BR/>  Attribute: %7</P>Wollen Sie die Datei "
 "überschreiben?</QT>"
 
-#: kpsion.cpp:1344
+#: kpsion.cpp:890
 msgid "Reading backups ..."
 msgstr "Lese Sicherungsdaten ..."
 
-#: kpsion.cpp:1349
+#: kpsion.cpp:895
 msgid "Selecting backups ..."
 msgstr "Wähle Sicherungsdaten ..."
 
-#: kpsion.cpp:1382 kpsion.cpp:1430
+#: kpsion.cpp:928 kpsion.cpp:976
 msgid "Restore %1% done"
 msgstr "Rücksicherung %1% abgeschlossen"
 
-#: kpsion.cpp:1446
+#: kpsion.cpp:992
 msgid "<QT>Could not create directory<BR/><B>%1</B><BR/>Reason: %2</QT>"
 msgstr "<QT>Konnte den Ordner<BR/><B>%1</B> nicht anlegen.<BR/>Grund: %2</QT>"
 
-#: kpsion.cpp:1461
+#: kpsion.cpp:1007
 msgid "<QT>Could not create<BR/><B>%1</B><BR/>Reason: %2</QT>"
 msgstr "<QT>Konnte<BR/><B>%1</B> nicht anlegen<BR/>Grund: %2</QT>"
 
-#: kpsion.cpp:1483
+#: kpsion.cpp:1029
 msgid "<QT>Could not write to<BR/><B>%1</B><BR/>Reason: %2</QT>"
 msgstr "<QT>Konnte nicht auf <BR/><B>%1</B> schreiben<BR/>Grund: %2</QT>"
 
-#: kpsion.cpp:1509
+#: kpsion.cpp:1055
 msgid "<QT>Could not set attributes of<BR/><B>%1</B><BR/>Reason: %2</QT>"
 msgstr "<QT>Konnte Attribute der Datei<BR/><B>%1</B>nicht setzen.<BR/>Grund: %2</QT>"
 
-#: kpsion.cpp:1522
+#: kpsion.cpp:1068
 msgid "<QT>Could not set modification time of<BR/><B>%1</B><BR/>Reason: %2</QT>"
 msgstr ""
 "<QT>Konnte Änderungsdatum der Datei<BR/><B>%1</B> nicht setzen<BR/>Grund: "
 "%2</QT>"
 
-#: kpsion.cpp:1549
+#: kpsion.cpp:1095
 msgid "Restore done"
 msgstr "Rücksicherung abgeschlossen"
 
-#: kpsion.cpp:1563
+#: kpsion.cpp:1109
 msgid "Formatting drive %1:"
 msgstr "Formatiere Laufwerk %1:"
 
-#: kpsion.cpp:1574
+#: kpsion.cpp:1120
 msgid "<QT>Could not format drive %1:<BR/>%2</QT>"
 msgstr "<QT>Konnte Laufwerk %1 nicht formatieren:<BR/>%2</QT>"
 
-#: kpsion.cpp:1591
+#: kpsion.cpp:1137
 msgid "<QT>Error during format of drive %1:<BR/>%2</QT>"
 msgstr "<QT>Fehler beim Formatieren von Laufwerk %1:<BR/>%2</QT>"
 
-#: kpsion.cpp:1609
+#: kpsion.cpp:1155
 msgid "Format done"
 msgstr "Formatierung beendet"
 
-#: kpsion.cpp:1615
+#: kpsion.cpp:1161
 msgid ""
 "<QT>This erases <B>ALL</B> data on the drive(s).<BR/>Do you really want to "
 "proceed?"
@@ -334,11 +366,11 @@ msgstr ""
 "<QT>Hierdurch werden <B>ALLE</B> Daten auf dem(den) Laufwerk(en) "
 "gelöscht.<BR/>Wollen Sie wirklich fortfahren?</QT>"
 
-#: kpsion.cpp:1636
+#: kpsion.cpp:1182
 msgid "Assign drive name"
 msgstr "Weise Laufwerksnamen zu"
 
-#: kpsion.cpp:1645
+#: kpsion.cpp:1191
 msgid ""
 "<QT>Formatting of drive %1: finished. Please assign a name for that "
 "drive.</QT>"
@@ -346,73 +378,85 @@ msgstr ""
 "<QT>Die Formatierung des Laufwerks %1 ist beendet. Bitte weisen Sie dem "
 "Laufwerk nun einen Namen zu.</QT>"
 
-#: kpsion.cpp:1649
+#: kpsion.cpp:1195
 msgid "New name of drive %1:"
 msgstr "Neuer Name für Laufwerk %1:"
 
-#: kpsion.cpp:1793
+#: kpsion.cpp:1341
 #, c-format
 msgid "Stopping %1"
 msgstr "Stoppe %1"
 
-#: kpsion.cpp:1811
+#: kpsion.cpp:1359
 msgid ""
 "<QT>Could not stop all processes.<BR/>Please stop running programs manually "
 "on the Psion, then klick <B>Ok</B>."
 msgstr ""
-"<QT>Konnte nicht alle Prozesse stoppen.<BR/>Bitte beenden Sie laufende Progamme "
-"auf dem Psion manuell. Klickens Die dann <B>Ok</B>."
+"<QT>Konnte nicht alle Prozesse stoppen.<BR/>Bitte beenden Sie laufende "
+"Progamme auf dem Psion manuell. Klickens Die dann <B>Ok</B>."
 
-#: kpsion.cpp:1834
+#: kpsion.cpp:1382
 #, c-format
 msgid "Starting %1"
 msgstr "Starte %1"
 
 #: kpsion.moc.cpp:42 kpsion.moc.cpp:47
-msgid "KPsionCheckListItem"
-msgstr "KPsionCheckListItem"
+msgid "KPsionMainWindow"
+msgstr "KPsionMainWindow"
 
-#: kpsion.moc.cpp:109 kpsion.moc.cpp:114
-msgid "KPsionBackupListView"
-msgstr "KPsionBackupListView"
+#: kpsionrestoredialog.cpp:35
+msgid "Restore"
+msgstr "Rücksicherung"
 
-#: kpsion.moc.cpp:184 kpsion.moc.cpp:189
+#: kpsionrestoredialog.cpp:39
+msgid "Start"
+msgstr "Start"
+
+#: kpsionrestoredialog.cpp:42
+msgid ""
+"Select items in the list of available backups, then click here to start "
+"restore of these items."
+msgstr ""
+"Wählen Sie in der Liste der verfügbaren Sicherungen Dateien aus und "
+"klicken Sie dann hier um die gewählten Dateien zu restaurieren."
+
+#: kpsionrestoredialog.cpp:53
+msgid "Format drive before restore"
+msgstr "Formatiere Laufwerk vor Rücksicherung"
+
+#: kpsionrestoredialog.moc.cpp:42 kpsionrestoredialog.moc.cpp:47
 msgid "KPsionRestoreDialog"
 msgstr "KPsionRestoreDialog"
 
-#: kpsion.moc.cpp:246 kpsion.moc.cpp:251
-msgid "KPsionMainWindow"
-msgstr "KPsionMainWindow"
-
-#: main.cpp:48
+#: main.cpp:49
 msgid "perform scheduled backup"
 msgstr "Führe geplante Sicherung durch"
 
-#: main.cpp:50
+#: main.cpp:51
 msgid "perform backup"
 msgstr "Führe Sicherung durch"
 
-#: main.cpp:52
+#: main.cpp:53
 msgid "perform restore"
 msgstr "Führe Rücksicherung durch"
 
-#: main.cpp:54
+#: main.cpp:55
 msgid "format drive"
 msgstr "Formatiere Laufwerk"
 
-#: main.cpp:59
+#: main.cpp:60
 msgid "KPsion"
 msgstr "KPsion"
 
-#: main.cpp:60
+#: main.cpp:61
 msgid "Psion connectivity utility"
 msgstr "Werkzeug für Psion PDA"
 
-#: main.cpp:65
+#: main.cpp:66
 msgid "Original Developer/Maintainer"
 msgstr "Original Entwickler/Betreuer"
 
-#: main.cpp:100
+#: main.cpp:104
 msgid ""
 "The options are mutually exclusive. I.e. You cannot specify more than one "
 "action at once."
@@ -420,33 +464,117 @@ msgstr ""
 "Die Optionen schließen sich gegenseitig aus. D.h. sie können nicht mehrere "
 "unterschiedliche Aktionen gleichzeitig angeben."
 
-#: setupdialog.cpp:20
-msgid "&General"
-msgstr "&Allgemein"
+#: setupdialog.cpp:54
+msgid "Backup &folder"
+msgstr "Sicherungs &Ordner"
 
-#: setupdialog.cpp:25
-msgid "Backup &directory"
-msgstr "&Ordner für Sicherungen"
-
-#: setupdialog.cpp:30 wizards.cpp:104
+#: setupdialog.cpp:62 wizards.cpp:107
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: setupdialog.cpp:33 wizards.cpp:177
+#: setupdialog.cpp:65 wizards.cpp:110
+msgid "This is the name of the backup folder."
+msgstr "Dies ist der Name des Sicherungs-Ordners."
+
+#: setupdialog.cpp:67 wizards.cpp:112
+msgid ""
+"Click here, for opening a dialog which lets you easily select the backup "
+"folder."
+msgstr ""
+"Aktivieren Sie diese Schaltfläche, um einen Dialog zu öffnen welcher es "
+"Ihnen auf einfache Weise erlaubt, den Sicherungs-Ordner zu wählen."
+
+#: setupdialog.cpp:75
+msgid "Backup &policy"
+msgstr "Sicherungs &Strategie"
+
+#: setupdialog.cpp:78 wizards.cpp:145
+msgid "&Incremental backup interval"
+msgstr "Invervall für &inkrementelle Sicherung"
+
+#: setupdialog.cpp:90 wizards.cpp:153
+msgid "&Full backup interval"
+msgstr "Intervall für &Komplett-Sicherung"
+
+#: setupdialog.cpp:101 wizards.cpp:161
 msgid "Backup &generations"
 msgstr "Sicherungs-&Generationen"
 
-#: setupdialog.cpp:39
-msgid "&Machines"
-msgstr "&Geräte"
+#: setupdialog.cpp:113
+msgid "&Connection"
+msgstr "&Verbindung"
 
-#: setupdialog.cpp:43
-msgid "Machine &Name"
-msgstr "&Name des Geräts"
+#: setupdialog.cpp:116 wizards.cpp:205
+msgid "&Connection retry interval (sec.)"
+msgstr "&Verbindungsaufbau-Intervall (in sek.)"
+
+#: setupdialog.cpp:126 wizards.cpp:213
+msgid "Serial &device"
+msgstr "&Serielle Schnittstelle"
+
+#: setupdialog.cpp:145 wizards.cpp:222
+msgid "Serial &speed"
+msgstr "Schnittstellen-&Geschwindigkeit"
+
+#: setupdialog.cpp:184 wizards.cpp:279
+msgid "Backup folder"
+msgstr "Sicherungs-Ordner"
+
+#: setupdialog.cpp:260 wizards.cpp:365
+msgid "<QT>The folder <B>%1</B> does <B>not</B> exist.<BR/>Shall it be created?</QT>"
+msgstr ""
+"<QT>Der Ordner <B>%1</B> existiert <B>nicht</B>.<BR/>Soll er angelegt "
+"werden?</QT>"
 
-#: setupdialog.cpp:48
-msgid "Machine &UID"
-msgstr "&UID des Geräts"
+#: setupdialog.cpp:265 wizards.cpp:370
+msgid "<QT>The specified folder<BR/><B>%1</B><BR/>could <B>not</B> be created"
+msgstr "<QT>Der angegebene Ordner<BR/><B>%1</B><BR/>konnte nicht angelegt werden"
+
+#: setupdialog.cpp:270 wizards.cpp:375
+msgid ""
+", because you either don't have sufficient rights to do that, or the "
+"filesystem is readonly."
+msgstr ""
+", weil Sie entweder nicht die nötigen Rechte besitzen, oder das Dateisystem "
+"nur lesbar ist."
+
+#: setupdialog.cpp:274 wizards.cpp:379
+msgid ", because the filesystem has not enough space."
+msgstr ", weil auf dem Dateisystem kein Platz mehr ist."
+
+#: setupdialog.cpp:280 wizards.cpp:385
+msgid ", because there already exists another object with the same name."
+msgstr ", weil schon ein anderes Objekt mit dem selben Namen existiert."
+
+#: setupdialog.cpp:290 wizards.cpp:395
+msgid ""
+", because you specified a path which probably contains a dangling symbolic "
+"link."
+msgstr ""
+", weil Sie eine Pfad angegeben haben, der eine nicht aufgelöste symbolische "
+"Verknüpfung enthält."
+
+#: setupdialog.cpp:293 wizards.cpp:398
+msgid ""
+", because you specified a path which contains an element which is not a "
+"folder."
+msgstr ""
+", weil Sie eine Pfad angegeben haben, der ein Element enthält, welches kein "
+"Ordner ist."
+
+#: setupdialog.cpp:297 wizards.cpp:402
+msgid ", because you specified a path which contains too many symbolic links."
+msgstr ""
+", weil Sie eine Pfad angegeben haben, der zu viele symbolische "
+"Verknüpfungen enthält."
+
+#: setupdialog.cpp:304 wizards.cpp:409
+msgid "<BR/>Please select another folder.</QT>"
+msgstr "<BR/>Bitte wählen Sie einen anderen Ordner.</QT>"
+
+#: setupdialog.moc.cpp:42 setupdialog.moc.cpp:47
+msgid "SetupDialog"
+msgstr "SetupDialog"
 
 #: statusbarprogress.cpp:357 statusbarprogress.cpp:370
 #: statusbarprogress.cpp:379 statusbarprogress.cpp:392
@@ -458,19 +586,19 @@ msgstr "%1 %2 von %3"
 msgid "KPsionStatusBarProgress"
 msgstr "KPsionStatusBarProgress"
 
-#: wizards.cpp:49
+#: wizards.cpp:52
 msgid "KPsion Setup"
 msgstr "KPsion Einstellungen"
 
-#: wizards.cpp:51 wizards.cpp:428
+#: wizards.cpp:54 wizards.cpp:429
 msgid "Click this button to continue with the next page."
 msgstr "Betätigen Sie diese Schaltfläche um mit der nächsten Seite fortzufahren."
 
-#: wizards.cpp:53 wizards.cpp:430
+#: wizards.cpp:56 wizards.cpp:431
 msgid "Click this button, to go to a previous page."
 msgstr "Betätigen Sie diese Schaltfläche, um zur vorigen Seite zu kommen."
 
-#: wizards.cpp:55
+#: wizards.cpp:58
 msgid ""
 "<QT>If you click this button, the setup of <B>KPSion</B> will be aborted and "
 "next time you start <B>KPsion</B>, it will run this setup again.</QT>"
@@ -479,7 +607,7 @@ msgstr ""
 "<B>KPsion</B> abgebrochen. Beim nächsten Start von <B>KPsion</B> wird dann "
 "die Konfiguration erneut gestartet.</QT>"
 
-#: wizards.cpp:66
+#: wizards.cpp:69
 msgid ""
 "<QT><H2>Welcome to KPsion!</H2>It looks like you started <B>KPsion</B> the "
 "first time. At least, i could not find any valid configuration.</BR>On the "
@@ -492,11 +620,11 @@ msgstr ""
 "sammeln, die für die Arbeit mit <B>KPsion</B> nötig sind.</BR> </BR>Viel "
 "Spaß.</QT>"
 
-#: wizards.cpp:83
+#: wizards.cpp:86
 msgid "<QT><BIG><B>Welcome<B></BIG></QT>"
 msgstr "<QT><BIG><B>Willkommen<B></BIG></QT>"
 
-#: wizards.cpp:91
+#: wizards.cpp:94
 msgid ""
 "<QT>First, we need a folder for storing backups of your Psion. You probably "
 "don't want others to have access to it, so it's best to choose a location "
@@ -510,91 +638,27 @@ msgstr ""
 "adäquate Stelle oder akzeptieren Sie einfach die unten angezeigte "
 "Vorgabe.</QT>"
 
-#: wizards.cpp:107
-msgid "This is the name of the backup folder."
-msgstr "Dies ist der Name des Sicherungs-Ordners."
-
-#: wizards.cpp:109
-msgid ""
-"Click here, for opening a dialog which lets you easily select the backup "
-"folder."
-msgstr ""
-"Aktivieren Sie diese Schaltfläche, um einen Dialog zu öffnen welcher es "
-"Ihnen auf einfache Weise erlaubt, den Sicherungs-Ordner zu wählen."
-
-#: wizards.cpp:124
+#: wizards.cpp:127
 msgid "<QT><BIG><B>Step 1</B></BIG> - Specify backup directory</QT>"
 msgstr "<QT><BIG><B>Schritt 1</B></BIG> - Angabe des Sicherungs-Ordners</QT>"
 
-#: wizards.cpp:131
+#: wizards.cpp:134
 msgid ""
 "<QT>Next, please specify some information regarding backup "
 "policy:<UL><LI>How many generations of backups do you want to "
-"keep?</LI><LI>Shall i remind you about backups?</LI><LI>If yes, in what "
+"keep?</LI><LI>Shall i perform automatic backups?</LI><LI>If yes, in what "
 "intervals do you want to happen backups?</LI></UL></QT>"
 msgstr ""
 "<QT>Als nächstes geben Sie bitte einige Informationen zur "
 "Sicherungs-Strategie an:<UL><LI>Wie viele Sicherungs-Generationen wollen Sie "
-"aufheben?</LI><LI>Soll ich Sie an Sicherungen erinnern?</LI><LI>Wenn ja, in "
+"aufheben?</LI><LI>Soll ich automatische Sicherungen vornehmen?</LI><LI>Wenn ja, in "
 "welchen Intervallen?</LI></UL></QT>"
 
-#: wizards.cpp:141
-msgid "&Incremental backup reminder"
-msgstr "Erinnerung an &inkrementelle Sicherung"
-
-#: wizards.cpp:144 wizards.cpp:162
-msgid "none"
-msgstr "keine"
-
-#: wizards.cpp:145 wizards.cpp:163
-msgid "daily"
-msgstr "täglich"
-
-#: wizards.cpp:146 wizards.cpp:164
-msgid "every 2 days"
-msgstr "alle 2 Tage"
-
-#: wizards.cpp:147 wizards.cpp:165
-msgid "every 3 days"
-msgstr "alle 3 Tage"
-
-#: wizards.cpp:148 wizards.cpp:166
-msgid "every 4 days"
-msgstr "alle 4 Tage"
-
-#: wizards.cpp:149 wizards.cpp:167
-msgid "every 5 days"
-msgstr "alle 5 Tage"
-
-#: wizards.cpp:150 wizards.cpp:168
-msgid "every 6 days"
-msgstr "alle 6 Tage"
-
-#: wizards.cpp:151 wizards.cpp:169
-msgid "weekly"
-msgstr "wöchentlich"
-
-#: wizards.cpp:152 wizards.cpp:170
-msgid "every 2 weeks"
-msgstr "alle 2 Wochen"
-
-#: wizards.cpp:153 wizards.cpp:171
-msgid "every 3 weeks"
-msgstr "alle 3 Wochen"
-
-#: wizards.cpp:154 wizards.cpp:172
-msgid "monthly"
-msgstr "monatlich"
-
-#: wizards.cpp:159
-msgid "&Full backup reminder"
-msgstr "Erinnerung an &Komplett-Sicherung"
-
-#: wizards.cpp:195
+#: wizards.cpp:181
 msgid "<QT><BIG><B>Step 2</B></BIG> - Backup policy</QT>"
 msgstr "<QT><BIG><B>Schritt 2</B></BIG> - Sicherungs-Strategie</QT>"
 
-#: wizards.cpp:203
+#: wizards.cpp:189
 msgid ""
 "<QT>If no connection could be established on startup, <B>KPsion</B> will "
 "attempt to connect in regular intervals. Please specify the interval after "
@@ -615,55 +679,11 @@ msgstr ""
 "Schnittstellengeschwindigkeit angeben</LI><LI>die Rechte zum Öffnen des "
 "angegebenen Ports besitzen</LI></UL></QT>"
 
-#: wizards.cpp:218
-msgid "&Connection retry interval (sec.)"
-msgstr "&Verbindungsaufbau-Intervall (in sek.)"
-
-#: wizards.cpp:224
-msgid "Serial &device"
-msgstr "&Serielle Schnittstelle"
-
-#: wizards.cpp:228
-msgid "/dev/ttyS0"
-msgstr "/dev/ttyS0"
-
-#: wizards.cpp:229
-msgid "/dev/ttyS1"
-msgstr "/dev/ttyS1"
-
-#: wizards.cpp:230
-msgid "/dev/ttyS2"
-msgstr "/dev/ttyS2"
-
-#: wizards.cpp:231
-msgid "/dev/ttyS3"
-msgstr "/dev/ttyS3"
-
-#: wizards.cpp:232
-msgid "/dev/ircomm0"
-msgstr "/dev/ircomm0"
-
-#: wizards.cpp:233
-msgid "/dev/ircomm1"
-msgstr "/dev/ircomm1"
-
-#: wizards.cpp:234
-msgid "/dev/ircomm2"
-msgstr "/dev/ircomm2"
-
-#: wizards.cpp:235
-msgid "/dev/ircomm3"
-msgstr "/dev/ircomm3"
-
-#: wizards.cpp:240
-msgid "Serial &speed"
-msgstr "Schnittstellen-&Geschwindigkeit"
-
-#: wizards.cpp:264
+#: wizards.cpp:244
 msgid "<QT><BIG><B>Step 3</B></BIG> - Connection parameters</QT>"
 msgstr "<QT><BIG><B>Schritt 3</B></BIG> - Verbindungs-Parameter</QT>"
 
-#: wizards.cpp:272
+#: wizards.cpp:252
 msgid ""
 "<QT>That's it!<BR/>Next, i will start <B>KPsion</B> and if your Psion is "
 "already connected and it's communication turned on (use <B>Ctrl-T</B> at "
@@ -679,15 +699,11 @@ msgstr ""
 "durchzuführen.<BR/>Bitte betätigen Sie nun die Schaltfläche "
 "<B>Abschließen</B>.</QT>"
 
-#: wizards.cpp:291
+#: wizards.cpp:271
 msgid "<QT><BIG><B>Finished</B></BIG></QT>"
 msgstr "<QT><BIG><B>Fertig<B></BIG></QT>"
 
-#: wizards.cpp:299
-msgid "Backup folder"
-msgstr "Sicherungs-Ordner"
-
-#: wizards.cpp:309
+#: wizards.cpp:289
 msgid ""
 "<QT>You are about to abort the initial setup of <B>KPsion</B>. No "
 "configuration will be stored and you will have to repeat this procedure when "
@@ -698,63 +714,11 @@ msgstr ""
 "Vorgang wiederholen müssen, wenn Sie <B>KPsion</B> das nächste Mal "
 "starten.<BR/>Wollen Sie das Programm wirklich verlassen?</QT>"
 
-#: wizards.cpp:364
-msgid "<QT>The folder <B>%1</B> does <B>not</B> exist.<BR/>Shall it be created?</QT>"
-msgstr ""
-"<QT>Der Ordner <B>%1</B> existiert <B>nicht</B>.<BR/>Soll er angelegt "
-"werden?</QT>"
-
-#: wizards.cpp:369
-msgid "<QT>The specified folder<BR/><B>%1</B><BR/>could <B>not</B> be created"
-msgstr "<QT>Der angegebene Ordner<BR/><B>%1</B><BR/>konnte nicht angelegt werden"
-
-#: wizards.cpp:374
-msgid ""
-", because you either don't have sufficient rights to do that, or the "
-"filesystem is readonly."
-msgstr ""
-", weil Sie entweder nicht die nötigen Rechte besitzen, oder das Dateisystem "
-"nur lesbar ist."
-
-#: wizards.cpp:378
-msgid ", because the filesystem has not enough space."
-msgstr ", weil auf dem Dateisystem kein Platz mehr ist."
-
-#: wizards.cpp:384
-msgid ", because there already exists another object with the same name."
-msgstr ", weil schon ein anderes Objekt mit dem selben Namen existiert."
-
-#: wizards.cpp:394
-msgid ""
-", because you specified a path which probably contains a dangling symbolic "
-"link."
-msgstr ""
-", weil Sie eine Pfad angegeben haben, der eine nicht aufgelöste symbolische "
-"Verknüpfung enthält."
-
-#: wizards.cpp:397
-msgid ""
-", because you specified a path which contains an element which is not a "
-"folder."
-msgstr ""
-", weil Sie eine Pfad angegeben haben, der ein Element enthält, welches kein "
-"Ordner ist."
-
-#: wizards.cpp:401
-msgid ", because you specified a path which contains too many symbolic links."
-msgstr ""
-", weil Sie eine Pfad angegeben haben, der zu viele symbolische "
-"Verknüpfungen enthält."
-
-#: wizards.cpp:408
-msgid "<BR/>Please select another folder.</QT>"
-msgstr "<BR/>Bitte wählen Sie einen anderen Ordner.</QT>"
-
-#: wizards.cpp:424
+#: wizards.cpp:425
 msgid "New Psion detected"
 msgstr "Neuer Psion erkannt"
 
-#: wizards.cpp:432
+#: wizards.cpp:433
 msgid ""
 "<QT>If you click this button, the setup for the new connected Psion will be "
 "aborted and next time you connect this Psion again, <B>KPsion</B> will run "
@@ -764,7 +728,7 @@ msgstr ""
 "den neuen Psion nicht gespeichert. Beim nächsten Verbindungsaufbau mit "
 "diesem Psion wird <B>KPsion</B> dann erneut diesen Dialog präsentieren.</QT>"
 
-#: wizards.cpp:441
+#: wizards.cpp:442
 msgid ""
 "<QT>The Psion with the unique ID <B>%1</B> is connected the first time. "
 "Please assign a name to it.</QT>"
@@ -772,19 +736,19 @@ msgstr ""
 "<QT>Zum Psion mit der ID <B>%1</B> wurde erstmalig Verbindung aufgenommen. "
 "Bitte weisen Sie diesem Gerät einen Namen zu.</QT>"
 
-#: wizards.cpp:448
+#: wizards.cpp:449
 msgid "&Name of new Psion"
 msgstr "&Name des neuen Psion"
 
-#: wizards.cpp:450
+#: wizards.cpp:451
 msgid "My new Psion"
 msgstr "Mein neuer Psion"
 
-#: wizards.cpp:467
+#: wizards.cpp:468
 msgid "<QT><BIG><B>New Psion detected<B></BIG></QT>"
 msgstr "<QT><BIG><B>Neuer Psion erkannt<B></BIG></QT>"
 
-#: wizards.cpp:475
+#: wizards.cpp:476
 msgid ""
 "<QT>Please select the Drive(s), you want to be backed up when running in "
 "unattended backup mode.</QT>"
@@ -792,19 +756,19 @@ msgstr ""
 "<QT>Bitte wählen sie die Laufwerke aus, die bei einer automatischen "
 "Sicherung gesichertwerden sollen.</QT>"
 
-#: wizards.cpp:483
+#: wizards.cpp:484
 msgid "Available drives"
 msgstr "Verfügbare Laufwerke"
 
-#: wizards.cpp:507
+#: wizards.cpp:508
 msgid "<QT><BIG><B>Specify drives to backup<B></BIG></QT>"
 msgstr "<QT><BIG><B>Wahl der zu sichernden Laufwerke<B></BIG></QT>"
 
-#: wizards.cpp:531
+#: wizards.cpp:532
 msgid "The name cannot be empty."
 msgstr "Der Name darf nicht leer sein."
 
-#: wizards.cpp:538
+#: wizards.cpp:539
 msgid ""
 "<QT>The name <B>%1</B> is already assigned to another machine.<BR/>Please "
 "choose a different name.</QT>"
diff --git a/kde2/po/kpsion.pot b/kde2/po/kpsion.pot
index afb5721..9f77bd6 100644
--- a/kde2/po/kpsion.pot
+++ b/kde2/po/kpsion.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-12 05:15+0100\n"
+"POT-Creation-Date: 2001-03-13 10:57+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,37 +14,89 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: kpsion.cpp:241
+#: kpsionbackuplistview.cpp:226
 msgid "Available backups"
 msgstr ""
 
-#: kpsion.cpp:275
+#: kpsionbackuplistview.cpp:260
 msgid "Full"
 msgstr ""
 
-#: kpsion.cpp:282
+#: kpsionbackuplistview.cpp:267
 msgid "Incremental"
 msgstr ""
 
-#: kpsion.cpp:289
+#: kpsionbackuplistview.cpp:274
 msgid "%1 backup, created at %2"
 msgstr ""
 
-#: kpsion.cpp:321
+#: kpsionbackuplistview.cpp:306
 msgid ""
 "<qt>Here, you can select the available backups. Select the items you want to "
 "restore, the click on <b>Start</b> to start restoring these items.</qt>"
 msgstr ""
 
-#: kpsion.cpp:482
-msgid "Idle"
+#: kpsionbackuplistview.moc.cpp:42 kpsionbackuplistview.moc.cpp:47
+msgid "KPsionCheckListItem"
+msgstr ""
+
+#: kpsionbackuplistview.moc.cpp:109 kpsionbackuplistview.moc.cpp:114
+msgid "KPsionBackupListView"
 msgstr ""
 
-#: kpsion.cpp:523 wizards.cpp:227
+#: kpsionconfig.cpp:88
 msgid "off"
 msgstr ""
 
-#: kpsion.cpp:527
+#: kpsionconfig.cpp:118
+msgid "none"
+msgstr ""
+
+#: kpsionconfig.cpp:119
+msgid "daily"
+msgstr ""
+
+#: kpsionconfig.cpp:120
+msgid "every 2 days"
+msgstr ""
+
+#: kpsionconfig.cpp:121
+msgid "every 3 days"
+msgstr ""
+
+#: kpsionconfig.cpp:122
+msgid "every 4 days"
+msgstr ""
+
+#: kpsionconfig.cpp:123
+msgid "every 5 days"
+msgstr ""
+
+#: kpsionconfig.cpp:124
+msgid "every 6 days"
+msgstr ""
+
+#: kpsionconfig.cpp:125
+msgid "weekly"
+msgstr ""
+
+#: kpsionconfig.cpp:126
+msgid "every 2 weeks"
+msgstr ""
+
+#: kpsionconfig.cpp:127
+msgid "every 3 weeks"
+msgstr ""
+
+#: kpsionconfig.cpp:128
+msgid "monthly"
+msgstr ""
+
+#: kpsion.cpp:65
+msgid "Idle"
+msgstr ""
+
+#: kpsion.cpp:125
 msgid ""
 "<qt>Here, you see your Psion's drives.<br/>Every drive is represented by an "
 "Icon. If you click on it, it gets selected for the next operation. E.g.: "
@@ -52,193 +104,175 @@ msgid ""
 "again.<br/>Select as many drives a you want, then choose an operation.</qt>"
 msgstr ""
 
-#: kpsion.cpp:595
+#: kpsion.cpp:193
 msgid "Start &Format"
 msgstr ""
 
-#: kpsion.cpp:597
+#: kpsion.cpp:195
 msgid "Start Full &Backup"
 msgstr ""
 
-#: kpsion.cpp:600
+#: kpsion.cpp:198
 msgid "Start &Incremental Backup"
 msgstr ""
 
-#: kpsion.cpp:602
+#: kpsion.cpp:200
 msgid "Start &Restore"
 msgstr ""
 
-#: kpsion.cpp:616
+#: kpsion.cpp:214
 msgid "Full backup of selected drive(s)"
 msgstr ""
 
-#: kpsion.cpp:618
+#: kpsion.cpp:216
 msgid "Incremental backup of selected drive(s)"
 msgstr ""
 
-#: kpsion.cpp:620
+#: kpsion.cpp:218
 msgid "Restore selected drive(s)"
 msgstr ""
 
-#: kpsion.cpp:622
+#: kpsion.cpp:220
 msgid "Format selected drive(s)"
 msgstr ""
 
-#: kpsion.cpp:693
+#: kpsion.cpp:291
 msgid "Retrieving machine info ..."
 msgstr ""
 
-#: kpsion.cpp:704
+#: kpsion.cpp:302
 msgid "Could not get Psion machine info"
 msgstr ""
 
-#: kpsion.cpp:717
+#: kpsion.cpp:318
 msgid "an unknown machine"
 msgstr ""
 
-#: kpsion.cpp:730
+#: kpsion.cpp:329
 msgid "Retrieving drive list ..."
 msgstr ""
 
-#: kpsion.cpp:733
+#: kpsion.cpp:332
 msgid "Could not get list of drives"
 msgstr ""
 
-#: kpsion.cpp:763 kpsion.cpp:1035 kpsion.cpp:1057 kpsion.cpp:1080
-#: kpsion.cpp:1190 kpsion.cpp:1377 kpsion.cpp:1538 kpsion.cpp:1547
-#: kpsion.cpp:1578 kpsion.cpp:1596 kpsion.cpp:1607
+#: kpsion.cpp:362 kpsion.cpp:634 kpsion.cpp:656 kpsion.cpp:679 kpsion.cpp:789
+#: kpsion.cpp:923 kpsion.cpp:1084 kpsion.cpp:1093 kpsion.cpp:1124
+#: kpsion.cpp:1142 kpsion.cpp:1153
 #, c-format
 msgid "Connected to %1"
 msgstr ""
 
-#: kpsion.cpp:797
+#: kpsion.cpp:396
 msgid ""
 "<QT>The selected drive <B>Z:</B> is a <B>ROM</B> drive and therefore cannot "
 "be restored.</QT>"
 msgstr ""
 
-#: kpsion.cpp:844
+#: kpsion.cpp:443
 msgid ""
 "A backup is running.\n"
 "Do you really want to quit?"
 msgstr ""
 
-#: kpsion.cpp:846
+#: kpsion.cpp:445
 msgid ""
 "A restore is running.\n"
 "Do you really want to quit?"
 msgstr ""
 
-#: kpsion.cpp:848
+#: kpsion.cpp:447
 msgid ""
 "A format is running.\n"
 "Do you really want to quit?"
 msgstr ""
 
-#: kpsion.cpp:874
+#: kpsion.cpp:473
 msgid "Connecting ..."
 msgstr ""
 
-#: kpsion.cpp:876
+#: kpsion.cpp:475
 msgid "RFSV could not connect to ncpd at %1:%2. "
 msgstr ""
 
-#: kpsion.cpp:879 kpsion.cpp:901 kpsion.cpp:924 kpsion.cpp:949
+#: kpsion.cpp:478 kpsion.cpp:500 kpsion.cpp:523 kpsion.cpp:548
 msgid " (Retry in %1 seconds.)"
 msgstr ""
 
-#: kpsion.cpp:896
+#: kpsion.cpp:495
 #, c-format
 msgid "RFSV could not establish link: %1."
 msgstr ""
 
-#: kpsion.cpp:917
+#: kpsion.cpp:516
 msgid "RPCS could not connect to ncpd at %1:%2."
 msgstr ""
 
-#: kpsion.cpp:940
+#: kpsion.cpp:539
 #, c-format
 msgid "RPCS could not establish link: %1."
 msgstr ""
 
-#: kpsion.cpp:1039
+#: kpsion.cpp:638
 #, c-format
 msgid "Could not retrieve drive details for drive %1"
 msgstr ""
 
-#: kpsion.cpp:1044
+#: kpsion.cpp:643
 #, c-format
 msgid "Scanning drive %1"
 msgstr ""
 
-#: kpsion.cpp:1053
+#: kpsion.cpp:652
 msgid "%1 files need backup"
 msgstr ""
 
-#: kpsion.cpp:1059
+#: kpsion.cpp:658
 msgid "No files need backup"
 msgstr ""
 
-#: kpsion.cpp:1082
+#: kpsion.cpp:681
 #, c-format
 msgid "Could not create backup folder %1"
 msgstr ""
 
-#: kpsion.cpp:1106
+#: kpsion.cpp:705
 msgid "Backup %1% done"
 msgstr ""
 
-#: kpsion.cpp:1126
+#: kpsion.cpp:725
 msgid "<QT>Could not open<BR/><B>%1</B></QT>"
 msgstr ""
 
-#: kpsion.cpp:1146
+#: kpsion.cpp:745
 msgid "<QT>Could not read<BR/><B>%1</B></QT>"
 msgstr ""
 
-#: kpsion.cpp:1159
+#: kpsion.cpp:758
 msgid "Resetting archive attributes"
 msgstr ""
 
-#: kpsion.cpp:1172
+#: kpsion.cpp:771
 msgid "<QT>Could not set attributes of<BR/><B>%1</B></QT>"
 msgstr ""
 
-#: kpsion.cpp:1194
+#: kpsion.cpp:793
 msgid "Backup done"
 msgstr ""
 
-#: kpsion.cpp:1198
-msgid "Restore"
-msgstr ""
-
-#: kpsion.cpp:1202
-msgid "Start"
-msgstr ""
-
-#: kpsion.cpp:1205
-msgid ""
-"Select items in the list of available backups, then click here to start "
-"restore of these items."
-msgstr ""
-
-#: kpsion.cpp:1216
-msgid "Format drive before restore"
-msgstr ""
-
-#: kpsion.cpp:1261 kpsion.cpp:1491
+#: kpsion.cpp:807 kpsion.cpp:1037
 msgid "<QT>Could not get attributes of<BR/><B>%1</B><BR/>Reason: %2</QT>"
 msgstr ""
 
-#: kpsion.cpp:1290
+#: kpsion.cpp:836
 msgid "Overwrite"
 msgstr ""
 
-#: kpsion.cpp:1293
+#: kpsion.cpp:839
 msgid "Overwrite &All"
 msgstr ""
 
-#: kpsion.cpp:1306
+#: kpsion.cpp:852
 msgid ""
 "<QT>The file <B>%1</B> exists already on the Psion with different size "
 "and/or attributes.<P><B>On the Psion:</B><BR/>  Size: %2<BR/>  Date: %3<BR/> "
@@ -246,300 +280,321 @@ msgid ""
 "Attributes: %7</P>Do you want to overwrite it?</QT>"
 msgstr ""
 
-#: kpsion.cpp:1344
+#: kpsion.cpp:890
 msgid "Reading backups ..."
 msgstr ""
 
-#: kpsion.cpp:1349
+#: kpsion.cpp:895
 msgid "Selecting backups ..."
 msgstr ""
 
-#: kpsion.cpp:1382 kpsion.cpp:1430
+#: kpsion.cpp:928 kpsion.cpp:976
 msgid "Restore %1% done"
 msgstr ""
 
-#: kpsion.cpp:1446
+#: kpsion.cpp:992
 msgid "<QT>Could not create directory<BR/><B>%1</B><BR/>Reason: %2</QT>"
 msgstr ""
 
-#: kpsion.cpp:1461
+#: kpsion.cpp:1007
 msgid "<QT>Could not create<BR/><B>%1</B><BR/>Reason: %2</QT>"
 msgstr ""
 
-#: kpsion.cpp:1483
+#: kpsion.cpp:1029
 msgid "<QT>Could not write to<BR/><B>%1</B><BR/>Reason: %2</QT>"
 msgstr ""
 
-#: kpsion.cpp:1509
+#: kpsion.cpp:1055
 msgid "<QT>Could not set attributes of<BR/><B>%1</B><BR/>Reason: %2</QT>"
 msgstr ""
 
-#: kpsion.cpp:1522
+#: kpsion.cpp:1068
 msgid ""
 "<QT>Could not set modification time of<BR/><B>%1</B><BR/>Reason: %2</QT>"
 msgstr ""
 
-#: kpsion.cpp:1549
+#: kpsion.cpp:1095
 msgid "Restore done"
 msgstr ""
 
-#: kpsion.cpp:1563
+#: kpsion.cpp:1109
 msgid "Formatting drive %1:"
 msgstr ""
 
-#: kpsion.cpp:1574
+#: kpsion.cpp:1120
 msgid "<QT>Could not format drive %1:<BR/>%2</QT>"
 msgstr ""
 
-#: kpsion.cpp:1591
+#: kpsion.cpp:1137
 msgid "<QT>Error during format of drive %1:<BR/>%2</QT>"
 msgstr ""
 
-#: kpsion.cpp:1609
+#: kpsion.cpp:1155
 msgid "Format done"
 msgstr ""
 
-#: kpsion.cpp:1615
+#: kpsion.cpp:1161
 msgid ""
 "<QT>This erases <B>ALL</B> data on the drive(s).<BR/>Do you really want to "
 "proceed?"
 msgstr ""
 
-#: kpsion.cpp:1636
+#: kpsion.cpp:1182
 msgid "Assign drive name"
 msgstr ""
 
-#: kpsion.cpp:1645
+#: kpsion.cpp:1191
 msgid ""
 "<QT>Formatting of drive %1: finished. Please assign a name for that "
 "drive.</QT>"
 msgstr ""
 
-#: kpsion.cpp:1649
+#: kpsion.cpp:1195
 msgid "New name of drive %1:"
 msgstr ""
 
-#: kpsion.cpp:1793
+#: kpsion.cpp:1341
 #, c-format
 msgid "Stopping %1"
 msgstr ""
 
-#: kpsion.cpp:1811
+#: kpsion.cpp:1359
 msgid ""
 "<QT>Could not stop all processes.<BR/>Please stop running programs manually "
 "on the Psion, then klick <B>Ok</B>."
 msgstr ""
 
-#: kpsion.cpp:1834
+#: kpsion.cpp:1382
 #, c-format
 msgid "Starting %1"
 msgstr ""
 
 #: kpsion.moc.cpp:42 kpsion.moc.cpp:47
-msgid "KPsionCheckListItem"
+msgid "KPsionMainWindow"
 msgstr ""
 
-#: kpsion.moc.cpp:109 kpsion.moc.cpp:114
-msgid "KPsionBackupListView"
+#: kpsionrestoredialog.cpp:35
+msgid "Restore"
 msgstr ""
 
-#: kpsion.moc.cpp:184 kpsion.moc.cpp:189
-msgid "KPsionRestoreDialog"
+#: kpsionrestoredialog.cpp:39
+msgid "Start"
 msgstr ""
 
-#: kpsion.moc.cpp:246 kpsion.moc.cpp:251
-msgid "KPsionMainWindow"
+#: kpsionrestoredialog.cpp:42
+msgid ""
+"Select items in the list of available backups, then click here to start "
+"restore of these items."
 msgstr ""
 
-#: main.cpp:48
+#: kpsionrestoredialog.cpp:53
+msgid "Format drive before restore"
+msgstr ""
+
+#: kpsionrestoredialog.moc.cpp:42 kpsionrestoredialog.moc.cpp:47
+msgid "KPsionRestoreDialog"
+msgstr ""
+
+#: main.cpp:49
 msgid "perform scheduled backup"
 msgstr ""
 
-#: main.cpp:50
+#: main.cpp:51
 msgid "perform backup"
 msgstr ""
 
-#: main.cpp:52
+#: main.cpp:53
 msgid "perform restore"
 msgstr ""
 
-#: main.cpp:54
+#: main.cpp:55
 msgid "format drive"
 msgstr ""
 
-#: main.cpp:59
+#: main.cpp:60
 msgid "KPsion"
 msgstr ""
 
-#: main.cpp:60
+#: main.cpp:61
 msgid "Psion connectivity utility"
 msgstr ""
 
-#: main.cpp:65
+#: main.cpp:66
 msgid "Original Developer/Maintainer"
 msgstr ""
 
-#: main.cpp:100
+#: main.cpp:104
 msgid ""
 "The options are mutually exclusive. I.e. You cannot specify more than one "
 "action at once."
 msgstr ""
 
-#: setupdialog.cpp:20
-msgid "&General"
+#: setupdialog.cpp:54
+msgid "Backup &folder"
 msgstr ""
 
-#: setupdialog.cpp:25
-msgid "Backup &directory"
+#: setupdialog.cpp:62 wizards.cpp:107
+msgid "Browse"
 msgstr ""
 
-#: setupdialog.cpp:30 wizards.cpp:104
-msgid "Browse"
+#: setupdialog.cpp:65 wizards.cpp:110
+msgid "This is the name of the backup folder."
 msgstr ""
 
-#: setupdialog.cpp:33 wizards.cpp:177
-msgid "Backup &generations"
+#: setupdialog.cpp:67 wizards.cpp:112
+msgid ""
+"Click here, for opening a dialog which lets you easily select the backup "
+"folder."
 msgstr ""
 
-#: setupdialog.cpp:39
-msgid "&Machines"
+#: setupdialog.cpp:75
+msgid "Backup &policy"
 msgstr ""
 
-#: setupdialog.cpp:43
-msgid "Machine &Name"
+#: setupdialog.cpp:78 wizards.cpp:145
+msgid "&Incremental backup interval"
 msgstr ""
 
-#: setupdialog.cpp:48
-msgid "Machine &UID"
+#: setupdialog.cpp:90 wizards.cpp:153
+msgid "&Full backup interval"
 msgstr ""
 
-#: statusbarprogress.cpp:357 statusbarprogress.cpp:370
-#: statusbarprogress.cpp:379 statusbarprogress.cpp:392
-#: statusbarprogress.cpp:401 statusbarprogress.cpp:412
-msgid "%1 %2 of %3"
+#: setupdialog.cpp:101 wizards.cpp:161
+msgid "Backup &generations"
 msgstr ""
 
-#: statusbarprogress.moc.cpp:42 statusbarprogress.moc.cpp:47
-msgid "KPsionStatusBarProgress"
+#: setupdialog.cpp:113
+msgid "&Connection"
 msgstr ""
 
-#: wizards.cpp:49
-msgid "KPsion Setup"
+#: setupdialog.cpp:116 wizards.cpp:205
+msgid "&Connection retry interval (sec.)"
 msgstr ""
 
-#: wizards.cpp:51 wizards.cpp:428
-msgid "Click this button to continue with the next page."
+#: setupdialog.cpp:126 wizards.cpp:213
+msgid "Serial &device"
 msgstr ""
 
-#: wizards.cpp:53 wizards.cpp:430
-msgid "Click this button, to go to a previous page."
+#: setupdialog.cpp:145 wizards.cpp:222
+msgid "Serial &speed"
 msgstr ""
 
-#: wizards.cpp:55
-msgid ""
-"<QT>If you click this button, the setup of <B>KPSion</B> will be aborted and "
-"next time you start <B>KPsion</B>, it will run this setup again.</QT>"
+#: setupdialog.cpp:184 wizards.cpp:279
+msgid "Backup folder"
 msgstr ""
 
-#: wizards.cpp:66
+#: setupdialog.cpp:260 wizards.cpp:365
 msgid ""
-"<QT><H2>Welcome to KPsion!</H2>It looks like you started <B>KPsion</B> the "
-"first time. At least, i could not find any valid configuration.</BR>On the "
-"following pages, we will gather some information, which is needed for "
-"working with <B>KPsion</B>.</BR> </BR>Have fun.</QT>"
+"<QT>The folder <B>%1</B> does <B>not</B> exist.<BR/>Shall it be created?</QT>"
 msgstr ""
 
-#: wizards.cpp:83
-msgid "<QT><BIG><B>Welcome<B></BIG></QT>"
+#: setupdialog.cpp:265 wizards.cpp:370
+msgid "<QT>The specified folder<BR/><B>%1</B><BR/>could <B>not</B> be created"
 msgstr ""
 
-#: wizards.cpp:91
+#: setupdialog.cpp:270 wizards.cpp:375
 msgid ""
-"<QT>First, we need a folder for storing backups of your Psion. You probably "
-"don't want others to have access to it, so it's best to choose a location "
-"somewhere in your home directory. Please browse through existing folders and "
-"select a suitable location or simply accept the default shown below.</QT>"
+", because you either don't have sufficient rights to do that, or the "
+"filesystem is readonly."
 msgstr ""
 
-#: wizards.cpp:107
-msgid "This is the name of the backup folder."
+#: setupdialog.cpp:274 wizards.cpp:379
+msgid ", because the filesystem has not enough space."
 msgstr ""
 
-#: wizards.cpp:109
-msgid ""
-"Click here, for opening a dialog which lets you easily select the backup "
-"folder."
+#: setupdialog.cpp:280 wizards.cpp:385
+msgid ", because there already exists another object with the same name."
 msgstr ""
 
-#: wizards.cpp:124
-msgid "<QT><BIG><B>Step 1</B></BIG> - Specify backup directory</QT>"
+#: setupdialog.cpp:290 wizards.cpp:395
+msgid ""
+", because you specified a path which probably contains a dangling symbolic "
+"link."
 msgstr ""
 
-#: wizards.cpp:131
+#: setupdialog.cpp:293 wizards.cpp:398
 msgid ""
-"<QT>Next, please specify some information regarding backup "
-"policy:<UL><LI>How many generations of backups do you want to "
-"keep?</LI><LI>Shall i remind you about backups?</LI><LI>If yes, in what "
-"intervals do you want to happen backups?</LI></UL></QT>"
+", because you specified a path which contains an element which is not a "
+"folder."
 msgstr ""
 
-#: wizards.cpp:141
-msgid "&Incremental backup reminder"
+#: setupdialog.cpp:297 wizards.cpp:402
+msgid ", because you specified a path which contains too many symbolic links."
 msgstr ""
 
-#: wizards.cpp:144 wizards.cpp:162
-msgid "none"
+#: setupdialog.cpp:304 wizards.cpp:409
+msgid "<BR/>Please select another folder.</QT>"
 msgstr ""
 
-#: wizards.cpp:145 wizards.cpp:163
-msgid "daily"
+#: setupdialog.moc.cpp:42 setupdialog.moc.cpp:47
+msgid "SetupDialog"
 msgstr ""
 
-#: wizards.cpp:146 wizards.cpp:164
-msgid "every 2 days"
+#: statusbarprogress.cpp:357 statusbarprogress.cpp:370
+#: statusbarprogress.cpp:379 statusbarprogress.cpp:392
+#: statusbarprogress.cpp:401 statusbarprogress.cpp:412
+msgid "%1 %2 of %3"
 msgstr ""
 
-#: wizards.cpp:147 wizards.cpp:165
-msgid "every 3 days"
+#: statusbarprogress.moc.cpp:42 statusbarprogress.moc.cpp:47
+msgid "KPsionStatusBarProgress"
 msgstr ""
 
-#: wizards.cpp:148 wizards.cpp:166
-msgid "every 4 days"
+#: wizards.cpp:52
+msgid "KPsion Setup"
 msgstr ""
 
-#: wizards.cpp:149 wizards.cpp:167
-msgid "every 5 days"
+#: wizards.cpp:54 wizards.cpp:429
+msgid "Click this button to continue with the next page."
 msgstr ""
 
-#: wizards.cpp:150 wizards.cpp:168
-msgid "every 6 days"
+#: wizards.cpp:56 wizards.cpp:431
+msgid "Click this button, to go to a previous page."
 msgstr ""
 
-#: wizards.cpp:151 wizards.cpp:169
-msgid "weekly"
+#: wizards.cpp:58
+msgid ""
+"<QT>If you click this button, the setup of <B>KPSion</B> will be aborted and "
+"next time you start <B>KPsion</B>, it will run this setup again.</QT>"
 msgstr ""
 
-#: wizards.cpp:152 wizards.cpp:170
-msgid "every 2 weeks"
+#: wizards.cpp:69
+msgid ""
+"<QT><H2>Welcome to KPsion!</H2>It looks like you started <B>KPsion</B> the "
+"first time. At least, i could not find any valid configuration.</BR>On the "
+"following pages, we will gather some information, which is needed for "
+"working with <B>KPsion</B>.</BR> </BR>Have fun.</QT>"
 msgstr ""
 
-#: wizards.cpp:153 wizards.cpp:171
-msgid "every 3 weeks"
+#: wizards.cpp:86
+msgid "<QT><BIG><B>Welcome<B></BIG></QT>"
 msgstr ""
 
-#: wizards.cpp:154 wizards.cpp:172
-msgid "monthly"
+#: wizards.cpp:94
+msgid ""
+"<QT>First, we need a folder for storing backups of your Psion. You probably "
+"don't want others to have access to it, so it's best to choose a location "
+"somewhere in your home directory. Please browse through existing folders and "
+"select a suitable location or simply accept the default shown below.</QT>"
 msgstr ""
 
-#: wizards.cpp:159
-msgid "&Full backup reminder"
+#: wizards.cpp:127
+msgid "<QT><BIG><B>Step 1</B></BIG> - Specify backup directory</QT>"
+msgstr ""
+
+#: wizards.cpp:134
+msgid ""
+"<QT>Next, please specify some information regarding backup "
+"policy:<UL><LI>How many generations of backups do you want to "
+"keep?</LI><LI>Shall i perform automatic backups?</LI><LI>If yes, in what "
+"intervals do you want to happen backups?</LI></UL></QT>"
 msgstr ""
 
-#: wizards.cpp:195
+#: wizards.cpp:181
 msgid "<QT><BIG><B>Step 2</B></BIG> - Backup policy</QT>"
 msgstr ""
 
-#: wizards.cpp:203
+#: wizards.cpp:189
 msgid ""
 "<QT>If no connection could be established on startup, <B>KPsion</B> will "
 "attempt to connect in regular intervals. Please specify the interval after "
@@ -550,55 +605,11 @@ msgid ""
 "rate</LI><LI>have permission to use the specified port</LI></UL></QT>"
 msgstr ""
 
-#: wizards.cpp:218
-msgid "&Connection retry interval (sec.)"
-msgstr ""
-
-#: wizards.cpp:224
-msgid "Serial &device"
-msgstr ""
-
-#: wizards.cpp:228
-msgid "/dev/ttyS0"
-msgstr ""
-
-#: wizards.cpp:229
-msgid "/dev/ttyS1"
-msgstr ""
-
-#: wizards.cpp:230
-msgid "/dev/ttyS2"
-msgstr ""
-
-#: wizards.cpp:231
-msgid "/dev/ttyS3"
-msgstr ""
-
-#: wizards.cpp:232
-msgid "/dev/ircomm0"
-msgstr ""
-
-#: wizards.cpp:233
-msgid "/dev/ircomm1"
-msgstr ""
-
-#: wizards.cpp:234
-msgid "/dev/ircomm2"
-msgstr ""
-
-#: wizards.cpp:235
-msgid "/dev/ircomm3"
-msgstr ""
-
-#: wizards.cpp:240
-msgid "Serial &speed"
-msgstr ""
-
-#: wizards.cpp:264
+#: wizards.cpp:244
 msgid "<QT><BIG><B>Step 3</B></BIG> - Connection parameters</QT>"
 msgstr ""
 
-#: wizards.cpp:272
+#: wizards.cpp:252
 msgid ""
 "<QT>That's it!<BR/>Next, i will start <B>KPsion</B> and if your Psion is "
 "already connected and it's communication turned on (use <B>Ctrl-T</B> at "
@@ -607,112 +618,65 @@ msgid ""
 "Backup.<BR/>Please click <B>Finish</B> now.</QT>"
 msgstr ""
 
-#: wizards.cpp:291
+#: wizards.cpp:271
 msgid "<QT><BIG><B>Finished</B></BIG></QT>"
 msgstr ""
 
-#: wizards.cpp:299
-msgid "Backup folder"
-msgstr ""
-
-#: wizards.cpp:309
+#: wizards.cpp:289
 msgid ""
 "<QT>You are about to abort the initial setup of <B>KPsion</B>. No "
 "configuration will be stored and you will have to repeat this procedure when "
 "you start <B>KPsion</B> next time.<BR/>Do you really want to exit now?</QT>"
 msgstr ""
 
-#: wizards.cpp:364
-msgid ""
-"<QT>The folder <B>%1</B> does <B>not</B> exist.<BR/>Shall it be created?</QT>"
-msgstr ""
-
-#: wizards.cpp:369
-msgid "<QT>The specified folder<BR/><B>%1</B><BR/>could <B>not</B> be created"
-msgstr ""
-
-#: wizards.cpp:374
-msgid ""
-", because you either don't have sufficient rights to do that, or the "
-"filesystem is readonly."
-msgstr ""
-
-#: wizards.cpp:378
-msgid ", because the filesystem has not enough space."
-msgstr ""
-
-#: wizards.cpp:384
-msgid ", because there already exists another object with the same name."
-msgstr ""
-
-#: wizards.cpp:394
-msgid ""
-", because you specified a path which probably contains a dangling symbolic "
-"link."
-msgstr ""
-
-#: wizards.cpp:397
-msgid ""
-", because you specified a path which contains an element which is not a "
-"folder."
-msgstr ""
-
-#: wizards.cpp:401
-msgid ", because you specified a path which contains too many symbolic links."
-msgstr ""
-
-#: wizards.cpp:408
-msgid "<BR/>Please select another folder.</QT>"
-msgstr ""
-
-#: wizards.cpp:424
+#: wizards.cpp:425
 msgid "New Psion detected"
 msgstr ""
 
-#: wizards.cpp:432
+#: wizards.cpp:433
 msgid ""
 "<QT>If you click this button, the setup for the new connected Psion will be "
 "aborted and next time you connect this Psion again, <B>KPsion</B> will run "
 "this setup again.</QT>"
 msgstr ""
 
-#: wizards.cpp:441
+#: wizards.cpp:442
 msgid ""
 "<QT>The Psion with the unique ID <B>%1</B> is connected the first time. "
 "Please assign a name to it.</QT>"
 msgstr ""
 
-#: wizards.cpp:448
+#: wizards.cpp:449
 msgid "&Name of new Psion"
 msgstr ""
 
-#: wizards.cpp:450
+#: wizards.cpp:451
 msgid "My new Psion"
 msgstr ""
 
-#: wizards.cpp:467
+#: wizards.cpp:468
 msgid "<QT><BIG><B>New Psion detected<B></BIG></QT>"
 msgstr ""
 
-#: wizards.cpp:475
+#: wizards.cpp:476
 msgid ""
 "<QT>Please select the Drive(s), you want to be backed up when running in "
 "unattended backup mode.</QT>"
 msgstr ""
 
-#: wizards.cpp:483
+#: wizards.cpp:484
 msgid "Available drives"
 msgstr ""
 
-#: wizards.cpp:507
+#: wizards.cpp:508
 msgid "<QT><BIG><B>Specify drives to backup<B></BIG></QT>"
 msgstr ""
 
-#: wizards.cpp:531
+#: wizards.cpp:532
 msgid "The name cannot be empty."
 msgstr ""
 
-#: wizards.cpp:538
+#: wizards.cpp:539
 msgid ""
 "<QT>The name <B>%1</B> is already assigned to another machine.<BR/>Please "
 "choose a different name.</QT>"