Merge lp:~aacid/unity8/shownosee into lp:unity8

Proposed by Albert Astals Cid on 2016-03-10
Status: Merged
Approved by: Andrea Cimitan on 2016-03-18
Approved revision: 2228
Merged at revision: 2357
Proposed branch: lp:~aacid/unity8/shownosee
Merge into: lp:unity8
Diff against target: 21 lines (+2/-2)
1 file modified
qml/Dash/GenericScopeView.qml (+2/-2)
To merge this branch: bzr merge lp:~aacid/unity8/shownosee
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing on 2016-03-24
Andrea Cimitan (community) 2016-03-10 Approve on 2016-03-18
Review via email: mp+288642@code.launchpad.net

Commit Message

See all/less -> Show all/less

Description of the Change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
This is driven by design.

To post a comment you must log in.
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2227
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/657/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/374
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/374
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/374
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/863
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/879
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/879
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/877
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/877/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/877
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/877/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/877
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/877/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/877
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/877/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/877
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/877/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/877
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/877/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/657/rebuild

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/shownosee updated on 2016-03-14
2228. By Albert Astals Cid on 2016-03-14

Merge

Andrea Cimitan (cimi) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
 * Did you make sure that the branch does not contain spurious tags?
y

review: Approve
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/shownosee updated on 2016-04-27
2229. By Albert Astals Cid on 2016-04-27

Another "See less" -> "Show less"

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Dash/GenericScopeView.qml'
2--- qml/Dash/GenericScopeView.qml 2016-03-14 08:53:26 +0000
3+++ qml/Dash/GenericScopeView.qml 2016-04-27 14:43:13 +0000
4@@ -567,7 +567,7 @@
5
6 Label {
7 id: seeAllLabel
8- text: baseItem.expanded ? i18n.tr("See less") : i18n.tr("See all")
9+ text: baseItem.expanded ? i18n.tr("Show less") : i18n.tr("Show all")
10 anchors {
11 centerIn: parent
12 verticalCenterOffset: units.gu(-0.5)
13@@ -752,7 +752,7 @@
14
15 Label {
16 id: seeLessLabel
17- text: i18n.tr("See less")
18+ text: i18n.tr("Show less")
19 anchors {
20 centerIn: parent
21 verticalCenterOffset: units.gu(-0.5)

Subscribers

People subscribed via source and target branches