[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. 25a3f306d990b9f8ce978805f506e3f9df976a41

[Sune Vuorela]

The following commit has been merged in the master branch:
commit 25a3f306d990b9f8ce978805f506e3f9df976a41
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Tue Feb 24 21:41:09 2009 +0100

    change strings as pr scottk's recommendations

diff --git a/choicepage.cpp b/choicepage.cpp
index 394b5cf..7a663ab 100644
--- a/choicepage.cpp
+++ b/choicepage.cpp
@@ -41,19 +41,19 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
   d->haskde4dir = QFile::exists(QDir::homePath()+KDE4DIR);
   d->haskdedir = QFile::exists(QDir::homePath()+KDEDIR);
   d->buttons = new QButtonGroup(this);
-  d->text = new QLabel(tr("Please select the option on how you want to migrate your settings"),this);
+  d->text = new QLabel(tr("Please select your settings migratation option"),this);
   d->text->setWordWrap(true);
   lay->addWidget(d->text);
   if(d->haskdedir)
   {
-    d->migrate = new RichRadioButton(tr("Migrate settings from KDE3 to KDE4 (recommended)"),this);
+    d->migrate = new RichRadioButton(tr("Migrate settings from KDE3 to KDE4 (standard)"),this);
     d->buttons->addButton(d->migrate,MigrationTool::Migrate);
     lay->addWidget(d->migrate);
     d->migrate->setChecked(true);
   }
   if(d->haskde4dir)
   {
-    d->move = new RichRadioButton(tr("Move settings from KDE 4 dir and <b>replace</b> settings from KDE 3"));
+    d->move = new RichRadioButton(tr("Use existing KDE 4 settings and <b>replace</b> KDE 3 settings"));
     d->buttons->addButton(d->move,MigrationTool::Move);
     lay->addWidget(d->move);
     if(d->haskdedir)
@@ -67,7 +67,7 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
       d->move->setChecked(true);
     }
   }
-  d->clean = new RichRadioButton(tr("Start with a fresh KDE. This option will <b>remove</b> data and settings such as contacts, local stored mails, accounts in KMail and Kopete, bookmarks and other such data"),this);
+  d->clean = new RichRadioButton(tr("Start with default KDE settings and data. This option will <b>remove</b> all data and settings such as contacts, local stored mails, accounts in KMail and Kopete, bookmarks and other such data"),this);
   d->buttons->addButton(d->clean,MigrationTool::Clean);
   lay->addWidget(d->clean);
   d->backup = new QCheckBox(tr("Backup existing settings from KDE3 into .kde3-backup. (Highly recommended)"));
@@ -89,11 +89,11 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
     if(dirsize > freespace)
     {
       quint64 partsize = DirOperations::totalPartitionSize(QDir::homePath());
-      QLabel *freewarning = new QLabel(tr("You have not enough free space to actually do a backup, please consider freeing up some space by going to TTY1"),this);
+      QLabel *freewarning = new QLabel(tr("Insufficient free space to complete a backup, please consider freeing up some space. You can go to TTY1 to do this."),this);
       QProgressBar *bar = new QProgressBar(this);
       bar->setMaximum(100);
       bar->setValue(round(static_cast<double>(partsize-freespace)/static_cast<double>(partsize)*100));
-      QLabel *freeinfo = new QLabel(tr("The current kde settings and data dir takes up %1 bytes").arg(dirsize));
+      QLabel *freeinfo = new QLabel(tr("The current KDE settings and data directory takes up %1 bytes").arg(dirsize));
       lay->addWidget(freewarning);
       lay->addWidget(bar);
       lay->addWidget(freeinfo);
diff --git a/warningpage.cpp b/warningpage.cpp
index 7d48ffa..a614811 100644
--- a/warningpage.cpp
+++ b/warningpage.cpp
@@ -19,7 +19,7 @@
 WarningPage::WarningPage(QWidget *parent) : QWizardPage(parent)
 {
   setTitle(tr("Warning"));
-  QLabel *text = new QLabel(tr("You have selected a potentially harmful operation and not to backup data. You will most likely lose data here. Are you completely sure?"),this);
+  QLabel *text = new QLabel(tr("You have selected a potentially harmful operation and to not backup data. You will most likely lose data here. Are you completely sure?"),this);
   text->setWordWrap(true);
   QHBoxLayout *lay = new QHBoxLayout();
   lay->addWidget(text);

-- 
Kaboom - Debian KDE 3->4 migration tool