20bf711 · unity8 · git.iko.soy

debian/changelog+42

compare with xenial

unifiedsplit

@@ -1,3 +1,45 @@

1+unity8 (7.84+14.04.20140314-0ubuntu1) trusty; urgency=low

2+

3+ [ Michał Sawicz ]

4+ * Fix tests under Qt 5.2.

5+ * CardHeader improvements depending on background. Also drop prices,

6+ they need to be reworked into attributes.

7+ * Bring Cards closer to design

8+ * Add back the workaround for not being able scroll the image gallery

9+ Taken from AppPreview.qml (LP: #1281709)

10+ * Only allow searching when preview isn't open. (LP: #1282475)

11+ * Adds carousel dynamic switch

12+

13+ [ Leo Arias ]

14+ * Update the url dispatcher test to use the fake app fixture from the

15+ toolkit.

16+

17+ [ Albert Astals ]

18+ * Fix tests under Qt 5.2.

19+ * Workaround compiz/unity7 behaviour change/bug

20+

21+ [ Michael Zanetti ]

22+ * Fix tests under Qt 5.2.

23+ * Disable HUD from the bottom edge.

24+

25+ [ Andrea Cimitan ]

26+ * Adds carousel dynamic switch

27+

28+ [ CI bot ]

29+ * Resync trunk

30+

31+ [ Michał Karnicki ]

32+ * CardHeader improvements depending on background. Also drop prices,

33+ they need to be reworked into attributes.

34+

35+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 14 Mar 2014 15:46:10 +0000

36+

37+unity8 (7.84+14.04.20140307-0ubuntu1) trusty; urgency=low

38+

39+ * New rebuild forced

40+

41+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 07 Mar 2014 10:54:33 +0000

42+

1unity8 (7.84+14.04.20140306-0ubuntu1) trusty; urgency=low

43unity8 (7.84+14.04.20140306-0ubuntu1) trusty; urgency=low

2

44

3 [ Bill Filler ]

45 [ Bill Filler ]

plugins/DashViews/listviewwithpageheader.cpp+33−10

@@ -91,6 +91,7 @@

91

92#include "listviewwithpageheader.h"

93

94+#include <QCoreApplication>

94#include <QDebug>

95#include <QDebug>

95#include <qqmlinfo.h>

96#include <qqmlinfo.h>

96#include <qqmlengine.h>

97#include <qqmlengine.h>

@@ -484,6 +485,11 @@ void ListViewWithPageHeader::componentComplete()

484 polish();

485 polish();

485}

486}

486

487

488+static inline bool uFuzzyCompare(qreal r1, qreal r2)

489+{

490+ return qFuzzyCompare(r1, r2) || (qFuzzyIsNull(r1) && qFuzzyIsNull(r2));

491+}

492+

487void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)

493void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)

488{

494{

489 // Check we are not being taken down and don't paint anything

495 // Check we are not being taken down and don't paint anything

@@ -498,11 +504,7 @@ void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)

498 const bool showHeaderAnimationRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationShowHeader;

504 const bool showHeaderAnimationRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationShowHeader;

499 if (m_headerItem) {

505 if (m_headerItem) {

500 const auto oldHeaderItemShownHeight = m_headerItemShownHeight;

506 const auto oldHeaderItemShownHeight = m_headerItemShownHeight;

501− if (contentY() < -m_minYExtent) {

507+ if (uFuzzyCompare(contentY(), -m_minYExtent) || contentY() > -m_minYExtent) {

502− // Stick the header item to the top when dragging down

503− m_headerItem->setY(contentY());

504− m_headerItem->setHeight(m_headerItem->implicitHeight() + (-m_minYExtent - contentY()));

505− } else {

506 m_headerItem->setHeight(m_headerItem->implicitHeight());

508 m_headerItem->setHeight(m_headerItem->implicitHeight());

507 // We are going down (but it's not because of the rebound at the end)

509 // We are going down (but it's not because of the rebound at the end)

508 // (but the header was not shown by it's own position)

510 // (but the header was not shown by it's own position)

@@ -516,21 +518,32 @@ void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)

516 m_headerItemShownHeight = 0;

518 m_headerItemShownHeight = 0;

517 m_headerItem->setY(-m_minYExtent);

519 m_headerItem->setY(-m_minYExtent);

518 } else if ((scrolledUp && notRebounding && notShownByItsOwn && !maximizeVisibleAreaRunning) || (m_headerItemShownHeight > 0) || m_inContentHeightKeepHeaderShown) {

520 } else if ((scrolledUp && notRebounding && notShownByItsOwn && !maximizeVisibleAreaRunning) || (m_headerItemShownHeight > 0) || m_inContentHeightKeepHeaderShown) {

521+ if (maximizeVisibleAreaRunning && diff > 0) {

519− if (maximizeVisibleAreaRunning && diff > 0) // If we are maximizing and the header was shown, make sure we hide it

522+ // If we are maximizing and the header was shown, make sure we hide it

520 m_headerItemShownHeight -= diff;

523 m_headerItemShownHeight -= diff;

521− else

524+ } else {

522 m_headerItemShownHeight += diff;

525 m_headerItemShownHeight += diff;

526+ }

523− if (contentY() == -m_minYExtent) {

527+ if (uFuzzyCompare(contentY(), -m_minYExtent)) {

524 m_headerItemShownHeight = 0;

528 m_headerItemShownHeight = 0;

525 } else {

529 } else {

526 m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, m_headerItem->height());

530 m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, m_headerItem->height());

527 }

531 }

528 if (m_headerItemShownHeight > 0) {

532 if (m_headerItemShownHeight > 0) {

533+ if (uFuzzyCompare(m_headerItem->height(), m_headerItemShownHeight)) {

534+ m_headerItem->setY(contentY());

535+ m_headerItemShownHeight = m_headerItem->height();

536+ } else {

529− m_headerItem->setY(contentY() - m_headerItem->height() + m_headerItemShownHeight);

537+ m_headerItem->setY(contentY() - m_headerItem->height() + m_headerItemShownHeight);

538+ }

530 } else {

539 } else {

531 m_headerItem->setY(-m_minYExtent);

540 m_headerItem->setY(-m_minYExtent);

532 }

541 }

533 }

542 }

543+ } else {

544+ // Stick the header item to the top when dragging down

545+ m_headerItem->setY(contentY());

546+ m_headerItem->setHeight(m_headerItem->implicitHeight() + (-m_minYExtent - contentY()));

534 }

547 }

535 // We will be changing the clip item, need to accomadate for it

548 // We will be changing the clip item, need to accomadate for it

536 // otherwise we move the firstItem down/up twice (unless the

549 // otherwise we move the firstItem down/up twice (unless the

@@ -1135,7 +1148,12 @@ void ListViewWithPageHeader::adjustMinYExtent()

1135 nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;

1148 nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;

1136// qDebug() << m_firstVisibleIndex << visibleItemsHeight << visibleItems << nonCreatedHeight;

1149// qDebug() << m_firstVisibleIndex << visibleItemsHeight << visibleItems << nonCreatedHeight;

1137 }

1150 }

1138− m_minYExtent = nonCreatedHeight - m_visibleItems.first()->y() - m_clipItem->y() + (m_headerItem ? m_headerItem->implicitHeight() : 0);

1151+ const qreal headerHeight = (m_headerItem ? m_headerItem->implicitHeight() : 0);

1152+ m_minYExtent = nonCreatedHeight - m_visibleItems.first()->y() - m_clipItem->y() + headerHeight;

1153+ if (m_minYExtent != 0 && qFuzzyIsNull(m_minYExtent)) {

1154+ m_minYExtent = 0;

1155+ m_visibleItems.first()->setY(nonCreatedHeight - m_clipItem->y() + headerHeight);

1156+ }

1139 }

1157 }

1140}

1158}

1141

1159

@@ -1271,6 +1289,11 @@ void ListViewWithPageHeader::updatePolish()

1271 refill();

1289 refill();

1272

1290

1273 if (m_contentHeightDirty) {

1291 if (m_contentHeightDirty) {

1292+ // We need to make sure all bindings have updated otherwise

1293+ // we may end up with bindings updating when we call setContentHeight

1294+ // and then everything gets out of sync, i.e. testHeaderPositionBug1240118

1295+ QCoreApplication::instance()->processEvents();

1296+

1274 qreal contentHeight;

1297 qreal contentHeight;

1275 if (m_visibleItems.isEmpty()) {

1298 if (m_visibleItems.isEmpty()) {

1276 contentHeight = m_headerItem ? m_headerItem->height() : 0;

1299 contentHeight = m_headerItem ? m_headerItem->height() : 0;

plugins/Utils/CMakeLists.txt−1

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

12

13set(QMLPLUGIN_SRC

14 albumartprovider.cpp

15− bottombarvisibilitycommunicatorshell.cpp

16 mediaartcache.cpp

15 mediaartcache.cpp

17 qlimitproxymodelqml.cpp

16 qlimitproxymodelqml.cpp

18 qsortfilterproxymodelqml.cpp

17 qsortfilterproxymodelqml.cpp

plugins/Utils/bottombarvisibilitycommunicatorshell.cppdeleted−49

@@ -1,49 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−#include "bottombarvisibilitycommunicatorshell.h"

18−

19−BottomBarVisibilityCommunicatorShell::BottomBarVisibilityCommunicatorShell()

20− : m_forceHidden(false),

21− m_position(0)

22−{

23−}

24−

25−bool BottomBarVisibilityCommunicatorShell::forceHidden() const

26−{

27− return m_forceHidden;

28−}

29−

30−double BottomBarVisibilityCommunicatorShell::position() const

31−{

32− return m_position;

33−}

34−

35−void BottomBarVisibilityCommunicatorShell::setForceHidden(bool forceHidden)

36−{

37− if (forceHidden != m_forceHidden) {

38− m_forceHidden = forceHidden;

39− Q_EMIT forceHiddenChanged(forceHidden);

40− }

41−}

42−

43−void BottomBarVisibilityCommunicatorShell::setPosition(double position)

44−{

45− if (position != m_position) {

46− m_position = position;

47− Q_EMIT positionChanged(position);

48− }

49−}

plugins/Utils/bottombarvisibilitycommunicatorshell.hdeleted−59

@@ -1,59 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−#ifndef BOTTOMBARVISIBILITYCOMMUNICATORSHELL_H

18−#define BOTTOMBARVISIBILITYCOMMUNICATORSHELL_H

19−

20−#include <QObject>

21−

22−class QDBusInterface;

23−

24−/** This is an internal class used to talk with the bottom bar used by either

25− * applications or the SDK.

26− * There is a method to force the bottom bar to be hidden or otherwise behave as usual

27− */

28−

29−class BottomBarVisibilityCommunicatorShell : public QObject

30−{

31− Q_OBJECT

32− Q_PROPERTY(bool forceHidden READ forceHidden WRITE setForceHidden NOTIFY forceHiddenChanged)

33− Q_PROPERTY(double position READ position WRITE setPosition NOTIFY positionChanged)

34−

35− Q_CLASSINFO("D-Bus Interface", "com.canonical.Shell.BottomBarVisibilityCommunicator")

36−public:

37− static BottomBarVisibilityCommunicatorShell& instance() {

38− static BottomBarVisibilityCommunicatorShell instance;

39− return instance;

40− }

41−

42− bool forceHidden() const;

43− void setForceHidden(bool forceHidden);

44−

45− double position() const;

46− void setPosition(double position);

47−

48−Q_SIGNALS:

49− void forceHiddenChanged(bool forceHidden);

50− void positionChanged(double position);

51−

52−private:

53− BottomBarVisibilityCommunicatorShell();

54−

55− bool m_forceHidden;

56− double m_position;

57−};

58−

59−#endif

plugins/Utils/plugin.cpp−10

@@ -27,15 +27,11 @@

27

28// local

29#include "albumartprovider.h"

30−#include "bottombarvisibilitycommunicatorshell.h"

31#include "qlimitproxymodelqml.h"

30#include "qlimitproxymodelqml.h"

32#include "qsortfilterproxymodelqml.h"

31#include "qsortfilterproxymodelqml.h"

33#include "timeformatter.h"

32#include "timeformatter.h"

34#include "unitymenumodelpaths.h"

33#include "unitymenumodelpaths.h"

35

34

36−static const char* BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH = "/BottomBarVisibilityCommunicator";

37−static const char* DBUS_SERVICE = "com.canonical.Shell.BottomBarVisibilityCommunicator";

38−

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

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

40{

36{

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

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

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

45 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");

41 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");

46 qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");

42 qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");

47 qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");

43 qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");

48− qmlRegisterUncreatableType<BottomBarVisibilityCommunicatorShell>(uri, 0, 1, "BottomBarVisibilityCommunicatorShell", "Can't create BottomBarVisibilityCommunicatorShell");

49}

44}

50

45

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

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

@@ -64,9 +59,4 @@ void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

64 {

59 {

65 qWarning() << "Failed to register image provider for albumart (unknown error)";

60 qWarning() << "Failed to register image provider for albumart (unknown error)";

66 }

61 }

67−

68− QDBusConnection::sessionBus().registerService(DBUS_SERVICE);

69− BottomBarVisibilityCommunicatorShell *bottomBarVisibilityCommunicator = &BottomBarVisibilityCommunicatorShell::instance();

70− QDBusConnection::sessionBus().registerObject(BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH, bottomBarVisibilityCommunicator, QDBusConnection::ExportAllContents);

71− engine->rootContext()->setContextProperty("bottomBarVisibilityCommunicatorShell", bottomBarVisibilityCommunicator);

72}

62}

po/am.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/ar.po+2−2

@@ -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: 2014-02-22 07:40+0000\n"

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

21

22#: plugins/Unity/Launcher/launcheritem.cpp:43

23#: plugins/Unity/Launcher/launcheritem.cpp:73

po/ast.po+2−2

@@ -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: 2014-03-02 05:30+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/az.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/bg.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/bs.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

21

22#: plugins/Unity/Launcher/launcheritem.cpp:43

23#: plugins/Unity/Launcher/launcheritem.cpp:73

po/ca.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/ckb.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/cs.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/da.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/de.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/el.po+2−2

@@ -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: 2014-02-27 06:34+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/en_AU.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/en_GB.po+11−9

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

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

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

10"POT-Creation-Date: 2014-02-13 18:37+0000\n"

11−"PO-Revision-Date: 2014-01-14 20:46+0000\n"

11+"PO-Revision-Date: 2014-03-07 13:27+0000\n"

12−"Last-Translator: Dan Bishop <dan@danbishop.org>\n"

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

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

14"MIME-Version: 1.0\n"

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

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

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

18−"X-Launchpad-Export-Date: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

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

72"You have now mastered the edge gestures and can start using the "

73"phone Tap on the screen to start"

74msgstr ""

75+"You have now mastered the edge gestures and can start using the "

76+"phone Tap on the screen to start"

75

77

76#: qml/Components/PageHeader.qml:340

78#: qml/Components/PageHeader.qml:340

77msgid "Recent searches"

79msgid "Recent searches"

@@ -79,11 +81,11 @@ msgstr "Recent searches"

79

81

80#: qml/Components/SeeMore.qml:35

82#: qml/Components/SeeMore.qml:35

81msgid "See more"

83msgid "See more"

82−msgstr ""

84+msgstr "See more"

83

85

84#: qml/Components/SeeMore.qml:57

86#: qml/Components/SeeMore.qml:57

85msgid "See less"

87msgid "See less"

86−msgstr ""

88+msgstr "See less"

87

89

88#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

90#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

89msgid "Rate this"

91msgid "Rate this"

@@ -105,11 +107,11 @@ msgstr[1] "%1 reviews"

105

107

106#: qml/Dash/Previews/PreviewActionCombo.qml:34

108#: qml/Dash/Previews/PreviewActionCombo.qml:34

107msgid "More..."

109msgid "More..."

108−msgstr ""

110+msgstr "More..."

109

111

110#: qml/Dash/Previews/PreviewActionCombo.qml:34

112#: qml/Dash/Previews/PreviewActionCombo.qml:34

111msgid "Less..."

113msgid "Less..."

112−msgstr ""

114+msgstr "Less..."

113

115

114#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74

116#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74

115msgid "Add a review"

117msgid "Add a review"

@@ -166,7 +168,7 @@ msgstr "Show password"

166

168

167#: qml/Notifications/NotificationMenuItemFactory.qml:103

169#: qml/Notifications/NotificationMenuItemFactory.qml:103

168msgid "Please enter SIM PIN"

170msgid "Please enter SIM PIN"

169−msgstr ""

171+msgstr "Please enter SIM PIN"

170

172

171#: qml/Panel/SearchIndicator.qml:27

173#: qml/Panel/SearchIndicator.qml:27

172msgid "Search"

174msgid "Search"

po/eo.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/es.po+2−2

@@ -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: 2014-02-21 06:42+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/eu.po+32−30

@@ -8,24 +8,24 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-02-13 18:37+0000\n"

11−"PO-Revision-Date: 2014-02-03 22:04+0000\n"

11+"PO-Revision-Date: 2014-03-16 17:40+0000\n"

12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

13"Language-Team: Basque <eu@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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-17 05:13+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

23msgid "Lock to Launcher"

24−msgstr ""

24+msgstr "Lotu abiarazlera"

25

26#: plugins/Unity/Launcher/launcheritem.cpp:73

27msgid "Unlock from Launcher"

28−msgstr ""

28+msgstr "Askatu abiarazletik"

29

30#: qml/Components/EdgeDemoOverlay.qml:151

31msgid "Skip intro"

@@ -74,107 +74,109 @@ msgid ""

74"You have now mastered the edge gestures and can start using the "

75"phone Tap on the screen to start"

76msgstr ""

77+"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "

78+"zaitezke Ukitu pantaila hasteko"

77

79

78#: qml/Components/PageHeader.qml:340

80#: qml/Components/PageHeader.qml:340

79msgid "Recent searches"

81msgid "Recent searches"

80−msgstr ""

82+msgstr "Azken bilaketak"

81

83

82#: qml/Components/SeeMore.qml:35

84#: qml/Components/SeeMore.qml:35

83msgid "See more"

85msgid "See more"

84−msgstr ""

86+msgstr "Ikusi gehiago"

85

87

86#: qml/Components/SeeMore.qml:57

88#: qml/Components/SeeMore.qml:57

87msgid "See less"

89msgid "See less"

88−msgstr ""

90+msgstr "Ikusi gutxiago"

89

91

90#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

92#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

91msgid "Rate this"

93msgid "Rate this"

92−msgstr ""

94+msgstr "Puntuatu hau"

93

95

94#. TRANSLATORS: Number of persons who rated this app/video/whatever

96#. TRANSLATORS: Number of persons who rated this app/video/whatever

95#: qml/Dash/Previews/Header.qml:93

97#: qml/Dash/Previews/Header.qml:93

96#, qt-format

98#, qt-format

97msgid "(%1)"

99msgid "(%1)"

98−msgstr ""

100+msgstr "(%1)"

99

101

100#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

102#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

101#: qml/Dash/Previews/Header.qml:105

103#: qml/Dash/Previews/Header.qml:105

102#, qt-format

104#, qt-format

103msgid "%1 review"

105msgid "%1 review"

104msgid_plural "%1 reviews"

106msgid_plural "%1 reviews"

105−msgstr[0] ""

107+msgstr[0] "berrikuspen %1"

106−msgstr[1] ""

108+msgstr[1] "%1 berrikuspen"

107

109

108#: qml/Dash/Previews/PreviewActionCombo.qml:34

110#: qml/Dash/Previews/PreviewActionCombo.qml:34

109msgid "More..."

111msgid "More..."

110−msgstr ""

112+msgstr "Gehiago..."

111

113

112#: qml/Dash/Previews/PreviewActionCombo.qml:34

114#: qml/Dash/Previews/PreviewActionCombo.qml:34

113msgid "Less..."

115msgid "Less..."

114−msgstr ""

116+msgstr "Gutxiago..."

115

117

116#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74

118#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74

117msgid "Add a review"

119msgid "Add a review"

118−msgstr ""

120+msgstr "Gehitu berrikuspena"

119

121

120#: qml/Dash/Previews/PreviewRating.qml:153 qml/Dash/Previews/Reviews.qml:121

122#: qml/Dash/Previews/PreviewRating.qml:153 qml/Dash/Previews/Reviews.qml:121

121msgid "Send"

123msgid "Send"

122−msgstr ""

124+msgstr "Bidali"

123

125

124#: qml/Dash/Previews/Reviews.qml:86

126#: qml/Dash/Previews/Reviews.qml:86

125msgid "Review"

127msgid "Review"

126−msgstr ""

128+msgstr "Berrikusi"

127

129

128#: qml/Dash/Previews/Reviews.qml:139

130#: qml/Dash/Previews/Reviews.qml:139

129msgid "Comments:"

131msgid "Comments:"

130−msgstr ""

132+msgstr "Iruzkinak:"

131

133

132#: qml/Greeter/Lockscreen.qml:149

134#: qml/Greeter/Lockscreen.qml:149

133msgid "Emergency Call"

135msgid "Emergency Call"

134−msgstr ""

136+msgstr "Larrialdi-deia"

135

137

136#: qml/Greeter/PassphraseLockscreen.qml:59

138#: qml/Greeter/PassphraseLockscreen.qml:59

137#, qt-format

139#, qt-format

138msgid "Hello %1"

140msgid "Hello %1"

139−msgstr ""

141+msgstr "Kaixo %1"

140

142

141#: qml/Greeter/PassphraseLockscreen.qml:59

143#: qml/Greeter/PassphraseLockscreen.qml:59

142msgid "Hello"

144msgid "Hello"

143−msgstr ""

145+msgstr "Kaixo"

144

146

145#: qml/Hud/HudParametrizedActionsPage.qml:132

147#: qml/Hud/HudParametrizedActionsPage.qml:132

146msgid "Confirm"

148msgid "Confirm"

147−msgstr ""

149+msgstr "Baieztatu"

148

150

149#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372

151#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372

150msgid "Type or say a command"

152msgid "Type or say a command"

151−msgstr ""

153+msgstr "Idatzi edo esan agindu bat"

152

154

153#: qml/Hud/Hud.qml:84

155#: qml/Hud/Hud.qml:84

154msgid "Loading. Please Wait..."

156msgid "Loading. Please Wait..."

155−msgstr ""

157+msgstr "Kargatzen. Itxaron, mesedez..."

156

158

157#: qml/Hud/Hud.qml:89

159#: qml/Hud/Hud.qml:89

158msgid "Speak Now..."

160msgid "Speak Now..."

159−msgstr ""

161+msgstr "Hitz egin orain..."

160

162

161#: qml/Hud/Hud.qml:94

163#: qml/Hud/Hud.qml:94

162msgid "Speaking..."

164msgid "Speaking..."

163−msgstr ""

165+msgstr "Hitz egiten..."

164

166

165#: qml/Notifications/NotificationMenuItemFactory.qml:91

167#: qml/Notifications/NotificationMenuItemFactory.qml:91

166msgid "Show password"

168msgid "Show password"

167−msgstr ""

169+msgstr "Erakutsi pasahitza"

168

170

169#: qml/Notifications/NotificationMenuItemFactory.qml:103

171#: qml/Notifications/NotificationMenuItemFactory.qml:103

170msgid "Please enter SIM PIN"

172msgid "Please enter SIM PIN"

171−msgstr ""

173+msgstr "Sartu SIMaren PINa"

172

174

173#: qml/Panel/SearchIndicator.qml:27

175#: qml/Panel/SearchIndicator.qml:27

174msgid "Search"

176msgid "Search"

175−msgstr ""

177+msgstr "Bilatu"

176

178

177#: qml/Shell.qml:440

179#: qml/Shell.qml:440

178#, qt-format

180#, qt-format

179msgid "Please enter %1"

181msgid "Please enter %1"

180−msgstr ""

182+msgstr "Sartu %1"

po/fa.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/fi.po+8−6

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

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

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

10"POT-Creation-Date: 2014-02-13 18:37+0000\n"

11−"PO-Revision-Date: 2014-02-21 19:36+0000\n"

11+"PO-Revision-Date: 2014-03-09 19:22+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: 2014-02-22 07:40+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

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

72"You have now mastered the edge gestures and can start using the "

73"phone Tap on the screen to start"

74msgstr ""

75+"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "

76+"käytön Napauta näyttöä aloittaaksesi"

75

77

76#: qml/Components/PageHeader.qml:340

78#: qml/Components/PageHeader.qml:340

77msgid "Recent searches"

79msgid "Recent searches"

@@ -79,11 +81,11 @@ msgstr "Viimeisimmät haut"

79

81

80#: qml/Components/SeeMore.qml:35

82#: qml/Components/SeeMore.qml:35

81msgid "See more"

83msgid "See more"

82−msgstr ""

84+msgstr "Näytä lisää"

83

85

84#: qml/Components/SeeMore.qml:57

86#: qml/Components/SeeMore.qml:57

85msgid "See less"

87msgid "See less"

86−msgstr ""

88+msgstr "Näytä vähemmän"

87

89

88#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

90#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

89msgid "Rate this"

91msgid "Rate this"

@@ -109,7 +111,7 @@ msgstr "Lisää..."

109

111

110#: qml/Dash/Previews/PreviewActionCombo.qml:34

112#: qml/Dash/Previews/PreviewActionCombo.qml:34

111msgid "Less..."

113msgid "Less..."

112−msgstr ""

114+msgstr "Vähemmän..."

113

115

114#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74

116#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74

115msgid "Add a review"

117msgid "Add a review"

po/fo.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/fr.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/gd.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

21

22#: plugins/Unity/Launcher/launcheritem.cpp:43

23#: plugins/Unity/Launcher/launcheritem.cpp:73

po/gl.po+5−5

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

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

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

10"POT-Creation-Date: 2014-02-13 18:37+0000\n"

11−"PO-Revision-Date: 2014-02-15 04:00+0000\n"

11+"PO-Revision-Date: 2014-03-08 06:58+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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -107,11 +107,11 @@ msgstr[1] "%1 opinións"

107

108#: qml/Dash/Previews/PreviewActionCombo.qml:34

109msgid "More..."

110−msgstr ""

110+msgstr "Máis…"

111

112#: qml/Dash/Previews/PreviewActionCombo.qml:34

113msgid "Less..."

114−msgstr ""

114+msgstr "Menos..."

115

116#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74

117msgid "Add a review"

po/he.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/hi.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/hr.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

21

22#: plugins/Unity/Launcher/launcheritem.cpp:43

23#: plugins/Unity/Launcher/launcheritem.cpp:73

po/hu.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/hy.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/id.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/is.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/it.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/ja.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/km.po+2−2

@@ -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: 2014-03-04 08:33+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/kn.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/ko.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/ky.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/lo.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/lt.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

21

22#: plugins/Unity/Launcher/launcheritem.cpp:43

23#: plugins/Unity/Launcher/launcheritem.cpp:73

po/lv.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/ml.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/mr.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/ms.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/my.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/nb.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/nl.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/pl.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

21

22#: plugins/Unity/Launcher/launcheritem.cpp:43

23#: plugins/Unity/Launcher/launcheritem.cpp:73

po/pt.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/pt_BR.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/ro.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

21

22#: plugins/Unity/Launcher/launcheritem.cpp:43

23#: plugins/Unity/Launcher/launcheritem.cpp:73

po/ru.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

21

22#: plugins/Unity/Launcher/launcheritem.cpp:43

23#: plugins/Unity/Launcher/launcheritem.cpp:73

po/shn.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/si.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/sl.po+2−2

@@ -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: 2014-02-22 07:40+0000\n"

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

21

22#: plugins/Unity/Launcher/launcheritem.cpp:43

23#: plugins/Unity/Launcher/launcheritem.cpp:73

po/sq.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/sr.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

21

22#: plugins/Unity/Launcher/launcheritem.cpp:43

23#: plugins/Unity/Launcher/launcheritem.cpp:73

po/sv.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/sw.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/ta.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20"Language: ta\n"

21

22#: plugins/Unity/Launcher/launcheritem.cpp:43

po/te.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/tr.po+2−2

@@ -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: 2014-03-06 06:19+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/ug.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/uk.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

21

22#: plugins/Unity/Launcher/launcheritem.cpp:43

23#: plugins/Unity/Launcher/launcheritem.cpp:73

po/vi.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/xh.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/zh_CN.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/zh_HK.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

po/zh_TW.po+2−2

@@ -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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

qml/Components/Stage.qml+4−6

@@ -339,13 +339,11 @@ Showable {

339

340 ScriptAction {

341 script: {

342− if (!stage.focusedApplicationWhenUsingScreenshots) {

343− // FIXME: only here to support case where application does

342+ // FIXME: only here to support case where application does

344− // not exist yet but is about to

343+ // not exist yet but is about to

345− return;

344+ if (stage.focusedApplicationWhenUsingScreenshots) {

345+ stage.__focusApplication(stage.focusedApplicationWhenUsingScreenshots);

346 }

347−

348− stage.__focusApplication(stage.focusedApplicationWhenUsingScreenshots);

349 }

347 }

350 }

348 }

351 }

349 }

qml/Shell.qml+3−49

@@ -28,9 +28,7 @@ import "Dash"

28import "Greeter"

29import "Launcher"

30import "Panel"

31−import "Hud"

32import "Components"

31import "Components"

33−import "Bottombar"

34import "SideStage"

32import "SideStage"

35import "Notifications"

33import "Notifications"

36import Unity.Notifications 1.0 as NotificationBackend

34import Unity.Notifications 1.0 as NotificationBackend

@@ -381,7 +379,7 @@ FocusScope {

381

379

382 readonly property int backgroundTopMargin: -panel.panelHeight

380 readonly property int backgroundTopMargin: -panel.panelHeight

383

381

384− hides: [launcher, panel.indicators, hud]

382+ hides: [launcher, panel.indicators]

385 shown: false

383 shown: false

386 enabled: true

384 enabled: true

387 showAnimation: StandardAnimation { property: "opacity"; to: 1 }

385 showAnimation: StandardAnimation { property: "opacity"; to: 1 }

@@ -436,7 +434,7 @@ FocusScope {

436 objectName: "greeter"

434 objectName: "greeter"

437

435

438 available: true

436 available: true

439− hides: [launcher, panel.indicators, hud]

437+ hides: [launcher, panel.indicators]

440 shown: true

438 shown: true

441

439

442 defaultBackground: shell.background

440 defaultBackground: shell.background

@@ -523,7 +521,7 @@ FocusScope {

523 InputFilterArea {

521 InputFilterArea {

524 anchors.fill: parent

522 anchors.fill: parent

525 blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown

523 blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown

526− || panel.indicators.shown || hud.shown

524+ || panel.indicators.shown

527 }

525 }

528

526

529 Connections {

527 Connections {

@@ -585,48 +583,6 @@ FocusScope {

585 }

583 }

586 }

584 }

587

585

588− Hud {

589− id: hud

590−

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

592− height: parent.height

593−

594− available: !greeter.shown && !panel.indicators.shown && !lockscreen.shown && edgeDemo.dashEnabled

595− shown: false

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

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

598−

599− Connections {

600− target: shell.applicationManager

601− onMainStageFocusedApplicationChanged: hud.hide()

602− onSideStageFocusedApplicationChanged: hud.hide()

603− }

604− }

605−

606− Revealer {

607− id: hudRevealer

608−

609− enabled: hud.shown

610− width: hud.width

611− anchors.left: hud.left

612− height: parent.height

613− target: hud.revealerTarget

614− closedValue: height

615− openedValue: 0

616− direction: Qt.RightToLeft

617− orientation: Qt.Vertical

618− handleSize: hud.handleHeight

619− onCloseClicked: target.hide()

620− }

621−

622− Bottombar {

623− id: bottombar

624− theHud: hud

625− anchors.fill: parent

626− enabled: hud.available

627− applicationIsOnForeground: applicationFocused

628− }

629−

630 InputFilterArea {

586 InputFilterArea {

631 blockInput: launcher.shown

587 blockInput: launcher.shown

632 anchors {

588 anchors {

@@ -671,8 +627,6 @@ FocusScope {

671 onShownChanged: {

627 onShownChanged: {

672 if (shown) {

628 if (shown) {

673 panel.indicators.hide()

629 panel.indicators.hide()

674− hud.hide()

675− bottombar.hide()

676 }

630 }

677 }

631 }

678 }

632 }

tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py+5−40

@@ -20,12 +20,11 @@

20"""Test the integration with the URL dispatcher service."""

21

22import os

23−import tempfile

24

23

25from autopilot import platform

24from autopilot import platform

26from autopilot.matchers import Eventually

25from autopilot.matchers import Eventually

27from testtools.matchers import Equals

26from testtools.matchers import Equals

28−from ubuntuuitoolkit import base as toolkit_base

27+from ubuntuuitoolkit import fixture_setup

29

28

30from unity8 import process_helpers

29from unity8 import process_helpers

31from unity8.shell import tests

30from unity8.shell import tests

@@ -47,13 +46,6 @@ MainView {

47 text: 'Test application.'

46 text: 'Test application.'

48 }

47 }

49}

48}

50−""")

51−

52− desktop_file_contents = ("""[Desktop Entry]

53−Type=Application

54−Name=test

55−Exec={qmlscene} {qml_file_path}

56−Icon=Not important

57""")

49""")

58

50

59 def setUp(self):

51 def setUp(self):

@@ -66,37 +58,10 @@ Icon=Not important

66 process_helpers.unlock_unity(unity_proxy)

58 process_helpers.unlock_unity(unity_proxy)

67

59

68 def create_test_application(self):

60 def create_test_application(self):

69− # FIXME most of this code is duplicated in the toolkit. We should

61+ fake_application = fixture_setup.FakeApplication(self.test_qml)

70− # create a fixture on the toolkit for other projects to use.

62+ self.useFixture(fake_application)

71− # http://pad.lv/1277334 --elopio - 2014-02-06

72− qml_file_path = self._write_test_qml_file()

73− self.addCleanup(os.remove, qml_file_path)

74− desktop_file_path = self._write_test_desktop_file(qml_file_path)

75− self.addCleanup(os.remove, desktop_file_path)

76− return qml_file_path, desktop_file_path

77−

78− def _write_test_qml_file(self):

79− qml_file = tempfile.NamedTemporaryFile(suffix='.qml', delete=False)

80− qml_file.write(self.test_qml.encode('utf-8'))

81− qml_file.close()

82− return qml_file.name

83−

84− def _write_test_desktop_file(self, qml_file_path):

85− desktop_file_dir = self._get_local_desktop_file_directory()

86− if not os.path.exists(desktop_file_dir):

87− os.makedirs(desktop_file_dir)

88− desktop_file = tempfile.NamedTemporaryFile(

89− suffix='.desktop', dir=desktop_file_dir, delete=False)

90− contents = self.desktop_file_contents.format(

91− qmlscene=toolkit_base.get_qmlscene_launch_command(),

92− qml_file_path=qml_file_path)

93− desktop_file.write(contents.encode('utf-8'))

94− desktop_file.close()

95− return desktop_file.name

96−

97− def _get_local_desktop_file_directory(self):

98− return os.path.join(

63+ return (

99− os.environ.get('HOME'), '.local', 'share', 'applications')

64+ fake_application.qml_file_path, fake_application.desktop_file_path)

100

65

101 def test_swipe_out_application_started_by_url_dispatcher(self):

66 def test_swipe_out_application_started_by_url_dispatcher(self):

102 _, desktop_file_path = self.create_test_application()

67 _, desktop_file_path = self.create_test_application()

tests/plugins/DashViews/listviewwithpageheadertest.cpp−6

@@ -1281,9 +1281,6 @@ private Q_SLOTS:

1281

1282 void testShowHeaderHalfShown()

1283 {

1284−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

1285− QSKIP("This test is extremely unstable in 5.0.x");

1286−#endif

1287 changeContentY(20);

1284 changeContentY(20);

1288

1285

1289 QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

1286 QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

@@ -1860,9 +1857,6 @@ private Q_SLOTS:

1860 model->setProperty(4, "size", 10);

1857 model->setProperty(4, "size", 10);

1861 model->setProperty(5, "size", 10);

1858 model->setProperty(5, "size", 10);

1862 model->setProperty(6, "size", 10);

1859 model->setProperty(6, "size", 10);

1863−#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 3))

1864− QTRY_COMPARE(lvwph->m_minYExtent, 210.);

1865−#endif

1866 QTRY_COMPARE(lvwph->m_headerItem->y(), -lvwph->m_minYExtent);

1860 QTRY_COMPARE(lvwph->m_headerItem->y(), -lvwph->m_minYExtent);

1867 }

1861 }

1868

1862

tests/plugins/DashViews/listviewwithpageheadertestsection.cpp−3

@@ -1486,9 +1486,6 @@ private Q_SLOTS:

1486

1487 void testShowHeaderHalfShown()

1488 {

1489−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

1490− QSKIP("This test is extremely unstable in 5.0.x");

1491−#endif

1492 changeContentY(20);

1489 changeContentY(20);

1493

1490

1494 QTRY_COMPARE(lvwph->m_visibleItems.count(), 3);

1491 QTRY_COMPARE(lvwph->m_visibleItems.count(), 3);

tests/qmltests/Components/tst_DragHandle.cpp−1

@@ -126,7 +126,6 @@ QQuickView *tst_DragHandle::createView()

126{

127 QQuickView *window = new QQuickView(0);

128 window->setResizeMode(QQuickView::SizeRootObjectToView);

129− window->resize(600, 600);

130 window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));

129 window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));

131 window->engine()->addImportPath(QLatin1String(TEST_DIR));

130 window->engine()->addImportPath(QLatin1String(TEST_DIR));

132

131

tests/qmltests/Components/tst_LazyImage.qml+1−1

@@ -155,7 +155,7 @@ Rectangle {

155

156 if (data.transition) {

157 // wait for the transition to complete

158− var transition = findInvisibleChild(data.image, data.transition);

158+ var transition = findChildIn(data.image, "transitions", data.transition);

159 tryCompare(transition, "running", true);

160 tryCompare(transition, "running", false);

161 }

tests/qmltests/Dash/Previews/tst_PreviewVideoPlayback.qml−6

@@ -53,12 +53,6 @@ Rectangle {

53 function test_loadScreenshot() {

54 var screenshot = findChild(videoPlayback, "screenshot");

55

56− videoPlayback.widgetData = widgetData0;

57− tryCompare(screenshot.visible, false);

58−

59− videoPlayback.widgetData = widgetData1;

60− tryCompare(screenshot.visible, true);

61−

62 videoPlayback.widgetData = widgetData2;

56 videoPlayback.widgetData = widgetData2;

63 var screenshotSource = screenshot.source

57 var screenshotSource = screenshot.source

64 verify(screenshotSource.toString().indexOf("image://thumbnailer/") === 0)

58 verify(screenshotSource.toString().indexOf("image://thumbnailer/") === 0)

tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml+3−4

@@ -30,14 +30,13 @@ Rectangle {

30 }

31

32 property var widgetData1: {

33− "source": "../../graphics/phone_background.jpg",

33+ "source": Qt.resolvedUrl("../artwork/checkers.png"),

34 "zoomable": false

35 }

36

37 PreviewZoomableImage {

38 id: zoomableImage

39 width: parent.width

40− widgetData: widgetData1

41 }

40 }

42

41

43 UT.UnityTestCase {

42 UT.UnityTestCase {

@@ -48,10 +47,10 @@ Rectangle {

48 var image = findChild(zoomableImage, "image");

47 var image = findChild(zoomableImage, "image");

49

48

50 zoomableImage.widgetData = widgetData0;

49 zoomableImage.widgetData = widgetData0;

51− tryCompare(image.state, "default");

50+ tryCompare(image, "state", "default");

52

51

53 zoomableImage.widgetData = widgetData1;

52 zoomableImage.widgetData = widgetData1;

54− tryCompare(image.state, "ready");

53+ tryCompare(image, "state", "ready");

55 }

54 }

56 }

55 }

57}

56}

tests/qmltests/Dash/tst_CardHeader.qml+1−1

@@ -95,7 +95,7 @@ Rectangle {

95 return [

96 { tag: "Column width", object: column, width: cardHeader.width },

97 { tag: "Column width with mascot", object: column, width: cardHeader.width - mascot.width - outerRow.margins * 3, mascot: "artwork/avatar.png" },

98− { tag: "Header height", object: cardHeader, height: function() { return subtitleLabel.y + subtitleLabel.height + outerRow.margins * 2 } },

98+ { tag: "Header height", object: cardHeader, height: function() { return outerRow.height + outerRow.margins * 2 } },

99 ]

100 }

101

tests/qmltests/Dash/tst_DashContent.qml+1−1

@@ -284,7 +284,7 @@ Item {

284 tryCompare(scopesModel, "loaded", true);

285 var tabbar = findChild(dashContent, "tabbar");

286

287− compare(dashContent.currentIndex, 0);

287+ tryCompare(dashContent, "currentIndex", 0);

288 tryCompare(tabbar, "selectedIndex", 0);

289 tryCompare(tabbar, "selectionMode", false);

290

tests/qmltests/Dash/tst_GenericPreview.qml+2−2

@@ -22,7 +22,7 @@ import Unity.Test 0.1 as UT

22Item {

23 id: root

24 width: units.gu(60)

25− height: units.gu(80)

25+ height: units.gu(90)

26

27 property var calls: []

28 property int counter: 0

@@ -81,7 +81,7 @@ Item {

81

82 var actions = get_actions_data();

83 for(var i = 0; i < actions.length; i++) {

84− compare(root.calls[i], actions[i].id);

84+ tryCompare(root.calls, i, actions[i].id);

85 }

86 }

87

tests/qmltests/Dash/tst_GenericScopeView.qml+3−3

@@ -67,7 +67,7 @@ Item {

67 function init() {

68 shell.width = units.gu(120)

69 genericScopeView.categoryView.positionAtBeginning();

70− tryCompare(genericScopeView.categoryView.contentY, 0)

70+ tryCompare(genericScopeView.categoryView, "contentY", 0)

71 }

72

73 function test_isCurrent() {

@@ -184,13 +184,13 @@ Item {

184 categoryListView.positionAtBeginning();

185 waitForRendering(categoryListView);

186 categoryListView.flick(0, -units.gu(60));

187− tryCompare(categoryListView.flicking, false);

187+ tryCompare(categoryListView, "flicking", false);

188

189 var tile = findChild(findChild(genericScopeView, "0"), "delegate0");

190 mouseClick(tile, tile.width / 2, tile.height - 1);

191 tryCompare(openEffect, "gap", 1);

192

193− verify(openEffect.positionPx >= pageHeader.height + categoryListView.stickyHeaderHeight);

193+ verify(openEffect.positionPx >= Math.round(pageHeader.height + categoryListView.stickyHeaderHeight));

194 }

195

196 function test_previewCycle() {

tests/qmltests/Launcher/tst_Launcher.qml+6−4

@@ -121,8 +121,7 @@ Item {

121 revealer.dragLauncherIntoView()

122

123 var listView = findChild(launcher, "launcherListView");

124− listView.flick(0, units.gu(500));

124+ listView.positionViewAtEnd();

125− tryCompare(listView, "flicking", false);

126

125

127 var appIcon = findChild(launcher, "launcherDelegate0")

126 var appIcon = findChild(launcher, "launcherDelegate0")

128

127

@@ -397,8 +396,11 @@ Item {

397

396

398 // Position launcher to where we need it

397 // Position launcher to where we need it

399 var listView = findChild(launcher, "launcherListView");

398 var listView = findChild(launcher, "launcherListView");

400− listView.flick(0, units.gu(200) * (data.flickTo === "top" ? 1 : -1));

399+ if (data.flickTo == "top") {

401− tryCompare(listView, "flicking", false);

400+ listView.positionViewAtEnd();

401+ } else {

402+ listView.positionViewAtBeginning();

403+ }

402

404

403 // Doing longpress

405 // Doing longpress

404 mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)

406 mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)

tests/qmltests/tst_Shell.qml+2−2

@@ -238,8 +238,8 @@ Item {

238

239 var dash = findChild(shell, "dash");

240 // check that dash has normal scale and opacity

241− tryCompare(dash.contentScale, 1.0);

241+ tryCompare(dash, "contentScale", 1.0);

242− tryCompare(dash.opacity, 1.0);

242+ tryCompare(dash, "opacity", 1.0);

243

244 touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY,

245 true /* beginTouch */, false /* endTouch */);

tests/utils/modules/Unity/Test/UnityTestCase.qml+10−16

@@ -71,19 +71,8 @@ TestCase {

71

72

73 // Find an object with the given name in the children tree of "obj"

74− function findChild(obj,objectName) {

74+ function findChild(obj, objectName) {

75− var childs = new Array(0);

75+ return findChildIn(obj, "children", objectName);

76− childs.push(obj)

77− while (childs.length > 0) {

78− if (childs[0].objectName == objectName) {

79− return childs[0]

80− }

81− for (var i in childs[0].children) {

82− childs.push(childs[0].children[i])

83− }

84− childs.splice(0, 1);

85− }

86− return null;

87 }

76 }

88

77

89 // Find an object with the given name in the children tree of "obj"

78 // Find an object with the given name in the children tree of "obj"

@@ -91,15 +80,20 @@ TestCase {

91 // Note: you should use findChild if you're not sure you need this

80 // Note: you should use findChild if you're not sure you need this

92 // as this tree is much bigger and might contain stuff that goes

81 // as this tree is much bigger and might contain stuff that goes

93 // away randomly.

82 // away randomly.

94− function findInvisibleChild(obj,objectName) {

83+ function findInvisibleChild(obj, objectName) {

84+ return findChildIn(obj, "data", objectName);

85+ }

86+

87+ // Find a child in the named property

88+ function findChildIn(obj, prop, objectName) {

95 var childs = new Array(0);

89 var childs = new Array(0);

96 childs.push(obj)

90 childs.push(obj)

97 while (childs.length > 0) {

91 while (childs.length > 0) {

98 if (childs[0].objectName == objectName) {

92 if (childs[0].objectName == objectName) {

99 return childs[0]

93 return childs[0]

100 }

94 }

101− for (var i in childs[0].data) {

95+ for (var i in childs[0][prop]) {

102− childs.push(childs[0].data[i])

96+ childs.push(childs[0][prop][i])

103 }

97 }

104 childs.splice(0, 1);

98 childs.splice(0, 1);

105 }

99 }