@@ -18,13 +18,13 @@ import QtQuick 2.3
1818import AccountsService 0.1
1919import QMenuModel 0.1 as QMenuModel
2020import Qt.labs.folderlistmodel 2.1
21−import Ubuntu.Components 1.1
21+import Ubuntu.Components 1.2
2222import ".." as LocalComponents
2323
2424LocalComponents.Page {
2525 objectName: "locationPage"
2626
27− title: i18n.tr("Location")
27+ title: i18n.tr("Location Services")
2828 forwardButtonSourceComponent: forwardButton
2929
3030 property bool pathSet: AccountsService.hereLicensePathValid
@@ -53,37 +53,20 @@ LocalComponents.Page {
5353 Column {
5454 id: column
5555 anchors.fill: content
56− spacing: units.gu(3)
57−
58− Label {
59− anchors.left: parent.left
60− anchors.right: parent.right
61− wrapMode: Text.Wrap
62− text: i18n.tr("Let the phone detect your location:")
63− }
64−
65− LocalComponents.CheckableSetting {
66− id: gpsCheck
67− objectName: "gpsCheck"
68− showDivider: false
69− text: i18n.tr("Using GPS only (less accurate)")
70− onTriggered: {
71− gpsCheck.checked = true;
72− hereCheck.checked = false;
73− nopeCheck.checked = false;
74− }
75− }
56+ spacing: units.gu(4)
57+ anchors.topMargin: units.gu(4)
7658
7759 Column {
7860 anchors.left: parent.left
7961 anchors.right: parent.right
8062 height: childrenRect.height
63+ spacing: units.gu(2)
8164
8265 LocalComponents.CheckableSetting {
8366 id: hereCheck
8467 objectName: "hereCheck"
8568 showDivider: false
86− text: i18n.tr("Using GPS, anonymized Wi-Fi and cellular network info (recommended)")
69+ text: i18n.tr("Use GPS, Wi-FI hotspots nad mobile network anonymously to detect location (recommended)")
8770 checked: true
8871 onTriggered: {
8972 gpsCheck.checked = false;
@@ -93,23 +76,38 @@ LocalComponents.Page {
9376 }
9477
9578 Label {
79+ id: termsLabel
9680 objectName: "hereTermsLink"
9781 anchors.left: parent.left
9882 anchors.leftMargin: hereCheck.labelOffset
9983 anchors.right: parent.right
10084 wrapMode: Text.Wrap
101− linkColor: Theme.palette.normal.foregroundText
85+ linkColor: UbuntuColors.darkGrey
86+ color: "black"
87+ fontSize: "small"
10288 // TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
10389 text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
10490 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
10591 }
10692 }
10793
94+ LocalComponents.CheckableSetting {
95+ id: gpsCheck
96+ objectName: "gpsCheck"
97+ showDivider: false
98+ text: i18n.tr("GPS only")
99+ onTriggered: {
100+ gpsCheck.checked = true;
101+ hereCheck.checked = false;
102+ nopeCheck.checked = false;
103+ }
104+ }
105+
108106 LocalComponents.CheckableSetting {
109107 id: nopeCheck
110108 objectName: "nopeCheck"
111109 showDivider: false
112− text: i18n.tr("Not at all")
110+ text: i18n.tr("Don't use my location")
113111 onTriggered: {
114112 gpsCheck.checked = false;
115113 hereCheck.checked = false;
@@ -121,14 +119,15 @@ LocalComponents.Page {
121119 anchors.left: parent.left
122120 anchors.right: parent.right
123121 wrapMode: Text.Wrap
124− text: i18n.tr("You can change your mind later in <b>System Settings</b>.")
122+ text: i18n.tr("You can change it later in <b>System Settings</b>.")
123+ color: "black"
125124 }
126125 }
127126
128127 Component {
129128 id: forwardButton
130129 LocalComponents.StackButton {
131− text: i18n.tr("Continue")
130+ text: i18n.tr("Next")
132131 onClicked: {
133132 var locationOn = gpsCheck.checked || hereCheck.checked;
134133 var gpsOn = gpsCheck.checked || hereCheck.checked;