Review texts

2 files changed, 61 insertions, 41 deletions

diff --git a/qml/AppList.qml b/qml/AppList.qml
index 79cad01..875d17d 100644
--- a/qml/AppList.qml
+++ b/qml/AppList.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.2
-    import QtQml.Models 2.1
+import QtQml.Models 2.1
     ListModel {
                 ListElement { group: "audio featured";description: "Various Multimedia Codecs for Audio";inst_repo: "tainted";title: "Audio Multimedia Codecs";name: "task-codec-audio";command: "";repo: "";icon: "img/codecs-audio.png";installable: "True";}
 ListElement { group: "audio featured";description: "Various Multimedia Codecs for Audio";inst_repo: "tainted";title: "Audio Multimedia Codecs";name: "task-codec-audio";command: "";repo: "tainted";icon: "img/codecs-audio.png";installable: "False";}
diff --git a/qml/mw-ui.qml b/qml/mw-ui.qml
index 1b3cba9..c7b2857 100644
--- a/qml/mw-ui.qml
+++ b/qml/mw-ui.qml
@@ -70,10 +70,12 @@ and help you with the configuration of your newly installed system.
                         color: "lightgreen"
                         width: 80;
                         height: 20
+                        Layout.alignment: Qt.AlignTop
+                        Layout.fillWidth: true
                         Label { text: qsTr("core");   }
                     }
                     Label {
-                        text: qsTr("- the free-open-source packages, i.e. software licensed under a free-open-source license");
+                        text: qsTr("- the free-open-source packages");
                         wrapMode: Text.WordWrap
                         Layout.maximumWidth: slideshow.width * .6
                     }
@@ -85,13 +87,15 @@ and help you with the configuration of your newly installed system.
                     Rectangle {id: nonfreeBg
                         color: "red"
                         width: 80; height: 20
+                        Layout.alignment: Qt.AlignTop
+                        Layout.fillWidth: true
                         Label { text: qsTr("nonfree");
 
                             wrapMode: Text.WordWrap}
                         }
                     Label {
                         width: parent.width
-                        text: qsTr("- some programs which are not free, or closed source. For example this repository includes Nvidia and ATI graphics card proprietary drivers, firmware for various WiFi cards, etc");
+                        text: qsTr("- closed-source programs, e.g. Nvidia proprietary drivers, non-free drivers for some Wi-Fi cards, etc");
                         Layout.maximumWidth: slideshow.width * .6
                         wrapMode: Text.WordWrap
                     }
@@ -101,7 +105,7 @@ and help you with the configuration of your newly installed system.
                         onClicked: { launch.command("drakrpm-edit-media")}
                         style: ButtonStyle {
                             label: Label {
-                                text: qsTr("Configure software repositories");
+                                text: qsTr("Edit software repositories")+" *";
                                 width: parent.width
                                 wrapMode: Text.WordWrap
                             }
@@ -110,10 +114,12 @@ and help you with the configuration of your newly installed system.
                     Rectangle {id: taintedBg
                         color: "red"
                         width: 80; height: 20
+                        Layout.alignment: Qt.AlignTop
+                        Layout.fillWidth: true
                         Label { text: qsTr("tainted");   }
                         }
                     Label {
-                        text: qsTr("- includes packages released under a free license. However, they may infringe on patents and copyright laws in some countries, e.g. multimedia codecs needed to play various audio/video files; packages needed to play commercial video DVD, etc. ");
+                        text: qsTr("- these packages may infringe on patents or copyright laws in certain countries, eg audio and video codecs needed for certain multimedia files or commercial DVDs");
                         wrapMode: Text.WordWrap
                         Layout.maximumWidth: slideshow.width * .6
                     }
@@ -124,6 +130,8 @@ and help you with the configuration of your newly installed system.
                     Rectangle {
                         color: "white"
                         width: 80; height: 20
+                        Layout.alignment: Qt.AlignTop
+                        Layout.fillWidth: true
                         Label { text: qsTr("backports");   }
                         }
                     Label {
@@ -132,27 +140,28 @@ and help you with the configuration of your newly installed system.
                         Layout.maximumWidth: slideshow.width * .6
                     }
                     Label {
-                        text: "Administrator password is needed"
-                        Layout.maximumWidth: slideshow.width * .3
+                        text: "(*) Administrator password is needed"
+                        Layout.maximumWidth: slideshow.width * .25
                         wrapMode: Text.WordWrap
                     }
                     Rectangle {id: noteBg
                         color: "yellow";
                         width: 70
                         height: 20
+                        Layout.alignment: Qt.AlignTop
+                        Layout.fillWidth: true
                         Label { text: qsTr("Note! ")
                         }
                       }
                     Label { text: qsTr("If you enabled the online repositories during installation, some media sources should be installed already. If you didn't, we will now configure these online repositories.
-    If this computer will have access to the Internet, you can delete the <i>cdrom</i> entry from the list of repositories.
-    <br />
-    Now, please enable or disable the online repositories of your choice: click on the <i>Edit software repositories</i> button below. Select the pair <i>release</i> with the <i>updates</i>. <i>Debuginfo</i> and <i>testing<i/> are for special cases.
-    <br />
-    After you have checked and enabled the repositories you need, please click on the <i>Next</i> arrow.
-    <br />Maybe we should suggest a bunch of usual repositories because the idea of repositories isn't obvious for newcomers")
-                                      wrapMode: Text.WordWrap
-                                      textFormat: Text.RichText
-                                      Layout.maximumWidth: slideshow.width * .6
+    If this computer will have access to the Internet, you can delete the <i>cdrom</i> entry from the list of repositories.")+"<BR />"+
+                               qsTr("Now, please enable or disable the online repositories of your choice: click on the <i>Edit software repositories</i> button. Select the pair <i>release</i> with the <i>updates</i>. <i>Debug</i> and <i>Testing</i> are for special cases.")+"<BR />"+
+                               qsTr("After you have checked and enabled the repositories you need, you can go to the next slide.");
+                          wrapMode: Text.WordWrap
+                          textFormat: Text.RichText
+                          Layout.fillWidth: true
+                          Layout.columnSpan: 2
+                          Layout.maximumWidth: slideshow.width - 100
                     }
             }
         }
@@ -256,6 +265,7 @@ It is highly recommended that you update your system regularly. An Update icon w
             Column {
                    anchors.left: parent.left
                    anchors.verticalCenter:  parent.verticalCenter
+                   anchors.leftMargin: 10
                    Label {
                        text: qsTr("Install and remove software")
                        width: slideshow.width * .7
@@ -263,14 +273,37 @@ It is highly recommended that you update your system regularly. An Update icon w
                        wrapMode: Text.WordWrap
                    }
                    Label {
-                       text: qsTr("<If you have used MS-Windows for a long time, you might not be able to find the software you are used to, which probably are under proprietary licenses. Therefore they can't be redistributed, or don't even exist on GNU/Linux systems. Don't worry, there are lots of open-source alternatives!<BR/>
-The most famous one is probably the web-browser Mozilla Firefox, an open-source alternative to Microsoft Internet Explorer.<BR />
-I you need a mail client to manage your e-mails, you may choose between Kmail (by the KDE team), Evolution (by the Gnome team), or Mozilla Thunderbird, which is also very popular amongst Windows users. There are lesser-known e-mail clients such as Sylpheed, but they are far from being less efficient! You will find even more of them in the Mageia Software Manager.<BR />
-With Mageia, you will find the software in the media repositories (named store by Google and Apple). Mageia users simply access these media via one of the Software Managers.<BR >
-Nest slide is a small selection of popular applications - any of which may be installed at this point.<BR/>
-You can find a more detailed list here:  <BR />
-If you can't find the software you need, please come and tell us about it. We will help you find the open-source equivalent.
-If it is an open-source application, we will gladly do our best to add it to the software repository. We will tell you how you can get in touch with the community in the <i>More information</i> tab.");
+                       text: qsTr("With Mageia, you will find the software in the media repositories. Mageia users simply access these media via one of the Software Managers.");
+                       width: slideshow.width * .7;
+                       wrapMode: Text.WordWrap
+                       textFormat: Text.RichText
+                   }
+                   Label {
+                       text: qsTr("Next slide is a small selection of popular applications - any of which may be installed at this point.<BR/>");
+                       width: slideshow.width * .7;
+                       wrapMode: Text.WordWrap
+                       textFormat: Text.RichText
+                   }
+                   Label {
+                       text: qsTr("You can find a more detailed list here:");
+                       width: slideshow.width * .7;
+                       wrapMode: Text.WordWrap
+                       textFormat: Text.RichText
+                   }
+                   Button {
+                       id: listApplicationsWiki
+                       objectName: "link"
+                       onClicked: { link.weblink(qsTr("https://wiki.mageia.org/en/List_of_applications"))}
+                       style: ButtonStyle {
+                           label: Label {
+                               text: qsTr("List of applications (wiki)");
+                               width: slideshow.width * .3
+                               wrapMode: Text.WordWrap
+                           }
+                       }
+                   }
+                   Label {
+                       text: qsTr("We will tell you how you can get in touch with the community in the <i>More information</i> tab.");
                        width: slideshow.width * .7;
                        wrapMode: Text.WordWrap
                        textFormat: Text.RichText
@@ -295,20 +328,6 @@ If it is an open-source application, we will gladly do our best to add it to the
                            wrapMode: Text.WordWrap
                            font.italic: true
                        }
-
-                       Button {
-                           id: listApplicationsWiki
-                           objectName: "link"
-                           onClicked: { link.weblink(qsTr("https://wiki.mageia.org/en/List_of_applications"))}
-                           style: ButtonStyle {
-                               label: Label {
-                                   text: qsTr("List of applications (wiki)");
-                                   width: slideshow.width * .3
-                                   wrapMode: Text.WordWrap
-                               }
-                           }
-                       }
-
                    }
         }
         // Applications page
@@ -508,14 +527,14 @@ If it is an open-source application, we will gladly do our best to add it to the
         }
         // Links page
         Rectangle {
-            property var title: "To go further"
+            property var title: "More information"
             width: view.width; height: view.height
             color: "#F4F0FF"
             Column {
                 anchors.left: parent.left
                 anchors.verticalCenter:  parent.verticalCenter
                 anchors.leftMargin: 10
-                Label { text: "To go further"; font.bold: true;  }
+                Label { text: "More information"; font.bold: true;  }
 
                 Grid {
                     columns: 3
@@ -539,7 +558,8 @@ If it is an open-source application, we will gladly do our best to add it to the
                         model: [{'name': qsTr("Release notes"), 'url': qsTr("https://wiki.mageia.org/en/Mageia_7_Release_Notes")},
                                  {'name': qsTr("Forums"),'url': qsTr("https://forums.mageia.org/en/")},
                                  {'name': qsTr("Community Center"),'url': qsTr("https://www.mageia.org/community/")},
-                                 {'name': qsTr("Errata"), 'url': qsTr("Wiki"),'url': qsTr("https://wiki.mageia.org/en/Mageia_7_Errata")},
+                                 {'name': qsTr("Errata"), 'url': qsTr("https://wiki.mageia.org/en/Mageia_7_Errata")},
+                                 {'name': qsTr("Wiki"), 'url': qsTr("https://wiki.mageia.org/en/Documentation")},
                                  {'name': qsTr("Contribute"),'url': qsTr("https://www.mageia.org/contribute/")},
                                  {'name': qsTr("Newcomers Howto"),'url': qsTr("https://wiki.mageia.org/en/Newcomers_start_here")},
                                  {'name': qsTr("Chat Room"),'url': qsTr("irc://irc.freenode.net/#mageia")},