on xenial help sign in
merge prereq
24c9f5fLukáš Tinkl
qml/Launcher/Drawer.qml+3−3
@@ -122,9 +122,9 @@ FocusScope {
122 Action {
122 Action {
123 text: i18n.ctr("Apps sorted alphabetically", "A-Z")
123 text: i18n.ctr("Apps sorted alphabetically", "A-Z")
124 // TODO: Disabling this for now as we don't get the right input from u-a-l yet.
124 // TODO: Disabling this for now as we don't get the right input from u-a-l yet.
125− },
125+// },
126− Action {
126+// Action {
127− text: i18n.ctr("Most used apps", "Most used")
127+// text: i18n.ctr("Most used apps", "Most used")
128 }
128 }
129 ]
129 ]
130
130
tests/qmltests/tst_ShellWithPin.qml+1−1
@@ -573,5 +573,5 @@ Item {
573
573
574 tryCompare(launcher, "state", "drawer");
574 tryCompare(launcher, "state", "drawer");
575 }
575 }
576− }
576+ }
577}
577}