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

Modestas Vainius modax-guest at alioth.debian.org
Tue Mar 31 01:29:16 UTC 2009


The following commit has been merged in the master branch:
commit 48c3ba4186d333bbfa739e50c66098bf3eed467c
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Mar 30 23:48:04 2009 +0300

    This info message got too long.
    
    What is more, it messes up the layout a bit. Shorten it.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>

diff --git a/choicepage.cpp b/choicepage.cpp
index c038b7d..a4c72e0 100644
--- a/choicepage.cpp
+++ b/choicepage.cpp
@@ -135,15 +135,11 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
   }
   d->clean = new RichRadioButton(
     tr("Start with default KDE settings and data."),
-    tr("<p>The wizard will <strong>remove</strong> existing KDE&nbsp;3 settings directory "
-       "(optionally backing it up first) and will not touch existing KDE&nbsp;4 settings "
-       "directory if it exists. Effectively, once this wizard is complete you will be "
-       "presented with default KDE&nbsp;4 desktop. Do not select this scenario (without "
-       "enabling the backup option below) if you do not want to irreversibly lose such data "
-       "as contacts, locally stored mails, accounts in KMail and Kopete, bookmarks, etc. "
-       "as stored by previous KDE&nbsp;3 versions of the respective applications. This "
-       "scenario is recommended for users who want to start with fresh KDE&nbsp;4 profile and, "
-       "optionally, do migration of KDE&nbsp;3 and/or old KDE&nbsp;4 settings manually.</p>"),
+    tr("<p>The wizard will <strong>remove</strong> (or move to backup) existing KDE&nbsp;3 "
+       "settings directory including such data as contacts, locally stored mails, accounts "
+       "in KMail and Kopete, bookmarks, etc. It will not touch KDE&nbsp;4 settings directory "
+       "if it exists. Choose 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.</p>"),
     this);
   d->buttons->addButton(d->clean,MigrationTool::Clean);
   lay->addWidget(d->clean);

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



More information about the pkg-kde-commits mailing list