[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/0.9.1-53-g8abf9d7

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit 8abf9d7e793c67d4c5ce17337a4ce007714a1559
Author: George Kiagiadakis <gkiagia at users.sourceforge.net>
Date:   Mon Apr 6 00:19:00 2009 +0300

    Don't translate "%1%2" and remove extra <p> in a string.

diff --git a/choicepage.cpp b/choicepage.cpp
index 4735953..0e8c960 100644
--- a/choicepage.cpp
+++ b/choicepage.cpp
@@ -61,7 +61,7 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
   d->configInfoLabel->setFont(boldFont);
   d->configInfoLabel->setWordWrap(true);
 
-  d->configLabel = new QLabel(tr("%1%2")
+  d->configLabel = new QLabel(QString("%1%2")
     .arg((s.kdehomeDir().exists()) ?
         tr("<strong>KDE&nbsp;3</strong> settings and data are at <u>%1</u><br/>").arg(s.kdehomePrettyPath()) : "")
     .arg((s.kde4homeDir().exists()) ?
@@ -146,7 +146,7 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
         "this scenario if you would like to start with default KDE&nbsp;4 "
        "desktop and/or want to do migration of old KDE settings manually (from backup).</p>")
     .arg((s.kdehomeDir().exists()) ?
-      tr("<p>The wizard will <strong>remove</strong> (or leave a copy as backup) existing KDE&nbsp;3 "
+      tr("The wizard will <strong>remove</strong> (or leave a copy as backup) existing KDE&nbsp;3 "
        "settings directory including such data as contacts, locally stored mails, accounts "
        "in KMail and Kopete, bookmarks, etc. ") : ""),
     this);

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