From 378fc54b614f77944e44edb68b486f4cce9d41c1 Mon Sep 17 00:00:00 2001 From: Automatic Release Builder Date: Thu, 8 Oct 2020 09:13:46 +0100 Subject: [PATCH] Launcher: first-run wording tweaks As discussed on the devel list, also switch to HTTPS. --- src/GUI/qml/FirstRun.qml | 5 ++--- src/GUI/qml/HelpSupport.qml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/GUI/qml/FirstRun.qml b/src/GUI/qml/FirstRun.qml index 2e1be7ae9..11b8006ad 100644 --- a/src/GUI/qml/FirstRun.qml +++ b/src/GUI/qml/FirstRun.qml @@ -91,7 +91,7 @@ Item { color: "white" wrapMode: Text.WordWrap - readonly property string forumLink: "href=\"http://forum.flightgear.org\""; + readonly property string forumLink: "href=\"https://forum.flightgear.org\""; text: qsTr("Welcome to FlightGear, the open source flight simulator. " + "This software is the work of volunteers. we hope you enjoy it. " + @@ -112,8 +112,7 @@ Item { readonly property string gplLink: "href=\"https://www.gnu.org/licenses/gpl-3.0.html\""; text: qsTr("FlightGear is Free software, licensed under the GNU General Public License. " + - "This means you are are free to use the software, customise it, or make fixes to it, so long as " + - "you share your changes with the community.").arg(gplLink) + "You are free to use, customize and fix the software; and share your changes with the community.").arg(gplLink) onLinkActivated: { Qt.openUrlExternally(link) diff --git a/src/GUI/qml/HelpSupport.qml b/src/GUI/qml/HelpSupport.qml index 0d51c8d2e..f73276db6 100644 --- a/src/GUI/qml/HelpSupport.qml +++ b/src/GUI/qml/HelpSupport.qml @@ -5,7 +5,7 @@ import "." Item { id: root - readonly property string forumLink: "href=\"http://forum.flightgear.org\""; + readonly property string forumLink: "href=\"https://forum.flightgear.org\""; readonly property string forumHelpLink: "href=\"https://forum.flightgear.org/viewforum.php?f=17\""; readonly property string wikiLink: "href=\"http://wiki.flightgear.org/Portal:User\"";