4868659 · unity8 · git.iko.soy

CMakeLists.txt+1−1

compare with xenial

unifiedsplit

@@ -57,7 +57,7 @@ find_package(Qt5DBus 5.4 REQUIRED)

57find_package(Qt5Concurrent 5.4 REQUIRED)

58find_package(Qt5Sql 5.4 REQUIRED)

59

60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=15)

60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=16)

61pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)

62pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)

63pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)

debian/changelog+31

@@ -1,3 +1,34 @@

1+unity8 (8.12+16.04.20160518.1-0ubuntu1) xenial; urgency=medium

2+

3+ [ CI Train Bot ]

4+ * Resync trunk.

5+

6+ [ Daniel d'Andrada, Michał Sawicz ]

7+ * Move prompt surfaces from MirSurface to Application

8+

9+ -- Nick Dedekind <ci-train-bot@canonical.com> Wed, 18 May 2016 11:20:04 +0000

10+

11+unity8 (8.12+16.04.20160504.2-0ubuntu1) xenial; urgency=medium

12+

13+ [ Albert Astals Cid ]

14+ * Expandable Filter Widget

15+ * Pass the category correctly

16+

17+ [ Albert Astals Cid, CI Train Bot ]

18+ * Make the previewActions react to the actions model changing (LP:

19+ #1485887)

20+ * Reload Preview Zoomable Image source if it gets updated

21+ * Update the icon also to the original one if that's what the scope

22+ wants

23+

24+ [ Andrea Cimitan ]

25+ * Add social actions to cards

26+

27+ [ CI Train Bot ]

28+ * Resync trunk.

29+

30+ -- Pawel Stolowski <ci-train-bot@canonical.com> Wed, 04 May 2016 18:09:33 +0000

31+

1unity8 (8.12+16.04.20160429.2-0ubuntu1) xenial; urgency=medium

32unity8 (8.12+16.04.20160429.2-0ubuntu1) xenial; urgency=medium

2

33

3 [ CI Train Bot ]

34 [ CI Train Bot ]

debian/control+4−4

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

31 libqt5xmlpatterns5-dev,

32 libsystemsettings-dev,

33 libudev-dev,

34− libunity-api-dev (>= 7.110),

34+ libunity-api-dev (>= 7.112),

35 libusermetricsoutput1-dev,

36# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop

37 libx11-dev[!armhf],

@@ -135,10 +135,10 @@ Depends: qml-module-qtquick-layouts,

135 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),

136 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,

137 ubuntu-thumbnailer-impl-0,

138− unity-application-impl-15,

138+ unity-application-impl-16,

139 unity-notifications-impl-3,

140 unity-plugin-scopes | unity-scopes-impl,

141− unity-scopes-impl-11,

141+ unity-scopes-impl-12,

142 unity8-tests | unity-application-impl,

143 ${misc:Depends},

144Breaks: unity8 (<< 7.86),

@@ -185,7 +185,7 @@ Depends: dbus-test-runner,

185 ${misc:Depends},

186 ${shlibs:Depends},

187Provides: unity-application-impl,

188− unity-application-impl-15,

188+ unity-application-impl-16,

189 unity8-fake-env,

190Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1),

191 unity8-fake-env,

plugins/Dash/CardCreator.js+44−1

@@ -351,6 +351,17 @@ var kAttributesRowCode = 'CardAttributes { \n\

351 model: cardData && cardData["attributes"]; \n\

352 }\n';

353

354+// %1 is used as anchors of socialActionsRow

355+// %2 is used as color of socialActionsRow

356+var kSocialActionsRowCode = 'CardSocialActions { \n\

357+ id: socialActionsRow; \n\

358+ objectName: "socialActionsRow"; \n\

359+ anchors { %1 } \n\

360+ color: %2; \n\

361+ model: cardData && cardData["socialActions"]; \n\

362+ onClicked: root.action(actionId); \n\

363+ }\n';

364+

354// %1 is used as top anchor of summary

365// %1 is used as top anchor of summary

355// %2 is used as topMargin anchor of summary

366// %2 is used as topMargin anchor of summary

356// %3 is used as color of summary

367// %3 is used as color of summary

@@ -437,9 +448,11 @@ function cardString(template, components, isCardTool) {

437 var hasSubtitle = hasTitle && components["subtitle"] || false;

448 var hasSubtitle = hasTitle && components["subtitle"] || false;

438 var hasHeaderRow = hasMascot && hasTitle;

449 var hasHeaderRow = hasMascot && hasTitle;

439 var hasAttributes = hasTitle && components["attributes"] && components["attributes"]["field"] || false;

450 var hasAttributes = hasTitle && components["attributes"] && components["attributes"]["field"] || false;

451+ var hasSocialActions = hasTitle && components["social-actions"] || false;

440 var isAudio = template["quick-preview-type"] === "audio";

452 var isAudio = template["quick-preview-type"] === "audio";

441 var asynchronous = isCardTool ? "false" : "true";

453 var asynchronous = isCardTool ? "false" : "true";

442

454

455+ code += 'signal action(var actionId);\n';

443 if (isAudio) {

456 if (isAudio) {

444 // For now we only support audio cards with [optional] art, title, subtitle

457 // For now we only support audio cards with [optional] art, title, subtitle

445 // in horizontal mode

458 // in horizontal mode

@@ -841,6 +854,34 @@ function cardString(template, components, isCardTool) {

841 code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(summaryColor);

854 code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(summaryColor);

842 }

855 }

843

856

857+ if (hasSocialActions) {

858+ var socialAnchors;

859+ var socialTopAnchor;

860+

861+ if (hasSummary) socialTopAnchor = 'summary.bottom;';

862+ else if (isHorizontal && hasArt) socialTopAnchor = 'artShapeHolder.bottom;';

863+ else if (headerAsOverlay && hasArt) socialTopAnchor = 'artShapeHolder.bottom;';

864+ else if (hasHeaderRow) socialTopAnchor = 'row.bottom;';

865+ else if (hasTitleContainer) socialTopAnchor = 'headerTitleContainer.bottom;';

866+ else if (hasMascot) socialTopAnchor = 'mascotImage.bottom;';

867+ else if (hasAttributes) socialTopAnchor = 'attributesRow.bottom;';

868+ else if (hasSubtitle) socialTopAnchor = 'subtitleLabel.bottom;';

869+ else if (hasTitle) socialTopAnchor = 'titleLabel.bottom;';

870+ else if (hasArt) socialTopAnchor = 'artShapeHolder.bottom;';

871+ else socialTopAnchor = 'parent.top';

872+

873+ socialAnchors = 'top: ' + socialTopAnchor + ' left: parent.left; right: parent.right; topMargin: units.gu(1);'

874+

875+ var socialColor;

876+ if (hasBackground) {

877+ socialColor = summaryColorWithBackground;

878+ } else {

879+ socialColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';

880+ }

881+

882+ code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);

883+ }

884+

844 var touchdownAnchors;

885 var touchdownAnchors;

845 if (hasBackground) {

886 if (hasBackground) {

846 touchdownAnchors = 'fill: backgroundLoader';

887 touchdownAnchors = 'fill: backgroundLoader';

@@ -852,7 +893,9 @@ function cardString(template, components, isCardTool) {

852 code += kTouchdownCode.arg(touchdownAnchors);

893 code += kTouchdownCode.arg(touchdownAnchors);

853

894

854 var implicitHeight = 'implicitHeight: ';

895 var implicitHeight = 'implicitHeight: ';

896+ if (hasSocialActions) {

897+ implicitHeight += 'socialActionsRow.y + socialActionsRow.height + units.gu(1);\n';

855− if (hasSummary) {

898+ } else if (hasSummary) {

856 implicitHeight += 'summary.y + summary.height + units.gu(1);\n';

899 implicitHeight += 'summary.y + summary.height + units.gu(1);\n';

857 } else if (isAudio) {

900 } else if (isAudio) {

858 implicitHeight += 'audioButton.height;\n';

901 implicitHeight += 'audioButton.height;\n';

plugins/Dash/CardSocialActions.qmlnew file+94

@@ -0,0 +1,94 @@

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.4

18+import QtQuick.Layouts 1.1

19+import Ubuntu.Components 1.3

20+

21+Column {

22+ id: socialActions

23+ spacing: units.gu(0.5)

24+

25+ property alias model: repeater.model

26+ property color color: theme.palette.normal.baseText

27+

28+ signal clicked(var actionId)

29+

30+ Rectangle {

31+ id: divider

32+ visible: repeater.count > 0

33+ anchors {

34+ left: parent.left;

35+ right: parent.right;

36+ leftMargin:units.dp(1);

37+ rightMargin: units.dp(1);

38+ }

39+ color: Qt.darker(theme.palette.normal.background, 1.12)

40+ height: visible ? units.dp(1) : 0

41+ }

42+

43+ Row {

44+ id: row

45+ anchors {

46+ left: parent.left

47+ right: parent.right

48+ leftMargin: units.gu(1)

49+ rightMargin: units.gu(1)

50+ }

51+ spacing: units.gu(2)

52+ readonly property int visibleItems: {

53+ if (width <= units.gu(12)) // small card

54+ return 2;

55+ else if (width <= units.gu(21)) // medium card

56+ return 3;

57+ else // large or horizontal card

58+ return 4;

59+ }

60+

61+ Repeater {

62+ id: repeater

63+ delegate: Loader {

64+ height: units.gu(2)

65+ active: index < row.visibleItems

66+ sourceComponent: AbstractButton {

67+ objectName: "delegate" + index

68+ height: units.gu(2)

69+ width: icon.width

70+ Icon {

71+ id: icon

72+ objectName: "icon"

73+

74+ readonly property url urlIcon: modelData && modelData["icon"] || ""

75+ readonly property url urlTemporaryIcon: "temporaryIcon" in modelData && modelData["temporaryIcon"] || ""

76+

77+ height: units.gu(2)

78+ // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293

79+ width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth

80+ source: urlIcon

81+ color: socialActions.color

82+

83+ onUrlIconChanged: {

84+ if (urlIcon) source = urlIcon

85+ }

86+ }

87+

88+ onClicked: socialActions.clicked(modelData["id"]);

89+ onPressedChanged: if (pressed && icon.urlTemporaryIcon != "") icon.source = icon.urlTemporaryIcon

90+ }

91+ }

92+ }

93+ }

94+}

plugins/Dash/qmldir+1

@@ -5,6 +5,7 @@ singleton CardCreatorCache 0.1 CardCreatorCache.qml

5singleton DashAudioPlayer 0.1 DashAudioPlayer.qml

6ScopeStyle 0.1 ScopeStyle.qml

7CardAttributes 0.1 CardAttributes.qml

8+CardSocialActions 0.1 CardSocialActions.qml

8CroppedImageMinimumSourceSize 0.1 CroppedImageMinimumSourceSize.qml

9CroppedImageMinimumSourceSize 0.1 CroppedImageMinimumSourceSize.qml

9AudioProgressBar 0.1 AudioProgressBar.qml

10AudioProgressBar 0.1 AudioProgressBar.qml

10CardAudioProgress 0.1 CardAudioProgress.qml

11CardAudioProgress 0.1 CardAudioProgress.qml

po/aa.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-02-12 10:18+0000\n"

12"Last-Translator: Charif AYFARAH <ayfarah@ymail.com>\n"

13"Language-Team: Afar <aa@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr "Goranto"

po/am.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-03-24 19:07+0000\n"

12"Last-Translator: samson <Unknown>\n"

13"Language-Team: Amharic <am@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -188,15 +188,15 @@ msgstr "የ እርስዎን ውጤቶች እንደገና ማጣሪያ"

188msgid "Reset"

189msgstr "እንደ ነበረ መመለሻ"

190

191−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

191+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

192msgid "Show less"

193msgstr ""

194

195−#: qml/Dash/GenericScopeView.qml:570

195+#: qml/Dash/GenericScopeView.qml:579

196msgid "Show all"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:627

199+#: qml/Dash/GenericScopeView.qml:636

200msgctxt "Label: Hint for dash search line edit"

201msgid "Search"

202msgstr "መፈለጊያ"

po/ar.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-07-29 09:41+0000\n"

12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"

13"Language-Team: Arabic <ar@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "

18"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"

19−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

19+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

20−"X-Generator: Launchpad (build 17995)\n"

20+"X-Generator: Launchpad (build 18025)\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

23msgid "Password: "

@@ -195,15 +195,15 @@ msgstr ""

195msgid "Reset"

196msgstr ""

197

198−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

198+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

199msgid "Show less"

200msgstr ""

201

202−#: qml/Dash/GenericScopeView.qml:570

202+#: qml/Dash/GenericScopeView.qml:579

203msgid "Show all"

204msgstr ""

205

206−#: qml/Dash/GenericScopeView.qml:627

206+#: qml/Dash/GenericScopeView.qml:636

207msgctxt "Label: Hint for dash search line edit"

208msgid "Search"

209msgstr "بحث"

po/ast.po+43−35

@@ -7,16 +7,16 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11−"PO-Revision-Date: 2016-04-17 16:57+0000\n"

11+"PO-Revision-Date: 2016-05-16 14:07+0000\n"

12"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"

13"Language-Team: Asturian <ast@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -140,7 +140,7 @@ msgstr "Apps que pueden tener datos sin guardar:"

140msgctxt ""

141"Re-dock means connect the device again to an external screen/mouse/keyboard"

142msgid "Re-dock, save your work and close these apps to continue."

143−msgstr ""

143+msgstr "Reconeuta, guarda'l trabayu y zarra eses apps pa siguir."

144

145#: qml/Components/ModeSwitchWarningDialog.qml:63

146msgid "Or force close now (unsaved data will be lost)."

@@ -183,28 +183,28 @@ msgstr "Amestar a favoritos"

183

184#: qml/Dash/FiltersPopover.qml:60

185msgid "Refine your results"

186−msgstr ""

186+msgstr "Refina los resultaos"

187

188#: qml/Dash/FiltersPopover.qml:69

189msgid "Reset"

190msgstr "Reafitar"

191

192−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

192+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

193msgid "Show less"

194−msgstr ""

194+msgstr "Ver menos"

195

196−#: qml/Dash/GenericScopeView.qml:570

196+#: qml/Dash/GenericScopeView.qml:579

197msgid "Show all"

198−msgstr ""

198+msgstr "Ver too"

199

200−#: qml/Dash/GenericScopeView.qml:627

200+#: qml/Dash/GenericScopeView.qml:636

201msgctxt "Label: Hint for dash search line edit"

202msgid "Search"

203msgstr "Guetar"

204

205#: qml/Dash/PageHeaderExtraPanel.qml:55

206msgid "Recent Searches"

207−msgstr ""

207+msgstr "Guetes recién"

208

209#: qml/Dash/PageHeaderExtraPanel.qml:66

210msgid "Clear All"

@@ -264,6 +264,8 @@ msgid ""

264"Your device is now connected to an external display. Use this screen as a "

265"touch pad to interact with the pointer."

266msgstr ""

267+"El preséu agora ta coneutáu con una pantalla esterna. Usa esta pantalla como "

268+"touch pad pa interactuar col punteru."

267

269

268#: qml/Greeter/CoverPage.qml:118

270#: qml/Greeter/CoverPage.qml:118

269msgid "Unlock"

271msgid "Unlock"

@@ -425,51 +427,53 @@ msgstr "Devolver llamada"

425

427

426#: qml/Stages/SideStage.qml:76

428#: qml/Stages/SideStage.qml:76

427msgid "Drag using 3 fingers any application from one window to the other"

429msgid "Drag using 3 fingers any application from one window to the other"

428−msgstr ""

430+msgstr "Abasnar cualquier aplicación d'una ventana a otra usando 3 deos"

429

431

430#: qml/Tutorial/TutorialBottom.qml:78

432#: qml/Tutorial/TutorialBottom.qml:78

431msgid "Swipe up to add a contact"

433msgid "Swipe up to add a contact"

432−msgstr ""

434+msgstr "Eslizar p'amestar un contactu"

433

435

434#: qml/Tutorial/TutorialBottom.qml:80

436#: qml/Tutorial/TutorialBottom.qml:80

435msgid "Swipe up for favorite calculations"

437msgid "Swipe up for favorite calculations"

436−msgstr ""

438+msgstr "Eslizar pa los cálculos favoritos"

437

439

438#: qml/Tutorial/TutorialBottom.qml:82

440#: qml/Tutorial/TutorialBottom.qml:82

439msgid "Swipe up for recent calls"

441msgid "Swipe up for recent calls"

440−msgstr ""

442+msgstr "Eslizar pa llamaes recién"

441

443

442#: qml/Tutorial/TutorialBottom.qml:84

444#: qml/Tutorial/TutorialBottom.qml:84

443msgid "Swipe up to create a message"

445msgid "Swipe up to create a message"

444−msgstr ""

446+msgstr "Eslizar pa crear un mensaxe"

445

447

446#: qml/Tutorial/TutorialBottom.qml:85

448#: qml/Tutorial/TutorialBottom.qml:85

447msgid "Swipe up to manage the app"

449msgid "Swipe up to manage the app"

448−msgstr ""

450+msgstr "Eslizar p'alministrar la app"

449

451

450#: qml/Tutorial/TutorialLeftLong.qml:47

452#: qml/Tutorial/TutorialLeftLong.qml:47

451msgid "Long swipe from the left edge to open the Today scope"

453msgid "Long swipe from the left edge to open the Today scope"

452−msgstr ""

454+msgstr "Eslizamientu llargu dende'l berbesu izquierdu pa ver el scope Güei"

453

455

454#: qml/Tutorial/TutorialLeft.qml:47

456#: qml/Tutorial/TutorialLeft.qml:47

455msgid "Swipe from the left edge to open the launcher"

457msgid "Swipe from the left edge to open the launcher"

456−msgstr ""

458+msgstr "Eslizar dende'l berbesu izquierdu p'abrir el llanzador"

457

459

458#: qml/Tutorial/TutorialRight.qml:55

460#: qml/Tutorial/TutorialRight.qml:55

459msgid "Push your mouse against the right edge to view your open apps"

461msgid "Push your mouse against the right edge to view your open apps"

460−msgstr ""

462+msgstr "Emburria'l mur escontra'l berbesu drechu pa ver les apps abiertes"

461

463

462#: qml/Tutorial/TutorialRight.qml:56

464#: qml/Tutorial/TutorialRight.qml:56

463msgid "Short or long swipe from the right edge to view your open apps"

465msgid "Short or long swipe from the right edge to view your open apps"

464msgstr ""

466msgstr ""

467+"Eslizamientu curtiu o llargu dende'l berbesu drechu pa ver les apps abiertes"

465

468

466#: qml/Tutorial/TutorialTop.qml:53

469#: qml/Tutorial/TutorialTop.qml:53

467msgid "Swipe from the top right edge to open the notification bar"

470msgid "Swipe from the top right edge to open the notification bar"

468msgstr ""

471msgstr ""

472+"Esliza dende'l berbesu superior drechu p'abrir la barra de notificaciones"

469

473

470#: qml/Tutorial/TutorialTop.qml:54

474#: qml/Tutorial/TutorialTop.qml:54

471msgid "Swipe from the top edge to open the notification bar"

475msgid "Swipe from the top edge to open the notification bar"

472−msgstr ""

476+msgstr "Esliza dende'l berbesu superior p'abrir la barra de notificaciones"

473

477

474#: qml/Wizard/Page.qml:54

478#: qml/Wizard/Page.qml:54

475msgctxt "Button: Go back one page in the Wizard"

479msgctxt "Button: Go back one page in the Wizard"

@@ -512,35 +516,37 @@ msgstr "Saltar"

512

516

513#: qml/Wizard/Pages/40-location.qml:27

517#: qml/Wizard/Pages/40-location.qml:27

514msgid "Location Services"

518msgid "Location Services"

515−msgstr ""

519+msgstr "Servicios d'allugamientu"

516

520

517#: qml/Wizard/Pages/40-location.qml:83

521#: qml/Wizard/Pages/40-location.qml:83

518msgid ""

522msgid ""

519"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "

523"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "

520"(recommended)"

524"(recommended)"

521msgstr ""

525msgstr ""

526+"Usar GPS, puntos Wi-Fi y redes móviles de mou anónimu pa detectar "

527+"l'allugamientu (recomendao)"

522

528

523#: qml/Wizard/Pages/40-location.qml:105

529#: qml/Wizard/Pages/40-location.qml:105

524#, qt-format

530#, qt-format

525msgid "By selecting this option you agree to the Nokia HERE %1."

531msgid "By selecting this option you agree to the Nokia HERE %1."

526−msgstr ""

532+msgstr "Seleicionando esta opción aceutes los %1 de Nokia HERE."

527

533

528#: qml/Wizard/Pages/40-location.qml:106

534#: qml/Wizard/Pages/40-location.qml:106

529msgctxt "part of: Nokia HERE terms and conditions"

535msgctxt "part of: Nokia HERE terms and conditions"

530msgid "terms and conditions"

536msgid "terms and conditions"

531−msgstr ""

537+msgstr "términos y condiciones"

532

538

533#: qml/Wizard/Pages/40-location.qml:160

539#: qml/Wizard/Pages/40-location.qml:160

534msgid "GPS only"

540msgid "GPS only"

535−msgstr ""

541+msgstr "Sólo GPS"

536

542

537#: qml/Wizard/Pages/40-location.qml:214

543#: qml/Wizard/Pages/40-location.qml:214

538msgid "Don't use my location"

544msgid "Don't use my location"

539−msgstr ""

545+msgstr "Nun usar l'allugamientu"

540

546

541#: qml/Wizard/Pages/40-location.qml:260

547#: qml/Wizard/Pages/40-location.qml:260

542msgid "You can change it later in System Settings."

548msgid "You can change it later in System Settings."

543−msgstr ""

549+msgstr "Pues camudalo sero na Configuración del Sistema."

544

550

545#: qml/Wizard/Pages/50-timezone.qml:29

551#: qml/Wizard/Pages/50-timezone.qml:29

546msgid "Time Zone"

552msgid "Time Zone"

@@ -565,33 +571,35 @@ msgstr "Bloquiar pantalla"

565#: qml/Wizard/Pages/70-passwd-type.qml:101

571#: qml/Wizard/Pages/70-passwd-type.qml:101

566msgctxt "Label: Type of security method"

572msgctxt "Label: Type of security method"

567msgid "Create new password"

573msgid "Create new password"

568−msgstr ""

574+msgstr "Crear contraseña nueva"

569

575

570#: qml/Wizard/Pages/70-passwd-type.qml:103

576#: qml/Wizard/Pages/70-passwd-type.qml:103

571msgctxt "Label: Type of security method"

577msgctxt "Label: Type of security method"

572msgid "Create passcode (numbers only)"

578msgid "Create passcode (numbers only)"

573−msgstr ""

579+msgstr "Crear códigu d'accesu (sólo númberos)"

574

580

575#: qml/Wizard/Pages/70-passwd-type.qml:105

581#: qml/Wizard/Pages/70-passwd-type.qml:105

576msgctxt "Label: Type of security method"

582msgctxt "Label: Type of security method"

577msgid "No lock code"

583msgid "No lock code"

578−msgstr ""

584+msgstr "Ensin códigu de bloquéu"

579

585

580#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108

586#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108

581msgid "Privacy Policy"

587msgid "Privacy Policy"

582−msgstr ""

588+msgstr "Política d'intimidá"

583

589

584#: qml/Wizard/Pages/75-report-check.qml:26

590#: qml/Wizard/Pages/75-report-check.qml:26

585msgid "Help Us Improve"

591msgid "Help Us Improve"

586−msgstr ""

592+msgstr "Ayúdanos a meyorar"

587

593

588#: qml/Wizard/Pages/75-report-check.qml:59

594#: qml/Wizard/Pages/75-report-check.qml:59

589msgid "Improve system performance by sending us crashes and error reports."

595msgid "Improve system performance by sending us crashes and error reports."

590msgstr ""

596msgstr ""

597+"Ameyora'l rindimientu del sistema unviándonos los informes d'errores y "

598+"cuelgues."

591

599

592#: qml/Wizard/Pages/75-report-check.qml:60

600#: qml/Wizard/Pages/75-report-check.qml:60

593msgid "Privacy policy"

601msgid "Privacy policy"

594−msgstr ""

602+msgstr "Política d'intimidá"

595

603

596#: qml/Wizard/Pages/80-finished.qml:89

604#: qml/Wizard/Pages/80-finished.qml:89

597msgid "Welcome to Ubuntu"

605msgid "Welcome to Ubuntu"

@@ -599,7 +607,7 @@ msgstr "Bienveníu/a a Ubuntu"

599

607

600#: qml/Wizard/Pages/80-finished.qml:104

608#: qml/Wizard/Pages/80-finished.qml:104

601msgid "You are ready to use your device now"

609msgid "You are ready to use your device now"

602−msgstr ""

610+msgstr "Ya tas preparáu pa usar el preséu"

603

611

604#: qml/Wizard/Pages/80-finished.qml:124

612#: qml/Wizard/Pages/80-finished.qml:124

605msgid "Get Started"

613msgid "Get Started"

po/az.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-09-03 16:39+0000\n"

12"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"

13"Language-Team: Azerbaijani <az@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/be.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-12-13 13:12+0000\n"

12"Last-Translator: Mikhail_SaTuRn <mikhail_saturn@tut.by>\n"

13"Language-Team: Belarusian <be@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

19−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

19+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

20−"X-Generator: Launchpad (build 17995)\n"

20+"X-Generator: Launchpad (build 18025)\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

23msgid "Password: "

@@ -193,15 +193,15 @@ msgstr ""

193msgid "Reset"

194msgstr ""

195

196−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

196+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

197msgid "Show less"

198msgstr ""

199

200−#: qml/Dash/GenericScopeView.qml:570

200+#: qml/Dash/GenericScopeView.qml:579

201msgid "Show all"

202msgstr ""

203

204−#: qml/Dash/GenericScopeView.qml:627

204+#: qml/Dash/GenericScopeView.qml:636

205msgctxt "Label: Hint for dash search line edit"

206msgid "Search"

207msgstr "Пошук"

po/bg.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-04-12 14:43+0000\n"

12"Last-Translator: George Karavasilev <kokoto-java@ubuntu.com>\n"

13"Language-Team: Bulgarian <bg@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -188,15 +188,15 @@ msgstr ""

188msgid "Reset"

189msgstr ""

190

191−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

191+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

192msgid "Show less"

193msgstr ""

194

195−#: qml/Dash/GenericScopeView.qml:570

195+#: qml/Dash/GenericScopeView.qml:579

196msgid "Show all"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:627

199+#: qml/Dash/GenericScopeView.qml:636

200msgctxt "Label: Hint for dash search line edit"

201msgid "Search"

202msgstr ""

po/bn.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-11-27 19:38+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Bengali <bn@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -188,15 +188,15 @@ msgstr ""

188msgid "Reset"

189msgstr ""

190

191−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

191+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

192msgid "Show less"

193msgstr ""

194

195−#: qml/Dash/GenericScopeView.qml:570

195+#: qml/Dash/GenericScopeView.qml:579

196msgid "Show all"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:627

199+#: qml/Dash/GenericScopeView.qml:636

200msgctxt "Label: Hint for dash search line edit"

201msgid "Search"

202msgstr "খুঁজুন"

po/br.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-04-27 12:20+0000\n"

12"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"

13"Language-Team: Breton <br@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -195,15 +195,15 @@ msgstr "Purañ ho tisoc'hoù"

195msgid "Reset"

196msgstr "Adderaouekaat"

197

198−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

198+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

199msgid "Show less"

200msgstr ""

201

202−#: qml/Dash/GenericScopeView.qml:570

202+#: qml/Dash/GenericScopeView.qml:579

203msgid "Show all"

204msgstr ""

205

206−#: qml/Dash/GenericScopeView.qml:627

206+#: qml/Dash/GenericScopeView.qml:636

207msgctxt "Label: Hint for dash search line edit"

208msgid "Search"

209msgstr "Klask"

po/bs.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-12-01 20:06+0000\n"

12"Last-Translator: Kenan Gutić <Unknown>\n"

13"Language-Team: Bosnian <bs@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

19+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

20−"X-Generator: Launchpad (build 17995)\n"

20+"X-Generator: Launchpad (build 18025)\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

23msgid "Password: "

@@ -192,15 +192,15 @@ msgstr ""

192msgid "Reset"

193msgstr ""

194

195−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

195+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

196msgid "Show less"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:570

199+#: qml/Dash/GenericScopeView.qml:579

200msgid "Show all"

201msgstr ""

202

203−#: qml/Dash/GenericScopeView.qml:627

203+#: qml/Dash/GenericScopeView.qml:636

204msgctxt "Label: Hint for dash search line edit"

205msgid "Search"

206msgstr "Pretraži"

po/ca.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-07-04 09:48+0000\n"

12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

13"Language-Team: Catalan <ca@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -192,15 +192,15 @@ msgstr ""

192msgid "Reset"

193msgstr ""

194

195−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

195+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

196msgid "Show less"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:570

199+#: qml/Dash/GenericScopeView.qml:579

200msgid "Show all"

201msgstr ""

202

203−#: qml/Dash/GenericScopeView.qml:627

203+#: qml/Dash/GenericScopeView.qml:636

204msgctxt "Label: Hint for dash search line edit"

205msgid "Search"

206msgstr "Cerca"

po/ca@valencia.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-02-22 15:22+0000\n"

12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

13"Language-Team: Catalan <ca@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -192,15 +192,15 @@ msgstr ""

192msgid "Reset"

193msgstr ""

194

195−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

195+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

196msgid "Show less"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:570

199+#: qml/Dash/GenericScopeView.qml:579

200msgid "Show all"

201msgstr ""

202

203−#: qml/Dash/GenericScopeView.qml:627

203+#: qml/Dash/GenericScopeView.qml:636

204msgctxt "Label: Hint for dash search line edit"

205msgid "Search"

206msgstr ""

po/ce.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-02-15 04:01+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Chechen <ce@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/ckb.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-01-21 11:05+0000\n"

12"Last-Translator: Aras <aras.noori@gmail.com>\n"

13"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/cs.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-07-07 10:44+0000\n"

12"Last-Translator: Vojtěch Daněk <vdanek@outlook.com>\n"

13"Language-Team: Czech <cs@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20"Language: cs\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

@@ -192,15 +192,15 @@ msgstr ""

192msgid "Reset"

193msgstr ""

194

195−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

195+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

196msgid "Show less"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:570

199+#: qml/Dash/GenericScopeView.qml:579

200msgid "Show all"

201msgstr ""

202

203−#: qml/Dash/GenericScopeView.qml:627

203+#: qml/Dash/GenericScopeView.qml:636

204msgctxt "Label: Hint for dash search line edit"

205msgid "Search"

206msgstr "Hledat"

po/cy.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-07-31 13:21+0000\n"

12"Last-Translator: Owen Llywelyn <owen.llywelyn@gmail.com>\n"

13"Language-Team: Welsh <cy@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "

18"2 : 3;\n"

19−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

19+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

20−"X-Generator: Launchpad (build 17995)\n"

20+"X-Generator: Launchpad (build 18025)\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

23msgid "Password: "

@@ -193,15 +193,15 @@ msgstr ""

193msgid "Reset"

194msgstr ""

195

196−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

196+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

197msgid "Show less"

198msgstr ""

199

200−#: qml/Dash/GenericScopeView.qml:570

200+#: qml/Dash/GenericScopeView.qml:579

201msgid "Show all"

202msgstr ""

203

204−#: qml/Dash/GenericScopeView.qml:627

204+#: qml/Dash/GenericScopeView.qml:636

205msgctxt "Label: Hint for dash search line edit"

206msgid "Search"

207msgstr "Chwilio"

po/da.po+6−6

@@ -8,7 +8,7 @@ msgid ""

8msgstr ""

9"Project-Id-Version: unity8\n"

10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

11−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

11+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

12"PO-Revision-Date: 2015-07-06 12:05+0000\n"

13"Last-Translator: Folmer Fredslund <Unknown>\n"

14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

19+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

20−"X-Generator: Launchpad (build 17995)\n"

20+"X-Generator: Launchpad (build 18025)\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

23msgid "Password: "

@@ -193,15 +193,15 @@ msgstr ""

193msgid "Reset"

194msgstr ""

195

196−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

196+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

197msgid "Show less"

198msgstr ""

199

200−#: qml/Dash/GenericScopeView.qml:570

200+#: qml/Dash/GenericScopeView.qml:579

201msgid "Show all"

202msgstr ""

203

204−#: qml/Dash/GenericScopeView.qml:627

204+#: qml/Dash/GenericScopeView.qml:636

205msgctxt "Label: Hint for dash search line edit"

206msgid "Search"

207msgstr "Søg"

po/de.po+12−10

@@ -7,16 +7,16 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11−"PO-Revision-Date: 2016-03-13 15:41+0000\n"

11+"PO-Revision-Date: 2016-05-10 19:23+0000\n"

12−"Last-Translator: schuko24 <gerdsaenger@t-online.de>\n"

12+"Last-Translator: Torsten Franz <Unknown>\n"

13"Language-Team: German <de@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -194,15 +194,15 @@ msgstr "Ergebnisse verfeinern"

194msgid "Reset"

195msgstr "Zurücksetzen"

196

197−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

197+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

198msgid "Show less"

199−msgstr ""

199+msgstr "Weniger anzeigen"

200

201−#: qml/Dash/GenericScopeView.qml:570

201+#: qml/Dash/GenericScopeView.qml:579

202msgid "Show all"

203−msgstr ""

203+msgstr "Alle anzeigen"

204

205−#: qml/Dash/GenericScopeView.qml:627

205+#: qml/Dash/GenericScopeView.qml:636

206msgctxt "Label: Hint for dash search line edit"

207msgid "Search"

208msgstr "Suchen"

@@ -466,6 +466,8 @@ msgstr "Von der linken Kante wischen, um den Starter zu öffnen"

466#: qml/Tutorial/TutorialRight.qml:55

467msgid "Push your mouse against the right edge to view your open apps"

468msgstr ""

469+"Bewegen Sie den Mauszeiger an die rechte Kante, um die geöffneten "

470+"Anwendungen zu sehen"

469

471

470#: qml/Tutorial/TutorialRight.qml:56

472#: qml/Tutorial/TutorialRight.qml:56

471msgid "Short or long swipe from the right edge to view your open apps"

473msgid "Short or long swipe from the right edge to view your open apps"

po/el.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-04-25 16:24+0000\n"

12"Last-Translator: Aggelos Arnaoutis <angelosarn@hotmail.com>\n"

13"Language-Team: Greek <el@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -194,15 +194,15 @@ msgstr "Βελτιώστε τα αποτελέσματά σας"

194msgid "Reset"

195msgstr "Επαναφορά"

196

197−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

197+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

198msgid "Show less"

199msgstr ""

200

201−#: qml/Dash/GenericScopeView.qml:570

201+#: qml/Dash/GenericScopeView.qml:579

202msgid "Show all"

203msgstr ""

204

205−#: qml/Dash/GenericScopeView.qml:627

205+#: qml/Dash/GenericScopeView.qml:636

206msgctxt "Label: Hint for dash search line edit"

207msgid "Search"

208msgstr "Αναζήτηση"

po/en_AU.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-03-27 10:09+0000\n"

12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"

13"Language-Team: English (Australia) <en_AU@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -188,15 +188,15 @@ msgstr "Refine your results"

188msgid "Reset"

189msgstr "Reset"

190

191−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

191+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

192msgid "Show less"

193msgstr ""

194

195−#: qml/Dash/GenericScopeView.qml:570

195+#: qml/Dash/GenericScopeView.qml:579

196msgid "Show all"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:627

199+#: qml/Dash/GenericScopeView.qml:636

200msgctxt "Label: Hint for dash search line edit"

201msgid "Search"

202msgstr "Search"

po/en_GB.po+9−9

@@ -7,16 +7,16 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11−"PO-Revision-Date: 2016-04-29 10:35+0000\n"

11+"PO-Revision-Date: 2016-05-10 10:10+0000\n"

12"Last-Translator: Andi Chandler <Unknown>\n"

13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -188,15 +188,15 @@ msgstr "Refine your results"

188msgid "Reset"

189msgstr "Reset"

190

191−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

191+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

192msgid "Show less"

193−msgstr ""

193+msgstr "Show less"

194

195−#: qml/Dash/GenericScopeView.qml:570

195+#: qml/Dash/GenericScopeView.qml:579

196msgid "Show all"

197−msgstr ""

197+msgstr "Show all"

198

199−#: qml/Dash/GenericScopeView.qml:627

199+#: qml/Dash/GenericScopeView.qml:636

200msgctxt "Label: Hint for dash search line edit"

201msgid "Search"

202msgstr "Search"

po/eo.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-06-06 23:37+0000\n"

12"Last-Translator: Eliovir <Unknown>\n"

13"Language-Team: Esperanto <eo@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr "Serĉi"

po/es.po+8−8

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-03-25 12:02+0000\n"

12"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"

13"Language-Team: Spanish <es@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -193,15 +193,15 @@ msgstr "Refinar resultados"

193msgid "Reset"

194msgstr "Restablecer"

195

196−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

196+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

197msgid "Show less"

198−msgstr ""

198+msgstr "Mostrar menos"

199

200−#: qml/Dash/GenericScopeView.qml:570

200+#: qml/Dash/GenericScopeView.qml:579

201msgid "Show all"

202−msgstr ""

202+msgstr "Mostrar todo"

203

204−#: qml/Dash/GenericScopeView.qml:627

204+#: qml/Dash/GenericScopeView.qml:636

205msgctxt "Label: Hint for dash search line edit"

206msgid "Search"

207msgstr "Búsqueda"

po/eu.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-07-13 23:29+0000\n"

12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

13"Language-Team: Basque <eu@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -189,15 +189,15 @@ msgstr ""

189msgid "Reset"

190msgstr ""

191

192−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

192+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

193msgid "Show less"

194msgstr ""

195

196−#: qml/Dash/GenericScopeView.qml:570

196+#: qml/Dash/GenericScopeView.qml:579

197msgid "Show all"

198msgstr ""

199

200−#: qml/Dash/GenericScopeView.qml:627

200+#: qml/Dash/GenericScopeView.qml:636

201msgctxt "Label: Hint for dash search line edit"

202msgid "Search"

203msgstr "Bilatu"

po/fa.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-03-30 14:29+0000\n"

12"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"

13"Language-Team: Persian <fa@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -189,15 +189,15 @@ msgstr "نتایجتان را بهبود دهید"

189msgid "Reset"

190msgstr "بازنشانی"

191

192−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

192+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

193msgid "Show less"

194msgstr ""

195

196−#: qml/Dash/GenericScopeView.qml:570

196+#: qml/Dash/GenericScopeView.qml:579

197msgid "Show all"

198msgstr ""

199

200−#: qml/Dash/GenericScopeView.qml:627

200+#: qml/Dash/GenericScopeView.qml:636

201msgctxt "Label: Hint for dash search line edit"

202msgid "Search"

203msgstr "جست‌وجو"

po/fi.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-07-04 18:32+0000\n"

12"Last-Translator: Jiri Grönroos <Unknown>\n"

13"Language-Team: Finnish <fi@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -192,15 +192,15 @@ msgstr "Tarkenna tuloksia"

192msgid "Reset"

193msgstr "Palauta"

194

195−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

195+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

196msgid "Show less"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:570

199+#: qml/Dash/GenericScopeView.qml:579

200msgid "Show all"

201msgstr ""

202

203−#: qml/Dash/GenericScopeView.qml:627

203+#: qml/Dash/GenericScopeView.qml:636

204msgctxt "Label: Hint for dash search line edit"

205msgid "Search"

206msgstr "Etsi"

po/fo.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-01-14 20:08+0000\n"

12"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"

13"Language-Team: Faroese <fo@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/fr.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-05-01 09:09+0000\n"

12"Last-Translator: Anne <anneonyme017@gmail.com>\n"

13"Language-Team: French <fr@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2016-05-02 05:45+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -196,15 +196,15 @@ msgstr "Affiner vos résultats"

196msgid "Reset"

197msgstr "Réinitialiser"

198

199−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

199+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

200msgid "Show less"

201msgstr "Afficher plus"

202

203−#: qml/Dash/GenericScopeView.qml:570

203+#: qml/Dash/GenericScopeView.qml:579

204msgid "Show all"

205msgstr "Tout afficher"

206

207−#: qml/Dash/GenericScopeView.qml:627

207+#: qml/Dash/GenericScopeView.qml:636

208msgctxt "Label: Hint for dash search line edit"

209msgid "Search"

210msgstr "Rechercher"

po/ga.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-01-25 11:33+0000\n"

12"Last-Translator: Joshua Kiley <Unknown>\n"

13"Language-Team: Irish <ga@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -187,15 +187,15 @@ msgstr ""

187msgid "Reset"

188msgstr ""

189

190−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

190+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

191msgid "Show less"

192msgstr ""

193

194−#: qml/Dash/GenericScopeView.qml:570

194+#: qml/Dash/GenericScopeView.qml:579

195msgid "Show all"

196msgstr ""

197

198−#: qml/Dash/GenericScopeView.qml:627

198+#: qml/Dash/GenericScopeView.qml:636

199msgctxt "Label: Hint for dash search line edit"

200msgid "Search"

201msgstr "Cuardach"

po/gd.po+8−8

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-04-08 18:34+0000\n"

12"Last-Translator: Akerbeltz <fios@akerbeltz.org>\n"

13"Language-Team: Fòram na Gàidhlig\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "

18"(n > 2 && n < 20) ? 2 : 3;\n"

19−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

19+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

20−"X-Generator: Launchpad (build 17995)\n"

20+"X-Generator: Launchpad (build 18025)\n"

21"Language: gd\n"

22

23#: plugins/IntegratedLightDM/Greeter.cpp:112

@@ -198,15 +198,15 @@ msgstr "Cuir na toraidhean air gleus"

198msgid "Reset"

199msgstr "Ath-shuidhich"

200

201−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

201+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

202msgid "Show less"

203−msgstr ""

203+msgstr "Seall nas lugha dhiubh"

204

205−#: qml/Dash/GenericScopeView.qml:570

205+#: qml/Dash/GenericScopeView.qml:579

206msgid "Show all"

207−msgstr ""

207+msgstr "Seall na h-uile"

208

209−#: qml/Dash/GenericScopeView.qml:627

209+#: qml/Dash/GenericScopeView.qml:636

210msgctxt "Label: Hint for dash search line edit"

211msgid "Search"

212msgstr "Lorg"

po/gl.po+8−8

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-01-15 14:56+0000\n"

12"Last-Translator: Marcos Lans <Unknown>\n"

13"Language-Team: Galician <gl@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -188,15 +188,15 @@ msgstr "Afinar os resultados"

188msgid "Reset"

189msgstr "Restabelecer"

190

191−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

191+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

192msgid "Show less"

193−msgstr ""

193+msgstr "Mostrar menos"

194

195−#: qml/Dash/GenericScopeView.qml:570

195+#: qml/Dash/GenericScopeView.qml:579

196msgid "Show all"

197−msgstr ""

197+msgstr "Mostrar todo"

198

199−#: qml/Dash/GenericScopeView.qml:627

199+#: qml/Dash/GenericScopeView.qml:636

200msgctxt "Label: Hint for dash search line edit"

201msgid "Search"

202msgstr "Buscar"

po/gv.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-04-02 14:24+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Manx <gv@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : (n == 2 ? 1 : 2);\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -193,15 +193,15 @@ msgstr ""

193msgid "Reset"

194msgstr ""

195

196−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

196+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

197msgid "Show less"

198msgstr ""

199

200−#: qml/Dash/GenericScopeView.qml:570

200+#: qml/Dash/GenericScopeView.qml:579

201msgid "Show all"

202msgstr ""

203

204−#: qml/Dash/GenericScopeView.qml:627

204+#: qml/Dash/GenericScopeView.qml:636

205msgctxt "Label: Hint for dash search line edit"

206msgid "Search"

207msgstr ""

po/he.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-07-12 08:47+0000\n"

12"Last-Translator: Yaron <sh.yaron@gmail.com>\n"

13"Language-Team: Hebrew <he@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr "חיפוש"

po/hi.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-01-15 01:49+0000\n"

12"Last-Translator: Siddhanathan Shanmugam <Unknown>\n"

13"Language-Team: Hindi <hi@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/hr.po+73−10

@@ -7,17 +7,17 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11−"PO-Revision-Date: 2013-06-27 04:14+0000\n"

11+"PO-Revision-Date: 2016-05-04 17:52+0000\n"

12−"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

12+"Last-Translator: gogo <trebelnik2@gmail.com>\n"

13"Language-Team: Croatian <hr@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

19+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

20−"X-Generator: Launchpad (build 17995)\n"

20+"X-Generator: Launchpad (build 18025)\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

23msgid "Password: "

@@ -192,15 +192,15 @@ msgstr "Precizirajte svoje rezultate"

192msgid "Reset"

193msgstr "Ponovno postavi"

194

195−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

195+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

196msgid "Show less"

197−msgstr ""

197+msgstr "Prikaži manje"

198

199−#: qml/Dash/GenericScopeView.qml:570

199+#: qml/Dash/GenericScopeView.qml:579

200msgid "Show all"

201−msgstr ""

201+msgstr "Prikaži sve"

202

203−#: qml/Dash/GenericScopeView.qml:627

203+#: qml/Dash/GenericScopeView.qml:636

204msgctxt "Label: Hint for dash search line edit"

205msgid "Search"

206msgstr "Pretraži"

@@ -467,6 +467,7 @@ msgstr "Povucite od lijevog ruba za otvaranje pokretača"

467#: qml/Tutorial/TutorialRight.qml:55

468msgid "Push your mouse against the right edge to view your open apps"

469msgstr ""

470+"Gurnite svoj miš uz desni rub kako bi vidjeli svoje otvorene aplikacije"

470

471

471#: qml/Tutorial/TutorialRight.qml:56

472#: qml/Tutorial/TutorialRight.qml:56

472msgid "Short or long swipe from the right edge to view your open apps"

473msgid "Short or long swipe from the right edge to view your open apps"

@@ -782,9 +783,36 @@ msgstr "Vrlo slaba lozinka"

782#~ msgid "Search"

783#~ msgid "Search"

783#~ msgstr "Pretraživanje"

784#~ msgstr "Pretraživanje"

784

785

786+#~ msgid "Top edge"

787+#~ msgstr "Gornji rub"

788+

789+#~ msgid "Left edge"

790+#~ msgstr "Lijevi rub"

791+

792+#~ msgid "Well done"

793+#~ msgstr "Dobro obavljeno"

794+

795+#~ msgid "Right edge"

796+#~ msgstr "Desni rub"

797+

798+#~ msgid "Close"

799+#~ msgstr "Zatvori"

800+

801+#~ msgid "Power"

802+#~ msgstr "Energija"

803+

804+#~ msgid "Power off"

805+#~ msgstr "Isključivanje"

806+

807+#~ msgid "Skip intro"

808+#~ msgstr "Preskoči uvod"

809+

785#~ msgid "See all"

810#~ msgid "See all"

786#~ msgstr "Prikaži sve"

811#~ msgstr "Prikaži sve"

787

812

813+#~ msgid "Settings"

814+#~ msgstr "Postavke"

815+

788#~ msgid "See less"

816#~ msgid "See less"

789#~ msgstr "Prikaži manje"

817#~ msgstr "Prikaži manje"

790

818

@@ -1013,3 +1041,38 @@ msgstr "Vrlo slaba lozinka"

1013#~ msgid "Hover your mouse on the right edge to view your open apps"

1041#~ msgid "Hover your mouse on the right edge to view your open apps"

1014#~ msgstr ""

1042#~ msgstr ""

1015#~ "Lebdite svojim mišem po desnom rubu kako bi vidjeli otvorene aplikacije"

1043#~ "Lebdite svojim mišem po desnom rubu kako bi vidjeli otvorene aplikacije"

1044+

1045+#~ msgid "Please re-enter"

1046+#~ msgstr "Ponovno upišite"

1047+

1048+#~ msgid "Log out"

1049+#~ msgstr "Odjava"

1050+

1051+#~ msgid "Reboot"

1052+#~ msgstr "Ponovno pokretanje"

1053+

1054+#~ msgid "Shut down"

1055+#~ msgstr "Isključivanje"

1056+

1057+#~ msgid "Try swiping from the top edge to access the indicators"

1058+#~ msgstr "Za pristup indikatorima pokušajte povući s desnog ruba"

1059+

1060+#~ msgid "Try swiping from the right edge to unlock the phone"

1061+#~ msgstr "Za otključavanje telefona pokušajte povući s desnog ruba"

1062+

1063+#~ msgid "Swipe up again to close the settings screen"

1064+#~ msgstr "Za zatvaranje zaslona postavki povucite prema gore"

1065+

1066+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

1067+#~ msgstr ""

1068+#~ "Za otkrivanje pokretača brzog pristupa aplikacijama povucite s lijeve strane"

1069+

1070+#~ msgid ""

1071+#~ "You have now mastered the edge gestures and can start using the "

1072+#~ "phone<br><br>Tap on the screen to start"

1073+#~ msgstr ""

1074+#~ "Uspješno ste ovladali korištenjem rubova zaslona i možete započeti s "

1075+#~ "korištenjem telefona<br><br>Dotaknite zaslon kako bi započeli"

1076+

1077+#~ msgid "Store"

1078+#~ msgstr "Pohrana"

po/hu.po+8−8

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-03-24 09:19+0000\n"

12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

13"Language-Team: Hungarian <hu@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -190,15 +190,15 @@ msgstr "Találatok finomítása"

190msgid "Reset"

191msgstr "Alaphelyzetbe állítás"

192

193−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

193+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

194msgid "Show less"

195−msgstr ""

195+msgstr "Kevesebb"

196

197−#: qml/Dash/GenericScopeView.qml:570

197+#: qml/Dash/GenericScopeView.qml:579

198msgid "Show all"

199−msgstr ""

199+msgstr "Összes megjelenítése"

200

201−#: qml/Dash/GenericScopeView.qml:627

201+#: qml/Dash/GenericScopeView.qml:636

202msgctxt "Label: Hint for dash search line edit"

203msgid "Search"

204msgstr "Keresés"

po/hy.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-10-28 06:34+0000\n"

12"Last-Translator: Vahan Harutyunyan <Unknown>\n"

13"Language-Team: Armenian <hy@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -190,15 +190,15 @@ msgstr ""

190msgid "Reset"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

193+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

194msgid "Show less"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:570

197+#: qml/Dash/GenericScopeView.qml:579

198msgid "Show all"

199msgstr ""

200

201−#: qml/Dash/GenericScopeView.qml:627

201+#: qml/Dash/GenericScopeView.qml:636

202msgctxt "Label: Hint for dash search line edit"

203msgid "Search"

204msgstr ""

po/ia.po+8−8

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-08-25 19:31+0000\n"

12"Last-Translator: karm <melo@carmu.com>\n"

13"Language-Team: Interlingua <ia@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -190,15 +190,15 @@ msgstr "Poli tu resultatos"

190msgid "Reset"

191msgstr "Restabilir"

192

193−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

193+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

194msgid "Show less"

195−msgstr ""

195+msgstr "Monstrar minus"

196

197−#: qml/Dash/GenericScopeView.qml:570

197+#: qml/Dash/GenericScopeView.qml:579

198msgid "Show all"

199−msgstr ""

199+msgstr "Monstrar toto"

200

201−#: qml/Dash/GenericScopeView.qml:627

201+#: qml/Dash/GenericScopeView.qml:636

202msgctxt "Label: Hint for dash search line edit"

203msgid "Search"

204msgstr "Cerca"

po/id.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2013-06-26 22:35+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Indonesian <id@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -189,15 +189,15 @@ msgstr ""

189msgid "Reset"

190msgstr ""

191

192−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

192+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

193msgid "Show less"

194msgstr ""

195

196−#: qml/Dash/GenericScopeView.qml:570

196+#: qml/Dash/GenericScopeView.qml:579

197msgid "Show all"

198msgstr ""

199

200−#: qml/Dash/GenericScopeView.qml:627

200+#: qml/Dash/GenericScopeView.qml:636

201msgctxt "Label: Hint for dash search line edit"

202msgid "Search"

203msgstr ""

po/is.po+6−6

@@ -9,7 +9,7 @@ msgid ""

9msgstr ""

10"Project-Id-Version: po_unity8-is\n"

11"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

12−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

12+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

13"PO-Revision-Date: 2014-11-13 09:32+0000\n"

14"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"

15"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"

@@ -17,8 +17,8 @@ msgstr ""

17"Content-Type: text/plain; charset=UTF-8\n"

18"Content-Transfer-Encoding: 8bit\n"

19"Plural-Forms: nplurals=2; plural=n != 1;\n"

20−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

20+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

21−"X-Generator: Launchpad (build 17995)\n"

21+"X-Generator: Launchpad (build 18025)\n"

22"Language: is\n"

23

24#: plugins/IntegratedLightDM/Greeter.cpp:112

@@ -195,15 +195,15 @@ msgstr ""

195msgid "Reset"

196msgstr ""

197

198−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

198+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

199msgid "Show less"

200msgstr ""

201

202−#: qml/Dash/GenericScopeView.qml:570

202+#: qml/Dash/GenericScopeView.qml:579

203msgid "Show all"

204msgstr ""

205

206−#: qml/Dash/GenericScopeView.qml:627

206+#: qml/Dash/GenericScopeView.qml:636

207msgctxt "Label: Hint for dash search line edit"

208msgid "Search"

209msgstr ""

po/it.po+10−10

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-04-03 16:08+0000\n"

12"Last-Translator: Milo Casagrande <milo.casagrande@gmail.com>\n"

13"Language-Team: Italian <it@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -194,15 +194,15 @@ msgstr "Affina la ricerca"

194msgid "Reset"

195msgstr "Azzera"

196

197−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

197+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

198msgid "Show less"

199−msgstr ""

199+msgstr "Mostra di meno"

200

201−#: qml/Dash/GenericScopeView.qml:570

201+#: qml/Dash/GenericScopeView.qml:579

202msgid "Show all"

203−msgstr ""

203+msgstr "Mostra tutto"

204

205−#: qml/Dash/GenericScopeView.qml:627

205+#: qml/Dash/GenericScopeView.qml:636

206msgctxt "Label: Hint for dash search line edit"

207msgid "Search"

208msgstr "Cerca"

@@ -309,7 +309,7 @@ msgid ""

309"If passcode is entered incorrectly, your phone will conduct a factory reset "

310"and all personal data will be deleted."

311msgstr ""

312−"Se verrà inserito una passcode errato, il telefono eseguirà un ripristino "

312+"Se verrà inserito un passcode errato, il telefono eseguirà un ripristino "

313"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."

314

315#: qml/Greeter/NarrowView.qml:116

@@ -465,7 +465,7 @@ msgstr "Scorrere dal bordo sinistro per aprire il launcher"

465

466#: qml/Tutorial/TutorialRight.qml:55

467msgid "Push your mouse against the right edge to view your open apps"

468−msgstr ""

468+msgstr "Spostare il mouse sul bordo destro per vedere le app aperte"

469

470#: qml/Tutorial/TutorialRight.qml:56

471msgid "Short or long swipe from the right edge to view your open apps"

po/ja.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-10-05 10:05+0000\n"

12"Last-Translator: Kentaro Kazuhama <Unknown>\n"

13"Language-Team: Japanese <ja@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -185,15 +185,15 @@ msgstr ""

185msgid "Reset"

186msgstr ""

187

188−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

188+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

189msgid "Show less"

190msgstr ""

191

192−#: qml/Dash/GenericScopeView.qml:570

192+#: qml/Dash/GenericScopeView.qml:579

193msgid "Show all"

194msgstr ""

195

196−#: qml/Dash/GenericScopeView.qml:627

196+#: qml/Dash/GenericScopeView.qml:636

197msgctxt "Label: Hint for dash search line edit"

198msgid "Search"

199msgstr ""

po/km.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-08-20 02:48+0000\n"

12"Last-Translator: Sophea Sok <sksophea@gmail.com>\n"

13"Language-Team: Khmer <km@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -188,15 +188,15 @@ msgstr ""

188msgid "Reset"

189msgstr "កំណត់ឡើងវិញ"

190

191−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

191+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

192msgid "Show less"

193msgstr ""

194

195−#: qml/Dash/GenericScopeView.qml:570

195+#: qml/Dash/GenericScopeView.qml:579

196msgid "Show all"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:627

199+#: qml/Dash/GenericScopeView.qml:636

200msgctxt "Label: Hint for dash search line edit"

201msgid "Search"

202msgstr "ស្វែងរក"

po/kn.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2013-06-27 05:43+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Kannada <kn@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/ko.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-08-19 13:02+0000\n"

12"Last-Translator: MinSik CHO <Unknown>\n"

13"Language-Team: Korean <ko@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -185,15 +185,15 @@ msgstr ""

185msgid "Reset"

186msgstr ""

187

188−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

188+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

189msgid "Show less"

190msgstr ""

191

192−#: qml/Dash/GenericScopeView.qml:570

192+#: qml/Dash/GenericScopeView.qml:579

193msgid "Show all"

194msgstr ""

195

196−#: qml/Dash/GenericScopeView.qml:627

196+#: qml/Dash/GenericScopeView.qml:636

197msgctxt "Label: Hint for dash search line edit"

198msgid "Search"

199msgstr "검색"

po/ku.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-09-10 13:14+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Kurdish <ku@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -188,15 +188,15 @@ msgstr ""

188msgid "Reset"

189msgstr ""

190

191−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

191+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

192msgid "Show less"

193msgstr ""

194

195−#: qml/Dash/GenericScopeView.qml:570

195+#: qml/Dash/GenericScopeView.qml:579

196msgid "Show all"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:627

199+#: qml/Dash/GenericScopeView.qml:636

200msgctxt "Label: Hint for dash search line edit"

201msgid "Search"

202msgstr ""

po/ky.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2013-06-27 06:17+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Kirghiz <ky@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/lo.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2013-10-02 10:00+0000\n"

12"Last-Translator: Anousak <anousak@gmail.com>\n"

13"Language-Team: Lao <lo@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/lt.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-05-19 17:15+0000\n"

12"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"

13"Language-Team: Lithuanian <lt@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"(n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

19+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

20−"X-Generator: Launchpad (build 17995)\n"

20+"X-Generator: Launchpad (build 18025)\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

23msgid "Password: "

@@ -187,15 +187,15 @@ msgstr ""

187msgid "Reset"

188msgstr ""

189

190−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

190+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

191msgid "Show less"

192msgstr ""

193

194−#: qml/Dash/GenericScopeView.qml:570

194+#: qml/Dash/GenericScopeView.qml:579

195msgid "Show all"

196msgstr ""

197

198−#: qml/Dash/GenericScopeView.qml:627

198+#: qml/Dash/GenericScopeView.qml:636

199msgctxt "Label: Hint for dash search line edit"

200msgid "Search"

201msgstr ""

po/lv.po+6−6

@@ -8,7 +8,7 @@ msgid ""

8msgstr ""

9"Project-Id-Version: unity\n"

10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

11−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

11+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

12"PO-Revision-Date: 2015-11-22 19:13+0000\n"

13"Last-Translator: Klavs Anson <anson.klavs@gmail.com>\n"

14"Language-Team: Latvian <lata-l10n@googlegroups.com>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

19+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

20−"X-Generator: Launchpad (build 17995)\n"

20+"X-Generator: Launchpad (build 18025)\n"

21"Language: lv\n"

22

23#: plugins/IntegratedLightDM/Greeter.cpp:112

@@ -191,15 +191,15 @@ msgstr ""

191msgid "Reset"

192msgstr ""

193

194−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

194+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

195msgid "Show less"

196msgstr ""

197

198−#: qml/Dash/GenericScopeView.qml:570

198+#: qml/Dash/GenericScopeView.qml:579

199msgid "Show all"

200msgstr ""

201

202−#: qml/Dash/GenericScopeView.qml:627

202+#: qml/Dash/GenericScopeView.qml:636

203msgctxt "Label: Hint for dash search line edit"

204msgid "Search"

205msgstr "Meklēt"

po/ml.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2013-11-23 11:44+0000\n"

12"Last-Translator: ST Alfas <Unknown>\n"

13"Language-Team: Malayalam <ml@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/mr.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-01-14 19:54+0000\n"

12"Last-Translator: Rohan Deshmukh <Unknown>\n"

13"Language-Team: Marathi <mr@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr "शोध"

po/ms.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-01-17 09:05+0000\n"

12"Last-Translator: abuyop <Unknown>\n"

13"Language-Team: Malay <ms@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -188,15 +188,15 @@ msgstr ""

188msgid "Reset"

189msgstr ""

190

191−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

191+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

192msgid "Show less"

193msgstr ""

194

195−#: qml/Dash/GenericScopeView.qml:570

195+#: qml/Dash/GenericScopeView.qml:579

196msgid "Show all"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:627

199+#: qml/Dash/GenericScopeView.qml:636

200msgctxt "Label: Hint for dash search line edit"

201msgid "Search"

202msgstr "Gelintar"

po/my.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2013-12-12 11:12+0000\n"

12"Last-Translator: Pyae Sone <Unknown>\n"

13"Language-Team: Burmese <my@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr "ရှာဖွေရန်"

po/nb.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-03-29 08:56+0000\n"

12"Last-Translator: Åka Sikrom <Unknown>\n"

13"Language-Team: Norwegian Bokmal <nb@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -192,15 +192,15 @@ msgstr "Filtrer søketreff"

192msgid "Reset"

193msgstr "Tilbakestill"

194

195−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

195+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

196msgid "Show less"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:570

199+#: qml/Dash/GenericScopeView.qml:579

200msgid "Show all"

201msgstr ""

202

203−#: qml/Dash/GenericScopeView.qml:627

203+#: qml/Dash/GenericScopeView.qml:636

204msgctxt "Label: Hint for dash search line edit"

205msgid "Search"

206msgstr "Søk"

po/ne.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-12-06 15:11+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Nepali <ne@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/nl.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-07-07 07:14+0000\n"

12"Last-Translator: Hannie Dumoleyn <Unknown>\n"

13"Language-Team: Dutch <nl@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -195,15 +195,15 @@ msgstr "Resultaten verfijnen"

195msgid "Reset"

196msgstr "Herstellen"

197

198−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

198+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

199msgid "Show less"

200msgstr ""

201

202−#: qml/Dash/GenericScopeView.qml:570

202+#: qml/Dash/GenericScopeView.qml:579

203msgid "Show all"

204msgstr ""

205

206−#: qml/Dash/GenericScopeView.qml:627

206+#: qml/Dash/GenericScopeView.qml:636

207msgctxt "Label: Hint for dash search line edit"

208msgid "Search"

209msgstr "Zoeken"

po/nn.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-05-12 11:32+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Norwegian Nynorsk <nn@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/oc.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-02-05 20:35+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Occitan (post 1500) <oc@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -195,15 +195,15 @@ msgstr "Afinar vòstres resultats"

195msgid "Reset"

196msgstr "Reïnicializar"

197

198−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

198+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

199msgid "Show less"

200msgstr ""

201

202−#: qml/Dash/GenericScopeView.qml:570

202+#: qml/Dash/GenericScopeView.qml:579

203msgid "Show all"

204msgstr ""

205

206−#: qml/Dash/GenericScopeView.qml:627

206+#: qml/Dash/GenericScopeView.qml:636

207msgctxt "Label: Hint for dash search line edit"

208msgid "Search"

209msgstr "Recercar"

po/or.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-03-21 05:28+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Oriya <or@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n!=1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/pa.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-04-24 04:29+0000\n"

12"Last-Translator: Gursharnjit_Singh <ubuntuser13@gmail.com>\n"

13"Language-Team: Punjabi <pa@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -188,15 +188,15 @@ msgstr ""

188msgid "Reset"

189msgstr ""

190

191−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

191+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

192msgid "Show less"

193msgstr ""

194

195−#: qml/Dash/GenericScopeView.qml:570

195+#: qml/Dash/GenericScopeView.qml:579

196msgid "Show all"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:627

199+#: qml/Dash/GenericScopeView.qml:636

200msgctxt "Label: Hint for dash search line edit"

201msgid "Search"

202msgstr "ਖੋਜ"

po/pl.po+11−11

@@ -7,17 +7,17 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11−"PO-Revision-Date: 2016-03-28 20:45+0000\n"

11+"PO-Revision-Date: 2016-05-05 13:36+0000\n"

12−"Last-Translator: Krzysztof Tataradziński <Unknown>\n"

12+"Last-Translator: dawidd6 <dawidd0811@gmail.com>\n"

13"Language-Team: Polish <pl@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "

18"|| n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

19+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

20−"X-Generator: Launchpad (build 17995)\n"

20+"X-Generator: Launchpad (build 18025)\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

23msgid "Password: "

@@ -189,15 +189,15 @@ msgstr "Przefiltruj wyniki"

189msgid "Reset"

190msgstr "Reset"

191

192−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

192+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

193msgid "Show less"

194−msgstr ""

194+msgstr "Pokaż mniej"

195

196−#: qml/Dash/GenericScopeView.qml:570

196+#: qml/Dash/GenericScopeView.qml:579

197msgid "Show all"

198−msgstr ""

198+msgstr "Pokaż wszystko"

199

200−#: qml/Dash/GenericScopeView.qml:627

200+#: qml/Dash/GenericScopeView.qml:636

201msgctxt "Label: Hint for dash search line edit"

202msgid "Search"

203msgstr "Szukaj"

@@ -463,7 +463,7 @@ msgstr "Przeciągnięcie od lewej krawędzi otwiera pasek uruchamiania"

463

464#: qml/Tutorial/TutorialRight.qml:55

465msgid "Push your mouse against the right edge to view your open apps"

466−msgstr ""

466+msgstr "Poprowadź kursor poza prawą krawędź, aby wyświetlić otwarte programy"

467

468#: qml/Tutorial/TutorialRight.qml:56

469msgid "Short or long swipe from the right edge to view your open apps"

po/pt.po+8−8

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-02-18 01:11+0000\n"

12"Last-Translator: Ivo Xavier <ivoxavier.8@gmail.com>\n"

13"Language-Team: Portuguese <pt@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -193,15 +193,15 @@ msgstr "Redefina os seus resultados"

193msgid "Reset"

194msgstr "Repor"

195

196−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

196+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

197msgid "Show less"

198−msgstr ""

198+msgstr "Mostrar menos"

199

200−#: qml/Dash/GenericScopeView.qml:570

200+#: qml/Dash/GenericScopeView.qml:579

201msgid "Show all"

202−msgstr ""

202+msgstr "Mostrar tudo"

203

204−#: qml/Dash/GenericScopeView.qml:627

204+#: qml/Dash/GenericScopeView.qml:636

205msgctxt "Label: Hint for dash search line edit"

206msgid "Search"

207msgstr "Procurar"

po/pt_BR.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-08-05 04:40+0000\n"

12"Last-Translator: Julio Alexander Sieg <julio.sieg@gmail.com>\n"

13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -190,15 +190,15 @@ msgstr ""

190msgid "Reset"

191msgstr "Redefinir"

192

193−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

193+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

194msgid "Show less"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:570

197+#: qml/Dash/GenericScopeView.qml:579

198msgid "Show all"

199msgstr ""

200

201−#: qml/Dash/GenericScopeView.qml:627

201+#: qml/Dash/GenericScopeView.qml:636

202msgctxt "Label: Hint for dash search line edit"

203msgid "Search"

204msgstr "Pesquisar"

po/ro.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-07-06 17:47+0000\n"

12"Last-Translator: Meriuță Cornel <meriutacornel@neacornel.eu>\n"

13"Language-Team: Romanian <ro@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "

18"== 0) && (n != 0))) ? 2: 1));\n"

19−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

19+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

20−"X-Generator: Launchpad (build 17995)\n"

20+"X-Generator: Launchpad (build 18025)\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

23msgid "Password: "

@@ -193,15 +193,15 @@ msgstr ""

193msgid "Reset"

194msgstr ""

195

196−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

196+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

197msgid "Show less"

198msgstr ""

199

200−#: qml/Dash/GenericScopeView.qml:570

200+#: qml/Dash/GenericScopeView.qml:579

201msgid "Show all"

202msgstr ""

203

204−#: qml/Dash/GenericScopeView.qml:627

204+#: qml/Dash/GenericScopeView.qml:636

205msgctxt "Label: Hint for dash search line edit"

206msgid "Search"

207msgstr "Căutare"

po/ru.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-07-06 05:33+0000\n"

12"Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"

13"Language-Team: Russian <ru@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

19+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

20−"X-Generator: Launchpad (build 17995)\n"

20+"X-Generator: Launchpad (build 18025)\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

23msgid "Password: "

@@ -192,15 +192,15 @@ msgstr ""

192msgid "Reset"

193msgstr "Сбросить"

194

195−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

195+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

196msgid "Show less"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:570

199+#: qml/Dash/GenericScopeView.qml:579

200msgid "Show all"

201msgstr ""

202

203−#: qml/Dash/GenericScopeView.qml:627

203+#: qml/Dash/GenericScopeView.qml:636

204msgctxt "Label: Hint for dash search line edit"

205msgid "Search"

206msgstr "Поиск"

po/shn.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-11-10 12:09+0000\n"

12"Last-Translator: Rockworld <sumoisrock@gmail.com>\n"

13"Language-Team: Shan <shn@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=(n == 1) ? 0 : 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/si.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2013-06-26 22:36+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Sinhalese <si@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -188,15 +188,15 @@ msgstr ""

188msgid "Reset"

189msgstr ""

190

191−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

191+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

192msgid "Show less"

193msgstr ""

194

195−#: qml/Dash/GenericScopeView.qml:570

195+#: qml/Dash/GenericScopeView.qml:579

196msgid "Show all"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:627

199+#: qml/Dash/GenericScopeView.qml:636

200msgctxt "Label: Hint for dash search line edit"

201msgid "Search"

202msgstr ""

po/sk.po+51−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-05-02 10:43+0000\n"

12"Last-Translator: P_E_T_O <Unknown>\n"

13"Language-Team: Slovak <sk@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"

18−"X-Launchpad-Export-Date: 2016-05-03 05:41+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20"Language: sk\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

@@ -195,15 +195,15 @@ msgstr "Spresniť výsledky"

195msgid "Reset"

196msgstr "Resetovať"

197

198−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

198+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

199msgid "Show less"

200msgstr "Zobraziť menej"

201

202−#: qml/Dash/GenericScopeView.qml:570

202+#: qml/Dash/GenericScopeView.qml:579

203msgid "Show all"

204msgstr "Zobraziť všetko"

205

206−#: qml/Dash/GenericScopeView.qml:627

206+#: qml/Dash/GenericScopeView.qml:636

207msgctxt "Label: Hint for dash search line edit"

208msgid "Search"

209msgstr "Hľadať"

@@ -764,6 +764,30 @@ msgstr "Heslo je slabé"

764msgid "Very weak password"

765msgstr "Heslo je veľmi slabé"

766

767+#~ msgid "Reboot"

768+#~ msgstr "Reštartovať"

769+

770+#~ msgid "Shut down"

771+#~ msgstr "Vypnúť"

772+

773+#~ msgid "Power"

774+#~ msgstr "Napájanie"

775+

776+#~ msgid "Power off"

777+#~ msgstr "Vypnúť"

778+

779+#~ msgid "Close"

780+#~ msgstr "Zatvoriť"

781+

782+#~ msgid "Well done"

783+#~ msgstr "Výborne"

784+

785+#~ msgid "Skip intro"

786+#~ msgstr "Preskočiť"

787+

788+#~ msgid "Right edge"

789+#~ msgstr "Pravý okraj"

790+

767#~ msgctxt "Title: Reboot/Shut down dialog"

791#~ msgctxt "Title: Reboot/Shut down dialog"

768#~ msgid "Shut down"

792#~ msgid "Shut down"

769#~ msgstr "Vypnúť"

793#~ msgstr "Vypnúť"

@@ -951,3 +975,24 @@ msgstr "Heslo je veľmi slabé"

951

975

952#~ msgid "Hover your mouse on the right edge to view your open apps"

976#~ msgid "Hover your mouse on the right edge to view your open apps"

953#~ msgstr "Prejdite myšou od pravého okraja pre zobrazenie otvorených aplikácií"

977#~ msgstr "Prejdite myšou od pravého okraja pre zobrazenie otvorených aplikácií"

978+

979+#~ msgid "Log out"

980+#~ msgstr "Odhlásiť sa"

981+

982+#~ msgid "Try swiping from the top edge to access the indicators"

983+#~ msgstr "Potiahnite horný okraj pre prístup k indikátorom"

984+

985+#~ msgid "Top edge"

986+#~ msgstr "Horný okraj"

987+

988+#~ msgid "Try swiping from the right edge to unlock the phone"

989+#~ msgstr "Potiahnite od pravého okraja pre odomknutie telefónu"

990+

991+#~ msgid "Swipe up again to close the settings screen"

992+#~ msgstr "Potiahnite späť hore pre zatvorenie nastavení"

993+

994+#~ msgid "Left edge"

995+#~ msgstr "Ľavý okraj"

996+

997+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

998+#~ msgstr "Potiahnite z ľavého okraja pre rýchly prístup k aplikáciam"

po/sl.po+9−9

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-01-31 18:34+0000\n"

12"Last-Translator: Bernard Banko <Unknown>\n"

13"Language-Team: Slovenian <sl@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "

18"n%100==4 ? 3 : 0);\n"

19−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

19+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

20−"X-Generator: Launchpad (build 17995)\n"

20+"X-Generator: Launchpad (build 18025)\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

23msgid "Password: "

@@ -193,15 +193,15 @@ msgstr "Prečistite rezultate"

193msgid "Reset"

194msgstr "Ponastavi"

195

196−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

196+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

197msgid "Show less"

198−msgstr ""

198+msgstr "Pokaži manj"

199

200−#: qml/Dash/GenericScopeView.qml:570

200+#: qml/Dash/GenericScopeView.qml:579

201msgid "Show all"

202−msgstr ""

202+msgstr "Pokaži vse"

203

204−#: qml/Dash/GenericScopeView.qml:627

204+#: qml/Dash/GenericScopeView.qml:636

205msgctxt "Label: Hint for dash search line edit"

206msgid "Search"

207msgstr "Iskanje"

@@ -469,7 +469,7 @@ msgstr "Potegnite levi rob za prikaz zaganjalnika"

469

470#: qml/Tutorial/TutorialRight.qml:55

471msgid "Push your mouse against the right edge to view your open apps"

472−msgstr ""

472+msgstr "Za prikaz odprtih programov potisnite kazalko proti desnemu robu."

473

474#: qml/Tutorial/TutorialRight.qml:56

475msgid "Short or long swipe from the right edge to view your open apps"

po/sq.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-04-21 06:03+0000\n"

12"Last-Translator: Indrit Bashkimi <indrit.bashkimi@gmail.com>\n"

13"Language-Team: sq\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:36+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:49+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20"Language: sq\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

@@ -187,15 +187,15 @@ msgstr "Përmirëso rezultatet"

187msgid "Reset"

188msgstr "Rivendos"

189

190−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

190+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

191msgid "Show less"

192msgstr ""

193

194−#: qml/Dash/GenericScopeView.qml:570

194+#: qml/Dash/GenericScopeView.qml:579

195msgid "Show all"

196msgstr ""

197

198−#: qml/Dash/GenericScopeView.qml:627

198+#: qml/Dash/GenericScopeView.qml:636

199msgctxt "Label: Hint for dash search line edit"

200msgid "Search"

201msgstr "Kërko"

po/sr.po+10−9

@@ -8,8 +8,8 @@ msgid ""

8msgstr ""

9"Project-Id-Version: unity\n"

10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

11−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

11+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

12−"PO-Revision-Date: 2016-03-24 12:36+0000\n"

12+"PO-Revision-Date: 2016-05-04 19:50+0000\n"

13"Last-Translator: Bojan Bogdanović <Unknown>\n"

14"Language-Team: српски <xfce4@xfce4.org>\n"

15"MIME-Version: 1.0\n"

@@ -17,8 +17,8 @@ msgstr ""

17"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

19"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

20−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

20+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

21−"X-Generator: Launchpad (build 17995)\n"

21+"X-Generator: Launchpad (build 18025)\n"

22"Language: sr\n"

23

24#: plugins/IntegratedLightDM/Greeter.cpp:112

@@ -192,15 +192,15 @@ msgstr "Пречистите Ваше резултате"

192msgid "Reset"

193msgstr "Ресетуј"

194

195−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

195+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

196msgid "Show less"

197−msgstr ""

197+msgstr "Прикажи мање"

198

199−#: qml/Dash/GenericScopeView.qml:570

199+#: qml/Dash/GenericScopeView.qml:579

200msgid "Show all"

201−msgstr ""

201+msgstr "Прикажи све"

202

203−#: qml/Dash/GenericScopeView.qml:627

203+#: qml/Dash/GenericScopeView.qml:636

204msgctxt "Label: Hint for dash search line edit"

205msgid "Search"

206msgstr "Претрага"

@@ -467,6 +467,7 @@ msgstr "Превуците са леве ивице да отворите пок

467#: qml/Tutorial/TutorialRight.qml:55

468msgid "Push your mouse against the right edge to view your open apps"

469msgstr ""

470+"померите Вашег миша преко десне ивице да видите Ваше отворене програме"

470

471

471#: qml/Tutorial/TutorialRight.qml:56

472#: qml/Tutorial/TutorialRight.qml:56

472msgid "Short or long swipe from the right edge to view your open apps"

473msgid "Short or long swipe from the right edge to view your open apps"

po/sv.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-03-25 05:01+0000\n"

12"Last-Translator: Josef Andersson <Unknown>\n"

13"Language-Team: Swedish\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20"Language: sv\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

@@ -190,15 +190,15 @@ msgstr "Förfina dina resultat"

190msgid "Reset"

191msgstr "Återställ"

192

193−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

193+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

194msgid "Show less"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:570

197+#: qml/Dash/GenericScopeView.qml:579

198msgid "Show all"

199msgstr ""

200

201−#: qml/Dash/GenericScopeView.qml:627

201+#: qml/Dash/GenericScopeView.qml:636

202msgctxt "Label: Hint for dash search line edit"

203msgid "Search"

204msgstr "Sök"

po/sw.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-07-17 20:02+0000\n"

12"Last-Translator: Valentine <mwangi_valentino@yahoo.com>\n"

13"Language-Team: Swahili <sw@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -188,15 +188,15 @@ msgstr ""

188msgid "Reset"

189msgstr ""

190

191−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

191+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

192msgid "Show less"

193msgstr ""

194

195−#: qml/Dash/GenericScopeView.qml:570

195+#: qml/Dash/GenericScopeView.qml:579

196msgid "Show all"

197msgstr ""

198

199−#: qml/Dash/GenericScopeView.qml:627

199+#: qml/Dash/GenericScopeView.qml:636

200msgctxt "Label: Hint for dash search line edit"

201msgid "Search"

202msgstr "Tafuta"

po/ta.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2013-10-24 11:36+0000\n"

12"Last-Translator: Arun Kumar - அருண் குமார் <thangam.arunx@gmail.com>\n"

13"Language-Team: Ubuntu Tamil Team/Free Tamil Computing/Thamizha\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20"Language: ta\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

@@ -187,15 +187,15 @@ msgstr ""

187msgid "Reset"

188msgstr ""

189

190−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

190+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

191msgid "Show less"

192msgstr ""

193

194−#: qml/Dash/GenericScopeView.qml:570

194+#: qml/Dash/GenericScopeView.qml:579

195msgid "Show all"

196msgstr ""

197

198−#: qml/Dash/GenericScopeView.qml:627

198+#: qml/Dash/GenericScopeView.qml:636

199msgctxt "Label: Hint for dash search line edit"

200msgid "Search"

201msgstr ""

po/te.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-07-19 10:04+0000\n"

12"Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"

13"Language-Team: Telugu <te@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/th.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-10-02 04:55+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Thai <th@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/tr.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-03-22 15:56+0000\n"

12"Last-Translator: Arda Ünlü <aarda.uunlu@gmail.com>\n"

13"Language-Team: Turkish <tr@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr "Ara"

po/ug.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-12-01 07:37+0000\n"

12"Last-Translator: Eltikin <eltikinuyghur@hotmail.com>\n"

13"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -187,15 +187,15 @@ msgstr ""

187msgid "Reset"

188msgstr ""

189

190−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

190+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

191msgid "Show less"

192msgstr ""

193

194−#: qml/Dash/GenericScopeView.qml:570

194+#: qml/Dash/GenericScopeView.qml:579

195msgid "Show all"

196msgstr ""

197

198−#: qml/Dash/GenericScopeView.qml:627

198+#: qml/Dash/GenericScopeView.qml:636

199msgctxt "Label: Hint for dash search line edit"

200msgid "Search"

201msgstr "ئىزدە"

po/uk.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-04-01 17:32+0000\n"

12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"

13"Language-Team: Ukrainian <uk@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

19+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

20−"X-Generator: Launchpad (build 17995)\n"

20+"X-Generator: Launchpad (build 18025)\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

23msgid "Password: "

@@ -196,15 +196,15 @@ msgstr "Покращіть результати"

196msgid "Reset"

197msgstr "Скинути"

198

199−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

199+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

200msgid "Show less"

201msgstr ""

202

203−#: qml/Dash/GenericScopeView.qml:570

203+#: qml/Dash/GenericScopeView.qml:579

204msgid "Show all"

205msgstr ""

206

207−#: qml/Dash/GenericScopeView.qml:627

207+#: qml/Dash/GenericScopeView.qml:636

208msgctxt "Label: Hint for dash search line edit"

209msgid "Search"

210msgstr "Пошук"

po/unity8.pot+4−4

@@ -8,7 +8,7 @@ msgid ""

8msgstr ""

9"Project-Id-Version: unity8\n"

10"Report-Msgid-Bugs-To: \n"

11−"POT-Creation-Date: 2016-04-29 20:07+0000\n"

11+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14"Language-Team: LANGUAGE <LL@li.org>\n"

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:575 qml/Dash/GenericScopeView.qml:760

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:575

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:632

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/ur.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-05-05 03:12+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Urdu <ur@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/uz.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-07-04 16:03+0000\n"

12"Last-Translator: Learner <muzaffar.habibullayev@yandex.ru>\n"

13"Language-Team: Uzbek <uz@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/vi.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-01-15 01:19+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Vietnamese <vi@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/wo.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2015-10-29 11:16+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Wolof <wo@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr "Seet"

po/xh.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2013-09-28 13:20+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Xhosa <xh@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/zh_CN.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-04-13 06:27+0000\n"

12"Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"

13"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -187,15 +187,15 @@ msgstr "精进查找结果"

187msgid "Reset"

188msgstr "重置"

189

190−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

190+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

191msgid "Show less"

192msgstr ""

193

194−#: qml/Dash/GenericScopeView.qml:570

194+#: qml/Dash/GenericScopeView.qml:579

195msgid "Show all"

196msgstr ""

197

198−#: qml/Dash/GenericScopeView.qml:627

198+#: qml/Dash/GenericScopeView.qml:636

199msgctxt "Label: Hint for dash search line edit"

200msgid "Search"

201msgstr "搜索"

po/zh_HK.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2014-08-10 11:45+0000\n"

12"Last-Translator: Daniel Cheung <daniel.2345@hotmail.com>\n"

13"Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -186,15 +186,15 @@ msgstr ""

186msgid "Reset"

187msgstr ""

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr ""

po/zh_TW.po+6−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-04-27 15:01+0000\n"

10+"POT-Creation-Date: 2016-05-18 11:19+0000\n"

11"PO-Revision-Date: 2016-02-24 04:40+0000\n"

12"Last-Translator: Po-Hsu Lin <po-hsu.lin@canonical.com>\n"

13"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2016-04-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2016-05-19 05:50+0000\n"

19−"X-Generator: Launchpad (build 17995)\n"

19+"X-Generator: Launchpad (build 18025)\n"

20"Language: zh_TW\n"

21

22#: plugins/IntegratedLightDM/Greeter.cpp:112

@@ -186,15 +186,15 @@ msgstr "精細篩選結果"

186msgid "Reset"

187msgstr "重設"

188

189−#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755

189+#: qml/Dash/GenericScopeView.qml:579 qml/Dash/GenericScopeView.qml:764

190msgid "Show less"

191msgstr ""

192

193−#: qml/Dash/GenericScopeView.qml:570

193+#: qml/Dash/GenericScopeView.qml:579

194msgid "Show all"

195msgstr ""

196

197−#: qml/Dash/GenericScopeView.qml:627

197+#: qml/Dash/GenericScopeView.qml:636

198msgctxt "Label: Hint for dash search line edit"

199msgid "Search"

200msgstr "搜尋"

qml/Dash/CardGrid.qml+1

@@ -78,6 +78,7 @@ DashRenderer {

78 target: loader.item

79 onClicked: root.clicked(index, result, loader.item, model)

80 onPressAndHold: root.pressAndHold(index, result, model)

81+ onAction: root.action(index, result, actionId)

81 }

82 }

83 }

84 }

qml/Dash/CardHorizontalList.qml+1

@@ -59,6 +59,7 @@ DashRenderer {

59 target: loader.item

60 onClicked: root.clicked(index, result, loader.item, model)

61 onPressAndHold: root.pressAndHold(index, result, model)

62+ onAction: root.action(index, result, actionId)

62 }

63 }

64 }

65 }

qml/Dash/CardTool.qml+23−7

@@ -162,7 +162,7 @@ Item {

162 id: attributesModel

163 property int numOfAttributes: 0

164 property var model: []

165− property bool hasAttributes: {

165+ readonly property bool hasAttributes: {

166 var attributes = components["attributes"];

167 var hasAttributesFlag = (attributes != undefined) && (attributes["field"] != undefined);

168

@@ -182,16 +182,31 @@ Item {

182 }

183 }

184

185+ Item {

186+ id: socialActionsModel

187+ property var model: []

188+ readonly property bool hasActions: components["social-actions"] != undefined

189+

190+ onHasActionsChanged: {

191+ model = []

192+ if (hasActions) {

193+ model.push( {"id":"text", "icon":"image://theme/ok" } );

194+ }

195+ }

196+ }

197+

185 Loader {

198 Loader {

186 id: cardLoader

199 id: cardLoader

187− readonly property var fields: ["art", "mascot", "title", "subtitle", "summary", "attributes"]

200+ readonly property var cfields: ["art", "mascot", "title", "subtitle", "summary", "attributes", "social-actions"]

201+ readonly property var dfields: ["art", "mascot", "title", "subtitle", "summary", "attributes", "socialActions"]

188 readonly property var maxData: {

202 readonly property var maxData: {

189 "art": Qt.resolvedUrl("graphics/pixel.png"),

203 "art": Qt.resolvedUrl("graphics/pixel.png"),

190 "mascot": Qt.resolvedUrl("graphics/pixel.png"),

204 "mascot": Qt.resolvedUrl("graphics/pixel.png"),

191 "title": "—\n—",

205 "title": "—\n—",

192 "subtitle": "—",

206 "subtitle": "—",

193 "summary": "—\n—\n—\n—\n—",

207 "summary": "—\n—\n—\n—\n—",

194− "attributes": attributesModel.model

208+ "attributes": attributesModel.model,

209+ "socialActions": socialActionsModel.model

195 }

210 }

196 sourceComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, true);

211 sourceComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, true);

197 onLoaded: {

212 onLoaded: {

@@ -206,13 +221,14 @@ Item {

206 }

221 }

207 function updateCardData() {

222 function updateCardData() {

208 var data = {};

223 var data = {};

209− for (var k in fields) {

224+ for (var k in cfields) {

225+ var ckey = cfields[k];

210− var component = cardTool.components[fields[k]];

226+ var component = cardTool.components[ckey];

211− var key = fields[k];

212 if ((typeof component === "string" && component.length > 0) ||

227 if ((typeof component === "string" && component.length > 0) ||

213 (typeof component === "object" && component !== null

228 (typeof component === "object" && component !== null

214 && typeof component["field"] === "string" && component["field"].length > 0)) {

229 && typeof component["field"] === "string" && component["field"].length > 0)) {

230+ var dkey = dfields[k];

215− data[key] = maxData[key];

231+ data[dkey] = maxData[dkey];

216 }

232 }

217 }

233 }

218 item.cardData = data;

234 item.cardData = data;

qml/Dash/CardVerticalJournal.qml+1

@@ -78,6 +78,7 @@ DashRenderer {

78 target: loader.item

79 onClicked: root.clicked(index, result, loader.item, model)

80 onPressAndHold: root.pressAndHold(index, result, model)

81+ onAction: root.action(index, result, actionId)

81 }

82 }

83 }

84 }

qml/Dash/DashRenderer.qml+6

@@ -57,4 +57,10 @@ Item {

57 /// @param result result model of the clicked item, used for activation

58 /// @param itemModel model of the item

59 signal pressAndHold(int index, var result, var itemModel)

60+

61+ /// Emitted when the user clicked on an item action

62+ /// @param index is the index of the clicked item

63+ /// @param result result model of the clicked item, used for activation

64+ /// @param actionId id of the clicked action

65+ signal action(int index, var result, var actionId)

60}

66}

qml/Dash/Filters/FilterExpandableWidget.qmlnew file+96

@@ -0,0 +1,96 @@

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.4

18+import Ubuntu.Components 1.3

19+import Ubuntu.Components.ListItems 1.3 as ListItems

20+

21+/*! Expandable Filter Widget. */

22+

23+FilterWidget {

24+ id: root

25+

26+ showsTitleOnItsOwn: true

27+

28+ implicitHeight: expandingItem.height

29+

30+ ListItems.Expandable {

31+ id: expandingItem

32+ objectName: "expandingItem"

33+

34+ expandedHeight: collapsedHeight + column.height

35+ anchors.left: parent.left

36+ anchors.right: parent.right

37+ showDivider: false

38+

39+ onClicked: {

40+ expanded = !expanded;

41+ forceActiveFocus();

42+ }

43+ __contentsMargins: 0

44+

45+ Item {

46+ id: titleHolder

47+ anchors.top: parent.top

48+ height: expandingItem.collapsedHeight

49+ anchors.left: parent.left

50+ anchors.right: parent.right

51+

52+ Label {

53+ anchors.left: parent.left

54+ anchors.leftMargin: units.gu(2)

55+ anchors.right: dropDown.left

56+ anchors.verticalCenter: parent.verticalCenter

57+ text: widgetData.title || ""

58+ }

59+

60+ Image {

61+ id: dropDown

62+ height: units.gu(3)

63+ fillMode: Image.PreserveAspectFit

64+ anchors.right: parent.right

65+ anchors.rightMargin: units.gu(2)

66+ anchors.verticalCenter: parent.verticalCenter

67+ source: expandingItem.expanded ? "image://theme/up" : "image://theme/down"

68+ }

69+ }

70+

71+ Column {

72+ id: column

73+ anchors.left: parent.left

74+ anchors.right: parent.right

75+ anchors.top: titleHolder.bottom

76+

77+ Repeater {

78+ id: repeater

79+ model: widgetData.filters

80+

81+ delegate: FilterWidgetFactory {

82+ width: parent.width

83+

84+ widgetId: id

85+ widgetType: type

86+ widgetData: filter

87+

88+ ListItems.ThinDivider {

89+ anchors.bottom: parent.bottom

90+ visible: index !== repeater.count - 1

91+ }

92+ }

93+ }

94+ }

95+ }

96+}

qml/Dash/Filters/FilterWidget.qml+3

@@ -25,5 +25,8 @@ Item {

25 //! Variable used to contain widget's data

26 property var widgetData: null

27

28+ //! Does the widget show the title inside?

29+ property bool showsTitleOnItsOwn: false

30+

28 objectName: widgetId

31 objectName: widgetId

29}

32}

qml/Dash/Filters/FilterWidgetFactory.qml+2−1

@@ -35,7 +35,7 @@ Item {

35

36 Label {

37 id: title

38− text: widgetData ? widgetData.title : ""

38+ text: widgetData && !(loader.item && loader.item.showsTitleOnItsOwn) ? widgetData.title : ""

39 height: text != "" ? implicitHeight : 0

40

41 anchors {

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

68 case Filters.OptionSelectorFilter: return "FilterOptionSelector.qml";

69 case Filters.RangeInputFilter: return "FilterRangeInput.qml";

70 case Filters.ValueSliderFilter: return "FilterValueSlider.qml";

71+ case Filters.ExpandableFilterWidget: return "FilterExpandableWidget.qml";

71 default: return "";

72 default: return "";

72 }

73 }

74 }

qml/Dash/GenericScopeView.qml+4

@@ -395,6 +395,10 @@ FocusScope {

395 scopeView.itemPressedAndHeld(result, baseItem.category);

396 }

397

398+ onAction: { // (int index, var result, var actionId)

399+ scope.activateAction(result, baseItem.category, actionId);

400+ }

401+

398 function categoryItemCount() {

402 function categoryItemCount() {

399 var categoryItemCount = -1;

403 var categoryItemCount = -1;

400 if (!rendererLoader.expanded && !seeAllLabel.visible && target.collapsedItemCount > 0) {

404 if (!rendererLoader.expanded && !seeAllLabel.visible && target.collapsedItemCount > 0) {

qml/Dash/Previews/PreviewActionCombo.qml+1−1

@@ -59,7 +59,7 @@ Item {

59

60 delegate: PreviewActionButton {

61 data: modelData

62− width: implicitWidth < parent.width ? parent.width : implicitWidth

62+ width: implicitWidth < root.width ? root.width : implicitWidth

63 onClicked: root.triggeredAction(modelData)

64 strokeColor: moreButton.strokeColor

65 }

qml/Dash/Previews/PreviewActions.qml+8−7

@@ -26,25 +26,26 @@ PreviewWidget {

26 id: root

27

28 implicitHeight: row.height + units.gu(1)

29+ readonly property var actions: root.widgetData ? root.widgetData["actions"] : null

29

30

30 Row {

31 Row {

31 id: row

32 id: row

32− readonly property var actions: root.widgetData ? root.widgetData["actions"] : null

33 anchors.right: parent.right

34

35 spacing: units.gu(1)

36

37 Loader {

38 id: loader

39+ objectName: "loader"

39− readonly property bool button: row.actions && row.actions.length == 2

40+ readonly property bool button: root.actions && root.actions.length == 2

40− readonly property bool combo: row.actions && row.actions.length > 2

41+ readonly property bool combo: root.actions && root.actions.length > 2

41 source: button ? "PreviewActionButton.qml" : (combo ? "PreviewActionCombo.qml" : "")

42 source: button ? "PreviewActionButton.qml" : (combo ? "PreviewActionCombo.qml" : "")

42 width: (root.width - units.gu(1)) / 2

43 width: (root.width - units.gu(1)) / 2

43 onLoaded: {

44 onLoaded: {

44 if (button) {

45 if (button) {

45− item.data = row.actions[1];

46+ item.data = Qt.binding(function() { return root.actions[1]; });

46 } else if (combo) {

47 } else if (combo) {

47− item.model = row.actions.slice(1);

48+ item.model = Qt.binding(function() { return root.actions.slice(1); });

48 }

49 }

50 }

50 Binding {

51 Binding {

@@ -61,8 +62,8 @@ PreviewWidget {

61 }

62 }

62

63

63 PreviewActionButton {

64 PreviewActionButton {

64− data: visible ? row.actions[0] : null

65+ data: visible ? root.actions[0] : null

65− visible: row.actions && row.actions.length > 0

66+ visible: root.actions && root.actions.length > 0

66 onTriggeredAction: root.triggered(root.widgetId, actionData.id, actionData)

67 onTriggeredAction: root.triggered(root.widgetId, actionData.id, actionData)

67 width: (root.width - units.gu(1)) / 2

68 width: (root.width - units.gu(1)) / 2

68 color: root.scopeStyle ? root.scopeStyle.previewButtonColor : UbuntuColors.orange

69 color: root.scopeStyle ? root.scopeStyle.previewButtonColor : UbuntuColors.orange

qml/Dash/Previews/PreviewIconActions.qml+15

@@ -32,10 +32,20 @@ PreviewWidget {

32 id: row

33 readonly property var actions: root.widgetData ? root.widgetData["actions"] : null

34 width: parent.width

35+ onActionsChanged: {

36+ // Rewire the source since it may have been unwired on onClicked

37+ // but the icon didn't change i.e. the scope updated the results

38+ // and the icon needs to go back to the one it was originally

39+ for (var i = 0; i < repeater.count; ++i) {

40+ var button = repeater.itemAt(i);

41+ button.updateIcon();

42+ }

43+ }

35

44

36 spacing: units.gu(2)

45 spacing: units.gu(2)

37

46

38 Repeater {

47 Repeater {

48+ id: repeater

39 model: row.actions

49 model: row.actions

40

50

41 AbstractButton {

51 AbstractButton {

@@ -43,6 +53,11 @@ PreviewWidget {

43 height: label.height

53 height: label.height

44 width: childrenRect.width

54 width: childrenRect.width

45

55

56+ readonly property var iconUrl: modelData.icon;

57+ function updateIcon() {

58+ icon.source = iconUrl;

59+ }

60+

46 Image {

61 Image {

47 id: icon

62 id: icon

48 height: parent.height

63 height: parent.height

qml/Dash/Previews/PreviewZoomableImage.qml+13−8

@@ -34,6 +34,8 @@ PreviewWidget {

34

35 property Item rootItem: QuickUtils.rootItem(root)

36

37+ readonly property var imageUrl: widgetData["source"] || widgetData["fallback"] || ""

38+

37 LazyImage {

39 LazyImage {

38 id: lazyImage

40 id: lazyImage

39 objectName: "lazyImage"

41 objectName: "lazyImage"

@@ -42,7 +44,7 @@ PreviewWidget {

42 right: parent.right

44 right: parent.right

43 }

45 }

44 scaleTo: "width"

46 scaleTo: "width"

45− source: widgetData["source"] || widgetData["fallback"] || ""

47+ source: root.imageUrl

46 asynchronous: true

48 asynchronous: true

47 useUbuntuShape: false

49 useUbuntuShape: false

48 pressed: mouseArea.pressed

50 pressed: mouseArea.pressed

@@ -59,11 +61,12 @@ PreviewWidget {

59

61

60 Connections {

62 Connections {

61 target: lazyImage.sourceImage

63 target: lazyImage.sourceImage

62− // If modelData would change after failing to load it would not be

63− // reloaded since the source binding is destroyed by the source = fallback

64− // But at the moment the model never changes

65 onStatusChanged: if (lazyImage.sourceImage.status === Image.Error) lazyImage.sourceImage.source = widgetData["fallback"];

64 onStatusChanged: if (lazyImage.sourceImage.status === Image.Error) lazyImage.sourceImage.source = widgetData["fallback"];

66 }

65 }

66+ Connections {

67+ target: root

68+ onImageUrlChanged: lazyImage.sourceImage.source = root.imageUrl;

69+ }

67

70

68 PreviewMediaToolbar {

71 PreviewMediaToolbar {

69 id: toolbar

72 id: toolbar

@@ -86,12 +89,14 @@ PreviewWidget {

86

89

87 delegate: ZoomableImage {

90 delegate: ZoomableImage {

88 anchors.fill: parent

91 anchors.fill: parent

89− source: widgetData["source"] || widgetData["fallback"] || ""

92+ source: root.imageUrl

90 zoomable: widgetData["zoomable"] ? widgetData["zoomable"] : false

93 zoomable: widgetData["zoomable"] ? widgetData["zoomable"] : false

91− // If modelData would change after failing to load it would not be

92− // reloaded since the source binding is destroyed by the source = fallback

93− // But at the moment the model never changes

94 onStatusChanged: if (status === Image.Error) source = widgetData["fallback"];

95+

96+ Connections {

97+ target: root

98+ onImageUrlChanged: source = root.imageUrl;

99+ }

95 }

100 }

96 }

101 }

97}

102}

qml/Stages/ApplicationWindow.qml+31−1

@@ -120,6 +120,17 @@ FocusScope {

120 || (application.supportedOrientations & Qt.InvertedLandscapeOrientation))

121

122 property bool surfaceOldEnoughToBeResized: false

123+

124+ property var focusedSurface: {

125+ if (promptSurfacesRepeater.count == 0) {

126+ return surfaceContainer;

127+ } else {

128+ return promptSurfacesRepeater.itemAt(promptSurfacesRepeater.count - 1);

129+ }

130+ }

131+ onFocusedSurfaceChanged: {

132+ focusedSurface.focus = true;

133+ }

123 }

134 }

124

135

125 Binding {

136 Binding {

@@ -183,7 +194,26 @@ FocusScope {

183 requestedWidth: root.requestedWidth

194 requestedWidth: root.requestedWidth

184 requestedHeight: root.requestedHeight

195 requestedHeight: root.requestedHeight

185 surfaceOrientationAngle: application && application.rotatesWindowContents ? root.surfaceOrientationAngle : 0

196 surfaceOrientationAngle: application && application.rotatesWindowContents ? root.surfaceOrientationAngle : 0

186− focus: true

197+ }

198+

199+ Repeater {

200+ id: promptSurfacesRepeater

201+ objectName: "promptSurfacesRepeater"

202+ // show only along with the top-most application surface

203+ model: {

204+ if (root.application && root.surface === root.application.surfaceList.first) {

205+ return root.application.promptSurfaceList;

206+ } else {

207+ return null;

208+ }

209+ }

210+ delegate: SurfaceContainer {

211+ interactive: index == (promptSurfacesRepeater.count - 1) && root.interactive

212+ surface: model.surface

213+ width: root.width

214+ height: root.height

215+ isPromptSurface: true

216+ }

187 }

217 }

188

218

189 // SurfaceContainer size drives ApplicationWindow size

219 // SurfaceContainer size drives ApplicationWindow size

qml/Stages/SurfaceContainer.qml+4−63

@@ -33,7 +33,7 @@ FocusScope {

33 property bool interactive

34 property int surfaceOrientationAngle: 0

35 property bool resizeSurface: true

36− property bool inPromptSession: false

36+ property bool isPromptSurface: false

37

38 onSurfaceChanged: {

39 // Not a binding because animations might remove the surface from the surfaceItem

@@ -56,6 +56,8 @@ FocusScope {

56 id: surfaceItem

57 objectName: "surfaceItem"

58

59+ focus: true

60+

59 fillMode: MirSurfaceItem.PadOrCrop

61 fillMode: MirSurfaceItem.PadOrCrop

60 consumesInput: true

62 consumesInput: true

61

63

@@ -122,59 +124,12 @@ FocusScope {

122 when: root.requestedHeight < 0

124 when: root.requestedHeight < 0

123 }

125 }

124

126

125− Repeater {

126− id: childSurfacesRepeater

127− objectName: "childSurfacesRepeater"

128− model: root.surface ? root.surface.promptSurfaceList : null

129−

130− delegate: Loader {

131− objectName: "childDelegate" + index

132− anchors.fill: root

133−

134− // Only way to do recursive qml items.

135− source: Qt.resolvedUrl("SurfaceContainer.qml")

136−

137− z: index

138−

139− // Since a Loader is a FocusScope, propagate its focus to the loaded Item

140− Binding {

141− target: item; when: item

142− property: "focus"; value: focus

143− }

144−

145− Binding {

146− target: item; when: item

147− property: "interactive"; value: index == (childSurfacesRepeater.count - 1) && root.interactive

148− }

149−

150− Binding {

151− target: item; when: item

152− property: "surface"; value: model.surface

153− }

154−

155− Binding {

156− target: item; when: item

157− property: "width"; value: root.width

158− }

159−

160− Binding {

161− target: item; when: item

162− property: "height"; value: root.height

163− }

164−

165− Binding {

166− target: item; when: item

167− property: "inPromptSession"; value: true

168− }

169− }

170− }

171−

172 Loader {

127 Loader {

173 id: animationsLoader

128 id: animationsLoader

174 objectName: "animationsLoader"

129 objectName: "animationsLoader"

175 active: root.surface

130 active: root.surface

176 source: {

131 source: {

177− if (root.inPromptSession) {

132+ if (root.isPromptSurface) {

178 return "PromptSurfaceAnimations.qml";

133 return "PromptSurfaceAnimations.qml";

179 } else {

134 } else {

180 // Let ApplicationWindow do the animations

135 // Let ApplicationWindow do the animations

@@ -194,18 +149,4 @@ FocusScope {

194 value: root

149 value: root

195 }

150 }

196 }

151 }

197−

198− QtObject {

199− id: d

200− property var focusedChild: {

201− if (childSurfacesRepeater.count == 0) {

202− return surfaceItem;

203− } else {

204− return childSurfacesRepeater.itemAt(childSurfacesRepeater.count - 1);

205− }

206− }

207− onFocusedChildChanged: {

208− focusedChild.focus = true;

209− }

210− }

211}

152}

tests/mocks/Unity/Application/ApplicationInfo.cpp+8

@@ -193,6 +193,10 @@ void ApplicationInfo::setState(State value)

193 MirSurface *surface = static_cast<MirSurface*>(m_surfaceList.get(i));

194 surface->setLive(false);

195 }

196+ for (int i = 0; i < m_promptSurfaceList.count(); ++i) {

197+ auto surface = static_cast<MirSurface*>(m_promptSurfaceList.get(i));

198+ surface->setLive(false);

199+ }

196 }

200 }

197

201

198 m_state = value;

202 m_state = value;

@@ -237,6 +241,10 @@ void ApplicationInfo::setManualSurfaceCreation(bool value)

237 if (value != m_manualSurfaceCreation) {

241 if (value != m_manualSurfaceCreation) {

238 m_manualSurfaceCreation = value;

242 m_manualSurfaceCreation = value;

239 Q_EMIT manualSurfaceCreationChanged(value);

243 Q_EMIT manualSurfaceCreationChanged(value);

244+

245+ if (m_manualSurfaceCreation && m_surfaceCreationTimer.isActive()) {

246+ m_surfaceCreationTimer.stop();

247+ }

240 }

248 }

241}

249}

242

250

tests/mocks/Unity/Application/ApplicationInfo.h+2

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

108 Q_INVOKABLE void setShellChrome(Mir::ShellChrome shellChrome);

109

110 MirSurfaceListInterface* surfaceList() override { return &m_surfaceList; }

111+ MirSurfaceListInterface* promptSurfaceList() override { return &m_promptSurfaceList; }

111

112

112 void setFocused(bool value);

113 void setFocused(bool value);

113

114

@@ -148,6 +149,7 @@ private:

148 bool m_exemptFromLifecycle{false};

149 bool m_exemptFromLifecycle{false};

149 QSize m_initialSurfaceSize;

150 QSize m_initialSurfaceSize;

150 MirSurfaceListModel m_surfaceList;

151 MirSurfaceListModel m_surfaceList;

152+ MirSurfaceListModel m_promptSurfaceList;

151 int m_liveSurfaceCount{0};

153 int m_liveSurfaceCount{0};

152 QTimer m_surfaceCreationTimer;

154 QTimer m_surfaceCreationTimer;

153 QList<MirSurface*> m_closingSurfaces;

155 QList<MirSurface*> m_closingSurfaces;

tests/mocks/Unity/Application/MirSurface.cpp+1−21

@@ -408,27 +408,6 @@ void MirSurface::close()

408 }

409}

410

411−void MirSurface::createPromptSurface()

412−{

413− QStringList screenshotIds = {"gallery", "map", "facebook", "camera", "browser", "music", "twitter"};

414− int i = rand() % screenshotIds.count();

415−

416− QUrl screenshotUrl = QString("qrc:///Unity/Application/screenshots/%1@12.png")

417− .arg(screenshotIds[i]);

418−

419− auto surface = new MirSurface(QString("prompt foo"),

420− Mir::NormalType,

421− Mir::RestoredState,

422− screenshotUrl);

423−

424− m_promptSurfaceList.appendSurface(surface);

425−}

426−

427−MirSurfaceListInterface* MirSurface::promptSurfaceList()

428−{

429− return &m_promptSurfaceList;

430−}

431−

432void MirSurface::requestFocus()

411void MirSurface::requestFocus()

433{

412{

434 DEBUG_MSG("");

413 DEBUG_MSG("");

@@ -485,6 +464,7 @@ void MirFocusController::setFocusedSurface(MirSurfaceInterface *surface)

485

464

486 if (m_focusedSurface) {

465 if (m_focusedSurface) {

487 Q_EMIT m_focusedSurface->focusedChanged(true);

466 Q_EMIT m_focusedSurface->focusedChanged(true);

467+ m_focusedSurface->raise();

488 }

468 }

489}

469}

490

470

tests/mocks/Unity/Application/MirSurface.h−5

@@ -107,8 +107,6 @@ public:

107

108 Q_INVOKABLE void close() override;

109

110− unity::shell::application::MirSurfaceListInterface* promptSurfaceList() override;

111−

112 Q_INVOKABLE void raise() override;

110 Q_INVOKABLE void raise() override;

113

111

114 ////

112 ////

@@ -130,8 +128,6 @@ public:

130 Q_INVOKABLE void setWidthIncrement(int);

128 Q_INVOKABLE void setWidthIncrement(int);

131 Q_INVOKABLE void setHeightIncrement(int);

129 Q_INVOKABLE void setHeightIncrement(int);

132

130

133− Q_INVOKABLE void createPromptSurface();

134−

135 /////

131 /////

136 // internal mock stuff

132 // internal mock stuff

137

133

@@ -199,7 +195,6 @@ private:

199 QSize m_pendingResize;

195 QSize m_pendingResize;

200

196

201 Mir::ShellChrome m_shellChrome;

197 Mir::ShellChrome m_shellChrome;

202− MirSurfaceListModel m_promptSurfaceList;

203

198

204 struct View {

199 struct View {

205 bool visible;

200 bool visible;

tests/mocks/Unity/Application/MirSurfaceListModel.cpp+28

@@ -67,6 +67,9 @@ void MirSurfaceListModel::appendSurface(MirSurface *surface)

67 connectSurface(surface);

68 endInsertRows();

69 Q_EMIT countChanged();

70+ if (m_surfaceList.count() == 1) {

71+ Q_EMIT firstChanged();

72+ }

70}

73}

71

74

72void MirSurfaceListModel::connectSurface(MirSurface *surface)

75void MirSurfaceListModel::connectSurface(MirSurface *surface)

@@ -83,6 +86,9 @@ void MirSurfaceListModel::removeSurface(MirSurface *surface)

83 m_surfaceList.removeAt(i);

86 m_surfaceList.removeAt(i);

84 endRemoveRows();

87 endRemoveRows();

85 Q_EMIT countChanged();

88 Q_EMIT countChanged();

89+ if (m_surfaceList.count() == 0 || i == 0) {

90+ Q_EMIT firstChanged();

91+ }

86 }

92 }

87}

93}

88

94

@@ -100,6 +106,10 @@ void MirSurfaceListModel::moveSurface(int from, int to)

100 m_surfaceList.move(from, to);

106 m_surfaceList.move(from, to);

101 endMoveRows();

107 endMoveRows();

102 }

108 }

109+

110+ if ((from == 0 || to == 0) && m_surfaceList.count() > 1) {

111+ Q_EMIT firstChanged();

112+ }

103}

113}

104

114

105MirSurfaceInterface *MirSurfaceListModel::get(int index)

115MirSurfaceInterface *MirSurfaceListModel::get(int index)

@@ -119,3 +129,21 @@ const MirSurfaceInterface *MirSurfaceListModel::get(int index) const

119 return nullptr;

129 return nullptr;

120 }

130 }

121}

131}

132+

133+MirSurfaceInterface *MirSurfaceListModel::createSurface()

134+{

135+ QStringList screenshotIds = {"gallery", "map", "facebook", "camera", "browser", "music", "twitter"};

136+ int i = rand() % screenshotIds.count();

137+

138+ QUrl screenshotUrl = QString("qrc:///Unity/Application/screenshots/%1@12.png")

139+ .arg(screenshotIds[i]);

140+

141+ auto surface = new MirSurface(QString("prompt foo"),

142+ Mir::NormalType,

143+ Mir::RestoredState,

144+ screenshotUrl);

145+

146+ appendSurface(surface);

147+

148+ return surface;

149+}

tests/mocks/Unity/Application/MirSurfaceListModel.h+5

@@ -43,6 +43,11 @@ public:

43

44 bool contains(MirSurface *surface) const { return m_surfaceList.contains(surface); }

45

46+ ////

47+ // API for tests

48+

49+ Q_INVOKABLE unity::shell::application::MirSurfaceInterface *createSurface();

50+

46private:

51private:

47 void raise(MirSurface *surface);

52 void raise(MirSurface *surface);

48 void moveSurface(int from, int to);

53 void moveSurface(int from, int to);

tests/mocks/Unity/CMakeLists.txt+3−1

@@ -8,7 +8,7 @@ add_subdirectory(DashCommunicator)

8add_subdirectory(Screens)

9

10pkg_search_module(GOBJECT gobject-2.0 REQUIRED)

11−pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=11)

11+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=12)

12

13include_directories(

14 ${CMAKE_CURRENT_BINARY_DIR}

@@ -34,6 +34,7 @@ set(UnityQML_SOURCES

34 fake_optionselectoroptions.cpp

35 fake_rangeinputfilter.cpp

36 fake_valuesliderfilter.cpp

37+ fake_expandablefilterwidget.cpp

37 fake_valueslidervalues.cpp

38 fake_valueslidervalues.cpp

38 fake_unity_plugin.cpp

39 fake_unity_plugin.cpp

39 ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/CategoriesInterface.h

40 ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/CategoriesInterface.h

@@ -51,6 +52,7 @@ set(UnityQML_SOURCES

51 ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/SettingsModelInterface.h

52 ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/SettingsModelInterface.h

52 ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ValueSliderFilterInterface.h

53 ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ValueSliderFilterInterface.h

53 ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ValueSliderValuesInterface.h

54 ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ValueSliderValuesInterface.h

55+ ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ExpandableFilterWidgetInterface.h

54)

56)

55

57

56# Workaround for gcc failure LP: #1417664

58# Workaround for gcc failure LP: #1417664

tests/mocks/Unity/fake_categories.cpp+4−1

@@ -88,7 +88,7 @@ Categories::data(const QModelIndex& index, int role) const

88 }

89 case RoleComponents:

90 {

91− QVariantMap map, artMap, attributeMap;

91+ QVariantMap map, artMap, attributeMap, socialActionMap;

92 if (index.row() % 2 != 0) {

93 artMap["aspect-ratio"] = QString("1.%1").arg(index.row());

94 } else {

@@ -99,6 +99,9 @@ Categories::data(const QModelIndex& index, int role) const

99 map["title"] = "HOLA";

100 map["subtitle"] = "HOLA";

101 attributeMap["field"] = "attribute";

102+ socialActionMap["icon"] = "icon";

103+ socialActionMap["id"] = "socialHola";

104+ map["socialActions"] = socialActionMap;

102 map["attributes"] = attributeMap;

105 map["attributes"] = attributeMap;

103 return map;

106 return map;

104 }

107 }

tests/mocks/Unity/fake_expandablefilterwidget.cppnew file+53

@@ -0,0 +1,53 @@

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_expandablefilterwidget.h"

18+

19+#include "fake_filters.h"

20+

21+FakeExpandbleFilterWidget::FakeExpandbleFilterWidget(const QString &id, const QString &tag, const QString &title, QObject* parent)

22+ : unity::shell::scopes::ExpandableFilterWidgetInterface(parent)

23+ , m_filterId(id)

24+ , m_filterTag(tag)

25+ , m_title(title)

26+{

27+ m_filters = new Filters(this);

28+}

29+

30+QString FakeExpandbleFilterWidget::filterId() const

31+{

32+ return m_filterId;

33+}

34+

35+QString FakeExpandbleFilterWidget::filterTag() const

36+{

37+ return m_filterTag;

38+}

39+

40+QString FakeExpandbleFilterWidget::title() const

41+{

42+ return m_title;

43+}

44+

45+unity::shell::scopes::FiltersInterface* FakeExpandbleFilterWidget::filters() const

46+{

47+ return m_filters;

48+}

49+

50+void FakeExpandbleFilterWidget::addFilter(unity::shell::scopes::FilterBaseInterface* f)

51+{

52+ m_filters->addFilter(f);

53+}

tests/mocks/Unity/fake_expandablefilterwidget.hnew file+48

@@ -0,0 +1,48 @@

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_EXPANDABLEFILTERWIDGET_H

18+#define FAKE_EXPANDABLEFILTERWIDGET_H

19+

20+#include <unity/shell/scopes/ExpandableFilterWidgetInterface.h>

21+

22+class Filters;

23+

24+class FakeExpandbleFilterWidget : public unity::shell::scopes::ExpandableFilterWidgetInterface

25+{

26+ Q_OBJECT

27+

28+public:

29+ FakeExpandbleFilterWidget(const QString &id, const QString &tag, const QString &title, QObject* parent);

30+

31+ QString filterId() const override;

32+ QString filterTag() const override;

33+ QString title() const override;

34+

35+ unity::shell::scopes::FiltersInterface* filters() const override;

36+

37+ // mock API

38+ void addFilter(unity::shell::scopes::FilterBaseInterface* f);

39+

40+private:

41+ QString m_filterId;

42+ QString m_filterTag;

43+ QString m_title;

44+

45+ Filters *m_filters;

46+};

47+

48+#endif

tests/mocks/Unity/fake_filters.cpp+19−8

@@ -19,10 +19,14 @@

19#include "fake_optionselectorfilter.h"

20#include "fake_rangeinputfilter.h"

21#include "fake_valuesliderfilter.h"

22−#include "fake_scope.h"

22+#include "fake_expandablefilterwidget.h"

23

24−Filters::Filters(Scope* parent)

24+Filters::Filters(QObject* parent)

25 : unity::shell::scopes::FiltersInterface(parent)

26+{

27+}

28+

29+void Filters::addFakeFilters()

26{

30{

27 addFilter(new FakeOptionSelectorFilter("OSF1", "Tag1", "Which Cake you like More", false, QStringList() << "cheese" << "carrot" << "chocolate", this));

31 addFilter(new FakeOptionSelectorFilter("OSF1", "Tag1", "Which Cake you like More", false, QStringList() << "cheese" << "carrot" << "chocolate", this));

28

32

@@ -41,6 +45,11 @@ Filters::Filters(Scope* parent)

41 addFilter(vsf);

45 addFilter(vsf);

42

46

43 addFilter(new FakeOptionSelectorFilter("OSF2", "Tag2", "Which Countries have you been to?", true, QStringList() << "Germany" << "UK" << "New Zealand", this));

47 addFilter(new FakeOptionSelectorFilter("OSF2", "Tag2", "Which Countries have you been to?", true, QStringList() << "Germany" << "UK" << "New Zealand", this));

48+

49+ auto expandableFilter = new FakeExpandbleFilterWidget("EFW", "Tag5", "Advanced Settings", this);

50+ expandableFilter->addFilter(new FakeValueSliderFilter("VS2", "Tag6", 15, 10, 150, labels, this));

51+

52+ addFilter(expandableFilter);

44}

53}

45

54

46void Filters::addFilter(unity::shell::scopes::FilterBaseInterface *f)

55void Filters::addFilter(unity::shell::scopes::FilterBaseInterface *f)

@@ -58,9 +67,10 @@ void Filters::addFilter(unity::shell::scopes::FilterBaseInterface *f)

58 }

67 }

59 break;

68 break;

60

69

61− case FiltersInterface::ValueSliderFilter: {

70+ case FiltersInterface::ExpandableFilterWidget:

71+ // Can't be active

72+ case FiltersInterface::ValueSliderFilter:

62− // Not counting value slider as active in the mock

73+ // Not counting value as active in the mock

63− }

64

74

65 case Invalid:

75 case Invalid:

66 break;

76 break;

@@ -113,9 +123,10 @@ int Filters::activeFiltersCount() const

113 }

123 }

114 break;

124 break;

115

125

116− case FiltersInterface::ValueSliderFilter: {

126+ case FiltersInterface::ExpandableFilterWidget:

127+ // Can't be active

128+ case FiltersInterface::ValueSliderFilter:

117− // Not counting value slider as active in the mock

129+ // Not counting value as active in the mock

118− }

119

130

120 case Invalid:

131 case Invalid:

121 break;

132 break;

tests/mocks/Unity/fake_filters.h+4−4

@@ -20,25 +20,25 @@

20#include <unity/shell/scopes/FiltersInterface.h>

21#include <unity/shell/scopes/FilterBaseInterface.h>

22

23−class Scope;

24−

25class Filters : public unity::shell::scopes::FiltersInterface

23class Filters : public unity::shell::scopes::FiltersInterface

26{

24{

27 Q_OBJECT

25 Q_OBJECT

28

26

29public:

27public:

30− Filters(Scope* parent);

28+ Filters(QObject* parent);

31

29

32 int rowCount(const QModelIndex &parent) const override;

30 int rowCount(const QModelIndex &parent) const override;

33 QVariant data(const QModelIndex &index, int role) const override;

31 QVariant data(const QModelIndex &index, int role) const override;

34

32

33+ // Mock API

35 int activeFiltersCount() const;

34 int activeFiltersCount() const;

35+ void addFakeFilters();

36+ void addFilter(unity::shell::scopes::FilterBaseInterface* f);

36

37

37Q_SIGNALS:

38Q_SIGNALS:

38 void activeFiltersCountChanged();

39 void activeFiltersCountChanged();

39

40

40private:

41private:

41− void addFilter(unity::shell::scopes::FilterBaseInterface* f);

42

43 QVector<unity::shell::scopes::FilterBaseInterface*> m_filters;

44};

tests/mocks/Unity/fake_resultsmodel.cpp+2

@@ -72,6 +72,8 @@ ResultsModel::data(const QModelIndex& index, int role) const

72 case RoleUri:

73 case RoleCategoryId:

74 case RoleDndUri:

75+ case RoleAttributes:

76+ case RoleSocialActions:

75 return QString();

77 return QString();

76 case RoleResult:

78 case RoleResult:

77 return QString("Result.%1.%2").arg(m_categoryId).arg(index.row());

79 return QString("Result.%1.%2").arg(m_categoryId).arg(index.row());

tests/mocks/Unity/fake_scope.cpp+2

@@ -49,6 +49,8 @@ Scope::Scope(QString const& id, QString const& name, bool favorite, Scopes* pare

49 , m_filters(new Filters(this))

50 , m_returnNullPreview(returnNullPreview)

51{

52+ m_filters->addFakeFilters();

53+

52 m_primaryNavigationFilter = new FakeOptionSelectorFilter("OSF3", "PFTag", "Which food you like More", false, QStringList() << "meat" << "vegetables", this);

54 m_primaryNavigationFilter = new FakeOptionSelectorFilter("OSF3", "PFTag", "Which food you like More", false, QStringList() << "meat" << "vegetables", this);

53 connect(m_filters, &Filters::activeFiltersCountChanged, this, &Scope::activeFiltersCountChanged);

55 connect(m_filters, &Filters::activeFiltersCountChanged, this, &Scope::activeFiltersCountChanged);

54}

56}

tests/plugins/Dash/cardcreator/1.res+1−1

@@ -11,7 +11,7 @@ AbstractButton {

11 property bool showHeader: true;

12 implicitWidth: childrenRect.width;

13 enabled: true;

14−

14+signal action(var actionId);

15readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

16Item {

17 id: artShapeHolder;

tests/plugins/Dash/cardcreator/1.res.cardcreator+1−1

@@ -10,7 +10,7 @@ AbstractButton {

10 property bool showHeader: true;

11 implicitWidth: childrenRect.width;

12 enabled: true;

13−

13+signal action(var actionId);

14readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

15Item {

16 id: artShapeHolder;

tests/plugins/Dash/cardcreator/10.res+1−1

@@ -11,7 +11,7 @@ AbstractButton {

11 property bool showHeader: true;

12 implicitWidth: childrenRect.width;

13 enabled: true;

14−

14+signal action(var actionId);

15Loader {

16 id: backgroundLoader;

17 objectName: "backgroundLoader";

tests/plugins/Dash/cardcreator/10.res.cardcreator+1−1

@@ -10,7 +10,7 @@ AbstractButton {

10 property bool showHeader: true;

11 implicitWidth: childrenRect.width;

12 enabled: true;

13−

13+signal action(var actionId);

14Loader {

15 id: backgroundLoader;

16 objectName: "backgroundLoader";

tests/plugins/Dash/cardcreator/11.res+1−1

@@ -11,7 +11,7 @@ AbstractButton {

11 property bool showHeader: true;

12 implicitWidth: childrenRect.width;

13 enabled: true;

14−

14+signal action(var actionId);

15Loader {

16 id: backgroundLoader;

17 objectName: "backgroundLoader";

tests/plugins/Dash/cardcreator/11.res.cardcreator+1−1

@@ -10,7 +10,7 @@ AbstractButton {

10 property bool showHeader: true;

11 implicitWidth: childrenRect.width;

12 enabled: true;

13−

13+signal action(var actionId);

14Loader {

15 id: backgroundLoader;

16 objectName: "backgroundLoader";

tests/plugins/Dash/cardcreator/12.resnew file+139

@@ -0,0 +1,139 @@

1+AbstractButton {

2+ id: root;

3+ property var cardData;

4+ property string artShapeStyle: "inset";

5+ property string backgroundShapeStyle: "inset";

6+ property real fontScale: 1.0;

7+ property var scopeStyle: null;

8+ property int fixedHeaderHeight: -1;

9+ property size fixedArtShapeSize: Qt.size(-1, -1);

10+ readonly property string title: cardData && cardData["title"] || "";

11+ property bool showHeader: true;

12+ implicitWidth: childrenRect.width;

13+ enabled: true;

14+signal action(var actionId);

15+readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

16+Item {

17+ id: artShapeHolder;

18+ height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;

19+ width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;

20+ anchors { horizontalCenter: parent.horizontalCenter; }

21+ Loader {

22+ id: artShapeLoader;

23+ objectName: "artShapeLoader";

24+ readonly property string cardArt: cardData && cardData["art"] || "";

25+ active: cardArt != "";

26+ asynchronous: true;

27+ visible: status == Loader.Ready;

28+ sourceComponent: Item {

29+ id: artShape;

30+ objectName: "artShape";

31+ visible: image.status == Image.Ready;

32+ readonly property alias image: artImage;

33+ Loader {

34+ anchors.fill: parent;

35+ visible: true;

36+ sourceComponent: root.artShapeStyle === "icon" ? artShapeIconComponent : artShapeShapeComponent;

37+ Component {

38+ id: artShapeShapeComponent;

39+ UbuntuShape {

40+ source: artImage;

41+ sourceFillMode: UbuntuShape.PreserveAspectCrop;

42+ radius: "medium";

43+ aspect: {

44+ switch (root.artShapeStyle) {

45+ case "inset": return UbuntuShape.Inset;

46+ case "shadow": return UbuntuShape.DropShadow;

47+ default:

48+ case "flat": return UbuntuShape.Flat;

49+ }

50+ }

51+ }

52+ }

53+ Component {

54+ id: artShapeIconComponent;

55+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }

56+ }

57+ }

58+ readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

59+ readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : 0.75;

60+ Component.onCompleted: { updateWidthHeightBindings(); }

61+ Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

62+ function updateWidthHeightBindings() {

63+ if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

64+ width = root.fixedArtShapeSize.width;

65+ height = root.fixedArtShapeSize.height;

66+ } else {

67+ width = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.width });

68+ height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });

69+ }

70+ }

71+ CroppedImageMinimumSourceSize {

72+ id: artImage;

73+ objectName: "artImage";

74+ source: artShapeLoader.cardArt;

75+ asynchronous: true;

76+ visible: !true;

77+ width: root.width;

78+ height: width / artShape.aspect;

79+ }

80+ }

81+ }

82+ }

83+readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;

84+Label {

85+ id: titleLabel;

86+ objectName: "titleLabel";

87+ anchors { right: parent.right;

88+ left: parent.left;

89+ top: artShapeHolder.bottom;

90+ topMargin: units.gu(1);

91+ }

92+ elide: Text.ElideRight;

93+ fontSize: "small";

94+ wrapMode: Text.Wrap;

95+ maximumLineCount: 2;

96+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

97+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;

98+ visible: showHeader ;

99+ width: undefined;

100+ text: root.title;

101+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

102+ horizontalAlignment: Text.AlignLeft;

103+ }

104+Label {

105+ id: subtitleLabel;

106+ objectName: "subtitleLabel";

107+ anchors { left: titleLabel.left;

108+ leftMargin: titleLabel.leftMargin;

109+ right: titleLabel.right;

110+ top: titleLabel.bottom;

111+ }

112+ anchors.topMargin: units.dp(2);

113+ elide: Text.ElideRight;

114+ maximumLineCount: 1;

115+ fontSize: "x-small";

116+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

117+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;

118+ visible: titleLabel.visible && titleLabel.text;

119+ text: cardData && cardData["subtitle"] || "";

120+ font.weight: Font.Light;

121+ }

122+CardSocialActions {

123+ id: socialActionsRow;

124+ objectName: "socialActionsRow";

125+ anchors { top: subtitleLabel.bottom; left: parent.left; right: parent.right; topMargin: units.gu(1); }

126+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;

127+ model: cardData && cardData["socialActions"];

128+ onClicked: root.action(actionId);

129+}

130+UbuntuShape {

131+ id: touchdown;

132+ objectName: "touchdown";

133+ anchors { fill: artShapeHolder }

134+ visible: root.artShapeStyle != "shadow" && root.artShapeStyle != "icon" && root.pressed;

135+ radius: "medium";

136+ borderSource: "radius_pressed.sci"

137+}

138+implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);

139+}

tests/plugins/Dash/cardcreator/12.res.cardcreatornew file+138

@@ -0,0 +1,138 @@

1+AbstractButton {

2+ id: root;

3+ property var cardData;

4+ property string artShapeStyle: "inset";

5+ property string backgroundShapeStyle: "inset";

6+ property real fontScale: 1.0;

7+ property var scopeStyle: null;

8+ property size fixedArtShapeSize: Qt.size(-1, -1);

9+ readonly property string title: cardData && cardData["title"] || "";

10+ property bool showHeader: true;

11+ implicitWidth: childrenRect.width;

12+ enabled: true;

13+signal action(var actionId);

14+readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

15+Item {

16+ id: artShapeHolder;

17+ height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;

18+ width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;

19+ anchors { horizontalCenter: parent.horizontalCenter; }

20+ Loader {

21+ id: artShapeLoader;

22+ objectName: "artShapeLoader";

23+ readonly property string cardArt: cardData && cardData["art"] || "";

24+ active: cardArt != "";

25+ asynchronous: false;

26+ visible: status == Loader.Ready;

27+ sourceComponent: Item {

28+ id: artShape;

29+ objectName: "artShape";

30+ visible: image.status == Image.Ready;

31+ readonly property alias image: artImage;

32+ Loader {

33+ anchors.fill: parent;

34+ visible: true;

35+ sourceComponent: root.artShapeStyle === "icon" ? artShapeIconComponent : artShapeShapeComponent;

36+ Component {

37+ id: artShapeShapeComponent;

38+ UbuntuShape {

39+ source: artImage;

40+ sourceFillMode: UbuntuShape.PreserveAspectCrop;

41+ radius: "medium";

42+ aspect: {

43+ switch (root.artShapeStyle) {

44+ case "inset": return UbuntuShape.Inset;

45+ case "shadow": return UbuntuShape.DropShadow;

46+ default:

47+ case "flat": return UbuntuShape.Flat;

48+ }

49+ }

50+ }

51+ }

52+ Component {

53+ id: artShapeIconComponent;

54+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }

55+ }

56+ }

57+ readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

58+ readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : 0.75;

59+ Component.onCompleted: { updateWidthHeightBindings(); }

60+ Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

61+ function updateWidthHeightBindings() {

62+ if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

63+ width = root.fixedArtShapeSize.width;

64+ height = root.fixedArtShapeSize.height;

65+ } else {

66+ width = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.width });

67+ height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });

68+ }

69+ }

70+ CroppedImageMinimumSourceSize {

71+ id: artImage;

72+ objectName: "artImage";

73+ source: artShapeLoader.cardArt;

74+ asynchronous: false;

75+ visible: !true;

76+ width: root.width;

77+ height: width / artShape.aspect;

78+ }

79+ }

80+ }

81+ }

82+readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;

83+Label {

84+ id: titleLabel;

85+ objectName: "titleLabel";

86+ anchors { right: parent.right;

87+ left: parent.left;

88+ top: artShapeHolder.bottom;

89+ topMargin: units.gu(1);

90+ }

91+ elide: Text.ElideRight;

92+ fontSize: "small";

93+ wrapMode: Text.Wrap;

94+ maximumLineCount: 2;

95+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

96+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;

97+ visible: showHeader ;

98+ width: undefined;

99+ text: root.title;

100+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

101+ horizontalAlignment: Text.AlignLeft;

102+ }

103+Label {

104+ id: subtitleLabel;

105+ objectName: "subtitleLabel";

106+ anchors { left: titleLabel.left;

107+ leftMargin: titleLabel.leftMargin;

108+ right: titleLabel.right;

109+ top: titleLabel.bottom;

110+ }

111+ anchors.topMargin: units.dp(2);

112+ elide: Text.ElideRight;

113+ maximumLineCount: 1;

114+ fontSize: "x-small";

115+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

116+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;

117+ visible: titleLabel.visible && titleLabel.text;

118+ text: cardData && cardData["subtitle"] || "";

119+ font.weight: Font.Light;

120+ }

121+CardSocialActions {

122+ id: socialActionsRow;

123+ objectName: "socialActionsRow";

124+ anchors { top: subtitleLabel.bottom; left: parent.left; right: parent.right; topMargin: units.gu(1); }

125+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;

126+ model: cardData && cardData["socialActions"];

127+ onClicked: root.action(actionId);

128+}

129+UbuntuShape {

130+ id: touchdown;

131+ objectName: "touchdown";

132+ anchors { fill: artShapeHolder }

133+ visible: root.artShapeStyle != "shadow" && root.artShapeStyle != "icon" && root.pressed;

134+ radius: "medium";

135+ borderSource: "radius_pressed.sci"

136+}

137+implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);

138+}

tests/plugins/Dash/cardcreator/12.tstnew file+3

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

1+template: {"card-layout":"vertical","card-size":"small","category-layout":"grid","collapsed-rows":2}

2+components: {"art":{"aspect-ratio":0.75,"field":"art"},"subtitle":{"field":"price"},"title":{"field":"title"},"attributes":{},"social-actions":{}}

3+result: 12.res

tests/plugins/Dash/cardcreator/2.res+1−1

@@ -11,7 +11,7 @@ AbstractButton {

11 property bool showHeader: true;

12 implicitWidth: childrenRect.width;

13 enabled: true;

14−

14+signal action(var actionId);

15Loader {

16 id: backgroundLoader;

17 objectName: "backgroundLoader";

tests/plugins/Dash/cardcreator/2.res.cardcreator+1−1

@@ -10,7 +10,7 @@ AbstractButton {

10 property bool showHeader: true;

11 implicitWidth: childrenRect.width;

12 enabled: true;

13−

13+signal action(var actionId);

14Loader {

15 id: backgroundLoader;

16 objectName: "backgroundLoader";

tests/plugins/Dash/cardcreator/3.res+1−1

@@ -11,7 +11,7 @@ AbstractButton {

11 property bool showHeader: true;

12 implicitWidth: childrenRect.width;

13 enabled: true;

14−

14+signal action(var actionId);

15readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

16Item {

17 id: artShapeHolder;

tests/plugins/Dash/cardcreator/3.res.cardcreator+1−1

@@ -10,7 +10,7 @@ AbstractButton {

10 property bool showHeader: true;

11 implicitWidth: childrenRect.width;

12 enabled: true;

13−

13+signal action(var actionId);

14readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

15Item {

16 id: artShapeHolder;

tests/plugins/Dash/cardcreator/4.res+1−1

@@ -11,7 +11,7 @@ AbstractButton {

11 property bool showHeader: true;

12 implicitWidth: childrenRect.width;

13 enabled: true;

14−

14+signal action(var actionId);

15readonly property size artShapeSize: Qt.size(-1, -1);

16readonly property int headerHeight: row.height;

17Row {

tests/plugins/Dash/cardcreator/4.res.cardcreator+1−1

@@ -10,7 +10,7 @@ AbstractButton {

10 property bool showHeader: true;

11 implicitWidth: childrenRect.width;

12 enabled: true;

13−

13+signal action(var actionId);

14readonly property size artShapeSize: Qt.size(-1, -1);

15readonly property int headerHeight: row.height;

16Row {

tests/plugins/Dash/cardcreator/5.res+1−1

@@ -11,7 +11,7 @@ AbstractButton {

11 property bool showHeader: true;

12 implicitWidth: childrenRect.width;

13 enabled: false;

14−

14+signal action(var actionId);

15readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

16Item {

17 id: artShapeHolder;

tests/plugins/Dash/cardcreator/5.res.cardcreator+1−1

@@ -10,7 +10,7 @@ AbstractButton {

10 property bool showHeader: true;

11 implicitWidth: childrenRect.width;

12 enabled: false;

13−

13+signal action(var actionId);

14readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

15Item {

16 id: artShapeHolder;

tests/plugins/Dash/cardcreator/6.res+1−1

@@ -11,7 +11,7 @@ AbstractButton {

11 property bool showHeader: true;

12 implicitWidth: childrenRect.width;

13 enabled: true;

14−

14+signal action(var actionId);

15Loader {

16 id: backgroundLoader;

17 objectName: "backgroundLoader";

tests/plugins/Dash/cardcreator/6.res.cardcreator+1−1

@@ -10,7 +10,7 @@ AbstractButton {

10 property bool showHeader: true;

11 implicitWidth: childrenRect.width;

12 enabled: true;

13−

13+signal action(var actionId);

14Loader {

15 id: backgroundLoader;

16 objectName: "backgroundLoader";

tests/plugins/Dash/cardcreator/7.res+1−1

@@ -11,7 +11,7 @@ AbstractButton {

11 property bool showHeader: true;

12 implicitWidth: childrenRect.width;

13 enabled: true;

14−

14+signal action(var actionId);

15Loader {

16 id: backgroundLoader;

17 objectName: "backgroundLoader";

tests/plugins/Dash/cardcreator/7.res.cardcreator+1−1

@@ -10,7 +10,7 @@ AbstractButton {

10 property bool showHeader: true;

11 implicitWidth: childrenRect.width;

12 enabled: true;

13−

13+signal action(var actionId);

14Loader {

15 id: backgroundLoader;

16 objectName: "backgroundLoader";

tests/plugins/Dash/cardcreator/8.res+1−1

@@ -11,7 +11,7 @@ AbstractButton {

11 property bool showHeader: true;

12 implicitWidth: childrenRect.width;

13 enabled: true;

14−

14+signal action(var actionId);

15Loader {

16 id: backgroundLoader;

17 objectName: "backgroundLoader";

tests/plugins/Dash/cardcreator/8.res.cardcreator+1−1

@@ -10,7 +10,7 @@ AbstractButton {

10 property bool showHeader: true;

11 implicitWidth: childrenRect.width;

12 enabled: true;

13−

13+signal action(var actionId);

14Loader {

15 id: backgroundLoader;

16 objectName: "backgroundLoader";

tests/plugins/Dash/cardcreator/9.res+1−1

@@ -11,7 +11,7 @@ AbstractButton {

11 property bool showHeader: true;

12 implicitWidth: childrenRect.width;

13 enabled: true;

14−

14+signal action(var actionId);

15readonly property size artShapeSize: Qt.size(-1, -1);

16readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + audioProgressBar.height + audioProgressBar.anchors.topMargin;

17Label {

tests/plugins/Dash/cardcreator/9.res.cardcreator+1−1

@@ -10,7 +10,7 @@ AbstractButton {

10 property bool showHeader: true;

11 implicitWidth: childrenRect.width;

12 enabled: true;

13−

13+signal action(var actionId);

14readonly property size artShapeSize: Qt.size(-1, -1);

15readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + audioProgressBar.height + audioProgressBar.anchors.topMargin;

16Label {

tests/plugins/Unity/Launcher/launchermodeltest.cpp+1

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

68 QSize initialSurfaceSize() const override { return QSize(); }

69 void setInitialSurfaceSize(const QSize &) override {}

70 MirSurfaceListInterface* surfaceList() override { return nullptr; }

71+ MirSurfaceListInterface* promptSurfaceList() override { return nullptr; }

71

72

72 // Methods used for mocking (not in the interface)

73 // Methods used for mocking (not in the interface)

73 void setFocused(bool focused) { m_focused = focused; Q_EMIT focusedChanged(focused); }

74 void setFocused(bool focused) { m_focused = focused; Q_EMIT focusedChanged(focused); }

tests/qmltests/CMakeLists.txt+1

@@ -63,6 +63,7 @@ add_unity8_qmltest(Dash/Filters FilterOptionSelector)

63add_unity8_qmltest(Dash/Filters FilterRangeInput)

64add_unity8_qmltest(Dash/Filters FilterValueSlider)

65add_unity8_qmltest(Dash/Filters FilterWidgetFactory)

66+add_unity8_qmltest(Dash/Filters FilterExpandableWidget)

66add_unity8_qmltest(Dash/ScopeSettings ScopeSettingBoolean)

67add_unity8_qmltest(Dash/ScopeSettings ScopeSettingBoolean)

67add_unity8_qmltest(Dash/ScopeSettings ScopeSettingList)

68add_unity8_qmltest(Dash/ScopeSettings ScopeSettingList)

68add_unity8_qmltest(Dash/ScopeSettings ScopeSettingNumber)

69add_unity8_qmltest(Dash/ScopeSettings ScopeSettingNumber)

tests/qmltests/Dash/CardHelpers.js+9−7

@@ -16,7 +16,8 @@

16

17.pragma library

18

19−var components = ["title", "art", "subtitle", "mascot", "emblem", "summary", "attributes", "overlayColor", "quickPreviewData"]

19+var components = ["title", "art", "subtitle", "mascot", "emblem", "summary", "attributes", "social-actions", "overlayColor", "quickPreviewData"]

20+var dataKeys = ["title", "art", "subtitle", "mascot", "emblem", "summary", "attributes", "socialActions", "overlayColor", "quickPreviewData"]

20

21

21var defaultLayout = ' \

22var defaultLayout = ' \

22{ \

23{ \

@@ -38,7 +39,8 @@ var defaultLayout = ' \

38 "mascot": null, \

39 "mascot": null, \

39 "emblem": null, \

40 "emblem": null, \

40 "summary": null, \

41 "summary": null, \

41− "attributes": { "max-count": 2 } \

42+ "attributes": { "max-count": 2 }, \

43+ "social-actions": null \

42 }, \

44 }, \

43 "resources": {} \

45 "resources": {} \

44}'

46}'

@@ -52,10 +54,10 @@ var fullMapping = ' \

52 "emblem": "emblem", \

54 "emblem": "emblem", \

53 "overlayColor": "overlayColor", \

55 "overlayColor": "overlayColor", \

54 "summary": "summary", \

56 "summary": "summary", \

55− "attributes": "attributes" \

57+ "attributes": "attributes", \

58+ "social-actions": "socialActions" \

56}'

59}'

57

60

58−

59function tryParse(json, errorLabel) {

61function tryParse(json, errorLabel) {

60 var o = undefined;

62 var o = undefined;

61 if (errorLabel !== undefined) {

63 if (errorLabel !== undefined) {

@@ -82,12 +84,12 @@ function mapData(json, layout, errorLabel) {

82 for (var k in components) {

84 for (var k in components) {

83 try {

85 try {

84 if (typeof layout[components[k]] == "object") {

86 if (typeof layout[components[k]] == "object") {

85− d[components[k]] = o[layout[components[k]]['field']];

87+ d[dataKeys[k]] = o[layout[components[k]]['field']];

86 } else {

88 } else {

87− d[components[k]] = o[layout[components[k]]];

89+ d[dataKeys[k]] = o[layout[components[k]]];

88 }

90 }

89 } catch(err) {

91 } catch(err) {

90− d[components[k]] = undefined;

92+ d[dataKeys[k]] = undefined;

91 }

93 }

92 }

94 }

93 }

95 }

tests/qmltests/Dash/Filters/tst_FilterExpandableWidget.qmlnew file+99

@@ -0,0 +1,99 @@

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.4

18+import QtTest 1.0

19+import Ubuntu.Components 1.3

20+import "../../../../qml/Dash/Filters"

21+import Unity.Test 0.1 as UT

22+import Unity 0.2

23+

24+Rectangle {

25+ id: root

26+ width: units.gu(60)

27+ height: units.gu(80)

28+ color: theme.palette.selected.background

29+

30+ QtObject {

31+ id: widgetData1

32+

33+ property string title: "Expand me!"

34+ property ListModel filters: ListModel {

35+ dynamicRoles: true

36+ }

37+ }

38+

39+ QtObject {

40+ id: sliderObject

41+

42+ property string title

43+ property int value: 30

44+ property int minValue: 10

45+ property int maxValue: 150

46+

47+ property ListModel values: ListModel {

48+ ListElement {

49+ value: 10

50+ label: "10"

51+ }

52+ ListElement {

53+ value: 30

54+ label: "30"

55+ }

56+ ListElement {

57+ value: 100

58+ label: "100"

59+ }

60+ ListElement {

61+ value: 150

62+ label: "150"

63+ }

64+ }

65+ }

66+

67+ Component.onCompleted: {

68+ widgetData1.filters.append({"type": Filters.ValueSliderFilter, "filter": sliderObject, id: "trololo"});

69+ }

70+

71+ FilterWidgetFactory {

72+ id: factory

73+ widgetId: "testExpandableWidget"

74+ widgetType: Filters.ExpandableFilterWidget

75+ widgetData: widgetData1

76+ anchors {

77+ left: parent.left

78+ right: parent.right

79+ }

80+ height: implicitHeight

81+ clip: true

82+ }

83+

84+ UT.UnityTestCase {

85+ name: "FilterExpandableWidget"

86+ when: windowShown

87+

88+ function test_expandedChanges() {

89+ var expandingItem = findChild(factory, "expandingItem");

90+ verify(!expandingItem.expanded)

91+ compare(expandingItem.height, expandingItem.collapsedHeight)

92+ mouseClick(expandingItem);

93+ verify(expandingItem.expanded)

94+ tryCompare(expandingItem, "height", expandingItem.expandedHeight)

95+ verify(expandingItem.collapsedHeight < expandingItem.expandedHeight / 2);

96+ }

97+

98+ }

99+}

tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qml+2−1

@@ -43,7 +43,8 @@ Rectangle {

43 return [

44 { tag: "OptionSelector", type: Filters.OptionSelectorFilter, source: "FilterOptionSelector.qml" },

45 { tag: "RangeInputFilter", type: Filters.RangeInputFilter, source: "FilterRangeInput.qml" },

46− { tag: "ValueSliderFilter", type: Filters.ValueSliderFilter, source: "FilterValueSlider.qml" }

46+ { tag: "ValueSliderFilter", type: Filters.ValueSliderFilter, source: "FilterValueSlider.qml" },

47+ { tag: "ExpandableFilter", type: Filters.ExpandableFilterWidget, source: "FilterExpandableWidget.qml" }

47 ];

48 ];

48 }

49 }

49

50

tests/qmltests/Dash/Previews/tst_PreviewActions.qml+100−17

@@ -26,17 +26,17 @@ Rectangle {

26 width: units.gu(60)

27 height: units.gu(80)

28

29− property var actionDataOneAction: {

29+ readonly property var actionDataOneAction: {

30 "actions": [{"label": "Some Label", "id": "someid"}]

31 }

32

33− property var actionDataTwoActions: {

33+ readonly property var actionDataTwoActions: {

34 "actions": [{"label": "Some Label A", "id": "someid1"},

35 {"label": "Some Label B", "id": "someid2"}

36 ]

37 }

38

39− property var actionDataFiveActions: {

39+ readonly property var actionDataFiveActions: {

40 "actions": [{"label": "Some Label C", "id": "someid3"},

41 {"label": "Some Label D", "id": "someid4"},

42 {"label": "Some Label E", "id": "someid5"},

@@ -45,6 +45,15 @@ Rectangle {

45 ]

46 }

47

48+ property var actionModelActions: {

49+ "actions": [{"label": "Some Label H", "id": "someid8"},

50+ {"label": "Some Label I", "id": "someid9"},

51+ {"label": "Some Label J", "id": "someid10"},

52+ {"label": "Some Label K", "id": "someid11"},

53+ {"label": "Some Label L", "id": "someid12"}

54+ ]

55+ }

56+

48 SignalSpy {

57 SignalSpy {

49 id: spy

58 id: spy

50 signalName: "triggered"

59 signalName: "triggered"

@@ -88,26 +97,32 @@ Rectangle {

88 onTriggered: console.log("triggered", widgetId, actionId);

97 onTriggered: console.log("triggered", widgetId, actionId);

89 width: units.gu(60)

98 width: units.gu(60)

90 }

99 }

100+

101+ PreviewActions {

102+ id: changeModelActions

103+ width: units.gu(60)

104+ }

105+

106+ PreviewActions {

107+ id: updateModelActions

108+ width: units.gu(60)

109+ }

91 }

110 }

92

111

93 UT.UnityTestCase {

112 UT.UnityTestCase {

94 name: "PreviewActionTest"

113 name: "PreviewActionTest"

95 when: windowShown

114 when: windowShown

96

115

97− function cleanup()

98− {

99− spy.clear();

100− }

101−

102 function checkButtonPressSignal(target, id)

116 function checkButtonPressSignal(target, id)

103 {

117 {

104− var button = findChild(root, "button" + id);

118+ var button = findChild(target, "button" + id);

105 verify(button != null);

119 verify(button != null);

106 spy.target = target;

120 spy.target = target;

107 mouseClick(button);

121 mouseClick(button);

108 compare(spy.count, 1);

122 compare(spy.count, 1);

109 compare(spy.signalArguments[0][0], target.widgetId);

123 compare(spy.signalArguments[0][0], target.widgetId);

110 compare(spy.signalArguments[0][1], id);

124 compare(spy.signalArguments[0][1], id);

125+ spy.clear();

111 }

126 }

112

127

113 function test_checkButtons_data() {

128 function test_checkButtons_data() {

@@ -120,7 +135,7 @@ Rectangle {

120 }

135 }

121

136

122 function test_checkButtons(data) {

137 function test_checkButtons(data) {

123− checkButtonPressSignal(data.target, data.id, data.buttonNumber)

138+ checkButtonPressSignal(data.target, data.id)

124 }

139 }

125

140

126 function test_comboButton_data() {

141 function test_comboButton_data() {

@@ -132,17 +147,85 @@ Rectangle {

132 ]

147 ]

133 }

148 }

134

149

135− function test_comboButton(data) {

150+ function pressMoreButton(buttonGroup)

151+ {

136− var button = findChild(root, "moreLessButton");

152+ var button = findChild(buttonGroup, "moreLessButton");

137− var buttonColumn = findChild(root, "buttonColumn");

153+ var buttonColumn = findChild(buttonGroup, "buttonColumn");

138 verify(button != null);

154 verify(button != null);

139− var twoActionsY = twoActions.y

140 mouseClick(button);

155 mouseClick(button);

141− tryCompareFunction(function () { return twoActions.y <= twoActionsY; }, false);

142 tryCompare(buttonColumn, "height", buttonColumn.implicitHeight);

156 tryCompare(buttonColumn, "height", buttonColumn.implicitHeight);

157+ }

158+

159+ function test_comboButton(data) {

160+ var twoActionsY = twoActions.y

161+ pressMoreButton(buttonAndCombo);

162+ tryCompareFunction(function () { return twoActions.y <= twoActionsY; }, false);

143− checkButtonPressSignal(buttonAndCombo, data.id, data.buttonNumber);

163+ checkButtonPressSignal(buttonAndCombo, data.id);

144− mouseClick(button);

164+ mouseClick(findChild(buttonAndCombo, "moreLessButton"));

145 tryCompare(twoActions, "y", twoActionsY);

165 tryCompare(twoActions, "y", twoActionsY);

146 }

166 }

167+

168+ function test_modelChange() {

169+ changeModelActions.widgetData = actionDataOneAction;

170+ waitForRendering(changeModelActions);

171+ checkButtonPressSignal(changeModelActions, "someid");

172+

173+ changeModelActions.widgetData = actionDataTwoActions;

174+ waitForRendering(changeModelActions);

175+ checkButtonPressSignal(changeModelActions, "someid1");

176+ checkButtonPressSignal(changeModelActions, "someid2");

177+

178+ changeModelActions.widgetData = actionDataFiveActions;

179+ waitForRendering(changeModelActions);

180+ pressMoreButton(changeModelActions);

181+ checkButtonPressSignal(changeModelActions, "someid3");

182+ checkButtonPressSignal(changeModelActions, "someid4");

183+ checkButtonPressSignal(changeModelActions, "someid5");

184+ checkButtonPressSignal(changeModelActions, "someid6");

185+ }

186+

187+ function test_modelUpdate() {

188+ updateModelActions.widgetData = actionModelActions;

189+ waitForRendering(updateModelActions);

190+ pressMoreButton(updateModelActions);

191+ checkButtonPressSignal(updateModelActions, "someid8");

192+ checkButtonPressSignal(updateModelActions, "someid9");

193+ checkButtonPressSignal(updateModelActions, "someid10");

194+ checkButtonPressSignal(updateModelActions, "someid11");

195+ checkButtonPressSignal(updateModelActions, "someid12");

196+

197+ updateModelActions["actions"].pop();

198+ updateModelActions.actionsChanged();

199+

200+ // Check that some12 is gone

201+ verify(!findChild(updateModelActions, "buttonsomeid12"));

202+

203+ updateModelActions["actions"][3].id = "someidmoo";

204+ updateModelActions.actionsChanged();

205+ checkButtonPressSignal(updateModelActions, "someidmoo");

206+

207+ verify(findChild(updateModelActions, "moreLessButton"));

208+

209+ updateModelActions["actions"].pop();

210+ updateModelActions["actions"].pop();

211+ updateModelActions.actionsChanged();

212+

213+ // Check there is no more/less button anymore

214+ verify(!findChild(updateModelActions, "moreLessButton"));

215+

216+ updateModelActions["actions"][1].id = "someidbar";

217+ updateModelActions.actionsChanged();

218+ checkButtonPressSignal(updateModelActions, "someidbar");

219+

220+ updateModelActions["actions"].pop();

221+ updateModelActions.actionsChanged();

222+

223+ // Check the loader for the second button/combo is gone

224+ compare(findChild(updateModelActions, "loader").source, "");

225+

226+ updateModelActions["actions"][0].id = "someidlolar";

227+ updateModelActions.actionsChanged();

228+ checkButtonPressSignal(updateModelActions, "someidlolar");

229+ }

147 }

230 }

148}

231}

tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml+14−4

@@ -69,9 +69,12 @@ Rectangle {

69 Timer {

70 id: timer

71 property int index: -1

72+ property bool changeIcon: true

72 interval: 500

73 interval: 500

73 onTriggered: {

74 onTriggered: {

75+ if (changeIcon) {

74− actionDataActions.actions[index].icon = Qt.resolvedUrl("../../UnityLogo.png");

76+ actionDataActions.actions[index].icon = Qt.resolvedUrl("../../UnityLogo.png");

77+ }

75 preview.widgetDataChanged();

78 preview.widgetDataChanged();

76 index = -1;

79 index = -1;

77 }

80 }

@@ -89,12 +92,14 @@ Rectangle {

89

92

90 function test_checkButtonWithTemporary_data() {

93 function test_checkButtonWithTemporary_data() {

91 return [

94 return [

92− {tag: "with temporary", temporaryIcon: "emblem", index: 0},

95+ {tag: "with temporary change icon", temporaryIcon: "emblem", index: 0, changeIcon: true},

96+ {tag: "with temporary no change icon", temporaryIcon: "emblem", index: 1, changeIcon: false},

93− {tag: "without temporary", temporaryIcon: undefined, index: 2},

97+ {tag: "without temporary", temporaryIcon: undefined, index: 2, changeIcon: true},

94 ];

98 ];

95 }

99 }

96

100

97 function test_checkButtonWithTemporary(data) {

101 function test_checkButtonWithTemporary(data) {

102+ waitForRendering(preview);

98 spy.target = preview;

103 spy.target = preview;

99

104

100 var buttonId = actionDataActions.actions[data.index].id;

105 var buttonId = actionDataActions.actions[data.index].id;

@@ -108,6 +113,7 @@ Rectangle {

108

113

109 compare(image.source, buttonIcon);

114 compare(image.source, buttonIcon);

110 compare(label.text, buttonLabel);

115 compare(label.text, buttonLabel);

116+ timer.changeIcon = data.changeIcon;

111 mouseClick(button);

117 mouseClick(button);

112 compare(spy.count, 1);

118 compare(spy.count, 1);

113 compare(spy.signalArguments[0][1], buttonId);

119 compare(spy.signalArguments[0][1], buttonId);

@@ -119,7 +125,11 @@ Rectangle {

119 tryCompareFunction(function() {

125 tryCompareFunction(function() {

120 var button = findChild(root, "button" + buttonId);

126 var button = findChild(root, "button" + buttonId);

121 var image = findChildsByType(button, "QQuickImage")[0];

127 var image = findChildsByType(button, "QQuickImage")[0];

128+ if (data.changeIcon) {

122− return image.source && image.source.toString().indexOf("UnityLogo") > -1;

129+ return image.source && image.source.toString().indexOf("UnityLogo") > -1;

130+ } else {

131+ return image.source && image.source == buttonIcon;

132+ }

123 }, true);

133 }, true);

124 }

134 }

125 }

135 }

tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml+17

@@ -44,6 +44,11 @@ Rectangle {

44 "fallback": "../../graphics/phone_background.jpg"

45 }

46

47+ property var widgetData4: {

48+ "source": "fadsasf",

49+ "fallback": "../../graphics/phone_background.jpg"

50+ }

51+

47 Loader {

52 Loader {

48 id: loader

53 id: loader

49 width: parent.width

54 width: parent.width

@@ -112,5 +117,17 @@ Rectangle {

112 waitForRendering(lazyImage);

117 waitForRendering(lazyImage);

113 tryCompare(lazyImage, "state", "ready");

118 tryCompare(lazyImage, "state", "ready");

114 }

119 }

120+

121+ function test_fallback_then_source() {

122+ zoomableImage.widgetData = widgetData4;

123+ waitForRendering(zoomableImage);

124+ waitForRendering(lazyImage);

125+ tryCompare(lazyImage, "state", "ready");

126+ verify(lazyImage.sourceImage.source.toString().indexOf("phone_background") > -1);

127+ zoomableImage.widgetData["source"] = "../../graphics/tablet_background.jpg"

128+ zoomableImage.widgetDataChanged();

129+ tryCompare(lazyImage, "state", "ready");

130+ verify(lazyImage.sourceImage.source.toString().indexOf("tablet_background") > -1);

131+ }

115 }

132 }

116}

133}

tests/qmltests/Dash/tst_Card.qml+38−3

@@ -36,6 +36,10 @@ Rectangle {

36 "subtitle": "bar",

37 "summary": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",

38 "attributes": [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}],

39+ "socialActions": [{"id":"like","icon":"image://theme/ok","temporaryIcon":"image://theme/undo"},

40+ {"id":"share","icon":"image://theme/cancel"},

41+ {"id":"like","icon":"image://theme/ok","temporaryIcon":"image://theme/undo"},

42+ {"id":"share","icon":"image://theme/cancel"}],

39 "quickPreviewData": {"uri": "/some/file", "duration": "14"}

43 "quickPreviewData": {"uri": "/some/file", "duration": "14"}

40 }'

44 }'

41

45

@@ -211,6 +215,11 @@ Rectangle {

211 }

215 }

212 }

216 }

213

217

218+ SignalSpy {

219+ id: signalSpy

220+ signalName: "action"

221+ }

222+

214 UT.UnityTestCase {

223 UT.UnityTestCase {

215 id: testCase

224 id: testCase

216 name: "Card"

225 name: "Card"

@@ -274,9 +283,11 @@ Rectangle {

274 { tag: "Wide", width: units.gu(18), index: 0 },

283 { tag: "Wide", width: units.gu(18), index: 0 },

275 { tag: "Horizontal", width: units.gu(38), index: 5 },

284 { tag: "Horizontal", width: units.gu(38), index: 5 },

276 // Make sure card ends with header when there's no summary

285 // Make sure card ends with header when there's no summary

277− { tag: "NoSummary", height: function() { var cardToolRow = findChild(cardTool, "outerRow");

286+ { tag: "NoSummary", height: function() { var socialActionsRow = findChild(cardTool, "socialActionsRow");

278− return cardToolRow.y + cardToolRow.height + units.gu(1) }, index: 6 },

287+ return socialActionsRow.y + socialActionsRow.height + units.gu(1) }, index: 6 },

288+ { tag: "HorizontalNoSummary", height: function() { var socialActionsRow = findChild(cardTool, "socialActionsRow");

289+ return socialActionsRow.y + socialActionsRow.height + units.gu(1) },

279− { tag: "HorizontalNoSummary", height: function() { return headerRow.height + units.gu(2) }, card_layout: "horizontal", index: 6 },

290+ card_layout: "horizontal", index: 6 },

280 ]

291 ]

281 }

292 }

282

293

@@ -641,5 +652,29 @@ Rectangle {

641 verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));

652 verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));

642 }

653 }

643 }

654 }

655+

656+ function test_action() {

657+ selector.selectedIndex = 0;

658+ waitForRendering(card);

659+

660+ signalSpy.target = card;

661+ var socialActionsRow = findChild(card, "socialActionsRow");

662+ var delegate0 = findChild(socialActionsRow, "delegate0");

663+ var icon0 = findChild(delegate0, "icon");

664+ var delegate1 = findChild(socialActionsRow, "delegate1");

665+ var icon1 = findChild(delegate1, "icon");

666+

667+ compare(icon0.source, "image://theme/ok");

668+ mouseClick(delegate0, delegate0.height / 2, delegate0.height / 2);

669+ tryCompare(signalSpy, "count", 1);

670+ compare(signalSpy.signalArguments[0][0], "like");

671+ compare(icon0.source, "image://theme/undo");

672+

673+ compare(icon1.source, "image://theme/cancel");

674+ mouseClick(delegate1, delegate1.height / 2, delegate1.height / 2);

675+ tryCompare(signalSpy, "count", 2);

676+ compare(signalSpy.signalArguments[1][0], "share");

677+ compare(icon1.source, "image://theme/cancel");

678+ }

644 }

679 }

645}

680}

tests/qmltests/Stages/ApplicationCheckBox.qml+33−3

@@ -44,6 +44,7 @@ Column {

44 d.bindGuard = false;

45 }

46

47+ // Application checkbox row

47 RowLayout {

48 RowLayout {

48

49

49 QtObject {

50 QtObject {

@@ -128,17 +129,47 @@ Column {

128 visible: enabled

129 visible: enabled

129 Label {

130 Label {

130 text: "➕"

131 text: "➕"

131− color: "white"

132 anchors.centerIn: parent

133 }

134 }

135 }

136+

137+ // Prompts controls row

138+ RowLayout {

139+ anchors.left: root.left

140+ anchors.leftMargin: units.gu(2)

141+ visible: root.checked === true && d.application !== null && root.enabled

142+ spacing: units.gu(1)

143+ Label {

144+ property int promptCount: d.application ? d.application.promptSurfaceList.count : 0

145+ id: promptsLabel

146+ text: promptCount + " prompts"

147+ }

148+ MouseArea {

149+ width: height

150+ height: promptsLabel.height * 0.7

151+ anchors.verticalCenter: parent.verticalCenter

152+ onClicked: d.application.promptSurfaceList.createSurface()

153+ Label { text: "➕"; anchors.centerIn: parent }

154+ }

155+ MouseArea {

156+ width: height

157+ height: promptsLabel.height * 0.7

158+ anchors.verticalCenter: parent.verticalCenter

159+ onClicked: d.application.promptSurfaceList.get(d.application.promptSurfaceList.count - 1).close()

160+ enabled: d.application && d.application.promptSurfaceList.count > 0

161+ Label { text: "➖"; anchors.centerIn: parent; enabled: parent.enabled }

162+ }

163+ }

164+

165+ // Rows of application surfaces

136 Repeater {

166 Repeater {

137 model: d.application ? d.application.surfaceList : null

167 model: d.application ? d.application.surfaceList : null

138 RowLayout {

168 RowLayout {

169+ anchors.left: root.left

170+ anchors.leftMargin: units.gu(2)

139 spacing: units.gu(1)

171 spacing: units.gu(1)

140 Label {

172 Label {

141− color: "white"

142 text: "- " + model.surface.name

173 text: "- " + model.surface.name

143 }

174 }

144 MouseArea {

175 MouseArea {

@@ -150,7 +181,6 @@ Column {

150 onClicked: model.surface.setLive(false);

181 onClicked: model.surface.setLive(false);

151 Label {

182 Label {

152 text: "⛒"

183 text: "⛒"

153− color: "white"

154 anchors.centerIn: parent

184 anchors.centerIn: parent

155 }

185 }

156 }

186 }

tests/qmltests/Stages/RecursingChildSessionControl.qmldeleted−94

@@ -1,94 +0,0 @@

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.4

18−import QtQuick.Layouts 1.1

19−import Ubuntu.Components 1.3

20−import Unity.Application 0.1

21−

22−ColumnLayout {

23− id: root

24−

25− property var surface

26−

27− Column {

28− id: column

29− Layout.fillWidth: true

30− visible: repeater.count

31− spacing: units.gu(1)

32−

33− Repeater {

34− id: repeater

35− model: root.surface ? root.surface.promptSurfaceList : null

36− delegate: Rectangle {

37− border {

38− color: "black"

39− width: 1

40− }

41− anchors {

42− left: column.left

43− right: column.right

44− leftMargin: units.gu(1)

45− rightMargin: units.gu(1)

46− }

47− height: loader.height

48−

49− Rectangle {

50− anchors.fill: parent

51− color: Qt.rgba(Math.random(), Math.random(), Math.random(), 0.4 )

52− }

53−

54− Loader {

55− id: loader

56− visible: status == Loader.Ready

57− source: Qt.resolvedUrl("RecursingChildSessionControl.qml")

58−

59− anchors {

60− left: parent.left

61− right: parent.right

62− }

63−

64− onLoaded: {

65− item.surface = model.surface;

66− }

67− }

68− }

69− }

70− }

71−

72− ColumnLayout {

73− Layout.fillWidth: true

74− spacing: units.gu(1)

75−

76− RowLayout {

77− id: buttonLayout

78−

79− Button {

80− enabled: root.surface

81− activeFocusOnPress: false

82− text: "Remove"

83− onClicked: { root.surface.close(); }

84− }

85−

86− Button {

87− enabled: root.surface !== null

88− activeFocusOnPress: false

89− text: "Add Prompt Surface"

90− onClicked: { root.surface.createPromptSurface(); }

91− }

92− }

93− }

94−}

tests/qmltests/Stages/tst_ApplicationWindow.qml+89−23

@@ -33,7 +33,6 @@ Rectangle {

33 Component.onCompleted: {

34 root.fakeApplication = ApplicationManager.add("gallery-app");

35 root.fakeApplication.manualSurfaceCreation = true;

36− root.fakeApplication.setState(ApplicationInfoInterface.Starting);

37 applicationWindowLoader.item.application = root.fakeApplication;

36 applicationWindowLoader.item.application = root.fakeApplication;

38 }

37 }

39 property QtObject fakeApplication: null

38 property QtObject fakeApplication: null

@@ -78,7 +77,7 @@ Rectangle {

78 Layout.fillWidth: true

77 Layout.fillWidth: true

79

78

80 CheckBox {

79 CheckBox {

81− id: surfaceCheckbox;

80+ id: surfaceCheckbox

82 checked: false;

81 checked: false;

83 activeFocusOnPress: false

82 activeFocusOnPress: false

84 onCheckedChanged: {

83 onCheckedChanged: {

@@ -86,10 +85,8 @@ Rectangle {

86 return;

85 return;

87

86

88 if (checked) {

87 if (checked) {

88+ root.fakeApplication.createSurface();

89− applicationWindowLoader.item.surface = SurfaceManager.createSurface("foo",

89+ applicationWindowLoader.item.surface = root.fakeApplication.surfaceList.get(0);

90− Mir.NormalType, Mir.MaximizedState, root.fakeApplication);

91−

92− root.fakeApplication.setState(ApplicationInfoInterface.Running);

93 } else {

90 } else {

94 if (applicationWindowLoader.item.surface) {

91 if (applicationWindowLoader.item.surface) {

95 applicationWindowLoader.item.surface.setLive(false);

92 applicationWindowLoader.item.surface.setLive(false);

@@ -103,22 +100,20 @@ Rectangle {

103 }

100 }

104 }

101 }

105

102

106− Rectangle {

103+ RowLayout {

107− border {

104+ property var promptSurfaceList: root.fakeApplication ? root.fakeApplication.promptSurfaceList : null

108− color: "black"

105+ Button {

109− width: 1

106+ enabled: parent.promptSurfaceList !== null && parent.promptSurfaceList.count > 0

110− }

107+ activeFocusOnPress: false

111− anchors {

108+ text: "Remove"

112− left: parent.left

109+ onClicked: { parent.promptSurfaceList.get(parent.promptSurfaceList.count - 1).close(); }

113− right: parent.right

114 }

110 }

115− Layout.preferredHeight: sessionControl.height

116

111

117− RecursingChildSessionControl {

112+ Button {

118− id: sessionControl

113+ enabled: parent.promptSurfaceList !== null

119− anchors { left: parent.left; right: parent.right; }

114+ activeFocusOnPress: false

120−

115+ text: "Add Prompt Surface"

121− surface: applicationWindowLoader.item ? applicationWindowLoader.item.surface : null

116+ onClicked: { parent.promptSurfaceList.createSurface(); }

122 }

117 }

123 }

118 }

124

119

@@ -244,19 +239,29 @@ Rectangle {

244 // deleted, so you end up with two instances in memory.

239 // deleted, so you end up with two instances in memory.

245 tryCompare(applicationWindowLoader, "itemDestroyed", true);

240 tryCompare(applicationWindowLoader, "itemDestroyed", true);

246

241

247− setApplicationState(appStarting);

248 surfaceCheckbox.checked = false;

242 surfaceCheckbox.checked = false;

249

243

250− ApplicationManager.stopApplication("gallery-app");

244+ console.log("killApps() start");

245+ killApps();

246+ console.log("killApps() end");

247+

251 root.fakeApplication = ApplicationManager.add("gallery-app");

248 root.fakeApplication = ApplicationManager.add("gallery-app");

252 root.fakeApplication.manualSurfaceCreation = true;

249 root.fakeApplication.manualSurfaceCreation = true;

253− root.fakeApplication.setState(ApplicationInfoInterface.Starting);

254

250

255 applicationWindowLoader.active = true;

251 applicationWindowLoader.active = true;

256

252

257 applicationWindowLoader.item.application = root.fakeApplication;

253 applicationWindowLoader.item.application = root.fakeApplication;

258 }

254 }

259

255

256+ function waitUntilSurfaceContainerStopsAnimating(container) {

257+ var animationsLoader = findChild(container, "animationsLoader");

258+ verify(animationsLoader);

259+ tryCompare(animationsLoader, "status", Loader.Ready)

260+

261+ var animation = animationsLoader.item;

262+ waitUntilTransitionsEnd(animation);

263+ }

264+

260 function test_showSplashUntilAppFullyInit_data() {

265 function test_showSplashUntilAppFullyInit_data() {

261 return [

266 return [

262 {tag: "state=Running then create surface", swapInitOrder: false},

267 {tag: "state=Running then create surface", swapInitOrder: false},

@@ -432,5 +437,66 @@ Rectangle {

432 applicationWindow.interactive = true;

437 applicationWindow.interactive = true;

433 compare(applicationWindow.surface.activeFocus, true);

438 compare(applicationWindow.surface.activeFocus, true);

434 }

439 }

440+

441+ function test_promptSurfaceDestructionReturnsFocusToPreviousSurface() {

442+ surfaceCheckbox.checked = true;

443+ var promptSurfaces = testCase.findChild(applicationWindow, "promptSurfacesRepeater");

444+ var promptSurfaceList = root.fakeApplication.promptSurfaceList;

445+ compare(promptSurfaces.count, 0);

446+

447+ var i;

448+ // 3 surfaces should cover all edge cases

449+ for (i = 0; i < 3; i++) {

450+ promptSurfaceList.createSurface();

451+ compare(promptSurfaces.count, i+1);

452+ waitUntilSurfaceContainerStopsAnimating(promptSurfaces.itemAt(promptSurfaces.count - 1));

453+ }

454+

455+ for (i = 2; i >= 0; --i) {

456+ var promptSurface = promptSurfaceList.get(i);

457+ compare(promptSurface.activeFocus, true);

458+

459+ promptSurface.close();

460+ tryCompareFunction(function() { return promptSurfaces.count; }, i);

461+

462+ if (i > 0) {

463+ // active focus should have gone to the yongest remaining sibling

464+ var previousPromptSurface = promptSurfaceList.get(i-1);

465+ tryCompare(previousPromptSurface, "activeFocus", true);

466+ } else {

467+ // active focus should have gone to the application surface

468+ tryCompare(applicationWindow.surface, "activeFocus", true);

469+ }

470+ }

471+ }

472+

473+ function test_promptSurfaceAdjustsForParentSize() {

474+ var promptSurfaceList = root.fakeApplication.promptSurfaceList;

475+

476+ promptSurfaceList.createSurface();

477+

478+ var promptSurfaces = testCase.findChild(applicationWindow, "promptSurfacesRepeater");

479+

480+ var delegate = promptSurfaces.itemAt(0);

481+ waitUntilSurfaceContainerStopsAnimating(delegate);

482+

483+ var promptSurfaceContainer = findChild(delegate, "surfaceContainer");

484+

485+ tryCompareFunction(function() { return promptSurfaceContainer.height === applicationWindow.height; }, true);

486+ tryCompareFunction(function() { return promptSurfaceContainer.width === applicationWindow.width; }, true);

487+ tryCompareFunction(function() { return promptSurfaceContainer.x === 0; }, true);

488+ tryCompareFunction(function() { return promptSurfaceContainer.y === 0; }, true);

489+

490+ applicationWindow.anchors.margins = units.gu(2);

491+

492+ tryCompareFunction(function() { return promptSurfaceContainer.height === applicationWindow.height; }, true);

493+ tryCompareFunction(function() { return promptSurfaceContainer.width === applicationWindow.width; }, true);

494+ tryCompareFunction(function() { return promptSurfaceContainer.x === 0; }, true);

495+ tryCompareFunction(function() { return promptSurfaceContainer.y === 0; }, true);

496+

497+ // clean up

498+ delegate.surface.close();

499+ tryCompare(promptSurfaces, "count", 0);

500+ }

435 }

501 }

436}

502}

tests/qmltests/Stages/tst_SurfaceContainer.qml+28−155

@@ -42,6 +42,7 @@ Rectangle {

42 anchors.fill: parent

43 focus: true

44 interactive: interactiveCheckbox.checked

45+ isPromptSurface: promptCheckbox.checked

45 Component.onDestruction: {

46 Component.onDestruction: {

46 surfaceContainerLoader.itemDestroyed = true;

47 surfaceContainerLoader.itemDestroyed = true;

47 }

48 }

@@ -75,17 +76,19 @@ Rectangle {

75 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }

76 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }

76 spacing: units.gu(1)

77 spacing: units.gu(1)

77

78

78− RowLayout {

79− Layout.fillWidth: true

80

79

81− Row {

80+ Row {

82− CheckBox {id: fullscreenCheckbox; checked: true; activeFocusOnPress: false }

81+ CheckBox {id: fullscreenCheckbox; checked: true; activeFocusOnPress: false }

83− Label { text: "fullscreen" }

82+ Label { text: "fullscreen" }

84− }

83+ }

85− Row {

84+ Row {

86− CheckBox {id: interactiveCheckbox; checked: true; activeFocusOnPress: false }

85+ CheckBox {id: interactiveCheckbox; checked: true; activeFocusOnPress: false }

87− Label { text: "interactive" }

86+ Label { text: "interactive" }

88− }

87+ }

88+ Row {

89+ CheckBox {id: promptCheckbox; checked: false; activeFocusOnPress: false

90+ enabled: surfaceContainerLoader.item.surface === null }

91+ Label { text: "isPromptSurface" }

89 }

92 }

90

93

91 RowLayout {

94 RowLayout {

@@ -102,10 +105,9 @@ Rectangle {

102 if (checked) {

105 if (checked) {

103 var application = ApplicationManager.add("music-app");

106 var application = ApplicationManager.add("music-app");

104 application.manualSurfaceCreation = true;

107 application.manualSurfaceCreation = true;

105− application.setState(ApplicationInfoInterface.Starting);

106

108

109+ application.createSurface();

107− surfaceContainerLoader.item.surface = SurfaceManager.createSurface("foo",

110+ surfaceContainerLoader.item.surface = application.surfaceList.get(0);

108− Mir.NormalType, Mir.MaximizedState, application.screenshot);

109

111

110 application.setState(ApplicationInfoInterface.Running);

112 application.setState(ApplicationInfoInterface.Running);

111 } else {

113 } else {

@@ -123,22 +125,11 @@ Rectangle {

123 }

125 }

124 }

126 }

125

127

126− Rectangle {

128+ Button {

127− border {

129+ text: "Reload"

128− color: "black"

130+ enabled: !surfaceCheckbox.checked

129− width: 1

131+ onClicked: {

130− }

132+ testCase.cleanup();

131− anchors {

132− left: parent.left

133− right: parent.right

134− }

135− Layout.preferredHeight: surfaceChildrenControl.height

136−

137− RecursingChildSessionControl {

138− id: surfaceChildrenControl

139− anchors { left: parent.left; right: parent.right; }

140−

141− surface: surfaceContainerLoader.item ? surfaceContainerLoader.item.surface : null

142 }

133 }

143 }

134 }

144 }

135 }

@@ -164,6 +155,7 @@ Rectangle {

164

155

165 surfaceCheckbox.checked = false;

156 surfaceCheckbox.checked = false;

166 interactiveCheckbox.checked = true;

157 interactiveCheckbox.checked = true;

158+ promptCheckbox.checked = false;

167

159

168 surfaceContainerLoader.active = true;

160 surfaceContainerLoader.active = true;

169 tryCompare(surfaceContainerLoader, "status", Loader.Ready);

161 tryCompare(surfaceContainerLoader, "status", Loader.Ready);

@@ -171,121 +163,6 @@ Rectangle {

171

163

172 when: windowShown

164 when: windowShown

173

165

174− function test_addChildSession_data() {

175− return [ { tag: "count=1", count: 1 },

176− { tag: "count=4", count: 4 } ];

177− }

178−

179− function test_addChildSession(data) {

180− surfaceCheckbox.checked = true;

181− var childSurfaces = testCase.findChild(surfaceContainer, "childSurfacesRepeater");

182− compare(childSurfaces.count, 0);

183−

184− var i;

185− for (i = 0; i < data.count; i++) {

186− surfaceContainer.surface.createPromptSurface();

187− compare(childSurfaces.count, i+1);

188− }

189−

190− for (i = data.count-1; i >= 0; i--) {

191− {

192− var childPromptSurface = surfaceContainer.surface.promptSurfaceList.get(i);

193− childPromptSurface.close();

194− }

195− tryCompareFunction(function() { return childSurfaces.count; }, i);

196− }

197− }

198−

199− function test_childSessionDestructionReturnsFocusToSiblingOrParent() {

200− surfaceCheckbox.checked = true;

201− var childSurfaces = testCase.findChild(surfaceContainer, "childSurfacesRepeater");

202− compare(childSurfaces.count, 0);

203−

204− var i;

205− // 3 surfaces should cover all edge cases

206− for (i = 0; i < 3; i++) {

207− surfaceContainer.surface.createPromptSurface();

208− compare(childSurfaces.count, i+1);

209− }

210−

211− for (i = 2; i >= 0; --i) {

212− var childPromptSurface = surfaceContainer.surface.promptSurfaceList.get(i);

213− compare(childPromptSurface.activeFocus, true);

214−

215− childPromptSurface.close();

216− tryCompareFunction(function() { return childSurfaces.count; }, i);

217−

218− if (i > 0) {

219− // active focus should have gone to the yongest remaining sibling

220− var previousSiblingSurface = surfaceContainer.surface.promptSurfaceList.get(i-1);

221− tryCompare(previousSiblingSurface, "activeFocus", true);

222− } else {

223− // active focus should have gone to the parent surface

224− tryCompare(surfaceContainer.surface, "activeFocus", true);

225− }

226− }

227− }

228−

229− function test_nestedChildSessions_data() {

230− return [ { tag: "depth=2", depth: 2 },

231− { tag: "depth=8", depth: 8 }

232− ];

233− }

234− function test_nestedChildSessions(data) {

235− surfaceCheckbox.checked = true;

236−

237− var i;

238− var container = surfaceContainer;

239− var surface = container.surface;

240− var surfaces = [surface];

241− var parent_childSurfaces = [null];

242− for (i = 0; i < data.depth; i++) {

243− surface.createPromptSurface();

244− var childSurfaces = testCase.findChild(container, "childSurfacesRepeater");

245− compare(childSurfaces.count, 1);

246−

247− var childDelegate = childSurfaces.itemAt(0);

248− container = findChild(childDelegate, "surfaceContainer");

249− {

250− var animationsLoader = findChild(container, "animationsLoader");

251− tryCompare(animationsLoader, "status", Loader.Ready);

252− waitUntilTransitionsEnd(animationsLoader.item);

253− }

254− surface = container.surface;

255−

256− surfaces.push(surface);

257− parent_childSurfaces.push(childSurfaces);

258− }

259−

260− for (i = surfaces.length-1; i >= 0; i--) {

261− surfaces[i].close();

262− if (parent_childSurfaces[i]) {

263− tryCompareFunction(function() { return parent_childSurfaces[i].count; }, 0);

264− }

265− }

266− }

267−

268− function test_childrenAdjustForParentSize() {

269− surfaceCheckbox.checked = true;

270−

271− surfaceContainer.surface.createPromptSurface();

272−

273− var delegate = findChild(surfaceContainer, "childDelegate0");

274− var childContainer = findChild(delegate, "surfaceContainer");

275−

276− tryCompareFunction(function() { return childContainer.height === surfaceContainer.height; }, true);

277− tryCompareFunction(function() { return childContainer.width === surfaceContainer.width; }, true);

278− tryCompareFunction(function() { return childContainer.x === 0; }, true);

279− tryCompareFunction(function() { return childContainer.y === 0; }, true);

280−

281− surfaceContainer.anchors.margins = units.gu(2);

282−

283− tryCompareFunction(function() { return childContainer.height === surfaceContainer.height; }, true);

284− tryCompareFunction(function() { return childContainer.width === surfaceContainer.width; }, true);

285− tryCompareFunction(function() { return childContainer.x === 0; }, true);

286− tryCompareFunction(function() { return childContainer.y === 0; }, true);

287− }

288−

289 function isContainerAnimating(container) {

166 function isContainerAnimating(container) {

290 var animationsLoader = findChild(container, "animationsLoader");

167 var animationsLoader = findChild(container, "animationsLoader");

291 if (!animationsLoader || animationsLoader.status != Loader.Ready) {

168 if (!animationsLoader || animationsLoader.status != Loader.Ready) {

@@ -303,25 +180,21 @@ Rectangle {

303 return false;

180 return false;

304 }

181 }

305

182

306− function test_childrenAnimate() {

183+ function test_promptSurfaceAnimates() {

184+ promptCheckbox.checked = true;

307 surfaceCheckbox.checked = true;

185 surfaceCheckbox.checked = true;

308

186

309− surfaceContainer.surface.createPromptSurface();

310−

311− var delegate = findChild(surfaceContainer, "childDelegate0");

312− var childContainer = findChild(delegate, "surfaceContainer");

313−

314 // wait for animation to begin

187 // wait for animation to begin

315− tryCompareFunction(function() { return isContainerAnimating(childContainer); }, true);

188+ tryCompareFunction(function() { return isContainerAnimating(surfaceContainer); }, true);

316 // wait for animation to end

189 // wait for animation to end

317− tryCompareFunction(function() { return isContainerAnimating(childContainer); }, false);

190+ tryCompareFunction(function() { return isContainerAnimating(surfaceContainer); }, false);

318

191

319− surfaceContainer.surface.promptSurfaceList.get(0).close();

192+ surfaceContainer.surface.close();

320

193

321 // wait for animation to begin

194 // wait for animation to begin

322− tryCompareFunction(function() { return isContainerAnimating(childContainer); }, true);

195+ tryCompareFunction(function() { return isContainerAnimating(surfaceContainer); }, true);

323 // wait for animation to end

196 // wait for animation to end

324− tryCompareFunction(function() { return isContainerAnimating(childContainer); }, false);

197+ tryCompareFunction(function() { return isContainerAnimating(surfaceContainer); }, false);

325 }

198 }

326

199

327 function test_surfaceItemGetsNoTouchesWhenContainerNotInteractive() {

200 function test_surfaceItemGetsNoTouchesWhenContainerNotInteractive() {