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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 7d24464f83634c1cdc96c7687641465aa6f545fa
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Apr 5 17:14:33 2009 +0300

    Fix descriptions of a few scenarios - kaboom never moves .kde4.
    
    Kaboom always copies it.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>

diff --git a/choicepage.cpp b/choicepage.cpp
index 77c10e5..4735953 100644
--- a/choicepage.cpp
+++ b/choicepage.cpp
@@ -110,8 +110,8 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
           .arg(s.kdehomeDir().exists() ?
               tr(" and <strong>replace</strong> current KDE&nbsp;3 settings") : ""),
         (s.kdehomeDir().exists()) ?
-          tr("<p>The wizard will remove current KDE&nbsp;3 settings directory and move "
-           "current KDE&nbsp;4 settings directory into its place. Effectively, you will "
+          tr("<p>The wizard will remove current KDE&nbsp;3 settings directory and copy "
+           "current KDE&nbsp;4 settings directory to its place. Effectively, you will "
            "lose all settings and data the KDE&nbsp;3 desktop and applications have stored "
            "unless the backup option below is enabled. This scenario should be useful for "
            "users who already actively and almost exclusively use KDE&nbsp;4 desktop and "
@@ -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 move to backup) existing KDE&nbsp;3 "
+      tr("<p>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