Merge lp:~larsu/unity-control-center/wrap-keyboard-label into lp:unity-control-center

Proposed by Robert Ancell
Status: Merged
Approved by: Robert Ancell
Approved revision: 12699
Merged at revision: 12701
Proposed branch: lp:~larsu/unity-control-center/wrap-keyboard-label
Merge into: lp:unity-control-center
Diff against target: 11 lines (+1/-0)
1 file modified
panels/keyboard/gnome-keyboard-panel.ui (+1/-0)
To merge this branch: bzr merge lp:~larsu/unity-control-center/wrap-keyboard-label
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Robert Ancell Approve
Review via email: mp+205229@code.launchpad.net

This proposal supersedes a proposal from 2014-02-06.

Commit message

keyboard: wrap information label in the shortcuts panel

Description of the change

keyboard: wrap information label in the shortcuts panel

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:12699
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/~larsu/unity-control-center/wrap-keyboard-label/+merge/205229/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/1/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/keyboard/gnome-keyboard-panel.ui'
2--- panels/keyboard/gnome-keyboard-panel.ui 2012-12-18 11:25:19 +0000
3+++ panels/keyboard/gnome-keyboard-panel.ui 2014-02-06 17:16:08 +0000
4@@ -804,6 +804,7 @@
5 <property name="visible">True</property>
6 <property name="can_focus">False</property>
7 <property name="xalign">0</property>
8+ <property name="max-width-chars">60</property>
9 <property name="label" translatable="yes">To edit a shortcut, click the row and hold down the new keys or press Backspace to clear.</property>
10 <property name="justify">fill</property>
11 <property name="wrap">True</property>

Subscribers

People subscribed via source and target branches