git.iko.soy/unity8
on xenial help sign in
string fixes
commit4ae5aae7997a1061439ccc5ffdc8613886c39c29 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 16 Mar 2016, 20:31 (11 years ago) parent6f68562
2 files changed+7−10
compare with xenial
unifiedsplit
qml/Wizard/Pages/40-location.qml+2−3 qml/Wizard/Pages/here-terms.qml+5−7
qml/Wizard/Pages/40-location.qml+2−3
@@ -102,9 +102,8 @@ LocalComponents.Page {
102102 fontSize: "small"
103103 lineHeight: 1.2
104104 linkColor: UbuntuColors.orange
105− text: i18n.tr("By selecting this option you agree to the Nokia HERE") + " <a href='#'>" +
106− // TRANSLATORS: "terms and conditions" is part of the sentence above
107− i18n.tr("terms and conditions") + "</a>."
105+ text: i18n.tr("By selecting this option you agree to the Nokia HERE %1.")
106+ .arg("<a href='#'>" + i18n.ctr("part of: Nokia HERE terms and conditions", "terms and conditions") + "</a>")
108107 Mouse.forwardTo: hereCheckArea // clicking on the link also selects this group
109108 Mouse.priority: Mouse.AfterItem
110109 onLinkActivated: {
qml/Wizard/Pages/here-terms.qml+5−7
@@ -78,9 +78,7 @@ LocalComponents.Page {
7878 fontSize: "small"
7979 font.weight: Font.Light
8080 lineHeight: 1.2
81− text: i18n.tr("To provide you with positioning services and to improve their quality, HERE collects " +
82− "information about nearby cell towers and Wi-Fi hotspots around your current location " +
83− "whenever your position is being found.")
81+ text: i18n.tr("To provide you with positioning services and to improve their quality, HERE collects information about nearby cell towers and Wi-Fi hotspots around your current location whenever your position is being found.")
8482 }
8583
8684 Label {
@@ -92,8 +90,7 @@ LocalComponents.Page {
9290 fontSize: "small"
9391 font.weight: Font.Light
9492 lineHeight: 1.2
95− text: i18n.tr("The information collected is used to analyze the service and to " +
96− "improve the use of service, but not to identify you personally.")
93+ text: i18n.tr("The information collected is used to analyze the service and to improve the use of service, but not to identify you personally.")
9794 }
9895
9996 Label {
@@ -106,8 +103,9 @@ LocalComponents.Page {
106103 font.weight: Font.Light
107104 lineHeight: 1.2
108105 linkColor: UbuntuColors.orange
109− text: i18n.tr("By continuing, you agree to the HERE platform <a href=\"http://here.com/terms/service-terms\">Service Terms</a> " +
110− "and <a href=\"http://here.com/privacy/privacy-policy\">Privacy Policy</a>.");
106+ text: i18n.tr("By continuing, you agree to the HERE platform %1 and %2.")
107+ .arg("<a href=\"http://here.com/terms/service-terms\">" + i18n.tr("Service Terms") + "</a>")
108+ .arg("<a href=\"http://here.com/privacy/privacy-policy\">" + i18n.tr("Privacy Policy") + "</a>");
111109 onLinkActivated: {
112110 showBrowser(true);
113111 webview.url = link;