3d59dc6 · unity8 · git.iko.soy

git.iko.soy/unity8

[ Albert Astals Cid ]

* Focus the shutdown dialog (LP: #1417991) * Make url-dispatching scope activation when the dash is not on the main scopes (LP: #1364306) * We use autopilot3 now [ CI Train Bot ] * New rebuild forced. * Resync trunk. added: po/or.po [ Daniel d'Andrada ] * Make tst_PreviewListView and tst_GenericScopeView work in out-of- source builds * MouseArea that shows the indicators panel should cover the indicators bar only (LP: #1439318) * Surface gets active focus also with mouse clicks [ Josh Arenson ] * Add a mode option to unity8 for selecting greeter mode in the future * Remove PkgConfig include from Launcher plugin to fix cross-compile (LP: #1437702) [ Leo Arias ] * Fixed the check for string in the lock screen test. (LP: #1434518) [ Michael Terry ] * Make sure the edge tutorial is destroyed when we receive a call during the wizard. (LP: #1436349) * Skip parts of the edge tutorial that require a touch device (like spread and bottom edge). (LP: #1434712) [ Michael Zanetti ] * Don't hide stages just because they're empty (LP: #1439615) * [Launcher] fix bug where an item would disappear even though the app is running (LP: #1438172) [ Nick Dedekind ] * Fixed autopilot test failures related to udev input failure for power button. * Made improvements for laggy indicator backends (lp#1390136). (LP: #1390136) [ Pete Woods ] * GPS only goes active when the Dash is in the foreground (LP: #1434379) [ handsome_feng<445865575@qq.com> ] * Modified the wrong time format in ScreenGrabber (LP: #1436006)

commit3d59dc6082d417fbffbdaa8c7ce899e051b5a0af authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 15 Apr 2015, 18:21 (12 years ago) parentc83ac8b 7478eb8

73 files changed+2795−436

compare with xenial

unifiedsplit

CMakeLists.txt+2

@@ -105,6 +105,8 @@ declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)

105105set(SHELL_APP unity8)

106106set(DASH_APP unity8-dash)

107107set(SCOPE_TOOL unity-scope-tool)

108+set(INDICATORS_CLIENT_APP indicators-client)

109+set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)

108110

109111include_directories(

110112 ${CMAKE_SOURCE_DIR}/include

CODING+1−1

@@ -186,7 +186,7 @@ $ make install

186186

187187To see the list of existing autopilot tests you can do

188188

189−$ PYTHONPATH=../tests/autopilot autopilot list unity8

189+$ PYTHONPATH=../tests/autopilot autopilot3 list unity8

190190

191191And then run a single test with

192192

data/CMakeLists.txt+2

@@ -1,11 +1,13 @@

11# generate desktop files

22configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)

33configure_file(${DASH_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop @ONLY)

4+configure_file(${INDICATORS_CLIENT_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop @ONLY)

56# install desktop files

67install(FILES

78 ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop

89 ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop

10+ ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop

911 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

1012 )

1113

data/indicators-client.desktop.innew file+9

@@ -0,0 +1,9 @@

1+[Desktop Entry]

2+Type=Application

3+Name=Indicators Client

4+Comment=Application for testing the Indicators system

5+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/indicators-client

6+Terminal=false

7+Icon=

8+NoDisplay=false

9+X-Ubuntu-Touch=true

data/unity-mock-indicator-service.confnew file+7

@@ -0,0 +1,7 @@

1+description "Unity Shell v8 Mock Indicator"

2+author "Nick Dedekind <nick.dedekind@canonical.com>"

4+respawn

5+respawn limit 2 10

7+exec ${BINARY:-unity-mock-indicator-service} $ARGS

debian/changelog+53

@@ -1,3 +1,56 @@

1+unity8 (8.02+15.04.20150409.1-0ubuntu1) vivid; urgency=medium

3+ [ Albert Astals Cid ]

4+ * Focus the shutdown dialog (LP: #1417991)

5+ * Make url-dispatching scope activation when the dash is not on the

6+ main scopes (LP: #1364306)

7+ * We use autopilot3 now

9+ [ CI Train Bot ]

10+ * New rebuild forced.

11+ * Resync trunk. added: po/or.po

12+

13+ [ Daniel d'Andrada ]

14+ * Make tst_PreviewListView and tst_GenericScopeView work in out-of-

15+ source builds

16+ * MouseArea that shows the indicators panel should cover the

17+ indicators bar only (LP: #1439318)

18+ * Surface gets active focus also with mouse clicks

19+

20+ [ Josh Arenson ]

21+ * Add a mode option to unity8 for selecting greeter mode in the future

22+ * Remove PkgConfig include from Launcher plugin to fix cross-compile

23+ (LP: #1437702)

24+

25+ [ Leo Arias ]

26+ * Fixed the check for string in the lock screen test. (LP: #1434518)

27+

28+ [ Michael Terry ]

29+ * Make sure the edge tutorial is destroyed when we receive a call

30+ during the wizard. (LP: #1436349)

31+ * Skip parts of the edge tutorial that require a touch device (like

32+ spread and bottom edge). (LP: #1434712)

33+

34+ [ Michael Zanetti ]

35+ * Don't hide stages just because they're empty (LP: #1439615)

36+ * [Launcher] fix bug where an item would disappear even though the app

37+ is running (LP: #1438172)

38+

39+ [ Nick Dedekind ]

40+ * Fixed autopilot test failures related to udev input failure for

41+ power button.

42+ * Made improvements for laggy indicator backends (lp#1390136). (LP:

43+ #1390136)

44+

45+ [ Pete Woods ]

46+ * GPS only goes active when the Dash is in the foreground (LP:

47+ #1434379)

48+

49+ [ handsome_feng<445865575@qq.com> ]

50+ * Modified the wrong time format in ScreenGrabber (LP: #1436006)

51+

52+ -- CI Train Bot <ci-train-bot@canonical.com> Thu, 09 Apr 2015 14:01:11 +0000

53+

154unity8 (8.02+15.04.20150320-0ubuntu1) vivid; urgency=medium

255

356 [ Albert Astals Cid ]

debian/control+2−2

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

4747 qtdeclarative5-dev-tools,

4848 qtdeclarative5-private-dev (>= 5.2.1),

4949 qtdeclarative5-qtmultimedia-plugin,

50− qtdeclarative5-ubuntu-settings-components (>= 0.5),

50+ qtdeclarative5-ubuntu-settings-components (>= 0.6),

5151 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),

5252 qtdeclarative5-ubuntu-web-plugin,

5353 ttf-ubuntu-font-family,

@@ -119,7 +119,7 @@ Description: Unity 8 shell

119119Package: unity8-common

120120Architecture: all

121121Depends: qml-module-qtquick-layouts,

122− qtdeclarative5-ubuntu-settings-components (>= 0.4),

122+ qtdeclarative5-ubuntu-settings-components (>= 0.6),

123123 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

124124 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),

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

debian/indicators-client.install+1

@@ -1 +1,2 @@

1+usr/share/applications/indicators-client.desktop

12/usr/bin/indicators-client

debian/unity8-autopilot.install+3−1

@@ -1,2 +1,4 @@

1+data/unity-mock-indicator-service.conf usr/share/upstart/sessions/

2+usr/bin/unity-mock-indicator-service

13usr/lib/python*/*/unity*

2−usr/share/unity8/unlock-device

4+usr/share/unity8/unlock-device

include/paths.h.in+1−6

@@ -92,12 +92,7 @@ inline QString mockPluginsDir() {

9292

9393inline QStringList shellDataDirs() {

9494 QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);

95− if (!isRunningInstalled()) {

96− if (getenv("UNITY_TEST_ENV")==nullptr) {

97− dirs.prepend("@CMAKE_BINARY_DIR@/share");

98− }

99− }

100− else {

95+ if (isRunningInstalled()) {

10196 // append so by default we use xdg files.

10297 dirs.append(qmlDirectory());

10398 }

plugins/Greeter/Unity/Launcher/CMakeLists.txt−1

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

1−include(FindPkgConfig)

21pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)

32pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)

43pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

plugins/ScreenGrabber/screengrabber.cpp+1−1

@@ -81,7 +81,7 @@ void ScreenGrabber::captureAndSave()

8181QString ScreenGrabber::makeFileName()

8282{

8383 QString fileName(fileNamePrefix);

84− fileName.append(QDateTime::currentDateTime().toString("yyyymmdd_hhmmsszzz"));

84+ fileName.append(QDateTime::currentDateTime().toString("yyyyMMdd_hhmmsszzz"));

8585 fileName.append(".");

8686 fileName.append(getFormat());

8787 return fileName;

plugins/Unity/Launcher/launchermodel.cpp+7−7

@@ -468,14 +468,14 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)

468468 return;

469469 }

470470

471− bool found = false;

472− Q_FOREACH(LauncherItem *item, m_list) {

473− if (app->appId() == item->appId()) {

474− found = true;

475− break;

471+ int itemIndex = findApplication(app->appId());

472+ if (itemIndex != -1) {

473+ LauncherItem *item = m_list.at(itemIndex);

474+ if (!item->recent()) {

475+ item->setRecent(true);

476+ m_asAdapter->syncItems(m_list);

477+ Q_EMIT dataChanged(index(itemIndex), index(itemIndex), QVector<int>() << RoleRecent);

476478 }

477− }

478− if (found) {

479479 // Shall we paint some running/recent app highlight? If yes, do it here.

480480 } else {

481481 LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);

plugins/Utils/CMakeLists.txt+1

@@ -9,6 +9,7 @@ include_directories(

99)

1010

1111set(QMLPLUGIN_SRC

12+ constants.cpp

1213 inputwatcher.cpp

1314 qlimitproxymodelqml.cpp

1415 unitysortfilterproxymodelqml.cpp

plugins/Utils/constants.cppnew file+27

@@ -0,0 +1,27 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU Lesser General Public License for more details.

12+ *

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

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

15+*/

16+

17+#include "constants.h"

18+

19+Constants::Constants(QObject *parent)

20+ : QObject(parent)

21+{

22+ if (qgetenv("QT_LOAD_TESTABILITY").isEmpty()) {

23+ m_indicatorValueTimeout = 30000;

24+ } else {

25+ m_indicatorValueTimeout = 5000;

26+ }

27+}

plugins/Utils/constants.hnew file+43

@@ -0,0 +1,43 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU Lesser General Public License for more details.

12+ *

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

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

15+*/

16+

17+#ifndef CONSTANTS_H

18+#define CONSTANTS_H

19+

20+#include <QObject>

21+

22+/**

23+ * @brief The Constants class

24+ *

25+ * This singleton class exposes contants to Qml

26+ *

27+ */

28+

29+class Constants: public QObject

30+{

31+ Q_OBJECT

32+ Q_PROPERTY(int indicatorValueTimeout READ indicatorValueTimeout CONSTANT)

33+

34+public:

35+ Constants(QObject *parent = 0);

36+

37+ int indicatorValueTimeout() const { return m_indicatorValueTimeout; }

38+

39+private:

40+ int m_indicatorValueTimeout;

41+};

42+

43+#endif

plugins/Utils/plugin.cpp+9

@@ -36,6 +36,7 @@

3636#include "easingcurve.h"

3737#include "windowstatestorage.h"

3838#include "spreadflickable.h"

39+#include "constants.h"

3940

4041static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)

4142{

@@ -44,6 +45,13 @@ static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEn

4445 return new WindowStateStorage();

4546}

4647

48+static QObject *createConstants(QQmlEngine *engine, QJSEngine *scriptEngine)

49+{

50+ Q_UNUSED(engine)

51+ Q_UNUSED(scriptEngine)

52+ return new Constants();

53+}

54+

4755void UtilsPlugin::registerTypes(const char *uri)

4856{

4957 Q_ASSERT(uri == QLatin1String("Utils"));

@@ -59,6 +67,7 @@ void UtilsPlugin::registerTypes(const char *uri)

5967 qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "WindowStateStorage", createWindowStateStorage);

6068 qmlRegisterType<InputWatcher>(uri, 0, 1, "InputWatcher");

6169 qmlRegisterType<SpreadFlickable>(uri, 0, 1, "SpreadFlickable");

70+ qmlRegisterSingletonType<Constants>(uri, 0, 1, "Constants", createConstants);

6271}

6372

6473void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

po/bg.po+6−4

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

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

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

1010"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2014-04-01 14:08+0000\n"

12−"Last-Translator: Atanas Kovachki <Unknown>\n"

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

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

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

1414"MIME-Version: 1.0\n"

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

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

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

18−"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-04-14 05:33+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

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

120120"Are you sure you would like\n"

121121"to power off?"

122122msgstr ""

123+"Искате ли да \n"

124+"изключите захранването на устройството?"

123125

124126#: qml/Components/Dialogs.qml:153

125127msgctxt "Button: Power off the system"

po/en_AU.po+25−25

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

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

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

1010"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2015-03-07 08:00+0000\n"

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

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

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

1414"MIME-Version: 1.0\n"

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

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

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

18−"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-04-14 05:33+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

@@ -53,7 +53,7 @@ msgstr[1] "Please wait %1 minutes and then try again…"

5353#: qml/Components/Dialogs.qml:67

5454msgctxt "Title: Lock/Log out dialog"

5555msgid "Log out"

56−msgstr ""

56+msgstr "Log out"

5757

5858#: qml/Components/Dialogs.qml:68

5959msgid "Are you sure you want to log out?"

@@ -62,12 +62,12 @@ msgstr "Are you sure you want to log out?"

6262#: qml/Components/Dialogs.qml:70

6363msgctxt "Button: Lock the system"

6464msgid "Lock"

65−msgstr ""

65+msgstr "Lock"

6666

6767#: qml/Components/Dialogs.qml:77

6868msgctxt "Button: Log out from the system"

6969msgid "Log Out"

70−msgstr ""

70+msgstr "Log Out"

7171

7272#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

7373#: qml/Components/Dialogs.qml:171

@@ -77,7 +77,7 @@ msgstr "Cancel"

7777#: qml/Components/Dialogs.qml:96

7878msgctxt "Title: Reboot/Shut down dialog"

7979msgid "Shut down"

80−msgstr ""

80+msgstr "Shut down"

8181

8282#: qml/Components/Dialogs.qml:97

8383msgid "Are you sure you want to shut down?"

@@ -86,17 +86,17 @@ msgstr "Are you sure you want to shut down?"

8686#: qml/Components/Dialogs.qml:99

8787msgctxt "Button: Reboot the system"

8888msgid "Reboot"

89−msgstr ""

89+msgstr "Reboot"

9090

9191#: qml/Components/Dialogs.qml:107

9292msgctxt "Button: Shut down the system"

9393msgid "Shut down"

94−msgstr ""

94+msgstr "Shut down"

9595

9696#: qml/Components/Dialogs.qml:127

9797msgctxt "Title: Reboot dialog"

9898msgid "Reboot"

99−msgstr ""

99+msgstr "Reboot"

100100

101101#: qml/Components/Dialogs.qml:128

102102msgid "Are you sure you want to reboot?"

@@ -113,7 +113,7 @@ msgstr "Yes"

113113#: qml/Components/Dialogs.qml:150

114114msgctxt "Title: Power off/Restart dialog"

115115msgid "Power"

116−msgstr ""

116+msgstr "Power"

117117

118118#: qml/Components/Dialogs.qml:151

119119msgid ""

@@ -126,12 +126,12 @@ msgstr ""

126126#: qml/Components/Dialogs.qml:153

127127msgctxt "Button: Power off the system"

128128msgid "Power off"

129−msgstr ""

129+msgstr "Power off"

130130

131131#: qml/Components/Dialogs.qml:162

132132msgctxt "Button: Restart the system"

133133msgid "Restart"

134−msgstr ""

134+msgstr "Restart"

135135

136136#: qml/Components/Lockscreen.qml:238

137137msgid "Return to Call"

@@ -156,22 +156,22 @@ msgstr "See all"

156156#: qml/Dash/GenericScopeView.qml:595

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

158158msgid "Search"

159−msgstr ""

159+msgstr "Search"

160160

161161#: qml/Dash/PageHeader.qml:269

162162msgctxt "Button: Open the Ubuntu Store"

163163msgid "Store"

164−msgstr ""

164+msgstr "Store"

165165

166166#: qml/Dash/PageHeader.qml:276

167167msgctxt "Button: Start a search in the current dash scope"

168168msgid "Search"

169−msgstr ""

169+msgstr "Search"

170170

171171#: qml/Dash/PageHeader.qml:286

172172msgctxt "Button: Show the current dash scope settings"

173173msgid "Settings"

174−msgstr ""

174+msgstr "Settings"

175175

176176#: qml/Dash/PageHeader.qml:293

177177msgid "Remove from Favorites"

@@ -338,7 +338,7 @@ msgstr "Failed, tap to retry"

338338#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

339339msgctxt "Label: Hint in message indicator line edit"

340340msgid "Reply"

341−msgstr ""

341+msgstr "Reply"

342342

343343#: qml/Panel/Indicators/ModemInfoItem.qml:105

344344msgid "Unlock SIM"

@@ -403,7 +403,7 @@ msgstr "View all your running tasks."

403403#: qml/Wizard/Page.qml:89

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

405405msgid "Back"

406−msgstr ""

406+msgstr "Back"

407407

408408#: qml/Wizard/Pages/10-welcome.qml:27

409409msgid "Hi!"

@@ -447,32 +447,32 @@ msgstr "Please select how you’d like to unlock your phone."

447447#: qml/Wizard/Pages/30-passwd-type.qml:97

448448msgctxt "Label: Type of security method"

449449msgid "Swipe"

450−msgstr ""

450+msgstr "Swipe"

451451

452452#: qml/Wizard/Pages/30-passwd-type.qml:98

453453msgctxt "Label: Description of security method"

454454msgid "No security"

455−msgstr ""

455+msgstr "No security"

456456

457457#: qml/Wizard/Pages/30-passwd-type.qml:100

458458msgctxt "Label: Type of security method"

459459msgid "Passcode"

460−msgstr ""

460+msgstr "Passcode"

461461

462462#: qml/Wizard/Pages/30-passwd-type.qml:101

463463msgctxt "Label: Description of security method"

464464msgid "4 digits only"

465−msgstr ""

465+msgstr "4 digits only"

466466

467467#: qml/Wizard/Pages/30-passwd-type.qml:103

468468msgctxt "Label: Type of security method"

469469msgid "Passphrase"

470−msgstr ""

470+msgstr "Passphrase"

471471

472472#: qml/Wizard/Pages/30-passwd-type.qml:104

473473msgctxt "Label: Description of security method"

474474msgid "Numbers and letters"

475−msgstr ""

475+msgstr "Numbers and letters"

476476

477477#: qml/Wizard/Pages/40-wifi.qml:29

478478msgid "Connect to Wi‑Fi"

po/fa.po+25−25

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

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

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

1010"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2015-03-08 04:40+0000\n"

11+"PO-Revision-Date: 2015-04-10 03:18+0000\n"

1212"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"

1313"Language-Team: Persian <fa@li.org>\n"

1414"MIME-Version: 1.0\n"

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

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

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-04-14 05:33+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

@@ -53,7 +53,7 @@ msgstr[0] "لطفاُ %1 دقیقه صبر نموده و سپس مجدّداً

5353#: qml/Components/Dialogs.qml:67

5454msgctxt "Title: Lock/Log out dialog"

5555msgid "Log out"

56−msgstr ""

56+msgstr "خروج از حساب"

5757

5858#: qml/Components/Dialogs.qml:68

5959msgid "Are you sure you want to log out?"

@@ -62,12 +62,12 @@ msgstr "مطمئنید که می‌خواهید از حساب خارج شوید"

6262#: qml/Components/Dialogs.qml:70

6363msgctxt "Button: Lock the system"

6464msgid "Lock"

65−msgstr ""

65+msgstr "قفل"

6666

6767#: qml/Components/Dialogs.qml:77

6868msgctxt "Button: Log out from the system"

6969msgid "Log Out"

70−msgstr ""

70+msgstr "خروج"

7171

7272#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

7373#: qml/Components/Dialogs.qml:171

@@ -77,7 +77,7 @@ msgstr "لغو"

7777#: qml/Components/Dialogs.qml:96

7878msgctxt "Title: Reboot/Shut down dialog"

7979msgid "Shut down"

80−msgstr ""

80+msgstr "خاموش کردن"

8181

8282#: qml/Components/Dialogs.qml:97

8383msgid "Are you sure you want to shut down?"

@@ -86,17 +86,17 @@ msgstr "مطمئنید که می‌خواهید خاموش کنید؟"

8686#: qml/Components/Dialogs.qml:99

8787msgctxt "Button: Reboot the system"

8888msgid "Reboot"

89−msgstr ""

89+msgstr "راه‌اندازی دوباره"

9090

9191#: qml/Components/Dialogs.qml:107

9292msgctxt "Button: Shut down the system"

9393msgid "Shut down"

94−msgstr ""

94+msgstr "خاموش"

9595

9696#: qml/Components/Dialogs.qml:127

9797msgctxt "Title: Reboot dialog"

9898msgid "Reboot"

99−msgstr ""

99+msgstr "راه‌اندازی دوباره"

100100

101101#: qml/Components/Dialogs.qml:128

102102msgid "Are you sure you want to reboot?"

@@ -113,7 +113,7 @@ msgstr "بله"

113113#: qml/Components/Dialogs.qml:150

114114msgctxt "Title: Power off/Restart dialog"

115115msgid "Power"

116−msgstr ""

116+msgstr "انرژی"

117117

118118#: qml/Components/Dialogs.qml:151

119119msgid ""

@@ -126,12 +126,12 @@ msgstr ""

126126#: qml/Components/Dialogs.qml:153

127127msgctxt "Button: Power off the system"

128128msgid "Power off"

129−msgstr ""

129+msgstr "خاموش کردن"

130130

131131#: qml/Components/Dialogs.qml:162

132132msgctxt "Button: Restart the system"

133133msgid "Restart"

134−msgstr ""

134+msgstr "راه‌اندازی دوباره"

135135

136136#: qml/Components/Lockscreen.qml:238

137137msgid "Return to Call"

@@ -156,22 +156,22 @@ msgstr "دیدن همه"

156156#: qml/Dash/GenericScopeView.qml:595

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

158158msgid "Search"

159−msgstr ""

159+msgstr "جست‌وجو"

160160

161161#: qml/Dash/PageHeader.qml:269

162162msgctxt "Button: Open the Ubuntu Store"

163163msgid "Store"

164−msgstr ""

164+msgstr "ذخیره"

165165

166166#: qml/Dash/PageHeader.qml:276

167167msgctxt "Button: Start a search in the current dash scope"

168168msgid "Search"

169−msgstr ""

169+msgstr "جست‌وجو"

170170

171171#: qml/Dash/PageHeader.qml:286

172172msgctxt "Button: Show the current dash scope settings"

173173msgid "Settings"

174−msgstr ""

174+msgstr "تنظیمات"

175175

176176#: qml/Dash/PageHeader.qml:293

177177msgid "Remove from Favorites"

@@ -338,7 +338,7 @@ msgstr "شکست خورد، برای تلاش دوباره ضربه بزنید"

338338#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

339339msgctxt "Label: Hint in message indicator line edit"

340340msgid "Reply"

341−msgstr ""

341+msgstr "پاسخ دادن"

342342

343343#: qml/Panel/Indicators/ModemInfoItem.qml:105

344344msgid "Unlock SIM"

@@ -403,7 +403,7 @@ msgstr "همه‌ی وظایف در حال اجرایتان را ببینید."

403403#: qml/Wizard/Page.qml:89

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

405405msgid "Back"

406−msgstr ""

406+msgstr "بازگشت"

407407

408408#: qml/Wizard/Pages/10-welcome.qml:27

409409msgid "Hi!"

@@ -448,32 +448,32 @@ msgstr "لطفاً برگزینید که می‌خواهید چگونه قفل

448448#: qml/Wizard/Pages/30-passwd-type.qml:97

449449msgctxt "Label: Type of security method"

450450msgid "Swipe"

451−msgstr ""

451+msgstr "لغزش"

452452

453453#: qml/Wizard/Pages/30-passwd-type.qml:98

454454msgctxt "Label: Description of security method"

455455msgid "No security"

456−msgstr ""

456+msgstr "هیچ امنیتی نیست"

457457

458458#: qml/Wizard/Pages/30-passwd-type.qml:100

459459msgctxt "Label: Type of security method"

460460msgid "Passcode"

461−msgstr ""

461+msgstr "رمزعبور"

462462

463463#: qml/Wizard/Pages/30-passwd-type.qml:101

464464msgctxt "Label: Description of security method"

465465msgid "4 digits only"

466−msgstr ""

466+msgstr "فقط ۴ رقم"

467467

468468#: qml/Wizard/Pages/30-passwd-type.qml:103

469469msgctxt "Label: Type of security method"

470470msgid "Passphrase"

471−msgstr ""

471+msgstr "عبارت‌عبور"

472472

473473#: qml/Wizard/Pages/30-passwd-type.qml:104

474474msgctxt "Label: Description of security method"

475475msgid "Numbers and letters"

476−msgstr ""

476+msgstr "اعداد و حروف"

477477

478478#: qml/Wizard/Pages/40-wifi.qml:29

479479msgid "Connect to Wi‑Fi"

po/gv.ponew file+649

@@ -0,0 +1,649 @@

1+# Manx translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.

5+#

6+msgid ""

7+msgstr ""

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

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

10+"POT-Creation-Date: 2015-03-19 16:03+0100\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"

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 == 2 ? 1 : 2);\n"

18+"X-Launchpad-Export-Date: 2015-04-03 05:47+0000\n"

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

20+

21+#: plugins/LightDM/Greeter.cpp:112

22+msgid "Password: "

23+msgstr "Fockle follit: "

24+

25+#: plugins/Unity/Launcher/launcheritem.cpp:45

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27+msgid "Pin shortcut"

28+msgstr "Jean freenaghey yn cassan er lheh"

29+

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31+msgid "Unpin shortcut"

32+msgstr "Jean neu-freenaghey yn cassan er lheh"

33+

34+#: qml/Components/DelayedLockscreen.qml:49

35+msgid "Device Locked"

36+msgstr "Saase glast"

37+

38+#: qml/Components/DelayedLockscreen.qml:64

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+"Hie oo er glassey magh kyndagh rish rour çhebbyn aggairagh er yn fockle "

42+"follit."

43+

44+#: qml/Components/DelayedLockscreen.qml:65

45+msgid "You have been locked out due to too many failed passcode attempts."

46+msgstr ""

47+"Hie oo er glassey magh kyndagh rish rour çhebbyn aggairagh er yn fockle "

48+"follit."

49+

50+#: qml/Components/DelayedLockscreen.qml:74

51+#, qt-format

52+msgid "Please wait %1 minute and then try again…"

53+msgid_plural "Please wait %1 minutes and then try again…"

54+msgstr[0] "Fuirree %1 minnid eisht prow reesht, my sailliu..."

55+msgstr[1] "Fuirree %1 minnid eisht prow reesht, my sailliu..."

56+msgstr[2] "Fuirree %1 minnid eisht prow reesht, my sailliu..."

57+

58+#: qml/Components/Dialogs.qml:67

59+msgctxt "Title: Lock/Log out dialog"

60+msgid "Log out"

61+msgstr ""

62+

63+#: qml/Components/Dialogs.qml:68

64+msgid "Are you sure you want to log out?"

65+msgstr "Vel oo shickyr dy vel oo laccal loggal magh?"

66+

67+#: qml/Components/Dialogs.qml:70

68+msgctxt "Button: Lock the system"

69+msgid "Lock"

70+msgstr ""

71+

72+#: qml/Components/Dialogs.qml:77

73+msgctxt "Button: Log out from the system"

74+msgid "Log Out"

75+msgstr ""

76+

77+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

78+#: qml/Components/Dialogs.qml:171

79+msgid "Cancel"

80+msgstr "Cur ass"

81+

82+#: qml/Components/Dialogs.qml:96

83+msgctxt "Title: Reboot/Shut down dialog"

84+msgid "Shut down"

85+msgstr ""

86+

87+#: qml/Components/Dialogs.qml:97

88+msgid "Are you sure you want to shut down?"

89+msgstr "Vel oo shickyr dy vel oo laccal dooney?"

90+

91+#: qml/Components/Dialogs.qml:99

92+msgctxt "Button: Reboot the system"

93+msgid "Reboot"

94+msgstr ""

95+

96+#: qml/Components/Dialogs.qml:107

97+msgctxt "Button: Shut down the system"

98+msgid "Shut down"

99+msgstr ""

100+

101+#: qml/Components/Dialogs.qml:127

102+msgctxt "Title: Reboot dialog"

103+msgid "Reboot"

104+msgstr ""

105+

106+#: qml/Components/Dialogs.qml:128

107+msgid "Are you sure you want to reboot?"

108+msgstr "Vel oo shickyr dy vel oo laccal aahoshiaghey?"

109+

110+#: qml/Components/Dialogs.qml:130

111+msgid "No"

112+msgstr "Cha nel"

113+

114+#: qml/Components/Dialogs.qml:136

115+msgid "Yes"

116+msgstr "Ta"

117+

118+#: qml/Components/Dialogs.qml:150

119+msgctxt "Title: Power off/Restart dialog"

120+msgid "Power"

121+msgstr ""

122+

123+#: qml/Components/Dialogs.qml:151

124+msgid ""

125+"Are you sure you would like\n"

126+"to power off?"

127+msgstr ""

128+"Vel oo shickyr dy vel oo laccal\n"

129+"mooghey?"

130+

131+#: qml/Components/Dialogs.qml:153

132+msgctxt "Button: Power off the system"

133+msgid "Power off"

134+msgstr ""

135+

136+#: qml/Components/Dialogs.qml:162

137+msgctxt "Button: Restart the system"

138+msgid "Restart"

139+msgstr ""

140+

141+#: qml/Components/Lockscreen.qml:238

142+msgid "Return to Call"

143+msgstr "Erash dys eam"

144+

145+#: qml/Components/Lockscreen.qml:238

146+msgid "Emergency Call"

147+msgstr "Eam eginit"

148+

149+#: qml/Components/Lockscreen.qml:270

150+msgid "OK"

151+msgstr "Mie dy liooar"

152+

153+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

154+msgid "See less"

155+msgstr "Faik ny sloo"

156+

157+#: qml/Dash/GenericScopeView.qml:533

158+msgid "See all"

159+msgstr "Faik ooilley"

160+

161+#: qml/Dash/GenericScopeView.qml:595

162+msgctxt "Label: Hint for dash search line edit"

163+msgid "Search"

164+msgstr ""

165+

166+#: qml/Dash/PageHeader.qml:269

167+msgctxt "Button: Open the Ubuntu Store"

168+msgid "Store"

169+msgstr ""

170+

171+#: qml/Dash/PageHeader.qml:276

172+msgctxt "Button: Start a search in the current dash scope"

173+msgid "Search"

174+msgstr ""

175+

176+#: qml/Dash/PageHeader.qml:286

177+msgctxt "Button: Show the current dash scope settings"

178+msgid "Settings"

179+msgstr ""

180+

181+#: qml/Dash/PageHeader.qml:293

182+msgid "Remove from Favorites"

183+msgstr "Jean scughey woish Reihyn"

184+

185+#: qml/Dash/PageHeader.qml:293

186+msgid "Add to Favorites"

187+msgstr "Cur ayns Reihyn"

188+

189+#: qml/Dash/Previews/PreviewActionCombo.qml:35

190+msgid "More..."

191+msgstr "Tooilley..."

192+

193+#: qml/Dash/Previews/PreviewActionCombo.qml:35

194+msgid "Less..."

195+msgstr "Ny sloo..."

196+

197+#: qml/Dash/Previews/PreviewRatingInput.qml:81

198+msgid "Rate this"

199+msgstr "Jean sessal shoh"

200+

201+#: qml/Dash/Previews/PreviewRatingInput.qml:126

202+msgid "Add a review"

203+msgstr "Jean aavriwnys"

204+

205+#: qml/Dash/Previews/PreviewRatingInput.qml:166

206+msgid "Send"

207+msgstr "Cur"

208+

209+#: qml/Dash/PullToRefreshScopeStyle.qml:55

210+msgid "Pull to refresh…"

211+msgstr "Jean tayrn dy aalaadey..."

212+

213+#: qml/Dash/PullToRefreshScopeStyle.qml:60

214+msgid "Release to refresh…"

215+msgstr "Jean aa-eaysley dy aalaadey..."

216+

217+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

218+msgid "Enable location data"

219+msgstr ""

220+

221+#: qml/Dash/ScopesList.qml:66

222+msgid "Manage"

223+msgstr "Jean stiurey"

224+

225+#: qml/Dash/ScopesList.qml:112

226+msgid "Home"

227+msgstr "Balley"

228+

229+#: qml/Dash/ScopesList.qml:113

230+msgid "Also installed"

231+msgstr ""

232+

233+#: qml/Greeter/CoverPage.qml:107

234+msgid "Unlock"

235+msgstr ""

236+

237+#: qml/Greeter/LoginList.qml:236

238+msgid "Retry"

239+msgstr ""

240+

241+#: qml/Greeter/LoginList.qml:237

242+msgid "Tap to unlock"

243+msgstr ""

244+

245+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

246+msgid "Sorry, incorrect passphrase."

247+msgstr ""

248+

249+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

250+msgid "Sorry, incorrect passcode."

251+msgstr ""

252+

253+#: qml/Greeter/NarrowView.qml:55

254+msgid "This will be your last attempt."

255+msgstr ""

256+

257+#: qml/Greeter/NarrowView.qml:57

258+msgid ""

259+"If passphrase is entered incorrectly, your phone will conduct a factory "

260+"reset and all personal data will be deleted."

261+msgstr ""

262+

263+#: qml/Greeter/NarrowView.qml:58

264+msgid ""

265+"If passcode is entered incorrectly, your phone will conduct a factory reset "

266+"and all personal data will be deleted."

267+msgstr ""

268+

269+#: qml/Greeter/NarrowView.qml:115

270+#, qt-format

271+msgid "Enter %1"

272+msgstr ""

273+

274+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

275+msgid "Enter passphrase"

276+msgstr ""

277+

278+#: qml/Greeter/NarrowView.qml:117

279+msgid "Enter passcode"

280+msgstr ""

281+

282+#: qml/Greeter/NarrowView.qml:118

283+#, qt-format

284+msgid "Sorry, incorrect %1"

285+msgstr ""

286+

287+#: qml/Greeter/NarrowView.qml:119

288+msgid "Sorry, incorrect passphrase"

289+msgstr ""

290+

291+#: qml/Greeter/NarrowView.qml:120

292+msgid "Please re-enter"

293+msgstr ""

294+

295+#: qml/Greeter/NarrowView.qml:121

296+msgid "Sorry, incorrect passcode"

297+msgstr ""

298+

299+#: qml/Notifications/NotificationMenuItemFactory.qml:128

300+msgid "Show password"

301+msgstr ""

302+

303+#: qml/Panel/ActiveCallHint.qml:79

304+msgid "Tap to return to call..."

305+msgstr ""

306+

307+#: qml/Panel/ActiveCallHint.qml:92

308+msgid "Conference"

309+msgstr ""

310+

311+#: qml/Panel/Indicators/MenuItemFactory.qml:643

312+msgid "Nothing is playing"

313+msgstr ""

314+

315+#: qml/Panel/Indicators/MenuItemFactory.qml:791

316+msgid "In queue…"

317+msgstr ""

318+

319+#: qml/Panel/Indicators/MenuItemFactory.qml:795

320+msgid "Downloading"

321+msgstr ""

322+

323+#: qml/Panel/Indicators/MenuItemFactory.qml:797

324+msgid "Paused, tap to resume"

325+msgstr ""

326+

327+#: qml/Panel/Indicators/MenuItemFactory.qml:799

328+msgid "Canceled"

329+msgstr ""

330+

331+#: qml/Panel/Indicators/MenuItemFactory.qml:801

332+msgid "Finished"

333+msgstr ""

334+

335+#: qml/Panel/Indicators/MenuItemFactory.qml:803

336+msgid "Failed, tap to retry"

337+msgstr ""

338+

339+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

340+msgctxt "Label: Hint in message indicator line edit"

341+msgid "Reply"

342+msgstr ""

343+

344+#: qml/Panel/Indicators/ModemInfoItem.qml:105

345+msgid "Unlock SIM"

346+msgstr ""

347+

348+#: qml/Panel/Indicators/RoamingIndication.qml:27

349+msgid "Roaming"

350+msgstr ""

351+

352+#: qml/Tutorial/TutorialBottomFinish.qml:24

353+msgid "This action does different things for different apps"

354+msgstr ""

355+

356+#: qml/Tutorial/TutorialBottomFinish.qml:25

357+msgid "Tap here to finish."

358+msgstr ""

359+

360+#: qml/Tutorial/TutorialBottom.qml:28

361+msgid "Open special menus"

362+msgstr ""

363+

364+#: qml/Tutorial/TutorialBottom.qml:29

365+msgid "Swipe up from the bottom edge."

366+msgstr ""

367+

368+#: qml/Tutorial/TutorialLeftFinish.qml:24

369+msgid "These are the shortcuts to favorite apps"

370+msgstr ""

371+

372+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

373+msgid "Tap here to continue."

374+msgstr ""

375+

376+#: qml/Tutorial/TutorialLeft.qml:26

377+msgid "Open the launcher"

378+msgstr ""

379+

380+#: qml/Tutorial/TutorialLeft.qml:27

381+msgid "Short swipe from the left edge."

382+msgstr ""

383+

384+#: qml/Tutorial/TutorialPage.qml:178

385+msgid "You almost got it!"

386+msgstr ""

387+

388+#: qml/Tutorial/TutorialPage.qml:195

389+msgid "Try again."

390+msgstr ""

391+

392+#: qml/Tutorial/TutorialRight.qml:31

393+msgid "To view open apps"

394+msgstr ""

395+

396+#: qml/Tutorial/TutorialRight.qml:32

397+msgid "Long swipe from the right edge."

398+msgstr ""

399+

400+#: qml/Tutorial/TutorialRight.qml:122

401+msgid "View all your running tasks."

402+msgstr ""

403+

404+#: qml/Wizard/Page.qml:89

405+msgctxt "Button: Go back one page in the Wizard"

406+msgid "Back"

407+msgstr ""

408+

409+#: qml/Wizard/Pages/10-welcome.qml:27

410+msgid "Hi!"

411+msgstr ""

412+

413+#: qml/Wizard/Pages/10-welcome.qml:44

414+msgid "Welcome to your Ubuntu phone."

415+msgstr ""

416+

417+#: qml/Wizard/Pages/10-welcome.qml:52

418+msgid "Let’s get started."

419+msgstr ""

420+

421+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

422+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

423+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

424+#: qml/Wizard/Pages/passwd-set.qml:90

425+msgid "Continue"

426+msgstr ""

427+

428+#: qml/Wizard/Pages/20-sim.qml:25

429+msgid "Add a SIM card and restart your device"

430+msgstr ""

431+

432+#: qml/Wizard/Pages/20-sim.qml:59

433+msgid "Without it, you won’t be able to make calls or use text messaging."

434+msgstr ""

435+

436+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

437+msgid "Skip"

438+msgstr ""

439+

440+#: qml/Wizard/Pages/30-passwd-type.qml:39

441+msgid "Lock security"

442+msgstr ""

443+

444+#: qml/Wizard/Pages/30-passwd-type.qml:74

445+msgid "Please select how you’d like to unlock your phone."

446+msgstr ""

447+

448+#: qml/Wizard/Pages/30-passwd-type.qml:97

449+msgctxt "Label: Type of security method"

450+msgid "Swipe"

451+msgstr ""

452+

453+#: qml/Wizard/Pages/30-passwd-type.qml:98

454+msgctxt "Label: Description of security method"

455+msgid "No security"

456+msgstr ""

457+

458+#: qml/Wizard/Pages/30-passwd-type.qml:100

459+msgctxt "Label: Type of security method"

460+msgid "Passcode"

461+msgstr ""

462+

463+#: qml/Wizard/Pages/30-passwd-type.qml:101

464+msgctxt "Label: Description of security method"

465+msgid "4 digits only"

466+msgstr ""

467+

468+#: qml/Wizard/Pages/30-passwd-type.qml:103

469+msgctxt "Label: Type of security method"

470+msgid "Passphrase"

471+msgstr ""

472+

473+#: qml/Wizard/Pages/30-passwd-type.qml:104

474+msgctxt "Label: Description of security method"

475+msgid "Numbers and letters"

476+msgstr ""

477+

478+#: qml/Wizard/Pages/40-wifi.qml:29

479+msgid "Connect to Wi‑Fi"

480+msgstr ""

481+

482+#: qml/Wizard/Pages/40-wifi.qml:168

483+msgid "Available networks…"

484+msgstr ""

485+

486+#: qml/Wizard/Pages/40-wifi.qml:169

487+msgid "No available networks."

488+msgstr ""

489+

490+#: qml/Wizard/Pages/50-location.qml:27

491+msgid "Location"

492+msgstr ""

493+

494+#: qml/Wizard/Pages/50-location.qml:62

495+msgid "Let the phone detect your location:"

496+msgstr ""

497+

498+#: qml/Wizard/Pages/50-location.qml:69

499+msgid "Using GPS only (less accurate)"

500+msgstr ""

501+

502+#: qml/Wizard/Pages/50-location.qml:86

503+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

504+msgstr ""

505+

506+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

507+#: qml/Wizard/Pages/50-location.qml:103

508+msgid ""

509+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

510+"conditions</a>."

511+msgstr ""

512+

513+#: qml/Wizard/Pages/50-location.qml:112

514+msgid "Not at all"

515+msgstr ""

516+

517+#: qml/Wizard/Pages/50-location.qml:124

518+msgid "You can change your mind later in System Settings."

519+msgstr ""

520+

521+#: qml/Wizard/Pages/60-reporting.qml:24

522+msgid "Improving your experience"

523+msgstr ""

524+

525+#: qml/Wizard/Pages/60-reporting.qml:36

526+msgid ""

527+"Your phone is set up to automatically report errors to Canonical and its "

528+"partners, the makers of the operating system."

529+msgstr ""

530+

531+#: qml/Wizard/Pages/60-reporting.qml:43

532+msgid ""

533+"This can be disabled in System Settings under Security & "

534+"Privacy"

535+msgstr ""

536+

537+#: qml/Wizard/Pages/80-finished.qml:24

538+msgid "All done"

539+msgstr ""

540+

541+#: qml/Wizard/Pages/80-finished.qml:39

542+msgid "Nice work!"

543+msgstr ""

544+

545+#: qml/Wizard/Pages/80-finished.qml:46

546+msgid "Your phone is now ready to use."

547+msgstr ""

548+

549+#: qml/Wizard/Pages/80-finished.qml:53

550+msgid "Finish"

551+msgstr ""

552+

553+#: qml/Wizard/Pages/here-terms.qml:27

554+msgid "Terms & Conditions"

555+msgstr ""

556+

557+#: qml/Wizard/Pages/passwd-confirm.qml:49

558+msgid "Confirm passphrase"

559+msgstr ""

560+

561+#: qml/Wizard/Pages/passwd-confirm.qml:50

562+msgid "Confirm passcode"

563+msgstr ""

564+

565+#: qml/Wizard/Pages/passwd-confirm.qml:53

566+#: qml/Wizard/Pages/passwd-confirm.qml:54

567+msgid "Please try again."

568+msgstr ""

569+

570+#: qml/Wizard/Pages/passwd-set.qml:61

571+msgid "Choose your passcode"

572+msgstr ""

573+

574+#: qml/Wizard/Pages/passwd-set.qml:68

575+msgid "Passphrase must be 4 characters long"

576+msgstr ""

577+

578+#: qml/Wizard/StackButton.qml:39

579+#, qt-format

580+msgid "〈 %1"

581+msgstr ""

582+

583+#: qml/Wizard/StackButton.qml:42

584+#, qt-format

585+msgid "%1 〉"

586+msgstr ""

587+

588+#~ msgid "Log out"

589+#~ msgstr "Log magh"

590+

591+#~ msgid "Reboot"

592+#~ msgstr "Aahoshee"

593+

594+#~ msgid "Shut down"

595+#~ msgstr "Jean dooney"

596+

597+#~ msgid "Power"

598+#~ msgstr "Pooyr"

599+

600+#~ msgid "Restart"

601+#~ msgstr "Aahoishee"

602+

603+#~ msgid "Power off"

604+#~ msgstr "Moogh"

605+

606+#~ msgid "Top edge"

607+#~ msgstr "Oirr mullagh"

608+

609+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

610+#~ msgstr ""

611+#~ "Flip woish yn çheu hoshtal dy soilshaghey yn lunneyder son raad aashagh dys "

612+#~ "ny h-appyn"

613+

614+#~ msgid "Well done"

615+#~ msgstr "Jeant dy mie"

616+

617+#~ msgid "Left edge"

618+#~ msgstr "Oirr hoshtal"

619+

620+#~ msgid "Skip intro"

621+#~ msgstr "Lhiem goan foaslee"

622+

623+#~ msgid "Try swiping from the right edge to unlock the phone"

624+#~ msgstr "Prow flippal woish yn oirr yesh dy neu-ghlassey yn çhellvane"

625+

626+#~ msgid "Right edge"

627+#~ msgstr "Oirr yesh"

628+

629+#~ msgid "Close"

630+#~ msgstr "Dooney"

631+

632+#~ msgid "Swipe up again to close the settings screen"

633+#~ msgstr "Flip seose reeshtagh dy dooney yn scaailan soieaghyn"

634+

635+#~ msgid "Settings"

636+#~ msgstr "Soieaghyn"

637+

638+#~ msgid ""

639+#~ "You have now mastered the edge gestures and can start using the "

640+#~ "phone Tap on the screen to start"

641+#~ msgstr ""

642+#~ "T'ou nish oayllagh er ny cowraghyn oirr as foddee oo cur toshiaght er jannoo "

643+#~ "ymmyd jeh'n çhellvane Jean broddey yn scaailan dy ghoaill toshiaght"

644+

645+#~ msgid "Store"

646+#~ msgstr "Shapp"

647+

648+#~ msgid "Search"

649+#~ msgstr "Jean shirrey"

po/pl.po+36−36

@@ -8,7 +8,7 @@ msgstr ""

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

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

1010"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2015-02-14 23:41+0000\n"

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

1212"Last-Translator: GTriderXC <gtriderxc@yahoo.com>\n"

1313"Language-Team: Polish <pl@li.org>\n"

1414"MIME-Version: 1.0\n"

@@ -16,7 +16,7 @@ msgstr ""

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

1717"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "

1818"|| n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19+"X-Launchpad-Export-Date: 2015-04-05 06:10+0000\n"

2020"X-Generator: Launchpad (build 17413)\n"

2121

2222#: plugins/LightDM/Greeter.cpp:112

@@ -56,7 +56,7 @@ msgstr[2] "Poczekaj %1 minut i spróbuj ponownie…"

5656#: qml/Components/Dialogs.qml:67

5757msgctxt "Title: Lock/Log out dialog"

5858msgid "Log out"

59−msgstr ""

59+msgstr "Wylogowanie"

6060

6161#: qml/Components/Dialogs.qml:68

6262msgid "Are you sure you want to log out?"

@@ -65,12 +65,12 @@ msgstr "Czy na pewno wylogować?"

6565#: qml/Components/Dialogs.qml:70

6666msgctxt "Button: Lock the system"

6767msgid "Lock"

68−msgstr ""

68+msgstr "Blokada"

6969

7070#: qml/Components/Dialogs.qml:77

7171msgctxt "Button: Log out from the system"

7272msgid "Log Out"

73−msgstr ""

73+msgstr "Wyloguj"

7474

7575#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

7676#: qml/Components/Dialogs.qml:171

@@ -80,7 +80,7 @@ msgstr "Anuluj"

8080#: qml/Components/Dialogs.qml:96

8181msgctxt "Title: Reboot/Shut down dialog"

8282msgid "Shut down"

83−msgstr ""

83+msgstr "Wyłącz"

8484

8585#: qml/Components/Dialogs.qml:97

8686msgid "Are you sure you want to shut down?"

@@ -89,17 +89,17 @@ msgstr "Czy na pewno wyłączyć?"

8989#: qml/Components/Dialogs.qml:99

9090msgctxt "Button: Reboot the system"

9191msgid "Reboot"

92−msgstr ""

92+msgstr "Uruchom ponownie"

9393

9494#: qml/Components/Dialogs.qml:107

9595msgctxt "Button: Shut down the system"

9696msgid "Shut down"

97−msgstr ""

97+msgstr "Wyłącz"

9898

9999#: qml/Components/Dialogs.qml:127

100100msgctxt "Title: Reboot dialog"

101101msgid "Reboot"

102−msgstr ""

102+msgstr "Uruchom ponownie"

103103

104104#: qml/Components/Dialogs.qml:128

105105msgid "Are you sure you want to reboot?"

@@ -116,7 +116,7 @@ msgstr "Tak"

116116#: qml/Components/Dialogs.qml:150

117117msgctxt "Title: Power off/Restart dialog"

118118msgid "Power"

119−msgstr ""

119+msgstr "Zasilanie"

120120

121121#: qml/Components/Dialogs.qml:151

122122msgid ""

@@ -129,12 +129,12 @@ msgstr ""

129129#: qml/Components/Dialogs.qml:153

130130msgctxt "Button: Power off the system"

131131msgid "Power off"

132−msgstr ""

132+msgstr "Wyłącz"

133133

134134#: qml/Components/Dialogs.qml:162

135135msgctxt "Button: Restart the system"

136136msgid "Restart"

137−msgstr ""

137+msgstr "Uruchom ponownie"

138138

139139#: qml/Components/Lockscreen.qml:238

140140msgid "Return to Call"

@@ -159,22 +159,22 @@ msgstr "Zobacz wszystko"

159159#: qml/Dash/GenericScopeView.qml:595

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

161161msgid "Search"

162−msgstr ""

162+msgstr "Szukaj"

163163

164164#: qml/Dash/PageHeader.qml:269

165165msgctxt "Button: Open the Ubuntu Store"

166166msgid "Store"

167−msgstr ""

167+msgstr "Sklep Ubuntu"

168168

169169#: qml/Dash/PageHeader.qml:276

170170msgctxt "Button: Start a search in the current dash scope"

171171msgid "Search"

172−msgstr ""

172+msgstr "Wyszukaj"

173173

174174#: qml/Dash/PageHeader.qml:286

175175msgctxt "Button: Show the current dash scope settings"

176176msgid "Settings"

177−msgstr ""

177+msgstr "Ustawienia"

178178

179179#: qml/Dash/PageHeader.qml:293

180180msgid "Remove from Favorites"

@@ -214,7 +214,7 @@ msgstr "Zwolnij by odświeżyć"

214214

215215#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

216216msgid "Enable location data"

217−msgstr ""

217+msgstr "Zezwól na lokalizację"

218218

219219#: qml/Dash/ScopesList.qml:66

220220msgid "Manage"

@@ -222,7 +222,7 @@ msgstr "Zarządzaj"

222222

223223#: qml/Dash/ScopesList.qml:112

224224msgid "Home"

225−msgstr ""

225+msgstr "Pulpit"

226226

227227#: qml/Dash/ScopesList.qml:113

228228msgid "Also installed"

@@ -234,11 +234,11 @@ msgstr "Odblokuj"

234234

235235#: qml/Greeter/LoginList.qml:236

236236msgid "Retry"

237−msgstr ""

237+msgstr "Ponów"

238238

239239#: qml/Greeter/LoginList.qml:237

240240msgid "Tap to unlock"

241−msgstr ""

241+msgstr "Dotknij, by odblokować"

242242

243243#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

244244msgid "Sorry, incorrect passphrase."

@@ -341,7 +341,7 @@ msgstr "Błąd, kliknij aby powtórzyć"

341341#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

342342msgctxt "Label: Hint in message indicator line edit"

343343msgid "Reply"

344−msgstr ""

344+msgstr "Odpowiedz"

345345

346346#: qml/Panel/Indicators/ModemInfoItem.qml:105

347347msgid "Unlock SIM"

@@ -353,11 +353,11 @@ msgstr "Roaming"

353353

354354#: qml/Tutorial/TutorialBottomFinish.qml:24

355355msgid "This action does different things for different apps"

356−msgstr ""

356+msgstr "Ta operacja ma różne skutki dla różnych programów"

357357

358358#: qml/Tutorial/TutorialBottomFinish.qml:25

359359msgid "Tap here to finish."

360−msgstr ""

360+msgstr "Dotknij tutaj, by zakończyć."

361361

362362#: qml/Tutorial/TutorialBottom.qml:28

363363msgid "Open special menus"

@@ -369,11 +369,11 @@ msgstr ""

369369

370370#: qml/Tutorial/TutorialLeftFinish.qml:24

371371msgid "These are the shortcuts to favorite apps"

372−msgstr ""

372+msgstr "To są skróty do ulubionych aplikacji"

373373

374374#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

375375msgid "Tap here to continue."

376−msgstr ""

376+msgstr "Dotknij tutaj, by kontynuować."

377377

378378#: qml/Tutorial/TutorialLeft.qml:26

379379msgid "Open the launcher"

@@ -385,15 +385,15 @@ msgstr ""

385385

386386#: qml/Tutorial/TutorialPage.qml:178

387387msgid "You almost got it!"

388−msgstr ""

388+msgstr "Już prawie nam się udało! ;-)"

389389

390390#: qml/Tutorial/TutorialPage.qml:195

391391msgid "Try again."

392−msgstr ""

392+msgstr "Spróbuj ponownie."

393393

394394#: qml/Tutorial/TutorialRight.qml:31

395395msgid "To view open apps"

396−msgstr ""

396+msgstr "By zobaczyć otwarte aplikacje"

397397

398398#: qml/Tutorial/TutorialRight.qml:32

399399msgid "Long swipe from the right edge."

@@ -401,12 +401,12 @@ msgstr ""

401401

402402#: qml/Tutorial/TutorialRight.qml:122

403403msgid "View all your running tasks."

404−msgstr ""

404+msgstr "Wyświetl wszystkie aktywne zadania."

405405

406406#: qml/Wizard/Page.qml:89

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

408408msgid "Back"

409−msgstr ""

409+msgstr "Powrót"

410410

411411#: qml/Wizard/Pages/10-welcome.qml:27

412412msgid "Hi!"

@@ -451,32 +451,32 @@ msgstr "Ustaw proszę jak ma być odblokowywane to urządzenie"

451451#: qml/Wizard/Pages/30-passwd-type.qml:97

452452msgctxt "Label: Type of security method"

453453msgid "Swipe"

454−msgstr ""

454+msgstr "Przeciągnięcie"

455455

456456#: qml/Wizard/Pages/30-passwd-type.qml:98

457457msgctxt "Label: Description of security method"

458458msgid "No security"

459−msgstr ""

459+msgstr "Brak zabezpieczenia"

460460

461461#: qml/Wizard/Pages/30-passwd-type.qml:100

462462msgctxt "Label: Type of security method"

463463msgid "Passcode"

464−msgstr ""

464+msgstr "Kod"

465465

466466#: qml/Wizard/Pages/30-passwd-type.qml:101

467467msgctxt "Label: Description of security method"

468468msgid "4 digits only"

469−msgstr ""

469+msgstr "Tylko 4 cyfry"

470470

471471#: qml/Wizard/Pages/30-passwd-type.qml:103

472472msgctxt "Label: Type of security method"

473473msgid "Passphrase"

474−msgstr ""

474+msgstr "Hasło"

475475

476476#: qml/Wizard/Pages/30-passwd-type.qml:104

477477msgctxt "Label: Description of security method"

478478msgid "Numbers and letters"

479−msgstr ""

479+msgstr "Litery i cyfry"

480480

481481#: qml/Wizard/Pages/40-wifi.qml:29

482482msgid "Connect to Wi‑Fi"

po/pt_BR.po+7−15

@@ -8,14 +8,14 @@ msgstr ""

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

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

1010"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2015-03-21 18:33+0000\n"

12−"Last-Translator: Vinicius Almeida <vinicius.algo@gmail.com>\n"

11+"PO-Revision-Date: 2015-04-06 19:02+0000\n"

12+"Last-Translator: Tiago Hillebrandt <tiagohillebrandt@gmail.com>\n"

1313"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"

1414"MIME-Version: 1.0\n"

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

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

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

18−"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

18+"X-Launchpad-Export-Date: 2015-04-07 05:30+0000\n"

1919"X-Generator: Launchpad (build 17413)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:112

@@ -59,7 +59,7 @@ msgstr "Sair"

5959

6060#: qml/Components/Dialogs.qml:68

6161msgid "Are you sure you want to log out?"

62−msgstr "Tem certeza de que deseja sair?"

62+msgstr "Você tem certeza que deseja sair?"

6363

6464#: qml/Components/Dialogs.qml:70

6565msgctxt "Button: Lock the system"

@@ -83,7 +83,7 @@ msgstr "Desligar"

8383

8484#: qml/Components/Dialogs.qml:97

8585msgid "Are you sure you want to shut down?"

86−msgstr "Tem certeza de que deseja desligar?"

86+msgstr "Você tem certeza que deseja desligar?"

8787

8888#: qml/Components/Dialogs.qml:99

8989msgctxt "Button: Reboot the system"

@@ -102,7 +102,7 @@ msgstr "Reiniciar"

102102

103103#: qml/Components/Dialogs.qml:128

104104msgid "Are you sure you want to reboot?"

105−msgstr "Tem certeza de que deseja reiniciar?"

105+msgstr "Você tem certeza que deseja reiniciar?"

106106

107107#: qml/Components/Dialogs.qml:130

108108msgid "No"

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

122122"Are you sure you would like\n"

123123"to power off?"

124124msgstr ""

125−"Tem certeza que você gostaria \n"

125+"Você tem certeza que gostaria \n"

126126"de desligar?"

127127

128128#: qml/Components/Dialogs.qml:153

@@ -687,11 +687,3 @@ msgstr "%1 〉"

687687

688688#~ msgid "Manage Scopes"

689689#~ msgstr "Gerenciar Plugins"

690−

691−#~ msgctxt "Button: Shown in Page Header Menu"

692−#~ msgid "Search"

693−#~ msgstr "Pesquisar"

694−

695−#~ msgctxt "Button: The Ubuntu Store"

696−#~ msgid "Store"

697−#~ msgstr "Loja"

po/sk.ponew file+579

@@ -0,0 +1,579 @@

1+# Slovak translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.

5+#

6+msgid ""

7+msgstr ""

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

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

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-04-10 09:15+0000\n"

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

13+"Language-Team: Slovak <sk@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) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"

18+"X-Launchpad-Export-Date: 2015-04-14 05:33+0000\n"

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

20+

21+#: plugins/LightDM/Greeter.cpp:112

22+msgid "Password: "

23+msgstr ""

24+

25+#: plugins/Unity/Launcher/launcheritem.cpp:45

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27+msgid "Pin shortcut"

28+msgstr ""

29+

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31+msgid "Unpin shortcut"

32+msgstr ""

33+

34+#: qml/Components/DelayedLockscreen.qml:49

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:64

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:65

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:74

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

55+msgid "Log out"

56+msgstr ""

57+

58+#: qml/Components/Dialogs.qml:68

59+msgid "Are you sure you want to log out?"

60+msgstr ""

61+

62+#: qml/Components/Dialogs.qml:70

63+msgctxt "Button: Lock the system"

64+msgid "Lock"

65+msgstr ""

66+

67+#: qml/Components/Dialogs.qml:77

68+msgctxt "Button: Log out from the system"

69+msgid "Log Out"

70+msgstr ""

71+

72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

73+#: qml/Components/Dialogs.qml:171

74+msgid "Cancel"

75+msgstr ""

76+

77+#: qml/Components/Dialogs.qml:96

78+msgctxt "Title: Reboot/Shut down dialog"

79+msgid "Shut down"

80+msgstr ""

81+

82+#: qml/Components/Dialogs.qml:97

83+msgid "Are you sure you want to shut down?"

84+msgstr ""

85+

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

88+msgid "Reboot"

89+msgstr ""

90+

91+#: qml/Components/Dialogs.qml:107

92+msgctxt "Button: Shut down the system"

93+msgid "Shut down"

94+msgstr ""

95+

96+#: qml/Components/Dialogs.qml:127

97+msgctxt "Title: Reboot dialog"

98+msgid "Reboot"

99+msgstr ""

100+

101+#: qml/Components/Dialogs.qml:128

102+msgid "Are you sure you want to reboot?"

103+msgstr ""

104+

105+#: qml/Components/Dialogs.qml:130

106+msgid "No"

107+msgstr ""

108+

109+#: qml/Components/Dialogs.qml:136

110+msgid "Yes"

111+msgstr ""

112+

113+#: qml/Components/Dialogs.qml:150

114+msgctxt "Title: Power off/Restart dialog"

115+msgid "Power"

116+msgstr ""

117+

118+#: qml/Components/Dialogs.qml:151

119+msgid ""

120+"Are you sure you would like\n"

121+"to power off?"

122+msgstr ""

123+

124+#: qml/Components/Dialogs.qml:153

125+msgctxt "Button: Power off the system"

126+msgid "Power off"

127+msgstr ""

128+

129+#: qml/Components/Dialogs.qml:162

130+msgctxt "Button: Restart the system"

131+msgid "Restart"

132+msgstr ""

133+

134+#: qml/Components/Lockscreen.qml:238

135+msgid "Return to Call"

136+msgstr ""

137+

138+#: qml/Components/Lockscreen.qml:238

139+msgid "Emergency Call"

140+msgstr ""

141+

142+#: qml/Components/Lockscreen.qml:270

143+msgid "OK"

144+msgstr ""

145+

146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

147+msgid "See less"

148+msgstr ""

149+

150+#: qml/Dash/GenericScopeView.qml:533

151+msgid "See all"

152+msgstr ""

153+

154+#: qml/Dash/GenericScopeView.qml:595

155+msgctxt "Label: Hint for dash search line edit"

156+msgid "Search"

157+msgstr ""

158+

159+#: qml/Dash/PageHeader.qml:269

160+msgctxt "Button: Open the Ubuntu Store"

161+msgid "Store"

162+msgstr ""

163+

164+#: qml/Dash/PageHeader.qml:276

165+msgctxt "Button: Start a search in the current dash scope"

166+msgid "Search"

167+msgstr ""

168+

169+#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

171+msgid "Settings"

172+msgstr ""

173+

174+#: qml/Dash/PageHeader.qml:293

175+msgid "Remove from Favorites"

176+msgstr ""

177+

178+#: qml/Dash/PageHeader.qml:293

179+msgid "Add to Favorites"

180+msgstr ""

181+

182+#: qml/Dash/Previews/PreviewActionCombo.qml:35

183+msgid "More..."

184+msgstr ""

185+

186+#: qml/Dash/Previews/PreviewActionCombo.qml:35

187+msgid "Less..."

188+msgstr ""

189+

190+#: qml/Dash/Previews/PreviewRatingInput.qml:81

191+msgid "Rate this"

192+msgstr ""

193+

194+#: qml/Dash/Previews/PreviewRatingInput.qml:126

195+msgid "Add a review"

196+msgstr ""

197+

198+#: qml/Dash/Previews/PreviewRatingInput.qml:166

199+msgid "Send"

200+msgstr ""

201+

202+#: qml/Dash/PullToRefreshScopeStyle.qml:55

203+msgid "Pull to refresh…"

204+msgstr ""

205+

206+#: qml/Dash/PullToRefreshScopeStyle.qml:60

207+msgid "Release to refresh…"

208+msgstr ""

209+

210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

211+msgid "Enable location data"

212+msgstr ""

213+

214+#: qml/Dash/ScopesList.qml:66

215+msgid "Manage"

216+msgstr ""

217+

218+#: qml/Dash/ScopesList.qml:112

219+msgid "Home"

220+msgstr ""

221+

222+#: qml/Dash/ScopesList.qml:113

223+msgid "Also installed"

224+msgstr ""

225+

226+#: qml/Greeter/CoverPage.qml:107

227+msgid "Unlock"

228+msgstr ""

229+

230+#: qml/Greeter/LoginList.qml:236

231+msgid "Retry"

232+msgstr ""

233+

234+#: qml/Greeter/LoginList.qml:237

235+msgid "Tap to unlock"

236+msgstr ""

237+

238+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

239+msgid "Sorry, incorrect passphrase."

240+msgstr ""

241+

242+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

243+msgid "Sorry, incorrect passcode."

244+msgstr ""

245+

246+#: qml/Greeter/NarrowView.qml:55

247+msgid "This will be your last attempt."

248+msgstr ""

249+

250+#: qml/Greeter/NarrowView.qml:57

251+msgid ""

252+"If passphrase is entered incorrectly, your phone will conduct a factory "

253+"reset and all personal data will be deleted."

254+msgstr ""

255+

256+#: qml/Greeter/NarrowView.qml:58

257+msgid ""

258+"If passcode is entered incorrectly, your phone will conduct a factory reset "

259+"and all personal data will be deleted."

260+msgstr ""

261+

262+#: qml/Greeter/NarrowView.qml:115

263+#, qt-format

264+msgid "Enter %1"

265+msgstr ""

266+

267+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

268+msgid "Enter passphrase"

269+msgstr ""

270+

271+#: qml/Greeter/NarrowView.qml:117

272+msgid "Enter passcode"

273+msgstr ""

274+

275+#: qml/Greeter/NarrowView.qml:118

276+#, qt-format

277+msgid "Sorry, incorrect %1"

278+msgstr ""

279+

280+#: qml/Greeter/NarrowView.qml:119

281+msgid "Sorry, incorrect passphrase"

282+msgstr ""

283+

284+#: qml/Greeter/NarrowView.qml:120

285+msgid "Please re-enter"

286+msgstr ""

287+

288+#: qml/Greeter/NarrowView.qml:121

289+msgid "Sorry, incorrect passcode"

290+msgstr ""

291+

292+#: qml/Notifications/NotificationMenuItemFactory.qml:128

293+msgid "Show password"

294+msgstr ""

295+

296+#: qml/Panel/ActiveCallHint.qml:79

297+msgid "Tap to return to call..."

298+msgstr ""

299+

300+#: qml/Panel/ActiveCallHint.qml:92

301+msgid "Conference"

302+msgstr ""

303+

304+#: qml/Panel/Indicators/MenuItemFactory.qml:643

305+msgid "Nothing is playing"

306+msgstr ""

307+

308+#: qml/Panel/Indicators/MenuItemFactory.qml:791

309+msgid "In queue…"

310+msgstr ""

311+

312+#: qml/Panel/Indicators/MenuItemFactory.qml:795

313+msgid "Downloading"

314+msgstr ""

315+

316+#: qml/Panel/Indicators/MenuItemFactory.qml:797

317+msgid "Paused, tap to resume"

318+msgstr ""

319+

320+#: qml/Panel/Indicators/MenuItemFactory.qml:799

321+msgid "Canceled"

322+msgstr ""

323+

324+#: qml/Panel/Indicators/MenuItemFactory.qml:801

325+msgid "Finished"

326+msgstr ""

327+

328+#: qml/Panel/Indicators/MenuItemFactory.qml:803

329+msgid "Failed, tap to retry"

330+msgstr ""

331+

332+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

333+msgctxt "Label: Hint in message indicator line edit"

334+msgid "Reply"

335+msgstr ""

336+

337+#: qml/Panel/Indicators/ModemInfoItem.qml:105

338+msgid "Unlock SIM"

339+msgstr ""

340+

341+#: qml/Panel/Indicators/RoamingIndication.qml:27

342+msgid "Roaming"

343+msgstr ""

344+

345+#: qml/Tutorial/TutorialBottomFinish.qml:24

346+msgid "This action does different things for different apps"

347+msgstr ""

348+

349+#: qml/Tutorial/TutorialBottomFinish.qml:25

350+msgid "Tap here to finish."

351+msgstr ""

352+

353+#: qml/Tutorial/TutorialBottom.qml:28

354+msgid "Open special menus"

355+msgstr ""

356+

357+#: qml/Tutorial/TutorialBottom.qml:29

358+msgid "Swipe up from the bottom edge."

359+msgstr ""

360+

361+#: qml/Tutorial/TutorialLeftFinish.qml:24

362+msgid "These are the shortcuts to favorite apps"

363+msgstr ""

364+

365+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

366+msgid "Tap here to continue."

367+msgstr ""

368+

369+#: qml/Tutorial/TutorialLeft.qml:26

370+msgid "Open the launcher"

371+msgstr ""

372+

373+#: qml/Tutorial/TutorialLeft.qml:27

374+msgid "Short swipe from the left edge."

375+msgstr ""

376+

377+#: qml/Tutorial/TutorialPage.qml:178

378+msgid "You almost got it!"

379+msgstr ""

380+

381+#: qml/Tutorial/TutorialPage.qml:195

382+msgid "Try again."

383+msgstr ""

384+

385+#: qml/Tutorial/TutorialRight.qml:31

386+msgid "To view open apps"

387+msgstr ""

388+

389+#: qml/Tutorial/TutorialRight.qml:32

390+msgid "Long swipe from the right edge."

391+msgstr ""

392+

393+#: qml/Tutorial/TutorialRight.qml:122

394+msgid "View all your running tasks."

395+msgstr ""

396+

397+#: qml/Wizard/Page.qml:89

398+msgctxt "Button: Go back one page in the Wizard"

399+msgid "Back"

400+msgstr ""

401+

402+#: qml/Wizard/Pages/10-welcome.qml:27

403+msgid "Hi!"

404+msgstr ""

405+

406+#: qml/Wizard/Pages/10-welcome.qml:44

407+msgid "Welcome to your Ubuntu phone."

408+msgstr ""

409+

410+#: qml/Wizard/Pages/10-welcome.qml:52

411+msgid "Let’s get started."

412+msgstr ""

413+

414+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

415+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

416+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

417+#: qml/Wizard/Pages/passwd-set.qml:90

418+msgid "Continue"

419+msgstr ""

420+

421+#: qml/Wizard/Pages/20-sim.qml:25

422+msgid "Add a SIM card and restart your device"

423+msgstr ""

424+

425+#: qml/Wizard/Pages/20-sim.qml:59

426+msgid "Without it, you won’t be able to make calls or use text messaging."

427+msgstr ""

428+

429+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

430+msgid "Skip"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/30-passwd-type.qml:39

434+msgid "Lock security"

435+msgstr ""

436+

437+#: qml/Wizard/Pages/30-passwd-type.qml:74

438+msgid "Please select how you’d like to unlock your phone."

439+msgstr ""

440+

441+#: qml/Wizard/Pages/30-passwd-type.qml:97

442+msgctxt "Label: Type of security method"

443+msgid "Swipe"

444+msgstr ""

445+

446+#: qml/Wizard/Pages/30-passwd-type.qml:98

447+msgctxt "Label: Description of security method"

448+msgid "No security"

449+msgstr ""

450+

451+#: qml/Wizard/Pages/30-passwd-type.qml:100

452+msgctxt "Label: Type of security method"

453+msgid "Passcode"

454+msgstr ""

455+

456+#: qml/Wizard/Pages/30-passwd-type.qml:101

457+msgctxt "Label: Description of security method"

458+msgid "4 digits only"

459+msgstr ""

460+

461+#: qml/Wizard/Pages/30-passwd-type.qml:103

462+msgctxt "Label: Type of security method"

463+msgid "Passphrase"

464+msgstr ""

465+

466+#: qml/Wizard/Pages/30-passwd-type.qml:104

467+msgctxt "Label: Description of security method"

468+msgid "Numbers and letters"

469+msgstr ""

470+

471+#: qml/Wizard/Pages/40-wifi.qml:29

472+msgid "Connect to Wi‑Fi"

473+msgstr ""

474+

475+#: qml/Wizard/Pages/40-wifi.qml:168

476+msgid "Available networks…"

477+msgstr ""

478+

479+#: qml/Wizard/Pages/40-wifi.qml:169

480+msgid "No available networks."

481+msgstr ""

482+

483+#: qml/Wizard/Pages/50-location.qml:27

484+msgid "Location"

485+msgstr ""

486+

487+#: qml/Wizard/Pages/50-location.qml:62

488+msgid "Let the phone detect your location:"

489+msgstr ""

490+

491+#: qml/Wizard/Pages/50-location.qml:69

492+msgid "Using GPS only (less accurate)"

493+msgstr ""

494+

495+#: qml/Wizard/Pages/50-location.qml:86

496+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

497+msgstr ""

498+

499+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

500+#: qml/Wizard/Pages/50-location.qml:103

501+msgid ""

502+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

503+"conditions</a>."

504+msgstr ""

505+

506+#: qml/Wizard/Pages/50-location.qml:112

507+msgid "Not at all"

508+msgstr ""

509+

510+#: qml/Wizard/Pages/50-location.qml:124

511+msgid "You can change your mind later in System Settings."

512+msgstr ""

513+

514+#: qml/Wizard/Pages/60-reporting.qml:24

515+msgid "Improving your experience"

516+msgstr ""

517+

518+#: qml/Wizard/Pages/60-reporting.qml:36

519+msgid ""

520+"Your phone is set up to automatically report errors to Canonical and its "

521+"partners, the makers of the operating system."

522+msgstr ""

523+

524+#: qml/Wizard/Pages/60-reporting.qml:43

525+msgid ""

526+"This can be disabled in System Settings under Security & "

527+"Privacy"

528+msgstr ""

529+

530+#: qml/Wizard/Pages/80-finished.qml:24

531+msgid "All done"

532+msgstr ""

533+

534+#: qml/Wizard/Pages/80-finished.qml:39

535+msgid "Nice work!"

536+msgstr ""

537+

538+#: qml/Wizard/Pages/80-finished.qml:46

539+msgid "Your phone is now ready to use."

540+msgstr ""

541+

542+#: qml/Wizard/Pages/80-finished.qml:53

543+msgid "Finish"

544+msgstr ""

545+

546+#: qml/Wizard/Pages/here-terms.qml:27

547+msgid "Terms & Conditions"

548+msgstr ""

549+

550+#: qml/Wizard/Pages/passwd-confirm.qml:49

551+msgid "Confirm passphrase"

552+msgstr ""

553+

554+#: qml/Wizard/Pages/passwd-confirm.qml:50

555+msgid "Confirm passcode"

556+msgstr ""

557+

558+#: qml/Wizard/Pages/passwd-confirm.qml:53

559+#: qml/Wizard/Pages/passwd-confirm.qml:54

560+msgid "Please try again."

561+msgstr ""

562+

563+#: qml/Wizard/Pages/passwd-set.qml:61

564+msgid "Choose your passcode"

565+msgstr ""

566+

567+#: qml/Wizard/Pages/passwd-set.qml:68

568+msgid "Passphrase must be 4 characters long"

569+msgstr ""

570+

571+#: qml/Wizard/StackButton.qml:39

572+#, qt-format

573+msgid "〈 %1"

574+msgstr ""

575+

576+#: qml/Wizard/StackButton.qml:42

577+#, qt-format

578+msgid "%1 〉"

579+msgstr ""

po/sr.po+33−32

@@ -9,16 +9,16 @@ msgstr ""

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

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

1111"POT-Creation-Date: 2015-03-19 16:03+0100\n"

12−"PO-Revision-Date: 2015-03-04 22:25+0000\n"

13−"Last-Translator: Саша Петровић <salepetronije@gmail.com>\n"

12+"PO-Revision-Date: 2015-04-13 15:19+0000\n"

13+"Last-Translator: Данило Шеган <Unknown>\n"

1414"Language-Team: српски <xfce4@xfce4.org>\n"

1515"MIME-Version: 1.0\n"

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

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

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

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

20−"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

21−"X-Generator: Launchpad (build 17413)\n"

20+"X-Launchpad-Export-Date: 2015-04-14 05:33+0000\n"

21+"X-Generator: Launchpad (build 17423)\n"

2222"Language: sr\n"

2323

2424#: plugins/LightDM/Greeter.cpp:112

@@ -57,7 +57,7 @@ msgstr[2] "Молим, сачекајте %1 минута, па покушајт

5757#: qml/Components/Dialogs.qml:67

5858msgctxt "Title: Lock/Log out dialog"

5959msgid "Log out"

60−msgstr ""

60+msgstr "Одјави се"

6161

6262#: qml/Components/Dialogs.qml:68

6363msgid "Are you sure you want to log out?"

@@ -66,12 +66,12 @@ msgstr "Сигурно желите да се одјавите?"

6666#: qml/Components/Dialogs.qml:70

6767msgctxt "Button: Lock the system"

6868msgid "Lock"

69−msgstr ""

69+msgstr "Закључај"

7070

7171#: qml/Components/Dialogs.qml:77

7272msgctxt "Button: Log out from the system"

7373msgid "Log Out"

74−msgstr ""

74+msgstr "Одјави се"

7575

7676#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

7777#: qml/Components/Dialogs.qml:171

@@ -81,7 +81,7 @@ msgstr "Откажи"

8181#: qml/Components/Dialogs.qml:96

8282msgctxt "Title: Reboot/Shut down dialog"

8383msgid "Shut down"

84−msgstr ""

84+msgstr "Угаси"

8585

8686#: qml/Components/Dialogs.qml:97

8787msgid "Are you sure you want to shut down?"

@@ -90,17 +90,17 @@ msgstr "Сигурно желите да угасите?"

9090#: qml/Components/Dialogs.qml:99

9191msgctxt "Button: Reboot the system"

9292msgid "Reboot"

93−msgstr ""

93+msgstr "Ресетуј"

9494

9595#: qml/Components/Dialogs.qml:107

9696msgctxt "Button: Shut down the system"

9797msgid "Shut down"

98−msgstr ""

98+msgstr "Угаси"

9999

100100#: qml/Components/Dialogs.qml:127

101101msgctxt "Title: Reboot dialog"

102102msgid "Reboot"

103−msgstr ""

103+msgstr "Ресетуј"

104104

105105#: qml/Components/Dialogs.qml:128

106106msgid "Are you sure you want to reboot?"

@@ -117,7 +117,7 @@ msgstr "Да"

117117#: qml/Components/Dialogs.qml:150

118118msgctxt "Title: Power off/Restart dialog"

119119msgid "Power"

120−msgstr ""

120+msgstr "Напајање"

121121

122122#: qml/Components/Dialogs.qml:151

123123msgid ""

@@ -130,12 +130,12 @@ msgstr ""

130130#: qml/Components/Dialogs.qml:153

131131msgctxt "Button: Power off the system"

132132msgid "Power off"

133−msgstr ""

133+msgstr "Искључи"

134134

135135#: qml/Components/Dialogs.qml:162

136136msgctxt "Button: Restart the system"

137137msgid "Restart"

138−msgstr ""

138+msgstr "Покрени поново"

139139

140140#: qml/Components/Lockscreen.qml:238

141141msgid "Return to Call"

@@ -160,22 +160,22 @@ msgstr "Опширније"

160160#: qml/Dash/GenericScopeView.qml:595

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

162162msgid "Search"

163−msgstr ""

163+msgstr "Претрага"

164164

165165#: qml/Dash/PageHeader.qml:269

166166msgctxt "Button: Open the Ubuntu Store"

167167msgid "Store"

168−msgstr ""

168+msgstr "Продавница"

169169

170170#: qml/Dash/PageHeader.qml:276

171171msgctxt "Button: Start a search in the current dash scope"

172172msgid "Search"

173−msgstr ""

173+msgstr "Тражи"

174174

175175#: qml/Dash/PageHeader.qml:286

176176msgctxt "Button: Show the current dash scope settings"

177177msgid "Settings"

178−msgstr ""

178+msgstr "Подешавања"

179179

180180#: qml/Dash/PageHeader.qml:293

181181msgid "Remove from Favorites"

@@ -235,11 +235,11 @@ msgstr "Откључај"

235235

236236#: qml/Greeter/LoginList.qml:236

237237msgid "Retry"

238−msgstr ""

238+msgstr "Покушај поново"

239239

240240#: qml/Greeter/LoginList.qml:237

241241msgid "Tap to unlock"

242−msgstr ""

242+msgstr "Додирните да откључате"

243243

244244#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

245245msgid "Sorry, incorrect passphrase."

@@ -342,7 +342,7 @@ msgstr "Неуспешно, тапните да покушате поново"

342342#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

343343msgctxt "Label: Hint in message indicator line edit"

344344msgid "Reply"

345−msgstr ""

345+msgstr "Одговор"

346346

347347#: qml/Panel/Indicators/ModemInfoItem.qml:105

348348msgid "Unlock SIM"

@@ -354,7 +354,7 @@ msgstr "Роминг"

354354

355355#: qml/Tutorial/TutorialBottomFinish.qml:24

356356msgid "This action does different things for different apps"

357−msgstr ""

357+msgstr "Ова радња ради различите ствари за различите програме"

358358

359359#: qml/Tutorial/TutorialBottomFinish.qml:25

360360msgid "Tap here to finish."

@@ -366,7 +366,7 @@ msgstr "Отвори нарочите изборнике"

366366

367367#: qml/Tutorial/TutorialBottom.qml:29

368368msgid "Swipe up from the bottom edge."

369−msgstr ""

369+msgstr "Превуците од доње ивице навише."

370370

371371#: qml/Tutorial/TutorialLeftFinish.qml:24

372372msgid "These are the shortcuts to favorite apps"

@@ -407,7 +407,7 @@ msgstr "Прегледајте покренуте задатке."

407407#: qml/Wizard/Page.qml:89

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

409409msgid "Back"

410−msgstr ""

410+msgstr "Назад"

411411

412412#: qml/Wizard/Pages/10-welcome.qml:27

413413msgid "Hi!"

@@ -415,7 +415,7 @@ msgstr "Здраво!"

415415

416416#: qml/Wizard/Pages/10-welcome.qml:44

417417msgid "Welcome to your Ubuntu phone."

418−msgstr ""

418+msgstr "Добродошли у свој Убунту телефон."

419419

420420#: qml/Wizard/Pages/10-welcome.qml:52

421421msgid "Let’s get started."

@@ -451,32 +451,32 @@ msgstr "Молим, изаберите како бисте желели да о

451451#: qml/Wizard/Pages/30-passwd-type.qml:97

452452msgctxt "Label: Type of security method"

453453msgid "Swipe"

454−msgstr ""

454+msgstr "Превлачење"

455455

456456#: qml/Wizard/Pages/30-passwd-type.qml:98

457457msgctxt "Label: Description of security method"

458458msgid "No security"

459−msgstr ""

459+msgstr "Без заштите"

460460

461461#: qml/Wizard/Pages/30-passwd-type.qml:100

462462msgctxt "Label: Type of security method"

463463msgid "Passcode"

464−msgstr ""

464+msgstr "Код"

465465

466466#: qml/Wizard/Pages/30-passwd-type.qml:101

467467msgctxt "Label: Description of security method"

468468msgid "4 digits only"

469−msgstr ""

469+msgstr "Само 4 цифре"

470470

471471#: qml/Wizard/Pages/30-passwd-type.qml:103

472472msgctxt "Label: Type of security method"

473473msgid "Passphrase"

474−msgstr ""

474+msgstr "Лозинка"

475475

476476#: qml/Wizard/Pages/30-passwd-type.qml:104

477477msgctxt "Label: Description of security method"

478478msgid "Numbers and letters"

479−msgstr ""

479+msgstr "Бројеви и слова"

480480

481481#: qml/Wizard/Pages/40-wifi.qml:29

482482msgid "Connect to Wi‑Fi"

@@ -505,6 +505,7 @@ msgstr "Користећи само ГПС (мања тачност)"

505505#: qml/Wizard/Pages/50-location.qml:86

506506msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

507507msgstr ""

508+"Помоћу GPS-a, заштићених података о бежичним и мобилним мрежама (препоручено)"

508509

509510#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

510511#: qml/Wizard/Pages/50-location.qml:103

@@ -582,7 +583,7 @@ msgstr "Изаберите своју шифру"

582583

583584#: qml/Wizard/Pages/passwd-set.qml:68

584585msgid "Passphrase must be 4 characters long"

585−msgstr ""

586+msgstr "Лозинка мора имати бар 4 знака"

586587

587588#: qml/Wizard/StackButton.qml:39

588589#, qt-format

po/sv.po+20−28

@@ -2,20 +2,20 @@

33# This file is distributed under the same license as the unity package.

44# Josef Andersson <josef.andersson@fripost.org>, 2014.

5−#

5+# clone <josef.andersson@fripost.org>, 2015.

66msgid ""

77msgstr ""

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

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

1010"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2015-03-21 16:29+0000\n"

11+"PO-Revision-Date: 2015-04-03 05:36+0000\n"

1212"Last-Translator: Josef Andersson <Unknown>\n"

13−"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"

13+"Language-Team: Swedish\n"

1414"MIME-Version: 1.0\n"

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

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

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

18−"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

18+"X-Launchpad-Export-Date: 2015-04-04 05:46+0000\n"

1919"X-Generator: Launchpad (build 17413)\n"

2020"Language: sv\n"

2121

@@ -48,8 +48,8 @@ msgstr "Du har blivit utlåst efter för många misslyckade lösenkodsförsök."

4848#, qt-format

4949msgid "Please wait %1 minute and then try again…"

5050msgid_plural "Please wait %1 minutes and then try again…"

51−msgstr[0] "Vänta %1 minut och prova sedan igen..."

52−msgstr[1] "Vänta %1 minuter och prova sedan igen..."

51+msgstr[0] "Vänta %1 minut och prova sedan igen…"

52+msgstr[1] "Vänta %1 minuter och prova sedan igen…"

5353

5454#: qml/Components/Dialogs.qml:67

5555msgctxt "Title: Lock/Log out dialog"

@@ -144,7 +144,7 @@ msgstr "Nödsamtal"

144144

145145#: qml/Components/Lockscreen.qml:270

146146msgid "OK"

147−msgstr "Ok"

147+msgstr "OK"

148148

149149#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

150150msgid "See less"

@@ -162,17 +162,17 @@ msgstr "Sök"

162162#: qml/Dash/PageHeader.qml:269

163163msgctxt "Button: Open the Ubuntu Store"

164164msgid "Store"

165−msgstr ""

165+msgstr "Förråd"

166166

167167#: qml/Dash/PageHeader.qml:276

168168msgctxt "Button: Start a search in the current dash scope"

169169msgid "Search"

170−msgstr ""

170+msgstr "Sök"

171171

172172#: qml/Dash/PageHeader.qml:286

173173msgctxt "Button: Show the current dash scope settings"

174174msgid "Settings"

175−msgstr ""

175+msgstr "Inställningar"

176176

177177#: qml/Dash/PageHeader.qml:293

178178msgid "Remove from Favorites"

@@ -204,11 +204,11 @@ msgstr "Skicka"

204204

205205#: qml/Dash/PullToRefreshScopeStyle.qml:55

206206msgid "Pull to refresh…"

207−msgstr "Dra för att uppdatera..."

207+msgstr "Dra för att uppdatera…"

208208

209209#: qml/Dash/PullToRefreshScopeStyle.qml:60

210210msgid "Release to refresh…"

211−msgstr "Släpp för uppdatera..."

211+msgstr "Släpp för att uppdatera…"

212212

213213#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

214214msgid "Enable location data"

@@ -302,7 +302,7 @@ msgstr "Visa lösenord"

302302

303303#: qml/Panel/ActiveCallHint.qml:79

304304msgid "Tap to return to call..."

305−msgstr "Tryck för att återgå till samtal..."

305+msgstr "Tryck för att återgå till samtal…"

306306

307307#: qml/Panel/ActiveCallHint.qml:92

308308msgid "Conference"

@@ -355,7 +355,7 @@ msgstr "Denna åtgärd gör olika saker för olika program"

355355

356356#: qml/Tutorial/TutorialBottomFinish.qml:25

357357msgid "Tap here to finish."

358−msgstr "Tryck här för att avsluta"

358+msgstr "Tryck här för att avsluta."

359359

360360#: qml/Tutorial/TutorialBottom.qml:28

361361msgid "Open special menus"

@@ -363,7 +363,7 @@ msgstr "Öppna specialmenyer"

363363

364364#: qml/Tutorial/TutorialBottom.qml:29

365365msgid "Swipe up from the bottom edge."

366−msgstr "Svep uppåt från nedre kanten"

366+msgstr "Svep uppåt från nedre kanten."

367367

368368#: qml/Tutorial/TutorialLeftFinish.qml:24

369369msgid "These are the shortcuts to favorite apps"

@@ -416,7 +416,7 @@ msgstr "Välkommen till din Ubuntutelefon."

416416

417417#: qml/Wizard/Pages/10-welcome.qml:52

418418msgid "Let’s get started."

419−msgstr "Låt oss komma igång"

419+msgstr "Låt oss komma igång."

420420

421421#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

422422#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

@@ -432,7 +432,7 @@ msgstr "Lägg till ett SIM-kort och starta om din enhet"

432432#: qml/Wizard/Pages/20-sim.qml:59

433433msgid "Without it, you won’t be able to make calls or use text messaging."

434434msgstr ""

435−"Utan det kommer du inte att kunnda ringa eller skicka textmeddelanden."

435+"Utan det kommer du inte att kunna ringa eller skicka textmeddelanden."

436436

437437#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

438438msgid "Skip"

@@ -482,11 +482,11 @@ msgstr "Anslut till Wi-Fi"

482482

483483#: qml/Wizard/Pages/40-wifi.qml:168

484484msgid "Available networks…"

485−msgstr "Tillgängliga nätverk.."

485+msgstr "Tillgängliga nätverk…"

486486

487487#: qml/Wizard/Pages/40-wifi.qml:169

488488msgid "No available networks."

489−msgstr "Inga tillgängliga nätverk"

489+msgstr "Inga tillgängliga nätverk."

490490

491491#: qml/Wizard/Pages/50-location.qml:27

492492msgid "Location"

@@ -520,7 +520,7 @@ msgstr "Inte alls"

520520

521521#: qml/Wizard/Pages/50-location.qml:124

522522msgid "You can change your mind later in System Settings."

523−msgstr "Du kan ändra dig senare via Systeminställningar</b."

523+msgstr "Du kan ändra dig senare via Systeminställningar."

524524

525525#: qml/Wizard/Pages/60-reporting.qml:24

526526msgid "Improving your experience"

@@ -683,11 +683,3 @@ msgstr "%1 〉"

683683

684684#~ msgid "Manage Scopes"

685685#~ msgstr "Hantera vyer"

686−

687−#~ msgctxt "Button: Shown in Page Header Menu"

688−#~ msgid "Search"

689−#~ msgstr "Sök"

690−

691−#~ msgctxt "Button: The Ubuntu Store"

692−#~ msgid "Store"

693−#~ msgstr "Butik"

qml/Components/Dialogs.qml+2

@@ -51,11 +51,13 @@ Item {

5151 if (!dialogLoader.active) {

5252 dialogLoader.sourceComponent = powerDialogComponent;

5353 dialogLoader.active = true;

54+ dialogLoader.item.forceActiveFocus();

5455 }

5556 }

5657 }

5758 Loader {

5859 id: dialogLoader

60+ objectName: "dialogLoader"

5961 anchors.fill: parent

6062 active: false

6163 }

qml/Dash/Dash.qml+27−14

@@ -28,29 +28,42 @@ Showable {

2828

2929 visible: shown

3030

31+ Connections {

32+ target: UriHandler

33+ onOpened: {

34+ backToDashContent()

35+ dashContent.currentScope.performQuery(uris[0])

36+ }

37+ }

38+

3139 DashCommunicatorService {

3240 objectName: "dashCommunicatorService"

3341 onSetCurrentScopeRequested: {

3442 if (!isSwipe || !window.active || bottomEdgeController.progress != 0 || scopeItem.scope || dashContent.subPageShown) {

3543 if (bottomEdgeController.progress != 0 && window.active) animate = false;

3644 dashContent.setCurrentScopeAtIndex(index, animate, isSwipe)

37− // Close dash overview and nested temp scopes in it

38− if (bottomEdgeController.progress != 0) {

39− bottomEdgeController.enableAnimation = window.active;

40− bottomEdgeController.progress = 0;

41− }

42− // Close normal temp scopes (e.g. App Store)

43− if (scopeItem.scope) {

44− scopeItem.backClicked();

45− }

46− // Close previews

47− if (dashContent.subPageShown) {

48− dashContent.closePreview();

49− }

45+ backToDashContent()

5046 }

5147 }

5248 }

5349

50+ function backToDashContent()

51+ {

52+ // Close dash overview and nested temp scopes in it

53+ if (bottomEdgeController.progress != 0) {

54+ bottomEdgeController.enableAnimation = window.active;

55+ bottomEdgeController.progress = 0;

56+ }

57+ // Close normal temp scopes (e.g. App Store)

58+ if (scopeItem.scope) {

59+ scopeItem.backClicked();

60+ }

61+ // Close previews

62+ if (dashContent.subPageShown) {

63+ dashContent.closePreview();

64+ }

65+ }

66+

5467 function setCurrentScope(scopeId, animate, reset) {

5568 var scopeIndex = -1;

5669 for (var i = 0; i < scopes.count; ++i) {

@@ -178,7 +191,7 @@ Showable {

178191 Binding {

179192 target: scopesList.scope

180193 property: "isActive"

181− value: bottomEdgeController.progress === 1

194+ value: bottomEdgeController.progress === 1 && (Qt.application.state == Qt.ApplicationActive)

182195 }

183196

184197 Connections {

qml/Dash/DashContent.qml−5

@@ -63,11 +63,6 @@ Item {

6363 }

6464 }

6565

66− Connections {

67− target: UriHandler

68− onOpened: dashContentList.currentItem.theScope.performQuery(uris[0])

69− }

70−

7166 function setCurrentScopeAtIndex(index, animate, reset) {

7267 // if the scopes haven't loaded yet, then wait until they are.

7368 if (!scopes.loaded) {

qml/Dash/GenericScopeView.qml+1−2

@@ -19,7 +19,6 @@ import Ubuntu.Components 1.1

1919import Utils 0.1

2020import Unity 0.2

2121import Dash 0.1

22−import Powerd 0.1

2322import "../Components"

2423import "../Components/ListItems" as ListItems

2524

@@ -105,7 +104,7 @@ FocusScope {

105104 Binding {

106105 target: scope

107106 property: "isActive"

108− value: isCurrent && !subPageLoader.open && (Powerd.status === Powerd.On)

107+ value: isCurrent && !subPageLoader.open && (Qt.application.state == Qt.ApplicationActive)

109108 }

110109

111110 UnitySortFilterProxyModel {

qml/Panel/Indicators/MenuItemFactory.qml+48−52

@@ -19,6 +19,7 @@

1919

2020import QtQuick 2.0

2121import Ubuntu.Settings.Menus 0.1 as Menus

22+import Ubuntu.Settings.Components 0.1

2223import QMenuModel 0.1

2324import Utils 0.1 as Utils

2425import Ubuntu.Components.ListItems 0.1 as ListItems

@@ -84,6 +85,7 @@ Item {

8485 id: sliderMenu;

8586

8687 Menus.SliderMenu {

88+ id: sliderItem

8789 objectName: "sliderMenu"

8890 property QtObject menuData: null

8991 property var menuModel: menuFactory.menuModel

@@ -113,15 +115,6 @@ Item {

113115 onMenuIndexChanged: {

114116 loadAttributes();

115117 }

116− onServerValueChanged: {

117− // value can be changed by slider, so a binding won't work.

118− if (serverValue !== undefined) {

119− value = serverValue;

120− }

121− }

122− onUpdated: {

123− menuModel.changeState(menuIndex, value);

124− }

125118

126119 function loadAttributes() {

127120 if (!menuModel || menuIndex == -1) return;

@@ -130,6 +123,20 @@ Item {

130123 'min-icon': 'icon',

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

132125 }

126+

127+ ServerPropertySynchroniser {

128+ objectName: "sync"

129+ syncTimeout: Utils.Constants.indicatorValueTimeout

130+ bufferedSyncTimeout: true

131+ maximumWaitBufferInterval: 16

132+

133+ serverTarget: sliderItem

134+ serverProperty: "serverValue"

135+ userTarget: sliderItem

136+ userProperty: "value"

137+

138+ onSyncTriggered: menuModel.changeState(menuIndex, value)

139+ }

133140 }

134141 }

135142

@@ -280,6 +287,7 @@ Item {

280287 id: checkableMenu;

281288

282289 Menus.CheckableMenu {

290+ id: checkItem

283291 objectName: "checkableMenu"

284292 property QtObject menuData: null

285293 property int menuIndex: -1

@@ -290,26 +298,16 @@ Item {

290298 checked: serverChecked

291299 highlightWhenPressed: false

292300

293− onServerCheckedChanged: updateFromServer()

294− onTriggered: {

295− menuModel.activate(menuIndex);

296− resyncTimer.restart();

297− }

301+ ServerPropertySynchroniser {

302+ objectName: "sync"

303+ syncTimeout: Utils.Constants.indicatorValueTimeout

298304

299− // value can be changed by menu, so a binding won't work.

300− function updateFromServer() {

301− resyncTimer.stop();

302− if (checked != serverChecked) {

303− checked = serverChecked;

304− }

305− }

305+ serverTarget: checkItem

306+ serverProperty: "serverChecked"

307+ userTarget: checkItem

308+ userProperty: "checked"

306309

307− // Server value is not guaranteed to change to what we expect from an activation.

308− // In this case, we need to re-assert that we are presenting the UI with the set backend value.

309− Timer {

310− id: resyncTimer

311− interval: 1500

312− onTriggered: updateFromServer()

310+ onSyncTriggered: menuModel.activate(checkItem.menuIndex)

313311 }

314312 }

315313 }

@@ -318,6 +316,7 @@ Item {

318316 id: switchMenu;

319317

320318 Menus.SwitchMenu {

319+ id: switchItem

321320 objectName: "switchMenu"

322321 property QtObject menuData: null

323322 property int menuIndex: -1

@@ -329,26 +328,16 @@ Item {

329328 checked: serverChecked

330329 highlightWhenPressed: false

331330

332− onServerCheckedChanged: updateFromServer()

333− onTriggered: {

334− menuModel.activate(menuIndex);

335− resyncTimer.restart();

336− }

331+ ServerPropertySynchroniser {

332+ objectName: "sync"

333+ syncTimeout: Utils.Constants.indicatorValueTimeout

337334

338− // value can be changed by menu, so a binding won't work.

339− function updateFromServer() {

340− resyncTimer.stop();

341− if (checked != serverChecked) {

342− checked = serverChecked;

343− }

344− }

335+ serverTarget: switchItem

336+ serverProperty: "serverChecked"

337+ userTarget: switchItem

338+ userProperty: "checked"

345339

346− // Server value is not guaranteed to change to what we expect from an activation.

347− // In this case, we need to re-assert that we are presenting the UI with the set backend value.

348− Timer {

349− id: resyncTimer

350− interval: 1500

351− onTriggered: updateFromServer()

340+ onSyncTriggered: menuModel.activate(switchItem.menuIndex);

352341 }

353342 }

354343 }

@@ -464,6 +453,7 @@ Item {

464453 id: accessPoint;

465454

466455 Menus.AccessPointMenu {

456+ id: apItem

467457 objectName: "accessPoint"

468458 property QtObject menuData: null

469459 property var menuModel: menuFactory.menuModel

@@ -485,19 +475,12 @@ Item {

485475 signalStrength: strengthAction.valid ? strengthAction.state : 0

486476 highlightWhenPressed: false

487477

488− onServerCheckedChanged: {

489− // value can be changed by menu, so a binding won't work.

490− active = serverChecked;

491− }

492478 onMenuModelChanged: {

493479 loadAttributes();

494480 }

495481 onMenuIndexChanged: {

496482 loadAttributes();

497483 }

498− onTriggered: {

499− menuModel.activate(menuIndex);

500− }

501484

502485 function loadAttributes() {

503486 if (!menuModel || menuIndex == -1) return;

@@ -505,6 +488,19 @@ Item {

505488 'x-canonical-wifi-ap-is-secure': 'bool',

506489 'x-canonical-wifi-ap-strength-action': 'string'});

507490 }

491+

492+ ServerPropertySynchroniser {

493+ objectName: "sync"

494+ syncTimeout: Utils.Constants.indicatorValueTimeout

495+

496+ serverTarget: apItem

497+ serverProperty: "serverChecked"

498+ userTarget: apItem

499+ userProperty: "active"

500+ userTrigger: "onTriggered"

501+

502+ onSyncTriggered: menuModel.activate(apItem.menuIndex)

503+ }

508504 }

509505 }

510506

qml/Panel/Indicators/client/IndicatorsList.qml+2−2

@@ -31,8 +31,8 @@ Page {

3131

3232 Indicators.IndicatorsModel {

3333 id: indicatorsModel

34−

35− Component.onCompleted: load(profile)

34+ profile: page.profile

35+ Component.onCompleted: load()

3636 }

3737

3838 ListView {

qml/Panel/IndicatorsMenu.qml+5−1

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

8888

8989 Handle {

9090 id: handle

91+ objectName: "handle"

9192 anchors {

9293 left: parent.left

9394 right: parent.right

@@ -163,7 +164,10 @@ Showable {

163164 }

164165

165166 MouseArea {

166− anchors.fill: __showDragHandle

167+ anchors.bottom: parent.bottom

168+ anchors.left: parent.left

169+ anchors.right: parent.right

170+ height: minimizedPanelHeight

167171 enabled: __showDragHandle.enabled

168172 onClicked: {

169173 bar.selectItemAt(mouseX)

qml/Panel/Panel.qml+1

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

187187

188188 QtObject {

189189 id: d

190+ objectName: "panelPriv"

190191 readonly property real indicatorHeight: indicators.minimizedPanelHeight + indicatorOrangeLine.height

191192 }

192193

qml/Shell.qml+28−18

@@ -79,6 +79,9 @@ Item {

7979 }

8080 }

8181

82+ // This is _only_ used to expose the property to autopilot tests

83+ readonly property string testShellMode: shellMode

84+

8285 function activateApplication(appId) {

8386 if (ApplicationManager.findApplication(appId)) {

8487 ApplicationManager.requestFocusApplication(appId);

@@ -183,7 +186,6 @@ Item {

183186 objectName: "stages"

184187 width: parent.width

185188 height: parent.height

186− visible: !ApplicationManager.empty

187189

188190 Connections {

189191 target: ApplicationManager

@@ -289,6 +291,31 @@ Item {

289291 value: physicalKeysMapper.altTabPressed

290292 }

291293 }

294+

295+ Tutorial {

296+ id: tutorial

297+ objectName: "tutorial"

298+ anchors.fill: parent

299+ active: AccountsService.demoEdges

300+ paused: LightDM.Greeter.active

301+ launcher: launcher

302+ panel: panel

303+ edgeSize: shell.edgeSize

304+

305+ // EdgeDragAreas don't work with mice. So to avoid trapping the user,

306+ // we'll tell the tutorial to avoid using them on the Desktop. The

307+ // Desktop doesn't use the same spread design anyway. The tutorial is

308+ // all a bit of a placeholder on non-phone form factors right now.

309+ // When the design team gives us more guidance, we can do something

310+ // more clever here.

311+ // TODO: use DeviceConfiguration instead of checking source

312+ useEdgeDragArea: applicationsDisplayLoader.source != Qt.resolvedUrl("Stages/DesktopStage.qml")

313+

314+ onFinished: {

315+ AccountsService.demoEdges = false;

316+ active = false; // for immediate response / if AS is having problems

317+ }

318+ }

292319 }

293320

294321 InputMethod {

@@ -586,23 +613,6 @@ Item {

586613 }

587614 }

588615

589− Tutorial {

590− id: tutorial

591− objectName: "tutorial"

592− active: AccountsService.demoEdges

593− paused: LightDM.Greeter.active

594− launcher: launcher

595− panel: panel

596− stages: stages

597− overlay: overlay

598− edgeSize: shell.edgeSize

599−

600− onFinished: {

601− AccountsService.demoEdges = false;

602− active = false; // for immediate response / if AS is having problems

603− }

604− }

605−

606616 Connections {

607617 target: SessionBroadcast

608618 onShowHome: showHome()

qml/Tutorial/Tutorial.qml+7−14

@@ -23,11 +23,10 @@ Item {

2323 property alias active: loader.active

2424 property bool paused

2525 property real edgeSize

26+ property bool useEdgeDragArea

2627

2728 property Item launcher

2829 property Item panel

29− property Item stages

30− property Item overlay

3130

3231 readonly property bool launcherEnabled: loader.item ? loader.item.launcherEnabled : true

3332 readonly property bool spreadEnabled: loader.item ? loader.item.spreadEnabled : true

@@ -62,26 +61,20 @@ Item {

6261

6362 Binding {

6463 target: loader.item

65− property: "launcher"

66− value: root.launcher

67− }

68−

69− Binding {

70− target: loader.item

71− property: "panel"

72− value: root.panel

64+ property: "useEdgeDragArea"

65+ value: root.useEdgeDragArea

7366 }

7467

7568 Binding {

7669 target: loader.item

77− property: "stages"

78− value: root.stages

70+ property: "launcher"

71+ value: root.launcher

7972 }

8073

8174 Binding {

8275 target: loader.item

83− property: "overlay"

84− value: root.overlay

76+ property: "panel"

77+ value: root.panel

8578 }

8679

8780 Connections {

qml/Tutorial/TutorialContent.qml+9−8

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

2222

2323 property Item launcher

2424 property Item panel

25− property Item stages

26− property Item overlay

2725

2826 readonly property bool launcherEnabled: !running ||

2927 (!paused && tutorialLeft.shown)

@@ -34,6 +32,7 @@ Item {

3432

3533 property bool paused: false

3634 property real edgeSize

35+ property bool useEdgeDragArea

3736

3837 signal finished()

3938

@@ -66,7 +65,6 @@ Item {

6665 TutorialLeft {

6766 id: tutorialLeft

6867 objectName: "tutorialLeft"

69− parent: root.stages

7068 anchors.fill: parent

7169 launcher: root.launcher

7270 paused: !shown || root.paused

@@ -77,21 +75,26 @@ Item {

7775 TutorialLeftFinish {

7876 id: tutorialLeftFinish

7977 objectName: "tutorialLeftFinish"

80− parent: root.stages

8178 anchors.fill: parent

8279 textXOffset: root.launcher.panelWidth

8380 paused: !shown || root.paused

81+ text: root.useEdgeDragArea ? i18n.tr("Tap here to continue.") : i18n.tr("Click here to finish.")

8482

8583 onFinished: {

8684 root.launcher.hide();

87− tutorialRight.show();

85+ if (root.useEdgeDragArea) {

86+ tutorialRight.show();

87+ } else {

88+ // Last two screens use EdgeDragArea (right edge spread and

89+ // bottom edge). So just end tutorial here.

90+ root.finish();

91+ }

8892 }

8993 }

9094

9195 TutorialRight {

9296 id: tutorialRight

9397 objectName: "tutorialRight"

94− parent: root.stages

9598 anchors.fill: parent

9699 edgeSize: root.edgeSize

97100 panel: root.panel

@@ -103,7 +106,6 @@ Item {

103106 TutorialBottom {

104107 id: tutorialBottom

105108 objectName: "tutorialBottom"

106− parent: root.stages

107109 anchors.fill: parent

108110 edgeSize: root.edgeSize

109111 paused: !shown || root.paused

@@ -114,7 +116,6 @@ Item {

114116 TutorialBottomFinish {

115117 id: tutorialBottomFinish

116118 objectName: "tutorialBottomFinish"

117− parent: root.stages

118119 anchors.fill: parent

119120 backgroundFadesOut: true

120121 paused: !shown || root.paused

run.sh+1−1

@@ -65,6 +65,6 @@ else

6565 echo "Unity8 is already running, please stop it first"

6666 exit 1

6767 fi

68− /sbin/initctl start unity8 BINARY="`readlink -f $QML_PHONE_SHELL_PATH` $QML_PHONE_SHELL_ARGS $@" QML2_IMPORT_PATH=$QML2_IMPORT_PATH LD_LIBRARY_PATH=$LD_LIBRARY_PATH

68+ /sbin/initctl start unity8 BINARY="`readlink -f $QML_PHONE_SHELL_PATH` $QML_PHONE_SHELL_ARGS $@" XDG_DATA_DIRS=$XDG_DATA_DIRS QML2_IMPORT_PATH=$QML2_IMPORT_PATH LD_LIBRARY_PATH=$LD_LIBRARY_PATH

6969 tailf -n 0 ~/.cache/upstart/unity8.log

7070fi

src/Panel/Indicators/client/CMakeLists.txt−2

@@ -1,5 +1,4 @@

11project(indicators_client)

2−set(INDICATORS_CLIENT_APP indicators-client)

43set(INDICATORS_CLIENT_SRC

54 main.cpp

@@ -15,7 +14,6 @@ add_executable(${INDICATORS_CLIENT_APP}

1514)

1615

1716qt5_use_modules(${INDICATORS_CLIENT_APP} Core Widgets Quick)

18−set_target_properties(${INDICATORS_CLIENT_APP} PROPERTIES COMPILE_FLAGS -fPIC)

1917

2018install(TARGETS ${INDICATORS_CLIENT_APP}

2119 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

src/main.cpp+26

@@ -70,6 +70,11 @@ int main(int argc, const char *argv[])

7070Load the testability driver");

7171 parser.addOption(testabilityOption);

7272

73+ QCommandLineOption modeOption("mode",

74+ "Whether to run greeter and/or shell [full-greeter, full-shell, greeter, shell]",

75+ "mode", "full-greeter");

76+ parser.addOption(modeOption);

77+

7378 application = new QGuiApplication(argc, (char**)argv);

7479

7580 // Treat args with single dashes the same as arguments with two dashes

@@ -90,6 +95,26 @@ Load the testability driver");

9095 qmlArgs.setSize(geom.at(0).toInt(), geom.at(1).toInt());

9196 }

9297

98+ // If an invalid option was specified, set it to the default

99+ // If no default was provided in the QCommandLineOption constructor, abort.

100+ QString shellMode;

101+ if(!parser.isSet(modeOption) ||

102+ (parser.value(modeOption) != "full-greeter" &&

103+ parser.value(modeOption) != "full-shell" &&

104+ parser.value(modeOption) != "greeter" &&

105+ parser.value(modeOption) != "shell"))

106+ {

107+ if (modeOption.defaultValues().first() != nullptr) {

108+ shellMode = modeOption.defaultValues().first();

109+ qWarning() << "Mode argument was not provided or was set to an illegal value. Using default value of --mode=" << shellMode;

110+ } else {

111+ qFatal("Shell mode argument was not provided and there is no default mode,");

112+ }

113+

114+ } else {

115+ shellMode = parser.value(modeOption);

116+ }

117+

93118 // The testability driver is only loaded by QApplication but not by QGuiApplication.

94119 // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.

95120 if (parser.isSet(testabilityOption) || getenv("QT_LOAD_TESTABILITY")) {

@@ -117,6 +142,7 @@ Load the testability driver");

117142 view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));

118143 view->rootContext()->setContextProperty("applicationArguments", &qmlArgs);

119144 view->rootContext()->setContextProperty("indicatorProfile", indicatorProfile);

145+ view->rootContext()->setContextProperty("shellMode", shellMode);

120146 if (parser.isSet(framelessOption)) {

121147 view->setFlags(Qt::FramelessWindowHint);

122148 }

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+2−4

@@ -91,10 +91,9 @@ class ApplicationLifecycleTests(tests.ApplicationLifeCycleTestCase):

9191 def test_greeter_hides_on_app_open(self):

9292 """Greeter should hide when an app is opened"""

9393 process_helpers.lock_unity()

94− greeter = self.main_window.get_greeter()

95− self.assertThat(greeter.created, Eventually(Equals(True)))

9694

9795 application_name = self.launch_fake_app()

96+ greeter = self.main_window.get_greeter()

9897 greeter.wait_swiped_away()

9998 process_helpers.unlock_unity()

10099 self.assert_current_focused_application(application_name)

@@ -108,10 +107,9 @@ class ApplicationLifecycleTests(tests.ApplicationLifeCycleTestCase):

108107 self.assert_current_focused_application('unity8-dash')

109108

110109 process_helpers.lock_unity()

111− greeter = self.main_window.get_greeter()

112− self.assertThat(greeter.created, Eventually(Equals(True)))

113110

114111 self.launch_upstart_application(application_name)

112+ greeter = self.main_window.get_greeter()

115113 greeter.wait_swiped_away()

116114 process_helpers.unlock_unity()

117115 self.assert_current_focused_application(application_name)

tests/autopilot/unity8/fixture_setup.py+46−1

@@ -19,12 +19,17 @@

1919

2020import fixtures

2121import subprocess

22+import logging

2223

2324from autopilot import introspection

2425

25−from unity8 import process_helpers

26+from unity8 import (

27+ get_binary_path,

28+ process_helpers

29+)

2630from unity8.shell import emulators

2731

32+logger = logging.getLogger(__name__)

2833

2934class LaunchDashApp(fixtures.Fixture):

3035

@@ -96,3 +101,43 @@ class DisplayRotationLock(fixtures.Fixture):

96101 'rotation-lock', value_string

97102 ]

98103 subprocess.check_output(command)

104+

105+class LaunchMockIndicatorService(fixtures.Fixture):

106+

107+ """Fixture to launch the indicator test service."""

108+

109+ def __init__(self, action_delay, ensure_not_running=True):

110+ """Initialize an instance.

111+

112+ :param action_delay: The delay to use when activating actions.

113+ Measured in milliseconds. Value of -1 will result in infinite delay.

114+ :type action_delay: An integer.

115+ :param boolean ensure_not_running: Make sure service is not running

116+

117+ """

118+ super(LaunchMockIndicatorService, self).__init__()

119+ self.action_delay = action_delay

120+ self.ensure_not_running = ensure_not_running

121+

122+ def setUp(self):

123+ super(LaunchMockIndicatorService, self).setUp()

124+ if self.ensure_not_running:

125+ self.ensure_service_not_running()

126+ self.addCleanup(self.stop_service)

127+ self.application_proxy = self.launch_service()

128+

129+ def launch_service(self):

130+ logger.info("Starting unity-mock-indicator-service")

131+ binary_path = get_binary_path('unity-mock-indicator-service')

132+ binary_arg = 'BINARY={}'.format(binary_path)

133+ env_args = 'ARGS=-t {}'.format(self.action_delay)

134+ all_args = [binary_arg, env_args]

135+ process_helpers.start_job('unity-mock-indicator-service', *all_args)

136+

137+ def stop_service(self):

138+ logger.info("Stopping unity-mock-indicator-service")

139+ process_helpers.stop_job('unity-mock-indicator-service')

140+

141+ def ensure_service_not_running(self):

142+ if process_helpers.is_job_running('unity-mock-indicator-service'):

143+ self.stop_service()

tests/autopilot/unity8/greeter/__init__.pynew file

No changes to the content.

tests/autopilot/unity8/greeter/tests/__init__.pynew file+26

@@ -0,0 +1,26 @@

1+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

2+#

3+# Unity Autopilot Test Suite

5+#

6+# This program is free software: you can redistribute it and/or modify

7+# it under the terms of the GNU General Public License as published by

8+# the Free Software Foundation, either version 3 of the License, or

9+# (at your option) any later version.

10+#

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

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

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

14+# GNU General Public License for more details.

15+#

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

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

18+#

19+

20+from unity8.shell.emulators import main_window as main_window_emulator

21+from unity8.shell.tests import UnityTestCase

22+

23+class GreeterTestCase(UnityTestCase):

24+ def get_shell(self, unity_proxy):

25+ main_window = unity_proxy.select_single(main_window_emulator.QQuickView)

26+ return main_window.select_single('Shell')

tests/autopilot/unity8/greeter/tests/test_args.pynew file+52

@@ -0,0 +1,52 @@

1+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

2+#

3+# Unity Autopilot Test Suite

5+#

6+# This program is free software: you can redistribute it and/or modify

7+# it under the terms of the GNU General Public License as published by

8+# the Free Software Foundation, either version 3 of the License, or

9+# (at your option) any later version.

10+#

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

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

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

14+# GNU General Public License for more details.

15+#

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

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

18+#

19+

20+from unity8.greeter.tests import GreeterTestCase

21+

22+class GreeterArgsTest(GreeterTestCase):

23+

24+ DEFAULT_SHELL_MODE = 'full-greeter'

25+ NONEXISTENT_MODE = 'non-existent-mode'

26+

27+ def test_full_greeter_mode(self):

28+ unity_proxy = self.launch_unity(mode='full-greeter')

29+ shell = self.get_shell(unity_proxy)

30+ self.assertTrue(shell.testShellMode == 'full-greeter')

31+

32+ def test_full_shell_mode(self):

33+ unity_proxy = self.launch_unity(mode='full-shell')

34+ shell = self.get_shell(unity_proxy)

35+ self.assertTrue(shell.testShellMode == 'full-shell')

36+

37+ def test_greeter_mode(self):

38+ unity_proxy = self.launch_unity(mode='greeter')

39+ shell = self.get_shell(unity_proxy)

40+ self.assertTrue(shell.testShellMode == 'greeter')

41+

42+ def test_nonexistent_mode(self):

43+ unity_proxy = self.launch_unity(mode=self.NONEXISTENT_MODE)

44+ shell = self.get_shell(unity_proxy)

45+ self.assertTrue(shell.testShellMode == self.DEFAULT_SHELL_MODE,

46+ "Shell mode was {} but should have been {}".format(

47+ shell.testShellMode, self.DEFAULT_SHELL_MODE))

48+

49+ def test_shell_mode(self):

50+ unity_proxy = self.launch_unity(mode='shell')

51+ shell = self.get_shell(unity_proxy)

52+ self.assertTrue(shell.testShellMode == 'shell')

tests/autopilot/unity8/indicators/__init__.py+89−10

@@ -19,6 +19,7 @@ import ubuntuuitoolkit

1919from autopilot import introspection

2020

2121from unity8.shell import emulators

22+from unity8 import fixture_setup

2223

2324

2425class IndicatorPage(emulators.UnityEmulatorBase):

@@ -33,26 +34,25 @@ class IndicatorPage(emulators.UnityEmulatorBase):

3334 def validate_dbus_object(cls, path, state):

3435 return False

3536

37+class Indicator():

3638

37−class DisplayIndicator():

38−

39− def __init__(self, main_window):

39+ def __init__(self, main_window, name):

4040 self._main_window = main_window

41+ self._name = name

4142

4243 def is_indicator_icon_visible(self):

4344 panel_item = self._main_window.wait_select_single(

44− objectName='indicator-rotation-lock-panelItem')

45+ objectName=self._name+'-panelItem')

4546 return panel_item.indicatorVisible

4647

4748 def open(self):

48− """Open the display indicator page.

49+ """Open the indicator page.

4950

50− :return: The custom proxy object for the display indicator page.

51+ :return: The custom proxy object for the indicator page.

5152

5253 """

5354 if self.is_indicator_icon_visible():

54− return self._main_window.open_indicator_page(

55− 'indicator-rotation-lock')

55+ return self._main_window.open_indicator_page(self._name)

5656 else:

5757 return self._open_indicator_with_icon_not_visible()

5858

@@ -61,10 +61,10 @@ class DisplayIndicator():

6161 self._main_window.open_indicator_page('indicator-datetime')

6262 self._make_indicator_icon_visible()

6363 indicator_rotation_icon = self._main_window.select_single(

64− objectName='indicator-rotation-lock-panelItem')

64+ objectName=self._name+'-panelItem')

6565 self._main_window.pointing_device.click_object(indicator_rotation_icon)

6666 return self._main_window.wait_select_single(

67− objectName='indicator-rotation-lock-page')

67+ objectName=self._name+'-page')

6868

6969 def _make_indicator_icon_visible(self):

7070 indicators_bar_flickable = self._main_window.select_single(

@@ -95,6 +95,13 @@ class DisplayIndicator():

9595 self._main_window.close_indicator_page()

9696

9797

98+class DisplayIndicator(Indicator):

99+

100+ def __init__(self, main_window):

101+ super(DisplayIndicator, self).__init__(main_window, 'indicator-rotation-lock')

102+ self._main_window = main_window

103+

104+

98105class DisplayIndicatorPage(IndicatorPage):

99106

100107 """Autopilot helper for the display indicator page."""

@@ -122,3 +129,75 @@ class DisplayIndicatorPage(IndicatorPage):

122129 switcher = self._get_switcher()

123130 switcher.uncheck()

124131 switcher.checked.wait_for(False)

132+

133+

134+class TestIndicator(Indicator):

135+

136+ def __init__(self, main_window):

137+ super(TestIndicator, self).__init__(main_window, 'indicator-mock')

138+ self._main_window = main_window

139+

140+

141+class TestIndicatorPage(IndicatorPage):

142+

143+ """Autopilot helper for the mock indicator page."""

144+

145+ @classmethod

146+ def validate_dbus_object(cls, path, state):

147+ name = introspection.get_classname_from_path(path)

148+ if name == b'IndicatorPage':

149+ if state['objectName'][1] == 'indicator-mock-page':

150+ return True

151+ return False

152+

153+ def get_switcher(self):

154+ return self.select_single(

155+ ubuntuuitoolkit.CheckBox, objectName='switcher')

156+

157+ def get_switch_menu(self):

158+ return self.select_single(

159+ 'SwitchMenu', objectName='indicator.action.switch')

160+

161+ def get_slider(self):

162+ return self.select_single(objectName='slider')

163+

164+ def get_slider_menu(self):

165+ return self.select_single(objectName='indicator.action.slider')

166+

167+

168+class Slider(emulators.UnityEmulatorBase):

169+

170+ """Autopilot helper for the Slider component."""

171+

172+ # XXX Because of https://bugs.launchpad.net/autopilot-qt/+bug/1341671

173+ # we need to make sure it does not match in any selection.

174+ # --elopio - 2015-01-20

175+

176+ @classmethod

177+ def validate_dbus_object(cls, path, state):

178+ name = introspection.get_classname_from_path(path)

179+ if name == b'Slider':

180+ return True

181+ return False

182+

183+ def slide_left(self, timeout=10):

184+ x, y, width, height = self.globalRect

185+

186+ rate = 5

187+ start_x = x + width/2

188+ start_y = stop_y = y + height/2

189+ stop_x = x

190+

191+ self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate)

192+ self.value.wait_for(self.minimumValue, timeout);

193+

194+ def slide_right(self, timeout=10):

195+ x, y, width, height = self.globalRect

196+

197+ rate = 5

198+ start_x = x + width/2

199+ start_y = stop_y = y + height/2

200+ stop_x = x + width

201+

202+ self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate)

203+ self.value.wait_for(self.maximumValue, timeout);

tests/autopilot/unity8/indicators/tests/__init__.py+7

@@ -26,6 +26,13 @@ class IndicatorTestCase(tests.UnityTestCase):

2626

2727 device_emulation_scenarios = tests._get_device_emulation_scenarios()

2828

29+ def setUp(self):

30+ super().setUp()

31+ self.unity_proxy = self.launch_unity()

32+ process_helpers.unlock_unity(self.unity_proxy)

33+

34+class DeviceIndicatorTestCase(IndicatorTestCase):

35+

2936 def setUp(self):

3037 if platform.model() == 'Desktop':

3138 self.skipTest('Test cannot be run on the desktop.')

tests/autopilot/unity8/indicators/tests/test_action_latency.pynew file+232

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

1+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

2+#

3+# Unity Indicators Autopilot Test Suite

5+#

6+# This program is free software: you can redistribute it and/or modify

7+# it under the terms of the GNU General Public License as published by

8+# the Free Software Foundation, either version 3 of the License, or

9+# (at your option) any later version.

10+#

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

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

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

14+# GNU General Public License for more details.

15+#

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

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

18+

19+from testscenarios import multiply_scenarios

20+

21+from unity8 import (

22+ fixture_setup,

23+ indicators,

24+ process_helpers

25+)

26+from unity8.shell import tests

27+from unity8.indicators import tests

28+

29+from autopilot.matchers import Eventually

30+from testtools.matchers import Equals, NotEquals

31+import time

32+

33+

34+class TestIndicatorBaseTestCase(tests.IndicatorTestCase):

35+

36+ scenarios = [ tests.IndicatorTestCase.device_emulation_scenarios[0] ]

37+

38+ def setUp(self):

39+ super(TestIndicatorBaseTestCase, self).setUp()

40+

41+ self.launch_indicator_service()

42+

43+ # wait for the indicator to appear in unity

44+ self.indicator = indicators.TestIndicator(self.main_window)

45+ self.assertThat(

46+ self.indicator.is_indicator_icon_visible(),

47+ Eventually(Equals(True), timeout=20)

48+ )

49+ self.indicator_page = self.indicator.open()

50+

51+ def launch_indicator_service(self):

52+ launch_service_fixture = fixture_setup.LaunchMockIndicatorService(self.action_delay)

53+ self.useFixture(launch_service_fixture)

54+

55+

56+class TestServerValueUpdate(TestIndicatorBaseTestCase):

57+

58+ """Test that an action causes the server to update"""

59+

60+ time_scenarios = [

61+ ('Low', {'action_delay': 0}),

62+ ('Medium', {'action_delay': 2500}),

63+ ('High', {'action_delay': 8000}),

64+ ]

65+ scenarios = multiply_scenarios(

66+ time_scenarios,

67+ TestIndicatorBaseTestCase.scenarios

68+ )

69+

70+ def test_switch_reaches_server_value(self):

71+ switch = self.indicator_page.get_switcher()

72+ switch_menu = self.indicator_page.get_switch_menu()

73+

74+ switch.change_state()

75+

76+ self.assertThat(

77+ switch_menu.serverChecked,

78+ Eventually(Equals(switch.checked), timeout=20)

79+ )

80+

81+ def test_slider_reaches_server_value(self):

82+ slider = self.indicator_page.get_slider()

83+ slider_menu = self.indicator_page.get_slider_menu()

84+

85+ old_value = slider.value

86+ slider.slide_left()

87+

88+ self.assertThat(

89+ slider_menu.serverValue,

90+ Eventually(NotEquals(old_value), timeout=20)

91+ )

92+

93+ self.assertThat(

94+ slider_menu.serverValue,

95+ Eventually(Equals(slider.value), timeout=20)

96+ )

97+

98+class TestBuffering(TestIndicatorBaseTestCase):

99+

100+ """Test that switching multiple times will buffer activations

101+

102+ See https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1390136 .

103+ """

104+ action_delay = 2500

105+

106+ def test_switch_buffers_actvations(self):

107+

108+ switch = self.indicator_page.get_switcher()

109+ switch.change_state()

110+ intermediate_value = switch.checked;

111+

112+ # will buffer change until it receives the change from server

113+ switch.change_state()

114+ final_value = switch.checked;

115+

116+ # backend will respond to first switch.

117+ switch_menu = self.indicator_page.get_switch_menu()

118+ self.assertThat(

119+ switch_menu.serverChecked,

120+ Eventually(Equals(intermediate_value), timeout=20)

121+ )

122+ # The buffered activation should have gone to server now.

123+

124+ # front-end should not change as a result of server update while it is buffered

125+ self.assertThat(

126+ switch.checked,

127+ Equals(final_value)

128+ )

129+

130+ # server will respond to the second activate

131+ self.assertThat(

132+ switch_menu.serverChecked,

133+ Eventually(Equals(final_value), timeout=20)

134+ )

135+

136+ # make sure we've got the server value set.

137+ self.assertThat(

138+ switch.checked,

139+ Equals(switch_menu.serverChecked)

140+ )

141+

142+ def test_slider_buffers_activations(self):

143+

144+ slider = self.indicator_page.get_slider()

145+ original_value = slider.value;

146+ slider.slide_left()

147+

148+ # will buffer change until it receives the change from server

149+ slider.slide_right()

150+ final_value = slider.value;

151+

152+ # backend will respond to first slider. Since it's a live slider it'll probably

153+ # be a random value along the slide.

154+ slider_menu = self.indicator_page.get_slider_menu()

155+ self.assertThat(

156+ slider_menu.serverValue,

157+ Eventually(NotEquals(original_value), timeout=20)

158+ )

159+ # It wont yet have reached the final value due to the buffering

160+ # Second activate should have gone out by now

161+ self.assertThat(

162+ slider_menu.serverValue,

163+ NotEquals(final_value)

164+ )

165+

166+ # front-end should not change as a result of server update while it is buffered

167+ self.assertThat(

168+ slider.value,

169+ Equals(final_value)

170+ )

171+

172+ # server will respond to the second activate

173+ self.assertThat(

174+ slider_menu.serverValue,

175+ Eventually(Equals(final_value), timeout=20)

176+ )

177+

178+ # make sure we've got the server value set.

179+ self.assertThat(

180+ slider.value,

181+ Equals(slider_menu.serverValue)

182+ )

183+

184+

185+class TestClientRevertsToServerValue(TestIndicatorBaseTestCase):

186+

187+ """Test that an action which does not respond in time will revert

188+ to original value if not actioned in time.

189+

190+ See https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1390136 .

191+ """

192+ action_delay = -1 # never action.

193+

194+ def test_switch_reverts_on_late_response(self):

195+

196+ switch = self.indicator_page.get_switcher()

197+ switch_menu = self.indicator_page.get_switch_menu()

198+

199+ original_value = switch.checked;

200+ switch.change_state()

201+

202+ # switch should revert to original value after 5 seconds (30 seconds in real usage)

203+ self.assertThat(

204+ switch.checked,

205+ Eventually(Equals(original_value), timeout=20)

206+ )

207+

208+ # make sure we've got the server value set.

209+ self.assertThat(

210+ switch.checked,

211+ Equals(switch_menu.serverChecked)

212+ )

213+

214+ def test_slider_reverts_on_late_response(self):

215+

216+ slider = self.indicator_page.get_slider()

217+ slider_menu = self.indicator_page.get_slider_menu()

218+

219+ original_value = slider.value;

220+ slider.slide_left()

221+

222+ # slider should revert to original value after 5 seconds (30 seconds in real usage)

223+ self.assertThat(

224+ slider.value,

225+ Eventually(Equals(original_value), timeout=20)

226+ )

227+

228+ # make sure we've got the server value set.

229+ self.assertThat(

230+ slider.value,

231+ Equals(slider_menu.serverValue)

232+ )

tests/autopilot/unity8/indicators/tests/test_display_indicator.py+3−1

@@ -23,7 +23,9 @@ from unity8 import (

2323from unity8.indicators import tests

2424

2525

26−class DisplayIndicatorTestCase(tests.IndicatorTestCase):

26+class DisplayIndicatorTestCase(tests.DeviceIndicatorTestCase):

27+

28+ scenarios = tests.IndicatorTestCase.device_emulation_scenarios

2729

2830 def test_indicator_icon_must_be_visible_after_rotation_locked(self):

2931 rotation_unlocked = fixture_setup.DisplayRotationLock(False)

tests/autopilot/unity8/indicators/tests/test_indicators.py+2−2

@@ -23,7 +23,7 @@ from autopilot import platform

2323from unity8.indicators import tests

2424

2525

26−class IndicatorExistsTestCase(tests.IndicatorTestCase):

26+class IndicatorExistsTestCase(tests.DeviceIndicatorTestCase):

2727

2828 indicator_scenarios = [

2929 ('Bluetooth', dict(indicator_name='indicator-bluetooth')),

@@ -51,7 +51,7 @@ class IndicatorExistsTestCase(tests.IndicatorTestCase):

5151 )

5252

5353

54−class IndicatorPageTitleMatchesWidgetTestCase(tests.IndicatorTestCase):

54+class IndicatorPageTitleMatchesWidgetTestCase(tests.DeviceIndicatorTestCase):

5555

5656 indicator_scenarios = [

5757 ('Bluetooth', dict(indicator_name='indicator-bluetooth',

tests/autopilot/unity8/process_helpers.py+47−14

@@ -89,20 +89,53 @@ def unlock_unity(unity_proxy_obj=None):

8989

9090

9191def lock_unity(unity_proxy_obj=None):

92− """Helper function that attempts to lock the unity greeter."""

93− import evdev

94− import time

95− uinput = evdev.UInput(name='unity8-autopilot-power-button',

96− devnode='/dev/autopilot-uinput')

97− # One press and release to turn screen off (locking unity)

98− uinput.write(evdev.ecodes.EV_KEY, evdev.ecodes.KEY_POWER, 1)

99− uinput.write(evdev.ecodes.EV_KEY, evdev.ecodes.KEY_POWER, 0)

100− uinput.syn()

101− time.sleep(1)

102− # And another press and release to turn screen back on

103− uinput.write(evdev.ecodes.EV_KEY, evdev.ecodes.KEY_POWER, 1)

104− uinput.write(evdev.ecodes.EV_KEY, evdev.ecodes.KEY_POWER, 0)

105− uinput.syn()

92+ """Helper function that attempts to lock unity greeter.

93+

94+ If unity_proxy_object is None create a proxy object by querying for the

95+ running unity process.

96+ Otherwise re-use the passed proxy object.

97+

98+ :raises RuntimeError: if the greeter attempts and fails to be locked.

99+

100+ :raises RuntimeWarning: when the greeter is found because it is

101+ already locked.

102+ :raises CannotAccessUnity: if unity is not introspectable or cannot be

103+ found on dbus.

104+ :raises CannotAccessUnity: if unity's upstart status is not "start" or the

105+ upstart job cannot be found at all.

106+

107+ """

108+ if unity_proxy_obj is None:

109+ try:

110+ pid = _get_unity_pid()

111+ unity = _get_unity_proxy_object(pid)

112+ main_window = unity.select_single(main_window_emulator.QQuickView)

113+ except ProcessSearchError as e:

114+ raise CannotAccessUnity(

115+ "Cannot introspect unity, make sure that it has been started "

116+ "with testability. Perhaps use the function "

117+ "'restart_unity_with_testability' this module provides."

118+ "(%s)"

119+ % str(e)

120+ )

121+ else:

122+ main_window = unity_proxy_obj.select_single(

123+ main_window_emulator.QQuickView)

124+

125+ greeter = main_window.get_greeter()

126+ if greeter.created is True:

127+ raise RuntimeWarning("Greeter appears to be already locked.")

128+

129+ bus = dbus.SessionBus()

130+ dbus_proxy = bus.get_object("com.canonical.UnityGreeter", "/")

131+ try:

132+ dbus_proxy.ShowGreeter()

133+ except dbus.DBusException:

134+ logger.info("Failed to lock greeter")

135+ raise

136+ else:

137+ greeter.created.wait_for(True)

138+ logger.info("Greeter locked, continuing.")

106139

107140

108141def restart_unity_with_testability(*args):

tests/autopilot/unity8/shell/tests/__init__.py+13−4

@@ -65,7 +65,6 @@ UNITYSHELL_GSETTINGS_PATH = "/org/compiz/profiles/unity/plugins/unityshell/"

6565UNITYSHELL_LAUNCHER_KEY = "launcher-hide-mode"

6666UNITYSHELL_LAUNCHER_MODE = 1 # launcher hidden

6767

68−

6968def _get_device_emulation_scenarios(devices='All'):

7069 nexus4 = ('Desktop Nexus 4',

7170 dict(app_width=768, app_height=1280, grid_unit_px=18))

@@ -253,8 +252,14 @@ class UnityTestCase(AutopilotTestCase):

253252 "%s=%s" % (key, value)

254253 ], stderr=subprocess.STDOUT)

255254

256− def launch_unity(self, **kwargs):

257− """Launch the unity shell, return a proxy object for it."""

255+ def launch_unity(self, mode="full-greeter", *args):

256+ """

257+ Launch the unity shell, return a proxy object for it.

258+

259+ :param str mode: The type of greeter/shell mode to use

260+ :param args: A list of aguments to pass to unity8

261+

262+ """

258263 binary_path = get_binary_path()

259264 lib_path = get_lib_path()

260265

@@ -289,9 +294,13 @@ class UnityTestCase(AutopilotTestCase):

289294 except OSError:

290295 pass

291296

297+ unity8_cli_args_list = ["--mode={}".format(mode)]

298+ if len(args) != 0:

299+ unity8_cli_args_list += args

300+

292301 app_proxy = self._launch_unity_with_upstart(

293302 binary_path,

294− self.unity_geometry_args,

303+ self.unity_geometry_args + unity8_cli_args_list

295304 )

296305

297306 self._set_proxy(app_proxy)

tests/autopilot/unity8/shell/tests/test_lock_screen.py+1−1

@@ -135,7 +135,7 @@ class TestLockscreen(UnityTestCase):

135135 :raises: TypeError if passphrase is not a string.

136136

137137 """

138− if not isinstance(passphrase, basestring):

138+ if not isinstance(passphrase, str):

139139 raise TypeError(

140140 "'passphrase' parameter must be a string, not %r."

141141 % type(passphrase)

tests/mocks/CMakeLists.txt+1

@@ -30,6 +30,7 @@ endmacro()

3030

3131add_subdirectory(AccountsService)

3232add_subdirectory(GSettings.1.0)

33+add_subdirectory(indicator-service)

3334add_subdirectory(libusermetrics)

3435add_subdirectory(LightDM)

3536add_subdirectory(Lights)

tests/mocks/GSettings.1.0/fake_gsettings.cpp+47−48

@@ -17,11 +17,12 @@

1717#include "fake_gsettings.h"

1818

1919#include <QList>

20−#include <QDebug>

2120

2221GSettingsControllerQml* GSettingsControllerQml::s_controllerInstance = 0;

2322

24−GSettingsControllerQml::GSettingsControllerQml() {

23+GSettingsControllerQml::GSettingsControllerQml()

24+ : m_usageMode("Staged")

25+{

2526}

2627

2728GSettingsControllerQml::~GSettingsControllerQml() {

@@ -35,50 +36,32 @@ GSettingsControllerQml* GSettingsControllerQml::instance() {

3536 return s_controllerInstance;

3637}

3738

38−void GSettingsControllerQml::registerSettingsObject(GSettingsQml *obj) {

39− m_registeredGSettings.append(obj);

40−}

41−

42−void GSettingsControllerQml::unRegisterSettingsObject(GSettingsQml *obj) {

43− m_registeredGSettings.removeOne(obj);

39+QString GSettingsControllerQml::pictureUri() const

40+{

41+ return m_pictureUri;

4442}

4543

46−void GSettingsControllerQml::setPictureUri(const QByteArray &schemaId, const QString &str)

44+void GSettingsControllerQml::setPictureUri(const QString &str)

4745{

48− if (m_pictureUri[schemaId] != str) {

49− m_pictureUri[schemaId] = str;

50−

51− Q_FOREACH (GSettingsQml *obj, m_registeredGSettings) {

52− if (obj->schema()->id() == schemaId) {

53− Q_EMIT obj->pictureUriChanged(str);

54− }

55− }

46+ if (str != m_pictureUri) {

47+ m_pictureUri = str;

48+ Q_EMIT pictureUriChanged(m_pictureUri);

5649 }

5750}

5851

59−QString GSettingsControllerQml::pictureUri(const QByteArray &schemaId) const

52+QString GSettingsControllerQml::usageMode() const

6053{

61− return m_pictureUri.value(schemaId, "");

54+ return m_usageMode;

6255}

6356

64−void GSettingsControllerQml::setUsageMode(const QByteArray &schemaId, const QString &str)

57+void GSettingsControllerQml::setUsageMode(const QString &usageMode)

6558{

66− if (m_usageMode[schemaId] != str) {

67− m_usageMode[schemaId] = str;

68−

69− Q_FOREACH (GSettingsQml *obj, m_registeredGSettings) {

70− if (obj->schema()->id() == schemaId) {

71− Q_EMIT obj->usageModeChanged(str);

72− }

73− }

59+ if (usageMode != m_usageMode) {

60+ m_usageMode = usageMode;

61+ Q_EMIT usageModeChanged(m_usageMode);

7462 }

7563}

7664

77−QString GSettingsControllerQml::usageMode(const QByteArray &schemaId) const

78−{

79− return m_usageMode.value(schemaId, "phone");

80−}

81−

8265GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {

8366}

8467

@@ -93,7 +76,6 @@ void GSettingsSchemaQml::setId(const QByteArray &id) {

9376 }

9477

9578 m_id = id;

96− Q_EMIT idChanged(id);

9779}

9880

9981QByteArray GSettingsSchemaQml::path() const {

@@ -109,31 +91,48 @@ void GSettingsSchemaQml::setPath(const QByteArray &path) {

10991 m_path = path;

11092}

11193

112−GSettingsQml::GSettingsQml(QObject *parent): QObject(parent) {

94+GSettingsQml::GSettingsQml(QObject *parent)

95+ : QObject(parent)

96+{

11397 m_schema = new GSettingsSchemaQml(this);

114− GSettingsControllerQml::instance()->registerSettingsObject(this);

115−}

116−

117−GSettingsQml::~GSettingsQml() {

118− GSettingsControllerQml::instance()->unRegisterSettingsObject(this);

98+ connect(GSettingsControllerQml::instance(), SIGNAL(pictureUriChanged(const QString &)),

99+ this, SIGNAL(pictureUriChanged(const QString &)));

100+ connect(GSettingsControllerQml::instance(), SIGNAL(usageModeChanged(const QString &)),

101+ this, SIGNAL(usageModeChanged(const QString &)));

119102}

120103

121104GSettingsSchemaQml * GSettingsQml::schema() const {

122105 return m_schema;

123106}

124107

125−void GSettingsQml::setPictureUri(const QString &str) {

126− GSettingsControllerQml::instance()->setPictureUri(m_schema->id(), str);

108+QString GSettingsQml::pictureUri() const

109+{

110+ if (m_schema->id() == "org.gnome.desktop.background") {

111+ return GSettingsControllerQml::instance()->pictureUri();

112+ } else {

113+ return "";

114+ }

127115}

128116

129−QString GSettingsQml::pictureUri() const {

130− return GSettingsControllerQml::instance()->pictureUri(m_schema->id());

117+void GSettingsQml::setPictureUri(const QString &str)

118+{

119+ if (m_schema->id() == "org.gnome.desktop.background") {

120+ GSettingsControllerQml::instance()->setPictureUri(str);

121+ }

131122}

132123

133−void GSettingsQml::setUsageMode(const QString &str) {

134− GSettingsControllerQml::instance()->setUsageMode(m_schema->id(), str);

124+QString GSettingsQml::usageMode() const

125+{

126+ if (m_schema->id() == "com.canonical.Unity8") {

127+ return GSettingsControllerQml::instance()->usageMode();

128+ } else {

129+ return "";

130+ }

135131}

136132

137−QString GSettingsQml::usageMode() const {

138− return GSettingsControllerQml::instance()->usageMode(m_schema->id());

133+void GSettingsQml::setUsageMode(const QString &usageMode)

134+{

135+ if (m_schema->id() == "com.canonical.Unity8") {

136+ GSettingsControllerQml::instance()->setUsageMode(usageMode);

137+ }

139138}

tests/mocks/GSettings.1.0/fake_gsettings.h+14−20

@@ -18,14 +18,13 @@

1818#define FAKE_GSETTINGS_H

1919

2020#include <QList>

21−#include <QHash>

2221#include <QObject>

2322

2423class GSettingsSchemaQml: public QObject

2524{

2625 Q_OBJECT

2726

28− Q_PROPERTY(QByteArray id READ id WRITE setId NOTIFY idChanged)

27+ Q_PROPERTY(QByteArray id READ id WRITE setId)

2928

3029public:

3130 GSettingsSchemaQml(QObject *parent = nullptr);

@@ -36,9 +35,6 @@ public:

3635 QByteArray path() const;

3736 void setPath(const QByteArray &path);

3837

39−Q_SIGNALS:

40− void idChanged(const QByteArray &id);

41−

4238private:

4339 QByteArray m_id;

4440 QByteArray m_path;

@@ -54,16 +50,14 @@ class GSettingsQml: public QObject

5450

5551public:

5652 GSettingsQml(QObject *parent = nullptr);

57− ~GSettingsQml();

5853

5954 GSettingsSchemaQml * schema() const;

60−

61− void setPictureUri(const QString &str);

6255 QString pictureUri() const;

63−

64− void setUsageMode(const QString &str);

6556 QString usageMode() const;

6657

58+ void setPictureUri(const QString &str);

59+ void setUsageMode(const QString &usageMode);

60+

6761Q_SIGNALS:

6862 void schemaChanged();

6963 void pictureUriChanged(const QString&);

@@ -71,7 +65,6 @@ Q_SIGNALS:

7165

7266private:

7367 GSettingsSchemaQml* m_schema;

74− QString m_pictureUri;

7568

7669 friend class GSettingsSchemaQml;

7770};

@@ -84,23 +77,24 @@ public:

8477 static GSettingsControllerQml* instance();

8578 ~GSettingsControllerQml();

8679

87− void registerSettingsObject(GSettingsQml *obj);

88− void unRegisterSettingsObject(GSettingsQml *obj);

80+ QString pictureUri() const;

81+ void setPictureUri(const QString &str);

8982

90− Q_INVOKABLE void setPictureUri(const QByteArray &id, const QString &str);

91− QString pictureUri(const QByteArray &id) const;

83+ QString usageMode() const;

84+ void setUsageMode(const QString &usageMode);

9285

93− Q_INVOKABLE void setUsageMode(const QByteArray &id, const QString &str);

94− QString usageMode(const QByteArray &id) const;

86+Q_SIGNALS:

87+ void pictureUriChanged(const QString&);

88+ void usageModeChanged(const QString&);

9589

9690private:

9791 GSettingsControllerQml();

9892

93+ QString m_pictureUri;

94+ QString m_usageMode;

95+

9996 static GSettingsControllerQml* s_controllerInstance;

10097 QList<GSettingsQml *> m_registeredGSettings;

101−

102− QHash<QString, QString> m_pictureUri;

103− QHash<QString, QString> m_usageMode;

10498};

10599

106100#endif // FAKE_GSETTINGS_H

tests/mocks/GSettings.1.0/plugin.cpp−6

@@ -19,14 +19,8 @@

1919

2020#include <QtQml/qqml.h>

2121

22−static QObject* controllerProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)

23−{

24− return GSettingsControllerQml::instance();

25−}

26−

2722void FakeGSettingsQmlPlugin::registerTypes(const char *uri)

2823{

29− qmlRegisterSingletonType<GSettingsControllerQml>(uri, 1, 0, "GSettingsController", controllerProvider);

3024 qmlRegisterType<GSettingsQml>(uri, 1, 0, "GSettings");

3125 qmlRegisterUncreatableType<GSettingsSchemaQml>(uri, 1, 0, "GSettingsSchema",

3226 "GSettingsSchema can only be used inside of a GSettings component");

tests/mocks/Unity/fake_scope.cpp+13−2

@@ -24,6 +24,8 @@

2424#include "fake_scopes.h"

2525#include "fake_settingsmodel.h"

2626

27+#include <paths.h> // from unity8/include

28+

2729Scope::Scope(Scopes* parent) : Scope("MockScope5", "Mock Scope", false, parent)

2830{

2931}

@@ -249,11 +251,11 @@ QVariantMap Scope::customizations() const

249251 m["foreground-color"] = "blue";

250252 m["page-header"] = h;

251253 } else if (m_id == "MockScope4") {

252− h["navigation-background"] = QUrl("../../../tests/qmltests/Dash/artwork/background.png");

254+ h["navigation-background"] = QUrl(sourceDirectory() + "tests/qmltests/Dash/artwork/background.png");

253255 m["page-header"] = h;

254256 } else if (m_id == "MockScope5") {

255257 h["background"] = "gradient:///lightgrey/grey";

256− h["logo"] = QUrl("../../../tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svg");

258+ h["logo"] = QUrl(sourceDirectory() + "tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svg");

257259 h["divider-color"] = "red";

258260 h["navigation-background"] = "color:///black";

259261 m["page-header"] = h;

@@ -310,3 +312,12 @@ void Scope::setNavigationState(const QString &navigationId, bool isAltNavigation

310312 Q_EMIT currentNavigationIdChanged();

311313 }

312314}

315+

316+void Scope::performQuery(const QString& query)

317+{

318+ Q_EMIT queryPerformed(query);

319+ if (query.startsWith("scopes://")) {

320+ QString scopeId = query.mid(9);

321+ Q_EMIT gotoScope(scopeId);

322+ }

323+}

tests/mocks/Unity/fake_scope.h+4−2

@@ -72,7 +72,7 @@ public:

7272 Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) override;

7373 Q_INVOKABLE unity::shell::scopes::NavigationInterface* getAltNavigation(QString const& altNavigationId) override;

7474 Q_INVOKABLE void setNavigationState(const QString &navigationId, bool isAltNavigation) override;

75− Q_SIGNAL void performQuery(const QString& query) override;

75+ void performQuery(const QString& query) override;

7676

7777 Status status() const override;

7878 QVariantMap customizations() const override;

@@ -80,7 +80,9 @@ public:

8080 Q_INVOKABLE void refresh() override;

8181

8282Q_SIGNALS:

83− void refreshed(); // This is not in the Interface, here for testing benefits

83+ // These are not in the Interface, here for testing benefits

84+ void refreshed();

85+ void queryPerformed(const QString& query);

8486

8587protected:

8688

tests/mocks/data/unity/indicators/com.canonical.indicator.mocknew file+10

@@ -0,0 +1,10 @@

1+[Indicator Service]

2+Name=indicator-mock

3+ObjectPath=/com/canonical/indicator/mock

4+Position=0

6+[phone]

7+ObjectPath=/com/canonical/indicator/mock/desktop

9+[desktop]

10+ObjectPath=/com/canonical/indicator/mock/desktop

tests/mocks/indicator-service/CMakeLists.txtnew file+20

@@ -0,0 +1,20 @@

1+project(mock-indicator-service)

2+pkg_search_module(GIO REQUIRED gio-2.0)

4+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")

6+include_directories(

7+ ${CMAKE_CURRENT_SOURCE_DIR}

8+ ${GIO_INCLUDE_DIRS}

9+)

10+

11+add_executable(${MOCK_INDICATOR_SERVICE_APP}

12+ mock-indicator-service.c

13+)

14+

15+target_link_libraries(${MOCK_INDICATOR_SERVICE_APP} ${GIO_LDFLAGS})

16+

17+set_target_properties(${MOCK_INDICATOR_SERVICE_APP} PROPERTIES COMPILE_FLAGS -fPIC)

18+

19+install(TARGETS ${MOCK_INDICATOR_SERVICE_APP}

20+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

tests/mocks/indicator-service/mock-indicator-service.cnew file+261

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

1+/*

3+ *

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

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

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

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

10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

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

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

15+ */

16+#include <gio/gio.h>

17+#include <stdio.h>

18+#include <stdlib.h>

19+

20+G_DEFINE_QUARK (SLIDER_VALUE, slider_value)

21+

22+typedef struct

23+{

24+ GSimpleActionGroup *actions;

25+ GMenu *menu;

26+

27+ guint actions_export_id;

28+ guint menu_export_id;

29+ int action_delay;

30+} IndicatorTestService;

31+

32+static void

33+bus_acquired (GDBusConnection *connection,

34+ const gchar *name,

35+ gpointer user_data)

36+{

37+ (void) name;

38+ IndicatorTestService *indicator = user_data;

39+ GError *error = NULL;

40+

41+ indicator->actions_export_id = g_dbus_connection_export_action_group (connection,

42+ "/com/canonical/indicator/mock",

43+ G_ACTION_GROUP (indicator->actions),

44+ &error);

45+ if (indicator->actions_export_id == 0)

46+ {

47+ g_warning ("cannot export action group: %s", error->message);

48+ g_error_free (error);

49+ return;

50+ }

51+

52+ indicator->menu_export_id = g_dbus_connection_export_menu_model (connection,

53+ "/com/canonical/indicator/mock/desktop",

54+ G_MENU_MODEL (indicator->menu),

55+ &error);

56+ if (indicator->menu_export_id == 0)

57+ {

58+ g_warning ("cannot export menu: %s", error->message);

59+ g_error_free (error);

60+ return;

61+ }

62+}

63+

64+static void

65+name_lost (GDBusConnection *connection,

66+ const gchar *name,

67+ gpointer user_data)

68+{

69+ (void) name;

70+ IndicatorTestService *indicator = user_data;

71+

72+ if (indicator->actions_export_id)

73+ g_dbus_connection_unexport_action_group (connection, indicator->actions_export_id);

74+

75+ if (indicator->menu_export_id)

76+ g_dbus_connection_unexport_menu_model (connection, indicator->menu_export_id);

77+}

78+

79+static void

80+activate_show (GSimpleAction *action,

81+ GVariant *parameter,

82+ gpointer user_data)

83+{

84+ (void) action;

85+ (void) parameter;

86+ (void) user_data;

87+ g_message ("showing");

88+}

89+

90+static gboolean

91+actual_switch (gpointer user_data)

92+{

93+ GSimpleAction *action = user_data;

94+

95+ GVariant* v = g_action_get_state(G_ACTION(action));

96+ gboolean state = g_variant_get_boolean (v);

97+ GVariant *new_state = g_variant_new_boolean (state == TRUE ? FALSE : TRUE);

98+

99+ g_simple_action_set_state(G_SIMPLE_ACTION(action), new_state);

100+

101+ g_variant_unref (v);

102+ g_message ("switching");

103+ return FALSE;

104+}

105+

106+static void

107+activate_switch (GSimpleAction *action,

108+ GVariant *parameter,

109+ gpointer user_data)

110+{

111+ (void) action;

112+ (void) parameter;

113+

114+ IndicatorTestService *indicator = user_data;

115+

116+ g_timeout_add(indicator->action_delay, actual_switch, action);

117+ g_message ("switch delay");

118+}

119+

120+static gboolean

121+actual_slide (gpointer user_data)

122+{

123+ GSimpleAction *action = user_data;

124+

125+ GVariant* new_state = g_object_get_qdata (G_OBJECT (action), slider_value_quark ());

126+

127+ g_simple_action_set_state(G_SIMPLE_ACTION(action), new_state);

128+

129+ g_message ("switching");

130+ return FALSE;

131+}

132+

133+void change_slider (GSimpleAction *action,

134+ GVariant *value,

135+ gpointer user_data)

136+{

137+ IndicatorTestService *indicator = user_data;

138+

139+ g_object_set_qdata (G_OBJECT (action), slider_value_quark (), g_variant_ref(value));

140+

141+ g_timeout_add(indicator->action_delay, actual_slide, action);

142+ g_message ("slide delay %.03f", g_variant_get_double(value));

143+}

144+

145+int

146+main (int argc, char **argv)

147+{

148+ IndicatorTestService indicator = { 0 };

149+ indicator.action_delay = -1;

150+ GMenuItem *item;

151+ GMenu *submenu;

152+ GActionEntry entries[] = {

153+ { "_header", NULL, NULL, "{'title': <'Test'>,"

154+ " 'label': <'Test'>,"

155+ " 'visible': <true>,"

156+ " 'accessible-desc': <'Test indicator'> }", NULL },

157+ { "action.show", activate_show, NULL, NULL, NULL },

158+ { "action.switch", activate_switch, NULL, "true", NULL },

159+ { "action.checkbox", activate_switch, NULL, "true", NULL },

160+ { "action.accessPoint", activate_switch, NULL, "false", NULL },

161+ { "action.slider", NULL, NULL, "0.5", change_slider }

162+ };

163+ GMainLoop *loop;

164+

165+ int help = 0;

166+ if (argc > 1)

167+ {

168+ int i;

169+ for (i = 1; i < argc; i++) {

170+ const char *arg = argv[i];

171+

172+ if (arg[0] == '-') {

173+ switch (arg[1])

174+ {

175+ case 't':

176+ {

177+ arg += 2;

178+ if (!arg[0] && i < argc-1) {

179+ i++;

180+ int delay = -1;

181+

182+ if (sscanf(argv[i], "%d", &delay) == 1) {

183+ indicator.action_delay = delay;

184+ } else {

185+ printf("Invalid action delay value: %s\n", argv[i]);

186+ help = 1;

187+ }

188+ } else {

189+ printf("Invalid action delay value: %s\n", argv[i]);

190+ help = 1;

191+ }

192+ break;

193+ }

194+ case 'h':

195+ help = 1;

196+ break;

197+ }

198+ }

199+ }

200+ }

201+

202+ if (help) {

203+ printf("Usage: %s [<options>]\n"

204+ " -t DELAY Action activation delay\n"

205+ " -h Show this help text\n"

206+ , argv[0]);

207+ return 0;

208+ }

209+

210+ indicator.actions = g_simple_action_group_new ();

211+ g_action_map_add_action_entries (G_ACTION_MAP (indicator.actions), entries, G_N_ELEMENTS (entries), &indicator);

212+

213+ submenu = g_menu_new ();

214+ g_menu_append (submenu, "Show", "indicator.action.show");

215+

216+ // Switch

217+ item = g_menu_item_new("Switch", "indicator.action.switch");

218+ g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.switch");

219+ g_menu_append_item(submenu, item);

220+

221+ // Checkbox

222+ item = g_menu_item_new("Checkbox", "indicator.action.checkbox");

223+ g_menu_append_item(submenu, item);

224+

225+ // Slider

226+ item = g_menu_item_new("Slider", "indicator.action.slider");

227+ g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.slider");

228+ g_menu_append_item(submenu, item);

229+

230+ // Access Point

231+ item = g_menu_item_new("Access Point", "indicator.action.accessPoint");

232+ g_menu_item_set_attribute (item, "x-canonical-type", "s", "unity.widgets.systemsettings.tablet.accesspoint");

233+ g_menu_append_item(submenu, item);

234+

235+

236+ item = g_menu_item_new (NULL, "indicator._header");

237+ g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.root");

238+ g_menu_item_set_submenu (item, G_MENU_MODEL (submenu));

239+ indicator.menu = g_menu_new ();

240+ g_menu_append_item (indicator.menu, item);

241+

242+ g_bus_own_name (G_BUS_TYPE_SESSION,

243+ "com.canonical.indicator.mock",

244+ G_BUS_NAME_OWNER_FLAGS_NONE,

245+ bus_acquired,

246+ NULL,

247+ name_lost,

248+ &indicator,

249+ NULL);

250+

251+ loop = g_main_loop_new (NULL, FALSE);

252+ g_main_loop_run (loop);

253+

254+ g_object_unref (submenu);

255+ g_object_unref (item);

256+ g_object_unref (indicator.actions);

257+ g_object_unref (indicator.menu);

258+ g_object_unref (loop);

259+

260+ return 1;

261+}

tests/plugins/Unity/Indicators/indicatorsmanagertest.cpp−2

@@ -31,13 +31,11 @@ private Q_SLOTS:

3131

3232 void initTestCase()

3333 {

34− setenv("UNITY_TEST_ENV", "1", 1);

3534 setenv("XDG_DATA_DIRS", (sourceDirectory() + "/tests/data").toLatin1().data(), 1);

3635 }

3736

3837 void cleanupTestCase()

3938 {

40− unsetenv("UNITY_TEST_ENV");

4139 }

4240

4341 /*

tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp−2

@@ -32,13 +32,11 @@ private Q_SLOTS:

3232

3333 void initTestCase()

3434 {

35− setenv("UNITY_TEST_ENV", "1", 1);

3635 setenv("XDG_DATA_DIRS", (sourceDirectory() + "/tests/data").toLatin1().data(), 1);

3736 }

3837

3938 void cleanupTestCase()

4039 {

41− unsetenv("UNITY_TEST_ENV");

4240 }

4341

4442 /*

tests/plugins/Unity/Launcher/launchermodeltest.cpp+57

@@ -400,6 +400,63 @@ private Q_SLOTS:

400400 QCOMPARE(launcherModel->get(index)->count(), 55);

401401 }

402402

403+ void testCountEmblemAddsRemovesItem_data() {

404+ QTest::addColumn<bool>("isPinned");

405+ QTest::addColumn<bool>("isRunning");

406+ QTest::addColumn<bool>("startWhenVisible");

407+ QTest::newRow("not pinned, not running") << false << false << false;

408+ QTest::newRow("pinned, not running") << true << false << false;

409+ QTest::newRow("not pinned, not running, starting from notification") << false << false << true;

410+ QTest::newRow("pinned, not running, starting from notification") << true << false << true;

411+ QTest::newRow("not pinned, running") << false << true << false;

412+ QTest::newRow("pinned, running") << true << true << false;

413+ }

414+

415+ void testCountEmblemAddsRemovesItem() {

416+ QFETCH(bool, isPinned);

417+ QFETCH(bool, isRunning);

418+ QFETCH(bool, startWhenVisible);

419+

420+ // Make sure item is here as expected after init() and that count is not visible

421+ int index = launcherModel->findApplication("abs-icon");

422+ QCOMPARE(index == -1, false);

423+ QCOMPARE(launcherModel->get(index)->countVisible(), false);

424+

425+ // Pin if we need to

426+ if (isPinned) {

427+ launcherModel->pin("abs-icon");

428+ }

429+ QCOMPARE(launcherModel->get(0)->pinned(), isPinned);

430+

431+ // Stop it if we need to

432+ if (!isRunning) {

433+ appManager->stopApplication("abs-icon");

434+ }

435+ QCOMPARE(launcherModel->findApplication("abs-icon") >= 0, isRunning || isPinned);

436+

437+

438+ // set the count emblem to visible

439+ QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher/abs_2Dicon", "org.freedesktop.DBus.Properties");

440+ interface.call("Set", "com.canonical.Unity.Launcher.Item", "count", QVariant::fromValue(QDBusVariant(55)));

441+ interface.call("Set", "com.canonical.Unity.Launcher.Item", "countVisible", QVariant::fromValue(QDBusVariant(true)));

442+

443+ // Make sure item is here and that count is visible

444+ index = launcherModel->findApplication("abs-icon");

445+ QCOMPARE(index == -1, false);

446+ QCOMPARE(launcherModel->get(index)->countVisible(), true);

447+

448+ if (!isRunning && startWhenVisible) {

449+ appManager->addApplication(new MockApp("abs-icon"));

450+ }

451+

452+ // Hide count emblem again

453+ interface.call("Set", "com.canonical.Unity.Launcher.Item", "countVisible", QVariant::fromValue(QDBusVariant(false)));

454+

455+ // Make sure item is shown/hidden as expected

456+ index = launcherModel->findApplication("abs-icon");

457+ QCOMPARE(index == -1, !isRunning && !isPinned && !startWhenVisible);

458+ }

459+

403460 void testRefreshAfterDeletedDesktopFiles_data() {

404461 QTest::addColumn<bool>("deleted");

405462 QTest::newRow("have .desktop files") << false;

tests/qmltests/Components/tst_Dialogs.qml+4−2

@@ -79,7 +79,7 @@ Rectangle {

7979 Column {

8080 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }

8181 spacing: units.gu(1)

82− Button { text: "Power dialog"; onClicked: { testCase.showPowerDialog(); } }

82+ Button { text: "Power dialog"; onClicked: { testCase.test_showPowerDialog(); } }

8383 Button { text: "Logout Requested"; onClicked: { fakeUnitySession.logoutRequested(); } }

8484 Button { text: "Shutdown Requested"; onClicked: { fakeUnitySession.shutdownRequested(); } }

8585 Button { text: "Reboot Requested"; onClicked: { fakeUnitySession.rebootRequested(); } }

@@ -96,9 +96,11 @@ Rectangle {

9696 name: "Dialogs"

9797 when: windowShown

9898

99− function showPowerDialog() {

99+ function test_showPowerDialog() {

100100 var dialogsPrivate = findInvisibleChild(dialogs, "dialogsPrivate");

101101 dialogsPrivate.showPowerDialog();

102+ var dialogLoader = findInvisibleChild(dialogs, "dialogLoader");

103+ tryCompare(dialogLoader.item, "focus", true);

102104 }

103105 }

104106}

tests/qmltests/Dash/tst_Dash.qml+49−1

@@ -315,7 +315,7 @@ Item {

315315

316316 var scopesList = findChild(dash, "scopesList");

317317 spy.target = scopesList.scope;

318− spy.signalName = "performQuery";

318+ spy.signalName = "queryPerformed";

319319

320320 // Click on the store

321321 var scopesListPageHeader = findChild(scopesList, "pageHeader");

@@ -517,5 +517,53 @@ Item {

517517 tryCompare(dashTempScopeItem, "x", dash.width);

518518 tryCompare(dashTempScopeItem, "visible", false);

519519 }

520+

521+ function test_UriDispatcher()

522+ {

523+ var dashContentList = findChild(dash, "dashContentList");

524+

525+ UriHandler.opened("scopes://clickscope");

526+ tryCompare(dashContentList, "currentIndex", 1);

527+

528+ // Show the manage dash

529+ touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));

530+ var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");

531+ tryCompare(bottomEdgeController, "progress", 1);

532+

533+ // UriHandler changes to a scope and closes the manage scopes

534+ UriHandler.opened("scopes://MockScope1");

535+ tryCompare(dashContentList, "currentIndex", 0);

536+ tryCompare(bottomEdgeController, "progress", 0);

537+

538+ // Show a preview

539+ var scopeLoader0 = findChild(dashContent, "scopeLoader0");

540+ var dashCategory0 = findChild(scopeLoader0, "dashCategory0");

541+ var delegate0 = findChild(dashCategory0, "delegate0");

542+ mouseClick(delegate0);

543+ tryCompare(dashContent, "subPageShown", true)

544+

545+ // UriHandler changes to a scope and closes the manage scopes

546+ UriHandler.opened("scopes://clickscope");

547+ tryCompare(dashContentList, "currentIndex", 1);

548+ tryCompare(dashContent, "subPageShown", false);

549+

550+ // Go to a temp scope

551+ touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));

552+ var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");

553+ tryCompare(bottomEdgeController, "progress", 1);

554+ var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");

555+ var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");

556+ tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);

557+ mouseClick(nonfavScopesListCategoryList.currentItem);

558+ var dashTempScopeItem = findChild(dash, "dashTempScopeItem");

559+ tryCompare(dashTempScopeItem, "x", 0);

560+ tryCompare(dashTempScopeItem, "visible", true);

561+

562+ // UriHandler changes to a scope and closes the temp scope

563+ UriHandler.opened("scopes://MockScope1");

564+ tryCompare(dashContentList, "currentIndex", 0);

565+ tryCompare(dashTempScopeItem, "x", dashTempScopeItem.width);

566+ tryCompare(dashTempScopeItem, "visible", false);

567+ }

520568 }

521569}

tests/qmltests/Dash/tst_GenericScopeView.qml+1−1

@@ -206,7 +206,7 @@ Item {

206206 var header = findChild(genericScopeView, "dashSectionHeader1");

207207

208208 spy.target = genericScopeView.scope;

209− spy.signalName = "performQuery";

209+ spy.signalName = "queryPerformed";

210210

211211 mouseClick(header);

212212

tests/qmltests/Dash/tst_PreviewListView.qml+1−1

@@ -109,7 +109,7 @@ Rectangle {

109109

110110 var image = findChild(header, "titleImage");

111111 verify(image, "Could not find the title image.");

112− compare(image.source, Qt.resolvedUrl("../Dash/tst_PageHeader/logo-ubuntu-orange.svg"), "Title image has the wrong source");

112+ compare(image.source, Qt.resolvedUrl("tst_PageHeader/logo-ubuntu-orange.svg"), "Title image has the wrong source");

113113 }

114114 }

115115}

tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+5−1

@@ -230,7 +230,7 @@ Item {

230230 compare(loader.item.value, data.manualValue, "Slider value does not match manual set value");

231231

232232 menuData.actionState = data.value2;

233− compare(loader.item.value, data.value2, "Value does not match new data");

233+ tryCompare(loader.item, "value", data.value2, 10000, "Value does not match new data");

234234

235235 menuData.actionState = undefined;

236236 compare(loader.item.value, data.value2, "Undefined state should not update slider value");

@@ -819,6 +819,10 @@ Item {

819819 loader.data = menuData;

820820 loader.sourceComponent = factory.load(menuData);

821821

822+ var sync = findInvisibleChild(loader.item, "sync");

823+ verify(sync);

824+ sync.syncTimeout = 500;

825+

822826 compare(loader.item.checked, false, "Loader did not load check state");

823827 mouseClick(loader.item,

824828 loader.item.width / 2, loader.item.height / 2);

tests/qmltests/Panel/tst_Panel.qml+52

@@ -390,5 +390,57 @@ IndicatorTest {

390390 tap(panel, touchPosX, touchPosY);

391391 compare(backgroundPressedSpy.count, 2);

392392 }

393+

394+ /*

395+ Regression test for https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1439318

396+ When the panel is in fullscreen mode and the user taps near the top edge,

397+ the panel should take no action and the tap should reach the item behind the

398+ panel.

399+ */

400+ function test_tapNearTopEdgeWithPanelInFullscreenMode() {

401+ var indicatorArea = findChild(panel, "indicatorArea");

402+ verify(indicatorArea);

403+ var panelPriv = findInvisibleChild(panel, "panelPriv");

404+ verify(panelPriv);

405+

406+ panel.fullscreenMode = true;

407+ // wait until if finishes hiding itself

408+ tryCompare(indicatorArea, "y", -panelPriv.indicatorHeight);

409+

410+ compare(panel.indicators.shown, false);

411+ verify(panel.indicators.fullyClosed);

412+

413+ // tap near the very top of the screen

414+ tap(itemArea, itemArea.width / 2, 2);

415+

416+ // the tap should have reached the item behind the panel

417+ compare(backgroundPressedSpy.count, 2);

418+

419+ // give it a couple of event loop iterations for any animations etc to kick in

420+ wait(50);

421+

422+ compare(panel.indicators.shown, false);

423+ verify(panel.indicators.fullyClosed);

424+ }

425+

426+ function test_openAndClosePanelWithMouseClicks() {

427+ compare(panel.indicators.shown, false);

428+ verify(panel.indicators.fullyClosed);

429+

430+ mouseClick(panel.indicators,

431+ panel.indicators.width / 2,

432+ panel.indicators.minimizedPanelHeight / 2);

433+

434+ compare(panel.indicators.shown, true);

435+ tryCompare(panel.indicators, "fullyOpened", true);

436+

437+ var handle = findChild(panel.indicators, "handle");

438+ verify(handle);

439+

440+ mouseClick(handle);

441+

442+ compare(panel.indicators.shown, false);

443+ tryCompare(panel.indicators, "fullyClosed", true);

444+ }

393445 }

394446}

tests/qmltests/Tutorial/tst_Tutorial.qml+22−5

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

1717import QtQuick 2.0

1818import QtTest 1.0

1919import AccountsService 0.1

20+import GSettings 1.0

2021import LightDM 0.1 as LightDM

2122import Ubuntu.Components 1.1

2223import Unity.Application 0.1

@@ -45,6 +46,11 @@ Item {

4546 }

4647 }

4748

49+ GSettings {

50+ id: unity8Settings

51+ schema.id: "com.canonical.Unity8"

52+ }

53+

4854 Component.onCompleted: {

4955 // must set the mock mode before loading the Shell

5056 LightDM.Greeter.mockMode = "single-pin";

@@ -112,6 +118,7 @@ Item {

112118

113119 function init() {

114120 tryCompare(shell, "enabled", true); // enabled by greeter when ready

121+ unity8Settings.usageMode = "Staged";

115122 AccountsService.demoEdges = false;

116123 AccountsService.demoEdges = true;

117124 swipeAwayGreeter();

@@ -185,17 +192,19 @@ Item {

185192 }

186193

187194 function checkRightEdge() {

188− touchFlick(shell, shell.width, halfHeight, halfWidth, halfHeight);

195+ if (unity8Settings.usageMode === "Staged") {

196+ touchFlick(shell, shell.width, halfHeight, halfWidth, halfHeight);

189197

190− var stage = findChild(shell, "stage");

191− var spreadView = findChild(stage, "spreadView");

192− tryCompare(spreadView, "phase", 0);

198+ var stage = findChild(shell, "stage");

199+ var spreadView = findChild(stage, "spreadView");

200+ tryCompare(spreadView, "phase", 0);

201+ }

193202 }

194203

195204 function checkBottomEdge() {

196205 // Can't actually check effect of swipe, since dash isn't really loaded

197206 var applicationsDisplayLoader = findChild(shell, "applicationsDisplayLoader");

198− tryCompare(applicationsDisplayLoader.item, "interactive", false);

207+ tryCompare(applicationsDisplayLoader, "interactive", false);

199208 }

200209

201210 function checkFinished() {

@@ -256,6 +265,14 @@ Item {

256265 goToPage(null);

257266 }

258267

268+ function test_walkthroughOnDesktop() {

269+ unity8Settings.usageMode = "Windowed";

270+ var page = goToPage("tutorialLeftFinish");

271+ var tick = findChild(page, "tick");

272+ tap(tick);

273+ checkFinished();

274+ }

275+

259276 function test_launcherShortDrag() {

260277 // goToPage does a normal launcher pull. But here we want to test

261278 // just barely pulling the launcher out and letting go (i.e. not

tests/qmltests/tst_Shell.qml+8−3

@@ -987,6 +987,11 @@ Rectangle {

987987 tryCompare(ApplicationManager, "focusedApplicationId", "gallery-app");

988988 compare(wizard.shown, false);

989989 compare(tutorial.running, false);

990+ tryCompare(AccountsService, "demoEdges", false);

991+ tryCompare(Wizard.System, "wizardEnabled", false);

992+

993+ var tutorialLeft = findChild(tutorial, "tutorialLeft");

994+ compare(tutorialLeft, null); // should be destroyed with tutorial

990995 }

991996

992997 function test_tapOnRightEdgeReachesApplicationSurface() {

@@ -1083,11 +1088,11 @@ Rectangle {

10831088 {

10841089 var buttonShowDashHome = findChild(launcher, "buttonShowDashHome");

10851090 var startPos = buttonShowDashHome.mapToItem(shell,

1086− buttonShowDashHome.width * 0.8,

1087− buttonShowDashHome.height * 0.2);

1088− var endPos = buttonShowDashHome.mapToItem(shell,

10891091 buttonShowDashHome.width * 0.2,

10901092 buttonShowDashHome.height * 0.8);

1093+ var endPos = buttonShowDashHome.mapToItem(shell,

1094+ buttonShowDashHome.width * 0.8,

1095+ buttonShowDashHome.height * 0.2);

10911096 touchFlick(shell, startPos.x, startPos.y, endPos.x, endPos.y);

10921097 }

10931098