summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageia.org>2020-08-16 07:19:58 +0200
committerPapoteur <papoteur@mageia.org>2020-08-16 07:19:58 +0200
commit4620f92633181153b525f3d772843614f2db7aff (patch)
treeae02b20da5ce7732be5f4c1f3a435da545c66f10
parent3e988b964de78327150cbf5c45da62fa93b2213e (diff)
downloadmageiawelcome-4620f92633181153b525f3d772843614f2db7aff.tar
mageiawelcome-4620f92633181153b525f3d772843614f2db7aff.tar.gz
mageiawelcome-4620f92633181153b525f3d772843614f2db7aff.tar.bz2
mageiawelcome-4620f92633181153b525f3d772843614f2db7aff.tar.xz
mageiawelcome-4620f92633181153b525f3d772843614f2db7aff.zip
Improve wording (mga#27114)
-rw-r--r--qml/Install.qml2
-rw-r--r--qml/Live.qml6
-rw-r--r--qml/Welcome.qml4
3 files changed, 6 insertions, 6 deletions
diff --git a/qml/Install.qml b/qml/Install.qml
index f715762..b8da993 100644
--- a/qml/Install.qml
+++ b/qml/Install.qml
@@ -15,7 +15,7 @@ Rectangle {
Label {
horizontalAlignment: TextInput.AlignHCenter
anchors.horizontalCenter: parent.horizontalCenter
- text: qsTr("Are you ready for Installation?");
+ text: qsTr("Here you can choose to permanently install this Mageia system on your computer. Any customizations you have made before launching the installer will be included.");
textFormat: Text.RichText
color: "white"
}
diff --git a/qml/Live.qml b/qml/Live.qml
index 30355c8..cf51754 100644
--- a/qml/Live.qml
+++ b/qml/Live.qml
@@ -23,7 +23,7 @@ Rectangle {
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: TextInput.AlignHCenter
width: slideshow.width
- text:qsTr('This support allows you to try out Mageia without having to actually install it, or make any changes to your computer. However, the Live media also includes an Installer, which can be started when booting the media, or after booting like now.')
+ text:qsTr('This mode allows you to try out Mageia without having to actually install it, or make any changes to your computer. However, the Live media also includes an Installer, which can be started when booting the media, or after booting into Live mode, like now.')
wrapMode: Text.WordWrap;textFormat: Text.RichText
color: "white"
}
@@ -31,7 +31,7 @@ Rectangle {
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: TextInput.AlignHCenter
width: slideshow.width
- text:qsTr("Any customization or installed software will be kept when installing just after. But they won't survive to a reboot, except on a memory support and if you have added a persistent partition.")
+ text:qsTr("Any customization, including installation of additional software, will only survive until you reboot the system, unless you have added a persistence partition.")
wrapMode: Text.WordWrap;textFormat: Text.RichText
color: "white"
}
@@ -40,7 +40,7 @@ Rectangle {
objectName: "link"
//: the link to the local file can be adapted to your language if the documentation is translated
onMbuttonClicked: { link.weblink(qsTr("file:///usr/share/doc/mageia-doc/draklive/en/index.html"))}
- buttonText: qsTr("Documentation of installer")
+ buttonText: qsTr("Installer documentation")
}
}
}
diff --git a/qml/Welcome.qml b/qml/Welcome.qml
index c42cb4d..8d9ea7d 100644
--- a/qml/Welcome.qml
+++ b/qml/Welcome.qml
@@ -25,9 +25,9 @@ import QtQuick.Controls 1
horizontalAlignment: TextInput.AlignHCenter
anchors.horizontalCenter: parent.horizontalCenter
text: (user == 'live' ?
- qsTr("We are going to guide you through a few important information and<BR />help you with to go further with Mageia.<BR /><BR />Now, click on <i> %1 </i> to go to the first step.").arg(qsTr("Live mode")) :
+ qsTr("We are going to guide you through a few important pieces of information and<BR />help you to go further with Mageia.<BR /><BR />Now, click on <i> %1 </i> to go to the first step.").arg(qsTr("Live mode")) :
qsTr("We are going to guide you through some important steps and help<BR />you with the configuration of your newly installed system.<BR /><BR />Now, click on <i>%1</i> to go to the first step.").arg(qsTr("Media sources")));
- textFormat: Text.RichText
+ wrapMode: Text.WordWrap;textFormat:textFormat: Text.RichText
color: "white"
}
}