Merge lp:~vanvugt/unity/fix-783813 into lp:unity

Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 1212
Proposed branch: lp:~vanvugt/unity/fix-783813
Merge into: lp:unity
Diff against target: 25 lines (+5/-5)
1 file modified
utouch/unity-mt-grab-handles/unitymtgrabhandles.xml.in (+5/-5)
To merge this branch: bzr merge lp:~vanvugt/unity/fix-783813
Reviewer Review Type Date Requested Status
Sam Spilsbury (community) Approve
Review via email: mp+61207@code.launchpad.net

Commit message

Fix duplicate names for Unity MT Grab Handles plugin settings (LP: #783813)

Description of the change

Fix duplicate names for Unity MT Grab Handles plugin settings (LP: #783813)

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'utouch/unity-mt-grab-handles/unitymtgrabhandles.xml.in'
--- utouch/unity-mt-grab-handles/unitymtgrabhandles.xml.in 2011-03-23 22:54:24 +0000
+++ utouch/unity-mt-grab-handles/unitymtgrabhandles.xml.in 2011-05-17 06:38:22 +0000
@@ -25,16 +25,16 @@
25 <options>25 <options>
26 <option name="toggle_handles_key" type="key">26 <option name="toggle_handles_key" type="key">
27 <_short>Toggle Handles</_short>27 <_short>Toggle Handles</_short>
28 <_long>Show/Hide the handles</_long>28 <_long>Key to toggle the handles</_long>
29 <!--<default>&lt;Control&gt;&lt;Alt&gt;h</default>-->29 <!--<default>&lt;Control&gt;&lt;Alt&gt;h</default>-->
30 </option>30 </option>
31 <option name="show_handles_key" type="key">31 <option name="show_handles_key" type="key">
32 <_short>Toggle Handles</_short>32 <_short>Show Handles</_short>
33 <_long>Show/Hide the handles</_long>33 <_long>Key to show the handles</_long>
34 </option>34 </option>
35 <option name="hide_handles_key" type="key">35 <option name="hide_handles_key" type="key">
36 <_short>Toggle Handles</_short>36 <_short>Hide Handles</_short>
37 <_long>Show/Hide the handles</_long>37 <_long>Key to hide the handles</_long>
38 </option>38 </option>
39 <option name="fade_duration" type="int">39 <option name="fade_duration" type="int">
40 <_short>Fade Duration</_short>40 <_short>Fade Duration</_short>