df569d7 · unity8 · git.iko.soy

git.iko.soy/unity8

merged with trunk

commitdf569d777bbb48aa8b08213df1cf7ab96fc68bf6 authorNick Dedekind <nicholas.dedekind@gmail.com> dateFri 6 Sep 2013, 15:09 (13 years ago) parenta510c7f 56827d4

156 files changed+5476−2210

compare with xenial

unifiedsplit

Bottombar/Bottombar.qml+60−6

@@ -18,6 +18,7 @@ import QtQuick 2.0

1818import "../Components"

1919import "../Components/Math.js" as MathLocal

2020import Unity 0.1

21+import Ubuntu.Application 0.1

2122import Ubuntu.Gestures 0.1

2223

2324Item {

@@ -28,15 +29,46 @@ Item {

2829

2930 property variant theHud

3031 property bool enabled: false

32+ property bool preventHiding: dragArea.dragging

3133 readonly property real bottomEdgeButtonCenterDistance: units.gu(34)

3234

33− state: dragArea.status === DirectionalDragArea.Recognized ? "shown" : "hidden"

35+ state: "hidden"

36+

37+ onStateChanged: {

38+ if (state == "hidden") {

39+ dismissTimer.stop()

40+ } else {

41+ dismissTimer.restart()

42+ }

43+ }

44+

45+ onPreventHidingChanged: {

46+ if (dismissTimer.running) {

47+ dismissTimer.restart();

48+ }

49+ }

50+

51+ Timer {

52+ id: dismissTimer

53+ interval: 5000

54+ onTriggered: {

55+ if (!bottombar.preventHiding) {

56+ bottombar.state = "hidden"

57+ } else {

58+ dismissTimer.restart()

59+ }

60+ }

61+ }

3462

3563 HudButton {

3664 id: hudButton

3765

38− x: MathLocal.clamp(dragArea.touchStartX - (width / 2), 0, bottombar.width - width)

66+ readonly property bool centeredHud: parent.width < units.gu(68) // Nexus 7 has 67 gu width

67+

68+ x: centeredHud ? parent.width / 2 - width / 2 : MathLocal.clamp(dragArea.touchStartX - (width / 2), 0, bottombar.width - width)

3969 y: bottombar.height - bottomEdgeButtonCenterDistance - (height / 2) - bottomMargin

70+ z: 1

71+ visible: opacity != 0

4072

4173 mouseOver: {

4274 if (dragArea.status === DirectionalDragArea.Recognized) {

@@ -55,13 +87,18 @@ Item {

5587 }

5688

5789 Behavior on opacity {

58− NumberAnimation{ duration: 200; easing.type: Easing.OutCubic}

90+ NumberAnimation{duration: 200; easing.type: Easing.OutCubic}

5991 }

6092 }

6193

6294 Connections {

6395 target: theHud

64− onShownChanged: bottomBarVisibilityCommunicatorShell.forceHidden = theHud.shown

96+ onShownChanged: {

97+ bottomBarVisibilityCommunicatorShell.forceHidden = theHud.shown

98+ if (theHud.shown) {

99+ bottombar.state = "hidden"

100+ }

101+ }

65102 }

66103

67104 EdgeDragArea {

@@ -70,6 +107,7 @@ Item {

70107 height: distanceThreshold

71108 anchors.bottom: parent.bottom

72109

110+ distanceThreshold: units.gu(8)

73111 enabled: !theHud.shown && bottombar.enabled && applicationIsOnForeground

74112 direction: Direction.Upwards

75113

@@ -84,12 +122,29 @@ Item {

84122 }

85123 }

86124 } else if (status === DirectionalDragArea.Undecided) {

87− touchStartX = touchX

125+ if (!hudButton.centeredHud) {

126+ touchStartX = touchX

127+ }

128+ } else if (status === DirectionalDragArea.Recognized) {

129+ bottombar.state = "shown"

88130 }

89131 previousStatus = status

90132 }

91133 }

92134

135+ MouseArea {

136+ anchors.fill: parent

137+ enabled: bottombar.state == "shown"

138+ onPressed: {

139+ bottombar.state = "hidden"

140+ }

141+ }

142+

143+ InputFilterArea {

144+ anchors.fill: parent

145+ blockInput: hudButton.visible

146+ }

147+

93148 states: [

94149 State {

95150 name: "hidden"

@@ -102,5 +157,4 @@ Item {

102157 PropertyChanges { target: hudButton; bottomMargin: units.gu(0)}

103158 }

104159 ]

105−

106160}

Bottombar/HudButton.qml+8−8

@@ -33,24 +33,24 @@ Item {

3333

3434 Item {

3535 id: hudButton

36− property alias actionButton: actionButton

3736

3837 anchors.centerIn: parent

3938 height: units.gu(12)

4039 width: height

41− opacity: item.mouseOver ? 1 : 0.7

42− scale: item.mouseOver ? scaleOnMouseOver : 1

40+ opacity: item.mouseOver || abstractButton.pressed ? 1 : 0.7

41+ scale: item.mouseOver || abstractButton.pressed ? scaleOnMouseOver : 1

4342 Behavior on opacity {NumberAnimation{duration: 200; easing.type: Easing.OutQuart}}

4443 Behavior on scale {NumberAnimation{duration: 200; easing.type: Easing.OutQuart}}

4544

46− UbuntuShape {

47− id: actionButton

45+ AbstractButton {

46+ id: abstractButton

4847 anchors.fill: parent

49−

50− borderSource: ""

51− image: Image {

48+ style: Image {

49+ anchors.fill: parent

5250 source: "graphics/hud_invoke_button_active.png"

5351 }

52+

53+ onClicked: item.clicked()

5454 }

5555

5656 Image {

Components/EdgeDemo.qmlnew file+232

@@ -0,0 +1,232 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import AccountsService 0.1

18+import LightDM 0.1 as LightDM

19+import QtQuick 2.0

20+

21+Item {

22+ id: demo

23+

24+ property Item greeter

25+ property Item dash

26+ property Item launcher

27+ property Item indicators

28+ property Item underlay

29+

30+ property bool launcherEnabled: true

31+ property bool dashEnabled: true

32+ property bool panelEnabled: true

33+ property bool panelContentEnabled: true

34+

35+ property bool paused: false

36+

37+ onPausedChanged: {

38+ if (d.rightEdgeDemo) d.rightEdgeDemo.paused = paused

39+ if (d.topEdgeDemo) d.topEdgeDemo.paused = paused

40+ if (d.bottomEdgeDemo) d.bottomEdgeDemo.paused = paused

41+ if (d.leftEdgeDemo) d.leftEdgeDemo.paused = paused

42+ if (d.finalEdgeDemo) d.finalEdgeDemo.paused = paused

43+ }

44+

45+ function hideEdgeDemoInShell() {

46+ var user = LightDM.Users.data(greeter.currentIndex, LightDM.UserRoles.NameRole);

47+ AccountsService.setUserProperty(user, "demo-edges", false);

48+ d.showEdgeDemo = false;

49+ stopDemo();

50+ }

51+

52+ function hideEdgeDemoInGreeter() {

53+ // TODO: AccountsService.setUserProperty("lightdm", "demo-edges", false);

54+ d.showEdgeDemoInGreeter = false;

55+ }

56+

57+ function hideEdgeDemos() {

58+ hideEdgeDemoInGreeter();

59+ hideEdgeDemoInShell();

60+ }

61+

62+ function stopDemo() {

63+ launcherEnabled = true

64+ dashEnabled = true

65+ panelEnabled = true

66+ panelContentEnabled = true

67+ if (d.rightEdgeDemo) d.rightEdgeDemo.destroy()

68+ if (d.topEdgeDemo) d.topEdgeDemo.destroy()

69+ if (d.bottomEdgeDemo) d.bottomEdgeDemo.destroy()

70+ if (d.leftEdgeDemo) d.leftEdgeDemo.destroy()

71+ if (d.finalEdgeDemo) d.finalEdgeDemo.destroy()

72+ }

73+

74+ QtObject {

75+ id: d

76+ property Component overlay

77+ property QtObject rightEdgeDemo

78+ property QtObject topEdgeDemo

79+ property QtObject bottomEdgeDemo

80+ property QtObject leftEdgeDemo

81+ property QtObject finalEdgeDemo

82+ property bool showEdgeDemo: false

83+ property bool showEdgeDemoInGreeter: d.showEdgeDemo // TODO: AccountsService.getUserProperty("lightdm", "demo-edges")

84+

85+ onShowEdgeDemoInGreeterChanged: {

86+ if (!d.overlay && d.showEdgeDemoInGreeter) {

87+ d.overlay = Qt.createComponent("EdgeDemoOverlay.qml")

88+ startRightEdgeDemo()

89+ }

90+ }

91+ }

92+

93+ function startRightEdgeDemo() {

94+ launcherEnabled = false;

95+ demo.dashEnabled = false;

96+ demo.panelEnabled = false;

97+ demo.panelContentEnabled = false;

98+ if (demo.greeter) {

99+ d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {

100+ "edge": "right",

101+ "title": i18n.tr("Right edge"),

102+ "text": i18n.tr("Try swiping from the right edge to unlock the phone"),

103+ "anchors.fill": demo.greeter,

104+ });

105+ }

106+ if (d.rightEdgeDemo) {

107+ d.rightEdgeDemo.onSkip.connect(demo.hideEdgeDemos)

108+ } else {

109+ stopDemo();

110+ }

111+ }

112+

113+ Connections {

114+ target: demo.greeter

115+

116+ function hide() {

117+ if (d.rightEdgeDemo && d.rightEdgeDemo.available) {

118+ d.rightEdgeDemo.hide()

119+ hideEdgeDemoInGreeter()

120+ startTopEdgeDemo()

121+ }

122+ }

123+

124+ onUnlocked: hide()

125+ onShownChanged: if (!greeter.shown) hide()

126+

127+ onSelected: {

128+ var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole)

129+ d.showEdgeDemo = AccountsService.getUserProperty(user, "demo-edges")

130+ }

131+ }

132+

133+ function startTopEdgeDemo() {

134+ demo.panelEnabled = true;

135+ if (demo.dash && demo.underlay) {

136+ d.topEdgeDemo = d.overlay.createObject(demo.underlay, {

137+ "edge": "top",

138+ "title": i18n.tr("Top edge"),

139+ "text": i18n.tr("Try swiping from the top edge to access the indicators"),

140+ "anchors.fill": demo.dash,

141+ });

142+ }

143+ if (d.topEdgeDemo) {

144+ d.topEdgeDemo.onSkip.connect(demo.hideEdgeDemoInShell)

145+ } else {

146+ stopDemo();

147+ }

148+ }

149+

150+ Connections {

151+ target: demo.indicators

152+ onFullyOpenedChanged: {

153+ if (d.topEdgeDemo && d.topEdgeDemo.available && demo.indicators.fullyOpened) {

154+ d.topEdgeDemo.hideNow()

155+ startBottomEdgeDemo()

156+ }

157+ }

158+ }

159+

160+ function startBottomEdgeDemo() {

161+ if (demo.indicators) {

162+ d.bottomEdgeDemo = d.overlay.createObject(demo.indicators, {

163+ "edge": "bottom",

164+ "title": i18n.tr("Close"),

165+ "text": i18n.tr("Swipe up again to close the settings screen"),

166+ "anchors.fill": demo.indicators,

167+ });

168+ }

169+ if (d.bottomEdgeDemo) {

170+ d.bottomEdgeDemo.onSkip.connect(demo.hideEdgeDemoInShell)

171+ } else {

172+ stopDemo();

173+ }

174+ }

175+

176+ Connections {

177+ target: demo.indicators

178+ onPartiallyOpenedChanged: {

179+ if (d.bottomEdgeDemo && d.bottomEdgeDemo.available && !demo.indicators.partiallyOpened && !demo.indicators.fullyOpened) {

180+ d.bottomEdgeDemo.hideNow()

181+ startLeftEdgeDemo()

182+ }

183+ }

184+ }

185+

186+ function startLeftEdgeDemo() {

187+ demo.panelEnabled = false;

188+ demo.launcherEnabled = true;

189+ if (demo.dash && demo.underlay) {

190+ d.leftEdgeDemo = d.overlay.createObject(demo.underlay, {

191+ "edge": "left",

192+ "title": i18n.tr("Left edge"),

193+ "text": i18n.tr("Swipe from the left to reveal the launcher for quick access to apps"),

194+ "anchors.fill": demo.dash,

195+ });

196+ }

197+ if (d.leftEdgeDemo) {

198+ d.leftEdgeDemo.onSkip.connect(demo.hideEdgeDemoInShell)

199+ } else {

200+ stopDemo();

201+ }

202+ }

203+

204+ Connections {

205+ target: demo.launcher

206+ onStateChanged: {

207+ if (d.leftEdgeDemo && d.leftEdgeDemo.available && launcher.state == "visible") {

208+ d.leftEdgeDemo.hide()

209+ launcher.hide()

210+ startFinalEdgeDemo()

211+ }

212+ }

213+ }

214+

215+ function startFinalEdgeDemo() {

216+ demo.launcherEnabled = false;

217+ if (demo.dash && demo.underlay) {

218+ d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {

219+ "edge": "none",

220+ "title": i18n.tr("Well done"),

221+ "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap anywhere to start"),

222+ "anchors.fill": demo.dash,

223+ "showSkip": false,

224+ });

225+ }

226+ if (d.finalEdgeDemo) {

227+ d.finalEdgeDemo.onSkip.connect(demo.hideEdgeDemoInShell)

228+ } else {

229+ stopDemo();

230+ }

231+ }

232+}

Components/EdgeDemoOverlay.qmlnew file+261

@@ -0,0 +1,261 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import Powerd 0.1

18+import QtQuick 2.0

19+import QtGraphicalEffects 1.0

20+import Ubuntu.Application 0.1

21+import Ubuntu.Components 0.1

22+

23+Showable {

24+ id: overlay

25+

26+ /*

27+ * Valid values are "left", "right", "top", "bottom", or "none".

28+ */

29+ property string edge: "top"

30+

31+ /*

32+ * This is the header displayed, like "Right edge".

33+ */

34+ property alias title: titleLabel.text

35+

36+ /*

37+ * This is the block of text displayed below the header.

38+ */

39+ property alias text: textLabel.text

40+

41+ /*

42+ * This is the text for the skip button.

43+ */

44+ property alias skipText: skipLabel.text

45+

46+ /*

47+ * This is the visible status of the skip button.

48+ */

49+ property alias showSkip: skipLabel.visible

50+

51+ /*

52+ * Whether this demo is running currently.

53+ */

54+ readonly property bool active: available && visible

55+

56+ /*

57+ * Whether animations are paused.

58+ */

59+ property alias paused: wholeAnimation.paused

60+

61+ /*

62+ * Whether animations are running.

63+ */

64+ readonly property alias running: wholeAnimation.running

65+

66+ signal skip()

67+

68+ function doSkip() {

69+ d.skipOnHide = true;

70+ hide();

71+ }

72+

73+ function hideNow() {

74+ overlay.visible = false;

75+ overlay.available = false;

76+ if (d.skipOnHide) {

77+ overlay.skip();

78+ }

79+ }

80+

81+ showAnimation: StandardAnimation {

82+ property: "opacity"

83+ to: 1

84+ onRunningChanged: if (running) overlay.visible = true

85+ }

86+ hideAnimation: StandardAnimation {

87+ property: "opacity"

88+ to: 0

89+ duration: UbuntuAnimation.BriskDuration

90+ onRunningChanged: if (!running) overlay.hideNow()

91+ }

92+

93+ QtObject {

94+ id: d

95+ property bool skipOnHide: false

96+ property int edgeMargin: units.gu(4)

97+ }

98+

99+ Rectangle {

100+ objectName: "backgroundShade"

101+

102+ anchors.fill: parent

103+ color: "black"

104+ opacity: 0.8

105+ visible: overlay.active

106+

107+ MouseArea {

108+ anchors.fill: parent

109+ enabled: overlay.edge == "none" && overlay.opacity == 1.0

110+ onClicked: overlay.doSkip()

111+ }

112+ }

113+

114+ Item {

115+ id: hintGroup

116+ x: 0

117+ y: 0

118+ width: parent.width

119+ height: parent.height

120+ visible: overlay.active

121+

122+ Column {

123+ id: labelGroup

124+ layer.enabled: true // otherwise the underlining on "Skip intro" jumps

125+ spacing: units.gu(3)

126+

127+ anchors {

128+ margins: d.edgeMargin

129+ left: parent.left

130+ top: overlay.edge == "bottom" ? undefined : parent.top

131+ bottom: overlay.edge == "bottom" ? parent.bottom : undefined

132+ }

133+

134+ Label {

135+ id: titleLabel

136+ fontSize: "x-large"

137+ width: units.gu(25)

138+ wrapMode: Text.WordWrap

139+ }

140+

141+ Label {

142+ id: textLabel

143+ width: units.gu(25)

144+ wrapMode: Text.WordWrap

145+ }

146+

147+ Label {

148+ id: skipLabel

149+ objectName: "skipLabel"

150+ text: i18n.tr("Skip intro")

151+ color: UbuntuColors.orange

152+ fontSize: "small"

153+ font.underline: true

154+

155+ MouseArea {

156+ anchors.fill: parent

157+ onClicked: overlay.doSkip()

158+ }

159+ }

160+ }

161+

162+ LinearGradient {

163+ id: edgeHint

164+ property int size: 1

165+ cached: false

166+ visible: overlay.edge != "none"

167+ gradient: Gradient {

168+ GradientStop {

169+ position: 0.0

170+ color: Qt.hsla(16.0/360.0, 0.83, 0.47, 0.4) // UbuntuColors.orange, but transparent

171+ }

172+ GradientStop {

173+ position: 1.0

174+ color: "transparent"

175+ }

176+ }

177+ anchors.fill: parent

178+ start: {

179+ if (overlay.edge == "right") {

180+ return Qt.point(width, 0);

181+ } else if (overlay.edge == "left") {

182+ return Qt.point(0, 0);

183+ } else if (overlay.edge == "top") {

184+ return Qt.point(0, 0);

185+ } else {

186+ return Qt.point(0, height);

187+ }

188+ }

189+ end: {

190+ if (overlay.edge == "right") {

191+ return Qt.point(width - size, 0);

192+ } else if (overlay.edge == "left") {

193+ return Qt.point(size, 0);

194+ } else if (overlay.edge == "top") {

195+ return Qt.point(0, size);

196+ } else {

197+ return Qt.point(0, height - size);

198+ }

199+ }

200+ }

201+ }

202+

203+ SequentialAnimation {

204+ id: wholeAnimation

205+ objectName: "wholeAnimation"

206+ running: overlay.active

207+

208+ ParallelAnimation {

209+ id: fadeInAnimation

210+

211+ StandardAnimation {

212+ target: labelGroup

213+ property: {

214+ if (overlay.edge == "right" || overlay.edge == "left") {

215+ return "anchors.leftMargin";

216+ } else if (overlay.edge == "bottom") {

217+ return "anchors.bottomMargin";

218+ } else {

219+ return "anchors.topMargin";

220+ }

221+ }

222+ from: {

223+ if (overlay.edge == "right") {

224+ return d.edgeMargin + units.gu(3)

225+ } else {

226+ return d.edgeMargin - units.gu(3)

227+ }

228+ }

229+ to: d.edgeMargin

230+ duration: overlay.edge == "none" ? 0 : UbuntuAnimation.SleepyDuration

231+ }

232+ StandardAnimation {

233+ target: overlay

234+ property: "opacity"

235+ from: 0.0

236+ to: 1.0

237+ duration: UbuntuAnimation.SleepyDuration

238+ }

239+ }

240+

241+ SequentialAnimation {

242+ id: hintAnimation

243+ loops: Animation.Infinite

244+ property string prop: (overlay.edge == "left" || overlay.edge == "right") ? "x" : "y"

245+ property double endVal: units.dp(5) * ((overlay.edge == "left" || overlay.edge == "top") ? 1 : -1)

246+ property double maxGlow: units.dp(20)

247+ property int duration: overlay.edge == "none" ? 0 : UbuntuAnimation.SleepyDuration

248+

249+ ParallelAnimation {

250+ StandardAnimation { target: hintGroup; property: hintAnimation.prop; from: 0; to: hintAnimation.endVal; duration: hintAnimation.duration }

251+ StandardAnimation { target: edgeHint; property: "size"; from: 1; to: hintAnimation.maxGlow; duration: hintAnimation.duration }

252+ }

253+

254+ // Undo the above

255+ ParallelAnimation {

256+ StandardAnimation { target: hintGroup; property: hintAnimation.prop; from: hintAnimation.endVal; to: 0; duration: hintAnimation.duration }

257+ StandardAnimation { target: edgeHint; property: "size"; from: hintAnimation.maxGlow; to: 1; duration: hintAnimation.duration }

258+ }

259+ }

260+ }

261+}

Dash/Apps/FrequentlyUsedAppsModel.qml+38−8

@@ -18,23 +18,43 @@ import QtQuick 2.0

1818

1919ListModel {

2020 ListElement {

21− uri: "application:///usr/share/applications/camera-app.desktop"

22− icon: "../../graphics/applicationIcons/camera.png"

21+ uri: "application:///usr/share/applications/dialer-app.desktop"

22+ icon: "../../graphics/applicationIcons/phone-app.png"

2323 category: 0

2424 mimetype: "application/x-desktop"

25− title: "Camera"

25+ title: "Dialer"

2626 comment: ""

27− dndUri: "file:///usr/share/applications/camera-app.desktop"

27+ dndUri: "file:///usr/share/applications/dialer-app.desktop"

2828 metadata: ""

2929 }

3030 ListElement {

31− uri: "application:///usr/share/applications/phone-app.desktop"

32− icon: "../../graphics/applicationIcons/phone-app.png"

31+ uri: "application:///usr/share/applications/messaging-app.desktop"

32+ icon: "../../graphics/applicationIcons/messages-app.png"

33+ category: 0

34+ mimetype: "application/x-desktop"

35+ title: "Messaging"

36+ comment: ""

37+ dndUri: "file:///usr/share/applications/messaging-app.desktop"

38+ metadata: ""

39+ }

40+ ListElement {

41+ uri: "application:///usr/share/applications/address-book-app.desktop"

42+ icon: "../../graphics/applicationIcons/contacts-app.png"

43+ category: 0

44+ mimetype: "application/x-desktop"

45+ title: "Contacts"

46+ comment: ""

47+ dndUri: "file:///usr/share/applications/address-book-app.desktop"

48+ metadata: ""

49+ }

50+ ListElement {

51+ uri: "application:///usr/share/applications/camera-app.desktop"

52+ icon: "../../graphics/applicationIcons/camera.png"

3353 category: 0

3454 mimetype: "application/x-desktop"

35− title: "Phone"

55+ title: "Camera"

3656 comment: ""

37− dndUri: "file:///usr/share/applications/phone-app.desktop"

57+ dndUri: "file:///usr/share/applications/camera-app.desktop"

3858 metadata: ""

3959 }

4060 ListElement {

@@ -77,4 +97,14 @@ ListModel {

7797 dndUri: "file:///usr/share/applications/gmail-webapp.desktop"

7898 metadata: ""

7999 }

100+ ListElement {

101+ uri: "application:///usr/share/applications/ubuntu-system-settings.desktop"

102+ icon: "../../graphics/applicationIcons/system-settings.png"

103+ category: 0

104+ mimetype: "application/x-desktop"

105+ title: "System Settings"

106+ comment: ""

107+ dndUri: "file:///usr/share/applications/ubuntu-system-settings.desktop"

108+ metadata: ""

109+ }

80110}

Dash/DashBar.qml+2−3

@@ -83,9 +83,8 @@ Item {

8383 }

8484

8585 delegate:

86− Item {

87− signal clicked()

88−

86+ // FIXME: Use Panel's integrated trigger() once that works again.

87+ MouseArea {

8988 width: itemSize

9089 height: dashBar.height

9190 anchors.top: parent.top

Dash/GenericScopeView.qml+4−4

@@ -74,12 +74,12 @@ ScopeView {

7474 onLoaded: {

7575 if (source.toString().indexOf("Apps/RunningApplicationsGrid.qml") != -1) {

7676 // TODO: the running apps grid doesn't support standard scope results model yet

77− item.firstModel = results.firstModel

78− item.secondModel = results.secondModel

77+ item.firstModel = Qt.binding(function() { return results.firstModel })

78+ item.secondModel = Qt.binding(function() { return results.secondModel })

7979 } else {

80− item.model = results

80+ item.model = Qt.binding(function() { return results })

8181 }

82− item.objectName = categoryId

82+ item.objectName = Qt.binding(function() { return categoryId })

8383 if (item.expandable) {

8484 var shouldFilter = index != categoryView.expandedIndex;

8585 if (shouldFilter != item.filter) {

Greeter/Greeter.qml+6−2

@@ -44,6 +44,8 @@ Showable {

4444 readonly property bool rightTeaserPressed: greeterContentLoader.status == Loader.Ready &&

4545 greeterContentLoader.item.rightTeaserPressed

4646

47+ readonly property int currentIndex: greeterContentLoader.currentIndex

48+

4749 signal selected(int uid)

4850 signal unlocked(int uid)

4951

@@ -63,11 +65,13 @@ Showable {

6365

6466 source: required ? "GreeterContent.qml" : ""

6567

66−

6768 Connections {

6869 target: greeterContentLoader.item

6970

70− onSelected: greeter.selected(uid);

71+ onSelected: {

72+ greeter.selected(uid);

73+ greeterContentLoader.currentIndex = uid;

74+ }

7175 onUnlocked: greeter.unlocked(uid);

7276 }

7377 }

Greeter/GreeterContent.qml+8−1

@@ -23,7 +23,7 @@ MouseArea {

2323 id: root

2424 anchors.fill: parent

2525

26− property bool ready: wallpaper.status == Image.Ready

26+ property bool ready: wallpaper.source == "" || wallpaper.status == Image.Ready || wallpaper.status == Image.Error

2727 property bool leftTeaserPressed: teasingMouseArea.pressed &&

2828 teasingMouseArea.mouseX < teasingMouseArea.width / 2

2929 property bool rightTeaserPressed: teasingMouseArea.pressed &&

@@ -32,6 +32,13 @@ MouseArea {

3232 signal selected(int uid)

3333 signal unlocked(int uid)

3434

35+ Rectangle {

36+ // In case wallpaper fails to load

37+ id: wallpaperBackup

38+ anchors.fill: parent

39+ color: "black"

40+ }

41+

3542 CrossFadeImage {

3643 id: wallpaper

3744

Greeter/Infographics.qml+1−2

@@ -286,9 +286,8 @@ Item {

286286 objectName: "backgroundCircle"

287287

288288 anchors.fill: parent

289− opacity: 0.9

290289

291− source: "graphics/infographic_circle.png"

290+ source: "graphics/infographic_circle_back.png"

292291 }

293292

294293 Timer {

Greeter/Lockscreen.qml+8

@@ -53,7 +53,15 @@ Showable {

5353 pinPadLoader.resetting = false;

5454 }

5555

56+ Rectangle {

57+ // In case wallpaper fails to load or is undefined

58+ id: wallpaperBackup

59+ anchors.fill: parent

60+ color: "black"

61+ }

62+

5663 Image {

64+ id: wallpaper

5765 anchors.fill: parent

5866 source: root.required ? root.background : ""

5967 fillMode: Image.PreserveAspectCrop

Greeter/graphics/infographic_circle.pngdeleted

Binary file not shown.

Greeter/graphics/infographic_circle_back.pngnew file

Binary file not shown.

Launcher/Launcher.qml+1

@@ -145,6 +145,7 @@ Item {

145145 LauncherPanel {

146146 id: panel

147147 objectName: "launcherPanel"

148+ enabled: root.available

148149 width: root.panelWidth

149150 anchors {

150151 top: parent.top

Launcher/LauncherDelegate.qml+21−10

@@ -24,6 +24,7 @@ Item {

2424 property int count: -1

2525 property int progress: -1

2626 property bool highlighted: false

27+ property bool itemFocused: false

2728 property real maxAngle: 0

2829 property bool inverted: false

2930

@@ -43,24 +44,25 @@ Item {

4344 onCountChanged: shaderEffectSource.scheduleUpdate();

4445 onProgressChanged: shaderEffectSource.scheduleUpdate();

4546 onHighlightedChanged: shaderEffectSource.scheduleUpdate();

47+ onItemFocusedChanged: shaderEffectSource.scheduleUpdate();

4648

4749 Item {

4850 id: iconItem

49− width: parent.itemWidth

50− height: parent.itemHeight

51+ width: parent.itemWidth + units.gu(1)

52+ height: parent.itemHeight + units.gu(1)

5153 anchors.centerIn: parent

5254

5355 UbuntuShape {

5456 id: iconShape

5557 anchors.fill: parent

56− anchors.margins: units.gu(0.5)

58+ anchors.margins: units.gu(1)

5759 radius: "medium"

5860

5961 image: Image {

6062 id: iconImage

6163 sourceSize.width: iconShape.width

6264 sourceSize.height: iconShape.height

63− source: "../graphics/applicationIcons/" + root.iconName + ".png"

65+ source: root.iconName

6466 }

6567 }

6668

@@ -78,7 +80,7 @@ Item {

7880 anchors {

7981 right: parent.right

8082 top: parent.top

81− margins: -units.dp(1)

83+ margins: units.dp(3)

8284 }

8385 width: Math.min(root.itemWidth, Math.max(units.gu(3), countLabel.implicitWidth + units.gu(2.5)))

8486 height: units.gu(3)

@@ -105,9 +107,9 @@ Item {

105107 left: iconItem.left

106108 right: iconItem.right

107109 bottom: iconItem.bottom

108− leftMargin: units.gu(0.5)

109− rightMargin: units.gu(0.5)

110− bottomMargin: units.gu(0.5)

110+ leftMargin: units.gu(1)

111+ rightMargin: units.gu(1)

112+ bottomMargin: units.gu(1)

111113 }

112114 height: units.gu(1.5)

113115 visible: root.progress > -1

@@ -136,14 +138,23 @@ Item {

136138 }

137139 }

138140 }

141+ Image {

142+ objectName: "focusedHighlight"

143+ anchors {

144+ right: parent.right

145+ verticalCenter: parent.verticalCenter

146+ }

147+ visible: root.itemFocused

148+ source: "graphics/focused_app_arrow.png"

149+ }

139150 }

140151

141152 ShaderEffect {

142153 id: transformEffect

143154 anchors.centerIn: parent

144155 anchors.verticalCenterOffset: root.offset

145− width: parent.itemWidth

146− height: parent.itemHeight

156+ width: iconItem.width

157+ height: iconItem.height

147158 property real itemOpacity: root.itemOpacity

148159 property real brightness: Math.max(-1, root.brightness)

149160 property real angle: root.angle

Launcher/LauncherPanel.qml+23−3

@@ -50,8 +50,6 @@ Item {

5050 id: mainColumn

5151 anchors {

5252 fill: parent

53− leftMargin: units.gu(0.5)

54− rightMargin: units.gu(0.5)

5553 }

5654

5755 MouseArea {

@@ -94,6 +92,8 @@ Item {

9492 fill: parent

9593 topMargin: -extensionSize + units.gu(0.5)

9694 bottomMargin: -extensionSize + units.gu(1)

95+ leftMargin: units.gu(0.5)

96+ rightMargin: units.gu(0.5)

9797 }

9898 topMargin: extensionSize

9999 bottomMargin: extensionSize

@@ -110,7 +110,20 @@ Item {

110110 // destroyed when dragging them outside the list. This needs to be at least

111111 // itemHeight to prevent folded items from disappearing and DragArea limits

112112 // need to be smaller than this size to avoid breakage.

113− property int extensionSize: itemHeight * 3

113+ property int extensionSize: 0

114+

115+ // Setting extensionSize after the list has been populated because it has

116+ // the potential to mess up with the intial positioning in combination

117+ // with snapping to the center of the list. This catches all the cases

118+ // where the item would be outside the list for more than itemHeight / 2.

119+ // For the rest, give it a flick to scroll to the beginning. Note that

120+ // the flicking alone isn't enough because in some cases it's not strong

121+ // enough to overcome the snapping.

122+ // https://bugreports.qt-project.org/browse/QTBUG-32251

123+ Component.onCompleted: {

124+ extensionSize = itemHeight * 3

125+ flick(0, clickFlickSpeed)

126+ }

114127

115128 // The height of the area where icons start getting folded

116129 property int foldingStartHeight: units.gu(6.5)

@@ -143,6 +156,7 @@ Item {

143156 iconName: model.icon

144157 count: model.count

145158 progress: model.progress

159+ itemFocused: model.focused

146160 inverted: root.inverted

147161 z: -Math.abs(offset)

148162 maxAngle: 55

@@ -499,6 +513,12 @@ Item {

499513 objectName: "quickListEntry" + index

500514 text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")

501515 highlightWhenPressed: model.clickable

516+

517+ // FIXME: This is a workaround for the theme not being context sensitive. I.e. the

518+ // ListItems don't know that they are sitting in a themed Popover where the color

519+ // needs to be inverted.

520+ __foregroundColor: Theme.palette.selected.backgroundText

521+

502522 onClicked: {

503523 if (!model.clickable) {

504524 return;

Launcher/graphics/focused_app_arrow@30.pngnew file

Binary file not shown.

Panel/Indicators.qml+4−2

@@ -34,6 +34,7 @@ Showable {

3434 property bool fullyOpened: height == openedHeight

3535 property bool partiallyOpened: height > panelHeight && !fullyOpened

3636 property real visualBottom: Math.max(y+height, y+indicatorRow.y+indicatorRow.height)

37+ property bool contentEnabled: true

3738

3839 // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to

3940 // use its own values. Need to ask design about this.

@@ -178,6 +179,7 @@ Showable {

178179 indicatorsModel: indicatorsModel

179180 clip: !indicators.fullyOpened

180181 activeHeader: indicators.state == "hint" || indicators.state == "reveal"

182+ enabled: contentEnabled

181183 visibleIndicators: indicatorRow.visibleIndicators

182184

183185 Connections {

@@ -316,7 +318,7 @@ Showable {

316318 anchors.right: parent.right

317319 height: panelHeight

318320 direction: Direction.Downwards

319− enabled: !indicators.shown

321+ enabled: !indicators.shown && indicators.available

320322 hintDisplacement: pinnedMode ? indicators.hintValue : 0

321323 autoCompleteDragThreshold: maxTotalDragDistance / 2

322324 stretch: true

@@ -333,7 +335,7 @@ Showable {

333335 id: hideDragHandle

334336 anchors.fill: handle

335337 direction: Direction.Upwards

336− enabled: indicators.shown

338+ enabled: indicators.shown && indicators.available

337339 hintDisplacement: indicators.hintValue

338340 autoCompleteDragThreshold: maxTotalDragDistance / 6

339341 stretch: true

Panel/Indicators/DefaultIndicatorWidget.qml+1−1

@@ -24,7 +24,7 @@ import Unity.IndicatorsLegacy 0.1 as Indicators

2424Indicators.IndicatorWidget {

2525 id: indicatorWidget

2626

27− width: itemRow.width + units.gu(1)

27+ width: itemRow.width + units.gu(0.5)

2828

2929 property alias label: itemLabel.text

3030 property alias iconSource: itemImage.source

Panel/Indicators/DefaultIndicatorWidget2.qml+43−16

@@ -24,10 +24,11 @@ import Unity.Indicators 0.1 as Indicators

2424Indicators.IndicatorWidget {

2525 id: indicatorWidget

2626

27− width: itemRow.width + units.gu(1)

27+ width: itemRow.width + units.gu(0.5)

2828

29− property alias label: itemLabel.text

30− property alias iconSource: itemImage.source

29+ property alias leftLabel: itemLeftLabel.text

30+ property alias rightLabel: itemRightLabel.text

31+ property var icons: undefined

3132

3233 Row {

3334 id: itemRow

@@ -39,19 +40,43 @@ Indicators.IndicatorWidget {

3940 }

4041 spacing: units.gu(0.5)

4142

42− // FIXME : Should us Ubuntu.Icon . results in low res images

43− Image {

44− id: itemImage

45− objectName: "itemImage"

46− visible: source != ""

47− height: indicatorWidget.iconSize

48− width: indicatorWidget.iconSize

43+ Label {

44+ id: itemLeftLabel

45+ objectName: "leftLabel"

46+ color: Theme.palette.selected.backgroundText

47+ opacity: 0.8

48+ font.family: "Ubuntu"

49+ fontSize: "medium"

4950 anchors.verticalCenter: parent.verticalCenter

51+ visible: text != ""

52+ }

53+

54+ Row {

55+ width: childrenRect.width

56+ anchors {

57+ top: parent.top

58+ bottom: parent.bottom

59+ }

60+ spacing: units.gu(0.5)

61+

62+ Repeater {

63+ model: indicatorWidget.icons

64+

65+ Image {

66+ id: itemImage

67+ objectName: "itemImage"

68+ visible: source != ""

69+ source: modelData

70+ height: indicatorWidget.iconSize

71+ width: indicatorWidget.iconSize

72+ anchors.verticalCenter: parent.verticalCenter

73+ }

74+ }

5075 }

5176

5277 Label {

53− id: itemLabel

54− objectName: "itemLabel"

78+ id: itemRightLabel

79+ objectName: "rightLabel"

5580 color: Theme.palette.selected.backgroundText

5681 opacity: 0.8

5782 font.family: "Ubuntu"

@@ -63,14 +88,16 @@ Indicators.IndicatorWidget {

6388

6489 onActionStateChanged: {

6590 if (actionState == undefined) {

66− label = "";

67− iconSource = "";

91+ leftLabel = "";

92+ rightLabel = "";

93+ icons = undefined;

6894 enabled = false;

6995 return;

7096 }

7197

72− label = actionState.label;

73− iconSource = actionState.icon;

98+ leftLabel = actionState.leftLabel ? actionState.leftLabel : "";

99+ rightLabel = actionState.rightLabel ? actionState.rightLabel : "";

100+ icons = actionState.icons;

74101 enabled = actionState.visible;

75102 }

76103}

Panel/Indicators/NetworkIndicatorWidget.qml+1−1

@@ -24,7 +24,7 @@ import Unity.IndicatorsLegacy 0.1 as Indicators

2424Indicators.IndicatorWidget {

2525 id: indicatorWidget

2626

27− width: networkIcon.width + units.gu(1)

27+ width: networkIcon.width + units.gu(0.5)

2828

2929 property int signalStrength: 0

3030 property int connectionState: Indicators.NetworkConnection.Initial

Shell.qml+39−3

@@ -19,6 +19,7 @@ import GSettings 1.0

1919import Ubuntu.Application 0.1

2020import Ubuntu.Components 0.1

2121import Ubuntu.Gestures 0.1

22+import Unity.Launcher 0.1

2223import LightDM 0.1 as LightDM

2324import Powerd 0.1

2425import "Dash"

@@ -94,6 +95,15 @@ FocusScope {

9495 greeter.hide();

9596 shell.activateApplication(desktopFile);

9697 }

98+

99+ onMainStageFocusedApplicationChanged: {

100+ var app = applicationManager.mainStageFocusedApplication

101+ if (app != null) {

102+ LauncherModel.applicationFocused(app.desktopFile);

103+ } else {

104+ LauncherModel.applicationFocused("");

105+ }

106+ }

97107 }

98108

99109 function activateApplication(desktopFile, argument) {

@@ -195,7 +205,7 @@ FocusScope {

195205 available: !greeter.shown && !lockscreen.shown

196206 hides: [stages, launcher, panel.indicators]

197207 shown: disappearingAnimationProgress !== 1.0

198− enabled: disappearingAnimationProgress === 0.0

208+ enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled

199209 // FIXME: unfocus all applications when going back to the dash

200210 onEnabledChanged: {

201211 if (enabled) {

@@ -386,6 +396,7 @@ FocusScope {

386396

387397 width: shell.edgeSize

388398 direction: Direction.Leftwards

399+ enabled: edgeDemo.dashEnabled

389400 property bool haveApps: mainStage.applications.count > 0 || sideStage.applications.count > 0

390401

391402 maxTotalDragDistance: haveApps ? parent.width : parent.width * 0.7

@@ -414,6 +425,7 @@ FocusScope {

414425 Component.onCompleted: {

415426 if (LightDM.Users.count == 1) {

416427 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))

428+ greeter.selected(0)

417429 }

418430 }

419431 }

@@ -456,12 +468,18 @@ FocusScope {

456468 // If there are more users, the Greeter will handle that

457469 if (LightDM.Users.count == 1) {

458470 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));

471+ greeter.selected(0);

459472 }

460473 greeter.forceActiveFocus();

461474 }

462475 }

463476

464477 onUnlocked: greeter.hide()

478+ onSelected: {

479+ // Update launcher items for new user

480+ var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);

481+ LauncherModel.setUser(user);

482+ }

465483

466484 onLeftTeaserPressedChanged: {

467485 if (leftTeaserPressed) {

@@ -510,6 +528,13 @@ FocusScope {

510528 } else if (status == Powerd.On) {

511529 powerConnection.setFocused(true);

512530 }

531+

532+ // No reason to chew demo CPU when user isn't watching

533+ if (status == Powerd.Off) {

534+ edgeDemo.paused = true;

535+ } else if (status == Powerd.On) {

536+ edgeDemo.paused = false;

537+ }

513538 }

514539 }

515540

@@ -524,6 +549,8 @@ FocusScope {

524549 indicatorsMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width

525550 indicators {

526551 hides: [launcher]

552+ available: edgeDemo.panelEnabled

553+ contentEnabled: edgeDemo.panelContentEnabled

527554 }

528555 fullscreenMode: shell.fullscreenMode

529556 searchVisible: !greeter.shown && !lockscreen.shown

@@ -540,7 +567,7 @@ FocusScope {

540567 width: parent.width > units.gu(60) ? units.gu(40) : parent.width

541568 height: parent.height

542569

543− available: !greeter.shown && !panel.indicators.shown && !lockscreen.shown

570+ available: !greeter.shown && !panel.indicators.shown && !lockscreen.shown && edgeDemo.dashEnabled

544571 shown: false

545572 showAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: 0; easing.type: Easing.Linear }

546573 hideAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: hudRevealer.closedValue; easing.type: Easing.Linear }

@@ -598,7 +625,7 @@ FocusScope {

598625 anchors.bottom: parent.bottom

599626 width: parent.width

600627 dragAreaWidth: shell.edgeSize

601− available: !greeter.shown || greeter.narrowMode

628+ available: (!greeter.shown || greeter.narrowMode) && edgeDemo.launcherEnabled

602629 onDashItemSelected: {

603630 greeter.hide()

604631 // Animate if moving between application and dash

@@ -707,4 +734,13 @@ FocusScope {

707734 rotation: -45

708735 scale: Math.min(parent.width, parent.height) / width

709736 }

737+

738+ EdgeDemo {

739+ id: edgeDemo

740+ greeter: greeter

741+ launcher: launcher

742+ dash: dash

743+ indicators: panel.indicators

744+ underlay: underlay

745+ }

710746}

build+9

@@ -57,6 +57,15 @@ mk_build_deps() {

5757 [ ! -f unity8-build-deps*deb -o $CODE_DIR/debian/control -nt unity8-build-deps*deb ] && mk-build-deps --install --root-cmd sudo $CODE_DIR/debian/control

5858}

5959

60+if [ -f "/usr/bin/ccache" ] ; then

61+ if [ "x$CC" = "x" ]; then

62+ export CC='ccache gcc'

63+ fi

64+ if [ "x$CXX" = "x" ] ; then

65+ export CXX='ccache g++'

66+ fi

67+fi

68+

6069if [ -f "/usr/bin/ninja" ] ; then

6170 GENERATOR="-G Ninja"

6271 # Ninja does not need -j, it parallelizes automatically.

debian/changelog+142

@@ -1,3 +1,145 @@

1+unity8 (7.81.3+13.10.20130905.2-0ubuntu1) saucy; urgency=low

3+ [ Michael Zanetti ]

4+ * Integrate Launcher with AppManager.

6+ [ Nick Dedekind ]

7+ * Removed FIXME from slider int->double conversion.

9+ [ Ubuntu daily release ]

10+ * Automatic snapshot from revision 291

11+

12+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 05 Sep 2013 10:48:02 +0000

13+

14+unity8 (7.81.3+13.10.20130904.1-0ubuntu1) saucy; urgency=low

15+

16+ [ Nicolas d'Offay ]

17+ * Switched infographic background at design's request.

18+

19+ [ Ubuntu daily release ]

20+ * Automatic snapshot from revision 287

21+

22+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 04 Sep 2013 07:34:57 +0000

23+

24+unity8 (7.81.3+13.10.20130904-0ubuntu1) saucy; urgency=low

25+

26+ [ mhall119 ]

27+ * Add a little bit of text to the last step of the tour telling the

28+ user how to end it and get to their phone.

29+

30+ [ Jussi Pakkanen ]

31+ * Use CCache if it is installed.

32+

33+ [ Nick Dedekind ]

34+ * Multiple icon/label support for indicators.

35+

36+ [ Albert Astals ]

37+ * Remove unneeded role.

38+

39+ [ Lars Uebernickel ]

40+ * Fall back to "ubuntu-mobile" icon theme if $UBUNTU_ICON_THEME is

41+ unset.

42+

43+ [ Michael Zanetti ]

44+ * Use MouseAreas in DashBar to enable clicking again.

45+ * load launcher default config from existing dconf key.

46+

47+ [ Ubuntu daily release ]

48+ * Automatic snapshot from revision 285

49+

50+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 04 Sep 2013 03:02:57 +0000

51+

52+unity8 (7.81.3+13.10.20130903.1-0ubuntu1) saucy; urgency=low

53+

54+ [ Michael Zanetti ]

55+ * workaround quicklist text color.

56+

57+ [ Ubuntu daily release ]

58+ * Automatic snapshot from revision 277

59+

60+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 03 Sep 2013 06:09:36 +0000

61+

62+unity8 (7.81.3+13.10.20130830-0ubuntu1) saucy; urgency=low

63+

64+ [ Pawel Stolowski ]

65+ * Implement a virtual 'All' filter option.

66+

67+ [ Ubuntu daily release ]

68+ * Automatic snapshot from revision 275

69+

70+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 30 Aug 2013 12:44:40 +0000

71+

72+unity8 (7.81.3+13.10.20130829.2-0ubuntu1) saucy; urgency=low

73+

74+ [ Michael Terry ]

75+ * Implement launcher item backend via AccountsService.

76+

77+ [ Ubuntu daily release ]

78+ * Automatic snapshot from revision 272

79+

80+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 29 Aug 2013 19:09:44 +0000

81+

82+unity8 (7.81.3+13.10.20130829.1-0ubuntu1) saucy; urgency=low

83+

84+ [ Michael Terry ]

85+ * Make sure greeter and lockscreen backgrounds are always defined,

86+ even if the wallpaper preference string is bogus. (LP: #1208889,

87+ #1208894)

88+

89+ [ Ubuntu daily release ]

90+ * Automatic snapshot from revision 270

91+

92+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 29 Aug 2013 11:09:43 +0000

93+

94+unity8 (7.81.3+13.10.20130829-0ubuntu1) saucy; urgency=low

95+

96+ [ Andrea Cimitan ]

97+ * Streamline some new HUD interactions to be more consistent with the

98+ Unity Launcher.

99+

100+ [ Michael Zanetti ]

101+ * setting the launcher's extensionSize delayed to position the view

102+ correctly at the beginning .

103+

104+ [ Bill Filler ]

105+ * add new telephony apps (dialer, messaging, contacts) to launcher and

106+ Home scope.

107+

108+ [ Michael Terry ]

109+ * Implement edge demos on first boot. Build-Depends: +dbus-test-

110+ runner, +qtbase5-dev-tools.

111+

112+ [ Ubuntu daily release ]

113+ * Automatic snapshot from revision 267

114+

115+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 29 Aug 2013 02:10:38 +0000

116+

117+unity8 (7.81.3+13.10.20130828.1-0ubuntu1) saucy; urgency=low

118+

119+ [ Andrea Cimitan ]

120+ * Hide the LauncherPanel when it's really hidden, by changing visible

121+ to false.

122+

123+ [ Gerry Boland ]

124+ * Fix sidestage applications - they were being ignored in the show-

125+ application-surface logic. (LP: #1217027, #1210079)

126+

127+ [ Michał Sawicz ]

128+ * Raise the exception if typing failed in autopilot.

129+

130+ [ Nick Dedekind ]

131+ * Added location indicator defaults.

132+

133+ [ Michael Zanetti ]

134+ * increase minimal dragging width for dismissing apps with left edge

135+ make it a configurable parameter and adjust animation to look like

136+ requested in the bug report . (LP: #1213153)

137+

138+ [ Ubuntu daily release ]

139+ * Automatic snapshot from revision 262

140+

141+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 28 Aug 2013 11:55:46 +0000

142+

1143unity8 (7.81.3+13.10.20130827.1-0ubuntu1) saucy; urgency=low

2144

3145 [ Michael Zanetti ]

debian/control+3

@@ -3,11 +3,13 @@ Section: x11

33Priority: optional

44Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>

55Build-Depends: cmake,

6+ dbus-test-runner,

67 debhelper (>= 9),

78 libdee-qt5-dev (>= 3.2),

89 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],

910 libgl1-mesa-dri,

1011 libgles2-mesa-dev[armhf],

12+ libgsettings-qt-dev,

1113 libhud-client2-dev,

1214 libjson-perl,

1315 libnih-dbus-dev,

@@ -31,6 +33,7 @@ Build-Depends: cmake,

3133 python3:any,

3234 qt5-default,

3335 qtbase5-dev,

36+ qtbase5-dev-tools,

3437 qtbase5-private-dev,

3538 qtdeclarative5-dev,

3639 qtdeclarative5-dev-tools,

debian/rules+5

@@ -16,6 +16,11 @@ override_dh_auto_clean:

1616 dh_auto_clean

1717 rm -rf builddir

1818

19+override_dh_auto_configure:

20+ # Debian defines CMAKE_INSTALL_LOCALSTATEDIR as /usr/var, which is wrong.

21+ # So until Debian bug 719148 is fixed, do it ourselves.

22+ dh_auto_configure -- -DCMAKE_INSTALL_LOCALSTATEDIR="/var"

23+

1924override_dh_install:

2025 # install autopilot tests

2126 cd tests/autopilot; \

debian/unity8-private.install+5

@@ -1,3 +1,4 @@

1+usr/lib/*/unity8/qml/AccountsService

12usr/lib/*/unity8/qml/HudClient

23usr/lib/*/unity8/qml/LightDM

34usr/lib/*/unity8/qml/ListViewWithPageHeader

@@ -5,3 +6,7 @@ usr/lib/*/unity8/qml/Powerd

56usr/lib/*/unity8/qml/Ubuntu

67usr/lib/*/unity8/qml/Unity

78usr/lib/*/unity8/qml/Utils

9+usr/share/accountsservice/interfaces

10+usr/share/dbus-1/interfaces

11+usr/share/polkit-1

12+var/lib/polkit-1

graphics/applicationIcons/contacts-app@18.pngnew file

Binary file not shown.

graphics/applicationIcons/messages-app@18.pngnew file

Binary file not shown.

graphics/applicationIcons/system-settings@18.pngnew file

Binary file not shown.

main.cpp+3−2

@@ -65,9 +65,10 @@ void appendImportPaths(QQmlEngine *engine, const QStringList &paths)

6565

6666void resolveIconTheme() {

6767 const char *ubuntuIconTheme = getenv("UBUNTU_ICON_THEME");

68− if (ubuntuIconTheme != NULL) {

69− QIcon::setThemeName(ubuntuIconTheme);

68+ if (ubuntuIconTheme == NULL) {

69+ ubuntuIconTheme = "ubuntu-mobile";

7070 }

71+ QIcon::setThemeName(ubuntuIconTheme);

7172}

7273} // namespace {

7374

plugins/AccountsService/50-com.canonical.unity.AccountsService.pklanew file+6

@@ -0,0 +1,6 @@

1+[Allow LightDM to set Unity AccountsService fields]

2+Identity=unix-user:lightdm

3+Action=com.canonical.unity.AccountsService.ModifyAnyUser

4+ResultActive=yes

5+ResultInactive=yes

6+ResultAny=yes

plugins/AccountsService/AccountsService.cppnew file+74

@@ -0,0 +1,74 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Author: Michael Terry <michael.terry@canonical.com>

17+ */

18+

19+#include "AccountsService.h"

20+#include <QDBusConnection>

21+#include <QDBusConnectionInterface>

22+#include <QDBusMessage>

23+#include <QDBusVariant>

24+

25+AccountsService::AccountsService(QObject* parent)

26+ : QObject(parent),

27+ accounts_manager(NULL),

28+ users()

29+{

30+ auto connection = QDBusConnection::SM_BUSNAME();

31+ auto interface = connection.interface();

32+ interface->startService("org.freedesktop.Accounts");

33+ accounts_manager = new QDBusInterface("org.freedesktop.Accounts",

34+ "/org/freedesktop/Accounts",

35+ "org.freedesktop.Accounts",

36+ connection, this);

37+}

38+

39+QVariant AccountsService::getUserProperty(const QString &user, const QString &property)

40+{

41+ auto iface = getUserInterface(user);

42+ if (iface != nullptr && iface->isValid()) {

43+ auto answer = iface->call("Get", "com.canonical.unity.AccountsService", property);

44+ if (answer.type() == QDBusMessage::ReplyMessage) {

45+ return answer.arguments()[0].value<QDBusVariant>().variant();

46+ }

47+ }

48+ return QVariant();

49+}

50+

51+void AccountsService::setUserProperty(const QString &user, const QString &property, const QVariant &value)

52+{

53+ auto iface = getUserInterface(user);

54+ if (iface != nullptr && iface->isValid()) {

55+ // The value needs to be carefully wrapped

56+ iface->call("Set", "com.canonical.unity.AccountsService", property, QVariant::fromValue(QDBusVariant(value)));

57+ }

58+}

59+

60+QDBusInterface *AccountsService::getUserInterface(const QString &user)

61+{

62+ auto iface = users.value(user);

63+ if (iface == nullptr && accounts_manager->isValid()) {

64+ auto answer = accounts_manager->call("FindUserByName", user);

65+ if (answer.type() == QDBusMessage::ReplyMessage) {

66+ iface = new QDBusInterface("org.freedesktop.Accounts",

67+ answer.arguments()[0].value<QDBusObjectPath>().path(),

68+ "org.freedesktop.DBus.Properties",

69+ accounts_manager->connection(), this);

70+ users.insert(user, iface);

71+ }

72+ }

73+ return iface;

74+}

plugins/AccountsService/AccountsService.hnew file+44

@@ -0,0 +1,44 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors: Michael Terry <michael.terry@canonical.com>

17+ */

18+

19+#ifndef UNITY_ACCOUNTSSERVICE_H

20+#define UNITY_ACCOUNTSSERVICE_H

21+

22+#include <QDBusInterface>

23+#include <QMap>

24+#include <QObject>

25+#include <QString>

26+

27+class AccountsService: public QObject

28+{

29+ Q_OBJECT

30+

31+public:

32+ explicit AccountsService(QObject *parent = 0);

33+

34+ Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &property);

35+ Q_INVOKABLE void setUserProperty(const QString &user, const QString &property, const QVariant &value);

36+

37+private:

38+ QDBusInterface *getUserInterface(const QString &user);

39+

40+ QDBusInterface *accounts_manager;

41+ QMap<QString, QDBusInterface *> users;

42+};

43+

44+#endif

plugins/AccountsService/CMakeLists.txtnew file+36

@@ -0,0 +1,36 @@

1+include(Plugins)

3+add_definitions(-DSM_BUSNAME=systemBus)

5+add_library(AccountsService-qml MODULE

6+ AccountsService.cpp

7+ plugin.cpp

8+ )

10+qt5_use_modules(AccountsService-qml DBus Qml)

11+

12+export_qmlfiles(AccountsService AccountsService)

13+export_qmlplugin(AccountsService 0.1 AccountsService TARGETS AccountsService-qml)

14+

15+set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")

16+set(POLKIT_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1")

17+set(DBUS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces")

18+set(ACCOUNTS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/accountsservice/interfaces")

19+

20+install(FILES com.canonical.unity.AccountsService.xml

21+ DESTINATION "${DBUS_IFACE_DIR}"

22+ )

23+

24+# Create accountsservice symlink for above dbus interface

25+install(CODE "

26+execute_process(COMMAND mkdir -p \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")

27+execute_process(COMMAND ln -sf ../../dbus-1/interfaces/com.canonical.unity.AccountsService.xml \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")

28+ ")

29+

30+install(FILES com.canonical.unity.AccountsService.policy

31+ DESTINATION "${POLKIT_DATA_DIR}/actions"

32+ )

33+

34+install(FILES 50-com.canonical.unity.AccountsService.pkla

35+ DESTINATION "${POLKIT_LIB_DIR}/localauthority/10-vendor.d"

36+ )

plugins/AccountsService/com.canonical.unity.AccountsService.policynew file+24

@@ -0,0 +1,24 @@

1+<?xml version="1.0" encoding="UTF-8"?>

3+<policyconfig>

4+ <action id="com.canonical.unity.AccountsService.ModifyOwnUser">

5+ <description>Set properties of own user</description>

6+ <message>Authentication is required to set one's own unity properties.</message>

7+ <defaults>

8+ <allow_any>yes</allow_any>

9+ <allow_inactive>yes</allow_inactive>

10+ <allow_active>yes</allow_active>

11+ </defaults>

12+ </action>

13+

14+ <action id="com.canonical.unity.AccountsService.ModifyAnyUser">

15+ <description>Set properties of any user</description>

16+ <message>Authentication is required to set another user's unity

17+properties.</message>

18+ <defaults>

19+ <allow_any>no</allow_any>

20+ <allow_inactive>no</allow_inactive>

21+ <allow_active>no</allow_active>

22+ </defaults>

23+ </action>

24+</policyconfig>

plugins/AccountsService/com.canonical.unity.AccountsService.xmlnew file+24

@@ -0,0 +1,24 @@

1+<node>

2+ <interface name="com.canonical.unity.AccountsService">

4+ <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>

6+ <annotation name="org.freedesktop.Accounts.Authentication.ChangeOwn"

7+ value="com.canonical.unity.AccountsService.ModifyOwnUser"/>

9+ <annotation name="org.freedesktop.Accounts.Authentication.ReadAny"

10+ value="com.canonical.unity.AccountsService.ModifyAnyUser"/>

11+

12+ <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"

13+ value="com.canonical.unity.AccountsService.ModifyAnyUser"/>

14+

15+ <property name="demo-edges" type="b" access="readwrite">

16+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>

17+ </property>

18+

19+ <property name="launcher-items" type="aa{sv}" access="readwrite">

20+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>

21+ </property>

22+

23+ </interface>

24+</node>

plugins/AccountsService/plugin.cppnew file+37

@@ -0,0 +1,37 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors: Michael Terry <michael.terry@canonical.com>

17+ */

18+

19+#include "plugin.h"

20+#include "AccountsService.h"

21+

22+#include <QDBusMetaType>

23+#include <QtQml>

24+

25+static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

26+{

27+ Q_UNUSED(engine)

28+ Q_UNUSED(scriptEngine)

29+ return new AccountsService();

30+}

31+

32+void AccountsServicePlugin::registerTypes(const char *uri)

33+{

34+ Q_ASSERT(uri == QLatin1String("AccountsService"));

35+ qDBusRegisterMetaType<QList<QVariantMap>>();

36+ qmlRegisterSingletonType<AccountsService>(uri, 0, 1, "AccountsService", service_provider);

37+}

plugins/AccountsService/plugin.hnew file+34

@@ -0,0 +1,34 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors: Michael Terry <michael.terry@canonical.com>

17+ */

18+

19+#ifndef ACCOUNTSSERVICE_PLUGIN_H

20+#define ACCOUNTSSERVICE_PLUGIN_H

21+

22+#include <QQmlEngine>

23+#include <QQmlExtensionPlugin>

24+

25+class AccountsServicePlugin : public QQmlExtensionPlugin

26+{

27+ Q_OBJECT

28+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

29+

30+public:

31+ void registerTypes(const char *uri);

32+};

33+

34+#endif

plugins/AccountsService/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module AccountsService

2+plugin AccountsService-qml

3+typeinfo plugin.qmltypes

plugins/CMakeLists.txt+4−3

@@ -1,7 +1,8 @@

1−add_subdirectory(Ubuntu)

2−add_subdirectory(Utils)

3−add_subdirectory(Unity)

1+add_subdirectory(AccountsService)

42add_subdirectory(HudClient)

53add_subdirectory(LightDM)

64add_subdirectory(ListViewWithPageHeader)

75add_subdirectory(Powerd)

6+add_subdirectory(Ubuntu)

7+add_subdirectory(Unity)

8+add_subdirectory(Utils)

plugins/Unity/CMakeLists.txt+1

@@ -43,6 +43,7 @@ set(QMLPLUGIN_SRC

4343 preview.cpp

4444 previewaction.cpp

4545 previewinfohint.cpp

46+ showallfilteroption.cpp

4647 signalslist.cpp

4748 socialpreview.cpp

4849 socialpreviewcomment.cpp

plugins/Unity/Indicators/qml/MenuItemFactory.qml+1−16

@@ -73,23 +73,8 @@ Item {

7373 'max-icon': 'icon'});

7474 }

7575

76− // FIXME: The interval should be [0.0 - 1.0]. Unfortunately, when

77− // reaching the boundaries (0.0 or 1.0), the value is converted

78− // to an integer when automatically wrapped in a variant when

79− // passed to QStateAction::updateState(…). The server chokes on

80− // those values, complaining that they’re not of the right type…

8176 onChangeState: {

82− if (value == Math.round(value)) {

83− if (value >= maximumValue) {

84− model.changeState(modelIndex, maximumValue - 0.000001);

85− } else if (value <= minimumValue) {

86− model.changeState(modelIndex, minimumValue + 0.000001);

87− } else {

88− model.changeState(modelIndex, value * 1.000001);

89− }

90− } else {

91− model.changeState(modelIndex, value);

92− }

77+ model.changeState(modelIndex, value);

9378 }

9479 }

9580 }

plugins/Unity/Indicators/rootactionstate.cpp+44−14

@@ -108,25 +108,32 @@ bool RootActionState::isValid() const

108108 return m_menu && m_menu->rowCount() > 0;

109109}

110110

111−QString RootActionState::label() const

111+QString RootActionState::leftLabel() const

112112{

113113 if (!isValid()) return QString();

114114

115− return m_cachedState.value("label", QVariant::fromValue(QString())).toString();

115+ return m_cachedState.value("pre-label", QVariant::fromValue(QString())).toString();

116116}

117117

118−QString RootActionState::icon() const

118+QString RootActionState::rightLabel() const

119119{

120120 if (!isValid()) return QString();

121121

122− return m_cachedState.value("icon", QVariant::fromValue(QString())).toString();

122+ return m_cachedState.value("label", QVariant::fromValue(QString())).toString();

123+}

124+

125+QStringList RootActionState::icons() const

126+{

127+ if (!isValid()) return QStringList();

128+

129+ return m_cachedState.value("icons", QVariant::fromValue(QStringList())).toStringList();

123130}

124131

125132QString RootActionState::accessibleName() const

126133{

127134 if (!isValid()) return QString();

128135

129− return m_cachedState.value("accessible-name", QVariant::fromValue(QString())).toString();

136+ return m_cachedState.value("accessible-desc", QVariant::fromValue(QString())).toString();

130137}

131138

132139bool RootActionState::isVisible() const

@@ -198,16 +205,39 @@ QVariant RootActionState::toQVariant(GVariant* state) const

198205 while (g_variant_iter_loop (&iter, "{sv}", &key, &vvalue))

199206 {

200207 QString str = QString::fromUtf8(key);

201− if (str == "icon") {

208+ if (str == "icon" && !qmap.contains("icons")) {

209+ QStringList icons;

210+

202211 // FIXME - should be sending a url.

203− GIcon *icon = g_icon_deserialize (vvalue);

204− if (icon) {

205− qmap.insert(str, iconUri(icon));

206− g_object_unref (icon);

212+ GIcon *gicon = g_icon_deserialize (vvalue);

213+ if (gicon) {

214+ icons << iconUri(gicon);

215+ g_object_unref (gicon);

207216 }

208− else {

209− qmap.insert(str, QVariant(""));

217+ qmap.insert("icons", icons);

218+

219+ } else if (str == "icons") {

220+

221+ QStringList icons;

222+

223+ if (g_variant_type_is_array(g_variant_get_type(vvalue))) {

224+

225+

226+ for (int i = 0, iMax = g_variant_n_children(vvalue); i < iMax; i++) {

227+ GVariant *child = g_variant_get_child_value(vvalue, i);

228+

229+ // FIXME - should be sending a url.

230+ GIcon *gicon = g_icon_deserialize (child);

231+ if (gicon) {

232+ icons << iconUri(gicon);

233+ g_object_unref (gicon);

234+ }

235+ g_variant_unref(child);

236+ }

210237 }

238+ // will overwrite icon.

239+ qmap.insert("icons", icons);

240+

211241 } else {

212242 qmap.insert(str, ActionStateParser::toQVariant(vvalue));

213243 }

@@ -230,12 +260,12 @@ QVariant RootActionState::toQVariant(GVariant* state) const

230260 &visible);

231261

232262 qmap["label"] = label ? QString::fromUtf8(label) : "";

233− qmap["accessible-name"] = accessible_name ? QString::fromUtf8(accessible_name) : "";

263+ qmap["accessible-desc"] = accessible_name ? QString::fromUtf8(accessible_name) : "";

234264 qmap["visible"] = visible;

235265

236266 gicon = g_icon_new_for_string (icon, NULL);

237267 if (gicon) {

238− qmap["icon"] = iconUri(gicon);

268+ qmap["icons"] = QStringList() << iconUri(gicon);

239269 g_object_unref (gicon);

240270 }

241271

plugins/Unity/Indicators/rootactionstate.h+9−6

@@ -32,8 +32,9 @@ class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser

3232 Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)

3333

3434 Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)

35− Q_PROPERTY(QString label READ label NOTIFY labelChanged)

36− Q_PROPERTY(QString icon READ icon NOTIFY iconChanged)

35+ Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)

36+ Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)

37+ Q_PROPERTY(QStringList icons READ icons NOTIFY iconsChanged)

3738 Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)

3839 Q_PROPERTY(bool visible READ isVisible NOTIFY visibleChanged)

3940public:

@@ -47,8 +48,9 @@ public:

4748 void setIndex(int index);

4849

4950 bool isValid() const;

50− QString label() const;

51− QString icon() const;

51+ QString leftLabel() const;

52+ QString rightLabel() const;

53+ QStringList icons() const;

5254 QString accessibleName() const;

5355 bool isVisible() const;

5456

@@ -62,8 +64,9 @@ Q_SIGNALS:

6264 void indexChanged();

6365

6466 void validChanged();

65− void labelChanged();

66− void iconChanged();

67+ void leftLabelChanged();

68+ void rightLabelChanged();

69+ void iconsChanged();

6770 void accessibleNameChanged();

6871 void visibleChanged();

6972

plugins/Unity/Launcher/CMakeLists.txt+9−1

@@ -1,8 +1,13 @@

11include(FindPkgConfig)

22pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)

3+pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

5+add_definitions(-DSM_BUSNAME=systemBus)

47include_directories(

58 ${CMAKE_CURRENT_SOURCE_DIR}

9+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService

10+ ${GSETTINGS_QT_INCLUDE_DIRS}

611)

712

813set(QMLLAUNCHERPLUGIN_SRC

@@ -12,6 +17,7 @@ set(QMLLAUNCHERPLUGIN_SRC

1217 quicklistmodel.cpp

1318 common/quicklistentry.cpp

1419 backend/launcherbackend.cpp

20+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp

1521 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

1622 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

1723 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

@@ -21,7 +27,9 @@ add_library(UnityLauncher-qml MODULE

2127 ${QMLLAUNCHERPLUGIN_SRC}

2228 )

2329

24−qt5_use_modules(UnityLauncher-qml Qml)

30+target_link_libraries(UnityLauncher-qml ${GSETTINGS_QT_LDFLAGS})

31+

32+qt5_use_modules(UnityLauncher-qml DBus Qml)

2533

2634# export the qmldir and qmltypes files

2735export_qmlfiles(Unity.Launcher Unity/Launcher)

plugins/Unity/Launcher/backend/launcherbackend.cpp+257−53

@@ -2,6 +2,7 @@

33 *

44 * Authors:

5+ * Michael Terry <michael.terry@canonical.com>

56 * Michael Zanetti <michael.zanetti@canonical.com>

67 *

78 * This program is free software; you can redistribute it and/or modify

@@ -17,57 +18,45 @@

1718 * along with this program. If not, see <http://www.gnu.org/licenses/>.

1819 */

1920

21+#include "AccountsService.h"

2022#include "launcherbackend.h"

2123

22−#include <QHash>

23−

24−LauncherBackend::LauncherBackend(QObject *parent):

25− QObject(parent)

26−{

27−

28− // TODO: load default pinned ones from default config, instead of hardcoding here...

29−

30− m_storedApps <<

31− QLatin1String("phone-app.desktop") <<

32− QLatin1String("camera-app.desktop") <<

33− QLatin1String("gallery-app.desktop") <<

34− QLatin1String("facebook-webapp.desktop") <<

35− QLatin1String("webbrowser-app.desktop") <<

36− QLatin1String("twitter-webapp.desktop") <<

37− QLatin1String("gmail-webapp.desktop") <<

38− QLatin1String("ubuntu-weather-app.desktop") <<

39− QLatin1String("notes-app.desktop") <<

40− QLatin1String("calendar-app.desktop");

41−

42− // TODO: get stuff from desktop files instead this hardcoded map

43− m_displayNameMap.insert("phone-app.desktop", "Phone");

44− m_displayNameMap.insert("camera-app.desktop", "Camera");

45− m_displayNameMap.insert("gallery-app.desktop", "Gallery");

46− m_displayNameMap.insert("facebook-webapp.desktop", "Facebook");

47− m_displayNameMap.insert("webbrowser-app.desktop", "Browser");

48− m_displayNameMap.insert("twitter-webapp.desktop", "Twitter");

49− m_displayNameMap.insert("gmail-webapp.desktop", "GMail");

50− m_displayNameMap.insert("ubuntu-weather-app.desktop", "Weather");

51− m_displayNameMap.insert("notes-app.desktop", "Notes");

52− m_displayNameMap.insert("calendar-app.desktop", "Calendar");

53−

54− // TODO: get stuff from desktop files instead this hardcoded map

55− m_iconMap.insert("phone-app.desktop", "phone-app");

56− m_iconMap.insert("camera-app.desktop", "camera");

57− m_iconMap.insert("gallery-app.desktop", "gallery");

58− m_iconMap.insert("facebook-webapp.desktop", "facebook");

59− m_iconMap.insert("webbrowser-app.desktop", "browser");

60− m_iconMap.insert("twitter-webapp.desktop", "twitter");

61− m_iconMap.insert("gmail-webapp.desktop", "gmail");

62− m_iconMap.insert("ubuntu-weather-app.desktop", "weather");

63− m_iconMap.insert("notes-app.desktop", "notepad");

64− m_iconMap.insert("calendar-app.desktop", "calendar");

24+#include <QDir>

25+#include <QDBusArgument>

26+#include <QFileInfo>

27+#include <QGSettings>

28+#include <QDebug>

6529

30+class LauncherBackendItem

31+{

32+public:

33+ LauncherBackendItem(): pinned(false) {}

34+

35+ QString desktopFile;

36+ QString displayName;

37+ QString icon;

38+ bool pinned;

39+};

40+

41+LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):

42+ QObject(parent),

43+ m_accounts(nullptr)

44+{

45+ if (useStorage) {

46+ m_accounts = new AccountsService(this);

47+ }

48+ m_user = qgetenv("USER");

49+ syncFromAccounts();

6650}

6751

6852LauncherBackend::~LauncherBackend()

6953{

54+ m_storedApps.clear();

7055

56+ Q_FOREACH(LauncherBackendItem *item, m_itemCache) {

57+ delete item;

58+ }

59+ m_itemCache.clear();

7160}

7261

7362QStringList LauncherBackend::storedApplications() const

@@ -77,38 +66,103 @@ QStringList LauncherBackend::storedApplications() const

7766

7867void LauncherBackend::setStoredApplications(const QStringList &appIds)

7968{

69+ if (appIds.count() < m_storedApps.count()) {

70+ Q_FOREACH(const QString &appId, m_storedApps) {

71+ if (!appIds.contains(appId)) {

72+ delete m_itemCache.take(appId);

73+ }

74+ }

75+ }

8076 m_storedApps = appIds;

81− // TODO: Cleanup pinned state from settings for apps not in list any more.

77+ Q_FOREACH(const QString &appId, appIds) {

78+ if (!m_itemCache.contains(appId)) {

79+ QString df = findDesktopFile(appId);

80+ if (!df.isEmpty()) {

81+ LauncherBackendItem *item = parseDesktopFile(df);

82+ m_itemCache.insert(appId, item);

83+ } else {

84+ // Cannot find any data for that app... ignoring it.

85+ qWarning() << "cannot find desktop file for" << appId << ". discarding app.";

86+ m_storedApps.removeAll(appId);

87+ }

88+ }

89+ }

90+ syncToAccounts();

8291}

8392

8493QString LauncherBackend::desktopFile(const QString &appId) const

8594{

86− // TODO: return real path instead of this hardcoded one

87− return QLatin1String("/usr/share/applications/") + appId;

95+ LauncherBackendItem *item = m_itemCache.value(appId);

96+ if (item) {

97+ return item->desktopFile;

98+ }

99+

100+ return findDesktopFile(appId);

88101}

89102

90103QString LauncherBackend::displayName(const QString &appId) const

91104{

92− return m_displayNameMap.value(appId);

105+ LauncherBackendItem *item = m_itemCache.value(appId);

106+ if (item) {

107+ return item->displayName;

108+ }

109+

110+ QString df = findDesktopFile(appId);

111+ if (!df.isEmpty()) {

112+ LauncherBackendItem *item = parseDesktopFile(df);

113+ m_itemCache.insert(appId, item);

114+ return item->displayName;

115+ }

116+

117+ return QString();

93118}

94119

95120QString LauncherBackend::icon(const QString &appId) const

96121{

97− return m_iconMap.value(appId);

122+ QString iconName;

123+ LauncherBackendItem *item = m_itemCache.value(appId);

124+ if (item) {

125+ iconName = item->icon;

126+ } else {

127+ QString df = findDesktopFile(appId);

128+ if (!df.isEmpty()) {

129+ LauncherBackendItem *item = parseDesktopFile(df);

130+ m_itemCache.insert(appId, item);

131+ iconName = item->icon;

132+ }

133+ }

134+

135+ QFileInfo info(iconName);

136+ if (info.exists()) {

137+ return info.absoluteFilePath();

138+ }

139+ return "image://theme/" + iconName;

98140}

99141

100142bool LauncherBackend::isPinned(const QString &appId) const

101143{

102− // TODO: return app's pinned state from settings

103− Q_UNUSED(appId)

144+ LauncherBackendItem *item = m_itemCache.value(appId);

145+ if (item) {

146+ return item->pinned;

147+ }

104148 return false;

105149}

106150

107151void LauncherBackend::setPinned(const QString &appId, bool pinned)

108152{

109− // TODO: Store pinned state in settings.

110− Q_UNUSED(appId)

111− Q_UNUSED(pinned)

153+ if (!m_storedApps.contains(appId)) {

154+ return;

155+ }

156+

157+ LauncherBackendItem *item = m_itemCache.value(appId);

158+ if (!item) {

159+ item = new LauncherBackendItem();

160+ m_itemCache.insert(appId, item);

161+ }

162+ if (item->pinned != pinned) {

163+ item->pinned = pinned;

164+ syncToAccounts();

165+ }

112166}

113167

114168QList<QuickListEntry> LauncherBackend::quickList(const QString &appId) const

@@ -137,9 +191,159 @@ int LauncherBackend::count(const QString &appId) const

137191 return 0;

138192}

139193

194+void LauncherBackend::setUser(const QString &username)

195+{

196+ if (qgetenv("USER") == "lightdm" && m_user != username) {

197+ m_user = username;

198+ syncFromAccounts();

199+ }

200+}

201+

140202void LauncherBackend::triggerQuickListAction(const QString &appId, const QString &quickListId)

141203{

142204 // TODO: execute the given quicklist action

143205 Q_UNUSED(appId)

144206 Q_UNUSED(quickListId)

145207}

208+

209+void LauncherBackend::syncFromAccounts()

210+{

211+ QList<QVariantMap> apps;

212+ bool defaults = true;

213+

214+ m_storedApps.clear();

215+

216+ if (m_accounts && !m_user.isEmpty()) {

217+ QVariant variant = m_accounts->getUserProperty(m_user, "launcher-items");

218+ apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());

219+ defaults = isDefaultsItem(apps);

220+ }

221+

222+ if (m_accounts && defaults) { // Checking accounts as it'll be null when !useStorage

223+ QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");

224+ Q_FOREACH(const QString &entry, gSettings.get("favorites").toStringList()) {

225+ if (entry.startsWith("application://")) {

226+ QString appId = entry;

227+ // Transform "application://foobar.desktop" to "foobar"

228+ appId.remove("application://");

229+ if (appId.endsWith(".desktop")) {

230+ appId.chop(8);

231+ }

232+ QString df = findDesktopFile(appId);

233+

234+ if (!df.isEmpty()) {

235+ m_storedApps << appId;

236+

237+ if (!m_itemCache.contains(appId)) {

238+ m_itemCache.insert(appId, parseDesktopFile(df));

239+ }

240+ m_itemCache.value(appId)->pinned = true;

241+ }

242+ }

243+ }

244+ } else {

245+ for (const QVariant &app: apps) {

246+ loadFromVariant(app.toMap());

247+ }

248+ }

249+}

250+

251+void LauncherBackend::syncToAccounts()

252+{

253+ if (m_accounts && !m_user.isEmpty()) {

254+ QList<QVariantMap> items;

255+

256+ Q_FOREACH(const QString &appId, m_storedApps) {

257+ items << itemToVariant(appId);

258+ }

259+

260+ m_accounts->setUserProperty(m_user, "launcher-items", QVariant::fromValue(items));

261+ }

262+}

263+

264+QString LauncherBackend::findDesktopFile(const QString &appId) const

265+{

266+ int dashPos = -1;

267+ QString helper = appId;

268+

269+ QStringList searchDirs;

270+ searchDirs << QDir::homePath() + "/.local/share/applications";

271+ searchDirs << "/usr/share/applications";

272+

273+#ifdef LAUNCHER_TESTING

274+ searchDirs << "";

275+#endif

276+

277+ do {

278+ if (dashPos != -1) {

279+ helper = helper.replace(dashPos, 1, '/');

280+ }

281+

282+ Q_FOREACH(const QString &searchDir, searchDirs) {

283+ QFileInfo fileInfo(QDir(searchDir), helper + ".desktop");

284+ if (fileInfo.exists()) {

285+ return fileInfo.absoluteFilePath();

286+ }

287+ }

288+

289+ dashPos = helper.indexOf("-");

290+ } while (dashPos != -1);

291+

292+ return QString();

293+}

294+

295+LauncherBackendItem* LauncherBackend::parseDesktopFile(const QString &desktopFile) const

296+{

297+ QSettings settings(desktopFile, QSettings::IniFormat);

298+

299+

300+ LauncherBackendItem* item = new LauncherBackendItem();

301+ item->desktopFile = desktopFile;

302+ item->displayName = settings.value("Desktop Entry/Name").toString();

303+ item->icon = settings.value("Desktop Entry/Icon").toString();

304+ item->pinned = false;

305+ return item;

306+}

307+

308+void LauncherBackend::loadFromVariant(const QVariantMap &details)

309+{

310+ if (!details.contains("id")) {

311+ return;

312+ }

313+ QString appId = details.value("id").toString();

314+

315+ LauncherBackendItem *item = m_itemCache.value(appId);

316+ if (item) {

317+ delete item;

318+ }

319+

320+ item = new LauncherBackendItem();

321+

322+ item->desktopFile = details.value("desktopFile").toString();

323+ item->displayName = details.value("name").toString();

324+ item->icon = details.value("icon").toString();

325+ item->pinned = details.value("is-pinned").toBool();

326+

327+ m_itemCache.insert(appId, item);

328+ m_storedApps.append(appId);

329+}

330+

331+QVariantMap LauncherBackend::itemToVariant(const QString &appId) const

332+{

333+ LauncherBackendItem *item = m_itemCache.value(appId);

334+ QVariantMap details;

335+ details.insert("id", appId);

336+ details.insert("name", item->displayName);

337+ details.insert("icon", item->icon);

338+ details.insert("desktopFile", item->desktopFile);

339+ details.insert("is-pinned", item->pinned);

340+ return details;

341+}

342+

343+bool LauncherBackend::isDefaultsItem(const QList<QVariantMap> &apps) const

344+{

345+ // To differentiate between an empty list and a list that hasn't been set

346+ // yet (and should thus be populated with the defaults), we use a special

347+ // list of one item with the 'defaults' field set to true.

348+ return (apps.size() == 1 && apps[0].value("defaults").toBool());

349+}

plugins/Unity/Launcher/backend/launcherbackend.h+36−5

@@ -22,20 +22,24 @@

2222#include "common/quicklistentry.h"

2323

2424#include <QObject>

25+#include <QSettings>

2526#include <QStringList>

26−#include <QHash>

27+

28+class AccountsService;

2729

2830/**

2931 * @brief An interface that provides all the data needed by the launcher.

3032 */

3133

34+class LauncherBackendItem;

35+

3236class LauncherBackend : public QObject

3337{

3438 Q_OBJECT

3539

3640

3741public:

38− LauncherBackend(QObject *parent = 0);

42+ LauncherBackend(bool useStorage = true, QObject *parent = 0);

3943 virtual ~LauncherBackend();

4044

4145 /**

@@ -57,12 +61,18 @@ public:

5761

5862 /**

5963 * @brief Get the full path to the .desktop file.

64+ *

65+ * The application does not need to be in the list of stored applications.

66+ *

6067 * @returns The full path to the .dekstop file.

6168 */

6269 QString desktopFile(const QString &appId) const;

6370

6471 /**

6572 * @brief Get the user friendly name of an application.

73+ *

74+ * The application does not need to be in the list of stored applications.

75+ *

6676 * @param appId The ID of the application.

6777 * @returns The user friendly name of the application.

6878 */

@@ -70,6 +80,9 @@ public:

7080

7181 /**

7282 * @brief Get the icon of an application.

83+ *

84+ * The application does not need to be in the list of stored applications.

85+ *

7386 * @param appId The ID of the application.

7487 * @returns The full path to the icon for the application.

7588 */

@@ -118,15 +131,33 @@ public:

118131 */

119132 int count(const QString &appId) const;

120133

134+ /**

135+ * @brief Sets the username for which to look up launcher items.

136+ * @param username The username to use.

137+ */

138+ void setUser(const QString &username);

139+

121140Q_SIGNALS:

122141 void quickListChanged(const QString &appId, const QList<QuickListEntry> &quickList);

123142 void progressChanged(const QString &appId, int progress);

124143 void countChanged(const QString &appId, int count);

125144

126145private:

127− QStringList m_storedApps;

128− QHash<QString, QString> m_displayNameMap;

129− QHash<QString, QString> m_iconMap;

146+ QString findDesktopFile(const QString &appId) const;

147+ LauncherBackendItem* parseDesktopFile(const QString &desktopFile) const;

148+

149+ QVariantMap itemToVariant(const QString &appId) const;

150+ void loadFromVariant(const QVariantMap &details);

151+

152+ bool isDefaultsItem(const QList<QVariantMap> &apps) const;

153+ void syncFromAccounts();

154+ void syncToAccounts();

155+

156+ QList<QString> m_storedApps;

157+ mutable QHash<QString, LauncherBackendItem*> m_itemCache;

158+

159+ AccountsService *m_accounts;

160+ QString m_user;

130161};

131162

132163#endif // LAUNCHERBACKEND_H

plugins/Unity/Launcher/launcheritem.cpp+14

@@ -31,6 +31,7 @@ LauncherItem::LauncherItem(const QString &appId, const QString &desktopFile, con

3131 m_recent(false),

3232 m_progress(-1),

3333 m_count(0),

34+ m_focused(false),

3435 m_quickList(new QuickListModel(this))

3536{

3637 QuickListEntry nameAction;

@@ -131,6 +132,19 @@ void LauncherItem::setCount(int count)

131132 }

132133}

133134

135+bool LauncherItem::focused() const

136+{

137+ return m_focused;

138+}

139+

140+void LauncherItem::setFocused(bool focused)

141+{

142+ if (m_focused != focused) {

143+ m_focused = focused;

144+ Q_EMIT focusedChanged(focused);

145+ }

146+}

147+

134148unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const

135149{

136150 return m_quickList;

plugins/Unity/Launcher/launcheritem.h+4

@@ -54,6 +54,9 @@ public:

5454 int count() const;

5555 void setCount(int count);

5656

57+ bool focused() const;

58+ void setFocused(bool focused);

59+

5760 unity::shell::launcher::QuickListModelInterface *quickList() const;

5861

5962Q_SIGNALS:

@@ -70,6 +73,7 @@ private:

7073 bool m_recent;

7174 int m_progress;

7275 int m_count;

76+ bool m_focused;

7377 QuickListModel *m_quickList;

7478};

7579

plugins/Unity/Launcher/launchermodel.cpp+63−3

@@ -23,7 +23,7 @@

2323

2424LauncherModel::LauncherModel(QObject *parent):

2525 LauncherModelInterface(parent),

26− m_backend(new LauncherBackend(this))

26+ m_backend(new LauncherBackend(true, this))

2727{

2828 connect(m_backend, SIGNAL(countChanged(QString,int)), SLOT(countChanged(QString,int)));

2929 connect(m_backend, SIGNAL(progressChanged(QString,int)), SLOT(progressChanged(QString,int)));

@@ -74,6 +74,8 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const

7474 return item->count();

7575 case RoleProgress:

7676 return item->progress();

77+ case RoleFocused:

78+ return item->focused();

7779 }

7880

7981 return QVariant();

@@ -123,6 +125,7 @@ void LauncherModel::pin(const QString &appId, int index)

123125 if (currentIndex >= 0) {

124126 if (index == -1 || index == currentIndex) {

125127 m_list.at(currentIndex)->setPinned(true);

128+ m_backend->setPinned(appId, true);

126129 QModelIndex modelIndex = this->index(currentIndex);

127130 Q_EMIT dataChanged(modelIndex, modelIndex);

128131 } else {

@@ -138,6 +141,7 @@ void LauncherModel::pin(const QString &appId, int index)

138141 m_backend->displayName(appId),

139142 m_backend->icon(appId));

140143 item->setPinned(true);

144+ m_backend->setPinned(appId, true);

141145 m_list.insert(index, item);

142146 endInsertRows();

143147 }

@@ -186,8 +190,64 @@ void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex

186190

187191void LauncherModel::setUser(const QString &username)

188192{

189− Q_UNUSED(username)

190− // TODO: Implement this...

193+ m_backend->setUser(username);

194+}

195+

196+void LauncherModel::applicationFocused(const QString &appId)

197+{

198+ // Unfocus all apps

199+ for(int i = 0; i < m_list.count(); ++i) {

200+ LauncherItem *item = m_list.at(i);

201+ if (item->focused()) {

202+ item->setFocused(false);

203+ Q_EMIT dataChanged(this->index(i), this->index(i), QVector<int>() << RoleFocused);

204+ }

205+ }

206+

207+ if (appId.isEmpty()) {

208+ return;

209+ }

210+

211+ // FIXME: drop this once we get real appIds from the AppManager

212+ QString helper = appId.split('/').last();

213+ if (helper.endsWith(".desktop")) {

214+ helper.chop(8);

215+ }

216+

217+ int index = findApplication(helper);

218+ if (index >= 0) {

219+ m_list.at(index)->setFocused(true);

220+ Q_EMIT dataChanged(this->index(index), this->index(index), QVector<int>() << RoleFocused);

221+ } else {

222+ // Add app to recent apps

223+ QString desktopFile = m_backend->desktopFile(helper);

224+ QString appName = m_backend->displayName(helper);

225+ QString icon = m_backend->icon(helper);

226+

227+ LauncherItem *item = new LauncherItem(helper, desktopFile, appName, icon);

228+ item->setRecent(true);

229+ item->setFocused(true);

230+ beginInsertRows(QModelIndex(), m_list.count(), m_list.count());

231+ m_list.append(item);

232+ endInsertRows();

233+

234+ // Clean up old recent apps

235+ QList<int> recentAppIndices;

236+ for (int i = 0; i < m_list.count(); ++i) {

237+ if (m_list.at(i)->recent()) {

238+ recentAppIndices << i;

239+ }

240+ }

241+ int run = 0;

242+ while (recentAppIndices.count() > 5) {

243+ beginRemoveRows(QModelIndex(), recentAppIndices.first() - run, recentAppIndices.first() - run);

244+ m_list.takeAt(recentAppIndices.first() - run)->deleteLater();

245+ endRemoveRows();

246+ recentAppIndices.takeFirst();

247+ ++run;

248+ }

249+ storeAppList();

250+ }

191251}

192252

193253void LauncherModel::storeAppList()

plugins/Unity/Launcher/launchermodel.h+2−1

@@ -17,7 +17,7 @@

1717 * Michael Zanetti <michael.zanetti@canonical.com>

1818 */

1919

20−#ifndef LAUNCHERMODELH

20+#ifndef LAUNCHERMODEL_H

2121#define LAUNCHERMODEL_H

2222

2323// unity-api

@@ -49,6 +49,7 @@ public:

4949 Q_INVOKABLE void requestRemove(const QString &appId);

5050 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);

5151 Q_INVOKABLE void setUser(const QString &username);

52+ Q_INVOKABLE void applicationFocused(const QString &appId);

5253

5354private:

5455 void storeAppList();

plugins/Unity/categories.cpp−3

@@ -43,7 +43,6 @@ Categories::Categories(QObject* parent)

4343 m_roles[Categories::RoleHints] = "hints";

4444 m_roles[Categories::RoleResults] = "results";

4545 m_roles[Categories::RoleCount] = "count";

46− m_roles[Categories::RoleCategoryIndex] = "categoryIndex";

4746

4847 // TODO This should not be needed but accumulatting the count changes

4948 // makes the visualization more stable and also makes crashes on fast

@@ -222,8 +221,6 @@ Categories::data(const QModelIndex& index, int role) const

222221 return QVariant::fromValue(m_overriddenCategories[id]->rowCount());

223222 }

224223 return QVariant::fromValue(getResults(index.row())->rowCount());

225− case RoleCategoryIndex:

226− return QVariant::fromValue(index.row());

227224 default:

228225 return QVariant();

229226 }

plugins/Unity/categories.h+1−2

@@ -50,8 +50,7 @@ public:

5050 RoleProgressSource,

5151 RoleHints,

5252 RoleResults,

53− RoleCount,

54− RoleCategoryIndex

53+ RoleCount

5554 };

5655

5756 Q_INVOKABLE void overrideResults(const QString& categoryId, QAbstractItemModel* model);

plugins/Unity/checkoptionfilter.cpp+3−1

@@ -52,9 +52,11 @@ void CheckOptionFilter::onOptionsChanged(unity::dash::CheckOptionFilter::CheckOp

5252

5353 m_options = new UnityOptionsModel(this, options,

5454 m_unityCheckOptionFilter->option_added,

55− m_unityCheckOptionFilter->option_removed);

55+ m_unityCheckOptionFilter->option_removed,

56+ m_unityCheckOptionFilter->show_all_button);

5657

5758 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));

59+ connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));

5860

5961 /* Property change signals */

6062 m_signals << m_unityCheckOptionFilter->options.changed.connect(sigc::mem_fun(this, &CheckOptionFilter::onOptionsChanged));

plugins/Unity/filter.h+3−2

@@ -56,11 +56,12 @@ public:

5656 bool filtering() const;

5757 virtual GenericOptionsModel* options() const = 0;

5858

59− Q_INVOKABLE void clear();

60−

6159 static Filter* newFromUnityFilter(unity::dash::Filter::Ptr unityFilter);

6260 bool hasUnityFilter(unity::dash::Filter::Ptr unityFilter) const;

6361

62+public Q_SLOTS:

63+ void clear();

64+

6465Q_SIGNALS:

6566 void optionsChanged();

6667

plugins/Unity/genericoptionsmodel.cpp+20−3

@@ -22,10 +22,18 @@

2222

2323// local

2424#include "abstractfilteroption.h"

25+#include "showallfilteroption.h"

2526

26−GenericOptionsModel::GenericOptionsModel(QObject *parent)

27+GenericOptionsModel::GenericOptionsModel(bool showAllOption, QObject *parent)

2728 : QAbstractListModel(parent)

2829{

30+ if (showAllOption)

31+ {

32+ auto showAll = new ShowAllFilterOption(this);

33+ connect(showAll, SIGNAL(activeChanged(bool)), this, SLOT(onOptionChanged()));

34+ connect(showAll, SIGNAL(activeChanged(bool)), this, SLOT(onShowAllClicked(bool)));

35+ addOption(showAll);

36+ }

2937}

3038

3139GenericOptionsModel::~GenericOptionsModel()

@@ -73,7 +81,7 @@ QVariant GenericOptionsModel::data(const QModelIndex& index, int role) const

7381

7482int GenericOptionsModel::rowCount(const QModelIndex& /* parent */) const

7583{

76− return m_options.size ();

84+ return m_options.size();

7785}

7886

7987void GenericOptionsModel::setActive(int idx, bool value)

@@ -117,7 +125,10 @@ void GenericOptionsModel::ensureTheOnlyActive(AbstractFilterOption *activeOption

117125

118126void GenericOptionsModel::addOption(AbstractFilterOption *option, int index)

119127{

120− m_options.insert(index, option);

128+ if (index >= 0)

129+ m_options.insert(index, option);

130+ else

131+ m_options.append(option);

121132

122133 connect(option, SIGNAL(idChanged(const QString &)), this, SLOT(onOptionChanged()));

123134 connect(option, SIGNAL(nameChanged(const QString &)), this, SLOT(onOptionChanged()));

@@ -168,3 +179,9 @@ void GenericOptionsModel::onActiveChanged()

168179 Q_EMIT activeChanged(option);

169180 }

170181}

182+

183+void GenericOptionsModel::onShowAllClicked(bool active)

184+{

185+ if (active)

186+ Q_EMIT showAllActivated();

187+}

plugins/Unity/genericoptionsmodel.h+4−2

@@ -35,7 +35,7 @@ class Q_DECL_EXPORT GenericOptionsModel : public QAbstractListModel

3535 Q_ENUMS(Roles)

3636

3737public:

38− GenericOptionsModel(QObject *parent = nullptr);

38+ GenericOptionsModel(bool showAllOption = false, QObject *parent = nullptr);

3939 ~GenericOptionsModel();

4040

4141 enum Roles {

@@ -59,13 +59,15 @@ public Q_SLOTS:

5959

6060Q_SIGNALS:

6161 void activeChanged(AbstractFilterOption *option);

62+ void showAllActivated();

6263

6364protected Q_SLOTS:

6465 void onOptionChanged();

6566 void onActiveChanged();

67+ void onShowAllClicked(bool active);

6668

6769protected:

68− void addOption(AbstractFilterOption *option, int index);

70+ void addOption(AbstractFilterOption *option, int index = -1);

6971 void removeOption(int index);

7072 int indexOf(const QString &option_id);

7173

plugins/Unity/multirangefilter.cpp+3−1

@@ -52,9 +52,11 @@ void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options o

5252

5353 m_options = new UnityOptionsModel(this, options,

5454 m_unityMultiRangeFilter->option_added,

55− m_unityMultiRangeFilter->option_removed);

55+ m_unityMultiRangeFilter->option_removed,

56+ m_unityMultiRangeFilter->show_all_button);

5657

5758 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));

59+ connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));

5860

5961 /* Property change signals */

6062 m_signals << m_unityMultiRangeFilter->options.changed.connect(sigc::mem_fun(this, &MultiRangeFilter::onOptionsChanged));

plugins/Unity/radiooptionfilter.cpp+3−1

@@ -51,7 +51,9 @@ void RadioOptionFilter::onOptionsChanged(unity::dash::RadioOptionFilter::RadioOp

5151 }

5252 m_options = new UnityOptionsModel(this, m_unityRadioOptionFilter->options,

5353 m_unityRadioOptionFilter->option_added,

54− m_unityRadioOptionFilter->option_removed);

54+ m_unityRadioOptionFilter->option_removed,

55+ m_unityRadioOptionFilter->show_all_button);

56+ connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));

5557

5658 m_signals << m_unityRadioOptionFilter->options.changed.connect(sigc::mem_fun(this, &RadioOptionFilter::onOptionsChanged));

5759

plugins/Unity/ratingoptionsmodel.cpp+3−3

@@ -23,11 +23,11 @@

2323// local

2424#include "ratingfilteroption.h"

2525

26−RatingOptionsModel::RatingOptionsModel(QObject *parent) :

27− GenericOptionsModel(parent)

26+RatingOptionsModel::RatingOptionsModel(bool showAllOption, QObject *parent) :

27+ GenericOptionsModel(showAllOption, parent)

2828{

2929 for (int i=1; i<=5; i++) {

3030 auto opt = new RatingFilterOption(QString::number(i), i*0.2f, this);

31− addOption(opt, i-1);

31+ addOption(opt);

3232 }

3333}

plugins/Unity/ratingoptionsmodel.h+1−1

@@ -27,7 +27,7 @@ class RatingOptionsModel : public GenericOptionsModel

2727 Q_OBJECT

2828

2929public:

30− RatingOptionsModel(QObject *parent);

30+ RatingOptionsModel(bool showAllOption, QObject *parent);

3131};

3232

3333#endif // RATINGOPTIONSMODEL_H

plugins/Unity/ratingsfilter.cpp+2−1

@@ -53,9 +53,10 @@ void RatingsFilter::setUnityFilter(unity::dash::Filter::Ptr filter)

5353

5454 delete m_options;

5555

56− m_options = new RatingOptionsModel(this);

56+ m_options = new RatingOptionsModel(m_unityRatingsFilter->show_all_button, this);

5757 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));

5858 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), this, SLOT(onActiveChanged(AbstractFilterOption *)));

59+ connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));

5960

6061 Q_EMIT optionsChanged();

6162}

plugins/Unity/showallfilteroption.cppnew file+60

@@ -0,0 +1,60 @@

1+/*

3+ *

4+ * Authors:

5+ * Pawel Stolowski <pawel.stolowski@canonical.com>

6+ *

7+ * This program is free software; you can redistribute it and/or modify

8+ * it under the terms of the GNU General Public License as published by

9+ * the Free Software Foundation; version 3.

10+ *

11+ * This program is distributed in the hope that it will be useful,

12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14+ * GNU General Public License for more details.

15+ *

16+ * You should have received a copy of the GNU General Public License

17+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

18+ */

19+

20+// self

21+#include "showallfilteroption.h"

22+

23+#include <libintl.h>

24+

25+unsigned int ShowAllFilterOption::m_showAllCount = 0;

26+

27+ShowAllFilterOption::ShowAllFilterOption(QObject *parent) :

28+ AbstractFilterOption(parent),

29+ m_active(false)

30+{

31+ m_id = QString("show_all::%1").arg(m_showAllCount++);

32+}

33+

34+QString ShowAllFilterOption::id() const

35+{

36+ return m_id;

37+}

38+

39+QString ShowAllFilterOption::name() const

40+{

41+ return QString::fromUtf8(dgettext("unity", "All"));

42+}

43+

44+QString ShowAllFilterOption::iconHint() const

45+{

46+ return QString::Null();

47+}

48+

49+bool ShowAllFilterOption::active() const

50+{

51+ return m_active;

52+}

53+

54+void ShowAllFilterOption::setActive(bool active)

55+{

56+ if (active != m_active) {

57+ m_active = active;

58+ Q_EMIT activeChanged(m_active);

59+ }

60+}

plugins/Unity/showallfilteroption.hnew file+51

@@ -0,0 +1,51 @@

1+/*

3+ *

4+ * Authors:

5+ * Pawel Stolowski <pawel.stolowski@canonical.com>

6+ *

7+ * This program is free software; you can redistribute it and/or modify

8+ * it under the terms of the GNU General Public License as published by

9+ * the Free Software Foundation; version 3.

10+ *

11+ * This program is distributed in the hope that it will be useful,

12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14+ * GNU General Public License for more details.

15+ *

16+ * You should have received a copy of the GNU General Public License

17+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

18+ */

19+

20+#ifndef SHOWALLFILTEROPTION_H

21+#define SHOWALLFILTEROPTION_H

22+

23+// local

24+#include "abstractfilteroption.h"

25+

26+class Q_DECL_EXPORT ShowAllFilterOption : public AbstractFilterOption

27+{

28+ Q_OBJECT

29+

30+public:

31+ explicit ShowAllFilterOption(QObject *parent = nullptr);

32+

33+ /* getters */

34+ QString id() const override;

35+ QString name() const override;

36+ QString iconHint() const override;

37+ bool active() const override;

38+

39+ /* setters */

40+ void setActive(bool active) override;

41+

42+private:

43+ bool m_active;

44+ QString m_id;

45+

46+ static unsigned int m_showAllCount;

47+};

48+

49+Q_DECLARE_METATYPE(ShowAllFilterOption*)

50+

51+#endif // SHOWALLFILTEROPTION_H

plugins/Unity/unityoptionsmodel.cpp+5−4

@@ -26,8 +26,9 @@

2626UnityOptionsModel::UnityOptionsModel(QObject *parent,

2727 const std::vector<unity::dash::FilterOption::Ptr> options,

2828 sigc::signal<void, unity::dash::FilterOption::Ptr> optionAdded,

29− sigc::signal<void, unity::dash::FilterOption::Ptr> optionRemoved) :

30− GenericOptionsModel(parent)

29+ sigc::signal<void, unity::dash::FilterOption::Ptr> optionRemoved,

30+ bool showAllOption) :

31+ GenericOptionsModel(showAllOption, parent)

3132{

3233 setOptions(options, optionAdded, optionRemoved);

3334}

@@ -38,7 +39,7 @@ void UnityOptionsModel::setOptions(const std::vector<unity::dash::FilterOption::

3839{

3940 for (unsigned int i=0; i<options.size(); i++)

4041 {

41− addOption(new FilterOption(options[i], this), i);

42+ addOption(new FilterOption(options[i], this));

4243 }

4344 optionAdded.connect(sigc::mem_fun(this, &UnityOptionsModel::onOptionAdded));

4445 optionRemoved.connect(sigc::mem_fun(this, &UnityOptionsModel::onOptionRemoved));

@@ -50,7 +51,7 @@ void UnityOptionsModel::onOptionAdded(unity::dash::FilterOption::Ptr option)

5051 if (index >= 0)

5152 {

5253 beginInsertRows(QModelIndex(), index, index);

53− addOption(new FilterOption(option, this), index);

54+ addOption(new FilterOption(option, this));

5455 endInsertRows();

5556 }

5657}

plugins/Unity/unityoptionsmodel.h+2−1

@@ -35,7 +35,8 @@ public:

3535 UnityOptionsModel(QObject *parent,

3636 const std::vector<unity::dash::FilterOption::Ptr> options,

3737 sigc::signal<void, unity::dash::FilterOption::Ptr> optionAdded,

38− sigc::signal<void, unity::dash::FilterOption::Ptr> optionRemoved);

38+ sigc::signal<void, unity::dash::FilterOption::Ptr> optionRemoved,

39+ bool showAllOption);

3940

4041private:

4142 void setOptions(const std::vector<unity::dash::FilterOption::Ptr> options,

po/ar.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-26 23:26+0000\n"

1212"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"

1313"Language-Team: Arabic <ar@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "

1818"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"

19−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

20−"X-Generator: Launchpad (build 16734)\n"

19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

20+"X-Generator: Launchpad (build 16750)\n"

2121

2222#: Applications/applications.js:23

2323msgid "Phone"

@@ -87,25 +87,69 @@ msgstr "ويكيبيديا"

8787msgid "YouTube"

8888msgstr "يوتيوب"

8989

90+#: Components/EdgeDemoOverlay.qml:145

91+msgid "Skip intro"

92+msgstr ""

93+

94+#: Components/EdgeDemo.qml:98

95+msgid "Right edge"

96+msgstr ""

97+

98+#: Components/EdgeDemo.qml:99

99+msgid "Try swiping from the right edge to unlock the phone"

100+msgstr ""

101+

102+#: Components/EdgeDemo.qml:135

103+msgid "Top edge"

104+msgstr ""

105+

106+#: Components/EdgeDemo.qml:136

107+msgid "Try swiping from the top edge to access the indicators"

108+msgstr ""

109+

110+#: Components/EdgeDemo.qml:161

111+msgid "Close"

112+msgstr ""

113+

114+#: Components/EdgeDemo.qml:162

115+msgid "Swipe up again to close the settings screen"

116+msgstr ""

117+

118+#: Components/EdgeDemo.qml:189

119+msgid "Left edge"

120+msgstr ""

121+

122+#: Components/EdgeDemo.qml:190

123+msgid "Swipe from the left to reveal the launcher for quick access to apps"

124+msgstr ""

125+

126+#: Components/EdgeDemo.qml:217

127+msgid "Well done"

128+msgstr ""

129+

130+#: Components/EdgeDemo.qml:218

131+msgid "You have now mastered the edge gestures and can start using the phone"

132+msgstr ""

133+

90134#: Components/PageHeader.qml:298

91135msgid "Recent searches"

92136msgstr "عمليات البحث الأخيرة"

93137

94138#. TRANSLATORS: Number of persons who rated this app

95−#: Dash/Apps/AppInfo.qml:72

139+#: Dash/Apps/AppInfo.qml:73

96140#, qt-format

97141msgid "(%1)"

98142msgstr ""

99143

100144#. TRANSLATORS: Number of persons who wrote reviews for this app

101−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

145+#: Dash/Apps/AppInfo.qml:85

102146#, qt-format

103147msgid "%1 review"

104148msgid_plural "%1 reviews"

105149msgstr[0] ""

106150msgstr[1] ""

107151

108−#: Dash/Apps/AppPreview.qml:181

152+#: Dash/Apps/AppPreview.qml:175

109153msgid "Rate this"

110154msgstr ""

111155

@@ -125,42 +169,6 @@ msgstr ""

125169msgid "Comments:"

126170msgstr ""

127171

128−#: Dash/DashApps.qml:65

129−msgid "Running apps"

130−msgstr "البرامج المُشغّلة"

131−

132−#: Dash/DashApps.qml:68

133−msgid "Frequently used"

134−msgstr "مُستخدمة بكثرة"

135−

136−#: Dash/DashApps.qml:71

137−msgid "Installed"

138−msgstr "مُثبّتة"

139−

140−#: Dash/DashApps.qml:74

141−msgid "Available for download"

142−msgstr "متوفرة للتنزيل"

143−

144−#: Dash/DashApps.qml:168

145−msgid "Apps"

146−msgstr "تطبيقات"

147−

148−#: Dash/DashHome.qml:41

149−msgid "Frequent Apps"

150−msgstr "تطبيقات مألوفة"

151−

152−#: Dash/DashHome.qml:44

153−msgid "Recent Music"

154−msgstr "آخر الصوتيات المشغلة"

155−

156−#: Dash/DashHome.qml:47

157−msgid "Videos Popular Online"

158−msgstr "فيديوهات رائجة على الإنترنت"

159−

160−#: Dash/DashHome.qml:151

161−msgid "Home"

162−msgstr "الرئيسية"

163−

164172#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

165173msgid "Featured"

166174msgstr "المميز"

@@ -201,7 +209,7 @@ msgstr "النجوم:"

201209msgid "Author:"

202210msgstr "المؤلف:"

203211

204−#: Greeter/Lockscreen.qml:133

212+#: Greeter/Lockscreen.qml:134

205213msgid "Emergency Call"

206214msgstr ""

207215

@@ -238,11 +246,11 @@ msgstr "تتكلم الآن..."

238246msgid "Search"

239247msgstr "ابحث"

240248

241−#: plugins/Unity/scope.cpp:298

249+#: plugins/Unity/scope.cpp:317

242250msgid "Sorry, there is nothing that matches your search."

243251msgstr "عذراً، لا يوجد ما يطابق بحثك."

244252

245−#: Shell.qml:399

253+#: Shell.qml:429

246254#, qt-format

247255msgid "Please enter %1"

248256msgstr ""

po/az.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-26 23:48+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Azerbaijani <az@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Son axtarışlar"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Tətbiqlər"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Ev"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Söylənilir..."

237245msgid "Search"

238246msgstr "Axtar"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Bağışlayın, amma axtarışınıza heç bir nəticə uyğun gəlmir."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/bg.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 00:06+0000\n"

1212"Last-Translator: Miroslav E. Hadzhiev (Хаджиев) "

1313"<miroslav.hadzhiev@gmail.com>\n"

@@ -16,8 +16,8 @@ msgstr ""

1616"Content-Type: text/plain; charset=UTF-8\n"

1717"Content-Transfer-Encoding: 8bit\n"

1818"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

20−"X-Generator: Launchpad (build 16734)\n"

19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

20+"X-Generator: Launchpad (build 16750)\n"

2121

2222#: Applications/applications.js:23

2323msgid "Phone"

@@ -87,25 +87,69 @@ msgstr "Уикипедия"

8787msgid "YouTube"

8888msgstr "YouTube"

8989

90+#: Components/EdgeDemoOverlay.qml:145

91+msgid "Skip intro"

92+msgstr ""

93+

94+#: Components/EdgeDemo.qml:98

95+msgid "Right edge"

96+msgstr ""

97+

98+#: Components/EdgeDemo.qml:99

99+msgid "Try swiping from the right edge to unlock the phone"

100+msgstr ""

101+

102+#: Components/EdgeDemo.qml:135

103+msgid "Top edge"

104+msgstr ""

105+

106+#: Components/EdgeDemo.qml:136

107+msgid "Try swiping from the top edge to access the indicators"

108+msgstr ""

109+

110+#: Components/EdgeDemo.qml:161

111+msgid "Close"

112+msgstr ""

113+

114+#: Components/EdgeDemo.qml:162

115+msgid "Swipe up again to close the settings screen"

116+msgstr ""

117+

118+#: Components/EdgeDemo.qml:189

119+msgid "Left edge"

120+msgstr ""

121+

122+#: Components/EdgeDemo.qml:190

123+msgid "Swipe from the left to reveal the launcher for quick access to apps"

124+msgstr ""

125+

126+#: Components/EdgeDemo.qml:217

127+msgid "Well done"

128+msgstr ""

129+

130+#: Components/EdgeDemo.qml:218

131+msgid "You have now mastered the edge gestures and can start using the phone"

132+msgstr ""

133+

90134#: Components/PageHeader.qml:298

91135msgid "Recent searches"

92136msgstr "Скорошни търсения"

93137

94138#. TRANSLATORS: Number of persons who rated this app

95−#: Dash/Apps/AppInfo.qml:72

139+#: Dash/Apps/AppInfo.qml:73

96140#, qt-format

97141msgid "(%1)"

98142msgstr ""

99143

100144#. TRANSLATORS: Number of persons who wrote reviews for this app

101−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

145+#: Dash/Apps/AppInfo.qml:85

102146#, qt-format

103147msgid "%1 review"

104148msgid_plural "%1 reviews"

105149msgstr[0] ""

106150msgstr[1] ""

107151

108−#: Dash/Apps/AppPreview.qml:181

152+#: Dash/Apps/AppPreview.qml:175

109153msgid "Rate this"

110154msgstr ""

111155

@@ -125,42 +169,6 @@ msgstr ""

125169msgid "Comments:"

126170msgstr ""

127171

128−#: Dash/DashApps.qml:65

129−msgid "Running apps"

130−msgstr ""

131−

132−#: Dash/DashApps.qml:68

133−msgid "Frequently used"

134−msgstr ""

135−

136−#: Dash/DashApps.qml:71

137−msgid "Installed"

138−msgstr "Инсталирани"

139−

140−#: Dash/DashApps.qml:74

141−msgid "Available for download"

142−msgstr ""

143−

144−#: Dash/DashApps.qml:168

145−msgid "Apps"

146−msgstr "Приложения"

147−

148−#: Dash/DashHome.qml:41

149−msgid "Frequent Apps"

150−msgstr ""

151−

152−#: Dash/DashHome.qml:44

153−msgid "Recent Music"

154−msgstr ""

155−

156−#: Dash/DashHome.qml:47

157−msgid "Videos Popular Online"

158−msgstr ""

159−

160−#: Dash/DashHome.qml:151

161−msgid "Home"

162−msgstr "Начало"

163−

164172#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

165173msgid "Featured"

166174msgstr "Най-отличени"

@@ -201,7 +209,7 @@ msgstr ""

201209msgid "Author:"

202210msgstr "Автор:"

203211

204−#: Greeter/Lockscreen.qml:133

212+#: Greeter/Lockscreen.qml:134

205213msgid "Emergency Call"

206214msgstr ""

207215

@@ -238,11 +246,11 @@ msgstr ""

238246msgid "Search"

239247msgstr "Търсене"

240248

241−#: plugins/Unity/scope.cpp:298

249+#: plugins/Unity/scope.cpp:317

242250msgid "Sorry, there is nothing that matches your search."

243251msgstr "Съжаляваме, няма нищо, което да отговаря на вашето търсене."

244252

245−#: Shell.qml:399

253+#: Shell.qml:429

246254#, qt-format

247255msgid "Please enter %1"

248256msgstr ""

po/ca.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 00:24+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Catalan <ca@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Cerques recents"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr "Aplications actives"

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "Les més freqüents"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "Instal·lades"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr "Disponibles per baixar"

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Aplicacions"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr "Aplicacions freqüents"

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr "Música recent"

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr "Vídeos populars en línia"

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Inici"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "S'està parlant..."

237245msgid "Search"

238246msgstr "Cerca"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "No hi ha res que coincideixi amb la cerca"

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/de.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 00:37+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: German <de@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr "Wikipedia"

8686msgid "YouTube"

8787msgstr "YouTube"

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Letzte Suchbegriffe"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr "Aktive Anwendungen"

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "Häufig verwendet"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "Installiert"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr "Zum Herunterladen verfügbar"

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Anwendungen"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr "Häufig genutzte Anwendungen"

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr "Zuletzt gehörte Musik"

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr "Beliebte Online-Videos"

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Start"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr "Empfehlungen"

@@ -200,7 +208,7 @@ msgstr "Darsteller:"

200208msgid "Author:"

201209msgstr "Autor:"

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Sie sprechen …"

237245msgid "Search"

238246msgstr "Suchen"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Entschuldigung, es wurden keine Treffer erzielt."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/el.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 00:53+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Greek <el@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Πρόσφατες αναζητήσεις"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Εφαρμογές"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Αρχή"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Ομιλία..."

237245msgid "Search"

238246msgstr "Αναζήτηση"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Λυπούμαστε, δεν υπάρχει τίποτα που να ταιριάζει στην αναζήτησή σας."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/en_AU.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 01:13+0000\n"

1212"Last-Translator: Jackson Doak <Doak.jackson@gmail.com>\n"

1313"Language-Team: English (Australia) <en_AU@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr "Wikipedia"

8686msgid "YouTube"

8787msgstr "YouTube"

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Recent searches"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr "Running apps"

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "Frequently used"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "Installed"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr "Available for download"

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Apps"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr "Frequent Apps"

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr "Recent Music"

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr "Videos Popular Online"

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Home"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr "Featured"

@@ -200,7 +208,7 @@ msgstr "Starring:"

200208msgid "Author:"

201209msgstr "Author:"

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Speaking..."

237245msgid "Search"

238246msgstr "Search"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Sorry, there is nothing that matches your search."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/en_GB.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 08:53+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: English (United Kingdom) <en_GB@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr "Wikipedia"

8686msgid "YouTube"

8787msgstr "YouTube"

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Recent searches"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr "Running apps"

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "Frequently used"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "Installed"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr "Available for download"

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Apps"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr "Frequent Apps"

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr "Recent Music"

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr "Videos Popular Online"

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Home"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr "Featured"

@@ -200,7 +208,7 @@ msgstr "Starring:"

200208msgid "Author:"

201209msgstr "Author:"

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Speaking..."

237245msgid "Search"

238246msgstr "Search"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Sorry, there is nothing that matches your search."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr "Please enter %1"

po/eo.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-26 22:35+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Esperanto <eo@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr ""

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr ""

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr ""

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr ""

237245msgid "Search"

238246msgstr ""

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr ""

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/es.po+65−55

@@ -7,16 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

11−"PO-Revision-Date: 2013-07-08 07:25+0000\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

11+"PO-Revision-Date: 2013-09-04 22:12+0000\n"

1212"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"

1313"Language-Team: Spanish <es@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-09-05 05:35+0000\n"

19+"X-Generator: Launchpad (build 16758)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,79 +86,89 @@ msgstr "Wikipedia"

8686msgid "YouTube"

8787msgstr "YouTube"

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr "Omitir la introducción"

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr "Borde derecho"

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr "Borde superior"

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr "Deslice el dedo desde el borde superior para acceder a los menús"

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr "Cerrar"

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr "Borde izquierdo"

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+"Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "

125+"rápidamente a las aplicaciones"

126+

127+#: Components/EdgeDemo.qml:217

128+msgid "Well done"

129+msgstr "Bien hecho"

130+

131+#: Components/EdgeDemo.qml:218

132+msgid "You have now mastered the edge gestures and can start using the phone"

133+msgstr "Ahora domina el uso de gestos de los bordes. Puede usar el teléfono"

134+

89135#: Components/PageHeader.qml:298

90136msgid "Recent searches"

91137msgstr "Búsquedas recientes"

92138

93139#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

140+#: Dash/Apps/AppInfo.qml:73

95141#, qt-format

96142msgid "(%1)"

97−msgstr ""

143+msgstr "(%1)"

98144

99145#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

146+#: Dash/Apps/AppInfo.qml:85

101147#, qt-format

102148msgid "%1 review"

103149msgid_plural "%1 reviews"

104−msgstr[0] ""

105−msgstr[1] ""

150+msgstr[0] "%1 reseña"

151+msgstr[1] "%1 reseñas"

106152

107−#: Dash/Apps/AppPreview.qml:181

153+#: Dash/Apps/AppPreview.qml:175

108154msgid "Rate this"

109−msgstr ""

155+msgstr "Valorar esto"

110156

111157#: Dash/Apps/AppReviews.qml:72

112158msgid "Add a review"

113−msgstr ""

159+msgstr "Añadir una reseña"

114160

115161#: Dash/Apps/AppReviews.qml:84

116162msgid "Review"

117−msgstr ""

163+msgstr "Reseñar"

118164

119165#: Dash/Apps/AppReviews.qml:118

120166msgid "Send"

121−msgstr ""

167+msgstr "Enviar"

122168

123169#: Dash/Apps/AppReviews.qml:136

124170msgid "Comments:"

125−msgstr ""

126−

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr "Aplicaciones en ejecución"

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "Usadas frecuentemente"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "Instaladas"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr "Disponibles para descargar"

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Aplicaciones"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr "Aplicaciones frecuentes"

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr "Música reciente"

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr "Vídeos populares en línea"

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Inicio"

171+msgstr "Comentarios:"

162172

163173#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164174msgid "Featured"

@@ -200,9 +210,9 @@ msgstr "Protagonistas:"

200210msgid "Author:"

201211msgstr "Autor:"

202212

203−#: Greeter/Lockscreen.qml:133

213+#: Greeter/Lockscreen.qml:134

204214msgid "Emergency Call"

205−msgstr ""

215+msgstr "Llamada de emergencia"

206216

207217#: Greeter/PassphraseLockscreen.qml:59

208218#, qt-format

@@ -237,11 +247,11 @@ msgstr "Hablando…"

237247msgid "Search"

238248msgstr "Buscar"

239249

240−#: plugins/Unity/scope.cpp:298

250+#: plugins/Unity/scope.cpp:317

241251msgid "Sorry, there is nothing that matches your search."

242252msgstr "No hay nada que coincida con su búsqueda."

243253

244−#: Shell.qml:399

254+#: Shell.qml:429

245255#, qt-format

246256msgid "Please enter %1"

247257msgstr "Introduzca %1"

po/fi.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-08-23 16:15+0000\n"

1212"Last-Translator: Timo Jyrinki <timo.jyrinki@canonical.com>\n"

1313"Language-Team: Finnish <fi@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-24 05:59+0000\n"

19−"X-Generator: Launchpad (build 16738)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr "Wikipedia"

8686msgid "YouTube"

8787msgstr "YouTube"

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Viimeisimmät haut"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr "(%1)"

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] "%1 arvostelu"

105149msgstr[1] "%1 arvostelua"

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr "Arvioi tämä"

110154

@@ -124,42 +168,6 @@ msgstr "Lähetä"

124168msgid "Comments:"

125169msgstr "Kommentit:"

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr "Käynnissä olevat sovellukset"

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "Usein käytetyt"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "Asennetut"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr "Ladattavissa"

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Sovellukset"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr "Yleisimmät sovellukset"

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr "Viimeisin musiikki"

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr "Suositut verkkovideot"

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Kotinäyttö"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr "Suositellut"

@@ -200,7 +208,7 @@ msgstr "Pääosissa:"

200208msgid "Author:"

201209msgstr "Tekijä:"

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr "Hätäpuhelu"

206214

@@ -237,11 +245,11 @@ msgstr "Puhutaan..."

237245msgid "Search"

238246msgstr "Hae"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Hakuun täsmääviä tuloksia ei löydy."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr "Kirjoita %1"

po/fo.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 02:57+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Faroese <fo@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr ""

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Nýtsluskipanir"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Heim"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Snakkar..."

237245msgid "Search"

238246msgstr "Leita"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Tíanverri er tað einki sum hóskar til tína leiting."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/fr.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 03:21+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: French <fr@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr ""

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Applications"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr ""

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr ""

237245msgid "Search"

238246msgstr ""

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr ""

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/gl.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 03:38+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Galician <gl@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Buscas recentes"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr "Aplicativos en execución"

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "Usadas frecuentemente"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "Instalado"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr "Dispoñíbel para descargar"

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Aplicativos"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr "Aplicativos frecuentes"

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr "Música recente"

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr "Vídeos populares en liña"

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Cartafol persoal"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Falando…"

237245msgid "Search"

238246msgstr "Buscar"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Sentímolo, non hai nada que coincida con esta busca."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/he.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 03:54+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Hebrew <he@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "חיפושים אחרונים"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "יישומים"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "בית"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "מושמע דיבור..."

237245msgid "Search"

238246msgstr "חיפוש"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "שום דבר אינו תואם לחיפוש שלך, עמך הסליחה."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/hr.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 04:14+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Croatian <hr@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

20−"X-Generator: Launchpad (build 16734)\n"

19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

20+"X-Generator: Launchpad (build 16750)\n"

2121

2222#: Applications/applications.js:23

2323msgid "Phone"

@@ -87,25 +87,69 @@ msgstr ""

8787msgid "YouTube"

8888msgstr ""

8989

90+#: Components/EdgeDemoOverlay.qml:145

91+msgid "Skip intro"

92+msgstr ""

93+

94+#: Components/EdgeDemo.qml:98

95+msgid "Right edge"

96+msgstr ""

97+

98+#: Components/EdgeDemo.qml:99

99+msgid "Try swiping from the right edge to unlock the phone"

100+msgstr ""

101+

102+#: Components/EdgeDemo.qml:135

103+msgid "Top edge"

104+msgstr ""

105+

106+#: Components/EdgeDemo.qml:136

107+msgid "Try swiping from the top edge to access the indicators"

108+msgstr ""

109+

110+#: Components/EdgeDemo.qml:161

111+msgid "Close"

112+msgstr ""

113+

114+#: Components/EdgeDemo.qml:162

115+msgid "Swipe up again to close the settings screen"

116+msgstr ""

117+

118+#: Components/EdgeDemo.qml:189

119+msgid "Left edge"

120+msgstr ""

121+

122+#: Components/EdgeDemo.qml:190

123+msgid "Swipe from the left to reveal the launcher for quick access to apps"

124+msgstr ""

125+

126+#: Components/EdgeDemo.qml:217

127+msgid "Well done"

128+msgstr ""

129+

130+#: Components/EdgeDemo.qml:218

131+msgid "You have now mastered the edge gestures and can start using the phone"

132+msgstr ""

133+

90134#: Components/PageHeader.qml:298

91135msgid "Recent searches"

92136msgstr "Nedavne pretrage"

93137

94138#. TRANSLATORS: Number of persons who rated this app

95−#: Dash/Apps/AppInfo.qml:72

139+#: Dash/Apps/AppInfo.qml:73

96140#, qt-format

97141msgid "(%1)"

98142msgstr ""

99143

100144#. TRANSLATORS: Number of persons who wrote reviews for this app

101−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

145+#: Dash/Apps/AppInfo.qml:85

102146#, qt-format

103147msgid "%1 review"

104148msgid_plural "%1 reviews"

105149msgstr[0] ""

106150msgstr[1] ""

107151

108−#: Dash/Apps/AppPreview.qml:181

152+#: Dash/Apps/AppPreview.qml:175

109153msgid "Rate this"

110154msgstr ""

111155

@@ -125,42 +169,6 @@ msgstr ""

125169msgid "Comments:"

126170msgstr ""

127171

128−#: Dash/DashApps.qml:65

129−msgid "Running apps"

130−msgstr ""

131−

132−#: Dash/DashApps.qml:68

133−msgid "Frequently used"

134−msgstr ""

135−

136−#: Dash/DashApps.qml:71

137−msgid "Installed"

138−msgstr ""

139−

140−#: Dash/DashApps.qml:74

141−msgid "Available for download"

142−msgstr ""

143−

144−#: Dash/DashApps.qml:168

145−msgid "Apps"

146−msgstr "Aplikacije"

147−

148−#: Dash/DashHome.qml:41

149−msgid "Frequent Apps"

150−msgstr ""

151−

152−#: Dash/DashHome.qml:44

153−msgid "Recent Music"

154−msgstr ""

155−

156−#: Dash/DashHome.qml:47

157−msgid "Videos Popular Online"

158−msgstr ""

159−

160−#: Dash/DashHome.qml:151

161−msgid "Home"

162−msgstr "Početna"

163−

164172#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

165173msgid "Featured"

166174msgstr ""

@@ -201,7 +209,7 @@ msgstr ""

201209msgid "Author:"

202210msgstr ""

203211

204−#: Greeter/Lockscreen.qml:133

212+#: Greeter/Lockscreen.qml:134

205213msgid "Emergency Call"

206214msgstr ""

207215

@@ -238,11 +246,11 @@ msgstr "Govor..."

238246msgid "Search"

239247msgstr "Pretraživanje"

240248

241−#: plugins/Unity/scope.cpp:298

249+#: plugins/Unity/scope.cpp:317

242250msgid "Sorry, there is nothing that matches your search."

243251msgstr "Nažalost, ne postoji ništa što odgovara vašoj pretrazi."

244252

245−#: Shell.qml:399

253+#: Shell.qml:429

246254#, qt-format

247255msgid "Please enter %1"

248256msgstr ""

po/hu.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 04:28+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Hungarian <hu@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Legutóbbi keresések"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr "Futó alkalmazások"

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "Gyakran használt"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "Telepített"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Alkalmazások"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Kezdőoldal"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Beszéd…"

237245msgid "Search"

238246msgstr "Keresés"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Elnézést, nincs találat a keresésre."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/hy.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 04:43+0000\n"

1212"Last-Translator: iAbaS <sosabazyan@yandex.ru>\n"

1313"Language-Team: Armenian <hy@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Վերջին որոնումներ"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr "Բացած ծրագրեր"

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "Վերջին բացածները"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "Տեղադրված"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr "Հասանելի ծրագրեր"

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Ծրագրեր"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr "Հաճախակի ծրագրերը"

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr "Վերջին երգերը"

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr "Հայտնի օնլայն վիդեոներ"

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Տուն"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Խոսում եմ..."

237245msgid "Search"

238246msgstr "Որոնում"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Կներերք, բայց Ձեր հարցումով ոչինչ չկար"

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/id.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-26 22:35+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Indonesian <id@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr ""

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr ""

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr ""

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr ""

237245msgid "Search"

238246msgstr ""

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr ""

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/it.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 05:14+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Italian <it@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Ricerche recenti"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Applicazioni"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Home"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Sto parlando..."

237245msgid "Search"

238246msgstr "Cerca"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Nessun risultato corrispondente alla ricerca."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/ja.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-26 22:36+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Japanese <ja@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr ""

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr ""

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr ""

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr ""

237245msgid "Search"

238246msgstr ""

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr ""

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/kn.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 05:43+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Kannada <kn@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "ಇತ್ತೀಚಿನ ಹುಡುಕಾಟಗಳು"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "ಮನೆ (Home)"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "ಮಾತನಾಡುತಿದ್ದೀರಿ"

237245msgid "Search"

238246msgstr "ಹುಡುಕು"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "ಕ್ಷಮಿಸಿ ನಿಮ್ಮ ಶೋಧನೆಗೆ ಸರಿಯಾದ ಹೊಂದಾಣಿಕೆಗಳು ದೊರಕುತ್ತಿಲ್ಲ"

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/ko.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 05:59+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Korean <ko@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "요즈음 찿은 것들"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr "돌아가고 있는 앱"

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "자주 쓰는 것들"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "깔림"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr "내려받을 수 있음"

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "앱"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr "자주 쓰는 앱"

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr "요즈음 찾는 음악"

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr ""

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr ""

237245msgid "Search"

238246msgstr "찾기"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr ""

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/ky.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 06:17+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Kirghiz <ky@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Соңку издөөлөр"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Тиркемелер"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Үй папкасы"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Сүйлөнүүдө..."

237245msgid "Search"

238246msgstr "Издөө"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Тилекке каршы, сиздин издөөңүзгө эч нерсе дал келген жок."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/lv.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 06:31+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Latvian <lv@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Nesen veiktās meklēšanas"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Lietotnes"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Mājas"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Runa..."

237245msgid "Search"

238246msgstr "Meklēt"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Diemžēl nekas neatbilst jūsu meklētajam."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/my.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 06:47+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Burmese <my@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "မကြာသေးခင်က ရှာဖွေခြင်း"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Apps"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "ပင်မ"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "ပြောနေသည်"

237245msgid "Search"

238246msgstr "ရှာဖွေ"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "ဆောရီး၊ သင်၏ရှာဖွေမူနှင့်တူညီတာဘာမှမရှိပါ။"

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/nb.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 07:02+0000\n"

1212"Last-Translator: Joakim Langvand <jlangvand@gmail.com>\n"

1313"Language-Team: Norwegian Bokmal <nb@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Siste søk"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "Ofte brukt"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "Installert"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr "Tilgjengelig for nedlasting"

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Programmer"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Hjem"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Snakker …"

237245msgid "Search"

238246msgstr "Søk"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Søket ga ingen treff."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/nl.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 07:19+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Dutch <nl@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Recente zoekopdrachten"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Apps"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Hoofdvenster"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Inspreken…"

237245msgid "Search"

238246msgstr "Zoeken"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Er is helaas niets dat met uw zoekopdracht overeenkomt."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/pl.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 08:52+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Polish <pl@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "

1818"|| n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

20−"X-Generator: Launchpad (build 16734)\n"

19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

20+"X-Generator: Launchpad (build 16750)\n"

2121

2222#: Applications/applications.js:23

2323msgid "Phone"

@@ -87,25 +87,69 @@ msgstr "Wikipedia"

8787msgid "YouTube"

8888msgstr "YouTube"

8989

90+#: Components/EdgeDemoOverlay.qml:145

91+msgid "Skip intro"

92+msgstr ""

93+

94+#: Components/EdgeDemo.qml:98

95+msgid "Right edge"

96+msgstr ""

97+

98+#: Components/EdgeDemo.qml:99

99+msgid "Try swiping from the right edge to unlock the phone"

100+msgstr ""

101+

102+#: Components/EdgeDemo.qml:135

103+msgid "Top edge"

104+msgstr ""

105+

106+#: Components/EdgeDemo.qml:136

107+msgid "Try swiping from the top edge to access the indicators"

108+msgstr ""

109+

110+#: Components/EdgeDemo.qml:161

111+msgid "Close"

112+msgstr ""

113+

114+#: Components/EdgeDemo.qml:162

115+msgid "Swipe up again to close the settings screen"

116+msgstr ""

117+

118+#: Components/EdgeDemo.qml:189

119+msgid "Left edge"

120+msgstr ""

121+

122+#: Components/EdgeDemo.qml:190

123+msgid "Swipe from the left to reveal the launcher for quick access to apps"

124+msgstr ""

125+

126+#: Components/EdgeDemo.qml:217

127+msgid "Well done"

128+msgstr ""

129+

130+#: Components/EdgeDemo.qml:218

131+msgid "You have now mastered the edge gestures and can start using the phone"

132+msgstr ""

133+

90134#: Components/PageHeader.qml:298

91135msgid "Recent searches"

92136msgstr "Ostatnie wyszukiwania"

93137

94138#. TRANSLATORS: Number of persons who rated this app

95−#: Dash/Apps/AppInfo.qml:72

139+#: Dash/Apps/AppInfo.qml:73

96140#, qt-format

97141msgid "(%1)"

98142msgstr ""

99143

100144#. TRANSLATORS: Number of persons who wrote reviews for this app

101−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

145+#: Dash/Apps/AppInfo.qml:85

102146#, qt-format

103147msgid "%1 review"

104148msgid_plural "%1 reviews"

105149msgstr[0] ""

106150msgstr[1] ""

107151

108−#: Dash/Apps/AppPreview.qml:181

152+#: Dash/Apps/AppPreview.qml:175

109153msgid "Rate this"

110154msgstr ""

111155

@@ -125,42 +169,6 @@ msgstr ""

125169msgid "Comments:"

126170msgstr ""

127171

128−#: Dash/DashApps.qml:65

129−msgid "Running apps"

130−msgstr "Uruchomione aplikacje"

131−

132−#: Dash/DashApps.qml:68

133−msgid "Frequently used"

134−msgstr "Najczęściej używane"

135−

136−#: Dash/DashApps.qml:71

137−msgid "Installed"

138−msgstr "Zainstalowane"

139−

140−#: Dash/DashApps.qml:74

141−msgid "Available for download"

142−msgstr "Dostępne do pobrania"

143−

144−#: Dash/DashApps.qml:168

145−msgid "Apps"

146−msgstr "Aplikacje"

147−

148−#: Dash/DashHome.qml:41

149−msgid "Frequent Apps"

150−msgstr "Często używane aplikacje"

151−

152−#: Dash/DashHome.qml:44

153−msgid "Recent Music"

154−msgstr "Najnowsza muzyka"

155−

156−#: Dash/DashHome.qml:47

157−msgid "Videos Popular Online"

158−msgstr "Wideo popularne online"

159−

160−#: Dash/DashHome.qml:151

161−msgid "Home"

162−msgstr "Dom"

163−

164172#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

165173msgid "Featured"

166174msgstr "Polecane"

@@ -201,7 +209,7 @@ msgstr "Obsada:"

201209msgid "Author:"

202210msgstr "Autor:"

203211

204−#: Greeter/Lockscreen.qml:133

212+#: Greeter/Lockscreen.qml:134

205213msgid "Emergency Call"

206214msgstr ""

207215

@@ -238,11 +246,11 @@ msgstr "Rozpoznanie..."

238246msgid "Search"

239247msgstr "Szukaj"

240248

241−#: plugins/Unity/scope.cpp:298

249+#: plugins/Unity/scope.cpp:317

242250msgid "Sorry, there is nothing that matches your search."

243251msgstr "Nie znaleziono pasujących wyników."

244252

245−#: Shell.qml:399

253+#: Shell.qml:429

246254#, qt-format

247255msgid "Please enter %1"

248256msgstr "Wprowadź %1"

po/pt_BR.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 07:39+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Pesquisas recentes"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Aplicativos"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Início"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Falando..."

237245msgid "Search"

238246msgstr "Pesquisar"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Desculpe, não há nada que corresponda à sua pesquisa."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/ro.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 07:53+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Romanian <ro@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "

1818"== 0) && (n != 0))) ? 2: 1));\n"

19−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

20−"X-Generator: Launchpad (build 16734)\n"

19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

20+"X-Generator: Launchpad (build 16750)\n"

2121

2222#: Applications/applications.js:23

2323msgid "Phone"

@@ -87,25 +87,69 @@ msgstr ""

8787msgid "YouTube"

8888msgstr ""

8989

90+#: Components/EdgeDemoOverlay.qml:145

91+msgid "Skip intro"

92+msgstr ""

93+

94+#: Components/EdgeDemo.qml:98

95+msgid "Right edge"

96+msgstr ""

97+

98+#: Components/EdgeDemo.qml:99

99+msgid "Try swiping from the right edge to unlock the phone"

100+msgstr ""

101+

102+#: Components/EdgeDemo.qml:135

103+msgid "Top edge"

104+msgstr ""

105+

106+#: Components/EdgeDemo.qml:136

107+msgid "Try swiping from the top edge to access the indicators"

108+msgstr ""

109+

110+#: Components/EdgeDemo.qml:161

111+msgid "Close"

112+msgstr ""

113+

114+#: Components/EdgeDemo.qml:162

115+msgid "Swipe up again to close the settings screen"

116+msgstr ""

117+

118+#: Components/EdgeDemo.qml:189

119+msgid "Left edge"

120+msgstr ""

121+

122+#: Components/EdgeDemo.qml:190

123+msgid "Swipe from the left to reveal the launcher for quick access to apps"

124+msgstr ""

125+

126+#: Components/EdgeDemo.qml:217

127+msgid "Well done"

128+msgstr ""

129+

130+#: Components/EdgeDemo.qml:218

131+msgid "You have now mastered the edge gestures and can start using the phone"

132+msgstr ""

133+

90134#: Components/PageHeader.qml:298

91135msgid "Recent searches"

92136msgstr "Căutări recente"

93137

94138#. TRANSLATORS: Number of persons who rated this app

95−#: Dash/Apps/AppInfo.qml:72

139+#: Dash/Apps/AppInfo.qml:73

96140#, qt-format

97141msgid "(%1)"

98142msgstr ""

99143

100144#. TRANSLATORS: Number of persons who wrote reviews for this app

101−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

145+#: Dash/Apps/AppInfo.qml:85

102146#, qt-format

103147msgid "%1 review"

104148msgid_plural "%1 reviews"

105149msgstr[0] ""

106150msgstr[1] ""

107151

108−#: Dash/Apps/AppPreview.qml:181

152+#: Dash/Apps/AppPreview.qml:175

109153msgid "Rate this"

110154msgstr ""

111155

@@ -125,42 +169,6 @@ msgstr ""

125169msgid "Comments:"

126170msgstr ""

127171

128−#: Dash/DashApps.qml:65

129−msgid "Running apps"

130−msgstr ""

131−

132−#: Dash/DashApps.qml:68

133−msgid "Frequently used"

134−msgstr ""

135−

136−#: Dash/DashApps.qml:71

137−msgid "Installed"

138−msgstr ""

139−

140−#: Dash/DashApps.qml:74

141−msgid "Available for download"

142−msgstr ""

143−

144−#: Dash/DashApps.qml:168

145−msgid "Apps"

146−msgstr "Aplicații"

147−

148−#: Dash/DashHome.qml:41

149−msgid "Frequent Apps"

150−msgstr ""

151−

152−#: Dash/DashHome.qml:44

153−msgid "Recent Music"

154−msgstr ""

155−

156−#: Dash/DashHome.qml:47

157−msgid "Videos Popular Online"

158−msgstr ""

159−

160−#: Dash/DashHome.qml:151

161−msgid "Home"

162−msgstr "Acasă"

163−

164172#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

165173msgid "Featured"

166174msgstr ""

@@ -201,7 +209,7 @@ msgstr ""

201209msgid "Author:"

202210msgstr ""

203211

204−#: Greeter/Lockscreen.qml:133

212+#: Greeter/Lockscreen.qml:134

205213msgid "Emergency Call"

206214msgstr ""

207215

@@ -238,12 +246,12 @@ msgstr "Vorbire..."

238246msgid "Search"

239247msgstr "Căutare"

240248

241−#: plugins/Unity/scope.cpp:298

249+#: plugins/Unity/scope.cpp:317

242250msgid "Sorry, there is nothing that matches your search."

243251msgstr ""

244252"Ne pare rău, nu este nimic care se potrivește căutării dumneavoastră."

245253

246−#: Shell.qml:399

254+#: Shell.qml:429

247255#, qt-format

248256msgid "Please enter %1"

249257msgstr ""

po/ru.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-28 06:40+0000\n"

1212"Last-Translator: Eugene Marshal <Unknown>\n"

1313"Language-Team: Russian <ru@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

20−"X-Generator: Launchpad (build 16734)\n"

19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

20+"X-Generator: Launchpad (build 16750)\n"

2121

2222#: Applications/applications.js:23

2323msgid "Phone"

@@ -87,25 +87,69 @@ msgstr "Википедия"

8787msgid "YouTube"

8888msgstr "YouTube"

8989

90+#: Components/EdgeDemoOverlay.qml:145

91+msgid "Skip intro"

92+msgstr ""

93+

94+#: Components/EdgeDemo.qml:98

95+msgid "Right edge"

96+msgstr ""

97+

98+#: Components/EdgeDemo.qml:99

99+msgid "Try swiping from the right edge to unlock the phone"

100+msgstr ""

101+

102+#: Components/EdgeDemo.qml:135

103+msgid "Top edge"

104+msgstr ""

105+

106+#: Components/EdgeDemo.qml:136

107+msgid "Try swiping from the top edge to access the indicators"

108+msgstr ""

109+

110+#: Components/EdgeDemo.qml:161

111+msgid "Close"

112+msgstr ""

113+

114+#: Components/EdgeDemo.qml:162

115+msgid "Swipe up again to close the settings screen"

116+msgstr ""

117+

118+#: Components/EdgeDemo.qml:189

119+msgid "Left edge"

120+msgstr ""

121+

122+#: Components/EdgeDemo.qml:190

123+msgid "Swipe from the left to reveal the launcher for quick access to apps"

124+msgstr ""

125+

126+#: Components/EdgeDemo.qml:217

127+msgid "Well done"

128+msgstr ""

129+

130+#: Components/EdgeDemo.qml:218

131+msgid "You have now mastered the edge gestures and can start using the phone"

132+msgstr ""

133+

90134#: Components/PageHeader.qml:298

91135msgid "Recent searches"

92136msgstr "Последние поисковые запросы"

93137

94138#. TRANSLATORS: Number of persons who rated this app

95−#: Dash/Apps/AppInfo.qml:72

139+#: Dash/Apps/AppInfo.qml:73

96140#, qt-format

97141msgid "(%1)"

98142msgstr ""

99143

100144#. TRANSLATORS: Number of persons who wrote reviews for this app

101−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

145+#: Dash/Apps/AppInfo.qml:85

102146#, qt-format

103147msgid "%1 review"

104148msgid_plural "%1 reviews"

105149msgstr[0] ""

106150msgstr[1] ""

107151

108−#: Dash/Apps/AppPreview.qml:181

152+#: Dash/Apps/AppPreview.qml:175

109153msgid "Rate this"

110154msgstr ""

111155

@@ -125,42 +169,6 @@ msgstr ""

125169msgid "Comments:"

126170msgstr ""

127171

128−#: Dash/DashApps.qml:65

129−msgid "Running apps"

130−msgstr "Запущенные приложения"

131−

132−#: Dash/DashApps.qml:68

133−msgid "Frequently used"

134−msgstr "Часто используемые"

135−

136−#: Dash/DashApps.qml:71

137−msgid "Installed"

138−msgstr "Установленные"

139−

140−#: Dash/DashApps.qml:74

141−msgid "Available for download"

142−msgstr "Доступно для загрузки"

143−

144−#: Dash/DashApps.qml:168

145−msgid "Apps"

146−msgstr "Приложения"

147−

148−#: Dash/DashHome.qml:41

149−msgid "Frequent Apps"

150−msgstr "Часто используемые приложения"

151−

152−#: Dash/DashHome.qml:44

153−msgid "Recent Music"

154−msgstr "Недавно прослушанная музыка"

155−

156−#: Dash/DashHome.qml:47

157−msgid "Videos Popular Online"

158−msgstr "Популярные видео из сети"

159−

160−#: Dash/DashHome.qml:151

161−msgid "Home"

162−msgstr "Главная"

163−

164172#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

165173msgid "Featured"

166174msgstr ""

@@ -201,7 +209,7 @@ msgstr "В главных ролях"

201209msgid "Author:"

202210msgstr "Автор:"

203211

204−#: Greeter/Lockscreen.qml:133

212+#: Greeter/Lockscreen.qml:134

205213msgid "Emergency Call"

206214msgstr ""

207215

@@ -238,11 +246,11 @@ msgstr "Говорите..."

238246msgid "Search"

239247msgstr "Поиск"

240248

241−#: plugins/Unity/scope.cpp:298

249+#: plugins/Unity/scope.cpp:317

242250msgid "Sorry, there is nothing that matches your search."

243251msgstr "Извините, поиск не дал результатов."

244252

245−#: Shell.qml:399

253+#: Shell.qml:429

246254#, qt-format

247255msgid "Please enter %1"

248256msgstr "Пожалуйста, введите %1"

po/si.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-26 22:36+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Sinhalese <si@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr ""

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr ""

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr ""

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr ""

237245msgid "Search"

238246msgstr ""

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr ""

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/sl.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-07-02 12:59+0000\n"

1212"Last-Translator: Damir Jerovšek <Unknown>\n"

1313"Language-Team: Slovenian <sl@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "

1818"n%100==4 ? 3 : 0);\n"

19−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

20−"X-Generator: Launchpad (build 16734)\n"

19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

20+"X-Generator: Launchpad (build 16750)\n"

2121

2222#: Applications/applications.js:23

2323msgid "Phone"

@@ -87,25 +87,69 @@ msgstr "Wikipedija"

8787msgid "YouTube"

8888msgstr "YouTube"

8989

90+#: Components/EdgeDemoOverlay.qml:145

91+msgid "Skip intro"

92+msgstr ""

93+

94+#: Components/EdgeDemo.qml:98

95+msgid "Right edge"

96+msgstr ""

97+

98+#: Components/EdgeDemo.qml:99

99+msgid "Try swiping from the right edge to unlock the phone"

100+msgstr ""

101+

102+#: Components/EdgeDemo.qml:135

103+msgid "Top edge"

104+msgstr ""

105+

106+#: Components/EdgeDemo.qml:136

107+msgid "Try swiping from the top edge to access the indicators"

108+msgstr ""

109+

110+#: Components/EdgeDemo.qml:161

111+msgid "Close"

112+msgstr ""

113+

114+#: Components/EdgeDemo.qml:162

115+msgid "Swipe up again to close the settings screen"

116+msgstr ""

117+

118+#: Components/EdgeDemo.qml:189

119+msgid "Left edge"

120+msgstr ""

121+

122+#: Components/EdgeDemo.qml:190

123+msgid "Swipe from the left to reveal the launcher for quick access to apps"

124+msgstr ""

125+

126+#: Components/EdgeDemo.qml:217

127+msgid "Well done"

128+msgstr ""

129+

130+#: Components/EdgeDemo.qml:218

131+msgid "You have now mastered the edge gestures and can start using the phone"

132+msgstr ""

133+

90134#: Components/PageHeader.qml:298

91135msgid "Recent searches"

92136msgstr "Nedavna iskanja"

93137

94138#. TRANSLATORS: Number of persons who rated this app

95−#: Dash/Apps/AppInfo.qml:72

139+#: Dash/Apps/AppInfo.qml:73

96140#, qt-format

97141msgid "(%1)"

98142msgstr ""

99143

100144#. TRANSLATORS: Number of persons who wrote reviews for this app

101−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

145+#: Dash/Apps/AppInfo.qml:85

102146#, qt-format

103147msgid "%1 review"

104148msgid_plural "%1 reviews"

105149msgstr[0] ""

106150msgstr[1] ""

107151

108−#: Dash/Apps/AppPreview.qml:181

152+#: Dash/Apps/AppPreview.qml:175

109153msgid "Rate this"

110154msgstr ""

111155

@@ -125,42 +169,6 @@ msgstr ""

125169msgid "Comments:"

126170msgstr ""

127171

128−#: Dash/DashApps.qml:65

129−msgid "Running apps"

130−msgstr ""

131−

132−#: Dash/DashApps.qml:68

133−msgid "Frequently used"

134−msgstr "Pogosto uporabljano"

135−

136−#: Dash/DashApps.qml:71

137−msgid "Installed"

138−msgstr "Nameščeno"

139−

140−#: Dash/DashApps.qml:74

141−msgid "Available for download"

142−msgstr "Na voljo za prejem"

143−

144−#: Dash/DashApps.qml:168

145−msgid "Apps"

146−msgstr "Programi"

147−

148−#: Dash/DashHome.qml:41

149−msgid "Frequent Apps"

150−msgstr "Pogosto uporabljani programi"

151−

152−#: Dash/DashHome.qml:44

153−msgid "Recent Music"

154−msgstr "Nedavna glasba"

155−

156−#: Dash/DashHome.qml:47

157−msgid "Videos Popular Online"

158−msgstr ""

159−

160−#: Dash/DashHome.qml:151

161−msgid "Home"

162−msgstr "Domov"

163−

164172#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

165173msgid "Featured"

166174msgstr "Predstavljeno"

@@ -201,7 +209,7 @@ msgstr ""

201209msgid "Author:"

202210msgstr ""

203211

204−#: Greeter/Lockscreen.qml:133

212+#: Greeter/Lockscreen.qml:134

205213msgid "Emergency Call"

206214msgstr ""

207215

@@ -238,11 +246,11 @@ msgstr "Govorjenje ..."

238246msgid "Search"

239247msgstr "Iskanje"

240248

241−#: plugins/Unity/scope.cpp:298

249+#: plugins/Unity/scope.cpp:317

242250msgid "Sorry, there is nothing that matches your search."

243251msgstr "Nič se ne ujema z vašim iskalnim nizom."

244252

245−#: Shell.qml:399

253+#: Shell.qml:429

246254#, qt-format

247255msgid "Please enter %1"

248256msgstr ""

po/sr.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 09:19+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Serbian <sr@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

20−"X-Generator: Launchpad (build 16734)\n"

19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

20+"X-Generator: Launchpad (build 16750)\n"

2121

2222#: Applications/applications.js:23

2323msgid "Phone"

@@ -87,25 +87,69 @@ msgstr ""

8787msgid "YouTube"

8888msgstr ""

8989

90+#: Components/EdgeDemoOverlay.qml:145

91+msgid "Skip intro"

92+msgstr ""

93+

94+#: Components/EdgeDemo.qml:98

95+msgid "Right edge"

96+msgstr ""

97+

98+#: Components/EdgeDemo.qml:99

99+msgid "Try swiping from the right edge to unlock the phone"

100+msgstr ""

101+

102+#: Components/EdgeDemo.qml:135

103+msgid "Top edge"

104+msgstr ""

105+

106+#: Components/EdgeDemo.qml:136

107+msgid "Try swiping from the top edge to access the indicators"

108+msgstr ""

109+

110+#: Components/EdgeDemo.qml:161

111+msgid "Close"

112+msgstr ""

113+

114+#: Components/EdgeDemo.qml:162

115+msgid "Swipe up again to close the settings screen"

116+msgstr ""

117+

118+#: Components/EdgeDemo.qml:189

119+msgid "Left edge"

120+msgstr ""

121+

122+#: Components/EdgeDemo.qml:190

123+msgid "Swipe from the left to reveal the launcher for quick access to apps"

124+msgstr ""

125+

126+#: Components/EdgeDemo.qml:217

127+msgid "Well done"

128+msgstr ""

129+

130+#: Components/EdgeDemo.qml:218

131+msgid "You have now mastered the edge gestures and can start using the phone"

132+msgstr ""

133+

90134#: Components/PageHeader.qml:298

91135msgid "Recent searches"

92136msgstr "Скорашње претраге"

93137

94138#. TRANSLATORS: Number of persons who rated this app

95−#: Dash/Apps/AppInfo.qml:72

139+#: Dash/Apps/AppInfo.qml:73

96140#, qt-format

97141msgid "(%1)"

98142msgstr ""

99143

100144#. TRANSLATORS: Number of persons who wrote reviews for this app

101−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

145+#: Dash/Apps/AppInfo.qml:85

102146#, qt-format

103147msgid "%1 review"

104148msgid_plural "%1 reviews"

105149msgstr[0] ""

106150msgstr[1] ""

107151

108−#: Dash/Apps/AppPreview.qml:181

152+#: Dash/Apps/AppPreview.qml:175

109153msgid "Rate this"

110154msgstr ""

111155

@@ -125,42 +169,6 @@ msgstr ""

125169msgid "Comments:"

126170msgstr ""

127171

128−#: Dash/DashApps.qml:65

129−msgid "Running apps"

130−msgstr ""

131−

132−#: Dash/DashApps.qml:68

133−msgid "Frequently used"

134−msgstr ""

135−

136−#: Dash/DashApps.qml:71

137−msgid "Installed"

138−msgstr ""

139−

140−#: Dash/DashApps.qml:74

141−msgid "Available for download"

142−msgstr ""

143−

144−#: Dash/DashApps.qml:168

145−msgid "Apps"

146−msgstr "Програми"

147−

148−#: Dash/DashHome.qml:41

149−msgid "Frequent Apps"

150−msgstr ""

151−

152−#: Dash/DashHome.qml:44

153−msgid "Recent Music"

154−msgstr ""

155−

156−#: Dash/DashHome.qml:47

157−msgid "Videos Popular Online"

158−msgstr ""

159−

160−#: Dash/DashHome.qml:151

161−msgid "Home"

162−msgstr "Почетна"

163−

164172#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

165173msgid "Featured"

166174msgstr ""

@@ -201,7 +209,7 @@ msgstr ""

201209msgid "Author:"

202210msgstr ""

203211

204−#: Greeter/Lockscreen.qml:133

212+#: Greeter/Lockscreen.qml:134

205213msgid "Emergency Call"

206214msgstr ""

207215

@@ -238,11 +246,11 @@ msgstr "Говор..."

238246msgid "Search"

239247msgstr "Претрага"

240248

241−#: plugins/Unity/scope.cpp:298

249+#: plugins/Unity/scope.cpp:317

242250msgid "Sorry, there is nothing that matches your search."

243251msgstr "Нажалост, претрага није наишла на икакво подударање."

244252

245−#: Shell.qml:399

253+#: Shell.qml:429

246254#, qt-format

247255msgid "Please enter %1"

248256msgstr ""

po/sv.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-26 22:36+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Swedish <sv@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr ""

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr ""

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr ""

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr ""

237245msgid "Search"

238246msgstr ""

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr ""

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/te.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 09:57+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Telugu <te@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr ""

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr ""

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "నివాసం"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr ""

237245msgid "Search"

238246msgstr ""

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr ""

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/tr.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 10:08+0000\n"

1212"Last-Translator: Adar Cem EREN <adarcemeren34@gmail.com>\n"

1313"Language-Team: Turkish <tr@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr "Vikipedi"

8686msgid "YouTube"

8787msgstr "YouTube"

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "Son Arananlar"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr "Çalışan uygulamalar"

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "Sıkça kullanılanlar"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "Yüklenenler"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr "İndirilebilir durumda"

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "Uygulamalar"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr "Sıkça Kullanılan Uygulamalar"

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr "En Son Müzik"

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr "Çevrimiçi Yaygın Videolar"

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "Ana Sayfa"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr "Öne Çıkanlar"

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr "Yazar:"

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "Konuşuyor..."

237245msgid "Search"

238246msgstr "Ara"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "Üzgünüz, aramanızla eşleşen hiçbir şey yok."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/ug.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 11:02+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Uyghur <ug@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr "ۋىكىپېدىيە"

8686msgid "YouTube"

8787msgstr "YouTube"

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "يېقىنقى ئىزدەشلەر"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr "ئىجرا بولۇۋاتقان ئەپلەر"

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "كوپ ئىشلىتىلگەنلىرى"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "ئورنىتىلغانلىرى"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr "چۈشۈرگىلى بولىدىغانلىرى"

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "ئەپلەر"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr "دائىم ئىشلىتىلىدىغان ئەپلەر"

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr "يېقىندا ئاڭلىغان مۇزىكىلار"

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr "توردىكى ئالقىشقا ئېرىشكەن سىنلار"

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "ماكان"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr "داڭلىق"

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr "ئاپتور:"

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "سۆزلەۋاتىسىز…"

237245msgid "Search"

238246msgstr "ئىزدە"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "كەچۈرۈڭ، ئىزدىگىنىڭىزگە ماس نەتىجە تېپىلمىدى."

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/uk.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-07-21 05:47+0000\n"

1212"Last-Translator: Ярослав Смук <Smuk.Slavko@yandex.ua>\n"

1313"Language-Team: Ukrainian <uk@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

20−"X-Generator: Launchpad (build 16734)\n"

19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

20+"X-Generator: Launchpad (build 16750)\n"

2121

2222#: Applications/applications.js:23

2323msgid "Phone"

@@ -87,25 +87,69 @@ msgstr "Вікіпедія"

8787msgid "YouTube"

8888msgstr "YouTube"

8989

90+#: Components/EdgeDemoOverlay.qml:145

91+msgid "Skip intro"

92+msgstr ""

93+

94+#: Components/EdgeDemo.qml:98

95+msgid "Right edge"

96+msgstr ""

97+

98+#: Components/EdgeDemo.qml:99

99+msgid "Try swiping from the right edge to unlock the phone"

100+msgstr ""

101+

102+#: Components/EdgeDemo.qml:135

103+msgid "Top edge"

104+msgstr ""

105+

106+#: Components/EdgeDemo.qml:136

107+msgid "Try swiping from the top edge to access the indicators"

108+msgstr ""

109+

110+#: Components/EdgeDemo.qml:161

111+msgid "Close"

112+msgstr ""

113+

114+#: Components/EdgeDemo.qml:162

115+msgid "Swipe up again to close the settings screen"

116+msgstr ""

117+

118+#: Components/EdgeDemo.qml:189

119+msgid "Left edge"

120+msgstr ""

121+

122+#: Components/EdgeDemo.qml:190

123+msgid "Swipe from the left to reveal the launcher for quick access to apps"

124+msgstr ""

125+

126+#: Components/EdgeDemo.qml:217

127+msgid "Well done"

128+msgstr ""

129+

130+#: Components/EdgeDemo.qml:218

131+msgid "You have now mastered the edge gestures and can start using the phone"

132+msgstr ""

133+

90134#: Components/PageHeader.qml:298

91135msgid "Recent searches"

92136msgstr "Нещодавні пошуки"

93137

94138#. TRANSLATORS: Number of persons who rated this app

95−#: Dash/Apps/AppInfo.qml:72

139+#: Dash/Apps/AppInfo.qml:73

96140#, qt-format

97141msgid "(%1)"

98142msgstr ""

99143

100144#. TRANSLATORS: Number of persons who wrote reviews for this app

101−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

145+#: Dash/Apps/AppInfo.qml:85

102146#, qt-format

103147msgid "%1 review"

104148msgid_plural "%1 reviews"

105149msgstr[0] ""

106150msgstr[1] ""

107151

108−#: Dash/Apps/AppPreview.qml:181

152+#: Dash/Apps/AppPreview.qml:175

109153msgid "Rate this"

110154msgstr ""

111155

@@ -125,42 +169,6 @@ msgstr ""

125169msgid "Comments:"

126170msgstr ""

127171

128−#: Dash/DashApps.qml:65

129−msgid "Running apps"

130−msgstr "Запущені програми"

131−

132−#: Dash/DashApps.qml:68

133−msgid "Frequently used"

134−msgstr "Найчастіше використовувані"

135−

136−#: Dash/DashApps.qml:71

137−msgid "Installed"

138−msgstr "Встановлені"

139−

140−#: Dash/DashApps.qml:74

141−msgid "Available for download"

142−msgstr "Доступно до завантаження"

143−

144−#: Dash/DashApps.qml:168

145−msgid "Apps"

146−msgstr "Програми"

147−

148−#: Dash/DashHome.qml:41

149−msgid "Frequent Apps"

150−msgstr "Часто використовувані програми"

151−

152−#: Dash/DashHome.qml:44

153−msgid "Recent Music"

154−msgstr "Нещодавно прослухана музика"

155−

156−#: Dash/DashHome.qml:47

157−msgid "Videos Popular Online"

158−msgstr "Популярні в мережі відео"

159−

160−#: Dash/DashHome.qml:151

161−msgid "Home"

162−msgstr "Домівка"

163−

164172#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

165173msgid "Featured"

166174msgstr "Рекомендовані"

@@ -201,7 +209,7 @@ msgstr "Актори:"

201209msgid "Author:"

202210msgstr "Автор:"

203211

204−#: Greeter/Lockscreen.qml:133

212+#: Greeter/Lockscreen.qml:134

205213msgid "Emergency Call"

206214msgstr ""

207215

@@ -238,11 +246,11 @@ msgstr "Мовлення…"

238246msgid "Search"

239247msgstr "Пошук"

240248

241−#: plugins/Unity/scope.cpp:298

249+#: plugins/Unity/scope.cpp:317

242250msgid "Sorry, there is nothing that matches your search."

243251msgstr "Вибачте, для вказаних вами ключових слів нічого не знайдено."

244252

245−#: Shell.qml:399

253+#: Shell.qml:429

246254#, qt-format

247255msgid "Please enter %1"

248256msgstr "Будь ласка, введіть %1"

po/unity8.pot+51−43

@@ -8,7 +8,7 @@ msgid ""

88msgstr ""

99"Project-Id-Version: unity8\n"

1010"Report-Msgid-Bugs-To: \n"

11−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

11+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1414"Language-Team: LANGUAGE <LL@li.org>\n"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr ""

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr ""

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr ""

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr ""

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr ""

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr ""

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr ""

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr ""

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr ""

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr ""

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr ""

237245msgid "Search"

238246msgstr ""

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr ""

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/zh_CN.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 10:33+0000\n"

1212"Last-Translator: Anthony Wong <anthony.wong@canonical.com>\n"

1313"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr "维基百科"

8686msgid "YouTube"

8787msgstr "YouTube"

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "近期搜索"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr "正在运行的应用程序"

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "常用"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "已安装"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr "可供下载"

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "应用程序"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr "常用软件"

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr "近期听过的音乐"

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr "热门在线视频"

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "主页"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr "推荐"

@@ -200,7 +208,7 @@ msgstr "主演："

200208msgid "Author:"

201209msgstr "作者："

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "讲话中..."

237245msgid "Search"

238246msgstr "搜索"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "对不起，没有找到您想要的结果。"

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

po/zh_TW.po+53−45

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2013-08-09 12:18+0200\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

1111"PO-Revision-Date: 2013-06-27 10:24+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Generator: Launchpad (build 16750)\n"

2020

2121#: Applications/applications.js:23

2222msgid "Phone"

@@ -86,25 +86,69 @@ msgstr ""

8686msgid "YouTube"

8787msgstr ""

8888

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

89133#: Components/PageHeader.qml:298

90134msgid "Recent searches"

91135msgstr "最近搜尋"

92136

93137#. TRANSLATORS: Number of persons who rated this app

94−#: Dash/Apps/AppInfo.qml:72

138+#: Dash/Apps/AppInfo.qml:73

95139#, qt-format

96140msgid "(%1)"

97141msgstr ""

98142

99143#. TRANSLATORS: Number of persons who wrote reviews for this app

100−#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

144+#: Dash/Apps/AppInfo.qml:85

101145#, qt-format

102146msgid "%1 review"

103147msgid_plural "%1 reviews"

104148msgstr[0] ""

105149msgstr[1] ""

106150

107−#: Dash/Apps/AppPreview.qml:181

151+#: Dash/Apps/AppPreview.qml:175

108152msgid "Rate this"

109153msgstr ""

110154

@@ -124,42 +168,6 @@ msgstr ""

124168msgid "Comments:"

125169msgstr ""

126170

127−#: Dash/DashApps.qml:65

128−msgid "Running apps"

129−msgstr "執行中的程式"

130−

131−#: Dash/DashApps.qml:68

132−msgid "Frequently used"

133−msgstr "最常使用"

134−

135−#: Dash/DashApps.qml:71

136−msgid "Installed"

137−msgstr "已安裝"

138−

139−#: Dash/DashApps.qml:74

140−msgid "Available for download"

141−msgstr "可供下載"

142−

143−#: Dash/DashApps.qml:168

144−msgid "Apps"

145−msgstr "程式"

146−

147−#: Dash/DashHome.qml:41

148−msgid "Frequent Apps"

149−msgstr "常用的程式"

150−

151−#: Dash/DashHome.qml:44

152−msgid "Recent Music"

153−msgstr "最近聽過的音樂"

154−

155−#: Dash/DashHome.qml:47

156−msgid "Videos Popular Online"

157−msgstr "線上熱門的影片"

158−

159−#: Dash/DashHome.qml:151

160−msgid "Home"

161−msgstr "家屋"

162−

163171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

164172msgid "Featured"

165173msgstr ""

@@ -200,7 +208,7 @@ msgstr ""

200208msgid "Author:"

201209msgstr ""

202210

203−#: Greeter/Lockscreen.qml:133

211+#: Greeter/Lockscreen.qml:134

204212msgid "Emergency Call"

205213msgstr ""

206214

@@ -237,11 +245,11 @@ msgstr "說話中..."

237245msgid "Search"

238246msgstr "搜尋"

239247

240−#: plugins/Unity/scope.cpp:298

248+#: plugins/Unity/scope.cpp:317

241249msgid "Sorry, there is nothing that matches your search."

242250msgstr "很抱歉，找不到符合您想搜尋的結果。"

243251

244−#: Shell.qml:399

252+#: Shell.qml:429

245253#, qt-format

246254msgid "Please enter %1"

247255msgstr ""

tests/autopilot/unity8/shell/tests/test_lock_screen.py+2

@@ -178,3 +178,5 @@ class TestLockscreen(UnityTestCase):

178178 except AssertionError:

179179 if retries > 0:

180180 self._type_character(character, prompt, retries-1)

181+ else:

182+ raise

tests/mocks/AccountsService/AccountsService.cppnew file+33

@@ -0,0 +1,33 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Author: Michael Terry <michael.terry@canonical.com>

17+ */

18+

19+#include "AccountsService.h"

20+

21+AccountsService::AccountsService(QObject* parent)

22+ : QObject(parent)

23+{

24+}

25+

26+QVariant AccountsService::getUserProperty(const QString &, const QString &)

27+{

28+ return QVariant(false);

29+}

30+

31+void AccountsService::setUserProperty(const QString &, const QString &, const QVariant &)

32+{

33+}

tests/mocks/AccountsService/AccountsService.hnew file+38

@@ -0,0 +1,38 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors: Gerry Boland <gerry.boland@canonical.com>

17+ * Michael Terry <michael.terry@canonical.com>

18+ */

19+

20+#ifndef UNITY_MOCK_ACCOUNTSSERVICE_H

21+#define UNITY_MOCK_ACCOUNTSSERVICE_H

22+

23+#include <QObject>

24+#include <QString>

25+#include <QVariant>

26+

27+class AccountsService: public QObject

28+{

29+ Q_OBJECT

30+

31+public:

32+ explicit AccountsService(QObject *parent = 0);

33+

34+ Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &property);

35+ Q_INVOKABLE void setUserProperty(const QString &user, const QString &property, const QVariant &value);

36+};

37+

38+#endif

tests/mocks/AccountsService/CMakeLists.txtnew file+19

@@ -0,0 +1,19 @@

1+add_library(MockAccountsService-qml MODULE

2+ AccountsService.cpp

3+ plugin.cpp

4+ )

6+qt5_use_modules(MockAccountsService-qml DBus Qml)

8+# copy files into build directory for shadow builds

9+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"

10+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}

11+ )

12+

13+install(TARGETS MockAccountsService-qml

14+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/AccountsService

15+ )

16+

17+install(FILES qmldir

18+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/AccountsService

19+ )

tests/mocks/AccountsService/plugin.cppnew file+36

@@ -0,0 +1,36 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors: Gerry Boland <gerry.boland@canonical.com>

17+ * Michael Terry <michael.terry@canonical.com>

18+ */

19+

20+#include "plugin.h"

21+#include "AccountsService.h"

22+

23+#include <QtQml>

24+

25+static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

26+{

27+ Q_UNUSED(engine)

28+ Q_UNUSED(scriptEngine)

29+ return new AccountsService();

30+}

31+

32+void AccountsServicePlugin::registerTypes(const char *uri)

33+{

34+ Q_ASSERT(uri == QLatin1String("AccountsService"));

35+ qmlRegisterSingletonType<AccountsService>(uri, 0, 1, "AccountsService", service_provider);

36+}

tests/mocks/AccountsService/plugin.hnew file+35

@@ -0,0 +1,35 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors: Gerry Boland <gerry.boland@canonical.com>

17+ * Michael Terry <michael.terry@canonical.com>

18+ */

19+

20+#ifndef MOCK_ACCOUNTSSERVICE_PLUGIN_H

21+#define MOCK_ACCOUNTSSERVICE_PLUGIN_H

22+

23+#include <QQmlEngine>

24+#include <QQmlExtensionPlugin>

25+

26+class AccountsServicePlugin : public QQmlExtensionPlugin

27+{

28+ Q_OBJECT

29+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

30+

31+public:

32+ void registerTypes(const char *uri);

33+};

34+

35+#endif

tests/mocks/AccountsService/qmldirnew file+2

@@ -0,0 +1,2 @@

1+module AccountsService

2+plugin MockAccountsService-qml

tests/mocks/CMakeLists.txt+1

@@ -1,3 +1,4 @@

1+add_subdirectory(AccountsService)

12add_subdirectory(GSettings.1.0)

23add_subdirectory(HudClient)

34add_subdirectory(libusermetrics)

tests/mocks/LightDM/demo/GreeterPrivate.cpp+4−2

@@ -55,11 +55,13 @@ void GreeterPrivate::handleRespond(const QString &response)

5555 QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);

5656 QVariant password = settings.value("password", "none");

5757

58+ QString passwordValue;

5859 if (password == "pin") {

59− authenticated = (response == "1234");

60+ passwordValue = settings.value("passwordValue", "1234").toString();

6061 } else {

61− authenticated = (response == "password");

62+ passwordValue = settings.value("passwordValue", "password").toString();

6263 }

64+ authenticated = (response == passwordValue);

6365 Q_EMIT q->authenticationComplete();

6466}

6567

tests/mocks/Unity/CMakeLists.txt+2

@@ -17,6 +17,8 @@ add_definitions(-DQT_NO_KEYWORDS)

1717

1818set(UnityQML_SOURCES

1919 ${CMAKE_SOURCE_DIR}/plugins/Unity/categoryresults.cpp

20+ fake_applications_scope.cpp

21+ fake_preview.cpp

2022 fake_scope.cpp

2123 fake_scopes.cpp

2224 fake_categories.cpp

tests/mocks/Unity/Launcher/CMakeLists.txt+2

@@ -1,6 +1,8 @@

11include(FindPkgConfig)

22pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)

4+add_definitions(-DTOP_SRCDIR="${CMAKE_SOURCE_DIR}")

46include_directories(

57 ${CMAKE_CURRENT_SOURCE_DIR}

68)

tests/mocks/Unity/Launcher/MockLauncherItem.cpp+17−1

@@ -27,12 +27,13 @@ MockLauncherItem::MockLauncherItem(const QString &appId, const QString& desktopF

2727 m_appId(appId),

2828 m_desktopFile(desktopFile),

2929 m_name(name),

30− m_icon(icon),

30+ m_icon(TOP_SRCDIR "/graphics/applicationIcons/" + icon + ".png"),

3131 m_pinned(false),

3232 m_running(false),

3333 m_recent(false),

3434 m_progress(-1),

3535 m_count(0),

36+ m_focused(false),

3637 m_quickList(new MockQuickListModel(this))

3738{

3839

@@ -128,6 +129,21 @@ void MockLauncherItem::setCount(int count)

128129 }

129130}

130131

132+bool MockLauncherItem::focused() const

133+{

134+ return m_focused;

135+}

136+

137+void MockLauncherItem::setFocused(bool focused)

138+{

139+ if (m_focused != focused)

140+ {

141+ m_focused = focused;

142+ Q_EMIT focusedChanged(focused);

143+ }

144+}

145+

146+

131147unity::shell::launcher::QuickListModelInterface *MockLauncherItem::quickList() const

132148{

133149 return m_quickList;

tests/mocks/Unity/Launcher/MockLauncherItem.h+4

@@ -52,6 +52,9 @@ public:

5252 int count() const;

5353 void setCount(int count);

5454

55+ bool focused() const;

56+ void setFocused(bool focused);

57+

5558 unity::shell::launcher::QuickListModelInterface *quickList() const;

5659

5760private:

@@ -64,6 +67,7 @@ private:

6467 bool m_recent;

6568 int m_progress;

6669 int m_count;

70+ bool m_focused;

6771 MockQuickListModel *m_quickList;

6872};

6973

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+9

@@ -25,6 +25,7 @@ MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(pa

2525 MockLauncherItem *item = new MockLauncherItem("phone-app", "/usr/share/applications/phone-app.desktop", "Phone", "phone-app", this);

2626 item->setProgress(0);

2727 m_list.append(item);

28+ item->setFocused(true);

2829 item = new MockLauncherItem("camera-app", "/usr/share/applications/camera-app.desktop", "Camera", "camera", this);

2930 item->setProgress(10);

3031 m_list.append(item);

@@ -49,6 +50,7 @@ MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(pa

4950 item = new MockLauncherItem("notes-app", "/usr/share/applications/notes-app.desktop", "Notepad", "notepad", this);

5051 item->setProgress(50);

5152 item->setCount(5);

53+ item->setFocused(true);

5254 m_list.append(item);

5355 item = new MockLauncherItem("calendar-app", "/usr/share/applications/calendar-app.desktop","Calendar", "calendar", this);

5456 m_list.append(item);

@@ -85,6 +87,8 @@ QVariant MockLauncherModel::data(const QModelIndex& index, int role) const

8587 return item->progress();

8688 case RoleCount:

8789 return item->count();

90+ case RoleFocused:

91+ return item->focused();

8892 }

8993

9094 return QVariant();

@@ -180,3 +184,8 @@ void MockLauncherModel::setUser(const QString &username)

180184 Q_UNUSED(username)

181185 // TODO: implement this...

182186}

187+

188+void MockLauncherModel::applicationFocused(const QString &appId)

189+{

190+ Q_UNUSED(appId)

191+}

tests/mocks/Unity/Launcher/MockLauncherModel.h+1

@@ -44,6 +44,7 @@ public:

4444 Q_INVOKABLE void requestRemove(const QString &appId);

4545 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);

4646 Q_INVOKABLE void setUser(const QString &username);

47+ Q_INVOKABLE void applicationFocused(const QString &appId);

4748

4849Q_SIGNALS:

4950 void quickListTriggered(const QString &appId, int index);

tests/mocks/Unity/fake_applications_scope.cppnew file+68

@@ -0,0 +1,68 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "fake_applications_scope.h"

18+

19+static const gchar * categories_model_schema[] = {

20+ "s", //ID

21+ "s", // DISPLAY_NAME

22+ "s", // ICON_HINT

23+ "s", // RENDERER_NAME

24+ "a{sv}" // HINTS

25+};

26+

27+ApplicationsScope::ApplicationsScope(bool visible, QObject* parent)

28+ : Scope(parent)

29+{

30+ m_id = "applications.scope";

31+ m_name = "Applications";

32+ m_visible = visible;

33+ m_categories->setModel(createCategoriesModel());

34+}

35+

36+DeeModel* ApplicationsScope::createCategoriesModel()

37+{

38+ DeeModel* category_model = dee_sequence_model_new();

39+ dee_model_set_schema_full(category_model, categories_model_schema, G_N_ELEMENTS(categories_model_schema));

40+ GVariant* hints = g_variant_new_array(g_variant_type_element(G_VARIANT_TYPE_VARDICT), NULL, 0);

41+

42+ GVariant* children[1];

43+ children[0] = g_variant_new_dict_entry(g_variant_new_string("content-type"),

44+ g_variant_new_variant(g_variant_new_string("apps")));

45+ GVariant* recentHints = g_variant_new_array(g_variant_type_element(G_VARIANT_TYPE_VARDICT), children, 1);

46+ dee_model_append(category_model,

47+ "recent",

48+ "Recent",

49+ "gtk-apply",

50+ "special",

51+ recentHints);

52+

53+ dee_model_append(category_model,

54+ "installed",

55+ "Installed",

56+ "gtk-apply",

57+ "grid",

58+ hints);

59+

60+ dee_model_append(category_model,

61+ "suggested",

62+ "Suggested",

63+ "gtk-apply",

64+ "grid",

65+ hints);

66+

67+ return category_model;

68+}

tests/mocks/Unity/fake_applications_scope.hnew file+33

@@ -0,0 +1,33 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef FAKE_APPLICATIONS_SCOPE_H

18+#define FAKE_APPLICATIONS_SCOPE_H

19+

20+#include "fake_scope.h"

21+

22+class ApplicationsScope : public Scope

23+{

24+ Q_OBJECT

25+

26+public:

27+ ApplicationsScope(bool visible, QObject* parent = 0);

28+

29+private:

30+ DeeModel* createCategoriesModel();

31+};

32+

33+#endif // FAKE_APPLICATIONS_SCOPE_H

tests/mocks/Unity/fake_categories.cpp+84−12

@@ -24,11 +24,20 @@

2424

2525#define CATEGORY_COLUMN 2

2626

27+// TODO: use something from libunity once it's public

28+enum CategoryColumn {

29+ ID,

30+ DISPLAY_NAME,

31+ ICON_HINT,

32+ RENDERER_NAME,

33+ HINTS

34+};

35+

2736Categories::Categories(QObject* parent)

2837 : DeeListModel(parent)

2938{

3039 // FIXME: need to clean up unused filters on countChanged

31− m_roles[Categories::RoleId] = "id";

40+ m_roles[Categories::RoleCategoryId] = "categoryId";

3241 m_roles[Categories::RoleName] = "name";

3342 m_roles[Categories::RoleIcon] = "icon";

3443 m_roles[Categories::RoleRenderer] = "renderer";

@@ -36,7 +45,6 @@ Categories::Categories(QObject* parent)

3645 m_roles[Categories::RoleHints] = "hints";

3746 m_roles[Categories::RoleResults] = "results";

3847 m_roles[Categories::RoleCount] = "count";

39− m_roles[Categories::RoleCategoryIndex] = "categoryIndex";

4048

4149 // TODO This should not be needed but accumulatting the count changes

4250 // makes the visualization more stable and also makes crashes on fast

@@ -74,6 +82,25 @@ Categories::onCountChanged()

7482 }

7583}

7684

85+void Categories::onRowCountChanged()

86+{

87+ QAbstractItemModel* model = qobject_cast<QAbstractItemModel*>(sender());

88+ // find the corresponding category index

89+ for (auto iter = m_overriddenCategories.begin(); iter != m_overriddenCategories.end(); ++iter) {

90+ if (iter.value() == model) {

91+ for (int i = 0; i < rowCount(); i++) {

92+ auto id = data(index(i), RoleCategoryId).toString();

93+ if (id != iter.key()) continue;

94+ QVector<int> roles;

95+ roles.append(RoleCount);

96+ QModelIndex changedIndex = index(i);

97+ Q_EMIT dataChanged(changedIndex, changedIndex, roles);

98+ break;

99+ }

100+ }

101+ }

102+}

103+

77104void

78105Categories::onEmitCountChanged()

79106{

@@ -93,6 +120,41 @@ Categories::roleNames() const

93120 return m_roles;

94121}

95122

123+void Categories::onOverrideModelDestroyed()

124+{

125+ QObject* model = sender();

126+ auto iter = m_overriddenCategories.begin();

127+ while (iter != m_overriddenCategories.end()) {

128+ if (iter.value() == model) {

129+ iter = m_overriddenCategories.erase(iter);

130+ continue;

131+ }

132+ ++iter;

133+ }

134+}

135+

136+void Categories::overrideResults(const QString& categoryId, QAbstractItemModel* model)

137+{

138+ m_overriddenCategories[categoryId] = model;

139+ // watch the model

140+ connect(model, &QObject::destroyed, this, &Categories::onOverrideModelDestroyed);

141+ connect(model, &QAbstractItemModel::rowsInserted, this, &Categories::onRowCountChanged);

142+ connect(model, &QAbstractItemModel::rowsRemoved, this, &Categories::onRowCountChanged);

143+ connect(model, &QAbstractItemModel::modelReset, this, &Categories::onRowCountChanged);

144+

145+ // emit the dataChanged signal if the category is already in the model

146+ for (int i = 0; i < rowCount(); i++) {

147+ auto id = data(index(i), RoleCategoryId).toString();

148+ if (id != categoryId) continue;

149+ QVector<int> roles;

150+ roles.append(RoleCount);

151+ roles.append(RoleResults);

152+ QModelIndex changedIndex = index(i);

153+ Q_EMIT dataChanged(changedIndex, changedIndex, roles);

154+ break;

155+ }

156+}

157+

96158void Categories::setResultModel(DeeModel* model)

97159{

98160 // FIXME: should ref it

@@ -154,27 +216,37 @@ Categories::data(const QModelIndex& index, int role) const

154216 }

155217

156218 switch (role) {

157− case RoleId:

158− return DeeListModel::data(index, 0); //ID

219+ case RoleCategoryId:

220+ return DeeListModel::data(index, CategoryColumn::ID);

159221 case RoleName:

160− return DeeListModel::data(index, 1); //DISPLAY_NAME

222+ return DeeListModel::data(index, CategoryColumn::DISPLAY_NAME);

161223 case RoleIcon:

162− return DeeListModel::data(index, 2); //ICON_HINT

224+ return DeeListModel::data(index, CategoryColumn::ICON_HINT);

163225 case RoleRenderer:

164− return DeeListModel::data(index, 3); //RENDERER_NAME

226+ return DeeListModel::data(index, CategoryColumn::RENDERER_NAME);

165227 case RoleContentType:

166228 {

167− auto hints = DeeListModel::data(index, 4).toHash();

168− return hints.contains("content-type") ? hints["content-type"] : QVariant(QString("default"));

229+ auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();

230+ return hints.contains("content-type") ? hints["content-type"] : QVariant(QString("default"));

169231 }

170232 case RoleHints:

171− return DeeListModel::data(index, 4); //HINTS

233+ return DeeListModel::data(index, CategoryColumn::HINTS);

172234 case RoleResults:

235+ if (m_overriddenCategories.size() > 0)

236+ {

237+ auto id = DeeListModel::data(index, CategoryColumn::ID).toString();

238+ if (m_overriddenCategories.find(id) != m_overriddenCategories.end())

239+ return QVariant::fromValue(m_overriddenCategories[id]);

240+ }

173241 return QVariant::fromValue(getFilter(index.row()));

174242 case RoleCount:

243+ if (m_overriddenCategories.size() > 0)

244+ {

245+ auto id = DeeListModel::data(index, CategoryColumn::ID).toString();

246+ if (m_overriddenCategories.find(id) != m_overriddenCategories.end())

247+ return QVariant::fromValue(m_overriddenCategories[id]->rowCount());

248+ }

175249 return QVariant::fromValue(getFilter(index.row())->rowCount());

176− case RoleCategoryIndex:

177− return QVariant::fromValue(index.row());

178250 default:

179251 return QVariant();

180252 }

tests/mocks/Unity/fake_categories.h+7−3

@@ -34,17 +34,18 @@ class Categories : public DeeListModel

3434public:

3535 Categories(QObject* parent = 0);

3636 enum Roles {

37− RoleId,

37+ RoleCategoryId,

3838 RoleName,

3939 RoleIcon,

4040 RoleRenderer,

4141 RoleContentType,

4242 RoleHints,

4343 RoleResults,

44− RoleCount,

45− RoleCategoryIndex

44+ RoleCount

4645 };

4746

47+ Q_INVOKABLE void overrideResults(const QString& categoryId, QAbstractItemModel* model);

48+

4849 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;

4950

5051 QHash<int, QByteArray> roleNames() const;

@@ -54,7 +55,9 @@ public:

5455

5556private Q_SLOTS:

5657 void onCountChanged();

58+ void onRowCountChanged();

5759 void onEmitCountChanged();

60+ void onOverrideModelDestroyed();

5861

5962private:

6063 DeeModel* getResultsForCategory(unsigned index) const;

@@ -64,6 +67,7 @@ private:

6467 QTimer m_timer;

6568 QSet<DeeListModel*> m_timerFilters;

6669 QHash<int, QByteArray> m_roles;

70+ QMap<QString, QAbstractItemModel*> m_overriddenCategories;

6771 mutable QMap<int, DeeListModel*> m_filters;

6872};

6973

tests/mocks/Unity/fake_preview.cppnew file+66

@@ -0,0 +1,66 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "fake_preview.h"

18+

19+QString Preview::rendererName() const

20+{

21+ return "foo";

22+}

23+

24+QString Preview::title() const

25+{

26+ return "Title";

27+}

28+

29+QString Preview::subtitle() const

30+{

31+ return "Subtitle";

32+}

33+

34+QString Preview::description() const

35+{

36+ return "Description";

37+}

38+

39+QVariant Preview::actions()

40+{

41+ return QVariant();

42+}

43+

44+QVariant Preview::infoHints()

45+{

46+ return QVariant();

47+}

48+

49+QVariantMap Preview::infoHintsHash() const

50+{

51+ return QVariantMap();

52+}

53+

54+QString Preview::image() const

55+{

56+ return "";

57+}

58+

59+QString Preview::imageSourceUri() const

60+{

61+ return "";

62+}

63+

64+void Preview::execute(const QString& actionId, const QHash<QString, QVariant>& hints)

65+{

66+}

tests/mocks/Unity/fake_preview.hnew file+62

@@ -0,0 +1,62 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef FAKE_PREVIEW_H

18+#define FAKE_PREVIEW_H

19+

20+// Qt

21+#include <QObject>

22+#include <QString>

23+#include <QMetaType>

24+#include <QList>

25+#include <QVariantMap>

26+

27+class Q_DECL_EXPORT Preview : public QObject

28+{

29+ Q_OBJECT

30+

31+ Q_PROPERTY(QString rendererName READ rendererName NOTIFY previewChanged)

32+ Q_PROPERTY(QString title READ title NOTIFY previewChanged)

33+ Q_PROPERTY(QString subtitle READ subtitle NOTIFY previewChanged)

34+ Q_PROPERTY(QString description READ description NOTIFY previewChanged)

35+ Q_PROPERTY(QVariant actions READ actions NOTIFY previewChanged)

36+ Q_PROPERTY(QVariant infoHints READ infoHints NOTIFY previewChanged)

37+ Q_PROPERTY(QVariantMap infoMap READ infoHintsHash NOTIFY previewChanged)

38+ Q_PROPERTY(QString image READ image NOTIFY previewChanged)

39+ Q_PROPERTY(QString imageSourceUri READ imageSourceUri NOTIFY previewChanged)

40+

41+public:

42+ explicit Preview(QObject *parent = 0);

43+

44+ QString rendererName() const;

45+ QString title() const;

46+ QString subtitle() const;

47+ QString description() const;

48+ QVariant actions();

49+ QVariant infoHints();

50+ QVariantMap infoHintsHash() const;

51+ QString image() const;

52+ QString imageSourceUri() const;

53+

54+ Q_INVOKABLE void execute(const QString& actionId, const QHash<QString, QVariant>& hints);

55+

56+Q_SIGNALS:

57+ void previewChanged();

58+};

59+

60+Q_DECLARE_METATYPE(Preview *)

61+

62+#endif // FAKE_PREVIEW_H

tests/mocks/Unity/fake_scope.cpp+33−9

@@ -20,6 +20,8 @@

2020#include <dee.h>

2121#include "paths.h"

2222

23+#include "fake_preview.h"

24+

2325static DeeModel* create_categories_model(unsigned category_count);

2426static DeeModel* create_results_model(unsigned category_count, unsigned result_count);

2527

@@ -127,6 +129,36 @@ void Scope::setNoResultsHint(const QString& str) {

127129 }

128130}

129131

132+void Scope::activate(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

133+ const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

134+ const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata)

135+{

136+ Q_UNUSED(uri);

137+ Q_UNUSED(icon_hint);

138+ Q_UNUSED(category);

139+ Q_UNUSED(result_type);

140+ Q_UNUSED(mimetype);

141+ Q_UNUSED(title);

142+ Q_UNUSED(comment);

143+ Q_UNUSED(dnd_uri);

144+ Q_UNUSED(metadata);

145+}

146+

147+void Scope::preview(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

148+ const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

149+ const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata)

150+{

151+ Q_UNUSED(uri);

152+ Q_UNUSED(icon_hint);

153+ Q_UNUSED(category);

154+ Q_UNUSED(result_type);

155+ Q_UNUSED(mimetype);

156+ Q_UNUSED(title);

157+ Q_UNUSED(comment);

158+ Q_UNUSED(dnd_uri);

159+ Q_UNUSED(metadata);

160+}

161+

130162static const gchar * categories_model_schema[] = {

131163 "s", //ID

132164 "s", // DISPLAY_NAME

@@ -168,14 +200,6 @@ static const gchar * results_model_schema[] = {

168200 "a{sv}" // METADATA

169201};

170202

171−static const gchar * icons[] = {

172− "Applications.png",

173− "Home.png",

174− "Music.png",

175− "People.png",

176− "Videos.png",

177−};

178−

179203DeeModel* create_results_model(unsigned category_count, unsigned result_count) {

180204 DeeModel* results_model = dee_sequence_model_new();

181205 dee_model_set_schema_full(results_model, results_model_schema, G_N_ELEMENTS(results_model_schema));

@@ -187,7 +211,7 @@ DeeModel* create_results_model(unsigned category_count, unsigned result_count) {

187211

188212 dee_model_append(results_model,

189213 ("uri://result."+std::to_string(i)).c_str(),

190− (shellAppDirectory() + "Dash/graphics/scopeIcons/" + (icons[i%G_N_ELEMENTS(icons)])).toLatin1().data(),

214+ (shellAppDirectory() + "graphics/applicationIcons/dash.png").toLatin1().data(),

191215 category,

192216 0,

193217 "application/x-desktop",

tests/mocks/Unity/fake_scope.h+15−1

@@ -21,6 +21,8 @@

2121#include <QObject>

2222#include "fake_categories.h"

2323

24+class Preview;

25+

2426class Scope : public QObject

2527{

2628 Q_OBJECT

@@ -63,6 +65,13 @@ public:

6365 void setNoResultsHint(const QString& hint);

6466 void setFormFactor(const QString& form_factor);

6567

68+ Q_INVOKABLE void activate(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

69+ const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

70+ const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata);

71+ Q_INVOKABLE void preview(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

72+ const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

73+ const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata);

74+

6675Q_SIGNALS:

6776 void idChanged(const QString&);

6877 void nameChanged(const QString&);

@@ -78,7 +87,12 @@ Q_SIGNALS:

7887 void noResultsHintChanged();

7988 void formFactorChanged();

8089

81−private:

90+ // signals triggered by activate(..) or preview(..) requests.

91+ void previewReady(Preview *preview);

92+ void activateApplication(const QString &desktop);

93+

94+protected:

95+

8296 QString m_id;

8397 QString m_iconHint;

8498 QString m_description;

tests/mocks/Unity/fake_scopes.cpp+4−1

@@ -19,6 +19,9 @@

1919// Self

2020#include "fake_scopes.h"

2121

22+// Local

23+#include "fake_applications_scope.h"

24+

2225// TODO: Implement remaining pieces, like Categories (i.e. LensView now gives warnings)

2326

2427// Qt

@@ -53,7 +56,7 @@ void Scopes::updateScopes()

5356 addScope(new Scope("MockScope1", "People", true, this));

5457 addScope(new Scope("MockScope2", "Music", false, this));

5558 addScope(new Scope("home.scope", "Home", true, this));

56− addScope(new Scope("applications.scope", "Applications", true, this));

59+ addScope(new ApplicationsScope(true, this));

5760 addScope(new Scope("MockScope5", "Videos", true, this));

5861

5962 if (!m_loaded) {

tests/plugins/AccountsService/AccountsServer.cppnew file+35

@@ -0,0 +1,35 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but

9+ * WITHOUT ANY WARRANTY; without even the implied warranties of

10+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * version 3 along with this program. If not, see

15+ * <http://www.gnu.org/licenses/>

16+ *

17+ * Authored by: Michael Terry <michael.terry@canonical.com>

18+ */

19+

20+#include "AccountsServer.h"

21+

22+AccountsServer::AccountsServer(QObject *parent)

23+ : QObject(parent)

24+{

25+}

26+

27+QDBusObjectPath AccountsServer::FindUserByName(const QString &user)

28+{

29+ if (user == "testuser") {

30+ return QDBusObjectPath("/user");

31+ } else {

32+ sendErrorReply(QDBusError::InvalidArgs, "Bad user");

33+ return QDBusObjectPath("/");

34+ }

35+}

tests/plugins/AccountsService/AccountsServer.hnew file+39

@@ -0,0 +1,39 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but

9+ * WITHOUT ANY WARRANTY; without even the implied warranties of

10+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * version 3 along with this program. If not, see

15+ * <http://www.gnu.org/licenses/>

16+ *

17+ * Authored by: Michael Terry <michael.terry@canonical.com>

18+ */

19+

20+#ifndef UNITY_ACCOUNTSSERVER_H

21+#define UNITY_ACCOUNTSSERVER_H

22+

23+#include <QDBusContext>

24+#include <QDBusObjectPath>

25+#include <QObject>

26+#include <QString>

27+

28+class AccountsServer: public QObject, protected QDBusContext

29+{

30+ Q_OBJECT

31+

32+public:

33+ explicit AccountsServer(QObject *parent = 0);

34+

35+public Q_SLOTS:

36+ QDBusObjectPath FindUserByName(const QString &user);

37+};

38+

39+#endif

tests/plugins/AccountsService/CMakeLists.txtnew file+40

@@ -0,0 +1,40 @@

1+macro(make_dbus_class NAME INTERFACE)

2+ if(${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/${NAME}Adaptor.h)

3+ execute_process(COMMAND qdbusxml2cpp -c ${NAME}Adaptor -a ${CMAKE_CURRENT_BINARY_DIR}/${NAME}Adaptor ${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml ${INTERFACE})

4+ endif()

5+endmacro(make_dbus_class)

7+make_dbus_class(Accounts org.freedesktop.Accounts)

8+make_dbus_class(Properties org.freedesktop.DBus.Properties)

10+include_directories(

11+ ${CMAKE_CURRENT_BINARY_DIR}

12+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService

13+ )

14+

15+add_definitions(-DSM_BUSNAME=sessionBus)

16+

17+add_executable(mock-server

18+ ${CMAKE_CURRENT_BINARY_DIR}/AccountsAdaptor.cpp

19+ ${CMAKE_CURRENT_BINARY_DIR}/PropertiesAdaptor.cpp

20+ server.cpp

21+ AccountsServer.cpp

22+ PropertiesServer.cpp

23+ )

24+qt5_use_modules(mock-server Core DBus)

25+

26+add_executable(test-accountsservice

27+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp

28+ client.cpp

29+ )

30+qt5_use_modules(test-accountsservice Core DBus Test)

31+

32+add_test(NAME test-accountsservice

33+ COMMAND dbus-test-runner

34+ --task ${CMAKE_CURRENT_BINARY_DIR}/mock-server

35+ --task-name server

36+ --ignore-return

37+ --task ${CMAKE_CURRENT_BINARY_DIR}/test-accountsservice

38+ --task-name client

39+ --wait-for org.freedesktop.Accounts

40+ )

tests/plugins/AccountsService/PropertiesServer.cppnew file+45

@@ -0,0 +1,45 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but

9+ * WITHOUT ANY WARRANTY; without even the implied warranties of

10+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * version 3 along with this program. If not, see

15+ * <http://www.gnu.org/licenses/>

16+ *

17+ * Authored by: Michael Terry <michael.terry@canonical.com>

18+ */

19+

20+#include "PropertiesServer.h"

21+

22+PropertiesServer::PropertiesServer(QObject *parent)

23+ : QObject(parent),

24+ edge_demo(true)

25+{

26+}

27+

28+QDBusVariant PropertiesServer::Get(const QString &interface, const QString &property)

29+{

30+ if (interface == "com.canonical.unity.AccountsService" && property == "demo-edges") {

31+ return QDBusVariant(QVariant(edge_demo));

32+ } else {

33+ sendErrorReply(QDBusError::InvalidArgs, "Bad interface or property");

34+ return QDBusVariant(QVariant());

35+ }

36+}

37+

38+void PropertiesServer::Set(const QString &interface, const QString &property, const QDBusVariant &variant)

39+{

40+ if (interface == "com.canonical.unity.AccountsService" && property == "demo-edges") {

41+ edge_demo = variant.variant().toBool();

42+ } else {

43+ sendErrorReply(QDBusError::InvalidArgs, "Bad interface or property");

44+ }

45+}

tests/plugins/AccountsService/PropertiesServer.hnew file+44

@@ -0,0 +1,44 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but

9+ * WITHOUT ANY WARRANTY; without even the implied warranties of

10+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * version 3 along with this program. If not, see

15+ * <http://www.gnu.org/licenses/>

16+ *

17+ * Authored by: Michael Terry <michael.terry@canonical.com>

18+ */

19+

20+#ifndef UNITY_PROPERTIESSERVER_H

21+#define UNITY_PROPERTIESSERVER_H

22+

23+#include "PropertiesServer.h"

24+#include <QDBusContext>

25+#include <QDBusVariant>

26+#include <QObject>

27+#include <QString>

28+

29+class PropertiesServer: public QObject, protected QDBusContext

30+{

31+ Q_OBJECT

32+

33+public:

34+ explicit PropertiesServer(QObject *parent = 0);

35+

36+public Q_SLOTS:

37+ QDBusVariant Get(const QString &interface, const QString &property);

38+ void Set(const QString &interface, const QString &property, const QDBusVariant &variant);

39+

40+private:

41+ bool edge_demo;

42+};

43+

44+#endif

tests/plugins/AccountsService/client.cppnew file+49

@@ -0,0 +1,49 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but

9+ * WITHOUT ANY WARRANTY; without even the implied warranties of

10+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * version 3 along with this program. If not, see

15+ * <http://www.gnu.org/licenses/>

16+ *

17+ * Authored by: Michael Terry <michael.terry@canonical.com>

18+ */

19+

20+#include "AccountsService.h"

21+#include <QSignalSpy>

22+#include <QTest>

23+

24+class AccountsServiceTest : public QObject

25+{

26+ Q_OBJECT

27+

28+private Q_SLOTS:

29+

30+ void testInvalids()

31+ {

32+ // Test various invalid calls

33+ AccountsService session;

34+ QCOMPARE(session.getUserProperty("NOPE", "demo-edges"), QVariant());

35+ QCOMPARE(session.getUserProperty("testuser", "NOPE"), QVariant());

36+ }

37+

38+ void testGetSet()

39+ {

40+ AccountsService session;

41+ QCOMPARE(session.getUserProperty("testuser", "demo-edges"), QVariant(true));

42+ session.setUserProperty("testuser", "demo-edges", QVariant(false));

43+ QCOMPARE(session.getUserProperty("testuser", "demo-edges"), QVariant(false));

44+ }

45+};

46+

47+QTEST_MAIN(AccountsServiceTest)

48+

49+#include "client.moc"

tests/plugins/AccountsService/interfaces.xmlnew file+20

@@ -0,0 +1,20 @@

1+<node>

2+ <interface name="org.freedesktop.DBus.Properties">

3+ <method name="Get">

4+ <arg name="interface" type="s" direction="in" />

5+ <arg name="property" type="s" direction="in" />

6+ <arg name="value" type="v" direction="out" />

7+ </method>

8+ <method name="Set">

9+ <arg name="interface" type="s" direction="in" />

10+ <arg name="property" type="s" direction="in" />

11+ <arg name="value" type="v" direction="in" />

12+ </method>

13+ </interface>

14+ <interface name="org.freedesktop.Accounts">

15+ <method name="FindUserByName">

16+ <arg name="user" type="s" direction="in" />

17+ <arg name="path" type="o" direction="out" />

18+ </method>

19+ </interface>

20+</node>

tests/plugins/AccountsService/server.cppnew file+46

@@ -0,0 +1,46 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but

9+ * WITHOUT ANY WARRANTY; without even the implied warranties of

10+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * version 3 along with this program. If not, see

15+ * <http://www.gnu.org/licenses/>

16+ *

17+ * Authored by: Michael Terry <michael.terry@canonical.com>

18+ */

19+

20+#include "AccountsAdaptor.h"

21+#include "AccountsServer.h"

22+#include "PropertiesAdaptor.h"

23+#include "PropertiesServer.h"

24+#include <QCoreApplication>

25+

26+int main(int argc, char *argv[])

27+{

28+ QCoreApplication a(argc, argv);

29+

30+ auto accounts = new AccountsServer();

31+ new AccountsAdaptor(accounts);

32+

33+ auto props = new PropertiesServer();

34+ new PropertiesAdaptor(props);

35+

36+ // We use the session bus for testing. The real plugin uses the system bus

37+ auto connection = QDBusConnection::sessionBus();

38+ if (!connection.registerObject("/org/freedesktop/Accounts", accounts))

39+ return 1;

40+ if (!connection.registerObject("/user", props))

41+ return 1;

42+ if (!connection.registerService("org.freedesktop.Accounts"))

43+ return 1;

44+

45+ return a.exec();

46+}

tests/plugins/CMakeLists.txt+3−2

@@ -1,4 +1,5 @@

1−add_subdirectory(Utils)

1+add_subdirectory(AccountsService)

2+add_subdirectory(ListViewWithPageHeader)

23add_subdirectory(Ubuntu)

34add_subdirectory(Unity)

4−add_subdirectory(ListViewWithPageHeader)

5+add_subdirectory(Utils)

tests/plugins/Unity/CMakeLists.txt+1

@@ -1,4 +1,5 @@

11add_subdirectory(Indicators)

2+add_subdirectory(Launcher)

34pkg_check_modules(UNITYCORE REQUIRED unity-core-6.0)

45pkg_check_modules(LIBUNITYPROTO REQUIRED unity-protocol-private)

tests/plugins/Unity/Launcher/CMakeLists.txtnew file+59

@@ -0,0 +1,59 @@

1+pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

2+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)

4+include_directories(

5+ ${CMAKE_CURRENT_BINARY_DIR}

6+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService

7+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher

8+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend

9+ ${GSETTINGS_QT_INCLUDE_DIRS}

10+ )

11+

12+add_definitions(-DSM_BUSNAME=sessionBus)

13+add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")

14+add_definitions(-DLAUNCHER_TESTING)

15+

16+### LauncherBackendTest

17+set(testBackendCommand ${CMAKE_CURRENT_BINARY_DIR}/launcherbackendtestExec

18+ -o ${CMAKE_BINARY_DIR}/launcherbackendtest.xml,xunitxml

19+ -o -,txt)

20+add_test(NAME launcherbackendtest COMMAND ${testBackendCommand})

21+add_custom_target(launcherbackendtest ${testBackendCommand})

22+add_executable(launcherbackendtestExec

23+ launcherbackendtest.cpp

24+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp

25+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp

26+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp

27+ )

28+target_link_libraries(launcherbackendtestExec ${GSETTINGS_QT_LDFLAGS})

29+qt5_use_modules(launcherbackendtestExec Test Core DBus)

30+

31+### LauncherModelTest

32+set(testModelCommand ${CMAKE_CURRENT_BINARY_DIR}/launchermodeltestExec

33+ -o ${CMAKE_BINARY_DIR}/launchermodeltest.xml,xunitxml

34+ -o -,txt)

35+add_test(NAME launchermodeltest COMMAND ${testModelCommand})

36+add_custom_target(launchermodeltest ${testModelCommand})

37+add_executable(launchermodeltestExec

38+ launchermodeltest.cpp

39+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launchermodel.cpp

40+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launcheritem.cpp

41+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistmodel.cpp

42+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp

43+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp

44+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp

45+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

46+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

47+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

48+ )

49+target_link_libraries(launchermodeltestExec ${GSETTINGS_QT_LDFLAGS} )

50+qt5_use_modules(launchermodeltestExec Test Core DBus)

51+

52+# copy .desktop files into build directory for shadow builds

53+file(GLOB DESKTOP_FILES *.desktop)

54+

55+foreach(DESKTOP_FILE ${DESKTOP_FILES})

56+ file(COPY "${DESKTOP_FILE}"

57+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}

58+ )

59+endforeach()

tests/plugins/Unity/Launcher/abs-icon.desktopnew file+3

@@ -0,0 +1,3 @@

1+[Desktop Entry]

2+Name=Absolute Icon

3+Icon=/path/to/icon.png

tests/plugins/Unity/Launcher/launcherbackendtest.cppnew file+60

@@ -0,0 +1,60 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Michael Terry <michael.terry@canonical.com>

18+ */

19+

20+#include "launcherbackend.h"

21+

22+#include <QtTest>

23+

24+class LauncherBackendTest : public QObject

25+{

26+ Q_OBJECT

27+

28+private Q_SLOTS:

29+ void testFileNames()

30+ {

31+ LauncherBackend backend(false);

32+

33+ backend.setStoredApplications(QStringList() << "rel-icon" << "abs-icon" << "invalid");

34+ QCOMPARE(backend.storedApplications(), QStringList() << "rel-icon" << "abs-icon");

35+ }

36+

37+ void testPinning()

38+ {

39+ LauncherBackend backend(false);

40+

41+ backend.setStoredApplications(QStringList() << "rel-icon" << "abs-icon");

42+ QCOMPARE(backend.isPinned("rel-icon"), false);

43+ QCOMPARE(backend.isPinned("abs-icon"), false);

44+

45+ backend.setPinned("rel-icon", true);

46+ QCOMPARE(backend.isPinned("rel-icon"), true);

47+

48+ backend.setStoredApplications(QStringList() << "rel-icon" << "abs-icon" << "no-name");

49+ QCOMPARE(backend.isPinned("rel-icon"), true);

50+ QCOMPARE(backend.isPinned("no-name"), false);

51+

52+ backend.setPinned("no-name", true);

53+ backend.setStoredApplications(QStringList() << "rel-icon" << "abs-icon");

54+ QCOMPARE(backend.isPinned("rel-icon"), true);

55+ QCOMPARE(backend.isPinned("no-name"), false); // doesn't exist anymore!

56+ }

57+};

58+

59+QTEST_GUILESS_MAIN(LauncherBackendTest)

60+#include "launcherbackendtest.moc"

tests/plugins/Unity/Launcher/launchermodeltest.cppnew file+146

@@ -0,0 +1,146 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Michael Zanetti <michael.zanetti@canonical.com>

18+ */

19+

20+// unity-api

21+#include <unity/shell/launcher/LauncherModelInterface.h>

22+

23+#include "launcheritem.h"

24+#include "launchermodel.h"

25+

26+#include <QtTest>

27+

28+class LauncherModelTest : public QObject

29+{

30+ Q_OBJECT

31+

32+private:

33+ LauncherModel *launcherModel;

34+

35+private Q_SLOTS:

36+

37+ void initTestCase() {

38+ launcherModel = new LauncherModel(this);

39+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 0);

40+ }

41+

42+ void init() {

43+ qDebug() << "init";

44+ launcherModel->applicationFocused("abs-icon");

45+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

46+

47+ launcherModel->applicationFocused("no-icon.desktop");

48+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

49+

50+ launcherModel->applicationFocused(QString());

51+ }

52+

53+ void cleanup() {

54+ while (launcherModel->rowCount(QModelIndex()) > 0) {

55+ launcherModel->requestRemove(launcherModel->get(0)->appId());

56+ }

57+ }

58+

59+ void testMove() {

60+ QCOMPARE(launcherModel->get(0)->pinned(), false);

61+ QCOMPARE(launcherModel->get(1)->pinned(), false);

62+

63+ LauncherItemInterface *item0BeforeMove = launcherModel->get(0);

64+ LauncherItemInterface *item1BeforeMove = launcherModel->get(1);

65+ launcherModel->move(1, 0);

66+

67+ QCOMPARE(item0BeforeMove, launcherModel->get(1));

68+ QCOMPARE(item1BeforeMove, launcherModel->get(0));

69+

70+ // moved item must be pinned now

71+ QCOMPARE(item0BeforeMove->pinned(), false);

72+ QCOMPARE(item1BeforeMove->pinned(), true);

73+ }

74+

75+ void testPinning() {

76+ QCOMPARE(launcherModel->get(0)->pinned(), false);

77+ QCOMPARE(launcherModel->get(1)->pinned(), false);

78+ launcherModel->pin(launcherModel->get(0)->appId());

79+ QCOMPARE(launcherModel->get(0)->pinned(), true);

80+ QCOMPARE(launcherModel->get(1)->pinned(), false);

81+ }

82+

83+ void testRemove() {

84+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

85+ launcherModel->requestRemove(launcherModel->get(0)->appId());

86+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

87+ }

88+

89+ void testQuickListPinningRemoving() {

90+ // we start with 2 unpinned items

91+ QCOMPARE(launcherModel->get(0)->pinned(), false);

92+ QCOMPARE(launcherModel->get(1)->pinned(), false);

93+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

94+

95+ // find the Pin item in the quicklist

96+ QuickListModel *model = qobject_cast<QuickListModel*>(launcherModel->get(0)->quickList());

97+ int pinActionIndex = -1;

98+ for (int i = 0; i < model->rowCount(QModelIndex()); ++i) {

99+ if (model->get(i).actionId() == "pin_item") {

100+ pinActionIndex = i;

101+ break;

102+ }

103+ }

104+ QVERIFY(pinActionIndex >= 0);

105+

106+ // trigger pin item quicklist action => Item must be pinned now.

107+ launcherModel->quickListActionInvoked(launcherModel->get(0)->appId(), pinActionIndex);

108+ QCOMPARE(launcherModel->get(0)->pinned(), true);

109+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

110+

111+ // quicklist needs to transform to remove item. trigger it and check it item goes away

112+ launcherModel->quickListActionInvoked(launcherModel->get(0)->appId(), pinActionIndex);

113+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

114+ }

115+

116+ void testApplicationFocused() {

117+ // all apps unfocused at beginning...

118+ QCOMPARE(launcherModel->get(0)->focused(), false);

119+ QCOMPARE(launcherModel->get(1)->focused(), false);

120+

121+ launcherModel->applicationFocused("abs-icon");

122+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

123+ QCOMPARE(launcherModel->get(0)->focused(), true);

124+ QCOMPARE(launcherModel->get(1)->focused(), false);

125+

126+ launcherModel->applicationFocused("no-icon");

127+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

128+ QCOMPARE(launcherModel->get(0)->focused(), false);

129+ QCOMPARE(launcherModel->get(1)->focused(), true);

130+

131+ launcherModel->applicationFocused("rel-icon");

132+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 3);

133+ QCOMPARE(launcherModel->get(0)->focused(), false);

134+ QCOMPARE(launcherModel->get(1)->focused(), false);

135+ QCOMPARE(launcherModel->get(2)->focused(), true);

136+

137+ launcherModel->applicationFocused(QString());

138+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 3);

139+ QCOMPARE(launcherModel->get(0)->focused(), false);

140+ QCOMPARE(launcherModel->get(1)->focused(), false);

141+ QCOMPARE(launcherModel->get(2)->focused(), false);

142+ }

143+};

144+

145+QTEST_GUILESS_MAIN(LauncherModelTest)

146+#include "launchermodeltest.moc"

tests/plugins/Unity/Launcher/no-icon.desktopnew file+2

@@ -0,0 +1,2 @@

1+[Desktop Entry]

2+Name=No Icon

tests/plugins/Unity/Launcher/no-name.desktopnew file+2

@@ -0,0 +1,2 @@

1+[Desktop Entry]

2+Icon=no-name

tests/plugins/Unity/Launcher/rel-icon.desktopnew file+3

@@ -0,0 +1,3 @@

1+[Desktop Entry]

2+Name=Relative Icon

3+Icon=rel-icon

tests/plugins/Unity/filtersbindingstest.cpp+61−30

@@ -65,17 +65,17 @@ DeeModel* FiltersBindingsTest::createFilterModel()

6565

6666void FiltersBindingsTest::createMultiRangeFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount)

6767{

68− createFilter(model, "filter-multirange", id, name, optionCount);

68+ createFilter(model, "filter-multirange", id, name, optionCount, true);

6969}

7070

7171void FiltersBindingsTest::createRadioOptionFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount)

7272{

73− createFilter(model, "filter-radiooption", id, name, optionCount);

73+ createFilter(model, "filter-radiooption", id, name, optionCount, true);

7474}

7575

7676void FiltersBindingsTest::createCheckOptionFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount)

7777{

78− createFilter(model, "filter-checkoption", id, name, optionCount);

78+ createFilter(model, "filter-checkoption", id, name, optionCount, true);

7979}

8080

8181void FiltersBindingsTest::createRatingsFilter(DeeModel *model, const std::string &id, const std::string &name)

@@ -90,7 +90,7 @@ void FiltersBindingsTest::createRatingsFilter(DeeModel *model, const std::string

9090 GVariant *children[2];

9191 GVariant *key1 = g_variant_new_string("show-all-button");

9292 GVariant *key2 = g_variant_new_string("rating");

93− children[0] = g_variant_new_dict_entry(key1, g_variant_new_variant(g_variant_new_boolean(false)));

93+ children[0] = g_variant_new_dict_entry(key1, g_variant_new_variant(g_variant_new_boolean(true)));

9494 children[1] = g_variant_new_dict_entry(key2, g_variant_new_variant(g_variant_new_double(0.0f)));

9595 auto fhints = g_variant_new_array(G_VARIANT_TYPE("{sv}"), children, 2);

9696

@@ -102,7 +102,7 @@ void FiltersBindingsTest::createRatingsFilter(DeeModel *model, const std::string

102102 dee_model_append_row(model, row);

103103}

104104

105−void FiltersBindingsTest::createFilter(DeeModel *model, const std::string &renderer, const std::string &id, const std::string &name, int optionCount)

105+void FiltersBindingsTest::createFilter(DeeModel *model, const std::string &renderer, const std::string &id, const std::string &name, int optionCount, bool showAll)

106106{

107107 GVariant* row[8];

108108

@@ -114,7 +114,7 @@ void FiltersBindingsTest::createFilter(DeeModel *model, const std::string &rende

114114 GVariant *children[2];

115115 GVariant *key1 = g_variant_new_string("show-all-button");

116116 GVariant *key2 = g_variant_new_string("options");

117− children[0] = g_variant_new_dict_entry(key1, g_variant_new_variant(g_variant_new_boolean(false)));

117+ children[0] = g_variant_new_dict_entry(key1, g_variant_new_variant(g_variant_new_boolean(showAll)));

118118 children[1] = g_variant_new_dict_entry(key2, g_variant_new_variant(createOptions(optionCount)));

119119 auto fhints = g_variant_new_array(G_VARIANT_TYPE("{sv}"), children, 2);

120120

@@ -143,9 +143,9 @@ void FiltersBindingsTest::testMultiRangeFilter()

143143 auto multi_filter = dynamic_cast<MultiRangeFilter*>(bind_filter);

144144 QVERIFY(multi_filter != nullptr);

145145 auto options = multi_filter->options();

146− QCOMPARE(options->rowCount(), 1);

146+ QCOMPARE(options->rowCount(), 2);

147147

148− auto idx = options->index(0);

148+ auto idx = options->index(1);

149149 QVariant id_var = options->data(idx, GenericOptionsModel::RoleId);

150150 QVariant name_var = options->data(idx, GenericOptionsModel::RoleName);

151151 QVariant icon_var = options->data(idx, GenericOptionsModel::RoleIconHint);

@@ -168,9 +168,9 @@ void FiltersBindingsTest::testMultiRangeFilter()

168168 auto multi_filter = dynamic_cast<MultiRangeFilter*>(bind_filter);

169169 QVERIFY(multi_filter != nullptr);

170170 auto options = multi_filter->options();

171− QCOMPARE(options->rowCount(), 2);

171+ QCOMPARE(options->rowCount(), 3);

172172

173− auto idx = options->index(0);

173+ auto idx = options->index(1);

174174 QVariant id_var = options->data(idx, GenericOptionsModel::RoleId);

175175 QVariant name_var = options->data(idx, GenericOptionsModel::RoleName);

176176 QVariant icon_var = options->data(idx, GenericOptionsModel::RoleIconHint);

@@ -181,10 +181,10 @@ void FiltersBindingsTest::testMultiRangeFilter()

181181 QCOMPARE(icon_var.toString(), QString(""));

182182 QCOMPARE(active_var.toBool(), false);

183183

184− AbstractFilterOption* opt1 = options->getRawOption(0);

184+ AbstractFilterOption* opt1 = options->getRawOption(1);

185185 QCOMPARE(opt1->id(), QString("opt0"));

186186

187− AbstractFilterOption* opt2 = options->getRawOption(1);

187+ AbstractFilterOption* opt2 = options->getRawOption(2);

188188 QCOMPARE(opt2->id(), QString("opt1"));

189189

190190 delete multi_filter;

@@ -199,18 +199,21 @@ void FiltersBindingsTest::testMultiRangeFilter()

199199 auto multi_filter = dynamic_cast<MultiRangeFilter*>(bind_filter);

200200 QVERIFY(multi_filter != nullptr);

201201 auto options = multi_filter->options();

202− QCOMPARE(options->rowCount(), 3);

202+ QCOMPARE(options->rowCount(), 4);

203+

204+ AbstractFilterOption* showAll = options->getRawOption(0);

205+ QVERIFY(showAll->id().startsWith("show_all::"));

203206

204− AbstractFilterOption* opt0 = options->getRawOption(0);

207+ AbstractFilterOption* opt0 = options->getRawOption(1);

205208 QCOMPARE(opt0->id(), QString("opt0"));

206209

207− AbstractFilterOption* opt1 = options->getRawOption(1);

210+ AbstractFilterOption* opt1 = options->getRawOption(2);

208211 QCOMPARE(opt1->id(), QString("opt1"));

209212

210− AbstractFilterOption* opt2 = options->getRawOption(2);

213+ AbstractFilterOption* opt2 = options->getRawOption(3);

211214 QCOMPARE(opt2->id(), QString("opt2"));

212215

213− // verify combined filter options are bound to correct underlying unity options

216+ // verify filter options are bound to correct underlying unity options

214217 auto core_multi_filter = std::dynamic_pointer_cast<unity::dash::MultiRangeFilter>(core_filter);

215218 QCOMPARE(QString::fromStdString(core_multi_filter->options()[0]->id()), QString("opt0"));

216219 QCOMPARE(QString::fromStdString(core_multi_filter->options()[1]->id()), QString("opt1"));

@@ -274,7 +277,7 @@ void FiltersBindingsTest::testCheckOptionFilter()

274277 auto check_filter = dynamic_cast<CheckOptionFilter*>(bind_filter);

275278 QVERIFY(check_filter != nullptr);

276279 auto options = check_filter->options();

277− QCOMPARE(options->rowCount(), 3);

280+ QCOMPARE(options->rowCount(), 4);

278281

279282 QCOMPARE(check_filter->id(), QString("f1"));

280283 QCOMPARE(check_filter->name(), QString("Filter1"));

@@ -284,7 +287,7 @@ void FiltersBindingsTest::testCheckOptionFilter()

284287 QCOMPARE(check_filter->collapsed(), false);

285288 QCOMPARE(check_filter->filtering(), false);

286289

287− auto idx = options->index(0);

290+ auto idx = options->index(1);

288291 QVariant id_var = options->data(idx, GenericOptionsModel::RoleId);

289292 QVariant name_var = options->data(idx, GenericOptionsModel::RoleName);

290293 QVariant icon_var = options->data(idx, GenericOptionsModel::RoleIconHint);

@@ -295,7 +298,7 @@ void FiltersBindingsTest::testCheckOptionFilter()

295298 QCOMPARE(icon_var.toString(), QString(""));

296299 QCOMPARE(active_var.toBool(), false);

297300

298− idx = options->index(1);

301+ idx = options->index(2);

299302 id_var = options->data(idx, GenericOptionsModel::RoleId);

300303 name_var = options->data(idx, GenericOptionsModel::RoleName);

301304 icon_var = options->data(idx, GenericOptionsModel::RoleIconHint);

@@ -306,38 +309,55 @@ void FiltersBindingsTest::testCheckOptionFilter()

306309 QCOMPARE(icon_var.toString(), QString(""));

307310 QCOMPARE(active_var.toBool(), false);

308311

309− AbstractFilterOption* opt0 = options->getRawOption(0);

310− AbstractFilterOption* opt1 = options->getRawOption(1);

311− AbstractFilterOption* opt2 = options->getRawOption(2);

312+ AbstractFilterOption* showAll = options->getRawOption(0);

313+ AbstractFilterOption* opt0 = options->getRawOption(1);

314+ AbstractFilterOption* opt1 = options->getRawOption(2);

315+ AbstractFilterOption* opt2 = options->getRawOption(3);

312316

317+ QSignalSpy showAllSpy(showAll, SIGNAL(activeChanged(bool)));

313318 QSignalSpy opt0spy(opt0, SIGNAL(activeChanged(bool)));

314319 QSignalSpy opt1spy(opt1, SIGNAL(activeChanged(bool)));

315320 QSignalSpy opt2spy(opt2, SIGNAL(activeChanged(bool)));

316321 QSignalSpy dataChangedSpy(options, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));

317322

318323 // test active property changes

324+ QCOMPARE(showAll->active(), false);

319325 QCOMPARE(opt0->active(), false);

320326 QCOMPARE(opt1->active(), false);

321327 QCOMPARE(opt2->active(), false);

322328

323329 opt0->setActive(true);

330+ QCOMPARE(showAllSpy.count(), 0);

324331 QCOMPARE(opt0spy.count(), 1);

325332 QCOMPARE(opt1spy.count(), 0);

326333 QCOMPARE(opt2spy.count(), 0);

334+ QCOMPARE(showAll->active(), false);

327335 QCOMPARE(opt0->active(), true);

328336 QCOMPARE(opt1->active(), false);

329337 QCOMPARE(opt2->active(), false);

330338

331339 opt1->setActive(true);

340+ QCOMPARE(showAllSpy.count(), 0);

332341 QCOMPARE(opt0spy.count(), 2);

333342 QCOMPARE(opt1spy.count(), 1);

334343 QCOMPARE(opt2spy.count(), 0);

344+ QCOMPARE(showAll->active(), false);

335345 QCOMPARE(opt0->active(), false);

336346 QCOMPARE(opt1->active(), true);

337347 QCOMPARE(opt2->active(), false);

338348

339349 QCOMPARE(dataChangedSpy.count(), 3);

340350

351+ showAll->setActive(true);

352+ QCOMPARE(showAllSpy.count(), 1);

353+ QCOMPARE(opt0spy.count(), 2);

354+ QCOMPARE(opt1spy.count(), 2);

355+ QCOMPARE(opt2spy.count(), 0);

356+ QCOMPARE(showAll->active(), true);

357+ QCOMPARE(opt0->active(), false);

358+ QCOMPARE(opt1->active(), false);

359+ QCOMPARE(opt2->active(), false);

360+

341361 delete check_filter;

342362 }

343363}

@@ -357,7 +377,7 @@ void FiltersBindingsTest::testRadioOptionFilter()

357377 auto radio_filter = dynamic_cast<RadioOptionFilter*>(bind_filter);

358378 QVERIFY(radio_filter != nullptr);

359379 auto options = radio_filter->options();

360− QCOMPARE(options->rowCount(), 3);

380+ QCOMPARE(options->rowCount(), 4);

361381

362382 auto idx = options->index(0);

363383 QVariant id_var = options->data(idx, GenericOptionsModel::RoleId);

@@ -365,12 +385,23 @@ void FiltersBindingsTest::testRadioOptionFilter()

365385 QVariant icon_var = options->data(idx, GenericOptionsModel::RoleIconHint);

366386 QVariant active_var = options->data(idx, GenericOptionsModel::RoleActive);

367387

388+ QVERIFY(id_var.toString().startsWith("show_all::"));

389+ QVERIFY(name_var.toString().size() > 0);

390+ QCOMPARE(icon_var.toString(), QString(""));

391+ QCOMPARE(active_var.toBool(), false);

392+

393+ idx = options->index(1);

394+ id_var = options->data(idx, GenericOptionsModel::RoleId);

395+ name_var = options->data(idx, GenericOptionsModel::RoleName);

396+ icon_var = options->data(idx, GenericOptionsModel::RoleIconHint);

397+ active_var = options->data(idx, GenericOptionsModel::RoleActive);

398+

368399 QCOMPARE(id_var.toString(), QString("opt0"));

369400 QCOMPARE(name_var.toString(), QString("Option 0"));

370401 QCOMPARE(icon_var.toString(), QString(""));

371402 QCOMPARE(active_var.toBool(), false);

372403

373− idx = options->index(1);

404+ idx = options->index(2);

374405 id_var = options->data(idx, GenericOptionsModel::RoleId);

375406 name_var = options->data(idx, GenericOptionsModel::RoleName);

376407 icon_var = options->data(idx, GenericOptionsModel::RoleIconHint);

@@ -381,9 +412,9 @@ void FiltersBindingsTest::testRadioOptionFilter()

381412 QCOMPARE(icon_var.toString(), QString(""));

382413 QCOMPARE(active_var.toBool(), false);

383414

384− AbstractFilterOption* opt0 = options->getRawOption(0);

385− AbstractFilterOption* opt1 = options->getRawOption(1);

386− AbstractFilterOption* opt2 = options->getRawOption(2);

415+ AbstractFilterOption* opt0 = options->getRawOption(1);

416+ AbstractFilterOption* opt1 = options->getRawOption(2);

417+ AbstractFilterOption* opt2 = options->getRawOption(3);

387418

388419 QSignalSpy opt0spy(opt0, SIGNAL(activeChanged(bool)));

389420 QSignalSpy opt1spy(opt1, SIGNAL(activeChanged(bool)));

@@ -432,11 +463,11 @@ void FiltersBindingsTest::testRatingsFilter()

432463 auto rating_filter = dynamic_cast<RatingsFilter*>(bind_filter);

433464 QVERIFY(rating_filter != nullptr);

434465 auto options = rating_filter->options();

435− QCOMPARE(options->rowCount(), 5);

466+ QCOMPARE(options->rowCount(), 6);

436467

437468 RatingFilterOption* opt[5];

438469 for (int i = 0; i<5; i++) {

439− opt[i] = dynamic_cast<RatingFilterOption *>(options->getRawOption(i));

470+ opt[i] = dynamic_cast<RatingFilterOption *>(options->getRawOption(i+1));

440471 }

441472

442473 QSignalSpy opt0spy(opt[0], SIGNAL(activeChanged(bool)));

tests/plugins/Unity/filtersbindingstest.h+1−1

@@ -41,7 +41,7 @@ class FiltersBindingsTest : public QObject

4141 void createCheckOptionFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount);

4242 void createRadioOptionFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount);

4343 void createRatingsFilter(DeeModel *model, const std::string &id, const std::string &name);

44− void createFilter(DeeModel *model, const std::string &renderer, const std::string &id, const std::string &name, int optionCount);

44+ void createFilter(DeeModel *model, const std::string &renderer, const std::string &id, const std::string &name, int optionCount, bool showAll);

4545};

4646

4747#endif // FILTERSBINDINGSTEST_H

tests/qmltests/CMakeLists.txt+1

@@ -30,6 +30,7 @@ add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_

3030 ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")

3131add_manual_qml_test(Components DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

3232add_qml_test(Components DraggingArea)

33+add_qml_test(Components EdgeDemoOverlay)

3334add_qml_test(Components FilterGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)

3435add_qml_test(Components ResponsiveFlowView)

3536add_qml_test(Components ResponsiveGridView)

tests/qmltests/Components/tst_EdgeDemoOverlay.qmlnew file+123

@@ -0,0 +1,123 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import QtTest 1.0

19+import Unity.Test 0.1 as UT

20+import "../../../Components"

21+

22+Item {

23+ id: root

24+ width: boxWidth * 3

25+ height: boxHeight * 2

26+

27+ property int boxWidth: 250

28+ property int boxHeight: 250

29+

30+ EdgeDemoOverlay {

31+ id: top

32+ edge: "top"

33+ title: "Top"

34+ text: "Displayed on top left"

35+ anchors.left: parent.left

36+ anchors.top: parent.top

37+ width: boxWidth

38+ height: boxHeight

39+ }

40+

41+ EdgeDemoOverlay {

42+ id: right

43+ edge: "right"

44+ title: "Right"

45+ text: "Displayed on top right"

46+ anchors.right: parent.right

47+ anchors.top: parent.top

48+ width: boxWidth

49+ height: boxHeight

50+ }

51+

52+ EdgeDemoOverlay {

53+ id: left

54+ edge: "left"

55+ title: "Left"

56+ text: "Displayed on bottom right"

57+ anchors.right: parent.right

58+ anchors.bottom: parent.bottom

59+ width: boxWidth

60+ height: boxHeight

61+ available: false

62+ }

63+

64+ EdgeDemoOverlay {

65+ id: bottom

66+ edge: "bottom"

67+ title: "Bottom"

68+ text: "Displayed on bottom left"

69+ anchors.left: parent.left

70+ anchors.bottom: parent.bottom

71+ width: boxWidth

72+ height: boxHeight

73+ }

74+

75+ EdgeDemoOverlay {

76+ id: none

77+ edge: "none"

78+ title: "None"

79+ text: "Displayed on top middle"

80+ anchors.horizontalCenter: parent.horizontalCenter

81+ anchors.top: parent.top

82+ width: boxWidth

83+ height: boxHeight

84+ }

85+

86+ SignalSpy {

87+ id: signalSpy

88+ }

89+

90+ UT.UnityTestCase {

91+ name: "EdgeDemoOverlay"

92+ when: windowShown

93+

94+ function test_animations() {

95+ compare(right.running, true)

96+

97+ compare(left.running, false)

98+ left.available = true

99+ compare(left.running, true)

100+ }

101+

102+ function test_skip() {

103+ signalSpy.target = bottom

104+ signalSpy.signalName = "skip"

105+ signalSpy.clear()

106+ var bottomSkip = findChild(bottom, "skipLabel")

107+ mousePress(bottomSkip, 1, 1)

108+ mouseRelease(bottomSkip, 1, 1)

109+ signalSpy.wait()

110+ compare(bottom.available, false)

111+

112+ // Test that the 'none' edge skips anywhere

113+ signalSpy.target = none

114+ signalSpy.clear()

115+ var backgroundShade = findChild(none, "backgroundShade")

116+ tryCompare(none, "opacity", 1)

117+ mousePress(backgroundShade, 1, 1)

118+ mouseRelease(backgroundShade, 1, 1)

119+ signalSpy.wait()

120+ compare(none.available, false)

121+ }

122+ }

123+}

tests/qmltests/Launcher/tst_Launcher.qml+12−6

@@ -198,6 +198,14 @@ Item {

198198 compare(findChild(delegate, "progressOverlay").visible, LauncherModel.get(i).progress >= 0)

199199 }

200200 }

201+

202+ function test_focusedHighlight() {

203+ var launcherListView = findChild(launcher, "launcherListView");

204+ for (var i = 0; i < launcherListView.count; ++i) {

205+ var delegate = findChild(launcherListView, "launcherDelegate" + i)

206+ compare(findChild(delegate, "focusedHighlight").visible, LauncherModel.get(i).focused)

207+ }

208+ }

201209 }

202210

203211 UT.UnityTestCase {

@@ -249,11 +257,10 @@ Item {

249257 name: "LauncherInit"

250258 when: windowShown

251259

252− /*

253− * FIXME: There is a bug in ListView which makes it snap to an item

254− * instead of the edge at startup. Enable this test once our patch for

255− * ListView has landed upstream.

256− * https://bugreports.qt-project.org/browse/QTBUG-32251

260+ function initTestCase() {

261+ var listView = findChild(launcher, "launcherListView");

262+ tryCompare(listView, "flicking", false)

263+ }

257264

258265 function test_initFirstUnfolded() {

259266

@@ -267,7 +274,6 @@ Item {

267274 // Now do check that snapping is in fact enabled

268275 compare(listView.snapMode, ListView.SnapToItem, "Snapping is not enabled");

269276 }

270− */

271277 }

272278

273279 UT.UnityTestCase {