Merge lp:~dpm/unity-scope-click/fix-1389207 into lp:unity-scope-click

[David Planella]

Fix for bug 1389207 to make "Scopes" appear in English.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:296
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dpm/unity-scope-click/fix-1389207/+merge/241408/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/545/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/74/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/66/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/78
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/78/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/545/rebuild

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

I don't understand why we'd want this change. Would also not want "Apps" to be untranslated then as well, if we really want this to not be translated? Having the translation be incorrect doesn't seem to be an appropriate reason to make the string instead just not be translatable. Do we need to add a comment describing the context so that the correct non-English word is used in a translation?

review: Needs Fixing

[dobey (dobey)]

Rejecting this as no further activity has been provided. If such a change is necessary please provide rationale and answers to the previously posed questions in a new MP. Thanks.

review: Needs Resubmitting

Unmerged revisions

296. By David Planella on 2014-11-11

Made 'Scopes' string untranslatable, as per the request on bug #1389207

=== modified file 'libclickscope/click/highlights.cpp'
--- libclickscope/click/highlights.cpp	2014-10-06 16:07:34 +0000
+++ libclickscope/click/highlights.cpp	2014-11-11 13:40:20 +0000
@@ -124,7 +124,7 @@
             }
 
             if (scopes.size() > 0) {
-                highlights.push_back(Highlight("__all-scopes__", _("Scopes"), scopes, true));
+                highlights.push_back(Highlight("__all-scopes__", "Scopes", scopes, true));
             }
 
             if (apps.size() > 0) {