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

[Sune Vuorela]

The following commit has been merged in the master branch:
commit fe28f4190b2fba7325ee136b83257f35bada3300
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Mon Feb 23 22:23:07 2009 +0100

    add tr's

diff --git a/choicepage.cpp b/choicepage.cpp
index 6f15eca..88d1c54 100644
--- a/choicepage.cpp
+++ b/choicepage.cpp
@@ -37,7 +37,7 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
 {
   d = new ChoicePagePrivate;
   QVBoxLayout *lay = new QVBoxLayout(this);
-  setTitle("Kaboom - MigrationTool");
+  setTitle(tr("Kaboom - MigrationTool"));
   d->haskde4dir = QFile::exists(QDir::homePath()+KDE4DIR);
   d->haskdedir = QFile::exists(QDir::homePath()+KDEDIR);
   d->buttons = new QButtonGroup(this);
@@ -45,19 +45,19 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
   lay->addWidget(d->text);
   if(d->haskdedir)
   {
-    d->migrate = new RichRadioButton("Migrate settings from KDE3 to KDE4 (recommended)",this);
+    d->migrate = new RichRadioButton(tr("Migrate settings from KDE3 to KDE4 (recommended)"),this);
     d->buttons->addButton(d->migrate,MigrationTool::Migrate);
     lay->addWidget(d->migrate);
     d->migrate->setChecked(true);
   }
   if(d->haskde4dir)
   {
-    d->move = new RichRadioButton("Move settings from KDE 4 dir and <b>replace</b> settings from KDE 3");
+    d->move = new RichRadioButton(tr("Move settings from KDE 4 dir and <b>replace</b> settings from KDE 3"));
     d->buttons->addButton(d->move,MigrationTool::Move);
     lay->addWidget(d->move);
     if(d->haskdedir)
     {
-      d->merge = new RichRadioButton("Merge settings from KDE3 and KDE4 (experimental)");
+      d->merge = new RichRadioButton(tr("Merge settings from KDE3 and KDE4 (experimental)"));
       d->buttons->addButton(d->merge,MigrationTool::Merge);
       lay->addWidget(d->merge);
     }
@@ -66,32 +66,28 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
       d->move->setChecked(true);
     }
   }
-  d->clean = new RichRadioButton("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 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->buttons->addButton(d->clean,MigrationTool::Clean);
   lay->addWidget(d->clean);
   if(d->haskdedir) //if no kdedir, nothing to backup.
   {
     quint64 dirsize = DirOperations::calculateDirSize(QDir::homePath()+KDEDIR);
-    qDebug() << "dirsize" << dirsize;
     quint64 freespace = DirOperations::freeDirSpace(QDir::homePath());
-    qDebug() << "freespace" << freespace;
     if(dirsize > freespace)
     {
       quint64 partsize = DirOperations::totalPartitionSize(QDir::homePath());
-      qDebug() << "partsize" << partsize;
-      QLabel *freewarning = new QLabel("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("You have not enough free space to actually do a backup, please consider freeing up some space by going to TTY1"),this);
       QProgressBar *bar = new QProgressBar(this);
       bar->setMaximum(100);
-      qDebug() << "freepercent" << (partsize-freespace)/partsize*100;
       bar->setValue(round(static_cast<double>(partsize-freespace)/static_cast<double>(partsize)*100));
-      QLabel *freeinfo = new QLabel(QString("The current kde settings and data dir takes up %1 bytes").arg(dirsize));
+      QLabel *freeinfo = new QLabel(tr("The current kde settings and data dir takes up %1 bytes").arg(dirsize));
       lay->addWidget(freewarning);
       lay->addWidget(bar);
       lay->addWidget(freeinfo);
     }
     else
     {
-      d->backup = new QCheckBox("Backup existing settings from KDE3 into .kde3-backup. (Highly recommended)");
+      d->backup = new QCheckBox(tr("Backup existing settings from KDE3 into .kde3-backup. (Highly recommended)"));
       d->backup->setChecked(true);
       registerField("backup",d->backup);
       lay->addWidget(d->backup);
diff --git a/warningpage.cpp b/warningpage.cpp
index fd91a6f..525f621 100644
--- a/warningpage.cpp
+++ b/warningpage.cpp
@@ -18,7 +18,7 @@
 
 WarningPage::WarningPage(QWidget *parent) : QWizardPage(parent)
 {
-  QLabel *text = new QLabel("You have selected a potentially harmful operation and not to backup data. You will most likely lose data here. Are you completely sure?");
+  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?"));
   QHBoxLayout *lay = new QHBoxLayout();
   lay->addWidget(text);
   setLayout(lay);

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