Merge lp:~mterry/ubuntu-system-settings/here-comment into lp:ubuntu-system-settings

[Michael Terry]

Add a translator comment for what HERE means. (LP: #1368838)

Add a translator comment for what HERE means. (LP: #1368838)

== Checklist ==

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
 Yes

 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
 Just a comment change

 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
 Just a comment change

 * Has your component "TestPlan” been executed successfully on emulator, N4?
 NA

 * Has a 5 minute exploratory testing run been executed on N4?
 NA

 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
 NA

 * If you changed the UI, did you subscribe the design-reviewers to this MP?
 NA

 * What components might get impacted by your changes?
 None

 * Have you requested review by the teams of these owning components?
 NA

[Iain Lane (laney)]

On Thu, Sep 18, 2014 at 01:19:25PM -0000, Michael Terry wrote:
> […]
> + // TRANSLATORS: HERE is a trademark for Nokia's location service

I think you should be clear and say "so please don't translate it"

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Michael Terry (mterry)]

OK, but some trademarks are actually translated in some languages. I don't happen to know if Nokia does that with HERE, but sure, we can assume they don't. I'll warn translators away even harder.

[lp:~mterry/ubuntu-system-settings/here-comment]

1061. By Michael Terry on 2014-09-18

Warn even harder

[Michael Terry (mterry)]

OK, updated.

[Iain Lane (laney)]

Thanks - I've seen complaints go by about this being translated, so I think it shouldn't be.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1060
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1500/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4948
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3609
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/692
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4701
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6200
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6200/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13388
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2996
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3918
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3918/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1500/rebuild

review: Approve (continuous-integration)

[lp:~mterry/ubuntu-system-settings/here-comment]

1062. By Michael Terry on 2014-09-24

Merge from trunk

=== modified file 'po/ubuntu-system-settings.pot'
--- po/ubuntu-system-settings.pot	2014-09-22 17:11:30 +0000
+++ po/ubuntu-system-settings.pot	2014-09-24 17:11:11 +0000
@@ -1855,6 +1855,7 @@
 msgid "Use your mobile network and Wi-Fi to work out where you are"
 msgstr ""
 
+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
 #: ../wizard/qml/Pages//30-location.qml:69
 msgid ""
 "I have read and agreed to the HERE <a href='terms.qml'>terms and conditions</"

=== modified file 'wizard/qml/Pages/30-location.qml'
--- wizard/qml/Pages/30-location.qml	2014-08-29 20:00:26 +0000
+++ wizard/qml/Pages/30-location.qml	2014-09-24 17:11:11 +0000
@@ -66,6 +66,7 @@
             id: termsCheck
             showDivider: false
             visible: System.hereLicensePath !== "" && termsModel.count > 0
+            // TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
             text: i18n.tr("I have read and agreed to the HERE <a href='terms.qml'>terms and conditions</a>")
             onLinkActivated: pageStack.push(Qt.resolvedUrl(link))
             checked: System.hereEnabled