Unity

Merge lp:~mc-return/unity/unity.merge-fix1112560-wrong-description-in-com.canonical.unity.launcher.favorites into lp:unity

  1. unity.merge-fix1112560-wrong-description-in-com.canonical.unity.launcher.favorites
  2. Merge into trunk
Proposed by MC Return
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3101
Proposed branch: lp:~mc-return/unity/unity.merge-fix1112560-wrong-description-in-com.canonical.unity.launcher.favorites
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
com.canonical.Unity.gschema.xml (+1/-1)
To merge this branch: bzr merge lp:~mc-return/unity/unity.merge-fix1112560-wrong-description-in-com.canonical.unity.launcher.favorites
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+146240@code.launchpad.net

Commit message

Fixed wrong description in Dconf key com.canonical.unity.launcher.favorites.
Also improved wording a bit.

(LP: #1112560)

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'com.canonical.Unity.gschema.xml'
2--- com.canonical.Unity.gschema.xml 2012-09-20 14:58:49 +0000
3+++ com.canonical.Unity.gschema.xml 2013-02-01 22:56:22 +0000
4@@ -46,7 +46,7 @@
5 <key type="as" name="favorites">
6 <default>[ 'application://ubiquity-gtkui.desktop', 'application://nautilus-home.desktop', 'application://firefox.desktop', 'application://libreoffice-writer.desktop', 'application://libreoffice-calc.desktop', 'application://libreoffice-impress.desktop', 'application://ubuntu-software-center.desktop', 'application://ubuntuone-installer.desktop', 'application://ubuntu-amazon-default.desktop', 'application://UbuntuOneMusiconeubuntucom.desktop', 'application://gnome-control-center.desktop', 'unity://running-apps', 'unity://expo-icon', 'unity://devices' ]</default>
7 <summary>List of items that should be shown by default in the launcher</summary>
8- <description>These items can be application://desktop-id.desktop, device://uiid and unity://special-id (including unity://running-apps that specifies the position of the ran applications, unity://devices the position of the attached devices, unity://expo-icon the position of the workspace switcher and unity://show-desktop-icon the position of the show-desktop icon); the order of this list determines the launcher items position.</description>
9+ <description>These items can be: application://desktop-id.desktop, device://uiid and unity://special-id (including: unity://running-apps (icons of running applications) unity://devices (icons of attached devices), unity://expo-icon (icon of the workspace switcher) and unity://desktop-icon (the show-desktop icon)); the order of this list determines the launcher item's position.</description>
10 </key>
11 <key type="s" name="favorite-migration">
12 <default>''</default>