f3ca9c1 · unity8 · git.iko.soy

CMakeLists.txt+2

compare with xenial

unifiedsplit

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

105set(SHELL_APP unity8)

106set(DASH_APP unity8-dash)

107set(SCOPE_TOOL unity-scope-tool)

108+set(INDICATORS_CLIENT_APP indicators-client)

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

108

110

109include_directories(

111include_directories(

110 ${CMAKE_SOURCE_DIR}/include

112 ${CMAKE_SOURCE_DIR}/include

CODING+1−1

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

186

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

188

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

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

190

191And then run a single test with

192

data/CMakeLists.txt+2

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

1# generate desktop files

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

3configure_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)

4

5

5# install desktop files

6# install desktop files

6install(FILES

7install(FILES

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

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

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

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

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

9 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

11 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

10 )

12 )

11

13

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>"

3+

4+respawn

5+respawn limit 2 10

6+

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

debian/changelog+70

@@ -1,3 +1,73 @@

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

2+

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

8+

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+

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

55+

56+ [ Albert Astals Cid ]

57+ * Fix regression making pan not possible in Zoomable Image (LP:

58+ #1433506)

59+ * Make sure m_firstVisibleIndex is correctly set after processing

60+ changeSet.removes (LP: #1433056)

61+ * make pot_file

62+

63+ [ Daniel d'Andrada ]

64+ * Don't show the rotating rect in "make tryFoo".

65+

66+ [ Michael Zanetti ]

67+ * make pinlockscreen adjust better to larger displays

68+

69+ -- CI Train Bot <ci-train-bot@canonical.com> Fri, 20 Mar 2015 11:56:41 +0000

70+

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

71unity8 (8.02+15.04.20150318-0ubuntu1) vivid; urgency=medium

2

72

3 [ Albert Astals Cid ]

73 [ Albert Astals Cid ]

debian/control+2−2

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

47 qtdeclarative5-dev-tools,

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

49 qtdeclarative5-qtmultimedia-plugin,

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

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

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

52 qtdeclarative5-ubuntu-web-plugin,

53 ttf-ubuntu-font-family,

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

119Package: unity8-common

120Architecture: all

121Depends: qml-module-qtquick-layouts,

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

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

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

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

125 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

1/usr/bin/indicators-client

2/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

1usr/lib/python*/*/unity*

3usr/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() {

92

93inline QStringList shellDataDirs() {

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

95− if (!isRunningInstalled()) {

95+ if (isRunningInstalled()) {

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

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

98− }

99− }

100− else {

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

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

102 dirs.append(qmlDirectory());

97 dirs.append(qmlDirectory());

103 }

98 }

plugins/Dash/listviewwithpageheader.cpp+7−8

@@ -973,14 +973,13 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool

973 }

974 if (growDown) {

975 adjustMinYExtent();

976− } else if (remove.index <= m_firstVisibleIndex) {

976+ } else if (remove.index <= m_firstVisibleIndex && !m_visibleItems.isEmpty()) {

977− if (!m_visibleItems.isEmpty()) {

978− // We removed the first item that is the one that positions the rest

979− // position the new first item correctly

980− m_visibleItems.first()->setY(oldFirstValidIndexPos);

977+ m_visibleItems.first()->setY(oldFirstValidIndexPos);

981− } else {

978+ }

979+ if (m_visibleItems.isEmpty()) {

982− m_firstVisibleIndex = -1;

980+ m_firstVisibleIndex = -1;

983− }

981+ } else {

982+ m_firstVisibleIndex -= qMax(0, m_firstVisibleIndex - remove.index);

984 }

983 }

985 } else if (remove.index + remove.count <= m_firstVisibleIndex) {

984 } else if (remove.index + remove.count <= m_firstVisibleIndex) {

986 m_firstVisibleIndex -= remove.count;

985 m_firstVisibleIndex -= remove.count;

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

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

1−include(FindPkgConfig)

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

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

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

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

4pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

3pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

plugins/ScreenGrabber/screengrabber.cpp+1−1

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

81QString ScreenGrabber::makeFileName()

82{

83 QString fileName(fileNamePrefix);

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

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

85 fileName.append(".");

86 fileName.append(getFormat());

87 return fileName;

plugins/Ubuntu/Gestures/TouchGate.cpp−2

@@ -53,8 +53,6 @@ void TouchGate::touchEvent(QTouchEvent *event)

53 m_touchInfoMap[touchPoint.id()].ownership = OwnershipRequested;

54 m_touchInfoMap[touchPoint.id()].ended = false;

55 TouchRegistry::instance()->requestTouchOwnership(touchPoint.id(), this);

56−

57− Q_EMIT pressed();

58 }

56 }

59

57

60 goodToGo &= m_touchInfoMap.contains(touchPoint.id())

58 goodToGo &= m_touchInfoMap.contains(touchPoint.id())

plugins/Ubuntu/Gestures/TouchGate.h−2

@@ -53,8 +53,6 @@ public:

53Q_SIGNALS:

54 void targetItemChanged(QQuickItem *item);

55

56− void pressed();

57−

58protected:

56protected:

59 void touchEvent(QTouchEvent *event) override;

57 void touchEvent(QTouchEvent *event) override;

60private:

58private:

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

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

468 return;

469 }

470

471− bool found = false;

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

472+ if (itemIndex != -1) {

472− Q_FOREACH(LauncherItem *item, m_list) {

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

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

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

474− found = true;

475+ item->setRecent(true);

475− break;

476+ m_asAdapter->syncItems(m_list);

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

476 }

478 }

477− }

478− if (found) {

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

480 } else {

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

plugins/Utils/CMakeLists.txt+2

@@ -8,6 +8,8 @@ include_directories(

8)

9

10set(QMLPLUGIN_SRC

11+ constants.cpp

12+ inputwatcher.cpp

11 qlimitproxymodelqml.cpp

13 qlimitproxymodelqml.cpp

12 unitysortfilterproxymodelqml.cpp

14 unitysortfilterproxymodelqml.cpp

13 relativetimeformatter.cpp

15 relativetimeformatter.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/inputwatcher.cppnew file+118

@@ -0,0 +1,118 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ *

16+ */

17+

18+#include "inputwatcher.h"

19+

20+#include <QMouseEvent>

21+

22+InputWatcher::InputWatcher(QObject *parent)

23+ : QObject(parent)

24+ , m_mousePressed(false)

25+ , m_touchPressed(false)

26+{

27+}

28+

29+QObject *InputWatcher::target() const

30+{

31+ return m_target;

32+}

33+

34+void InputWatcher::setTarget(QObject *value)

35+{

36+ if (m_target == value) {

37+ return;

38+ }

39+

40+ if (m_target) {

41+ m_target->removeEventFilter(this);

42+ }

43+

44+ setMousePressed(false);

45+ setTouchPressed(false);

46+

47+ m_target = value;

48+ if (m_target) {

49+ m_target->installEventFilter(this);

50+ }

51+

52+ Q_EMIT targetChanged(value);

53+}

54+

55+bool InputWatcher::targetPressed() const

56+{

57+ return m_mousePressed || m_touchPressed;

58+}

59+

60+bool InputWatcher::eventFilter(QObject* /*watched*/, QEvent *event)

61+{

62+ switch (event->type()) {

63+ case QEvent::TouchBegin:

64+ setTouchPressed(true);

65+ break;

66+ case QEvent::TouchEnd:

67+ setTouchPressed(false);

68+ break;

69+ case QEvent::MouseButtonPress:

70+ {

71+ QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);

72+ if (mouseEvent->button() == Qt::LeftButton) {

73+ setMousePressed(true);

74+ }

75+ }

76+ break;

77+ case QEvent::MouseButtonRelease:

78+ {

79+ QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);

80+ if (mouseEvent->button() == Qt::LeftButton) {

81+ setMousePressed(false);

82+ }

83+ }

84+ break;

85+ default:

86+ // Not interested

87+ break;

88+ }

89+

90+ // We never filter them out. We are just watching.

91+ return false;

92+}

93+

94+void InputWatcher::setMousePressed(bool value)

95+{

96+ if (value == m_mousePressed) {

97+ return;

98+ }

99+

100+ bool oldPressed = targetPressed();

101+ m_mousePressed = value;

102+ if (targetPressed() != oldPressed) {

103+ Q_EMIT targetPressedChanged(targetPressed());

104+ }

105+}

106+

107+void InputWatcher::setTouchPressed(bool value)

108+{

109+ if (value == m_touchPressed) {

110+ return;

111+ }

112+

113+ bool oldPressed = targetPressed();

114+ m_touchPressed = value;

115+ if (targetPressed() != oldPressed) {

116+ Q_EMIT targetPressedChanged(targetPressed());

117+ }

118+}

plugins/Utils/inputwatcher.hnew file+58

@@ -0,0 +1,58 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ *

16+ */

17+

18+#ifndef UNITY_INPUTWATCHER_H

19+#define UNITY_INPUTWATCHER_H

20+

21+#include <QObject>

22+#include <QPointer>

23+

24+/*

25+ Monitors the target object for input events to figure out whether it's pressed

26+ or not.

27+ */

28+class InputWatcher : public QObject

29+{

30+ Q_OBJECT

31+ Q_PROPERTY(QObject* target READ target WRITE setTarget NOTIFY targetChanged)

32+

33+ // Whether the target object is pressed (by either touch or mouse)

34+ Q_PROPERTY(bool targetPressed READ targetPressed NOTIFY targetPressedChanged)

35+public:

36+ InputWatcher(QObject *parent = nullptr);

37+

38+ QObject *target() const;

39+ void setTarget(QObject *value);

40+

41+ bool targetPressed() const;

42+

43+ bool eventFilter(QObject *watched, QEvent *event) override;

44+

45+Q_SIGNALS:

46+ void targetChanged(QObject *value);

47+ void targetPressedChanged(bool value);

48+

49+private:

50+ void setMousePressed(bool value);

51+ void setTouchPressed(bool value);

52+

53+ bool m_mousePressed;

54+ bool m_touchPressed;

55+ QPointer<QObject> m_target;

56+};

57+

58+#endif // UNITY_INPUTWATCHER_H

plugins/Utils/plugin.cpp+11

@@ -26,6 +26,7 @@

26#include "plugin.h"

27

28// local

29+#include "inputwatcher.h"

29#include "qlimitproxymodelqml.h"

30#include "qlimitproxymodelqml.h"

30#include "unitysortfilterproxymodelqml.h"

31#include "unitysortfilterproxymodelqml.h"

31#include "relativetimeformatter.h"

32#include "relativetimeformatter.h"

@@ -34,6 +35,7 @@

34#include "windowkeysfilter.h"

35#include "windowkeysfilter.h"

35#include "easingcurve.h"

36#include "easingcurve.h"

36#include "windowstatestorage.h"

37#include "windowstatestorage.h"

38+#include "constants.h"

37

39

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

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

39{

41{

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

42 return new WindowStateStorage();

44 return new WindowStateStorage();

43}

45}

44

46

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

48+{

49+ Q_UNUSED(engine)

50+ Q_UNUSED(scriptEngine)

51+ return new Constants();

52+}

53+

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

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

46{

55{

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

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

@@ -55,6 +64,8 @@ void UtilsPlugin::registerTypes(const char *uri)

55 qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");

64 qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");

56 qmlRegisterType<RelativeTimeFormatter>(uri, 0, 1, "RelativeTimeFormatter");

65 qmlRegisterType<RelativeTimeFormatter>(uri, 0, 1, "RelativeTimeFormatter");

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

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

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

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

58}

69}

59

70

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

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

po/am.po+18−6

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

11"PO-Revision-Date: 2015-03-19 23:16+0000\n"

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

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

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

@@ -159,18 +159,19 @@ msgid "Search"

159msgstr "መፈለጊያ"

160

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

162−msgctxt "Button: The Ubuntu Store"

162+msgctxt "Button: Open the Ubuntu Store"

163msgid "Store"

164msgstr "ማስቀመጫ"

165

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

167−msgctxt "Button: Shown in Page Header Menu"

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

168msgid "Search"

169msgstr "መፈለጊያ"

170

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

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

172msgid "Settings"

173msgid "Settings"

173−msgstr "ማሰናጃ"

174+msgstr "ማሰናጃዎች"

174

175

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

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

176msgid "Remove from Favorites"

177msgid "Remove from Favorites"

@@ -661,6 +662,9 @@ msgstr "%1 〉"

661#~ msgid "Reboot"

662#~ msgid "Reboot"

662#~ msgstr "እንደገና ማስነሻ"

663#~ msgstr "እንደገና ማስነሻ"

663

664

665+#~ msgid "Settings"

666+#~ msgstr "ማሰናጃ"

667+

664#~ msgid ""

668#~ msgid ""

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

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

666#~ "phone Tap on the screen to start"

670#~ "phone Tap on the screen to start"

@@ -672,3 +676,11 @@ msgstr "%1 〉"

672

676

673#~ msgid "Manage Scopes"

677#~ msgid "Manage Scopes"

674#~ msgstr "የ ክልል አስተዳዳሪ"

678#~ msgstr "የ ክልል አስተዳዳሪ"

679+

680+#~ msgctxt "Button: Shown in Page Header Menu"

681+#~ msgid "Search"

682+#~ msgstr "መፈለጊያ"

683+

684+#~ msgctxt "Button: The Ubuntu Store"

685+#~ msgid "Store"

686+#~ msgstr "ማስቀመጫ"

po/ar.po+6−5

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

11"PO-Revision-Date: 2014-05-22 08:22+0000\n"

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

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

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

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

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

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

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

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

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

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

21

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

23msgid "Password: "

@@ -158,16 +158,17 @@ msgid "Search"

158msgstr ""

159

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

161−msgctxt "Button: The Ubuntu Store"

161+msgctxt "Button: Open the Ubuntu Store"

162msgid "Store"

163msgstr ""

164

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

166−msgctxt "Button: Shown in Page Header Menu"

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

167msgid "Search"

168msgstr ""

169

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

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

171msgid "Settings"

172msgid "Settings"

172msgstr ""

173msgstr ""

173

174

po/ast.po+10−6

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

11"PO-Revision-Date: 2015-03-02 18:12+0000\n"

12"Last-Translator: ivarela <ivarela@ubuntu.com>\n"

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

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

@@ -160,18 +160,19 @@ msgid "Search"

160msgstr ""

161

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

163−msgctxt "Button: The Ubuntu Store"

163+msgctxt "Button: Open the Ubuntu Store"

164msgid "Store"

165msgstr ""

166

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

168−msgctxt "Button: Shown in Page Header Menu"

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

169msgid "Search"

170msgstr ""

171

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

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

173msgid "Settings"

174msgid "Settings"

174−msgstr "Axustes"

175+msgstr ""

175

176

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

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

177msgid "Remove from Favorites"

178msgid "Remove from Favorites"

@@ -660,6 +661,9 @@ msgstr "%1 〉"

660#~ msgid "Shut down"

661#~ msgid "Shut down"

661#~ msgstr "Apagar"

662#~ msgstr "Apagar"

662

663

664+#~ msgid "Settings"

665+#~ msgstr "Axustes"

666+

663#~ msgid "Power off"

667#~ msgid "Power off"

664#~ msgstr "Apagar"

668#~ msgstr "Apagar"

665

669

po/az.po+10−6

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

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

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

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

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

@@ -157,18 +157,19 @@ msgid "Search"

157msgstr ""

158

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

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

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

165−msgctxt "Button: Shown in Page Header Menu"

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

166msgid "Search"

167msgstr ""

168

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

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

170msgid "Settings"

171msgid "Settings"

171−msgstr "Tənzimləmələr"

172+msgstr ""

172

173

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

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

174msgid "Remove from Favorites"

175msgid "Remove from Favorites"

@@ -655,5 +656,8 @@ msgstr ""

655#~ "Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "

656#~ "Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "

656#~ "bilərsiniz. Başlamaq üçün ekrana toxunun"

657#~ "bilərsiniz. Başlamaq üçün ekrana toxunun"

657

658

659+#~ msgid "Settings"

660+#~ msgstr "Tənzimləmələr"

661+

658#~ msgid "Type or say a command"

662#~ msgid "Type or say a command"

659#~ msgstr "Bir әmr söyləyin və ya yazın"

663#~ msgstr "Bir әmr söyləyin və ya yazın"

po/be.po+10−6

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

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

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

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

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

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

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

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

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

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

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

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

21

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

23msgid "Password: "

@@ -164,18 +164,19 @@ msgid "Search"

164msgstr ""

165

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

167−msgctxt "Button: The Ubuntu Store"

167+msgctxt "Button: Open the Ubuntu Store"

168msgid "Store"

169msgstr ""

170

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

172−msgctxt "Button: Shown in Page Header Menu"

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

173msgid "Search"

174msgstr ""

175

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

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

177msgid "Settings"

178msgid "Settings"

178−msgstr "Параметры"

179+msgstr ""

179

180

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

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

181msgid "Remove from Favorites"

182msgid "Remove from Favorites"

@@ -664,6 +665,9 @@ msgstr "%1 〉"

664#~ msgid "Skip intro"

665#~ msgid "Skip intro"

665#~ msgstr "Прапусціць уводзіны"

666#~ msgstr "Прапусціць уводзіны"

666

667

668+#~ msgid "Settings"

669+#~ msgstr "Параметры"

670+

667#~ msgid ""

671#~ msgid ""

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

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

669#~ "phone Tap on the screen to start"

673#~ "phone Tap on the screen to start"

po/bg.po+10−7

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

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

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

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

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

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

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

20

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

22msgid "Password: "

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

120"Are you sure you would like\n"

121"to power off?"

122msgstr ""

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

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

123

125

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

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

125msgctxt "Button: Power off the system"

127msgctxt "Button: Power off the system"

@@ -157,16 +159,17 @@ msgid "Search"

157msgstr ""

159msgstr ""

158

160

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

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

160−msgctxt "Button: The Ubuntu Store"

162+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

163msgid "Store"

162msgstr ""

164msgstr ""

163

165

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

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

165−msgctxt "Button: Shown in Page Header Menu"

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

166msgid "Search"

168msgid "Search"

167msgstr ""

169msgstr ""

168

170

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

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

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

170msgid "Settings"

173msgid "Settings"

171msgstr ""

174msgstr ""

172

175

po/br.po+31−27

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

11−"PO-Revision-Date: 2015-03-13 13:01+0000\n"

11+"PO-Revision-Date: 2015-03-25 07:36+0000\n"

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

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

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2015-03-26 05:27+0000\n"

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

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

20

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

22msgid "Password: "

@@ -57,7 +57,7 @@ msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."

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

58msgctxt "Title: Lock/Log out dialog"

59msgid "Log out"

60−msgstr ""

60+msgstr "Digevreañ"

61

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

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

@@ -66,12 +66,12 @@ msgstr "Ha sur oc'h e fell deoc'h digevreañ ?"

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

67msgctxt "Button: Lock the system"

68msgid "Lock"

69−msgstr ""

69+msgstr "Prennañ"

70

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

72msgctxt "Button: Log out from the system"

73msgid "Log Out"

74−msgstr ""

74+msgstr "Digevreañ"

75

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

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

@@ -81,7 +81,7 @@ msgstr "Nullañ"

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

82msgctxt "Title: Reboot/Shut down dialog"

83msgid "Shut down"

84−msgstr ""

84+msgstr "Lazhañ ar benveg"

85

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

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

@@ -90,17 +90,17 @@ msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"

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

91msgctxt "Button: Reboot the system"

92msgid "Reboot"

93−msgstr ""

93+msgstr "Adloc'hañ"

94

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

96msgctxt "Button: Shut down the system"

97msgid "Shut down"

98−msgstr ""

98+msgstr "Lazhañ ar benveg"

99

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

101msgctxt "Title: Reboot dialog"

102msgid "Reboot"

103−msgstr ""

103+msgstr "Adloc'hañ"

104

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

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

@@ -117,7 +117,7 @@ msgstr "Ya"

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

118msgctxt "Title: Power off/Restart dialog"

119msgid "Power"

120−msgstr ""

120+msgstr "Enaouiñ"

121

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

123msgid ""

@@ -130,12 +130,12 @@ msgstr ""

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

131msgctxt "Button: Power off the system"

132msgid "Power off"

133−msgstr ""

133+msgstr "Lazhañ"

134

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

136msgctxt "Button: Restart the system"

137msgid "Restart"

138−msgstr ""

138+msgstr "Adloc'hañ"

139

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

141msgid "Return to Call"

@@ -160,19 +160,20 @@ msgstr "Gwelet pep tra"

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

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

162msgid "Search"

163−msgstr ""

163+msgstr "Klask"

164

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

166−msgctxt "Button: The Ubuntu Store"

166+msgctxt "Button: Open the Ubuntu Store"

167msgid "Store"

168−msgstr ""

168+msgstr "Stal"

169

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

171−msgctxt "Button: Shown in Page Header Menu"

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

172msgid "Search"

173−msgstr ""

173+msgstr "Klask"

174

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

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

176msgid "Settings"

177msgid "Settings"

177msgstr "Arventennoù"

178msgstr "Arventennoù"

178

179

@@ -341,7 +342,7 @@ msgstr "C'hwitet, touchit evit adkregiñ"

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

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

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

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

343msgid "Reply"

344msgid "Reply"

344−msgstr ""

345+msgstr "Respont"

345

346

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

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

347msgid "Unlock SIM"

348msgid "Unlock SIM"

@@ -406,7 +407,7 @@ msgstr "Gwelet an holl drevelloù a ya en-dro."

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

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

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

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

408msgid "Back"

409msgid "Back"

409−msgstr ""

410+msgstr "Distreiñ"

410

411

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

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

412msgid "Hi!"

413msgid "Hi!"

@@ -451,32 +452,32 @@ msgstr ""

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

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

452msgctxt "Label: Type of security method"

453msgctxt "Label: Type of security method"

453msgid "Swipe"

454msgid "Swipe"

454−msgstr ""

455+msgstr "Riklañ"

455

456

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

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

457msgctxt "Label: Description of security method"

458msgctxt "Label: Description of security method"

458msgid "No security"

459msgid "No security"

459−msgstr ""

460+msgstr "Tamm surentez ebet"

460

461

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

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

462msgctxt "Label: Type of security method"

463msgctxt "Label: Type of security method"

463msgid "Passcode"

464msgid "Passcode"

464−msgstr ""

465+msgstr "Kod-tremen"

465

466

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

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

467msgctxt "Label: Description of security method"

468msgctxt "Label: Description of security method"

468msgid "4 digits only"

469msgid "4 digits only"

469−msgstr ""

470+msgstr "4 sifr hepken"

470

471

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

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

472msgctxt "Label: Type of security method"

473msgctxt "Label: Type of security method"

473msgid "Passphrase"

474msgid "Passphrase"

474−msgstr ""

475+msgstr "Frazenn-dremen"

475

476

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

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

477msgctxt "Label: Description of security method"

478msgctxt "Label: Description of security method"

478msgid "Numbers and letters"

479msgid "Numbers and letters"

479−msgstr ""

480+msgstr "Sifroù ha lizherennoù"

480

481

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

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

482msgid "Connect to Wi‑Fi"

483msgid "Connect to Wi‑Fi"

@@ -682,6 +683,9 @@ msgstr "%1 〉"

682#~ msgid "Shut down"

683#~ msgid "Shut down"

683#~ msgstr "Lazhañ ar benveg"

684#~ msgstr "Lazhañ ar benveg"

684

685

686+#~ msgid "Settings"

687+#~ msgstr "Arventennoù"

688+

685#~ msgid "Restart"

689#~ msgid "Restart"

686#~ msgstr "Adloc'hañ"

690#~ msgstr "Adloc'hañ"

687

691

po/bs.po+6−5

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

11"PO-Revision-Date: 2014-01-16 22:33+0000\n"

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

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

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

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

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

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

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

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

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

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

21

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

23msgid "Password: "

@@ -158,16 +158,17 @@ msgid "Search"

158msgstr ""

159

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

161−msgctxt "Button: The Ubuntu Store"

161+msgctxt "Button: Open the Ubuntu Store"

162msgid "Store"

163msgstr ""

164

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

166−msgctxt "Button: Shown in Page Header Menu"

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

167msgid "Search"

168msgstr ""

169

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

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

171msgid "Settings"

172msgid "Settings"

172msgstr ""

173msgstr ""

173

174

po/ca.po+10−6

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

11"PO-Revision-Date: 2015-03-07 11:45+0000\n"

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

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

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

@@ -163,18 +163,19 @@ msgid "Search"

163msgstr ""

164

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

166−msgctxt "Button: The Ubuntu Store"

166+msgctxt "Button: Open the Ubuntu Store"

167msgid "Store"

168msgstr ""

169

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

171−msgctxt "Button: Shown in Page Header Menu"

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

172msgid "Search"

173msgstr ""

174

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

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

176msgid "Settings"

177msgid "Settings"

177−msgstr "Paràmetres"

178+msgstr ""

178

179

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

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

180msgid "Remove from Favorites"

181msgid "Remove from Favorites"

@@ -677,6 +678,9 @@ msgstr "%1 〉"

677#~ msgid "Reboot"

678#~ msgid "Reboot"

678#~ msgstr "Reinicia"

679#~ msgstr "Reinicia"

679

680

681+#~ msgid "Settings"

682+#~ msgstr "Paràmetres"

683+

680#~ msgid "Power"

684#~ msgid "Power"

681#~ msgstr "Energia"

685#~ msgstr "Energia"

682

686

po/ca@valencia.po+10−6

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

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

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

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

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

@@ -163,18 +163,19 @@ msgid "Search"

163msgstr ""

164

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

166−msgctxt "Button: The Ubuntu Store"

166+msgctxt "Button: Open the Ubuntu Store"

167msgid "Store"

168msgstr ""

169

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

171−msgctxt "Button: Shown in Page Header Menu"

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

172msgid "Search"

173msgstr ""

174

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

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

176msgid "Settings"

177msgid "Settings"

177−msgstr "Paràmetres"

178+msgstr ""

178

179

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

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

180msgid "Remove from Favorites"

181msgid "Remove from Favorites"

@@ -655,6 +656,9 @@ msgstr "%1 〉"

655#~ msgid "Search"

656#~ msgid "Search"

656#~ msgstr "Cerca"

657#~ msgstr "Cerca"

657

658

659+#~ msgid "Settings"

660+#~ msgstr "Paràmetres"

661+

658#~ msgid "Manage Scopes"

662#~ msgid "Manage Scopes"

659#~ msgstr "Gestioneu les lents"

663#~ msgstr "Gestioneu les lents"

660

664

po/ce.po+6−5

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

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

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

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

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

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

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

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

165−msgctxt "Button: Shown in Page Header Menu"

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

166msgid "Search"

167msgstr ""

168

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

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

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/ckb.po+6−5

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

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

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

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

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

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

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

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

165−msgctxt "Button: Shown in Page Header Menu"

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

166msgid "Search"

167msgstr ""

168

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

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

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/cs.po+6−5

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

11"PO-Revision-Date: 2014-01-08 10:11+0000\n"

12"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"

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

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

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

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

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

165−msgctxt "Button: Shown in Page Header Menu"

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

166msgid "Search"

167msgstr ""

168

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

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

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/da.po+6−5

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

8msgstr ""

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

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

11−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

12"PO-Revision-Date: 2014-07-30 12:37+0000\n"

13"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"

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

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

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

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

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

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

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

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

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

21

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

23msgid "Password: "

@@ -158,16 +158,17 @@ msgid "Search"

158msgstr ""

159

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

161−msgctxt "Button: The Ubuntu Store"

161+msgctxt "Button: Open the Ubuntu Store"

162msgid "Store"

163msgstr ""

164

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

166−msgctxt "Button: Shown in Page Header Menu"

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

167msgid "Search"

168msgstr ""

169

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

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

171msgid "Settings"

172msgid "Settings"

172msgstr ""

173msgstr ""

173

174

po/de.po+10−6

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

11"PO-Revision-Date: 2015-03-06 14:24+0000\n"

12"Last-Translator: Niklas Wenzel <nikwen.developer@gmail.com>\n"

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

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

@@ -163,18 +163,19 @@ msgid "Search"

163msgstr ""

164

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

166−msgctxt "Button: The Ubuntu Store"

166+msgctxt "Button: Open the Ubuntu Store"

167msgid "Store"

168msgstr ""

169

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

171−msgctxt "Button: Shown in Page Header Menu"

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

172msgid "Search"

173msgstr ""

174

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

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

176msgid "Settings"

177msgid "Settings"

177−msgstr "Einstellungen"

178+msgstr ""

178

179

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

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

180msgid "Remove from Favorites"

181msgid "Remove from Favorites"

@@ -681,6 +682,9 @@ msgstr "%1 〉"

681#~ msgid "Power"

682#~ msgid "Power"

682#~ msgstr "Energie"

683#~ msgstr "Energie"

683

684

685+#~ msgid "Settings"

686+#~ msgstr "Einstellungen"

687+

684#~ msgid "Restart"

688#~ msgid "Restart"

685#~ msgstr "Neustarten"

689#~ msgstr "Neustarten"

686

690

po/el.po+14−10

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

11−"PO-Revision-Date: 2015-03-19 22:46+0000\n"

11+"PO-Revision-Date: 2015-03-30 19:52+0000\n"

12"Last-Translator: Simos Xenitellis <Unknown>\n"

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

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2015-03-31 05:58+0000\n"

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

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

20

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

22msgid "Password: "

@@ -130,7 +130,7 @@ msgstr ""

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

131msgctxt "Button: Power off the system"

132msgid "Power off"

133−msgstr ""

133+msgstr "Κλείσιμο τροφοδοσίας"

134

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

136msgctxt "Button: Restart the system"

@@ -163,18 +163,19 @@ msgid "Search"

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

164

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

166−msgctxt "Button: The Ubuntu Store"

166+msgctxt "Button: Open the Ubuntu Store"

167msgid "Store"

168−msgstr "Κατάστημα"

168+msgstr ""

169

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

171−msgctxt "Button: Shown in Page Header Menu"

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

172msgid "Search"

173−msgstr "Αναζήτηση"

173+msgstr ""

174

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

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

176msgid "Settings"

177msgid "Settings"

177−msgstr "Ρυθμίσεις"

178+msgstr ""

178

179

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

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

180msgid "Remove from Favorites"

181msgid "Remove from Favorites"

@@ -686,5 +687,8 @@ msgstr "%1 〉"

686#~ msgid "Shut down"

687#~ msgid "Shut down"

687#~ msgstr "Τερματισμός λειτουργίας"

688#~ msgstr "Τερματισμός λειτουργίας"

688

689

690+#~ msgid "Settings"

691+#~ msgstr "Ρυθμίσεις"

692+

689#~ msgid "Power"

693#~ msgid "Power"

690#~ msgstr "Ενέργεια"

694#~ msgstr "Ενέργεια"

po/en_AU.po+31−27

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"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"

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

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

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

20

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

22msgid "Password: "

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

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

54msgctxt "Title: Lock/Log out dialog"

55msgid "Log out"

56−msgstr ""

56+msgstr "Log out"

57

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

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

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

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

63msgctxt "Button: Lock the system"

64msgid "Lock"

65−msgstr ""

65+msgstr "Lock"

66

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

68msgctxt "Button: Log out from the system"

69msgid "Log Out"

70−msgstr ""

70+msgstr "Log Out"

71

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

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

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

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

78msgctxt "Title: Reboot/Shut down dialog"

79msgid "Shut down"

80−msgstr ""

80+msgstr "Shut down"

81

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

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

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

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

87msgctxt "Button: Reboot the system"

88msgid "Reboot"

89−msgstr ""

89+msgstr "Reboot"

90

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

92msgctxt "Button: Shut down the system"

93msgid "Shut down"

94−msgstr ""

94+msgstr "Shut down"

95

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

97msgctxt "Title: Reboot dialog"

98msgid "Reboot"

99−msgstr ""

99+msgstr "Reboot"

100

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

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

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

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

114msgctxt "Title: Power off/Restart dialog"

115msgid "Power"

116−msgstr ""

116+msgstr "Power"

117

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

119msgid ""

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

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

127msgctxt "Button: Power off the system"

128msgid "Power off"

129−msgstr ""

129+msgstr "Power off"

130

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

132msgctxt "Button: Restart the system"

133msgid "Restart"

134−msgstr ""

134+msgstr "Restart"

135

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

137msgid "Return to Call"

@@ -156,19 +156,20 @@ msgstr "See all"

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

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

158msgid "Search"

159−msgstr ""

159+msgstr "Search"

160

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

162−msgctxt "Button: The Ubuntu Store"

162+msgctxt "Button: Open the Ubuntu Store"

163msgid "Store"

164−msgstr ""

164+msgstr "Store"

165

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

167−msgctxt "Button: Shown in Page Header Menu"

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

168msgid "Search"

169−msgstr ""

169+msgstr "Search"

170

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

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

172msgid "Settings"

173msgid "Settings"

173msgstr "Settings"

174msgstr "Settings"

174

175

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

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

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

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

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

339msgid "Reply"

340msgid "Reply"

340−msgstr ""

341+msgstr "Reply"

341

342

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

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

343msgid "Unlock SIM"

344msgid "Unlock SIM"

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

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

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

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

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

404msgid "Back"

405msgid "Back"

405−msgstr ""

406+msgstr "Back"

406

407

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

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

408msgid "Hi!"

409msgid "Hi!"

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

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

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

447msgctxt "Label: Type of security method"

448msgctxt "Label: Type of security method"

448msgid "Swipe"

449msgid "Swipe"

449−msgstr ""

450+msgstr "Swipe"

450

451

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

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

452msgctxt "Label: Description of security method"

453msgctxt "Label: Description of security method"

453msgid "No security"

454msgid "No security"

454−msgstr ""

455+msgstr "No security"

455

456

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

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

457msgctxt "Label: Type of security method"

458msgctxt "Label: Type of security method"

458msgid "Passcode"

459msgid "Passcode"

459−msgstr ""

460+msgstr "Passcode"

460

461

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

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

462msgctxt "Label: Description of security method"

463msgctxt "Label: Description of security method"

463msgid "4 digits only"

464msgid "4 digits only"

464−msgstr ""

465+msgstr "4 digits only"

465

466

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

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

467msgctxt "Label: Type of security method"

468msgctxt "Label: Type of security method"

468msgid "Passphrase"

469msgid "Passphrase"

469−msgstr ""

470+msgstr "Passphrase"

470

471

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

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

472msgctxt "Label: Description of security method"

473msgctxt "Label: Description of security method"

473msgid "Numbers and letters"

474msgid "Numbers and letters"

474−msgstr ""

475+msgstr "Numbers and letters"

475

476

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

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

477msgid "Connect to Wi‑Fi"

478msgid "Connect to Wi‑Fi"

@@ -671,6 +672,9 @@ msgstr "%1 〉"

671#~ msgid "Shut down"

672#~ msgid "Shut down"

672#~ msgstr "Shut down"

673#~ msgstr "Shut down"

673

674

675+#~ msgid "Settings"

676+#~ msgstr "Settings"

677+

674#~ msgid "Restart"

678#~ msgid "Restart"

675#~ msgstr "Restart"

679#~ msgstr "Restart"

676

680

po/en_GB.po+20−8

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

11"PO-Revision-Date: 2015-01-22 12:14+0000\n"

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

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

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

@@ -159,18 +159,19 @@ msgid "Search"

159msgstr "Search"

160

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

162−msgctxt "Button: The Ubuntu Store"

162+msgctxt "Button: Open the Ubuntu Store"

163msgid "Store"

164−msgstr "Store"

164+msgstr ""

165

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

167−msgctxt "Button: Shown in Page Header Menu"

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

168msgid "Search"

169−msgstr "Search"

169+msgstr ""

170

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

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

172msgid "Settings"

173msgid "Settings"

173−msgstr "Settings"

174+msgstr ""

174

175

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

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

176msgid "Remove from Favorites"

177msgid "Remove from Favorites"

@@ -671,8 +672,19 @@ msgstr "%1 〉"

671#~ msgid "Shut down"

672#~ msgid "Shut down"

672#~ msgstr "Shut down"

673#~ msgstr "Shut down"

673

674

675+#~ msgid "Settings"

676+#~ msgstr "Settings"

677+

674#~ msgid "Restart"

678#~ msgid "Restart"

675#~ msgstr "Restart"

679#~ msgstr "Restart"

676

680

677#~ msgid "Manage Scopes"

681#~ msgid "Manage Scopes"

678#~ msgstr "Manage Scopes"

682#~ msgstr "Manage Scopes"

683+

684+#~ msgctxt "Button: Shown in Page Header Menu"

685+#~ msgid "Search"

686+#~ msgstr "Search"

687+

688+#~ msgctxt "Button: The Ubuntu Store"

689+#~ msgid "Store"

690+#~ msgstr "Store"

po/eo.po+6−5

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

11"PO-Revision-Date: 2013-06-26 22:35+0000\n"

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

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

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

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

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

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

165−msgctxt "Button: Shown in Page Header Menu"

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

166msgid "Search"

167msgstr ""

168

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

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

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/es.po+37−33

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

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

11+"PO-Revision-Date: 2015-03-27 21:24+0000\n"

12−"Last-Translator: Jose Luis Tirado <Unknown>\n"

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

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

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2015-03-28 05:32+0000\n"

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

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

20

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

22msgid "Password: "

@@ -57,21 +57,21 @@ msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."

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

58msgctxt "Title: Lock/Log out dialog"

59msgid "Log out"

60−msgstr ""

60+msgstr "Cerrar la sesión"

61

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

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

64−msgstr "̉¿Está seguro de que quiere cerrar la sesión?"

64+msgstr "¿Seguro que quiere cerrar la sesión?"

65

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

67msgctxt "Button: Lock the system"

68msgid "Lock"

69−msgstr ""

69+msgstr "Bloquear"

70

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

72msgctxt "Button: Log out from the system"

73msgid "Log Out"

74−msgstr ""

74+msgstr "Cerrar la sesión"

75

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

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

@@ -81,7 +81,7 @@ msgstr "Cancelar"

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

82msgctxt "Title: Reboot/Shut down dialog"

83msgid "Shut down"

84−msgstr ""

84+msgstr "Apagar"

85

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

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

@@ -90,21 +90,21 @@ msgstr "¿Está seguro de que quiere apagar?"

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

91msgctxt "Button: Reboot the system"

92msgid "Reboot"

93−msgstr ""

93+msgstr "Reiniciar"

94

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

96msgctxt "Button: Shut down the system"

97msgid "Shut down"

98−msgstr ""

98+msgstr "Apagar"

99

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

101msgctxt "Title: Reboot dialog"

102msgid "Reboot"

103−msgstr ""

103+msgstr "Reiniciar"

104

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

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

107−msgstr "¿Esta seguro de que quiere reiniciar?"

107+msgstr "¿Seguro que quiere reiniciar?"

108

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

110msgid "No"

@@ -117,25 +117,25 @@ msgstr "Sí"

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

118msgctxt "Title: Power off/Restart dialog"

119msgid "Power"

120−msgstr ""

120+msgstr "Apagar"

121

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

123msgid ""

124"Are you sure you would like\n"

125"to power off?"

126msgstr ""

127−"¿Está seguro de que quiere\n"

127+"¿Seguro que quiere\n"

128"apagar?"

129

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

131msgctxt "Button: Power off the system"

132msgid "Power off"

133−msgstr ""

133+msgstr "Apagar"

134

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

136msgctxt "Button: Restart the system"

137msgid "Restart"

138−msgstr ""

138+msgstr "Reiniciar"

139

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

141msgid "Return to Call"

@@ -160,21 +160,22 @@ msgstr "Ver todo"

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

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

162msgid "Search"

163−msgstr ""

163+msgstr "Búsqueda"

164

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

166−msgctxt "Button: The Ubuntu Store"

166+msgctxt "Button: Open the Ubuntu Store"

167msgid "Store"

168−msgstr ""

168+msgstr "Tienda"

169

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

171−msgctxt "Button: Shown in Page Header Menu"

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

172msgid "Search"

173−msgstr ""

173+msgstr "Buscar"

174

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

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

176msgid "Settings"

177msgid "Settings"

177−msgstr "Configuración"

178+msgstr "Ajustes"

178

179

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

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

180msgid "Remove from Favorites"

181msgid "Remove from Favorites"

@@ -304,7 +305,7 @@ msgstr "Mostrar contraseña"

304

305

305#: qml/Panel/ActiveCallHint.qml:79

306#: qml/Panel/ActiveCallHint.qml:79

306msgid "Tap to return to call..."

307msgid "Tap to return to call..."

307−msgstr "Toque para volver a llamar..."

308+msgstr "Toque para volver a la llamada…"

308

309

309#: qml/Panel/ActiveCallHint.qml:92

310#: qml/Panel/ActiveCallHint.qml:92

310msgid "Conference"

311msgid "Conference"

@@ -341,7 +342,7 @@ msgstr "Falló, toque para reintentar"

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

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

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

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

343msgid "Reply"

344msgid "Reply"

344−msgstr ""

345+msgstr "Responder"

345

346

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

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

347msgid "Unlock SIM"

348msgid "Unlock SIM"

@@ -406,7 +407,7 @@ msgstr "Ver todas las tareas en ejecución."

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

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

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

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

408msgid "Back"

409msgid "Back"

409−msgstr ""

410+msgstr "Atrás"

410

411

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

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

412msgid "Hi!"

413msgid "Hi!"

@@ -450,32 +451,32 @@ msgstr "Seleccione el método de desbloqueo del teléfono."

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

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

451msgctxt "Label: Type of security method"

452msgctxt "Label: Type of security method"

452msgid "Swipe"

453msgid "Swipe"

453−msgstr ""

454+msgstr "Deslizar"

454

455

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

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

456msgctxt "Label: Description of security method"

457msgctxt "Label: Description of security method"

457msgid "No security"

458msgid "No security"

458−msgstr ""

459+msgstr "Sin seguridad"

459

460

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

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

461msgctxt "Label: Type of security method"

462msgctxt "Label: Type of security method"

462msgid "Passcode"

463msgid "Passcode"

463−msgstr ""

464+msgstr "Código"

464

465

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

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

466msgctxt "Label: Description of security method"

467msgctxt "Label: Description of security method"

467msgid "4 digits only"

468msgid "4 digits only"

468−msgstr ""

469+msgstr "Solo 4 dígitos"

469

470

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

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

471msgctxt "Label: Type of security method"

472msgctxt "Label: Type of security method"

472msgid "Passphrase"

473msgid "Passphrase"

473−msgstr ""

474+msgstr "Contraseña"

474

475

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

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

476msgctxt "Label: Description of security method"

477msgctxt "Label: Description of security method"

477msgid "Numbers and letters"

478msgid "Numbers and letters"

478−msgstr ""

479+msgstr "Números y letras"

479

480

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

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

481msgid "Connect to Wi‑Fi"

482msgid "Connect to Wi‑Fi"

@@ -672,6 +673,9 @@ msgstr "%1 〉"

672#~ msgid "Shut down"

673#~ msgid "Shut down"

673#~ msgstr "Apagar"

674#~ msgstr "Apagar"

674

675

676+#~ msgid "Settings"

677+#~ msgstr "Configuración"

678+

675#~ msgid "Log out"

679#~ msgid "Log out"

676#~ msgstr "Cerrar la sesión"

680#~ msgstr "Cerrar la sesión"

677

681

po/eu.po+10−6

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

11"PO-Revision-Date: 2015-01-22 21:40+0000\n"

12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

13"Language-Team: Basque <eu@li.org>\n"

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

@@ -160,18 +160,19 @@ msgid "Search"

160msgstr ""

161

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

163−msgctxt "Button: The Ubuntu Store"

163+msgctxt "Button: Open the Ubuntu Store"

164msgid "Store"

165msgstr ""

166

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

168−msgctxt "Button: Shown in Page Header Menu"

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

169msgid "Search"

170msgstr ""

171

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

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

173msgid "Settings"

174msgid "Settings"

174−msgstr "Ezarpenak"

175+msgstr ""

175

176

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

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

177msgid "Remove from Favorites"

178msgid "Remove from Favorites"

@@ -651,6 +652,9 @@ msgstr "%1 〉"

651#~ msgid "Shut down"

652#~ msgid "Shut down"

652#~ msgstr "Itzali"

653#~ msgstr "Itzali"

653

654

655+#~ msgid "Settings"

656+#~ msgstr "Ezarpenak"

657+

654#~ msgid "Power off"

658#~ msgid "Power off"

655#~ msgstr "Itzali"

659#~ msgstr "Itzali"

656

660

po/fa.po+31−27

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"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"

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

13"Language-Team: Persian <fa@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=1; plural=0;\n"

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

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

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

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

20

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

22msgid "Password: "

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

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

54msgctxt "Title: Lock/Log out dialog"

55msgid "Log out"

56−msgstr ""

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

57

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

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

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

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

63msgctxt "Button: Lock the system"

64msgid "Lock"

65−msgstr ""

65+msgstr "قفل"

66

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

68msgctxt "Button: Log out from the system"

69msgid "Log Out"

70−msgstr ""

70+msgstr "خروج"

71

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

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

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

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

78msgctxt "Title: Reboot/Shut down dialog"

79msgid "Shut down"

80−msgstr ""

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

81

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

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

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

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

87msgctxt "Button: Reboot the system"

88msgid "Reboot"

89−msgstr ""

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

90

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

92msgctxt "Button: Shut down the system"

93msgid "Shut down"

94−msgstr ""

94+msgstr "خاموش"

95

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

97msgctxt "Title: Reboot dialog"

98msgid "Reboot"

99−msgstr ""

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

100

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

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

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

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

114msgctxt "Title: Power off/Restart dialog"

115msgid "Power"

116−msgstr ""

116+msgstr "انرژی"

117

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

119msgid ""

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

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

127msgctxt "Button: Power off the system"

128msgid "Power off"

129−msgstr ""

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

130

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

132msgctxt "Button: Restart the system"

133msgid "Restart"

134−msgstr ""

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

135

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

137msgid "Return to Call"

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

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

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

158msgid "Search"

159−msgstr ""

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

160

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

162−msgctxt "Button: The Ubuntu Store"

162+msgctxt "Button: Open the Ubuntu Store"

163msgid "Store"

164−msgstr ""

164+msgstr "ذخیره"

165

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

167−msgctxt "Button: Shown in Page Header Menu"

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

168msgid "Search"

169−msgstr ""

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

170

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

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

172msgid "Settings"

173msgid "Settings"

173msgstr "تنظیمات"

174msgstr "تنظیمات"

174

175

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

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

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

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

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

339msgid "Reply"

340msgid "Reply"

340−msgstr ""

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

341

342

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

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

343msgid "Unlock SIM"

344msgid "Unlock SIM"

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

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

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

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

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

404msgid "Back"

405msgid "Back"

405−msgstr ""

406+msgstr "بازگشت"

406

407

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

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

408msgid "Hi!"

409msgid "Hi!"

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

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

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

448msgctxt "Label: Type of security method"

449msgctxt "Label: Type of security method"

449msgid "Swipe"

450msgid "Swipe"

450−msgstr ""

451+msgstr "لغزش"

451

452

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

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

453msgctxt "Label: Description of security method"

454msgctxt "Label: Description of security method"

454msgid "No security"

455msgid "No security"

455−msgstr ""

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

456

457

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

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

458msgctxt "Label: Type of security method"

459msgctxt "Label: Type of security method"

459msgid "Passcode"

460msgid "Passcode"

460−msgstr ""

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

461

462

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

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

463msgctxt "Label: Description of security method"

464msgctxt "Label: Description of security method"

464msgid "4 digits only"

465msgid "4 digits only"

465−msgstr ""

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

466

467

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

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

468msgctxt "Label: Type of security method"

469msgctxt "Label: Type of security method"

469msgid "Passphrase"

470msgid "Passphrase"

470−msgstr ""

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

471

472

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

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

473msgctxt "Label: Description of security method"

474msgctxt "Label: Description of security method"

474msgid "Numbers and letters"

475msgid "Numbers and letters"

475−msgstr ""

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

476

477

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

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

478msgid "Connect to Wi‑Fi"

479msgid "Connect to Wi‑Fi"

@@ -673,6 +674,9 @@ msgstr "%1 〉"

673#~ msgid "Shut down"

674#~ msgid "Shut down"

674#~ msgstr "خاموش کردن"

675#~ msgstr "خاموش کردن"

675

676

677+#~ msgid "Settings"

678+#~ msgstr "تنظیمات"

679+

676#~ msgid "Restart"

680#~ msgid "Restart"

677#~ msgstr "شروع مجدّد"

681#~ msgstr "شروع مجدّد"

678

682

po/fi.po+10−6

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

11−"PO-Revision-Date: 2015-03-19 07:54+0000\n"

11+"PO-Revision-Date: 2015-03-25 07:55+0000\n"

12"Last-Translator: Jiri Grönroos <Unknown>\n"

13"Language-Team: Finnish <fi@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2015-03-26 05:27+0000\n"

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

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

20

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

22msgid "Password: "

@@ -161,16 +161,17 @@ msgid "Search"

161msgstr "Etsi"

162

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

164−msgctxt "Button: The Ubuntu Store"

164+msgctxt "Button: Open the Ubuntu Store"

165msgid "Store"

166msgstr "Kauppa"

167

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

169−msgctxt "Button: Shown in Page Header Menu"

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

170msgid "Search"

171msgstr "Etsi"

172

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

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

174msgid "Settings"

175msgid "Settings"

175msgstr "Asetukset"

176msgstr "Asetukset"

176

177

@@ -671,6 +672,9 @@ msgstr "%1 〉"

671#~ msgid "Shut down"

672#~ msgid "Shut down"

672#~ msgstr "Sammuta"

673#~ msgstr "Sammuta"

673

674

675+#~ msgid "Settings"

676+#~ msgstr "Asetukset"

677+

674#~ msgid "Power"

678#~ msgid "Power"

675#~ msgstr "Virran katkaisu"

679#~ msgstr "Virran katkaisu"

676

680

po/fo.po+6−5

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

7msgstr ""

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

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

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

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

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

12"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"

13"Language-Team: Faroese <fo@li.org>\n"

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

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

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

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

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/fr.po+20−8

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2015-03-19 21:55+0000\n"

12"Last-Translator: Anne <anneonyme017@gmail.com>\n"

13"Language-Team: French <fr@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -163,18 +163,19 @@ msgid "Search"

163msgstr "Rechercher"

164

165#: qml/Dash/PageHeader.qml:269

166−msgctxt "Button: The Ubuntu Store"

166+msgctxt "Button: Open the Ubuntu Store"

167msgid "Store"

168−msgstr "Logithèque"

168+msgstr ""

169

170#: qml/Dash/PageHeader.qml:276

171−msgctxt "Button: Shown in Page Header Menu"

171+msgctxt "Button: Start a search in the current dash scope"

172msgid "Search"

173−msgstr "Rechercher"

173+msgstr ""

174

175#: qml/Dash/PageHeader.qml:286

176+msgctxt "Button: Show the current dash scope settings"

176msgid "Settings"

177msgid "Settings"

177−msgstr "Paramètres"

178+msgstr ""

178

179

179#: qml/Dash/PageHeader.qml:293

180#: qml/Dash/PageHeader.qml:293

180msgid "Remove from Favorites"

181msgid "Remove from Favorites"

@@ -687,6 +688,9 @@ msgstr "%1 〉"

687#~ msgid "Shut down"

688#~ msgid "Shut down"

688#~ msgstr "Éteindre"

689#~ msgstr "Éteindre"

689

690

691+#~ msgid "Settings"

692+#~ msgstr "Paramètres"

693+

690#~ msgid "Power"

694#~ msgid "Power"

691#~ msgstr "Alimentation"

695#~ msgstr "Alimentation"

692

696

@@ -695,3 +699,11 @@ msgstr "%1 〉"

695

699

696#~ msgid "Manage Scopes"

700#~ msgid "Manage Scopes"

697#~ msgstr "Gérer les moteurs de recherche"

701#~ msgstr "Gérer les moteurs de recherche"

702+

703+#~ msgctxt "Button: Shown in Page Header Menu"

704+#~ msgid "Search"

705+#~ msgstr "Rechercher"

706+

707+#~ msgctxt "Button: The Ubuntu Store"

708+#~ msgid "Store"

709+#~ msgstr "Logithèque"

po/gd.po+30−26

@@ -7,8 +7,8 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2015-03-12 17:56+0000\n"

11+"PO-Revision-Date: 2015-03-27 09:50+0000\n"

12"Last-Translator: GunChleoc <Unknown>\n"

13"Language-Team: Fòram na Gàidhlig\n"

14"MIME-Version: 1.0\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "

18"(n > 2 && n < 20) ? 2 : 3;\n"

19−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

19+"X-Launchpad-Export-Date: 2015-03-28 05:32+0000\n"

20−"X-Generator: Launchpad (build 17405)\n"

20+"X-Generator: Launchpad (build 17413)\n"

21"Language: gd\n"

22

23#: plugins/LightDM/Greeter.cpp:112

@@ -61,7 +61,7 @@ msgstr[3] "Fuirich ort %1 diog 's feuch ris a-rithist an uairsin…"

61#: qml/Components/Dialogs.qml:67

62msgctxt "Title: Lock/Log out dialog"

63msgid "Log out"

64−msgstr ""

64+msgstr "Clàraich a-mach"

65

66#: qml/Components/Dialogs.qml:68

67msgid "Are you sure you want to log out?"

@@ -70,12 +70,12 @@ msgstr "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?"

70#: qml/Components/Dialogs.qml:70

71msgctxt "Button: Lock the system"

72msgid "Lock"

73−msgstr ""

73+msgstr "Glais"

74

75#: qml/Components/Dialogs.qml:77

76msgctxt "Button: Log out from the system"

77msgid "Log Out"

78−msgstr ""

78+msgstr "Clàraich a-mach"

79

80#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

81#: qml/Components/Dialogs.qml:171

@@ -85,7 +85,7 @@ msgstr "Sguir dheth"

85#: qml/Components/Dialogs.qml:96

86msgctxt "Title: Reboot/Shut down dialog"

87msgid "Shut down"

88−msgstr ""

88+msgstr "Dùin sìos"

89

90#: qml/Components/Dialogs.qml:97

91msgid "Are you sure you want to shut down?"

@@ -94,17 +94,17 @@ msgstr "A bheil thu cinnteach gu bheil thu airson a dhùnadh sìos?"

94#: qml/Components/Dialogs.qml:99

95msgctxt "Button: Reboot the system"

96msgid "Reboot"

97−msgstr ""

97+msgstr "Ath-thòisich an siostam"

98

99#: qml/Components/Dialogs.qml:107

100msgctxt "Button: Shut down the system"

101msgid "Shut down"

102−msgstr ""

102+msgstr "Dùin sìos"

103

104#: qml/Components/Dialogs.qml:127

105msgctxt "Title: Reboot dialog"

106msgid "Reboot"

107−msgstr ""

107+msgstr "Ath-thòisich an siostam"

108

109#: qml/Components/Dialogs.qml:128

110msgid "Are you sure you want to reboot?"

@@ -121,7 +121,7 @@ msgstr "Tha"

121#: qml/Components/Dialogs.qml:150

122msgctxt "Title: Power off/Restart dialog"

123msgid "Power"

124−msgstr ""

124+msgstr "Cumhachd"

125

126#: qml/Components/Dialogs.qml:151

127msgid ""

@@ -134,12 +134,12 @@ msgstr ""

134#: qml/Components/Dialogs.qml:153

135msgctxt "Button: Power off the system"

136msgid "Power off"

137−msgstr ""

137+msgstr "Cuir a' chumhachd dheth"

138

139#: qml/Components/Dialogs.qml:162

140msgctxt "Button: Restart the system"

141msgid "Restart"

142−msgstr ""

142+msgstr "Ath-thòisich"

143

144#: qml/Components/Lockscreen.qml:238

145msgid "Return to Call"

@@ -164,19 +164,20 @@ msgstr "Seall na h-uile"

164#: qml/Dash/GenericScopeView.qml:595

165msgctxt "Label: Hint for dash search line edit"

166msgid "Search"

167−msgstr ""

167+msgstr "Lorg"

168

169#: qml/Dash/PageHeader.qml:269

170−msgctxt "Button: The Ubuntu Store"

170+msgctxt "Button: Open the Ubuntu Store"

171msgid "Store"

172−msgstr ""

172+msgstr "A' bhùth"

173

174#: qml/Dash/PageHeader.qml:276

175−msgctxt "Button: Shown in Page Header Menu"

175+msgctxt "Button: Start a search in the current dash scope"

176msgid "Search"

177−msgstr ""

177+msgstr "Lorg"

178

179#: qml/Dash/PageHeader.qml:286

180+msgctxt "Button: Show the current dash scope settings"

180msgid "Settings"

181msgid "Settings"

181msgstr "Roghainnean"

182msgstr "Roghainnean"

182

183

@@ -347,7 +348,7 @@ msgstr "Dh'fhàillig leis, thoir gnogag gus feuchainn a-rithist"

347#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

348#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

348msgctxt "Label: Hint in message indicator line edit"

349msgctxt "Label: Hint in message indicator line edit"

349msgid "Reply"

350msgid "Reply"

350−msgstr ""

351+msgstr "Freagairt"

351

352

352#: qml/Panel/Indicators/ModemInfoItem.qml:105

353#: qml/Panel/Indicators/ModemInfoItem.qml:105

353msgid "Unlock SIM"

354msgid "Unlock SIM"

@@ -412,7 +413,7 @@ msgstr "Seall gach saothair a tha thu a' ruith."

412#: qml/Wizard/Page.qml:89

413#: qml/Wizard/Page.qml:89

413msgctxt "Button: Go back one page in the Wizard"

414msgctxt "Button: Go back one page in the Wizard"

414msgid "Back"

415msgid "Back"

415−msgstr ""

416+msgstr "Air ais"

416

417

417#: qml/Wizard/Pages/10-welcome.qml:27

418#: qml/Wizard/Pages/10-welcome.qml:27

418msgid "Hi!"

419msgid "Hi!"

@@ -456,17 +457,17 @@ msgstr "Tagh an dòigh sa tha thu airson a' ghlas a thoirt far an fhòn agad."

456#: qml/Wizard/Pages/30-passwd-type.qml:97

457#: qml/Wizard/Pages/30-passwd-type.qml:97

457msgctxt "Label: Type of security method"

458msgctxt "Label: Type of security method"

458msgid "Swipe"

459msgid "Swipe"

459−msgstr ""

460+msgstr "Grad-shlaighd"

460

461

461#: qml/Wizard/Pages/30-passwd-type.qml:98

462#: qml/Wizard/Pages/30-passwd-type.qml:98

462msgctxt "Label: Description of security method"

463msgctxt "Label: Description of security method"

463msgid "No security"

464msgid "No security"

464−msgstr ""

465+msgstr "Gun tèarainteachd"

465

466

466#: qml/Wizard/Pages/30-passwd-type.qml:100

467#: qml/Wizard/Pages/30-passwd-type.qml:100

467msgctxt "Label: Type of security method"

468msgctxt "Label: Type of security method"

468msgid "Passcode"

469msgid "Passcode"

469−msgstr ""

470+msgstr "Còd-faire"

470

471

471#: qml/Wizard/Pages/30-passwd-type.qml:101

472#: qml/Wizard/Pages/30-passwd-type.qml:101

472msgctxt "Label: Description of security method"

473msgctxt "Label: Description of security method"

@@ -476,12 +477,12 @@ msgstr ""

476#: qml/Wizard/Pages/30-passwd-type.qml:103

477#: qml/Wizard/Pages/30-passwd-type.qml:103

477msgctxt "Label: Type of security method"

478msgctxt "Label: Type of security method"

478msgid "Passphrase"

479msgid "Passphrase"

479−msgstr ""

480+msgstr "Abairt-fhaire"

480

481

481#: qml/Wizard/Pages/30-passwd-type.qml:104

482#: qml/Wizard/Pages/30-passwd-type.qml:104

482msgctxt "Label: Description of security method"

483msgctxt "Label: Description of security method"

483msgid "Numbers and letters"

484msgid "Numbers and letters"

484−msgstr ""

485+msgstr "Àireamhan 's litrichean"

485

486

486#: qml/Wizard/Pages/40-wifi.qml:29

487#: qml/Wizard/Pages/40-wifi.qml:29

487msgid "Connect to Wi‑Fi"

488msgid "Connect to Wi‑Fi"

@@ -692,6 +693,9 @@ msgstr "%1 〉"

692#~ msgid "Power"

693#~ msgid "Power"

693#~ msgstr "Cumhachd"

694#~ msgstr "Cumhachd"

694

695

696+#~ msgid "Settings"

697+#~ msgstr "Roghainnean"

698+

695#~ msgid "Restart"

699#~ msgid "Restart"

696#~ msgstr "Ath-thòisich"

700#~ msgstr "Ath-thòisich"

697

701

po/gl.po+11−7

@@ -7,16 +7,16 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2015-03-21 14:09+0000\n"

11+"PO-Revision-Date: 2015-03-29 19:15+0000\n"

12"Last-Translator: Marcos Lans <Unknown>\n"

13"Language-Team: Galician <gl@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-22 05:30+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-30 05:45+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr "Buscar"

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr "Tenda"

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr "Buscar"

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr "Axustes"

172msgstr "Axustes"

172

173

@@ -232,7 +233,7 @@ msgstr "Reintentar"

232

233

233#: qml/Greeter/LoginList.qml:237

234#: qml/Greeter/LoginList.qml:237

234msgid "Tap to unlock"

235msgid "Tap to unlock"

235−msgstr "Toque para desbloquear"

236+msgstr "Tocar para desbloquear"

236

237

237#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

238#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

238msgid "Sorry, incorrect passphrase."

239msgid "Sorry, incorrect passphrase."

@@ -672,6 +673,9 @@ msgstr "%1 〉"

672#~ msgid "Power"

673#~ msgid "Power"

673#~ msgstr "Enerxía"

674#~ msgstr "Enerxía"

674

675

676+#~ msgid "Settings"

677+#~ msgstr "Axustes"

678+

675#~ msgid "Restart"

679#~ msgid "Restart"

676#~ msgstr "Reiniciar"

680#~ msgstr "Reiniciar"

677

681

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/he.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-08-23 14:19+0000\n"

12"Last-Translator: Yaron <sh.yaron@gmail.com>\n"

13"Language-Team: Hebrew <he@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/hi.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-01-15 01:49+0000\n"

12"Last-Translator: Siddhanathan S. <Unknown>\n"

13"Language-Team: Hindi <hi@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/hr.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2013-06-27 04:14+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Croatian <hr@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

19+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

20−"X-Generator: Launchpad (build 17405)\n"

20+"X-Generator: Launchpad (build 17413)\n"

21

22#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

@@ -158,16 +158,17 @@ msgid "Search"

158msgstr ""

159

160#: qml/Dash/PageHeader.qml:269

161−msgctxt "Button: The Ubuntu Store"

161+msgctxt "Button: Open the Ubuntu Store"

162msgid "Store"

163msgstr ""

164

165#: qml/Dash/PageHeader.qml:276

166−msgctxt "Button: Shown in Page Header Menu"

166+msgctxt "Button: Start a search in the current dash scope"

167msgid "Search"

168msgstr ""

169

170#: qml/Dash/PageHeader.qml:286

171+msgctxt "Button: Show the current dash scope settings"

171msgid "Settings"

172msgid "Settings"

172msgstr ""

173msgstr ""

173

174

po/hu.po+10−6

@@ -7,16 +7,16 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2015-03-19 08:20+0000\n"

11+"PO-Revision-Date: 2015-03-25 20:55+0000\n"

12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

13"Language-Team: Hungarian <hu@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-26 05:27+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -159,16 +159,17 @@ msgid "Search"

159msgstr "Keresés"

160

161#: qml/Dash/PageHeader.qml:269

162−msgctxt "Button: The Ubuntu Store"

162+msgctxt "Button: Open the Ubuntu Store"

163msgid "Store"

164msgstr "Áruház"

165

166#: qml/Dash/PageHeader.qml:276

167−msgctxt "Button: Shown in Page Header Menu"

167+msgctxt "Button: Start a search in the current dash scope"

168msgid "Search"

169msgstr "Keresés"

170

171#: qml/Dash/PageHeader.qml:286

172+msgctxt "Button: Show the current dash scope settings"

172msgid "Settings"

173msgid "Settings"

173msgstr "Beállítások"

174msgstr "Beállítások"

174

175

@@ -672,6 +673,9 @@ msgstr "%1 〉"

672#~ msgid "Shut down"

673#~ msgid "Shut down"

673#~ msgstr "Leállítás"

674#~ msgstr "Leállítás"

674

675

676+#~ msgid "Settings"

677+#~ msgstr "Beállítások"

678+

675#~ msgid "Power"

679#~ msgid "Power"

676#~ msgstr "Kikapcsolás"

680#~ msgstr "Kikapcsolás"

677

681

po/hy.po+10−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-10-28 06:34+0000\n"

12"Last-Translator: Vahan Harutyunyan <Unknown>\n"

13"Language-Team: Armenian <hy@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -161,18 +161,19 @@ msgid "Search"

161msgstr ""

162

163#: qml/Dash/PageHeader.qml:269

164−msgctxt "Button: The Ubuntu Store"

164+msgctxt "Button: Open the Ubuntu Store"

165msgid "Store"

166msgstr ""

167

168#: qml/Dash/PageHeader.qml:276

169−msgctxt "Button: Shown in Page Header Menu"

169+msgctxt "Button: Start a search in the current dash scope"

170msgid "Search"

171msgstr ""

172

173#: qml/Dash/PageHeader.qml:286

174+msgctxt "Button: Show the current dash scope settings"

174msgid "Settings"

175msgid "Settings"

175−msgstr "Կարգավորումներ"

176+msgstr ""

176

177

177#: qml/Dash/PageHeader.qml:293

178#: qml/Dash/PageHeader.qml:293

178msgid "Remove from Favorites"

179msgid "Remove from Favorites"

@@ -626,6 +627,9 @@ msgstr ""

626#~ msgid "Right edge"

627#~ msgid "Right edge"

627#~ msgstr "Աջ եզրը"

628#~ msgstr "Աջ եզրը"

628

629

630+#~ msgid "Settings"

631+#~ msgstr "Կարգավորումներ"

632+

629#~ msgid "Favorites"

633#~ msgid "Favorites"

630#~ msgstr "Նախընտրելի"

634#~ msgstr "Նախընտրելի"

631

635

po/id.po+10−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2013-06-26 22:35+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Indonesian <id@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -160,18 +160,19 @@ msgid "Search"

160msgstr ""

161

162#: qml/Dash/PageHeader.qml:269

163−msgctxt "Button: The Ubuntu Store"

163+msgctxt "Button: Open the Ubuntu Store"

164msgid "Store"

165msgstr ""

166

167#: qml/Dash/PageHeader.qml:276

168−msgctxt "Button: Shown in Page Header Menu"

168+msgctxt "Button: Start a search in the current dash scope"

169msgid "Search"

170msgstr ""

171

172#: qml/Dash/PageHeader.qml:286

173+msgctxt "Button: Show the current dash scope settings"

173msgid "Settings"

174msgid "Settings"

174−msgstr "Pengaturan"

175+msgstr ""

175

176

176#: qml/Dash/PageHeader.qml:293

177#: qml/Dash/PageHeader.qml:293

177msgid "Remove from Favorites"

178msgid "Remove from Favorites"

@@ -638,6 +639,9 @@ msgstr ""

638#~ msgid "Power off"

639#~ msgid "Power off"

639#~ msgstr "Matikan"

640#~ msgstr "Matikan"

640

641

642+#~ msgid "Settings"

643+#~ msgstr "Pengaturan"

644+

641#~ msgid "Search"

645#~ msgid "Search"

642#~ msgstr "Cari"

646#~ msgstr "Cari"

643

647

po/is.po+10−6

@@ -9,7 +9,7 @@ msgid ""

9msgstr ""

10"Project-Id-Version: po_unity8-is\n"

11"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

12−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

12+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

13"PO-Revision-Date: 2014-11-13 09:32+0000\n"

14"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"

15"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"

@@ -17,8 +17,8 @@ msgstr ""

17"Content-Type: text/plain; charset=UTF-8\n"

18"Content-Transfer-Encoding: 8bit\n"

19"Plural-Forms: nplurals=2; plural=n != 1;\n"

20−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

20+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

21−"X-Generator: Launchpad (build 17405)\n"

21+"X-Generator: Launchpad (build 17413)\n"

22"Language: is\n"

23

24#: plugins/LightDM/Greeter.cpp:112

@@ -166,18 +166,19 @@ msgid "Search"

166msgstr ""

167

168#: qml/Dash/PageHeader.qml:269

169−msgctxt "Button: The Ubuntu Store"

169+msgctxt "Button: Open the Ubuntu Store"

170msgid "Store"

171msgstr ""

172

173#: qml/Dash/PageHeader.qml:276

174−msgctxt "Button: Shown in Page Header Menu"

174+msgctxt "Button: Start a search in the current dash scope"

175msgid "Search"

176msgstr ""

177

178#: qml/Dash/PageHeader.qml:286

179+msgctxt "Button: Show the current dash scope settings"

179msgid "Settings"

180msgid "Settings"

180−msgstr "Stillingar"

181+msgstr ""

181

182

182#: qml/Dash/PageHeader.qml:293

183#: qml/Dash/PageHeader.qml:293

183msgid "Remove from Favorites"

184msgid "Remove from Favorites"

@@ -658,6 +659,9 @@ msgstr ""

658#~ msgid "Shut down"

659#~ msgid "Shut down"

659#~ msgstr "Slökkva á tölvunni"

660#~ msgstr "Slökkva á tölvunni"

660

661

662+#~ msgid "Settings"

663+#~ msgstr "Stillingar"

664+

661#~ msgid "Restart"

665#~ msgid "Restart"

662#~ msgstr "Endurræsa"

666#~ msgstr "Endurræsa"

663

667

po/it.po+20−8

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2015-03-21 12:42+0000\n"

12"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"

13"Language-Team: Italian <it@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-22 05:30+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -163,18 +163,19 @@ msgid "Search"

163msgstr "Cerca"

164

165#: qml/Dash/PageHeader.qml:269

166−msgctxt "Button: The Ubuntu Store"

166+msgctxt "Button: Open the Ubuntu Store"

167msgid "Store"

168−msgstr "Store"

168+msgstr ""

169

170#: qml/Dash/PageHeader.qml:276

171−msgctxt "Button: Shown in Page Header Menu"

171+msgctxt "Button: Start a search in the current dash scope"

172msgid "Search"

173−msgstr "Cerca"

173+msgstr ""

174

175#: qml/Dash/PageHeader.qml:286

176+msgctxt "Button: Show the current dash scope settings"

176msgid "Settings"

177msgid "Settings"

177−msgstr "Impostazioni"

178+msgstr ""

178

179

179#: qml/Dash/PageHeader.qml:293

180#: qml/Dash/PageHeader.qml:293

180msgid "Remove from Favorites"

181msgid "Remove from Favorites"

@@ -681,6 +682,9 @@ msgstr "%1 〉"

681#~ msgid "Shut down"

682#~ msgid "Shut down"

682#~ msgstr "Spegni"

683#~ msgstr "Spegni"

683

684

685+#~ msgid "Settings"

686+#~ msgstr "Impostazioni"

687+

684#~ msgid "Power"

688#~ msgid "Power"

685#~ msgstr "Alimentazione"

689#~ msgstr "Alimentazione"

686

690

@@ -689,3 +693,11 @@ msgstr "%1 〉"

689

693

690#~ msgid "Manage Scopes"

694#~ msgid "Manage Scopes"

691#~ msgstr "Gestisci Scope"

695#~ msgstr "Gestisci Scope"

696+

697+#~ msgctxt "Button: Shown in Page Header Menu"

698+#~ msgid "Search"

699+#~ msgstr "Cerca"

700+

701+#~ msgctxt "Button: The Ubuntu Store"

702+#~ msgid "Store"

703+#~ msgstr "Store"

po/ja.po+10−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-11-20 05:08+0000\n"

12"Last-Translator: Kentaro Kazuhama <Unknown>\n"

13"Language-Team: Japanese <ja@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -156,18 +156,19 @@ msgid "Search"

156msgstr ""

157

158#: qml/Dash/PageHeader.qml:269

159−msgctxt "Button: The Ubuntu Store"

159+msgctxt "Button: Open the Ubuntu Store"

160msgid "Store"

161msgstr ""

162

163#: qml/Dash/PageHeader.qml:276

164−msgctxt "Button: Shown in Page Header Menu"

164+msgctxt "Button: Start a search in the current dash scope"

165msgid "Search"

166msgstr ""

167

168#: qml/Dash/PageHeader.qml:286

169+msgctxt "Button: Show the current dash scope settings"

169msgid "Settings"

170msgid "Settings"

170−msgstr "設定"

171+msgstr ""

171

172

172#: qml/Dash/PageHeader.qml:293

173#: qml/Dash/PageHeader.qml:293

173msgid "Remove from Favorites"

174msgid "Remove from Favorites"

@@ -654,6 +655,9 @@ msgstr ""

654#~ msgid "Shut down"

655#~ msgid "Shut down"

655#~ msgstr "シャットダウン"

656#~ msgstr "シャットダウン"

656

657

658+#~ msgid "Settings"

659+#~ msgstr "設定"

660+

657#~ msgid "Power"

661#~ msgid "Power"

658#~ msgstr "電源"

662#~ msgstr "電源"

659

663

po/km.po+10−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-08-20 02:48+0000\n"

12"Last-Translator: Sophea Sok <sksophea@gmail.com>\n"

13"Language-Team: Khmer <km@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -159,18 +159,19 @@ msgid "Search"

159msgstr ""

160

161#: qml/Dash/PageHeader.qml:269

162−msgctxt "Button: The Ubuntu Store"

162+msgctxt "Button: Open the Ubuntu Store"

163msgid "Store"

164msgstr ""

165

166#: qml/Dash/PageHeader.qml:276

167−msgctxt "Button: Shown in Page Header Menu"

167+msgctxt "Button: Start a search in the current dash scope"

168msgid "Search"

169msgstr ""

170

171#: qml/Dash/PageHeader.qml:286

172+msgctxt "Button: Show the current dash scope settings"

172msgid "Settings"

173msgid "Settings"

173−msgstr "ការកំណត់"

174+msgstr ""

174

175

175#: qml/Dash/PageHeader.qml:293

176#: qml/Dash/PageHeader.qml:293

176msgid "Remove from Favorites"

177msgid "Remove from Favorites"

@@ -669,5 +670,8 @@ msgstr ""

669#~ msgid "Reboot"

670#~ msgid "Reboot"

670#~ msgstr "ចាប់ផ្ដើមឡើងវិញ"

671#~ msgstr "ចាប់ផ្ដើមឡើងវិញ"

671

672

673+#~ msgid "Settings"

674+#~ msgstr "ការកំណត់"

675+

672#~ msgid "Restart"

676#~ msgid "Restart"

673#~ msgstr "ចាប់ផ្ដើមឡើងវិញ"

677#~ msgstr "ចាប់ផ្ដើមឡើងវិញ"

po/kn.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2013-06-27 05:43+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Kannada <kn@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/ko.po+20−8

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-08-19 13:02+0000\n"

12"Last-Translator: MinSik CHO <Unknown>\n"

13"Language-Team: Korean <ko@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -156,18 +156,19 @@ msgid "Search"

156msgstr "검색"

157

158#: qml/Dash/PageHeader.qml:269

159−msgctxt "Button: The Ubuntu Store"

159+msgctxt "Button: Open the Ubuntu Store"

160msgid "Store"

161−msgstr "장터"

161+msgstr ""

162

163#: qml/Dash/PageHeader.qml:276

164−msgctxt "Button: Shown in Page Header Menu"

164+msgctxt "Button: Start a search in the current dash scope"

165msgid "Search"

166−msgstr "검색"

166+msgstr ""

167

168#: qml/Dash/PageHeader.qml:286

169+msgctxt "Button: Show the current dash scope settings"

169msgid "Settings"

170msgid "Settings"

170−msgstr "설정"

171+msgstr ""

171

172

172#: qml/Dash/PageHeader.qml:293

173#: qml/Dash/PageHeader.qml:293

173msgid "Remove from Favorites"

174msgid "Remove from Favorites"

@@ -630,6 +631,9 @@ msgstr "%1 〉"

630#~ msgid "Shut down"

631#~ msgid "Shut down"

631#~ msgstr "컴퓨터 끄기"

632#~ msgstr "컴퓨터 끄기"

632

633

634+#~ msgid "Settings"

635+#~ msgstr "설정"

636+

633#~ msgid "Top edge"

637#~ msgid "Top edge"

634#~ msgstr "윗쪽 가장자리"

638#~ msgstr "윗쪽 가장자리"

635

639

@@ -662,3 +666,11 @@ msgstr "%1 〉"

662

666

663#~ msgid "Manage Scopes"

667#~ msgid "Manage Scopes"

664#~ msgstr "스코프 관리"

668#~ msgstr "스코프 관리"

669+

670+#~ msgctxt "Button: Shown in Page Header Menu"

671+#~ msgid "Search"

672+#~ msgstr "검색"

673+

674+#~ msgctxt "Button: The Ubuntu Store"

675+#~ msgid "Store"

676+#~ msgstr "장터"

po/ku.po+10−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-09-10 13:14+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Kurdish <ku@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -159,18 +159,19 @@ msgid "Search"

159msgstr ""

160

161#: qml/Dash/PageHeader.qml:269

162−msgctxt "Button: The Ubuntu Store"

162+msgctxt "Button: Open the Ubuntu Store"

163msgid "Store"

164msgstr ""

165

166#: qml/Dash/PageHeader.qml:276

167−msgctxt "Button: Shown in Page Header Menu"

167+msgctxt "Button: Start a search in the current dash scope"

168msgid "Search"

169msgstr ""

170

171#: qml/Dash/PageHeader.qml:286

172+msgctxt "Button: Show the current dash scope settings"

172msgid "Settings"

173msgid "Settings"

173−msgstr "Eyar"

174+msgstr ""

174

175

175#: qml/Dash/PageHeader.qml:293

176#: qml/Dash/PageHeader.qml:293

176msgid "Remove from Favorites"

177msgid "Remove from Favorites"

@@ -598,6 +599,9 @@ msgstr ""

598#~ msgid "Well done"

599#~ msgid "Well done"

599#~ msgstr "Aferim"

600#~ msgstr "Aferim"

600

601

602+#~ msgid "Settings"

603+#~ msgstr "Eyar"

604+

601#~ msgid "Search"

605#~ msgid "Search"

602#~ msgstr "Lêgerîn"

606#~ msgstr "Lêgerîn"

603

607

po/ky.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2013-06-27 06:17+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Kirghiz <ky@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/lo.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2013-10-02 10:00+0000\n"

12"Last-Translator: Anousak <anousak@gmail.com>\n"

13"Language-Team: Lao <lo@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/lt.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-05-19 17:15+0000\n"

12"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"

13"Language-Team: Lithuanian <lt@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"(n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

19+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

20−"X-Generator: Launchpad (build 17405)\n"

20+"X-Generator: Launchpad (build 17413)\n"

21

22#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

@@ -158,16 +158,17 @@ msgid "Search"

158msgstr ""

159

160#: qml/Dash/PageHeader.qml:269

161−msgctxt "Button: The Ubuntu Store"

161+msgctxt "Button: Open the Ubuntu Store"

162msgid "Store"

163msgstr ""

164

165#: qml/Dash/PageHeader.qml:276

166−msgctxt "Button: Shown in Page Header Menu"

166+msgctxt "Button: Start a search in the current dash scope"

167msgid "Search"

168msgstr ""

169

170#: qml/Dash/PageHeader.qml:286

171+msgctxt "Button: Show the current dash scope settings"

171msgid "Settings"

172msgid "Settings"

172msgstr ""

173msgstr ""

173

174

po/lv.po+10−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2015-02-28 16:18+0000\n"

12"Last-Translator: Rūdolfs Mazurs <Unknown>\n"

13"Language-Team: Latvian <lv@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -160,18 +160,19 @@ msgid "Search"

160msgstr ""

161

162#: qml/Dash/PageHeader.qml:269

163−msgctxt "Button: The Ubuntu Store"

163+msgctxt "Button: Open the Ubuntu Store"

164msgid "Store"

165msgstr ""

166

167#: qml/Dash/PageHeader.qml:276

168−msgctxt "Button: Shown in Page Header Menu"

168+msgctxt "Button: Start a search in the current dash scope"

169msgid "Search"

170msgstr ""

171

172#: qml/Dash/PageHeader.qml:286

173+msgctxt "Button: Show the current dash scope settings"

173msgid "Settings"

174msgid "Settings"

174−msgstr "Iestatījumi"

175+msgstr ""

175

176

176#: qml/Dash/PageHeader.qml:293

177#: qml/Dash/PageHeader.qml:293

177msgid "Remove from Favorites"

178msgid "Remove from Favorites"

@@ -656,6 +657,9 @@ msgstr "%1 〉"

656#~ msgid "Power"

657#~ msgid "Power"

657#~ msgstr "Barošana"

658#~ msgstr "Barošana"

658

659

660+#~ msgid "Settings"

661+#~ msgstr "Iestatījumi"

662+

659#~ msgid "Log out"

663#~ msgid "Log out"

660#~ msgstr "Izrakstīties"

664#~ msgstr "Izrakstīties"

661

665

po/ml.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2013-11-23 11:44+0000\n"

12"Last-Translator: ST Alfas <Unknown>\n"

13"Language-Team: Malayalam <ml@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/mr.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-01-14 19:54+0000\n"

12"Last-Translator: Rohan Deshmukh <Unknown>\n"

13"Language-Team: Marathi <mr@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/ms.po+10−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-01-17 09:05+0000\n"

12"Last-Translator: abuyop <Unknown>\n"

13"Language-Team: Malay <ms@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -159,18 +159,19 @@ msgid "Search"

159msgstr ""

160

161#: qml/Dash/PageHeader.qml:269

162−msgctxt "Button: The Ubuntu Store"

162+msgctxt "Button: Open the Ubuntu Store"

163msgid "Store"

164msgstr ""

165

166#: qml/Dash/PageHeader.qml:276

167−msgctxt "Button: Shown in Page Header Menu"

167+msgctxt "Button: Start a search in the current dash scope"

168msgid "Search"

169msgstr ""

170

171#: qml/Dash/PageHeader.qml:286

172+msgctxt "Button: Show the current dash scope settings"

172msgid "Settings"

173msgid "Settings"

173−msgstr "Tetapan"

174+msgstr ""

174

175

175#: qml/Dash/PageHeader.qml:293

176#: qml/Dash/PageHeader.qml:293

176msgid "Remove from Favorites"

177msgid "Remove from Favorites"

@@ -649,6 +650,9 @@ msgstr ""

649#~ msgid "Power off"

650#~ msgid "Power off"

650#~ msgstr "Tutup"

651#~ msgstr "Tutup"

651

652

653+#~ msgid "Settings"

654+#~ msgstr "Tetapan"

655+

652#~ msgid "All"

656#~ msgid "All"

653#~ msgstr "Semua"

657#~ msgstr "Semua"

654

658

po/my.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2013-12-12 11:12+0000\n"

12"Last-Translator: Pyae Sone <Unknown>\n"

13"Language-Team: Burmese <my@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/nb.po+20−8

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2015-03-20 14:03+0000\n"

12"Last-Translator: Åka Sikrom <Unknown>\n"

13"Language-Team: Norwegian Bokmal <nb@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-21 05:43+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -161,18 +161,19 @@ msgid "Search"

161msgstr "Søk"

162

163#: qml/Dash/PageHeader.qml:269

164−msgctxt "Button: The Ubuntu Store"

164+msgctxt "Button: Open the Ubuntu Store"

165msgid "Store"

166−msgstr "Butikk"

166+msgstr ""

167

168#: qml/Dash/PageHeader.qml:276

169−msgctxt "Button: Shown in Page Header Menu"

169+msgctxt "Button: Start a search in the current dash scope"

170msgid "Search"

171−msgstr "Søk"

171+msgstr ""

172

173#: qml/Dash/PageHeader.qml:286

174+msgctxt "Button: Show the current dash scope settings"

174msgid "Settings"

175msgid "Settings"

175−msgstr "Innstillinger"

176+msgstr ""

176

177

177#: qml/Dash/PageHeader.qml:293

178#: qml/Dash/PageHeader.qml:293

178msgid "Remove from Favorites"

179msgid "Remove from Favorites"

@@ -673,8 +674,19 @@ msgstr "%1 〉"

673#~ msgid "Power"

674#~ msgid "Power"

674#~ msgstr "Strøm"

675#~ msgstr "Strøm"

675

676

677+#~ msgid "Settings"

678+#~ msgstr "Innstillinger"

679+

676#~ msgid "Restart"

680#~ msgid "Restart"

677#~ msgstr "Start på nytt"

681#~ msgstr "Start på nytt"

678

682

679#~ msgid "Manage Scopes"

683#~ msgid "Manage Scopes"

680#~ msgstr "Håndter virkefelt"

684#~ msgstr "Håndter virkefelt"

685+

686+#~ msgctxt "Button: Shown in Page Header Menu"

687+#~ msgid "Search"

688+#~ msgstr "Søk"

689+

690+#~ msgctxt "Button: The Ubuntu Store"

691+#~ msgid "Store"

692+#~ msgstr "Butikk"

po/nl.po+11−7

@@ -7,16 +7,16 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2015-03-20 08:54+0000\n"

11+"PO-Revision-Date: 2015-03-28 21:07+0000\n"

12−"Last-Translator: rob <linuxned@gmail.com>\n"

12+"Last-Translator: Sergi <philipsen.sergi@gmail.com>\n"

13"Language-Team: Dutch <nl@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-21 05:43+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-29 05:46+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -163,16 +163,17 @@ msgid "Search"

163msgstr "Zoeken"

164

165#: qml/Dash/PageHeader.qml:269

166−msgctxt "Button: The Ubuntu Store"

166+msgctxt "Button: Open the Ubuntu Store"

167msgid "Store"

168msgstr "Winkel"

169

170#: qml/Dash/PageHeader.qml:276

171−msgctxt "Button: Shown in Page Header Menu"

171+msgctxt "Button: Start a search in the current dash scope"

172msgid "Search"

173msgstr "Zoeken"

174

175#: qml/Dash/PageHeader.qml:286

176+msgctxt "Button: Show the current dash scope settings"

176msgid "Settings"

177msgid "Settings"

177msgstr "Instellingen"

178msgstr "Instellingen"

178

179

@@ -675,6 +676,9 @@ msgstr "%1 〉"

675#~ msgid "Shut down"

676#~ msgid "Shut down"

676#~ msgstr "Uitschakelen"

677#~ msgstr "Uitschakelen"

677

678

679+#~ msgid "Settings"

680+#~ msgstr "Instellingen"

681+

678#~ msgid "Power"

682#~ msgid "Power"

679#~ msgstr "Energie"

683#~ msgstr "Energie"

680

684

po/oc.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2015-02-05 20:35+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Occitan (post 1500) <oc@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/or.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2015-03-21 05:28+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Oriya <or@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n!=1;\n"

18−"X-Launchpad-Export-Date: 2015-03-22 05:30+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/pa.po+10−6

@@ -7,16 +7,16 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2015-03-20 05:14+0000\n"

11+"PO-Revision-Date: 2015-03-26 04:53+0000\n"

12"Last-Translator: Gursharnjit_Singh <ubuntuser13@gmail.com>\n"

13"Language-Team: Punjabi <pa@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-21 05:43+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-27 05:36+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -159,16 +159,17 @@ msgid "Search"

159msgstr "ਖੋਜ"

160

161#: qml/Dash/PageHeader.qml:269

162−msgctxt "Button: The Ubuntu Store"

162+msgctxt "Button: Open the Ubuntu Store"

163msgid "Store"

164msgstr "ਸਟੋਰ"

165

166#: qml/Dash/PageHeader.qml:276

167−msgctxt "Button: Shown in Page Header Menu"

167+msgctxt "Button: Start a search in the current dash scope"

168msgid "Search"

169msgstr "ਖੋਜ"

170

171#: qml/Dash/PageHeader.qml:286

172+msgctxt "Button: Show the current dash scope settings"

172msgid "Settings"

173msgid "Settings"

173msgstr "ਸੈਟਿੰਗ"

174msgstr "ਸੈਟਿੰਗ"

174

175

@@ -617,6 +618,9 @@ msgstr "%1 〉"

617#~ msgid "Power off"

618#~ msgid "Power off"

618#~ msgstr "ਬੰਦ ਕਰੋ"

619#~ msgstr "ਬੰਦ ਕਰੋ"

619

620

621+#~ msgid "Settings"

622+#~ msgstr "ਸੈਟਿੰਗ"

623+

620#~ msgid "Store"

624#~ msgid "Store"

621#~ msgstr "ਸਟੋਰ"

625#~ msgstr "ਸਟੋਰ"

622

626

po/pl.po+43−39

@@ -7,8 +7,8 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"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"

12"Last-Translator: GTriderXC <gtriderxc@yahoo.com>\n"

13"Language-Team: Polish <pl@li.org>\n"

14"MIME-Version: 1.0\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "

18"|| n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

19+"X-Launchpad-Export-Date: 2015-04-05 06:10+0000\n"

20−"X-Generator: Launchpad (build 17405)\n"

20+"X-Generator: Launchpad (build 17413)\n"

21

22#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

@@ -56,7 +56,7 @@ msgstr[2] "Poczekaj %1 minut i spróbuj ponownie…"

56#: qml/Components/Dialogs.qml:67

57msgctxt "Title: Lock/Log out dialog"

58msgid "Log out"

59−msgstr ""

59+msgstr "Wylogowanie"

60

61#: qml/Components/Dialogs.qml:68

62msgid "Are you sure you want to log out?"

@@ -65,12 +65,12 @@ msgstr "Czy na pewno wylogować?"

65#: qml/Components/Dialogs.qml:70

66msgctxt "Button: Lock the system"

67msgid "Lock"

68−msgstr ""

68+msgstr "Blokada"

69

70#: qml/Components/Dialogs.qml:77

71msgctxt "Button: Log out from the system"

72msgid "Log Out"

73−msgstr ""

73+msgstr "Wyloguj"

74

75#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

76#: qml/Components/Dialogs.qml:171

@@ -80,7 +80,7 @@ msgstr "Anuluj"

80#: qml/Components/Dialogs.qml:96

81msgctxt "Title: Reboot/Shut down dialog"

82msgid "Shut down"

83−msgstr ""

83+msgstr "Wyłącz"

84

85#: qml/Components/Dialogs.qml:97

86msgid "Are you sure you want to shut down?"

@@ -89,17 +89,17 @@ msgstr "Czy na pewno wyłączyć?"

89#: qml/Components/Dialogs.qml:99

90msgctxt "Button: Reboot the system"

91msgid "Reboot"

92−msgstr ""

92+msgstr "Uruchom ponownie"

93

94#: qml/Components/Dialogs.qml:107

95msgctxt "Button: Shut down the system"

96msgid "Shut down"

97−msgstr ""

97+msgstr "Wyłącz"

98

99#: qml/Components/Dialogs.qml:127

100msgctxt "Title: Reboot dialog"

101msgid "Reboot"

102−msgstr ""

102+msgstr "Uruchom ponownie"

103

104#: qml/Components/Dialogs.qml:128

105msgid "Are you sure you want to reboot?"

@@ -116,7 +116,7 @@ msgstr "Tak"

116#: qml/Components/Dialogs.qml:150

117msgctxt "Title: Power off/Restart dialog"

118msgid "Power"

119−msgstr ""

119+msgstr "Zasilanie"

120

121#: qml/Components/Dialogs.qml:151

122msgid ""

@@ -129,12 +129,12 @@ msgstr ""

129#: qml/Components/Dialogs.qml:153

130msgctxt "Button: Power off the system"

131msgid "Power off"

132−msgstr ""

132+msgstr "Wyłącz"

133

134#: qml/Components/Dialogs.qml:162

135msgctxt "Button: Restart the system"

136msgid "Restart"

137−msgstr ""

137+msgstr "Uruchom ponownie"

138

139#: qml/Components/Lockscreen.qml:238

140msgid "Return to Call"

@@ -159,19 +159,20 @@ msgstr "Zobacz wszystko"

159#: qml/Dash/GenericScopeView.qml:595

160msgctxt "Label: Hint for dash search line edit"

161msgid "Search"

162−msgstr ""

162+msgstr "Szukaj"

163

164#: qml/Dash/PageHeader.qml:269

165−msgctxt "Button: The Ubuntu Store"

165+msgctxt "Button: Open the Ubuntu Store"

166msgid "Store"

167−msgstr ""

167+msgstr "Sklep Ubuntu"

168

169#: qml/Dash/PageHeader.qml:276

170−msgctxt "Button: Shown in Page Header Menu"

170+msgctxt "Button: Start a search in the current dash scope"

171msgid "Search"

172−msgstr ""

172+msgstr "Wyszukaj"

173

174#: qml/Dash/PageHeader.qml:286

175+msgctxt "Button: Show the current dash scope settings"

175msgid "Settings"

176msgid "Settings"

176msgstr "Ustawienia"

177msgstr "Ustawienia"

177

178

@@ -213,7 +214,7 @@ msgstr "Zwolnij by odświeżyć"

213

214

214#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

215#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

215msgid "Enable location data"

216msgid "Enable location data"

216−msgstr ""

217+msgstr "Zezwól na lokalizację"

217

218

218#: qml/Dash/ScopesList.qml:66

219#: qml/Dash/ScopesList.qml:66

219msgid "Manage"

220msgid "Manage"

@@ -221,7 +222,7 @@ msgstr "Zarządzaj"

221

222

222#: qml/Dash/ScopesList.qml:112

223#: qml/Dash/ScopesList.qml:112

223msgid "Home"

224msgid "Home"

224−msgstr ""

225+msgstr "Pulpit"

225

226

226#: qml/Dash/ScopesList.qml:113

227#: qml/Dash/ScopesList.qml:113

227msgid "Also installed"

228msgid "Also installed"

@@ -233,11 +234,11 @@ msgstr "Odblokuj"

233

234

234#: qml/Greeter/LoginList.qml:236

235#: qml/Greeter/LoginList.qml:236

235msgid "Retry"

236msgid "Retry"

236−msgstr ""

237+msgstr "Ponów"

237

238

238#: qml/Greeter/LoginList.qml:237

239#: qml/Greeter/LoginList.qml:237

239msgid "Tap to unlock"

240msgid "Tap to unlock"

240−msgstr ""

241+msgstr "Dotknij, by odblokować"

241

242

242#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

243#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

243msgid "Sorry, incorrect passphrase."

244msgid "Sorry, incorrect passphrase."

@@ -340,7 +341,7 @@ msgstr "Błąd, kliknij aby powtórzyć"

340#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

341#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

341msgctxt "Label: Hint in message indicator line edit"

342msgctxt "Label: Hint in message indicator line edit"

342msgid "Reply"

343msgid "Reply"

343−msgstr ""

344+msgstr "Odpowiedz"

344

345

345#: qml/Panel/Indicators/ModemInfoItem.qml:105

346#: qml/Panel/Indicators/ModemInfoItem.qml:105

346msgid "Unlock SIM"

347msgid "Unlock SIM"

@@ -352,11 +353,11 @@ msgstr "Roaming"

352

353

353#: qml/Tutorial/TutorialBottomFinish.qml:24

354#: qml/Tutorial/TutorialBottomFinish.qml:24

354msgid "This action does different things for different apps"

355msgid "This action does different things for different apps"

355−msgstr ""

356+msgstr "Ta operacja ma różne skutki dla różnych programów"

356

357

357#: qml/Tutorial/TutorialBottomFinish.qml:25

358#: qml/Tutorial/TutorialBottomFinish.qml:25

358msgid "Tap here to finish."

359msgid "Tap here to finish."

359−msgstr ""

360+msgstr "Dotknij tutaj, by zakończyć."

360

361

361#: qml/Tutorial/TutorialBottom.qml:28

362#: qml/Tutorial/TutorialBottom.qml:28

362msgid "Open special menus"

363msgid "Open special menus"

@@ -368,11 +369,11 @@ msgstr ""

368

369

369#: qml/Tutorial/TutorialLeftFinish.qml:24

370#: qml/Tutorial/TutorialLeftFinish.qml:24

370msgid "These are the shortcuts to favorite apps"

371msgid "These are the shortcuts to favorite apps"

371−msgstr ""

372+msgstr "To są skróty do ulubionych aplikacji"

372

373

373#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

374#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

374msgid "Tap here to continue."

375msgid "Tap here to continue."

375−msgstr ""

376+msgstr "Dotknij tutaj, by kontynuować."

376

377

377#: qml/Tutorial/TutorialLeft.qml:26

378#: qml/Tutorial/TutorialLeft.qml:26

378msgid "Open the launcher"

379msgid "Open the launcher"

@@ -384,15 +385,15 @@ msgstr ""

384

385

385#: qml/Tutorial/TutorialPage.qml:178

386#: qml/Tutorial/TutorialPage.qml:178

386msgid "You almost got it!"

387msgid "You almost got it!"

387−msgstr ""

388+msgstr "Już prawie nam się udało! ;-)"

388

389

389#: qml/Tutorial/TutorialPage.qml:195

390#: qml/Tutorial/TutorialPage.qml:195

390msgid "Try again."

391msgid "Try again."

391−msgstr ""

392+msgstr "Spróbuj ponownie."

392

393

393#: qml/Tutorial/TutorialRight.qml:31

394#: qml/Tutorial/TutorialRight.qml:31

394msgid "To view open apps"

395msgid "To view open apps"

395−msgstr ""

396+msgstr "By zobaczyć otwarte aplikacje"

396

397

397#: qml/Tutorial/TutorialRight.qml:32

398#: qml/Tutorial/TutorialRight.qml:32

398msgid "Long swipe from the right edge."

399msgid "Long swipe from the right edge."

@@ -400,12 +401,12 @@ msgstr ""

400

401

401#: qml/Tutorial/TutorialRight.qml:122

402#: qml/Tutorial/TutorialRight.qml:122

402msgid "View all your running tasks."

403msgid "View all your running tasks."

403−msgstr ""

404+msgstr "Wyświetl wszystkie aktywne zadania."

404

405

405#: qml/Wizard/Page.qml:89

406#: qml/Wizard/Page.qml:89

406msgctxt "Button: Go back one page in the Wizard"

407msgctxt "Button: Go back one page in the Wizard"

407msgid "Back"

408msgid "Back"

408−msgstr ""

409+msgstr "Powrót"

409

410

410#: qml/Wizard/Pages/10-welcome.qml:27

411#: qml/Wizard/Pages/10-welcome.qml:27

411msgid "Hi!"

412msgid "Hi!"

@@ -450,32 +451,32 @@ msgstr "Ustaw proszę jak ma być odblokowywane to urządzenie"

450#: qml/Wizard/Pages/30-passwd-type.qml:97

451#: qml/Wizard/Pages/30-passwd-type.qml:97

451msgctxt "Label: Type of security method"

452msgctxt "Label: Type of security method"

452msgid "Swipe"

453msgid "Swipe"

453−msgstr ""

454+msgstr "Przeciągnięcie"

454

455

455#: qml/Wizard/Pages/30-passwd-type.qml:98

456#: qml/Wizard/Pages/30-passwd-type.qml:98

456msgctxt "Label: Description of security method"

457msgctxt "Label: Description of security method"

457msgid "No security"

458msgid "No security"

458−msgstr ""

459+msgstr "Brak zabezpieczenia"

459

460

460#: qml/Wizard/Pages/30-passwd-type.qml:100

461#: qml/Wizard/Pages/30-passwd-type.qml:100

461msgctxt "Label: Type of security method"

462msgctxt "Label: Type of security method"

462msgid "Passcode"

463msgid "Passcode"

463−msgstr ""

464+msgstr "Kod"

464

465

465#: qml/Wizard/Pages/30-passwd-type.qml:101

466#: qml/Wizard/Pages/30-passwd-type.qml:101

466msgctxt "Label: Description of security method"

467msgctxt "Label: Description of security method"

467msgid "4 digits only"

468msgid "4 digits only"

468−msgstr ""

469+msgstr "Tylko 4 cyfry"

469

470

470#: qml/Wizard/Pages/30-passwd-type.qml:103

471#: qml/Wizard/Pages/30-passwd-type.qml:103

471msgctxt "Label: Type of security method"

472msgctxt "Label: Type of security method"

472msgid "Passphrase"

473msgid "Passphrase"

473−msgstr ""

474+msgstr "Hasło"

474

475

475#: qml/Wizard/Pages/30-passwd-type.qml:104

476#: qml/Wizard/Pages/30-passwd-type.qml:104

476msgctxt "Label: Description of security method"

477msgctxt "Label: Description of security method"

477msgid "Numbers and letters"

478msgid "Numbers and letters"

478−msgstr ""

479+msgstr "Litery i cyfry"

479

480

480#: qml/Wizard/Pages/40-wifi.qml:29

481#: qml/Wizard/Pages/40-wifi.qml:29

481msgid "Connect to Wi‑Fi"

482msgid "Connect to Wi‑Fi"

@@ -670,3 +671,6 @@ msgstr "%1 〉"

670

671

671#~ msgid "Store"

672#~ msgid "Store"

672#~ msgstr "Zachowaj"

673#~ msgstr "Zachowaj"

674+

675+#~ msgid "Settings"

676+#~ msgstr "Ustawienia"

po/pt.po+19−16

@@ -7,16 +7,16 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2015-03-21 00:04+0000\n"

11+"PO-Revision-Date: 2015-03-29 23:41+0000\n"

12−"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"

12+"Last-Translator: António Miranda <Unknown>\n"

13"Language-Team: Portuguese <pt@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-22 05:30+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-30 05:45+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -159,16 +159,17 @@ msgid "Search"

159msgstr "Procurar"

160

161#: qml/Dash/PageHeader.qml:269

162−msgctxt "Button: The Ubuntu Store"

162+msgctxt "Button: Open the Ubuntu Store"

163msgid "Store"

164msgstr "Store"

165

166#: qml/Dash/PageHeader.qml:276

167−msgctxt "Button: Shown in Page Header Menu"

167+msgctxt "Button: Start a search in the current dash scope"

168msgid "Search"

169msgstr "Procurar"

170

171#: qml/Dash/PageHeader.qml:286

172+msgctxt "Button: Show the current dash scope settings"

172msgid "Settings"

173msgid "Settings"

173msgstr "Definições"

174msgstr "Definições"

174

175

@@ -349,7 +350,7 @@ msgstr "Roaming"

349

350

350#: qml/Tutorial/TutorialBottomFinish.qml:24

351#: qml/Tutorial/TutorialBottomFinish.qml:24

351msgid "This action does different things for different apps"

352msgid "This action does different things for different apps"

352−msgstr "Esta ação faz coisas diferentes para aplicações diferentes"

353+msgstr "Esta ação faz coisas diferentes para apps diferentes"

353

354

354#: qml/Tutorial/TutorialBottomFinish.qml:25

355#: qml/Tutorial/TutorialBottomFinish.qml:25

355msgid "Tap here to finish."

356msgid "Tap here to finish."

@@ -365,7 +366,7 @@ msgstr "Deslize para cima a partir da margem inferior."

365

366

366#: qml/Tutorial/TutorialLeftFinish.qml:24

367#: qml/Tutorial/TutorialLeftFinish.qml:24

367msgid "These are the shortcuts to favorite apps"

368msgid "These are the shortcuts to favorite apps"

368−msgstr "Estes são os atalhos para as suas aplicações favoritas"

369+msgstr "Estes são os atalhos para as suas apps favoritas"

369

370

370#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

371#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

371msgid "Tap here to continue."

372msgid "Tap here to continue."

@@ -389,7 +390,7 @@ msgstr "Tente de novo."

389

390

390#: qml/Tutorial/TutorialRight.qml:31

391#: qml/Tutorial/TutorialRight.qml:31

391msgid "To view open apps"

392msgid "To view open apps"

392−msgstr "Para ver as aplicações abertas"

393+msgstr "Para ver as apps abertas"

393

394

394#: qml/Tutorial/TutorialRight.qml:32

395#: qml/Tutorial/TutorialRight.qml:32

395msgid "Long swipe from the right edge."

396msgid "Long swipe from the right edge."

@@ -492,7 +493,7 @@ msgstr "Localização"

492

493

493#: qml/Wizard/Pages/50-location.qml:62

494#: qml/Wizard/Pages/50-location.qml:62

494msgid "Let the phone detect your location:"

495msgid "Let the phone detect your location:"

495−msgstr "Deixe o telefone detectar a sua localização:"

496+msgstr "Deixe o telemóvel detetar a sua localização:"

496

497

497#: qml/Wizard/Pages/50-location.qml:69

498#: qml/Wizard/Pages/50-location.qml:69

498msgid "Using GPS only (less accurate)"

499msgid "Using GPS only (less accurate)"

@@ -653,6 +654,9 @@ msgstr "%1 〉"

653#~ msgid "Power"

654#~ msgid "Power"

654#~ msgstr "Energia"

655#~ msgstr "Energia"

655

656

657+#~ msgid "Settings"

658+#~ msgstr "Definições"

659+

656#~ msgid "Restart"

660#~ msgid "Restart"

657#~ msgstr "Reiniciar"

661#~ msgstr "Reiniciar"

658

662

@@ -662,11 +666,6 @@ msgstr "%1 〉"

662#~ msgid "Try swiping from the top edge to access the indicators"

666#~ msgid "Try swiping from the top edge to access the indicators"

663#~ msgstr "Tente deslizar da margem superior para aceder aos indicadores"

667#~ msgstr "Tente deslizar da margem superior para aceder aos indicadores"

664

668

665−#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

666−#~ msgstr ""

667−#~ "Deslize da margem esquerda para mostrar o lançador para acesso rápido às "

668−#~ "aplicações"

669−

670#~ msgid "Try swiping from the right edge to unlock the phone"

669#~ msgid "Try swiping from the right edge to unlock the phone"

671#~ msgstr "Tente deslizar da margem direita para desbloquear o telemóvel"

670#~ msgstr "Tente deslizar da margem direita para desbloquear o telemóvel"

672

671

@@ -679,3 +678,7 @@ msgstr "%1 〉"

679

678

680#~ msgid "Store"

679#~ msgid "Store"

681#~ msgstr "Store"

680#~ msgstr "Store"

681+

682+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

683+#~ msgstr ""

684+#~ "Deslize da margem esquerda para mostrar o lançador para acesso rápido às apps"

po/pt_BR.po+18−14

@@ -7,16 +7,16 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2015-03-21 18:33+0000\n"

11+"PO-Revision-Date: 2015-04-06 19:02+0000\n"

12−"Last-Translator: Vinicius Almeida <vinicius.algo@gmail.com>\n"

12+"Last-Translator: Tiago Hillebrandt <tiagohillebrandt@gmail.com>\n"

13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-22 05:30+0000\n"

18+"X-Launchpad-Export-Date: 2015-04-07 05:30+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -59,7 +59,7 @@ msgstr "Sair"

59

60#: qml/Components/Dialogs.qml:68

61msgid "Are you sure you want to log out?"

62−msgstr "Tem certeza de que deseja sair?"

62+msgstr "Você tem certeza que deseja sair?"

63

64#: qml/Components/Dialogs.qml:70

65msgctxt "Button: Lock the system"

@@ -83,7 +83,7 @@ msgstr "Desligar"

83

84#: qml/Components/Dialogs.qml:97

85msgid "Are you sure you want to shut down?"

86−msgstr "Tem certeza de que deseja desligar?"

86+msgstr "Você tem certeza que deseja desligar?"

87

88#: qml/Components/Dialogs.qml:99

89msgctxt "Button: Reboot the system"

@@ -102,7 +102,7 @@ msgstr "Reiniciar"

102

103#: qml/Components/Dialogs.qml:128

104msgid "Are you sure you want to reboot?"

105−msgstr "Tem certeza de que deseja reiniciar?"

105+msgstr "Você tem certeza que deseja reiniciar?"

106

107#: qml/Components/Dialogs.qml:130

108msgid "No"

@@ -122,7 +122,7 @@ msgid ""

122"Are you sure you would like\n"

123"to power off?"

124msgstr ""

125−"Tem certeza que você gostaria \n"

125+"Você tem certeza que gostaria \n"

126"de desligar?"

127

128#: qml/Components/Dialogs.qml:153

@@ -161,18 +161,19 @@ msgid "Search"

161msgstr "Pesquisar"

162

163#: qml/Dash/PageHeader.qml:269

164−msgctxt "Button: The Ubuntu Store"

164+msgctxt "Button: Open the Ubuntu Store"

165msgid "Store"

166−msgstr "Loja"

166+msgstr ""

167

168#: qml/Dash/PageHeader.qml:276

169−msgctxt "Button: Shown in Page Header Menu"

169+msgctxt "Button: Start a search in the current dash scope"

170msgid "Search"

171−msgstr "Pesquisar"

171+msgstr ""

172

173#: qml/Dash/PageHeader.qml:286

174+msgctxt "Button: Show the current dash scope settings"

174msgid "Settings"

175msgid "Settings"

175−msgstr "Configurações"

176+msgstr ""

176

177

177#: qml/Dash/PageHeader.qml:293

178#: qml/Dash/PageHeader.qml:293

178msgid "Remove from Favorites"

179msgid "Remove from Favorites"

@@ -678,6 +679,9 @@ msgstr "%1 〉"

678#~ msgid "Power"

679#~ msgid "Power"

679#~ msgstr "Energia"

680#~ msgstr "Energia"

680

681

682+#~ msgid "Settings"

683+#~ msgstr "Configurações"

684+

681#~ msgid "Restart"

685#~ msgid "Restart"

682#~ msgstr "Reiniciar"

686#~ msgstr "Reiniciar"

683

687

po/ro.po+10−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2015-02-18 20:23+0000\n"

12"Last-Translator: Meriuță Cornel <meriutacornel@neacornel.eu>\n"

13"Language-Team: Romanian <ro@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "

18"== 0) && (n != 0))) ? 2: 1));\n"

19−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

19+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

20−"X-Generator: Launchpad (build 17405)\n"

20+"X-Generator: Launchpad (build 17413)\n"

21

22#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

@@ -164,18 +164,19 @@ msgid "Search"

164msgstr ""

165

166#: qml/Dash/PageHeader.qml:269

167−msgctxt "Button: The Ubuntu Store"

167+msgctxt "Button: Open the Ubuntu Store"

168msgid "Store"

169msgstr ""

170

171#: qml/Dash/PageHeader.qml:276

172−msgctxt "Button: Shown in Page Header Menu"

172+msgctxt "Button: Start a search in the current dash scope"

173msgid "Search"

174msgstr ""

175

176#: qml/Dash/PageHeader.qml:286

177+msgctxt "Button: Show the current dash scope settings"

177msgid "Settings"

178msgid "Settings"

178−msgstr "Configurări"

179+msgstr ""

179

180

180#: qml/Dash/PageHeader.qml:293

181#: qml/Dash/PageHeader.qml:293

181msgid "Remove from Favorites"

182msgid "Remove from Favorites"

@@ -686,6 +687,9 @@ msgstr "%1 〉"

686#~ msgid "Power"

687#~ msgid "Power"

687#~ msgstr "Alimentare"

688#~ msgstr "Alimentare"

688

689

690+#~ msgid "Settings"

691+#~ msgstr "Configurări"

692+

689#~ msgid "Restart"

693#~ msgid "Restart"

690#~ msgstr "Repornire"

694#~ msgstr "Repornire"

691

695

po/ru.po+47−43

@@ -7,8 +7,8 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2015-01-29 08:02+0000\n"

11+"PO-Revision-Date: 2015-03-30 09:44+0000\n"

12"Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"

13"Language-Team: Russian <ru@li.org>\n"

14"MIME-Version: 1.0\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

19+"X-Launchpad-Export-Date: 2015-03-31 05:58+0000\n"

20−"X-Generator: Launchpad (build 17405)\n"

20+"X-Generator: Launchpad (build 17413)\n"

21

22#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

@@ -59,7 +59,7 @@ msgstr[2] "Подождите %1 минут и попытайтесь снова

59#: qml/Components/Dialogs.qml:67

60msgctxt "Title: Lock/Log out dialog"

61msgid "Log out"

62−msgstr ""

62+msgstr "Завершение сеанса"

63

64#: qml/Components/Dialogs.qml:68

65msgid "Are you sure you want to log out?"

@@ -68,12 +68,12 @@ msgstr "Завершить сеанс?"

68#: qml/Components/Dialogs.qml:70

69msgctxt "Button: Lock the system"

70msgid "Lock"

71−msgstr ""

71+msgstr "Заблокировать"

72

73#: qml/Components/Dialogs.qml:77

74msgctxt "Button: Log out from the system"

75msgid "Log Out"

76−msgstr ""

76+msgstr "Выйти из системы"

77

78#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

79#: qml/Components/Dialogs.qml:171

@@ -83,7 +83,7 @@ msgstr "Отменить"

83#: qml/Components/Dialogs.qml:96

84msgctxt "Title: Reboot/Shut down dialog"

85msgid "Shut down"

86−msgstr ""

86+msgstr "Выключение"

87

88#: qml/Components/Dialogs.qml:97

89msgid "Are you sure you want to shut down?"

@@ -92,17 +92,17 @@ msgstr "Выключить?"

92#: qml/Components/Dialogs.qml:99

93msgctxt "Button: Reboot the system"

94msgid "Reboot"

95−msgstr ""

95+msgstr "Перезагрузить"

96

97#: qml/Components/Dialogs.qml:107

98msgctxt "Button: Shut down the system"

99msgid "Shut down"

100−msgstr ""

100+msgstr "Выключить"

101

102#: qml/Components/Dialogs.qml:127

103msgctxt "Title: Reboot dialog"

104msgid "Reboot"

105−msgstr ""

105+msgstr "Перезагрузка"

106

107#: qml/Components/Dialogs.qml:128

108msgid "Are you sure you want to reboot?"

@@ -119,7 +119,7 @@ msgstr "Да"

119#: qml/Components/Dialogs.qml:150

120msgctxt "Title: Power off/Restart dialog"

121msgid "Power"

122−msgstr ""

122+msgstr "Питание"

123

124#: qml/Components/Dialogs.qml:151

125msgid ""

@@ -130,12 +130,12 @@ msgstr "Отключить питание?"

130#: qml/Components/Dialogs.qml:153

131msgctxt "Button: Power off the system"

132msgid "Power off"

133−msgstr ""

133+msgstr "Отключить"

134

135#: qml/Components/Dialogs.qml:162

136msgctxt "Button: Restart the system"

137msgid "Restart"

138−msgstr ""

138+msgstr "Перезагрузить"

139

140#: qml/Components/Lockscreen.qml:238

141msgid "Return to Call"

@@ -160,19 +160,20 @@ msgstr "Показать всё"

160#: qml/Dash/GenericScopeView.qml:595

161msgctxt "Label: Hint for dash search line edit"

162msgid "Search"

163−msgstr ""

163+msgstr "Поиск"

164

165#: qml/Dash/PageHeader.qml:269

166−msgctxt "Button: The Ubuntu Store"

166+msgctxt "Button: Open the Ubuntu Store"

167msgid "Store"

168−msgstr ""

168+msgstr "Магазин"

169

170#: qml/Dash/PageHeader.qml:276

171−msgctxt "Button: Shown in Page Header Menu"

171+msgctxt "Button: Start a search in the current dash scope"

172msgid "Search"

173−msgstr ""

173+msgstr "Найти"

174

175#: qml/Dash/PageHeader.qml:286

176+msgctxt "Button: Show the current dash scope settings"

176msgid "Settings"

177msgid "Settings"

177msgstr "Настройки"

178msgstr "Настройки"

178

179

@@ -214,7 +215,7 @@ msgstr "Отпустите для обновления…"

214

215

215#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

216#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

216msgid "Enable location data"

217msgid "Enable location data"

217−msgstr ""

218+msgstr "Включить данные о местоположении"

218

219

219#: qml/Dash/ScopesList.qml:66

220#: qml/Dash/ScopesList.qml:66

220msgid "Manage"

221msgid "Manage"

@@ -234,11 +235,11 @@ msgstr "Разблокировать"

234

235

235#: qml/Greeter/LoginList.qml:236

236#: qml/Greeter/LoginList.qml:236

236msgid "Retry"

237msgid "Retry"

237−msgstr ""

238+msgstr "Повторить"

238

239

239#: qml/Greeter/LoginList.qml:237

240#: qml/Greeter/LoginList.qml:237

240msgid "Tap to unlock"

241msgid "Tap to unlock"

241−msgstr ""

242+msgstr "Нажмите для разблокировки"

242

243

243#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

244#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

244msgid "Sorry, incorrect passphrase."

245msgid "Sorry, incorrect passphrase."

@@ -341,7 +342,7 @@ msgstr "Сбой, коснитесь для повтора"

341#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

342#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

342msgctxt "Label: Hint in message indicator line edit"

343msgctxt "Label: Hint in message indicator line edit"

343msgid "Reply"

344msgid "Reply"

344−msgstr ""

345+msgstr "Ответить"

345

346

346#: qml/Panel/Indicators/ModemInfoItem.qml:105

347#: qml/Panel/Indicators/ModemInfoItem.qml:105

347msgid "Unlock SIM"

348msgid "Unlock SIM"

@@ -353,60 +354,60 @@ msgstr "Роуминг"

353

354

354#: qml/Tutorial/TutorialBottomFinish.qml:24

355#: qml/Tutorial/TutorialBottomFinish.qml:24

355msgid "This action does different things for different apps"

356msgid "This action does different things for different apps"

356−msgstr ""

357+msgstr "Это действие имеет разные функции в зависимости от приложения"

357

358

358#: qml/Tutorial/TutorialBottomFinish.qml:25

359#: qml/Tutorial/TutorialBottomFinish.qml:25

359msgid "Tap here to finish."

360msgid "Tap here to finish."

360−msgstr ""

361+msgstr "Нажмите здесь для завершения."

361

362

362#: qml/Tutorial/TutorialBottom.qml:28

363#: qml/Tutorial/TutorialBottom.qml:28

363msgid "Open special menus"

364msgid "Open special menus"

364−msgstr ""

365+msgstr "Открытие специальных меню"

365

366

366#: qml/Tutorial/TutorialBottom.qml:29

367#: qml/Tutorial/TutorialBottom.qml:29

367msgid "Swipe up from the bottom edge."

368msgid "Swipe up from the bottom edge."

368−msgstr ""

369+msgstr "Проведите вверх от нижнего края."

369

370

370#: qml/Tutorial/TutorialLeftFinish.qml:24

371#: qml/Tutorial/TutorialLeftFinish.qml:24

371msgid "These are the shortcuts to favorite apps"

372msgid "These are the shortcuts to favorite apps"

372−msgstr ""

373+msgstr "Это ярлыки избранных приложений"

373

374

374#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

375#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

375msgid "Tap here to continue."

376msgid "Tap here to continue."

376−msgstr ""

377+msgstr "Нажмите здесь для продолжения."

377

378

378#: qml/Tutorial/TutorialLeft.qml:26

379#: qml/Tutorial/TutorialLeft.qml:26

379msgid "Open the launcher"

380msgid "Open the launcher"

380−msgstr ""

381+msgstr "Открытие панели запуска"

381

382

382#: qml/Tutorial/TutorialLeft.qml:27

383#: qml/Tutorial/TutorialLeft.qml:27

383msgid "Short swipe from the left edge."

384msgid "Short swipe from the left edge."

384−msgstr ""

385+msgstr "Короткое смахивание от левого края."

385

386

386#: qml/Tutorial/TutorialPage.qml:178

387#: qml/Tutorial/TutorialPage.qml:178

387msgid "You almost got it!"

388msgid "You almost got it!"

388−msgstr ""

389+msgstr "Почти получилось!"

389

390

390#: qml/Tutorial/TutorialPage.qml:195

391#: qml/Tutorial/TutorialPage.qml:195

391msgid "Try again."

392msgid "Try again."

392−msgstr ""

393+msgstr "Попробуйте ещё раз."

393

394

394#: qml/Tutorial/TutorialRight.qml:31

395#: qml/Tutorial/TutorialRight.qml:31

395msgid "To view open apps"

396msgid "To view open apps"

396−msgstr ""

397+msgstr "Просмотр открытых приложений"

397

398

398#: qml/Tutorial/TutorialRight.qml:32

399#: qml/Tutorial/TutorialRight.qml:32

399msgid "Long swipe from the right edge."

400msgid "Long swipe from the right edge."

400−msgstr ""

401+msgstr "Длинное смахивание от правого края."

401

402

402#: qml/Tutorial/TutorialRight.qml:122

403#: qml/Tutorial/TutorialRight.qml:122

403msgid "View all your running tasks."

404msgid "View all your running tasks."

404−msgstr ""

405+msgstr "Просмотр всех запущенных задач."

405

406

406#: qml/Wizard/Page.qml:89

407#: qml/Wizard/Page.qml:89

407msgctxt "Button: Go back one page in the Wizard"

408msgctxt "Button: Go back one page in the Wizard"

408msgid "Back"

409msgid "Back"

409−msgstr ""

410+msgstr "Назад"

410

411

411#: qml/Wizard/Pages/10-welcome.qml:27

412#: qml/Wizard/Pages/10-welcome.qml:27

412msgid "Hi!"

413msgid "Hi!"

@@ -451,32 +452,32 @@ msgstr "Выберите способ разблокировки телефон

451#: qml/Wizard/Pages/30-passwd-type.qml:97

452#: qml/Wizard/Pages/30-passwd-type.qml:97

452msgctxt "Label: Type of security method"

453msgctxt "Label: Type of security method"

453msgid "Swipe"

454msgid "Swipe"

454−msgstr ""

455+msgstr "Смахивание"

455

456

456#: qml/Wizard/Pages/30-passwd-type.qml:98

457#: qml/Wizard/Pages/30-passwd-type.qml:98

457msgctxt "Label: Description of security method"

458msgctxt "Label: Description of security method"

458msgid "No security"

459msgid "No security"

459−msgstr ""

460+msgstr "Без пароля"

460

461

461#: qml/Wizard/Pages/30-passwd-type.qml:100

462#: qml/Wizard/Pages/30-passwd-type.qml:100

462msgctxt "Label: Type of security method"

463msgctxt "Label: Type of security method"

463msgid "Passcode"

464msgid "Passcode"

464−msgstr ""

465+msgstr "Секретный код"

465

466

466#: qml/Wizard/Pages/30-passwd-type.qml:101

467#: qml/Wizard/Pages/30-passwd-type.qml:101

467msgctxt "Label: Description of security method"

468msgctxt "Label: Description of security method"

468msgid "4 digits only"

469msgid "4 digits only"

469−msgstr ""

470+msgstr "4 цифры"

470

471

471#: qml/Wizard/Pages/30-passwd-type.qml:103

472#: qml/Wizard/Pages/30-passwd-type.qml:103

472msgctxt "Label: Type of security method"

473msgctxt "Label: Type of security method"

473msgid "Passphrase"

474msgid "Passphrase"

474−msgstr ""

475+msgstr "Кодовая фраза"

475

476

476#: qml/Wizard/Pages/30-passwd-type.qml:104

477#: qml/Wizard/Pages/30-passwd-type.qml:104

477msgctxt "Label: Description of security method"

478msgctxt "Label: Description of security method"

478msgid "Numbers and letters"

479msgid "Numbers and letters"

479−msgstr ""

480+msgstr "Цифры и буквы"

480

481

481#: qml/Wizard/Pages/40-wifi.qml:29

482#: qml/Wizard/Pages/40-wifi.qml:29

482msgid "Connect to Wi‑Fi"

483msgid "Connect to Wi‑Fi"

@@ -680,6 +681,9 @@ msgstr "%1 〉"

680#~ msgid "Power"

681#~ msgid "Power"

681#~ msgstr "Питание"

682#~ msgstr "Питание"

682

683

684+#~ msgid "Settings"

685+#~ msgstr "Настройки"

686+

683#~ msgid "Store"

687#~ msgid "Store"

684#~ msgstr "Магазин"

688#~ msgstr "Магазин"

685

689

po/shn.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2013-10-07 11:46+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Shan <shn@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=(n == 1) ? 0 : 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/si.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2013-06-26 22:36+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Sinhalese <si@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

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/sl.po+38−26

@@ -7,8 +7,8 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11−"PO-Revision-Date: 2015-03-04 09:10+0000\n"

11+"PO-Revision-Date: 2015-03-23 07:24+0000\n"

12"Last-Translator: Damir Jerovšek <Unknown>\n"

13"Language-Team: Slovenian <sl@li.org>\n"

14"MIME-Version: 1.0\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "

18"n%100==4 ? 3 : 0);\n"

19−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

19+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

20−"X-Generator: Launchpad (build 17405)\n"

20+"X-Generator: Launchpad (build 17413)\n"

21

22#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

@@ -56,7 +56,7 @@ msgstr[3] "Počakajte %1 minute ter poskusite ponovno ..."

56#: qml/Components/Dialogs.qml:67

57msgctxt "Title: Lock/Log out dialog"

58msgid "Log out"

59−msgstr ""

59+msgstr "Odjava"

60

61#: qml/Components/Dialogs.qml:68

62msgid "Are you sure you want to log out?"

@@ -65,12 +65,12 @@ msgstr "Ali ste prepričani, da se želite odjaviti?"

65#: qml/Components/Dialogs.qml:70

66msgctxt "Button: Lock the system"

67msgid "Lock"

68−msgstr ""

68+msgstr "Zakleni"

69

70#: qml/Components/Dialogs.qml:77

71msgctxt "Button: Log out from the system"

72msgid "Log Out"

73−msgstr ""

73+msgstr "Odjavi se"

74

75#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

76#: qml/Components/Dialogs.qml:171

@@ -80,7 +80,7 @@ msgstr "Prekliči"

80#: qml/Components/Dialogs.qml:96

81msgctxt "Title: Reboot/Shut down dialog"

82msgid "Shut down"

83−msgstr ""

83+msgstr "Izklop"

84

85#: qml/Components/Dialogs.qml:97

86msgid "Are you sure you want to shut down?"

@@ -89,17 +89,17 @@ msgstr "Ali ste prepričani, da želite izklopiti?"

89#: qml/Components/Dialogs.qml:99

90msgctxt "Button: Reboot the system"

91msgid "Reboot"

92−msgstr ""

92+msgstr "Ponovno zaženi"

93

94#: qml/Components/Dialogs.qml:107

95msgctxt "Button: Shut down the system"

96msgid "Shut down"

97−msgstr ""

97+msgstr "Izklopi"

98

99#: qml/Components/Dialogs.qml:127

100msgctxt "Title: Reboot dialog"

101msgid "Reboot"

102−msgstr ""

102+msgstr "Ponovni zagon"

103

104#: qml/Components/Dialogs.qml:128

105msgid "Are you sure you want to reboot?"

@@ -116,7 +116,7 @@ msgstr "Da"

116#: qml/Components/Dialogs.qml:150

117msgctxt "Title: Power off/Restart dialog"

118msgid "Power"

119−msgstr ""

119+msgstr "Napajanje"

120

121#: qml/Components/Dialogs.qml:151

122msgid ""

@@ -129,12 +129,12 @@ msgstr ""

129#: qml/Components/Dialogs.qml:153

130msgctxt "Button: Power off the system"

131msgid "Power off"

132−msgstr ""

132+msgstr "Izključi"

133

134#: qml/Components/Dialogs.qml:162

135msgctxt "Button: Restart the system"

136msgid "Restart"

137−msgstr ""

137+msgstr "Ponovno zaženi"

138

139#: qml/Components/Lockscreen.qml:238

140msgid "Return to Call"

@@ -159,21 +159,22 @@ msgstr "Pokaži vse"

159#: qml/Dash/GenericScopeView.qml:595

160msgctxt "Label: Hint for dash search line edit"

161msgid "Search"

162−msgstr ""

162+msgstr "Iskanje"

163

164#: qml/Dash/PageHeader.qml:269

165−msgctxt "Button: The Ubuntu Store"

165+msgctxt "Button: Open the Ubuntu Store"

166msgid "Store"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:276

170−msgctxt "Button: Shown in Page Header Menu"

170+msgctxt "Button: Start a search in the current dash scope"

171msgid "Search"

172msgstr ""

173

174#: qml/Dash/PageHeader.qml:286

175+msgctxt "Button: Show the current dash scope settings"

175msgid "Settings"

176msgid "Settings"

176−msgstr "Nastavitve"

177+msgstr ""

177

178

178#: qml/Dash/PageHeader.qml:293

179#: qml/Dash/PageHeader.qml:293

179msgid "Remove from Favorites"

180msgid "Remove from Favorites"

@@ -340,7 +341,7 @@ msgstr "Spodletelo, tapnite za ponovni poskus"

340#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

341#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

341msgctxt "Label: Hint in message indicator line edit"

342msgctxt "Label: Hint in message indicator line edit"

342msgid "Reply"

343msgid "Reply"

343−msgstr ""

344+msgstr "Odgovor"

344

345

345#: qml/Panel/Indicators/ModemInfoItem.qml:105

346#: qml/Panel/Indicators/ModemInfoItem.qml:105

346msgid "Unlock SIM"

347msgid "Unlock SIM"

@@ -405,7 +406,7 @@ msgstr "Ogled vseh izvajajočih se opravil"

405#: qml/Wizard/Page.qml:89

406#: qml/Wizard/Page.qml:89

406msgctxt "Button: Go back one page in the Wizard"

407msgctxt "Button: Go back one page in the Wizard"

407msgid "Back"

408msgid "Back"

408−msgstr ""

409+msgstr "Nazaj"

409

410

410#: qml/Wizard/Pages/10-welcome.qml:27

411#: qml/Wizard/Pages/10-welcome.qml:27

411msgid "Hi!"

412msgid "Hi!"

@@ -449,32 +450,32 @@ msgstr "Izberite, kako želite odkleniti svoj telefon."

449#: qml/Wizard/Pages/30-passwd-type.qml:97

450#: qml/Wizard/Pages/30-passwd-type.qml:97

450msgctxt "Label: Type of security method"

451msgctxt "Label: Type of security method"

451msgid "Swipe"

452msgid "Swipe"

452−msgstr ""

453+msgstr "Poteg"

453

454

454#: qml/Wizard/Pages/30-passwd-type.qml:98

455#: qml/Wizard/Pages/30-passwd-type.qml:98

455msgctxt "Label: Description of security method"

456msgctxt "Label: Description of security method"

456msgid "No security"

457msgid "No security"

457−msgstr ""

458+msgstr "Brez varnosti"

458

459

459#: qml/Wizard/Pages/30-passwd-type.qml:100

460#: qml/Wizard/Pages/30-passwd-type.qml:100

460msgctxt "Label: Type of security method"

461msgctxt "Label: Type of security method"

461msgid "Passcode"

462msgid "Passcode"

462−msgstr ""

463+msgstr "Geslo"

463

464

464#: qml/Wizard/Pages/30-passwd-type.qml:101

465#: qml/Wizard/Pages/30-passwd-type.qml:101

465msgctxt "Label: Description of security method"

466msgctxt "Label: Description of security method"

466msgid "4 digits only"

467msgid "4 digits only"

467−msgstr ""

468+msgstr "Samo 4 številke"

468

469

469#: qml/Wizard/Pages/30-passwd-type.qml:103

470#: qml/Wizard/Pages/30-passwd-type.qml:103

470msgctxt "Label: Type of security method"

471msgctxt "Label: Type of security method"

471msgid "Passphrase"

472msgid "Passphrase"

472−msgstr ""

473+msgstr "Šifrirno reklo"

473

474

474#: qml/Wizard/Pages/30-passwd-type.qml:104

475#: qml/Wizard/Pages/30-passwd-type.qml:104

475msgctxt "Label: Description of security method"

476msgctxt "Label: Description of security method"

476msgid "Numbers and letters"

477msgid "Numbers and letters"

477−msgstr ""

478+msgstr "Številke in črke"

478

479

479#: qml/Wizard/Pages/40-wifi.qml:29

480#: qml/Wizard/Pages/40-wifi.qml:29

480msgid "Connect to Wi‑Fi"

481msgid "Connect to Wi‑Fi"

@@ -678,5 +679,16 @@ msgstr "%1 〉"

678#~ msgid "Power"

679#~ msgid "Power"

679#~ msgstr "Izključitev"

680#~ msgstr "Izključitev"

680

681

682+#~ msgid "Settings"

683+#~ msgstr "Nastavitve"

684+

681#~ msgid "Restart"

685#~ msgid "Restart"

682#~ msgstr "Ponovni zagon"

686#~ msgstr "Ponovni zagon"

687+

688+#~ msgctxt "Button: Shown in Page Header Menu"

689+#~ msgid "Search"

690+#~ msgstr "Poišči"

691+

692+#~ msgctxt "Button: The Ubuntu Store"

693+#~ msgid "Store"

694+#~ msgstr "Trgovina"

po/sq.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-01-15 13:51+0000\n"

12"Last-Translator: Besmir Zanaj <besmirzanaj@gmail.com>\n"

13"Language-Team: Albanian <sq@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:20+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/sr.po+39−34

@@ -8,17 +8,17 @@ msgid ""

8msgstr ""

9"Project-Id-Version: unity\n"

10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

11−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

11+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

12−"PO-Revision-Date: 2015-03-04 22:25+0000\n"

12+"PO-Revision-Date: 2015-04-13 15:19+0000\n"

13−"Last-Translator: Саша Петровић <salepetronije@gmail.com>\n"

13+"Last-Translator: Данило Шеган <Unknown>\n"

14"Language-Team: српски <xfce4@xfce4.org>\n"

15"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

19"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

20−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

20+"X-Launchpad-Export-Date: 2015-04-14 05:33+0000\n"

21−"X-Generator: Launchpad (build 17405)\n"

21+"X-Generator: Launchpad (build 17423)\n"

22"Language: sr\n"

23

24#: plugins/LightDM/Greeter.cpp:112

@@ -57,7 +57,7 @@ msgstr[2] "Молим, сачекајте %1 минута, па покушајт

57#: qml/Components/Dialogs.qml:67

58msgctxt "Title: Lock/Log out dialog"

59msgid "Log out"

60−msgstr ""

60+msgstr "Одјави се"

61

62#: qml/Components/Dialogs.qml:68

63msgid "Are you sure you want to log out?"

@@ -66,12 +66,12 @@ msgstr "Сигурно желите да се одјавите?"

66#: qml/Components/Dialogs.qml:70

67msgctxt "Button: Lock the system"

68msgid "Lock"

69−msgstr ""

69+msgstr "Закључај"

70

71#: qml/Components/Dialogs.qml:77

72msgctxt "Button: Log out from the system"

73msgid "Log Out"

74−msgstr ""

74+msgstr "Одјави се"

75

76#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

77#: qml/Components/Dialogs.qml:171

@@ -81,7 +81,7 @@ msgstr "Откажи"

81#: qml/Components/Dialogs.qml:96

82msgctxt "Title: Reboot/Shut down dialog"

83msgid "Shut down"

84−msgstr ""

84+msgstr "Угаси"

85

86#: qml/Components/Dialogs.qml:97

87msgid "Are you sure you want to shut down?"

@@ -90,17 +90,17 @@ msgstr "Сигурно желите да угасите?"

90#: qml/Components/Dialogs.qml:99

91msgctxt "Button: Reboot the system"

92msgid "Reboot"

93−msgstr ""

93+msgstr "Ресетуј"

94

95#: qml/Components/Dialogs.qml:107

96msgctxt "Button: Shut down the system"

97msgid "Shut down"

98−msgstr ""

98+msgstr "Угаси"

99

100#: qml/Components/Dialogs.qml:127

101msgctxt "Title: Reboot dialog"

102msgid "Reboot"

103−msgstr ""

103+msgstr "Ресетуј"

104

105#: qml/Components/Dialogs.qml:128

106msgid "Are you sure you want to reboot?"

@@ -117,7 +117,7 @@ msgstr "Да"

117#: qml/Components/Dialogs.qml:150

118msgctxt "Title: Power off/Restart dialog"

119msgid "Power"

120−msgstr ""

120+msgstr "Напајање"

121

122#: qml/Components/Dialogs.qml:151

123msgid ""

@@ -130,12 +130,12 @@ msgstr ""

130#: qml/Components/Dialogs.qml:153

131msgctxt "Button: Power off the system"

132msgid "Power off"

133−msgstr ""

133+msgstr "Искључи"

134

135#: qml/Components/Dialogs.qml:162

136msgctxt "Button: Restart the system"

137msgid "Restart"

138−msgstr ""

138+msgstr "Покрени поново"

139

140#: qml/Components/Lockscreen.qml:238

141msgid "Return to Call"

@@ -160,19 +160,20 @@ msgstr "Опширније"

160#: qml/Dash/GenericScopeView.qml:595

161msgctxt "Label: Hint for dash search line edit"

162msgid "Search"

163−msgstr ""

163+msgstr "Претрага"

164

165#: qml/Dash/PageHeader.qml:269

166−msgctxt "Button: The Ubuntu Store"

166+msgctxt "Button: Open the Ubuntu Store"

167msgid "Store"

168−msgstr ""

168+msgstr "Продавница"

169

170#: qml/Dash/PageHeader.qml:276

171−msgctxt "Button: Shown in Page Header Menu"

171+msgctxt "Button: Start a search in the current dash scope"

172msgid "Search"

173−msgstr ""

173+msgstr "Тражи"

174

175#: qml/Dash/PageHeader.qml:286

176+msgctxt "Button: Show the current dash scope settings"

176msgid "Settings"

177msgid "Settings"

177msgstr "Подешавања"

178msgstr "Подешавања"

178

179

@@ -234,11 +235,11 @@ msgstr "Откључај"

234

235

235#: qml/Greeter/LoginList.qml:236

236#: qml/Greeter/LoginList.qml:236

236msgid "Retry"

237msgid "Retry"

237−msgstr ""

238+msgstr "Покушај поново"

238

239

239#: qml/Greeter/LoginList.qml:237

240#: qml/Greeter/LoginList.qml:237

240msgid "Tap to unlock"

241msgid "Tap to unlock"

241−msgstr ""

242+msgstr "Додирните да откључате"

242

243

243#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

244#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

244msgid "Sorry, incorrect passphrase."

245msgid "Sorry, incorrect passphrase."

@@ -341,7 +342,7 @@ msgstr "Неуспешно, тапните да покушате поново"

341#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

342#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

342msgctxt "Label: Hint in message indicator line edit"

343msgctxt "Label: Hint in message indicator line edit"

343msgid "Reply"

344msgid "Reply"

344−msgstr ""

345+msgstr "Одговор"

345

346

346#: qml/Panel/Indicators/ModemInfoItem.qml:105

347#: qml/Panel/Indicators/ModemInfoItem.qml:105

347msgid "Unlock SIM"

348msgid "Unlock SIM"

@@ -353,7 +354,7 @@ msgstr "Роминг"

353

354

354#: qml/Tutorial/TutorialBottomFinish.qml:24

355#: qml/Tutorial/TutorialBottomFinish.qml:24

355msgid "This action does different things for different apps"

356msgid "This action does different things for different apps"

356−msgstr ""

357+msgstr "Ова радња ради различите ствари за различите програме"

357

358

358#: qml/Tutorial/TutorialBottomFinish.qml:25

359#: qml/Tutorial/TutorialBottomFinish.qml:25

359msgid "Tap here to finish."

360msgid "Tap here to finish."

@@ -365,7 +366,7 @@ msgstr "Отвори нарочите изборнике"

365

366

366#: qml/Tutorial/TutorialBottom.qml:29

367#: qml/Tutorial/TutorialBottom.qml:29

367msgid "Swipe up from the bottom edge."

368msgid "Swipe up from the bottom edge."

368−msgstr ""

369+msgstr "Превуците од доње ивице навише."

369

370

370#: qml/Tutorial/TutorialLeftFinish.qml:24

371#: qml/Tutorial/TutorialLeftFinish.qml:24

371msgid "These are the shortcuts to favorite apps"

372msgid "These are the shortcuts to favorite apps"

@@ -406,7 +407,7 @@ msgstr "Прегледајте покренуте задатке."

406#: qml/Wizard/Page.qml:89

407#: qml/Wizard/Page.qml:89

407msgctxt "Button: Go back one page in the Wizard"

408msgctxt "Button: Go back one page in the Wizard"

408msgid "Back"

409msgid "Back"

409−msgstr ""

410+msgstr "Назад"

410

411

411#: qml/Wizard/Pages/10-welcome.qml:27

412#: qml/Wizard/Pages/10-welcome.qml:27

412msgid "Hi!"

413msgid "Hi!"

@@ -414,7 +415,7 @@ msgstr "Здраво!"

414

415

415#: qml/Wizard/Pages/10-welcome.qml:44

416#: qml/Wizard/Pages/10-welcome.qml:44

416msgid "Welcome to your Ubuntu phone."

417msgid "Welcome to your Ubuntu phone."

417−msgstr ""

418+msgstr "Добродошли у свој Убунту телефон."

418

419

419#: qml/Wizard/Pages/10-welcome.qml:52

420#: qml/Wizard/Pages/10-welcome.qml:52

420msgid "Let’s get started."

421msgid "Let’s get started."

@@ -450,32 +451,32 @@ msgstr "Молим, изаберите како бисте желели да о

450#: qml/Wizard/Pages/30-passwd-type.qml:97

451#: qml/Wizard/Pages/30-passwd-type.qml:97

451msgctxt "Label: Type of security method"

452msgctxt "Label: Type of security method"

452msgid "Swipe"

453msgid "Swipe"

453−msgstr ""

454+msgstr "Превлачење"

454

455

455#: qml/Wizard/Pages/30-passwd-type.qml:98

456#: qml/Wizard/Pages/30-passwd-type.qml:98

456msgctxt "Label: Description of security method"

457msgctxt "Label: Description of security method"

457msgid "No security"

458msgid "No security"

458−msgstr ""

459+msgstr "Без заштите"

459

460

460#: qml/Wizard/Pages/30-passwd-type.qml:100

461#: qml/Wizard/Pages/30-passwd-type.qml:100

461msgctxt "Label: Type of security method"

462msgctxt "Label: Type of security method"

462msgid "Passcode"

463msgid "Passcode"

463−msgstr ""

464+msgstr "Код"

464

465

465#: qml/Wizard/Pages/30-passwd-type.qml:101

466#: qml/Wizard/Pages/30-passwd-type.qml:101

466msgctxt "Label: Description of security method"

467msgctxt "Label: Description of security method"

467msgid "4 digits only"

468msgid "4 digits only"

468−msgstr ""

469+msgstr "Само 4 цифре"

469

470

470#: qml/Wizard/Pages/30-passwd-type.qml:103

471#: qml/Wizard/Pages/30-passwd-type.qml:103

471msgctxt "Label: Type of security method"

472msgctxt "Label: Type of security method"

472msgid "Passphrase"

473msgid "Passphrase"

473−msgstr ""

474+msgstr "Лозинка"

474

475

475#: qml/Wizard/Pages/30-passwd-type.qml:104

476#: qml/Wizard/Pages/30-passwd-type.qml:104

476msgctxt "Label: Description of security method"

477msgctxt "Label: Description of security method"

477msgid "Numbers and letters"

478msgid "Numbers and letters"

478−msgstr ""

479+msgstr "Бројеви и слова"

479

480

480#: qml/Wizard/Pages/40-wifi.qml:29

481#: qml/Wizard/Pages/40-wifi.qml:29

481msgid "Connect to Wi‑Fi"

482msgid "Connect to Wi‑Fi"

@@ -504,6 +505,7 @@ msgstr "Користећи само ГПС (мања тачност)"

504#: qml/Wizard/Pages/50-location.qml:86

505#: qml/Wizard/Pages/50-location.qml:86

505msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

506msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

506msgstr ""

507msgstr ""

508+"Помоћу GPS-a, заштићених података о бежичним и мобилним мрежама (препоручено)"

507

509

508#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

510#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

509#: qml/Wizard/Pages/50-location.qml:103

511#: qml/Wizard/Pages/50-location.qml:103

@@ -581,7 +583,7 @@ msgstr "Изаберите своју шифру"

581

583

582#: qml/Wizard/Pages/passwd-set.qml:68

584#: qml/Wizard/Pages/passwd-set.qml:68

583msgid "Passphrase must be 4 characters long"

585msgid "Passphrase must be 4 characters long"

584−msgstr ""

586+msgstr "Лозинка мора имати бар 4 знака"

585

587

586#: qml/Wizard/StackButton.qml:39

588#: qml/Wizard/StackButton.qml:39

587#, qt-format

589#, qt-format

@@ -663,6 +665,9 @@ msgstr "%1 〉"

663#~ "Сада сте савладали превлачења са ивица и можете да користите "

665#~ "Сада сте савладали превлачења са ивица и можете да користите "

664#~ "телефон Тапните на екран да почнете"

666#~ "телефон Тапните на екран да почнете"

665

667

668+#~ msgid "Settings"

669+#~ msgstr "Подешавања"

670+

666#~ msgid "All"

671#~ msgid "All"

667#~ msgstr "Сви"

672#~ msgstr "Сви"

668

673

po/sv.po+26−22

@@ -2,21 +2,21 @@

3# This file is distributed under the same license as the unity package.

4# Josef Andersson <josef.andersson@fripost.org>, 2014.

5−#

5+# clone <josef.andersson@fripost.org>, 2015.

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"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"

12"Last-Translator: Josef Andersson <Unknown>\n"

13−"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"

13+"Language-Team: Swedish\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-22 05:30+0000\n"

18+"X-Launchpad-Export-Date: 2015-04-04 05:46+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20"Language: sv\n"

21

22#: plugins/LightDM/Greeter.cpp:112

@@ -48,8 +48,8 @@ msgstr "Du har blivit utlåst efter för många misslyckade lösenkodsförsök."

48#, qt-format

49msgid "Please wait %1 minute and then try again…"

50msgid_plural "Please wait %1 minutes and then try again…"

51−msgstr[0] "Vänta %1 minut 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..."

52+msgstr[1] "Vänta %1 minuter och prova sedan igen…"

53

54#: qml/Components/Dialogs.qml:67

55msgctxt "Title: Lock/Log out dialog"

@@ -144,7 +144,7 @@ msgstr "Nödsamtal"

144

145#: qml/Components/Lockscreen.qml:270

146msgid "OK"

147−msgstr "Ok"

147+msgstr "OK"

148

149#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

150msgid "See less"

@@ -160,16 +160,17 @@ msgid "Search"

160msgstr "Sök"

161

162#: qml/Dash/PageHeader.qml:269

163−msgctxt "Button: The Ubuntu Store"

163+msgctxt "Button: Open the Ubuntu Store"

164msgid "Store"

165−msgstr "Butik"

165+msgstr "Förråd"

166

167#: qml/Dash/PageHeader.qml:276

168−msgctxt "Button: Shown in Page Header Menu"

168+msgctxt "Button: Start a search in the current dash scope"

169msgid "Search"

170msgstr "Sök"

171

172#: qml/Dash/PageHeader.qml:286

173+msgctxt "Button: Show the current dash scope settings"

173msgid "Settings"

174msgid "Settings"

174msgstr "Inställningar"

175msgstr "Inställningar"

175

176

@@ -203,11 +204,11 @@ msgstr "Skicka"

203

204

204#: qml/Dash/PullToRefreshScopeStyle.qml:55

205#: qml/Dash/PullToRefreshScopeStyle.qml:55

205msgid "Pull to refresh…"

206msgid "Pull to refresh…"

206−msgstr "Dra för att uppdatera..."

207+msgstr "Dra för att uppdatera…"

207

208

208#: qml/Dash/PullToRefreshScopeStyle.qml:60

209#: qml/Dash/PullToRefreshScopeStyle.qml:60

209msgid "Release to refresh…"

210msgid "Release to refresh…"

210−msgstr "Släpp för uppdatera..."

211+msgstr "Släpp för att uppdatera…"

211

212

212#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

213#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

213msgid "Enable location data"

214msgid "Enable location data"

@@ -301,7 +302,7 @@ msgstr "Visa lösenord"

301

302

302#: qml/Panel/ActiveCallHint.qml:79

303#: qml/Panel/ActiveCallHint.qml:79

303msgid "Tap to return to call..."

304msgid "Tap to return to call..."

304−msgstr "Tryck för att återgå till samtal..."

305+msgstr "Tryck för att återgå till samtal…"

305

306

306#: qml/Panel/ActiveCallHint.qml:92

307#: qml/Panel/ActiveCallHint.qml:92

307msgid "Conference"

308msgid "Conference"

@@ -354,7 +355,7 @@ msgstr "Denna åtgärd gör olika saker för olika program"

354

355

355#: qml/Tutorial/TutorialBottomFinish.qml:25

356#: qml/Tutorial/TutorialBottomFinish.qml:25

356msgid "Tap here to finish."

357msgid "Tap here to finish."

357−msgstr "Tryck här för att avsluta"

358+msgstr "Tryck här för att avsluta."

358

359

359#: qml/Tutorial/TutorialBottom.qml:28

360#: qml/Tutorial/TutorialBottom.qml:28

360msgid "Open special menus"

361msgid "Open special menus"

@@ -362,7 +363,7 @@ msgstr "Öppna specialmenyer"

362

363

363#: qml/Tutorial/TutorialBottom.qml:29

364#: qml/Tutorial/TutorialBottom.qml:29

364msgid "Swipe up from the bottom edge."

365msgid "Swipe up from the bottom edge."

365−msgstr "Svep uppåt från nedre kanten"

366+msgstr "Svep uppåt från nedre kanten."

366

367

367#: qml/Tutorial/TutorialLeftFinish.qml:24

368#: qml/Tutorial/TutorialLeftFinish.qml:24

368msgid "These are the shortcuts to favorite apps"

369msgid "These are the shortcuts to favorite apps"

@@ -415,7 +416,7 @@ msgstr "Välkommen till din Ubuntutelefon."

415

416

416#: qml/Wizard/Pages/10-welcome.qml:52

417#: qml/Wizard/Pages/10-welcome.qml:52

417msgid "Let’s get started."

418msgid "Let’s get started."

418−msgstr "Låt oss komma igång"

419+msgstr "Låt oss komma igång."

419

420

420#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

421#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

421#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

422#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

@@ -431,7 +432,7 @@ msgstr "Lägg till ett SIM-kort och starta om din enhet"

431#: qml/Wizard/Pages/20-sim.qml:59

432#: qml/Wizard/Pages/20-sim.qml:59

432msgid "Without it, you won’t be able to make calls or use text messaging."

433msgid "Without it, you won’t be able to make calls or use text messaging."

433msgstr ""

434msgstr ""

434−"Utan det kommer du inte att kunnda ringa eller skicka textmeddelanden."

435+"Utan det kommer du inte att kunna ringa eller skicka textmeddelanden."

435

436

436#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

437#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

437msgid "Skip"

438msgid "Skip"

@@ -481,11 +482,11 @@ msgstr "Anslut till Wi-Fi"

481

482

482#: qml/Wizard/Pages/40-wifi.qml:168

483#: qml/Wizard/Pages/40-wifi.qml:168

483msgid "Available networks…"

484msgid "Available networks…"

484−msgstr "Tillgängliga nätverk.."

485+msgstr "Tillgängliga nätverk…"

485

486

486#: qml/Wizard/Pages/40-wifi.qml:169

487#: qml/Wizard/Pages/40-wifi.qml:169

487msgid "No available networks."

488msgid "No available networks."

488−msgstr "Inga tillgängliga nätverk"

489+msgstr "Inga tillgängliga nätverk."

489

490

490#: qml/Wizard/Pages/50-location.qml:27

491#: qml/Wizard/Pages/50-location.qml:27

491msgid "Location"

492msgid "Location"

@@ -519,7 +520,7 @@ msgstr "Inte alls"

519

520

520#: qml/Wizard/Pages/50-location.qml:124

521#: qml/Wizard/Pages/50-location.qml:124

521msgid "You can change your mind later in System Settings."

522msgid "You can change your mind later in System Settings."

522−msgstr "Du kan ändra dig senare via Systeminställningar</b."

523+msgstr "Du kan ändra dig senare via Systeminställningar."

523

524

524#: qml/Wizard/Pages/60-reporting.qml:24

525#: qml/Wizard/Pages/60-reporting.qml:24

525msgid "Improving your experience"

526msgid "Improving your experience"

@@ -665,6 +666,9 @@ msgstr "%1 〉"

665#~ msgid "All"

666#~ msgid "All"

666#~ msgstr "Alla"

667#~ msgstr "Alla"

667

668

669+#~ msgid "Settings"

670+#~ msgstr "Inställningar"

671+

668#~ msgid "Store"

672#~ msgid "Store"

669#~ msgstr "Butik"

673#~ msgstr "Butik"

670

674

po/sw.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-01-14 19:28+0000\n"

12"Last-Translator: Damas <Unknown>\n"

13"Language-Team: Swahili <sw@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/ta.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2013-10-24 11:36+0000\n"

12"Last-Translator: Arun Kumar - அருண் குமார் <thangam.arunx@gmail.com>\n"

13"Language-Team: Ubuntu Tamil Team/Free Tamil Computing/Thamizha\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20"Language: ta\n"

21

22#: plugins/LightDM/Greeter.cpp:112

@@ -158,16 +158,17 @@ msgid "Search"

158msgstr ""

159

160#: qml/Dash/PageHeader.qml:269

161−msgctxt "Button: The Ubuntu Store"

161+msgctxt "Button: Open the Ubuntu Store"

162msgid "Store"

163msgstr ""

164

165#: qml/Dash/PageHeader.qml:276

166−msgctxt "Button: Shown in Page Header Menu"

166+msgctxt "Button: Start a search in the current dash scope"

167msgid "Search"

168msgstr ""

169

170#: qml/Dash/PageHeader.qml:286

171+msgctxt "Button: Show the current dash scope settings"

171msgid "Settings"

172msgid "Settings"

172msgstr ""

173msgstr ""

173

174

po/te.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-07-19 10:04+0000\n"

12"Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"

13"Language-Team: Telugu <te@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/th.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-10-02 04:55+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Thai <th@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/tr.po+10−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2015-03-22 15:56+0000\n"

12"Last-Translator: Arda Ünlü <aarda.uunlu@gmail.com>\n"

13"Language-Team: Turkish <tr@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-23 05:31+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,18 +157,19 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171−msgstr "Ayarlar"

172+msgstr ""

172

173

173#: qml/Dash/PageHeader.qml:293

174#: qml/Dash/PageHeader.qml:293

174msgid "Remove from Favorites"

175msgid "Remove from Favorites"

@@ -668,5 +669,8 @@ msgstr "%1 〉"

668#~ msgid "Power off"

669#~ msgid "Power off"

669#~ msgstr "Kapat"

670#~ msgstr "Kapat"

670

671

672+#~ msgid "Settings"

673+#~ msgstr "Ayarlar"

674+

671#~ msgid "Restart"

675#~ msgid "Restart"

672#~ msgstr "Yeniden başlat"

676#~ msgstr "Yeniden başlat"

po/ug.po+10−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-10-07 09:00+0000\n"

12"Last-Translator: Gheyret T.Kenji <Unknown>\n"

13"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -158,18 +158,19 @@ msgid "Search"

158msgstr ""

159

160#: qml/Dash/PageHeader.qml:269

161−msgctxt "Button: The Ubuntu Store"

161+msgctxt "Button: Open the Ubuntu Store"

162msgid "Store"

163msgstr ""

164

165#: qml/Dash/PageHeader.qml:276

166−msgctxt "Button: Shown in Page Header Menu"

166+msgctxt "Button: Start a search in the current dash scope"

167msgid "Search"

168msgstr ""

169

170#: qml/Dash/PageHeader.qml:286

171+msgctxt "Button: Show the current dash scope settings"

171msgid "Settings"

172msgid "Settings"

172−msgstr "تەڭشەكلەر"

173+msgstr ""

173

174

174#: qml/Dash/PageHeader.qml:293

175#: qml/Dash/PageHeader.qml:293

175msgid "Remove from Favorites"

176msgid "Remove from Favorites"

@@ -652,6 +653,9 @@ msgstr ""

652#~ msgid "Power off"

653#~ msgid "Power off"

653#~ msgstr "توكنى ئۈز"

654#~ msgstr "توكنى ئۈز"

654

655

656+#~ msgid "Settings"

657+#~ msgstr "تەڭشەكلەر"

658+

655#~ msgid "Done"

659#~ msgid "Done"

656#~ msgstr "تامام"

660#~ msgstr "تامام"

657

661

po/uk.po+20−8

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2015-03-20 11:40+0000\n"

12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"

13"Language-Team: Ukrainian <uk@li.org>\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2015-03-21 05:43+0000\n"

19+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

20−"X-Generator: Launchpad (build 17405)\n"

20+"X-Generator: Launchpad (build 17413)\n"

21

22#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

@@ -165,18 +165,19 @@ msgid "Search"

165msgstr "Пошук"

166

167#: qml/Dash/PageHeader.qml:269

168−msgctxt "Button: The Ubuntu Store"

168+msgctxt "Button: Open the Ubuntu Store"

169msgid "Store"

170−msgstr "Крамниця"

170+msgstr ""

171

172#: qml/Dash/PageHeader.qml:276

173−msgctxt "Button: Shown in Page Header Menu"

173+msgctxt "Button: Start a search in the current dash scope"

174msgid "Search"

175−msgstr "Шукати"

175+msgstr ""

176

177#: qml/Dash/PageHeader.qml:286

178+msgctxt "Button: Show the current dash scope settings"

178msgid "Settings"

179msgid "Settings"

179−msgstr "Параметри"

180+msgstr ""

180

181

181#: qml/Dash/PageHeader.qml:293

182#: qml/Dash/PageHeader.qml:293

182msgid "Remove from Favorites"

183msgid "Remove from Favorites"

@@ -683,8 +684,19 @@ msgstr "%1 〉"

683#~ msgid "Power"

684#~ msgid "Power"

684#~ msgstr "Живлення"

685#~ msgstr "Живлення"

685

686

687+#~ msgid "Settings"

688+#~ msgstr "Параметри"

689+

686#~ msgid "Restart"

690#~ msgid "Restart"

687#~ msgstr "Перезапуск"

691#~ msgstr "Перезапуск"

688

692

689#~ msgid "Manage Scopes"

693#~ msgid "Manage Scopes"

690#~ msgstr "Керування областями"

694#~ msgstr "Керування областями"

695+

696+#~ msgctxt "Button: Shown in Page Header Menu"

697+#~ msgid "Search"

698+#~ msgstr "Шукати"

699+

700+#~ msgctxt "Button: The Ubuntu Store"

701+#~ msgid "Store"

702+#~ msgstr "Крамниця"

po/unity8.pot+4−3

@@ -8,7 +8,7 @@ msgid ""

8msgstr ""

9"Project-Id-Version: unity8\n"

10"Report-Msgid-Bugs-To: \n"

11−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

11+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14"Language-Team: LANGUAGE <LL@li.org>\n"

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/vi.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-01-15 01:19+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Vietnamese <vi@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/xh.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2013-09-28 13:20+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Xhosa <xh@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/zh_CN.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-12-04 11:57+0000\n"

12"Last-Translator: Mo <alimo199x@gmail.com>\n"

13"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/zh_HK.po+6−5

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2014-08-10 11:45+0000\n"

12"Last-Translator: Daniel Cheung <daniel.2345@hotmail.com>\n"

13"Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

@@ -157,16 +157,17 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171msgstr ""

172msgstr ""

172

173

po/zh_TW.po+10−6

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2015-03-13 11:06+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11"PO-Revision-Date: 2015-03-15 06:06+0000\n"

12"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"

13"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-03-20 05:21+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17405)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20"Language: zh_TW\n"

21

22#: plugins/LightDM/Greeter.cpp:112

@@ -157,18 +157,19 @@ msgid "Search"

157msgstr ""

158

159#: qml/Dash/PageHeader.qml:269

160−msgctxt "Button: The Ubuntu Store"

160+msgctxt "Button: Open the Ubuntu Store"

161msgid "Store"

162msgstr ""

163

164#: qml/Dash/PageHeader.qml:276

165−msgctxt "Button: Shown in Page Header Menu"

165+msgctxt "Button: Start a search in the current dash scope"

166msgid "Search"

167msgstr ""

168

169#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

170msgid "Settings"

171msgid "Settings"

171−msgstr "設定"

172+msgstr ""

172

173

173#: qml/Dash/PageHeader.qml:293

174#: qml/Dash/PageHeader.qml:293

174msgid "Remove from Favorites"

175msgid "Remove from Favorites"

@@ -648,6 +649,9 @@ msgstr "%1 〉"

648#~ msgid "All"

649#~ msgid "All"

649#~ msgstr "全部"

650#~ msgstr "全部"

650

651

652+#~ msgid "Settings"

653+#~ msgstr "設定"

654+

651#~ msgid "Favorites"

655#~ msgid "Favorites"

652#~ msgstr "最愛"

656#~ msgstr "最愛"

653

657

qml/Components/Dialogs.qml+2

@@ -51,11 +51,13 @@ Item {

51 if (!dialogLoader.active) {

52 dialogLoader.sourceComponent = powerDialogComponent;

53 dialogLoader.active = true;

54+ dialogLoader.item.forceActiveFocus();

54 }

55 }

56 }

57 }

57 Loader {

58 Loader {

58 id: dialogLoader

59 id: dialogLoader

60+ objectName: "dialogLoader"

59 anchors.fill: parent

61 anchors.fill: parent

60 active: false

62 active: false

61 }

63 }

qml/Components/Lockscreen.qml+14−7

@@ -60,6 +60,8 @@ Showable {

60 // 0: normal background, 1: black background

61 property real darkenBackground: 0

62

63+ property color foregroundColor: "#f3f3e7"

64+

63 readonly property string passphrase: (pinPadLoader.item && pinPadLoader.item.passphrase) ? pinPadLoader.item.passphrase : ""

65 readonly property string passphrase: (pinPadLoader.item && pinPadLoader.item.passphrase) ? pinPadLoader.item.passphrase : ""

64

66

65 signal entered(string passphrase)

67 signal entered(string passphrase)

@@ -210,11 +212,16 @@ Showable {

210 property: "delayMinutes"

212 property: "delayMinutes"

211 value: root.delayMinutes

213 value: root.delayMinutes

212 }

214 }

215+ Binding {

216+ target: pinPadLoader.item

217+ property: "showCancelButton"

218+ value: root.showCancelButton

213− }

219+ }

214− Binding {

220+ Binding {

215− target: pinPadLoader.item

221+ target: pinPadLoader.item

216− property: "showCancelButton"

222+ property: "foregroundColor"

217− value: root.showCancelButton

223+ value: root.foregroundColor

224+ }

218 }

225 }

219 }

226 }

220

227

@@ -236,7 +243,7 @@ Showable {

236 anchors.horizontalCenter: parent.horizontalCenter

243 anchors.horizontalCenter: parent.horizontalCenter

237

244

238 text: callManager.hasCalls ? i18n.tr("Return to Call") : i18n.tr("Emergency Call")

245 text: callManager.hasCalls ? i18n.tr("Return to Call") : i18n.tr("Emergency Call")

239− color: "#f3f3e7"

246+ color: root.foregroundColor

240 }

247 }

241

248

242 Icon {

249 Icon {

@@ -246,7 +253,7 @@ Showable {

246 width: emergencyCallLabel.height

253 width: emergencyCallLabel.height

247 height: emergencyCallLabel.height

254 height: emergencyCallLabel.height

248 name: "call-start"

255 name: "call-start"

249− color: "#f3f3e7"

256+ color: root.foregroundColor

250 }

257 }

251

258

252 MouseArea {

259 MouseArea {

qml/Components/PassphraseLockscreen.qml+5−4

@@ -26,6 +26,7 @@ Item {

26 property string infoText

27 property string errorText

28 property bool entryEnabled: true

29+ property color foregroundColor: "#000000"

29

30

30 readonly property string passphrase: pinentryField.text

31 readonly property string passphrase: pinentryField.text

31

32

@@ -53,7 +54,7 @@ Item {

53 id: infoField

54 id: infoField

54 objectName: "infoTextLabel"

55 objectName: "infoTextLabel"

55 fontSize: "x-large"

56 fontSize: "x-large"

56− color: "#f3f3e7"

57+ color: root.foregroundColor

57 anchors.horizontalCenter: parent.horizontalCenter

58 anchors.horizontalCenter: parent.horizontalCenter

58 text: root.infoText

59 text: root.infoText

59 }

60 }

@@ -79,7 +80,7 @@ Item {

79 echoMode: TextInput.Password

80 echoMode: TextInput.Password

80 inputMethodHints: Qt.ImhHiddenText | Qt.ImhSensitiveData |

81 inputMethodHints: Qt.ImhHiddenText | Qt.ImhSensitiveData |

81 Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText

82 Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText

82− color: "#f3f3e7"

83+ color: root.foregroundColor

83 cursorDelegate: Item {} // disable cursor

84 cursorDelegate: Item {} // disable cursor

84 onCursorPositionChanged: {

85 onCursorPositionChanged: {

85 // And because we don't show the cursor, always position the

86 // And because we don't show the cursor, always position the

@@ -119,7 +120,7 @@ Item {

119 Repeater {

120 Repeater {

120 model: pinentryField.length

121 model: pinentryField.length

121 delegate: Rectangle {

122 delegate: Rectangle {

122− color: "#f3f3e7"

123+ color: root.foregroundColor

123 width: dotRow.dotSize

124 width: dotRow.dotSize

124 height: width

125 height: width

125 radius: width / 2

126 radius: width / 2

@@ -131,7 +132,7 @@ Item {

131 id: wrongNoticeLabel

132 id: wrongNoticeLabel

132 objectName: "wrongNoticeLabel"

133 objectName: "wrongNoticeLabel"

133 fontSize: "large"

134 fontSize: "large"

134− color: "#f3f3e7"

135+ color: root.foregroundColor

135 anchors.horizontalCenter: parent.horizontalCenter

136 anchors.horizontalCenter: parent.horizontalCenter

136 horizontalAlignment: Text.AlignHCenter

137 horizontalAlignment: Text.AlignHCenter

137 text: root.errorText

138 text: root.errorText

qml/Components/PinLockscreen.qml+156−144

@@ -19,19 +19,16 @@ import Ubuntu.Components 0.1

19import Ubuntu.Components.ListItems 0.1

20import "../Components"

21

22−Column {

22+Item {

23 id: root

24− y: units.gu(4)

25− spacing: units.gu(2)

26

24

27 property string infoText

25 property string infoText

28 property string retryText

26 property string retryText

29 property string errorText

27 property string errorText

30− property int padWidth: units.gu(34)

31− property int padHeight: units.gu(28)

32 property int minPinLength: -1

28 property int minPinLength: -1

33 property int maxPinLength: -1

29 property int maxPinLength: -1

34 property bool showCancelButton: true

30 property bool showCancelButton: true

31+ property color foregroundColor: "#000000"

35

32

36 readonly property string passphrase: pinentryField.text

33 readonly property string passphrase: pinentryField.text

37

34

@@ -49,180 +46,195 @@ Column {

49 }

46 }

50

47

51 Column {

48 Column {

52− id: shakeContainer

49+ anchors {

53− anchors.horizontalCenter: parent.horizontalCenter

50+ left: parent.left;

54− width: parent.width

51+ right: parent.right;

55− spacing: units.gu(1)

52+ verticalCenter: parent.verticalCenter;

56−

53+ verticalCenterOffset: Math.max(-units.gu(10), -(root.height - height) / 2) + units.gu(4)

57− Label {

58− id: infoField

59− objectName: "infoTextLabel"

60− fontSize: "large"

61− color: "#f3f3e7"

62− anchors.horizontalCenter: parent.horizontalCenter

63− text: root.infoText

64 }

54 }

55+ spacing: units.gu(2)

65

56

66− Item {

57+ Column {

67− id: pinContainer

58+ id: shakeContainer

68− anchors { left: parent.left; right: parent.right; margins: units.gu(2) }

59+ anchors.horizontalCenter: parent.horizontalCenter

60+ width: parent.width

69− height: units.gu(4)

61+ spacing: units.gu(1)

70

62

71− Row {

63+ Label {

72− id: pinentryField

64+ id: infoField

73− objectName: "pinentryField"

65+ objectName: "infoTextLabel"

66+ fontSize: "large"

67+ color: root.foregroundColor

74 anchors.horizontalCenter: parent.horizontalCenter

68 anchors.horizontalCenter: parent.horizontalCenter

75− anchors.verticalCenter: parent.verticalCenter

69+ text: root.infoText

76− spacing: Math.max(0, Math.min(units.gu(3), (parent.width / root.maxPinLength) - units.gu(3)))

77−

78− property string text

79− property bool incorrectOverride: false

80−

81− Repeater {

82− model: pinentryField.text.length

83− delegate: Rectangle {

84− color: "#f3f3e7"

85− width: Math.min(units.gu(2), (pinContainer.width - pinContainer.height*2 ) / (root.maxPinLength >= 0 ? root.maxPinLength : 16))

86− height: width

87− radius: width / 2

88− }

89− }

70+ }

90

71

91− function appendNumber(number) {

72+ Item {

92− if (incorrectOverride) {

73+ id: pinContainer

93− incorrectOverride = false;

74+ anchors { left: parent.left; right: parent.right; margins: units.gu(2) }

75+ height: units.gu(4)

76+

77+ Row {

78+ id: pinentryField

79+ objectName: "pinentryField"

80+ anchors.horizontalCenter: parent.horizontalCenter

81+ anchors.verticalCenter: parent.verticalCenter

82+ spacing: Math.max(0, Math.min(units.gu(3), (parent.width / root.maxPinLength) - units.gu(3)))

83+

84+ property string text

85+ property bool incorrectOverride: false

86+

87+ Repeater {

88+ model: pinentryField.text.length

89+ delegate: Rectangle {

90+ color: root.foregroundColor

91+ width: Math.min(units.gu(2), (pinContainer.width - pinContainer.height*2 ) / (root.maxPinLength >= 0 ? root.maxPinLength : 16))

92+ height: width

93+ radius: width / 2

94+ }

94 }

95 }

95

96

96− pinentryField.text = pinentryField.text + number

97+ function appendNumber(number) {

98+ if (incorrectOverride) {

99+ incorrectOverride = false;

100+ }

97

101

102+ pinentryField.text = pinentryField.text + number

103+

98− if (root.minPinLength > 0 && root.maxPinLength > 0

104+ if (root.minPinLength > 0 && root.maxPinLength > 0

99− && root.minPinLength == root.maxPinLength && pinentryField.text.length == root.minPinLength) {

105+ && root.minPinLength == root.maxPinLength && pinentryField.text.length == root.minPinLength) {

100− root.entered(pinentryField.text)

106+ root.entered(pinentryField.text)

107+ }

101 }

108 }

102− }

103

109

104− function backspace() {

110+ function backspace() {

105− pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1)

111+ pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1)

112+ }

113+ }

114+ Label {

115+ id: wrongNoticeLabel

116+ objectName: "wrongNoticeLabel"

117+ fontSize: "x-large"

118+ color: root.foregroundColor

119+ anchors.horizontalCenter: parent.horizontalCenter

120+ horizontalAlignment: Text.AlignHCenter

121+ text: root.errorText

122+ visible: pinentryField.incorrectOverride

123+ scale: Math.min(1, parent.width / width)

106 }

124 }

107− }

108− Label {

109− id: wrongNoticeLabel

110− objectName: "wrongNoticeLabel"

111− fontSize: "x-large"

112− color: "#f3f3e7"

113− anchors.horizontalCenter: parent.horizontalCenter

114− horizontalAlignment: Text.AlignHCenter

115− text: root.errorText

116− visible: pinentryField.incorrectOverride

117− scale: Math.min(1, parent.width / width)

118− }

119

125

120− AbstractButton {

126+ AbstractButton {

121− objectName: "backspaceIcon"

127+ objectName: "backspaceIcon"

122− anchors { right: parent.right; top: parent.top; bottom: parent.bottom }

128+ anchors { right: parent.right; top: parent.top; bottom: parent.bottom }

123− width: height

129+ width: height

124− enabled: root.entryEnabled

130+ enabled: root.entryEnabled

125

131

126− Icon {

132+ Icon {

127− anchors.fill: parent

133+ anchors.fill: parent

128− name: "erase"

134+ name: "erase"

129− color: "#f3f3e7"

135+ color: root.foregroundColor

130− }

136+ }

131

137

132− opacity: (pinentryField.text.length > 0 && !pinentryField.incorrectOverride) ? 1 : 0

138+ opacity: (pinentryField.text.length > 0 && !pinentryField.incorrectOverride) ? 1 : 0

133

139

134− Behavior on opacity {

140+ Behavior on opacity {

135− UbuntuNumberAnimation {}

141+ UbuntuNumberAnimation {}

142+ }

143+

144+ onClicked: pinentryField.backspace()

136 }

145 }

146+ }

137

147

138− onClicked: pinentryField.backspace()

148+ Label {

149+ objectName: "retryLabel"

150+ fontSize: "x-small"

151+ color: root.foregroundColor

152+ anchors.horizontalCenter: parent.horizontalCenter

153+ text: root.retryText || " "

139 }

154 }

140 }

155 }

141

156

142− Label {

157+ ThinDivider {

143− objectName: "retryLabel"

158+ anchors { left: parent.left; right: parent.right; margins: units.gu(2) }

144− fontSize: "x-small"

145− color: "#f3f3e7"

146− anchors.horizontalCenter: parent.horizontalCenter

147− text: root.retryText || " "

148 }

159 }

149− }

150−

151− ThinDivider {

152− anchors { left: parent.left; right: parent.right; margins: units.gu(2) }

153− }

154−

155− Grid {

156− id: numbersGrid

157− anchors { horizontalCenter: parent.horizontalCenter }

158− columns: 3

159−

160− property int buttonHeight: units.gu(8)

161− property int buttonWidth: units.gu(12)

162−

163− Repeater {

164− model: 9

165

160

161+ Grid {

162+ id: numbersGrid

163+ objectName: "numbersGrid"

164+ anchors { horizontalCenter: parent.horizontalCenter }

165+ columns: 3

166+

167+ property int maxWidth: Math.min(units.gu(50), root.width - units.gu(8))

168+ property int buttonWidth: maxWidth / 3

169+ property int buttonHeight: buttonWidth * 2 / 3

170+

171+ Repeater {

172+ model: 9

173+

174+ PinPadButton {

175+ objectName: "pinPadButton" + text

176+ text: index + 1

177+ height: numbersGrid.buttonHeight

178+ width: numbersGrid.buttonWidth

179+ foregroundColor: root.foregroundColor

180+ enabled: root.entryEnabled && (root.maxPinLength == -1 ||

181+ pinentryField.text.length < root.maxPinLength ||

182+ pinentryField.incorrectOverride)

183+

184+ onClicked: {

185+ pinentryField.appendNumber(index + 1)

186+ }

187+ }

188+ }

189+ Item {

190+ height: numbersGrid.buttonHeight

191+ width: numbersGrid.buttonWidth

192+ }

166 PinPadButton {

193 PinPadButton {

167− objectName: "pinPadButton" + text

194+ text: "0"

168− text: index + 1

169 height: numbersGrid.buttonHeight

195 height: numbersGrid.buttonHeight

170 width: numbersGrid.buttonWidth

196 width: numbersGrid.buttonWidth

197+ foregroundColor: root.foregroundColor

171 enabled: root.entryEnabled && (root.maxPinLength == -1 ||

198 enabled: root.entryEnabled && (root.maxPinLength == -1 ||

172 pinentryField.text.length < root.maxPinLength ||

199 pinentryField.text.length < root.maxPinLength ||

173 pinentryField.incorrectOverride)

200 pinentryField.incorrectOverride)

174

201

175 onClicked: {

202 onClicked: {

176− pinentryField.appendNumber(index + 1)

203+ pinentryField.appendNumber(0)

177 }

204 }

178 }

205 }

179− }

180− Item {

206+ Item {

181− height: numbersGrid.buttonHeight

182− width: numbersGrid.buttonWidth

183− }

184− PinPadButton {

185− text: "0"

186− height: numbersGrid.buttonHeight

207+ height: numbersGrid.buttonHeight

187− width: numbersGrid.buttonWidth

208+ width: numbersGrid.buttonWidth

188− enabled: root.entryEnabled && (root.maxPinLength == -1 ||

189− pinentryField.text.length < root.maxPinLength ||

190− pinentryField.incorrectOverride)

191−

192− onClicked: {

193− pinentryField.appendNumber(0)

194 }

209 }

195− }

196− Item {

197− height: numbersGrid.buttonHeight

198− width: numbersGrid.buttonWidth

199− }

200− PinPadButton {

210+ PinPadButton {

201− iconName: "close"

211+ iconName: "close"

202− height: units.gu(5) // visual spec has this row a little closer in

212+ height: units.gu(5) // visual spec has this row a little closer in

213+ width: numbersGrid.buttonWidth

214+ foregroundColor: root.foregroundColor

215+ onClicked: root.cancel()

216+ visible: root.showCancelButton

217+ }

218+ Item {

219+ height: units.gu(5)

203− width: numbersGrid.buttonWidth

220+ width: numbersGrid.buttonWidth

221+ }

222+ PinPadButton {

223+ iconName: "tick"

224+ objectName: "confirmButton"

225+ height: units.gu(5)

226+ width: numbersGrid.buttonWidth

227+ foregroundColor: root.foregroundColor

228+ enabled: root.enabled && pinentryField.text.length >= root.minPinLength

229+ visible: root.minPinLength == -1 || root.minPinLength !== root.maxPinLength

204

230

205− onClicked: root.cancel()

231+ onClicked: root.entered(pinentryField.text)

206− visible: root.showCancelButton

207− }

232+ }

208− Item {

209− height: units.gu(5)

210− width: numbersGrid.buttonWidth

211 }

233 }

212− PinPadButton {

234+ WrongPasswordAnimation {

213− iconName: "tick"

235+ id: wrongPasswordAnimation

214− objectName: "confirmButton"

236+ objectName: "wrongPasswordAnimation"

215− height: units.gu(5)

237+ target: shakeContainer

216− width: numbersGrid.buttonWidth

217− enabled: root.enabled && pinentryField.text.length >= root.minPinLength

218− visible: root.minPinLength == -1 || root.minPinLength !== root.maxPinLength

219−

220− onClicked: root.entered(pinentryField.text)

221 }

238 }

222 }

239 }

223− WrongPasswordAnimation {

224− id: wrongPasswordAnimation

225− objectName: "wrongPasswordAnimation"

226− target: shakeContainer

227− }

228}

240}

qml/Components/PinPadButton.qml+3−2

@@ -23,6 +23,7 @@ AbstractButton {

23

24 property alias text: label.text

25 property string iconName

26+ property color foregroundColor: "#000000"

26

27

27 UbuntuShape {

28 UbuntuShape {

28 anchors.fill: parent

29 anchors.fill: parent

@@ -36,7 +37,7 @@ AbstractButton {

36 id: label

37 id: label

37 anchors.centerIn: parent

38 anchors.centerIn: parent

38 horizontalAlignment: Text.AlignHCenter

39 horizontalAlignment: Text.AlignHCenter

39− color: "#f3f3e7"

40+ color: root.foregroundColor

40 fontSize: "x-large"

41 fontSize: "x-large"

41 font.weight: Font.DemiBold

42 font.weight: Font.DemiBold

42 visible: text.length > 0

43 visible: text.length > 0

@@ -52,7 +53,7 @@ AbstractButton {

52 width: height

53 width: height

53 anchors.centerIn: parent

54 anchors.centerIn: parent

54 name: root.iconName

55 name: root.iconName

55− color: "#f3f3e7"

56+ color: root.foregroundColor

56 visible: name.length > 0

57 visible: name.length > 0

57 scale: root.pressed ? 0.9 : 1

58 scale: root.pressed ? 0.9 : 1

58 Behavior on scale {

59 Behavior on scale {

qml/Components/ZoomableImage.qml+14−14

@@ -107,6 +107,20 @@ Item {

107 }

108 }

109

110+ PinchArea {

111+ id: pinchArea

112+ objectName: "pinchArea"

113+ property real minScale: 1.0

114+ anchors.fill: parent

115+ enabled: zoomable ? zoomable : false

116+

117+ pinch.target: image

118+ pinch.minimumScale: minScale

119+ pinch.maximumScale: 10

120+

121+ onPinchFinished: flickable.returnToBounds()

122+ }

123+

110 MouseArea {

124 MouseArea {

111 id: mouseArea

125 id: mouseArea

112 objectName: "mouseArea"

126 objectName: "mouseArea"

@@ -139,18 +153,4 @@ Item {

139 }

153 }

140 }

154 }

141 }

155 }

142−

143− PinchArea {

144− id: pinchArea

145− objectName: "pinchArea"

146− property real minScale: 1.0

147− anchors.fill: flickable

148− enabled: zoomable ? zoomable : false

149−

150− pinch.target: image

151− pinch.minimumScale: minScale

152− pinch.maximumScale: 10

153−

154− onPinchFinished: flickable.returnToBounds()

155− }

156}

qml/Dash/Dash.qml+27−14

@@ -28,29 +28,42 @@ Showable {

28

29 visible: shown

30

31+ Connections {

32+ target: UriHandler

33+ onOpened: {

34+ backToDashContent()

35+ dashContent.currentScope.performQuery(uris[0])

36+ }

37+ }

38+

31 DashCommunicatorService {

39 DashCommunicatorService {

32 objectName: "dashCommunicatorService"

40 objectName: "dashCommunicatorService"

33 onSetCurrentScopeRequested: {

41 onSetCurrentScopeRequested: {

34 if (!isSwipe || !window.active || bottomEdgeController.progress != 0 || scopeItem.scope || dashContent.subPageShown) {

42 if (!isSwipe || !window.active || bottomEdgeController.progress != 0 || scopeItem.scope || dashContent.subPageShown) {

35 if (bottomEdgeController.progress != 0 && window.active) animate = false;

43 if (bottomEdgeController.progress != 0 && window.active) animate = false;

36 dashContent.setCurrentScopeAtIndex(index, animate, isSwipe)

44 dashContent.setCurrentScopeAtIndex(index, animate, isSwipe)

37− // Close dash overview and nested temp scopes in it

45+ backToDashContent()

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− }

50 }

46 }

51 }

47 }

52 }

48 }

53

49

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+

54 function setCurrentScope(scopeId, animate, reset) {

67 function setCurrentScope(scopeId, animate, reset) {

55 var scopeIndex = -1;

68 var scopeIndex = -1;

56 for (var i = 0; i < scopes.count; ++i) {

69 for (var i = 0; i < scopes.count; ++i) {

@@ -178,7 +191,7 @@ Showable {

178 Binding {

191 Binding {

179 target: scopesList.scope

192 target: scopesList.scope

180 property: "isActive"

193 property: "isActive"

181− value: bottomEdgeController.progress === 1

194+ value: bottomEdgeController.progress === 1 && (Qt.application.state == Qt.ApplicationActive)

182 }

195 }

183

196

184 Connections {

197 Connections {

qml/Dash/DashContent.qml−5

@@ -63,11 +63,6 @@ Item {

63 }

64 }

65

66− Connections {

67− target: UriHandler

68− onOpened: dashContentList.currentItem.theScope.performQuery(uris[0])

69− }

70−

71 function setCurrentScopeAtIndex(index, animate, reset) {

66 function setCurrentScopeAtIndex(index, animate, reset) {

72 // if the scopes haven't loaded yet, then wait until they are.

67 // if the scopes haven't loaded yet, then wait until they are.

73 if (!scopes.loaded) {

68 if (!scopes.loaded) {

qml/Dash/GenericScopeView.qml+1−2

@@ -19,7 +19,6 @@ import Ubuntu.Components 1.1

19import Utils 0.1

20import Unity 0.2

21import Dash 0.1

22−import Powerd 0.1

23import "../Components"

22import "../Components"

24import "../Components/ListItems" as ListItems

23import "../Components/ListItems" as ListItems

25

24

@@ -105,7 +104,7 @@ FocusScope {

105 Binding {

104 Binding {

106 target: scope

105 target: scope

107 property: "isActive"

106 property: "isActive"

108− value: isCurrent && !subPageLoader.open && (Powerd.status === Powerd.On)

107+ value: isCurrent && !subPageLoader.open && (Qt.application.state == Qt.ApplicationActive)

109 }

108 }

110

109

111 UnitySortFilterProxyModel {

110 UnitySortFilterProxyModel {

qml/Panel/Indicators/MenuItemFactory.qml+48−52

@@ -19,6 +19,7 @@

19

20import QtQuick 2.0

21import Ubuntu.Settings.Menus 0.1 as Menus

22+import Ubuntu.Settings.Components 0.1

22import QMenuModel 0.1

23import QMenuModel 0.1

23import Utils 0.1 as Utils

24import Utils 0.1 as Utils

24import Ubuntu.Components.ListItems 0.1 as ListItems

25import Ubuntu.Components.ListItems 0.1 as ListItems

@@ -84,6 +85,7 @@ Item {

84 id: sliderMenu;

85 id: sliderMenu;

85

86

86 Menus.SliderMenu {

87 Menus.SliderMenu {

88+ id: sliderItem

87 objectName: "sliderMenu"

89 objectName: "sliderMenu"

88 property QtObject menuData: null

90 property QtObject menuData: null

89 property var menuModel: menuFactory.menuModel

91 property var menuModel: menuFactory.menuModel

@@ -113,15 +115,6 @@ Item {

113 onMenuIndexChanged: {

115 onMenuIndexChanged: {

114 loadAttributes();

116 loadAttributes();

115 }

117 }

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− }

125

118

126 function loadAttributes() {

119 function loadAttributes() {

127 if (!menuModel || menuIndex == -1) return;

120 if (!menuModel || menuIndex == -1) return;

@@ -130,6 +123,20 @@ Item {

130 'min-icon': 'icon',

123 'min-icon': 'icon',

131 'max-icon': 'icon'});

124 'max-icon': 'icon'});

132 }

125 }

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+ }

133 }

140 }

134 }

141 }

135

142

@@ -280,6 +287,7 @@ Item {

280 id: checkableMenu;

287 id: checkableMenu;

281

288

282 Menus.CheckableMenu {

289 Menus.CheckableMenu {

290+ id: checkItem

283 objectName: "checkableMenu"

291 objectName: "checkableMenu"

284 property QtObject menuData: null

292 property QtObject menuData: null

285 property int menuIndex: -1

293 property int menuIndex: -1

@@ -290,26 +298,16 @@ Item {

290 checked: serverChecked

298 checked: serverChecked

291 highlightWhenPressed: false

299 highlightWhenPressed: false

292

300

293− onServerCheckedChanged: updateFromServer()

301+ ServerPropertySynchroniser {

294− onTriggered: {

302+ objectName: "sync"

295− menuModel.activate(menuIndex);

303+ syncTimeout: Utils.Constants.indicatorValueTimeout

296− resyncTimer.restart();

297− }

298

304

299− // value can be changed by menu, so a binding won't work.

305+ serverTarget: checkItem

300− function updateFromServer() {

301− resyncTimer.stop();

302− if (checked != serverChecked) {

306+ serverProperty: "serverChecked"

303− checked = serverChecked;

307+ userTarget: checkItem

304− }

308+ userProperty: "checked"

305− }

306

309

307− // Server value is not guaranteed to change to what we expect from an activation.

310+ onSyncTriggered: menuModel.activate(checkItem.menuIndex)

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()

313 }

311 }

314 }

312 }

315 }

313 }

@@ -318,6 +316,7 @@ Item {

318 id: switchMenu;

316 id: switchMenu;

319

317

320 Menus.SwitchMenu {

318 Menus.SwitchMenu {

319+ id: switchItem

321 objectName: "switchMenu"

320 objectName: "switchMenu"

322 property QtObject menuData: null

321 property QtObject menuData: null

323 property int menuIndex: -1

322 property int menuIndex: -1

@@ -329,26 +328,16 @@ Item {

329 checked: serverChecked

328 checked: serverChecked

330 highlightWhenPressed: false

329 highlightWhenPressed: false

331

330

332− onServerCheckedChanged: updateFromServer()

331+ ServerPropertySynchroniser {

333− onTriggered: {

332+ objectName: "sync"

334− menuModel.activate(menuIndex);

333+ syncTimeout: Utils.Constants.indicatorValueTimeout

335− resyncTimer.restart();

336− }

337

334

338− // value can be changed by menu, so a binding won't work.

335+ serverTarget: switchItem

339− function updateFromServer() {

340− resyncTimer.stop();

341− if (checked != serverChecked) {

336+ serverProperty: "serverChecked"

342− checked = serverChecked;

337+ userTarget: switchItem

343− }

338+ userProperty: "checked"

344− }

345

339

346− // Server value is not guaranteed to change to what we expect from an activation.

340+ onSyncTriggered: menuModel.activate(switchItem.menuIndex);

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()

352 }

341 }

353 }

342 }

354 }

343 }

@@ -464,6 +453,7 @@ Item {

464 id: accessPoint;

453 id: accessPoint;

465

454

466 Menus.AccessPointMenu {

455 Menus.AccessPointMenu {

456+ id: apItem

467 objectName: "accessPoint"

457 objectName: "accessPoint"

468 property QtObject menuData: null

458 property QtObject menuData: null

469 property var menuModel: menuFactory.menuModel

459 property var menuModel: menuFactory.menuModel

@@ -485,19 +475,12 @@ Item {

485 signalStrength: strengthAction.valid ? strengthAction.state : 0

475 signalStrength: strengthAction.valid ? strengthAction.state : 0

486 highlightWhenPressed: false

476 highlightWhenPressed: false

487

477

488− onServerCheckedChanged: {

489− // value can be changed by menu, so a binding won't work.

490− active = serverChecked;

491− }

492 onMenuModelChanged: {

478 onMenuModelChanged: {

493 loadAttributes();

479 loadAttributes();

494 }

480 }

495 onMenuIndexChanged: {

481 onMenuIndexChanged: {

496 loadAttributes();

482 loadAttributes();

497 }

483 }

498− onTriggered: {

499− menuModel.activate(menuIndex);

500− }

501

484

502 function loadAttributes() {

485 function loadAttributes() {

503 if (!menuModel || menuIndex == -1) return;

486 if (!menuModel || menuIndex == -1) return;

@@ -505,6 +488,19 @@ Item {

505 'x-canonical-wifi-ap-is-secure': 'bool',

488 'x-canonical-wifi-ap-is-secure': 'bool',

506 'x-canonical-wifi-ap-strength-action': 'string'});

489 'x-canonical-wifi-ap-strength-action': 'string'});

507 }

490 }

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+ }

508 }

504 }

509 }

505 }

510

506

qml/Panel/Indicators/client/IndicatorsList.qml+2−2

@@ -31,8 +31,8 @@ Page {

31

32 Indicators.IndicatorsModel {

33 id: indicatorsModel

34−

34+ profile: page.profile

35− Component.onCompleted: load(profile)

35+ Component.onCompleted: load()

36 }

37

38 ListView {

qml/Panel/IndicatorsMenu.qml+5−1

@@ -88,6 +88,7 @@ Showable {

88

89 Handle {

90 id: handle

91+ objectName: "handle"

91 anchors {

92 anchors {

92 left: parent.left

93 left: parent.left

93 right: parent.right

94 right: parent.right

@@ -163,7 +164,10 @@ Showable {

163 }

164 }

164

165

165 MouseArea {

166 MouseArea {

166− anchors.fill: __showDragHandle

167+ anchors.bottom: parent.bottom

168+ anchors.left: parent.left

169+ anchors.right: parent.right

170+ height: minimizedPanelHeight

167 enabled: __showDragHandle.enabled

171 enabled: __showDragHandle.enabled

168 onClicked: {

172 onClicked: {

169 bar.selectItemAt(mouseX)

173 bar.selectItemAt(mouseX)

qml/Panel/Panel.qml+1

@@ -187,6 +187,7 @@ Item {

187

188 QtObject {

189 id: d

190+ objectName: "panelPriv"

190 readonly property real indicatorHeight: indicators.minimizedPanelHeight + indicatorOrangeLine.height

191 readonly property real indicatorHeight: indicators.minimizedPanelHeight + indicatorOrangeLine.height

191 }

192 }

192

193

qml/Shell.qml+25−18

@@ -185,7 +185,6 @@ Item {

185 objectName: "stages"

186 width: parent.width

187 height: parent.height

188− visible: !ApplicationManager.empty

189

188

190 Connections {

189 Connections {

191 target: ApplicationManager

190 target: ApplicationManager

@@ -286,6 +285,31 @@ Item {

286 value: shell.background

285 value: shell.background

287 }

286 }

288 }

287 }

288+

289+ Tutorial {

290+ id: tutorial

291+ objectName: "tutorial"

292+ anchors.fill: parent

293+ active: AccountsService.demoEdges

294+ paused: LightDM.Greeter.active

295+ launcher: launcher

296+ panel: panel

297+ edgeSize: shell.edgeSize

298+

299+ // EdgeDragAreas don't work with mice. So to avoid trapping the user,

300+ // we'll tell the tutorial to avoid using them on the Desktop. The

301+ // Desktop doesn't use the same spread design anyway. The tutorial is

302+ // all a bit of a placeholder on non-phone form factors right now.

303+ // When the design team gives us more guidance, we can do something

304+ // more clever here.

305+ // TODO: use DeviceConfiguration instead of checking source

306+ useEdgeDragArea: applicationsDisplayLoader.source != Qt.resolvedUrl("Stages/DesktopStage.qml")

307+

308+ onFinished: {

309+ AccountsService.demoEdges = false;

310+ active = false; // for immediate response / if AS is having problems

311+ }

312+ }

289 }

313 }

290

314

291 InputMethod {

315 InputMethod {

@@ -584,23 +608,6 @@ Item {

584 }

608 }

585 }

609 }

586

610

587− Tutorial {

588− id: tutorial

589− objectName: "tutorial"

590− active: AccountsService.demoEdges

591− paused: LightDM.Greeter.active

592− launcher: launcher

593− panel: panel

594− stages: stages

595− overlay: overlay

596− edgeSize: shell.edgeSize

597−

598− onFinished: {

599− AccountsService.demoEdges = false;

600− active = false; // for immediate response / if AS is having problems

601− }

602− }

603−

604 Connections {

611 Connections {

605 target: SessionBroadcast

612 target: SessionBroadcast

606 onShowHome: showHome()

613 onShowHome: showHome()

qml/Stages/SurfaceContainer.qml+12−9

@@ -1,5 +1,5 @@

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

@@ -17,6 +17,7 @@

17import QtQuick 2.0

18import Ubuntu.Components 1.1

19import Ubuntu.Gestures 0.1 // For TouchGate

20+import Utils 0.1 // for InputWatcher

20

21

21FocusScope {

22FocusScope {

22 id: root

23 id: root

@@ -26,8 +27,6 @@ FocusScope {

26 property int orientation

27 property int orientation

27 property bool interactive

28 property bool interactive

28

29

29− signal surfacePressed()

30−

31 onSurfaceChanged: {

30 onSurfaceChanged: {

32 if (surface) {

31 if (surface) {

33 // Set the surface focus *after* it is added to the scene to

32 // Set the surface focus *after* it is added to the scene to

@@ -45,17 +44,21 @@ FocusScope {

45 Binding { target: surface; property: "enabled"; value: root.interactive; when: surface }

44 Binding { target: surface; property: "enabled"; value: root.interactive; when: surface }

46 Binding { target: surface; property: "antialiasing"; value: !root.interactive; when: surface }

45 Binding { target: surface; property: "antialiasing"; value: !root.interactive; when: surface }

47

46

47+ InputWatcher {

48+ target: root.surface

49+ onTargetPressedChanged: {

50+ if (targetPressed && root.interactive) {

51+ root.focus = true;

52+ root.forceActiveFocus();

53+ }

54+ }

55+ }

56+

48 TouchGate {

57 TouchGate {

49 targetItem: surface

58 targetItem: surface

50 anchors.fill: root

59 anchors.fill: root

51 enabled: root.surface ? root.surface.enabled : false

60 enabled: root.surface ? root.surface.enabled : false

52 z: 2

61 z: 2

53− onPressed: {

54− root.focus = true;

55− if (root.interactive) {

56− root.forceActiveFocus();

57− }

58− }

59 }

62 }

60

63

61 states: [

64 states: [

qml/Tutorial/Tutorial.qml+7−14

@@ -23,11 +23,10 @@ Item {

23 property alias active: loader.active

24 property bool paused

25 property real edgeSize

26+ property bool useEdgeDragArea

26

27

27 property Item launcher

28 property Item launcher

28 property Item panel

29 property Item panel

29− property Item stages

30− property Item overlay

31

30

32 readonly property bool launcherEnabled: loader.item ? loader.item.launcherEnabled : true

31 readonly property bool launcherEnabled: loader.item ? loader.item.launcherEnabled : true

33 readonly property bool spreadEnabled: loader.item ? loader.item.spreadEnabled : true

32 readonly property bool spreadEnabled: loader.item ? loader.item.spreadEnabled : true

@@ -62,26 +61,20 @@ Item {

62

61

63 Binding {

62 Binding {

64 target: loader.item

63 target: loader.item

65− property: "launcher"

64+ property: "useEdgeDragArea"

66− value: root.launcher

67− }

68−

69− Binding {

70− target: loader.item

71− property: "panel"

72− value: root.panel

65+ value: root.useEdgeDragArea

73 }

66 }

74

67

75 Binding {

68 Binding {

76 target: loader.item

69 target: loader.item

77− property: "stages"

70+ property: "launcher"

78− value: root.stages

71+ value: root.launcher

79 }

72 }

80

73

81 Binding {

74 Binding {

82 target: loader.item

75 target: loader.item

83− property: "overlay"

76+ property: "panel"

84− value: root.overlay

77+ value: root.panel

85 }

78 }

86

79

87 Connections {

80 Connections {

qml/Tutorial/TutorialContent.qml+9−8

@@ -22,8 +22,6 @@ Item {

22

23 property Item launcher

24 property Item panel

25− property Item stages

26− property Item overlay

27

25

28 readonly property bool launcherEnabled: !running ||

26 readonly property bool launcherEnabled: !running ||

29 (!paused && tutorialLeft.shown)

27 (!paused && tutorialLeft.shown)

@@ -34,6 +32,7 @@ Item {

34

32

35 property bool paused: false

33 property bool paused: false

36 property real edgeSize

34 property real edgeSize

35+ property bool useEdgeDragArea

37

36

38 signal finished()

37 signal finished()

39

38

@@ -66,7 +65,6 @@ Item {

66 TutorialLeft {

65 TutorialLeft {

67 id: tutorialLeft

66 id: tutorialLeft

68 objectName: "tutorialLeft"

67 objectName: "tutorialLeft"

69− parent: root.stages

70 anchors.fill: parent

68 anchors.fill: parent

71 launcher: root.launcher

69 launcher: root.launcher

72 paused: !shown || root.paused

70 paused: !shown || root.paused

@@ -77,21 +75,26 @@ Item {

77 TutorialLeftFinish {

75 TutorialLeftFinish {

78 id: tutorialLeftFinish

76 id: tutorialLeftFinish

79 objectName: "tutorialLeftFinish"

77 objectName: "tutorialLeftFinish"

80− parent: root.stages

81 anchors.fill: parent

78 anchors.fill: parent

82 textXOffset: root.launcher.panelWidth

79 textXOffset: root.launcher.panelWidth

83 paused: !shown || root.paused

80 paused: !shown || root.paused

81+ text: root.useEdgeDragArea ? i18n.tr("Tap here to continue.") : i18n.tr("Click here to finish.")

84

82

85 onFinished: {

83 onFinished: {

86 root.launcher.hide();

84 root.launcher.hide();

85+ if (root.useEdgeDragArea) {

87− tutorialRight.show();

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+ }

88 }

92 }

89 }

93 }

90

94

91 TutorialRight {

95 TutorialRight {

92 id: tutorialRight

96 id: tutorialRight

93 objectName: "tutorialRight"

97 objectName: "tutorialRight"

94− parent: root.stages

95 anchors.fill: parent

98 anchors.fill: parent

96 edgeSize: root.edgeSize

99 edgeSize: root.edgeSize

97 panel: root.panel

100 panel: root.panel

@@ -103,7 +106,6 @@ Item {

103 TutorialBottom {

106 TutorialBottom {

104 id: tutorialBottom

107 id: tutorialBottom

105 objectName: "tutorialBottom"

108 objectName: "tutorialBottom"

106− parent: root.stages

107 anchors.fill: parent

109 anchors.fill: parent

108 edgeSize: root.edgeSize

110 edgeSize: root.edgeSize

109 paused: !shown || root.paused

111 paused: !shown || root.paused

@@ -114,7 +116,6 @@ Item {

114 TutorialBottomFinish {

116 TutorialBottomFinish {

115 id: tutorialBottomFinish

117 id: tutorialBottomFinish

116 objectName: "tutorialBottomFinish"

118 objectName: "tutorialBottomFinish"

117− parent: root.stages

118 anchors.fill: parent

119 anchors.fill: parent

119 backgroundFadesOut: true

120 backgroundFadesOut: true

120 paused: !shown || root.paused

121 paused: !shown || root.paused

run.sh+1−1

@@ -65,6 +65,6 @@ else

65 echo "Unity8 is already running, please stop it first"

66 exit 1

67 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

69 tailf -n 0 ~/.cache/upstart/unity8.log

70fi

src/Panel/Indicators/client/CMakeLists.txt−2

@@ -1,5 +1,4 @@

1project(indicators_client)

2−set(INDICATORS_CLIENT_APP indicators-client)

3

2

4set(INDICATORS_CLIENT_SRC

3set(INDICATORS_CLIENT_SRC

5 main.cpp

4 main.cpp

@@ -15,7 +14,6 @@ add_executable(${INDICATORS_CLIENT_APP}

15)

14)

16

15

17qt5_use_modules(${INDICATORS_CLIENT_APP} Core Widgets Quick)

16qt5_use_modules(${INDICATORS_CLIENT_APP} Core Widgets Quick)

18−set_target_properties(${INDICATORS_CLIENT_APP} PROPERTIES COMPILE_FLAGS -fPIC)

19

17

20install(TARGETS ${INDICATORS_CLIENT_APP}

18install(TARGETS ${INDICATORS_CLIENT_APP}

21 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

19 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+2−4

@@ -91,10 +91,9 @@ class ApplicationLifecycleTests(tests.ApplicationLifeCycleTestCase):

91 def test_greeter_hides_on_app_open(self):

92 """Greeter should hide when an app is opened"""

93 process_helpers.lock_unity()

94− greeter = self.main_window.get_greeter()

95− self.assertThat(greeter.created, Eventually(Equals(True)))

96

94

97 application_name = self.launch_fake_app()

95 application_name = self.launch_fake_app()

96+ greeter = self.main_window.get_greeter()

98 greeter.wait_swiped_away()

97 greeter.wait_swiped_away()

99 process_helpers.unlock_unity()

98 process_helpers.unlock_unity()

100 self.assert_current_focused_application(application_name)

99 self.assert_current_focused_application(application_name)

@@ -108,10 +107,9 @@ class ApplicationLifecycleTests(tests.ApplicationLifeCycleTestCase):

108 self.assert_current_focused_application('unity8-dash')

107 self.assert_current_focused_application('unity8-dash')

109

108

110 process_helpers.lock_unity()

109 process_helpers.lock_unity()

111− greeter = self.main_window.get_greeter()

112− self.assertThat(greeter.created, Eventually(Equals(True)))

113

110

114 self.launch_upstart_application(application_name)

111 self.launch_upstart_application(application_name)

112+ greeter = self.main_window.get_greeter()

115 greeter.wait_swiped_away()

113 greeter.wait_swiped_away()

116 process_helpers.unlock_unity()

114 process_helpers.unlock_unity()

117 self.assert_current_focused_application(application_name)

115 self.assert_current_focused_application(application_name)

tests/autopilot/unity8/fixture_setup.py+46−1

@@ -19,12 +19,17 @@

19

20import fixtures

21import subprocess

22+import logging

22

23

23from autopilot import introspection

24from autopilot import introspection

24

25

25−from unity8 import process_helpers

26+from unity8 import (

27+ get_binary_path,

28+ process_helpers

29+)

26from unity8.shell import emulators

30from unity8.shell import emulators

27

31

32+logger = logging.getLogger(__name__)

28

33

29class LaunchDashApp(fixtures.Fixture):

34class LaunchDashApp(fixtures.Fixture):

30

35

@@ -96,3 +101,43 @@ class DisplayRotationLock(fixtures.Fixture):

96 'rotation-lock', value_string

101 'rotation-lock', value_string

97 ]

102 ]

98 subprocess.check_output(command)

103 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/indicators/__init__.py+89−10

@@ -19,6 +19,7 @@ import ubuntuuitoolkit

19from autopilot import introspection

20

21from unity8.shell import emulators

22+from unity8 import fixture_setup

22

23

24

24class IndicatorPage(emulators.UnityEmulatorBase):

25class IndicatorPage(emulators.UnityEmulatorBase):

@@ -33,26 +34,25 @@ class IndicatorPage(emulators.UnityEmulatorBase):

33 def validate_dbus_object(cls, path, state):

34 def validate_dbus_object(cls, path, state):

34 return False

35 return False

35

36

37+class Indicator():

36

38

37−class DisplayIndicator():

38−

39− def __init__(self, main_window):

39+ def __init__(self, main_window, name):

40 self._main_window = main_window

41+ self._name = name

41

42

42 def is_indicator_icon_visible(self):

43 def is_indicator_icon_visible(self):

43 panel_item = self._main_window.wait_select_single(

44 panel_item = self._main_window.wait_select_single(

44− objectName='indicator-rotation-lock-panelItem')

45+ objectName=self._name+'-panelItem')

45 return panel_item.indicatorVisible

46 return panel_item.indicatorVisible

46

47

47 def open(self):

48 def open(self):

48− """Open the display indicator page.

49+ """Open the indicator page.

49

50

50− :return: The custom proxy object for the display indicator page.

51+ :return: The custom proxy object for the indicator page.

51

52

52 """

53 """

53 if self.is_indicator_icon_visible():

54 if self.is_indicator_icon_visible():

54− return self._main_window.open_indicator_page(

55+ return self._main_window.open_indicator_page(self._name)

55− 'indicator-rotation-lock')

56 else:

57 return self._open_indicator_with_icon_not_visible()

58

@@ -61,10 +61,10 @@ class DisplayIndicator():

61 self._main_window.open_indicator_page('indicator-datetime')

62 self._make_indicator_icon_visible()

63 indicator_rotation_icon = self._main_window.select_single(

64− objectName='indicator-rotation-lock-panelItem')

64+ objectName=self._name+'-panelItem')

65 self._main_window.pointing_device.click_object(indicator_rotation_icon)

66 return self._main_window.wait_select_single(

67− objectName='indicator-rotation-lock-page')

67+ objectName=self._name+'-page')

68

69 def _make_indicator_icon_visible(self):

70 indicators_bar_flickable = self._main_window.select_single(

@@ -95,6 +95,13 @@ class DisplayIndicator():

95 self._main_window.close_indicator_page()

96

97

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+

98class DisplayIndicatorPage(IndicatorPage):

105class DisplayIndicatorPage(IndicatorPage):

99

106

100 """Autopilot helper for the display indicator page."""

107 """Autopilot helper for the display indicator page."""

@@ -122,3 +129,75 @@ class DisplayIndicatorPage(IndicatorPage):

122 switcher = self._get_switcher()

129 switcher = self._get_switcher()

123 switcher.uncheck()

130 switcher.uncheck()

124 switcher.checked.wait_for(False)

131 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):

26

27 device_emulation_scenarios = tests._get_device_emulation_scenarios()

28

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+

29 def setUp(self):

36 def setUp(self):

30 if platform.model() == 'Desktop':

37 if platform.model() == 'Desktop':

31 self.skipTest('Test cannot be run on the desktop.')

38 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 (

23from unity8.indicators import tests

24

25

26−class DisplayIndicatorTestCase(tests.IndicatorTestCase):

26+class DisplayIndicatorTestCase(tests.DeviceIndicatorTestCase):

27+

28+ scenarios = tests.IndicatorTestCase.device_emulation_scenarios

27

29

28 def test_indicator_icon_must_be_visible_after_rotation_locked(self):

30 def test_indicator_icon_must_be_visible_after_rotation_locked(self):

29 rotation_unlocked = fixture_setup.DisplayRotationLock(False)

31 rotation_unlocked = fixture_setup.DisplayRotationLock(False)

tests/autopilot/unity8/indicators/tests/test_indicators.py+2−2

@@ -23,7 +23,7 @@ from autopilot import platform

23from unity8.indicators import tests

24

25

26−class IndicatorExistsTestCase(tests.IndicatorTestCase):

26+class IndicatorExistsTestCase(tests.DeviceIndicatorTestCase):

27

28 indicator_scenarios = [

29 ('Bluetooth', dict(indicator_name='indicator-bluetooth')),

@@ -51,7 +51,7 @@ class IndicatorExistsTestCase(tests.IndicatorTestCase):

51 )

52

53

54−class IndicatorPageTitleMatchesWidgetTestCase(tests.IndicatorTestCase):

54+class IndicatorPageTitleMatchesWidgetTestCase(tests.DeviceIndicatorTestCase):

55

56 indicator_scenarios = [

57 ('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):

89

90

91def lock_unity(unity_proxy_obj=None):

92− """Helper function that attempts to lock the unity greeter."""

92+ """Helper function that attempts to lock unity greeter.

93− import evdev

93+

94− import time

94+ If unity_proxy_object is None create a proxy object by querying for the

95− uinput = evdev.UInput(name='unity8-autopilot-power-button',

95+ running unity process.

96− devnode='/dev/autopilot-uinput')

96+ Otherwise re-use the passed proxy object.

97− # One press and release to turn screen off (locking unity)

97+

98− uinput.write(evdev.ecodes.EV_KEY, evdev.ecodes.KEY_POWER, 1)

98+ :raises RuntimeError: if the greeter attempts and fails to be locked.

99− uinput.write(evdev.ecodes.EV_KEY, evdev.ecodes.KEY_POWER, 0)

99+

100− uinput.syn()

100+ :raises RuntimeWarning: when the greeter is found because it is

101− time.sleep(1)

101+ already locked.

102− # And another press and release to turn screen back on

102+ :raises CannotAccessUnity: if unity is not introspectable or cannot be

103− uinput.write(evdev.ecodes.EV_KEY, evdev.ecodes.KEY_POWER, 1)

103+ found on dbus.

104− uinput.write(evdev.ecodes.EV_KEY, evdev.ecodes.KEY_POWER, 0)

104+ :raises CannotAccessUnity: if unity's upstart status is not "start" or the

105− uinput.syn()

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.")

106

139

107

140

108def restart_unity_with_testability(*args):

141def restart_unity_with_testability(*args):

tests/autopilot/unity8/shell/tests/test_lock_screen.py+1−1

@@ -135,7 +135,7 @@ class TestLockscreen(UnityTestCase):

135 :raises: TypeError if passphrase is not a string.

136

137 """

138− if not isinstance(passphrase, basestring):

138+ if not isinstance(passphrase, str):

139 raise TypeError(

140 "'passphrase' parameter must be a string, not %r."

141 % type(passphrase)

tests/mocks/CMakeLists.txt+1

@@ -30,6 +30,7 @@ endmacro()

30

31add_subdirectory(AccountsService)

32add_subdirectory(GSettings.1.0)

33+add_subdirectory(indicator-service)

33add_subdirectory(libusermetrics)

34add_subdirectory(libusermetrics)

34add_subdirectory(LightDM)

35add_subdirectory(LightDM)

35add_subdirectory(Lights)

36add_subdirectory(Lights)

tests/mocks/GSettings.1.0/fake_gsettings.cpp+58−22

@@ -20,7 +20,9 @@

20

21GSettingsControllerQml* GSettingsControllerQml::s_controllerInstance = 0;

22

23−GSettingsControllerQml::GSettingsControllerQml() {

23+GSettingsControllerQml::GSettingsControllerQml()

24+ : m_usageMode("Staged")

25+{

24}

26}

25

27

26GSettingsControllerQml::~GSettingsControllerQml() {

28GSettingsControllerQml::~GSettingsControllerQml() {

@@ -34,17 +36,29 @@ GSettingsControllerQml* GSettingsControllerQml::instance() {

34 return s_controllerInstance;

36 return s_controllerInstance;

35}

37}

36

38

39+QString GSettingsControllerQml::pictureUri() const

40+{

41+ return m_pictureUri;

42+}

43+

37−void GSettingsControllerQml::registerSettingsObject(GSettingsQml *obj) {

44+void GSettingsControllerQml::setPictureUri(const QString &str)

38− m_registeredGSettings.append(obj);

45+{

46+ if (str != m_pictureUri) {

47+ m_pictureUri = str;

48+ Q_EMIT pictureUriChanged(m_pictureUri);

49+ }

39}

50}

40

51

41−void GSettingsControllerQml::unRegisterSettingsObject(GSettingsQml *obj) {

52+QString GSettingsControllerQml::usageMode() const

42− m_registeredGSettings.removeOne(obj);

53+{

54+ return m_usageMode;

43}

55}

44

56

45−void GSettingsControllerQml::setPictureUri(const QString &str) {

57+void GSettingsControllerQml::setUsageMode(const QString &usageMode)

46− Q_FOREACH (GSettingsQml *obj, m_registeredGSettings) {

58+{

47− obj->setPictureUri(str);

59+ if (usageMode != m_usageMode) {

60+ m_usageMode = usageMode;

61+ Q_EMIT usageModeChanged(m_usageMode);

48 }

62 }

49}

63}

50

64

@@ -56,7 +70,7 @@ QByteArray GSettingsSchemaQml::id() const {

56}

70}

57

71

58void GSettingsSchemaQml::setId(const QByteArray &id) {

72void GSettingsSchemaQml::setId(const QByteArray &id) {

59− if (m_id.isEmpty()) {

73+ if (!m_id.isEmpty()) {

60 qWarning("GSettings.schema.id may only be set on construction");

74 qWarning("GSettings.schema.id may only be set on construction");

61 return;

75 return;

62 }

76 }

@@ -69,7 +83,7 @@ QByteArray GSettingsSchemaQml::path() const {

69}

83}

70

84

71void GSettingsSchemaQml::setPath(const QByteArray &path) {

85void GSettingsSchemaQml::setPath(const QByteArray &path) {

72− if (m_path.isEmpty()) {

86+ if (!m_path.isEmpty()) {

73 qWarning("GSettings.schema.path may only be set on construction");

87 qWarning("GSettings.schema.path may only be set on construction");

74 return;

88 return;

75 }

89 }

@@ -77,26 +91,48 @@ void GSettingsSchemaQml::setPath(const QByteArray &path) {

77 m_path = path;

91 m_path = path;

78}

92}

79

93

80−GSettingsQml::GSettingsQml(QObject *parent): QObject(parent) {

94+GSettingsQml::GSettingsQml(QObject *parent)

95+ : QObject(parent)

96+{

81 m_schema = new GSettingsSchemaQml(this);

97 m_schema = new GSettingsSchemaQml(this);

82− GSettingsControllerQml::instance()->registerSettingsObject(this);

98+ connect(GSettingsControllerQml::instance(), SIGNAL(pictureUriChanged(const QString &)),

83−}

99+ this, SIGNAL(pictureUriChanged(const QString &)));

84−

85−GSettingsQml::~GSettingsQml() {

86− GSettingsControllerQml::instance()->unRegisterSettingsObject(this);

100+ connect(GSettingsControllerQml::instance(), SIGNAL(usageModeChanged(const QString &)),

101+ this, SIGNAL(usageModeChanged(const QString &)));

87}

102}

88

103

89GSettingsSchemaQml * GSettingsQml::schema() const {

104GSettingsSchemaQml * GSettingsQml::schema() const {

90 return m_schema;

105 return m_schema;

91}

106}

92

107

93−QString GSettingsQml::pictureUri() const {

108+QString GSettingsQml::pictureUri() const

109+{

110+ if (m_schema->id() == "org.gnome.desktop.background") {

111+ return GSettingsControllerQml::instance()->pictureUri();

112+ } else {

94− return m_pictureUri;

113+ return "";

114+ }

95}

115}

96

116

97−void GSettingsQml::setPictureUri(const QString &str) {

117+void GSettingsQml::setPictureUri(const QString &str)

98− if (str != m_pictureUri) {

118+{

99− m_pictureUri = str;

119+ if (m_schema->id() == "org.gnome.desktop.background") {

100− Q_EMIT pictureUriChanged(m_pictureUri);

120+ GSettingsControllerQml::instance()->setPictureUri(str);

121+ }

122+}

123+

124+QString GSettingsQml::usageMode() const

125+{

126+ if (m_schema->id() == "com.canonical.Unity8") {

127+ return GSettingsControllerQml::instance()->usageMode();

128+ } else {

129+ return "";

130+ }

131+}

132+

133+void GSettingsQml::setUsageMode(const QString &usageMode)

134+{

135+ if (m_schema->id() == "com.canonical.Unity8") {

136+ GSettingsControllerQml::instance()->setUsageMode(usageMode);

101 }

137 }

102}

138}

tests/mocks/GSettings.1.0/fake_gsettings.h+16−6

@@ -46,25 +46,26 @@ class GSettingsQml: public QObject

46

47 Q_PROPERTY(GSettingsSchemaQml* schema READ schema NOTIFY schemaChanged)

48 Q_PROPERTY(QString pictureUri READ pictureUri WRITE setPictureUri NOTIFY pictureUriChanged)

49+ Q_PROPERTY(QString usageMode READ usageMode WRITE setUsageMode NOTIFY usageModeChanged)

49

50

50public:

51public:

51 GSettingsQml(QObject *parent = nullptr);

52 GSettingsQml(QObject *parent = nullptr);

52− ~GSettingsQml();

53

54 GSettingsSchemaQml * schema() const;

55 QString pictureUri() const;

56+ QString usageMode() const;

56

57

57 void setPictureUri(const QString &str);

58 void setPictureUri(const QString &str);

59+ void setUsageMode(const QString &usageMode);

58

60

59Q_SIGNALS:

61Q_SIGNALS:

60 void schemaChanged();

62 void schemaChanged();

61 void pictureUriChanged(const QString&);

63 void pictureUriChanged(const QString&);

64+ void usageModeChanged(const QString&);

62

65

63private:

66private:

64 GSettingsSchemaQml* m_schema;

67 GSettingsSchemaQml* m_schema;

65

68

66− QString m_pictureUri;

67−

68 friend class GSettingsSchemaQml;

69 friend class GSettingsSchemaQml;

69};

70};

70

71

@@ -76,13 +77,22 @@ public:

76 static GSettingsControllerQml* instance();

77 static GSettingsControllerQml* instance();

77 ~GSettingsControllerQml();

78 ~GSettingsControllerQml();

78

79

79− void registerSettingsObject(GSettingsQml *obj);

80+ QString pictureUri() const;

80− void unRegisterSettingsObject(GSettingsQml *obj);

81− Q_INVOKABLE void setPictureUri(const QString &str);

81+ void setPictureUri(const QString &str);

82+

83+ QString usageMode() const;

84+ void setUsageMode(const QString &usageMode);

85+

86+Q_SIGNALS:

87+ void pictureUriChanged(const QString&);

88+ void usageModeChanged(const QString&);

82

89

83private:

90private:

84 GSettingsControllerQml();

91 GSettingsControllerQml();

85

92

93+ QString m_pictureUri;

94+ QString m_usageMode;

95+

86 static GSettingsControllerQml* s_controllerInstance;

96 static GSettingsControllerQml* s_controllerInstance;

87 QList<GSettingsQml *> m_registeredGSettings;

97 QList<GSettingsQml *> m_registeredGSettings;

88};

98};

tests/mocks/GSettings.1.0/plugin.cpp−6

@@ -19,14 +19,8 @@

19

20#include <QtQml/qqml.h>

21

22−static QObject* controllerProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)

23−{

24− return GSettingsControllerQml::instance();

25−}

26−

27void FakeGSettingsQmlPlugin::registerTypes(const char *uri)

22void FakeGSettingsQmlPlugin::registerTypes(const char *uri)

28{

23{

29− qmlRegisterSingletonType<GSettingsControllerQml>(uri, 1, 0, "GSettingsController", controllerProvider);

30 qmlRegisterType<GSettingsQml>(uri, 1, 0, "GSettings");

24 qmlRegisterType<GSettingsQml>(uri, 1, 0, "GSettings");

31 qmlRegisterUncreatableType<GSettingsSchemaQml>(uri, 1, 0, "GSettingsSchema",

25 qmlRegisterUncreatableType<GSettingsSchemaQml>(uri, 1, 0, "GSettingsSchema",

32 "GSettingsSchema can only be used inside of a GSettings component");

26 "GSettingsSchema can only be used inside of a GSettings component");

tests/mocks/Unity/Application/MirSurfaceItem.cpp+6

@@ -47,6 +47,12 @@ MirSurfaceItem::MirSurfaceItem(const QString& name,

47{

48 qDebug() << "MirSurfaceItem::MirSurfaceItem() " << this->name();

49

50+ setAcceptedMouseButtons(Qt::LeftButton | Qt::MiddleButton | Qt::RightButton |

51+ Qt::ExtraButton1 | Qt::ExtraButton2 | Qt::ExtraButton3 | Qt::ExtraButton4 |

52+ Qt::ExtraButton5 | Qt::ExtraButton6 | Qt::ExtraButton7 | Qt::ExtraButton8 |

53+ Qt::ExtraButton9 | Qt::ExtraButton10 | Qt::ExtraButton11 |

54+ Qt::ExtraButton12 | Qt::ExtraButton13);

55+

50 QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);

56 QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);

51

57

52 connect(this, &QQuickItem::focusChanged,

58 connect(this, &QQuickItem::focusChanged,

tests/mocks/Unity/Application/MirSurfaceItem.h+5

@@ -104,6 +104,11 @@ Q_SIGNALS:

104protected:

105 void touchEvent(QTouchEvent * event) override;

106

107+ // becaue the default implementation ignores the events

108+ void mousePressEvent(QMouseEvent *) override {}

109+ void mouseMoveEvent(QMouseEvent *) override {}

110+ void mouseReleaseEvent(QMouseEvent *) override {}

111+

107private Q_SLOTS:

112private Q_SLOTS:

108 void onFocusChanged();

113 void onFocusChanged();

109 void onComponentStatusChanged(QQmlComponent::Status status);

114 void onComponentStatusChanged(QQmlComponent::Status status);

tests/mocks/Unity/fake_scope.cpp+13−2

@@ -24,6 +24,8 @@

24#include "fake_scopes.h"

25#include "fake_settingsmodel.h"

26

27+#include <paths.h> // from unity8/include

28+

27Scope::Scope(Scopes* parent) : Scope("MockScope5", "Mock Scope", false, parent)

29Scope::Scope(Scopes* parent) : Scope("MockScope5", "Mock Scope", false, parent)

28{

30{

29}

31}

@@ -249,11 +251,11 @@ QVariantMap Scope::customizations() const

249 m["foreground-color"] = "blue";

251 m["foreground-color"] = "blue";

250 m["page-header"] = h;

252 m["page-header"] = h;

251 } else if (m_id == "MockScope4") {

253 } 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");

253 m["page-header"] = h;

255 m["page-header"] = h;

254 } else if (m_id == "MockScope5") {

256 } else if (m_id == "MockScope5") {

255 h["background"] = "gradient:///lightgrey/grey";

257 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");

257 h["divider-color"] = "red";

259 h["divider-color"] = "red";

258 h["navigation-background"] = "color:///black";

260 h["navigation-background"] = "color:///black";

259 m["page-header"] = h;

261 m["page-header"] = h;

@@ -310,3 +312,12 @@ void Scope::setNavigationState(const QString &navigationId, bool isAltNavigation

310 Q_EMIT currentNavigationIdChanged();

312 Q_EMIT currentNavigationIdChanged();

311 }

313 }

312}

314}

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:

72 Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) override;

73 Q_INVOKABLE unity::shell::scopes::NavigationInterface* getAltNavigation(QString const& altNavigationId) override;

74 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;

76

77 Status status() const override;

78 QVariantMap customizations() const override;

@@ -80,7 +80,9 @@ public:

80 Q_INVOKABLE void refresh() override;

81

82Q_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);

84

86

85protected:

87protected:

86

88

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

5+

6+[phone]

7+ObjectPath=/com/canonical/indicator/mock/desktop

8+

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)

3+

4+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")

5+

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/Dash/listviewwithpageheadertest.cpp+11

@@ -1938,6 +1938,17 @@ private Q_SLOTS:

1938 QCOMPARE(lvwph->m_headerItemShownHeight, 0.);

1939 }

1940

1941+ void testFirstVisibleIndexRemove()

1942+ {

1943+ changeContentY(520);

1944+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

1945+ QCOMPARE(lvwph->m_firstVisibleIndex, 1);

1946+

1947+ // Remove 0 and 1, the previously visible index 2 will be 0 and visible

1948+ QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 2));

1949+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);

1950+ }

1951+

1941private:

1952private:

1942 QQuickView *view;

1953 QQuickView *view;

1943 ListViewWithPageHeader *lvwph;

1954 ListViewWithPageHeader *lvwph;

tests/plugins/Unity/Indicators/indicatorsmanagertest.cpp−2

@@ -31,13 +31,11 @@ private Q_SLOTS:

31

32 void initTestCase()

33 {

34− setenv("UNITY_TEST_ENV", "1", 1);

35 setenv("XDG_DATA_DIRS", (sourceDirectory() + "/tests/data").toLatin1().data(), 1);

34 setenv("XDG_DATA_DIRS", (sourceDirectory() + "/tests/data").toLatin1().data(), 1);

36 }

35 }

37

36

38 void cleanupTestCase()

37 void cleanupTestCase()

39 {

38 {

40− unsetenv("UNITY_TEST_ENV");

41 }

39 }

42

40

43 /*

41 /*

tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp−2

@@ -32,13 +32,11 @@ private Q_SLOTS:

32

33 void initTestCase()

34 {

35− setenv("UNITY_TEST_ENV", "1", 1);

36 setenv("XDG_DATA_DIRS", (sourceDirectory() + "/tests/data").toLatin1().data(), 1);

35 setenv("XDG_DATA_DIRS", (sourceDirectory() + "/tests/data").toLatin1().data(), 1);

37 }

36 }

38

37

39 void cleanupTestCase()

38 void cleanupTestCase()

40 {

39 {

41− unsetenv("UNITY_TEST_ENV");

42 }

40 }

43

41

44 /*

42 /*

tests/plugins/Unity/Launcher/launchermodeltest.cpp+57

@@ -400,6 +400,63 @@ private Q_SLOTS:

400 QCOMPARE(launcherModel->get(index)->count(), 55);

401 }

402

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+

403 void testRefreshAfterDeletedDesktopFiles_data() {

460 void testRefreshAfterDeletedDesktopFiles_data() {

404 QTest::addColumn<bool>("deleted");

461 QTest::addColumn<bool>("deleted");

405 QTest::newRow("have .desktop files") << false;

462 QTest::newRow("have .desktop files") << false;

tests/qmltests/Components/tst_Dialogs.qml+4−2

@@ -79,7 +79,7 @@ Rectangle {

79 Column {

80 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }

81 spacing: units.gu(1)

82− Button { text: "Power dialog"; onClicked: { testCase.showPowerDialog(); } }

82+ Button { text: "Power dialog"; onClicked: { testCase.test_showPowerDialog(); } }

83 Button { text: "Logout Requested"; onClicked: { fakeUnitySession.logoutRequested(); } }

84 Button { text: "Shutdown Requested"; onClicked: { fakeUnitySession.shutdownRequested(); } }

85 Button { text: "Reboot Requested"; onClicked: { fakeUnitySession.rebootRequested(); } }

@@ -96,9 +96,11 @@ Rectangle {

96 name: "Dialogs"

97 when: windowShown

98

99− function showPowerDialog() {

99+ function test_showPowerDialog() {

100 var dialogsPrivate = findInvisibleChild(dialogs, "dialogsPrivate");

101 dialogsPrivate.showPowerDialog();

102+ var dialogLoader = findInvisibleChild(dialogs, "dialogLoader");

103+ tryCompare(dialogLoader.item, "focus", true);

102 }

104 }

103 }

105 }

104}

106}

tests/qmltests/Components/tst_Lockscreen.qml+26

@@ -173,6 +173,10 @@ Rectangle {

173 function cleanup() {

174 lockscreen.clear(false);

175 delayMinutesTextField.text = "0"

176+

177+ // Reset sizing

178+ root.width = units.gu(80)

179+ root.height = units.gu(76)

176 }

180 }

177

181

178 function waitForLockscreenReady() {

182 function waitForLockscreenReady() {

@@ -450,6 +454,28 @@ Rectangle {

450 var label = findChild(lockscreen, "deviceLockedLabel")

454 var label = findChild(lockscreen, "deviceLockedLabel")

451 compare(label.text, "Device Locked")

455 compare(label.text, "Device Locked")

452 }

456 }

457+

458+ function test_resize_data() {

459+ return [

460+ { tag: "small", width: units.gu(40), height: units.gu(76) },

461+ { tag: "medium", width: units.gu(50), height: units.gu(86) },

462+ { tag: "large", width: units.gu(60), height: units.gu(96) },

463+ { tag: "x-large", width: units.gu(80), height: units.gu(116) },

464+ ]

465+ }

466+

467+ function test_resize(data) {

468+ var controlsAreaWidth = lockscreen.anchors.rightMargin;

469+ root.width = data.width + controlsAreaWidth;

470+ root.height = data.height;

471+ waitForRendering(root);

472+

473+ var numbersGrid = findChild(lockscreen, "numbersGrid");

474+ // Make sure the numbers pad keeps a 4gu margin on left/right but doesn't grow larger than 50 gu's width.

475+ // For rounding reasons it might be off 1 pixel. Let's make sure it's within +/- 1 pixel of what we expect

476+ verify(numbersGrid.width >= Math.min(units.gu(50), data.width - units.gu(8)) - 1);

477+ verify(numbersGrid.width <= Math.min(units.gu(50), data.width - units.gu(8)) + 1);

478+ }

453 }

479 }

454

480

455 SignalSpy {

481 SignalSpy {

tests/qmltests/Components/tst_ZoomableImage.qml+7

@@ -182,6 +182,13 @@ Rectangle {

182 compare(flickable.contentWidth, Math.max(imageRenderer.width * image.scale, flickable.width));

183 compare(flickable.contentHeight, Math.max(imageRenderer.height * image.scale, flickable.height));

184

185+ // try pan it a bit

186+ var contentX = flickable.contentX;

187+ var contentY = flickable.contentY;

188+ touchFlick(zoomableImage, units.gu(1), units.gu(1), units.gu(10), units.gu(10));

189+ tryCompare(flickable, "moving", false)

190+ tryCompareFunction(function() { return flickable.contentX != contentX && flickable.contentY != contentY; }, zoomableImage.zoomable)

191+

185 wait(3000); // have to delay between two consequent pinch event.

192 wait(3000); // have to delay between two consequent pinch event.

186 // pinch zoom-out

193 // pinch zoom-out

187 touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);

194 touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);

tests/qmltests/Dash/tst_Dash.qml+49−1

@@ -315,7 +315,7 @@ Item {

315

316 var scopesList = findChild(dash, "scopesList");

317 spy.target = scopesList.scope;

318− spy.signalName = "performQuery";

318+ spy.signalName = "queryPerformed";

319

320 // Click on the store

321 var scopesListPageHeader = findChild(scopesList, "pageHeader");

@@ -517,5 +517,53 @@ Item {

517 tryCompare(dashTempScopeItem, "x", dash.width);

518 tryCompare(dashTempScopeItem, "visible", false);

519 }

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+ }

520 }

568 }

521}

569}

tests/qmltests/Dash/tst_GenericScopeView.qml+1−1

@@ -206,7 +206,7 @@ Item {

206 var header = findChild(genericScopeView, "dashSectionHeader1");

207

208 spy.target = genericScopeView.scope;

209− spy.signalName = "performQuery";

209+ spy.signalName = "queryPerformed";

210

211 mouseClick(header);

212

tests/qmltests/Dash/tst_PreviewListView.qml+1−1

@@ -109,7 +109,7 @@ Rectangle {

109

110 var image = findChild(header, "titleImage");

111 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");

113 }

114 }

115}

tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+5−1

@@ -230,7 +230,7 @@ Item {

230 compare(loader.item.value, data.manualValue, "Slider value does not match manual set value");

231

232 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");

234

235 menuData.actionState = undefined;

236 compare(loader.item.value, data.value2, "Undefined state should not update slider value");

@@ -819,6 +819,10 @@ Item {

819 loader.data = menuData;

820 loader.sourceComponent = factory.load(menuData);

821

822+ var sync = findInvisibleChild(loader.item, "sync");

823+ verify(sync);

824+ sync.syncTimeout = 500;

825+

822 compare(loader.item.checked, false, "Loader did not load check state");

826 compare(loader.item.checked, false, "Loader did not load check state");

823 mouseClick(loader.item,

827 mouseClick(loader.item,

824 loader.item.width / 2, loader.item.height / 2);

828 loader.item.width / 2, loader.item.height / 2);

tests/qmltests/Panel/tst_Panel.qml+52

@@ -390,5 +390,57 @@ IndicatorTest {

390 tap(panel, touchPosX, touchPosY);

391 compare(backgroundPressedSpy.count, 2);

392 }

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+ }

393 }

445 }

394}

446}

tests/qmltests/Stages/tst_SurfaceContainer.qml+32−5

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Unity.Test 0.1 as UT

19+import Unity.Test 0.1

20import ".."

21import "../../../qml/Stages"

22import Ubuntu.Components 0.1

@@ -32,6 +32,8 @@ Rectangle {

32 id: surfaceContainerComponent

33 SurfaceContainer {

34 anchors.fill: parent

35+ orientation: Qt.PortraitOrientation

36+ interactive: interactiveCheckbox.checked

35 }

37 }

36 }

38 }

37 Loader {

39 Loader {

@@ -85,6 +87,12 @@ Rectangle {

85 CheckBox {id: fullscreenCheckbox; checked: true; }

87 CheckBox {id: fullscreenCheckbox; checked: true; }

86 Label { text: "fullscreen" }

88 Label { text: "fullscreen" }

87 }

89 }

90+ Row {

91+ anchors { left: parent.left; right: parent.right }

92+ CheckBox {id: interactiveCheckbox; checked: true; }

93+ Label { text: "interactive" }

94+ }

95+ MouseTouchEmulationCheckbox {}

88 }

96 }

89 }

97 }

90

98

@@ -94,7 +102,7 @@ Rectangle {

94 signalName: "surfaceDestroyed"

102 signalName: "surfaceDestroyed"

95 }

103 }

96

104

97− UT.UnityTestCase {

105+ UnityTestCase {

98 id: testCase

106 id: testCase

99 name: "SurfaceContainer"

107 name: "SurfaceContainer"

100 when: windowShown

108 when: windowShown

@@ -110,6 +118,8 @@ Rectangle {

110

118

111 tryCompare(surfaceContainerLoader.item, "surface", null);

119 tryCompare(surfaceContainerLoader.item, "surface", null);

112 surfaceSpy.clear();

120 surfaceSpy.clear();

121+

122+ interactiveCheckbox.checked = true;

113 }

123 }

114

124

115 /*

125 /*

@@ -145,14 +155,13 @@ Rectangle {

145 surfaceContainer.surface.touchPressCount = 0;

155 surfaceContainer.surface.touchPressCount = 0;

146 surfaceContainer.surface.touchReleaseCount = 0;

156 surfaceContainer.surface.touchReleaseCount = 0;

147

157

148− surfaceContainer.interactive = true;

149 tap(surfaceContainer, surfaceContainer.width / 2, surfaceContainer.height / 2);

158 tap(surfaceContainer, surfaceContainer.width / 2, surfaceContainer.height / 2);

150

159

151 // surface got touches as the surfaceContainer is interactive

160 // surface got touches as the surfaceContainer is interactive

152 compare(surfaceContainer.surface.touchPressCount, 1)

161 compare(surfaceContainer.surface.touchPressCount, 1)

153 compare(surfaceContainer.surface.touchReleaseCount, 1);

162 compare(surfaceContainer.surface.touchReleaseCount, 1);

154

163

155− surfaceContainer.interactive = false;

164+ interactiveCheckbox.checked = false;

156 tap(surfaceContainer, surfaceContainer.width / 2, surfaceContainer.height / 2);

165 tap(surfaceContainer, surfaceContainer.width / 2, surfaceContainer.height / 2);

157

166

158 // surface shouldn't get the touches from the second tap as the surfaceContainer

167 // surface shouldn't get the touches from the second tap as the surfaceContainer

@@ -160,5 +169,23 @@ Rectangle {

160 compare(surfaceContainer.surface.touchPressCount, 1)

169 compare(surfaceContainer.surface.touchPressCount, 1)

161 compare(surfaceContainer.surface.touchReleaseCount, 1);

170 compare(surfaceContainer.surface.touchReleaseCount, 1);

162 }

171 }

172+

173+ function test_surfaceGetsActiveFocusOnMousePress() {

174+ surfaceCheckbox.checked = true;

175+ verify(surfaceContainer.surface !== null);

176+

177+ compare(surfaceContainer.surface.activeFocus, false);

178+ mouseClick(surfaceContainer);

179+ compare(surfaceContainer.surface.activeFocus, true);

180+ }

181+

182+ function test_surfaceGetsActiveFocusOnTap() {

183+ surfaceCheckbox.checked = true;

184+ verify(surfaceContainer.surface !== null);

185+

186+ compare(surfaceContainer.surface.activeFocus, false);

187+ tap(surfaceContainer);

188+ compare(surfaceContainer.surface.activeFocus, true);

189+ }

163 }

190 }

164}

191}

tests/qmltests/Tutorial/tst_Tutorial.qml+22−5

@@ -17,6 +17,7 @@

17import QtQuick 2.0

18import QtTest 1.0

19import AccountsService 0.1

20+import GSettings 1.0

20import LightDM 0.1 as LightDM

21import LightDM 0.1 as LightDM

21import Ubuntu.Components 1.1

22import Ubuntu.Components 1.1

22import Unity.Application 0.1

23import Unity.Application 0.1

@@ -45,6 +46,11 @@ Item {

45 }

46 }

47 }

47

48

49+ GSettings {

50+ id: unity8Settings

51+ schema.id: "com.canonical.Unity8"

52+ }

53+

48 Component.onCompleted: {

54 Component.onCompleted: {

49 // must set the mock mode before loading the Shell

55 // must set the mock mode before loading the Shell

50 LightDM.Greeter.mockMode = "single-pin";

56 LightDM.Greeter.mockMode = "single-pin";

@@ -112,6 +118,7 @@ Item {

112

118

113 function init() {

119 function init() {

114 tryCompare(shell, "enabled", true); // enabled by greeter when ready

120 tryCompare(shell, "enabled", true); // enabled by greeter when ready

121+ unity8Settings.usageMode = "Staged";

115 AccountsService.demoEdges = false;

122 AccountsService.demoEdges = false;

116 AccountsService.demoEdges = true;

123 AccountsService.demoEdges = true;

117 swipeAwayGreeter();

124 swipeAwayGreeter();

@@ -185,17 +192,19 @@ Item {

185 }

192 }

186

193

187 function checkRightEdge() {

194 function checkRightEdge() {

195+ if (unity8Settings.usageMode === "Staged") {

188− touchFlick(shell, shell.width, halfHeight, halfWidth, halfHeight);

196+ touchFlick(shell, shell.width, halfHeight, halfWidth, halfHeight);

189

197

190− var stage = findChild(shell, "stage");

198+ var stage = findChild(shell, "stage");

191− var spreadView = findChild(stage, "spreadView");

199+ var spreadView = findChild(stage, "spreadView");

192− tryCompare(spreadView, "phase", 0);

200+ tryCompare(spreadView, "phase", 0);

201+ }

193 }

202 }

194

203

195 function checkBottomEdge() {

204 function checkBottomEdge() {

196 // Can't actually check effect of swipe, since dash isn't really loaded

205 // Can't actually check effect of swipe, since dash isn't really loaded

197 var applicationsDisplayLoader = findChild(shell, "applicationsDisplayLoader");

206 var applicationsDisplayLoader = findChild(shell, "applicationsDisplayLoader");

198− tryCompare(applicationsDisplayLoader.item, "interactive", false);

207+ tryCompare(applicationsDisplayLoader, "interactive", false);

199 }

208 }

200

209

201 function checkFinished() {

210 function checkFinished() {

@@ -256,6 +265,14 @@ Item {

256 goToPage(null);

265 goToPage(null);

257 }

266 }

258

267

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+

259 function test_launcherShortDrag() {

276 function test_launcherShortDrag() {

260 // goToPage does a normal launcher pull. But here we want to test

277 // goToPage does a normal launcher pull. But here we want to test

261 // just barely pulling the launcher out and letting go (i.e. not

278 // just barely pulling the launcher out and letting go (i.e. not

tests/qmltests/tst_Shell.qml+8−3

@@ -988,6 +988,11 @@ Rectangle {

988 tryCompare(ApplicationManager, "focusedApplicationId", "gallery-app");

989 compare(wizard.shown, false);

990 compare(tutorial.running, false);

991+ tryCompare(AccountsService, "demoEdges", false);

992+ tryCompare(Wizard.System, "wizardEnabled", false);

993+

994+ var tutorialLeft = findChild(tutorial, "tutorialLeft");

995+ compare(tutorialLeft, null); // should be destroyed with tutorial

991 }

996 }

992

997

993 function test_tapOnRightEdgeReachesApplicationSurface() {

998 function test_tapOnRightEdgeReachesApplicationSurface() {

@@ -1084,11 +1089,11 @@ Rectangle {

1084 {

1089 {

1085 var buttonShowDashHome = findChild(launcher, "buttonShowDashHome");

1090 var buttonShowDashHome = findChild(launcher, "buttonShowDashHome");

1086 var startPos = buttonShowDashHome.mapToItem(shell,

1091 var startPos = buttonShowDashHome.mapToItem(shell,

1087− buttonShowDashHome.width * 0.8,

1088− buttonShowDashHome.height * 0.2);

1089− var endPos = buttonShowDashHome.mapToItem(shell,

1090 buttonShowDashHome.width * 0.2,

1092 buttonShowDashHome.width * 0.2,

1091 buttonShowDashHome.height * 0.8);

1093 buttonShowDashHome.height * 0.8);

1094+ var endPos = buttonShowDashHome.mapToItem(shell,

1095+ buttonShowDashHome.width * 0.8,

1096+ buttonShowDashHome.height * 0.2);

1092 touchFlick(shell, startPos.x, startPos.y, endPos.x, endPos.y);

1097 touchFlick(shell, startPos.x, startPos.y, endPos.x, endPos.y);

1093 }

1098 }

1094

1099

tests/utils/modules/Unity/Test/UnityTestCase.qml+4−2

@@ -32,8 +32,10 @@ TestCase {

32 border { width: units.dp(1); color: "black" }

33 opacity: 0.6

34

35+ visible: testCase.running

36+

35 RotationAnimation on rotation {

37 RotationAnimation on rotation {

36− running: true

38+ running: parent.visible

37 from: 0

39 from: 0

38 to: 360

40 to: 360

39 loops: Animation.Infinite

41 loops: Animation.Infinite

@@ -315,7 +317,7 @@ TestCase {

315 event1.press(0, x1Start, y1Start);

317 event1.press(0, x1Start, y1Start);

316 event1.commit();

318 event1.commit();

317 // second finger

319 // second finger

318− event1.stationary(0);

320+ event1.move(0, x1Start, y1Start);

319 event1.press(1, x2Start, y2Start);

321 event1.press(1, x2Start, y2Start);

320 event1.commit();

322 event1.commit();

321

323