[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/1.1.0-2-gd2c617f
Frederik Gladhorn
fregl-guest at alioth.debian.org
Mon Apr 6 22:37:58 UTC 2009
The following commit has been merged in the master branch:
commit d2c617fa7366a06f7b018e1f516a82e5cd54dc34
Author: Frederik Gladhorn <frederik at greshym.(none)>
Date: Tue Apr 7 00:37:21 2009 +0200
a few string fixes
diff --git a/choicepage.cpp b/choicepage.cpp
index 0e8c960..cef9ba9 100644
--- a/choicepage.cpp
+++ b/choicepage.cpp
@@ -92,7 +92,7 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
if(s.kdehomeDir().exists())
{
d->migrate = new RichRadioButton(
- tr("Use current KDE 3 settings as initial for KDE 4. (<i>standard</i>)"),
+ tr("Use current KDE 3 settings as initial settings for KDE 4. (<i>standard</i>)"),
tr("<p>The wizard will not make any changes to your current KDE 3 settings directory. "
"It may only optionally back this directory up if the appropriate option below is "
"enabled. This scenario is recommended for users who have not actively used KDE 4 "
@@ -110,16 +110,16 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
.arg(s.kdehomeDir().exists() ?
tr(" and <strong>replace</strong> current KDE 3 settings") : ""),
(s.kdehomeDir().exists()) ?
- tr("<p>The wizard will remove current KDE 3 settings directory and copy "
- "current KDE 4 settings directory to its place. Effectively, you will "
+ tr("<p>The wizard will remove the current KDE 3 settings directory and copy "
+ "the current KDE 4 settings directory to its place. Effectively, you will "
"lose all settings and data the KDE 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 4 desktop and "
- "applications as previously packaged by Debian and do not care about losing "
+ "unless the backup option below is enabled. This scenario is useful for "
+ "users who already use a KDE 4 desktop and applications almost exclusively "
+ "and do not care about losing "
"settings of (a few) KDE 3 applications anymore.</p>") :
- tr("<p>The wizard will rename your current old KDE 4 settings directory. "
+ tr("<p>The wizard will rename your current KDE 4 settings directory. "
"Select this option if you would like to keep all KDE 4 settings and "
- "continue using KDE 4 desktop as before.</p>"),
+ "continue using the KDE 4 desktop as before.</p>"),
this);
d->buttons->addButton(d->move,MigrationTool::Move);
lay->addWidget(d->move);
@@ -146,8 +146,8 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
"this scenario if you would like to start with default KDE 4 "
"desktop and/or want to do migration of old KDE settings manually (from backup).</p>")
.arg((s.kdehomeDir().exists()) ?
- tr("The wizard will <strong>remove</strong> (or leave a copy as backup) existing KDE 3 "
- "settings directory including such data as contacts, locally stored mails, accounts "
+ tr("The wizard will <strong>remove</strong> (or leave a copy as backup) the existing KDE 3 "
+ "settings directory including data such as contacts, locally stored mails, accounts "
"in KMail and Kopete, bookmarks, etc. ") : ""),
this);
d->buttons->addButton(d->clean,MigrationTool::Clean);
@@ -193,7 +193,7 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
tr("<strong>Warning</strong>: insufficient free space to complete a backup. "
"Consider freeing up some space."));
d->freewarning->setToolTip(
- tr("To free up some disk case, cancel the wizard now or switch to the Linux virtual terminal."));
+ tr("To free up some disk space, cancel the wizard now or switch to the Linux virtual terminal."));
d->freewarning->setMinimumWidth(506);
d->freewarning->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
@@ -266,7 +266,7 @@ void ChoicePage::checkSpaceForBackup()
d->freespace->setMaximum(partsize);
d->freespace->setValue(partsize-freespace);
d->freespace->setLabelText(
- tr("<p><i>The current KDE 3 settings and data directory takes up %1</i></p>")
+ tr("<p><i>The current KDE 3 settings and data directory take up %1</i></p>")
.arg(DirOperations::bytesToString(dirsize))
);
d->freespace->setToolTip(tr("%1% of disk space currently used").arg((partsize-freespace)*100/partsize));
diff --git a/intropage.cpp b/intropage.cpp
index 6583132..017e61c 100644
--- a/intropage.cpp
+++ b/intropage.cpp
@@ -21,18 +21,18 @@ IntroPage::IntroPage(QWidget *parent) : QWizardPage(parent)
{
setTitle(tr("Welcome to the Debian KDE Settings Migration Wizard!"));
QLabel *text = new QLabel(tr(
- "<p align='justify'>This version of KDE 4 in Debian uses <u>%1</u> "
+ "<p align='justify'>This version of KDE 4 in Debian uses the <u>%1</u> "
"directory (where ~ refers to the path of your Home directory) to "
"store user settings and data. The wizard has detected that you have "
"recently upgraded to this version of KDE 4 from KDE 3 and/or "
- "previous Debian KDE 4 release that used <u>%2</u> directory to "
+ "a previous Debian KDE 4 release that used the <u>%2</u> directory to "
"store user settings.</p>"
"<p align='justify'>This wizard will guide you through the process of "
"backing up, copying, moving or merging your user settings and data which "
"were created by the old KDE installation. Please note, however, that it "
"does not migrate configuration files directly. It operates on the "
- "filesystem level and sets up <u>%1</u> directory the way you request "
+ "filesystem level and sets up the <u>%1</u> directory the way you request "
"in the next step.</p>"
"<p align='justify'>Once you finish with this wizard, migration of the "
@@ -45,7 +45,7 @@ IntroPage::IntroPage(QWidget *parent) : QWizardPage(parent)
"<p align='justify'>If you need to make manual adjustments, you can cancel the "
"wizard. KDE will not start and the current session will be terminated. You will "
- "see this wizard when you try to start KDE session again.</p>"
+ "see this wizard when you try to start a KDE session again.</p>"
).arg(KaboomSettings::instance().kdehomePrettyPath())
.arg(KaboomSettings::instance().kde4homePrettyPath()), this);
text->setWordWrap(true);
diff --git a/migrationpage.cpp b/migrationpage.cpp
index 2cc2db1..1bdb8ae 100644
--- a/migrationpage.cpp
+++ b/migrationpage.cpp
@@ -48,7 +48,7 @@ MigrationPagePrivate::MigrationPagePrivate(MigrationPage* parent)
error->setPalette(pal);
QLabel *warning = new QLabel;
- warning->setText(tr("WARNING: if you go back, migration process will restarted over current state."));
+ warning->setText(tr("WARNING: if you go back, the migration process will be restarted over the current state."));
warning->setWordWrap(true);
warning->setAlignment(Qt::AlignJustify);
--
Kaboom - Debian KDE 3->4 migration tool
More information about the pkg-kde-commits
mailing list