git.iko.soy/unity8
on xenial help sign in
string fixes
4ae5aaeLukáš Tinkl
qml/Wizard/Pages/40-location.qml+2−3
compare with xenial
unifiedsplit
@@ -102,9 +102,8 @@ LocalComponents.Page {
102 fontSize: "small"
102 fontSize: "small"
103 lineHeight: 1.2
103 lineHeight: 1.2
104 linkColor: UbuntuColors.orange
104 linkColor: UbuntuColors.orange
105− text: i18n.tr("By selecting this option you agree to the Nokia HERE") + " <a href='#'>" +
105+ text: i18n.tr("By selecting this option you agree to the Nokia HERE %1.")
106− // TRANSLATORS: "terms and conditions" is part of the sentence above
107− i18n.tr("terms and conditions") + "</a>."
106+ .arg("<a href='#'>" + i18n.ctr("part of: Nokia HERE terms and conditions", "terms and conditions") + "</a>")
108 Mouse.forwardTo: hereCheckArea // clicking on the link also selects this group
107 Mouse.forwardTo: hereCheckArea // clicking on the link also selects this group
109 Mouse.priority: Mouse.AfterItem
108 Mouse.priority: Mouse.AfterItem
110 onLinkActivated: {
109 onLinkActivated: {
qml/Wizard/Pages/here-terms.qml+5−7
@@ -78,9 +78,7 @@ LocalComponents.Page {
78 fontSize: "small"
78 fontSize: "small"
79 font.weight: Font.Light
79 font.weight: Font.Light
80 lineHeight: 1.2
80 lineHeight: 1.2
81− text: i18n.tr("To provide you with positioning services and to improve their quality, HERE collects " +
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.")
82− "information about nearby cell towers and Wi-Fi hotspots around your current location " +
83− "whenever your position is being found.")
84 }
82 }
85
83
86 Label {
84 Label {
@@ -92,8 +90,7 @@ LocalComponents.Page {
92 fontSize: "small"
90 fontSize: "small"
93 font.weight: Font.Light
91 font.weight: Font.Light
94 lineHeight: 1.2
92 lineHeight: 1.2
95− text: i18n.tr("The information collected is used to analyze the service and to " +
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.")
96− "improve the use of service, but not to identify you personally.")
97 }
94 }
98
95
99 Label {
96 Label {
@@ -106,8 +103,9 @@ LocalComponents.Page {
106 font.weight: Font.Light
103 font.weight: Font.Light
107 lineHeight: 1.2
104 lineHeight: 1.2
108 linkColor: UbuntuColors.orange
105 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> " +
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>")
110− "and <a href=\"http://here.com/privacy/privacy-policy\">Privacy Policy</a>.");
108+ .arg("<a href=\"http://here.com/privacy/privacy-policy\">" + i18n.tr("Privacy Policy") + "</a>");
111 onLinkActivated: {
109 onLinkActivated: {
112 showBrowser(true);
110 showBrowser(true);
113 webview.url = link;
111 webview.url = link;